From 9b543986f154d142c77cd07df28087e68da25982 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Tue, 8 Mar 2022 18:03:09 +0800 Subject: [PATCH] Revert path for Android - on newer API it can't access the texture except text... --- forge-gui-mobile/src/forge/Forge.java | 2 +- forge-gui-mobile/src/forge/assets/FSkin.java | 2 +- forge-gui-mobile/src/forge/screens/SplashScreen.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 317643a6e32..98960d81a4e 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -339,7 +339,7 @@ public class Forge implements ApplicationListener { protected void afterDbLoaded() { //init here to fix crash if the assets are missing - transitionTexture = new Texture(Gdx.files.classpath("fallback_skin").child("transition.png")); + transitionTexture = new Texture(GuiBase.isAndroid() ? Gdx.files.internal("fallback_skin").child("transition.png") : Gdx.files.classpath("fallback_skin").child("transition.png")); destroyThis = false; //Allow back() diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java index 46f4619829d..8f7abc78286 100644 --- a/forge-gui-mobile/src/forge/assets/FSkin.java +++ b/forge-gui-mobile/src/forge/assets/FSkin.java @@ -108,7 +108,7 @@ public class FSkin { { if (!dir.exists() || !dir.isDirectory()) { //if skins directory doesn't exist, point to internal assets/skin directory instead for the sake of the splash screen - preferredDir = Gdx.files.classpath("fallback_skin"); + preferredDir = GuiBase.isAndroid() ? Gdx.files.internal("fallback_skin") : Gdx.files.classpath("fallback_skin"); } else { if (splashScreen != null) { diff --git a/forge-gui-mobile/src/forge/screens/SplashScreen.java b/forge-gui-mobile/src/forge/screens/SplashScreen.java index ce5b40db88f..958fa78dbb1 100644 --- a/forge-gui-mobile/src/forge/screens/SplashScreen.java +++ b/forge-gui-mobile/src/forge/screens/SplashScreen.java @@ -97,7 +97,9 @@ public class SplashScreen extends FContainer { private float progress = 0; private boolean finished, openAdventure; //for transition image only... - TextureRegion transition_bg = new TextureRegion(new Texture(Gdx.files.classpath("fallback_skin").child("title_bg_lq.png"))); + TextureRegion transition_bg = new TextureRegion(new Texture(GuiBase.isAndroid() + ? Gdx.files.internal("fallback_skin").child("title_bg_lq.png") + : Gdx.files.classpath("fallback_skin").child("title_bg_lq.png"))); public void drawBackground(Graphics g) { float percentage = progress / DURATION;