From 1cb22822a35bb3149cdcf7e2fdb14c1b0f87a11e Mon Sep 17 00:00:00 2001 From: Natan Date: Wed, 15 May 2024 21:49:01 -0300 Subject: [PATCH] Small resource fix --- .../teavm/config/TeaVMResourceProperties.java | 17 +++++++++-------- .../resources/META-INF/gdx-teavm.properties | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/TeaVMResourceProperties.java b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/TeaVMResourceProperties.java index 451a37fb..2f179325 100644 --- a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/TeaVMResourceProperties.java +++ b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/TeaVMResourceProperties.java @@ -66,21 +66,22 @@ public static List getResources(ArrayList acceptedURL) { boolean accept = false; for(TeaVMResourceProperties properties : propertiesList) { ignoreResources.addAll(properties.ignorePath); + // Accept if properties exist in current path if(path.contains(properties.path)) { accept = true; break; } - if(!accept) { - for(String additionalPath : properties.additionalPath) { - if(path.contains(additionalPath)) { - accept = true; - break; - } - } - if(accept) { + for(String additionalPath : properties.additionalPath) { + // Check if the jar path contains in properties + if(path.contains(additionalPath)) { + accept = true; break; } } + + if(accept) { + break; + } } if(accept) { URI uri = URI.create("jar:file:" + path); diff --git a/backends/backend-teavm/src/main/resources/META-INF/gdx-teavm.properties b/backends/backend-teavm/src/main/resources/META-INF/gdx-teavm.properties index e77e3eb9..8d864f50 100644 --- a/backends/backend-teavm/src/main/resources/META-INF/gdx-teavm.properties +++ b/backends/backend-teavm/src/main/resources/META-INF/gdx-teavm.properties @@ -1,3 +1,4 @@ resources=com.badlogicgames.gdx/gdx/ +resources=build/libs/gdx- resources=com.github.mgsx-dev.gdx-gltf/gltf/ ignore-resources=startup-logo.png \ No newline at end of file