Merge pull request #125 from xpenatan/master

Release v1.0.1
xpenatan · Jul 10, 2024 · 3ce4e2f · 3ce4e2f
2 parents 41943bb + a63dcd3
commit 3ce4e2f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 50 deletions.
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 [-SNAPSHOT]
 
+[1.0.1]
+- Fix an issue when creating database and trying to load assets.
+- Quick fix to filter out assets.txt file and to delete it before adding new files
+
 [1.0.0]
 - Update teavm to 0.10.0
 - Pixmap now use Gdx2DPixmap

diff --git a/...ds/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/TeaApplication.java b/...ds/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/TeaApplication.java
@@ -206,8 +206,6 @@ public void handleEvent(EventWrapper evt) {
             });
         }
 
-        assetLoader.preload(config, "assets.txt");
-
         window.requestAnimationFrame(this);
     }
 
@@ -218,10 +216,14 @@ public void run() {
             switch(state) {
                 case INIT:
                     if(delayInitCount == 0) {
-                        initState = AppState.LOAD_ASSETS;
+                        initState = AppState.PRELOAD_ASSETS;
                     }
                     break;
-                case LOAD_ASSETS:
+                case PRELOAD_ASSETS:
+                    assetLoader.preload(config, "assets.txt");
+                    initState = AppState.DOWNLOAD_ASSETS;
+                    break;
+                case DOWNLOAD_ASSETS:
                     int queue = AssetDownloader.getInstance().getQueue();
                     if(queue == 0) {
                         initState = AppState.APP_LOOP;
@@ -469,7 +471,8 @@ public static boolean isMobileDevice () {
 
     public enum AppState {
         INIT,
-        LOAD_ASSETS,
+        PRELOAD_ASSETS,
+        DOWNLOAD_ASSETS,
         APP_CREATE,
         APP_LOOP
     }

diff --git a/...teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/DefaultAssetFilter.java b/...teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/DefaultAssetFilter.java
@@ -8,6 +8,7 @@ public class DefaultAssetFilter implements AssetFilter {
     public boolean accept(String file, boolean isDirectory) {
         if(isDirectory && file.endsWith(".svn")) return false;
         if(file.endsWith(".jar")) return false;
+        if(file.endsWith("assets.txt")) return false;
         return true;
     }
 }
diff --git a/...backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/TeaBuilder.java b/...backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/TeaBuilder.java
@@ -503,20 +503,25 @@ public static void configAssets(TeaClassLoader classLoader, TeaBuildConfiguratio
             useDefaultHTMLIndexFile(classLoader, configuration, webappDistFolder, webappName, webappFolder);
         }
 
-        if(assetFile.exists()) {
-            assetFile.delete();
-        }
 
         boolean generateAssetPaths = configuration.shouldGenerateAssetFile();
 
+        ArrayList<AssetsCopy.Asset> alLAssets = new ArrayList<>();
         // Copy Assets files
         ArrayList<AssetFileHandle> assetsPaths = configuration.assetsPath();
         for(int i = 0; i < assetsPaths.size(); i++) {
             AssetFileHandle assetFileHandle = assetsPaths.get(i);
             ArrayList<AssetsCopy.Asset> assets = AssetsCopy.copyAssets(assetFileHandle, filter, assetsFolder);
-            if(generateAssetPaths) {
-                AssetsCopy.generateAssetsFile(assets, assetsFolder, assetFile);
-            }
+            alLAssets.addAll(assets);
+        }
+
+        if(assetFile.exists()) {
+            // Delete assets.txt before adding the updated list.
+            assetFile.delete();
+        }
+
+        if(generateAssetPaths) {
+            AssetsCopy.generateAssetsFile(alLAssets, assetsFolder, assetFile);
         }
 
         // Copy assets from resources

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=1.0.0
+version=1.0.1
 gdxSourcePath = E:/Dev/Projects/java/libgdx
 teavmPath = E:/Dev/Projects/java/teavm
 includeLibgdxSource = false