diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml index 04dc74f19b4..7cbeb6ca9b6 100644 --- a/forge-gui-android/pom.xml +++ b/forge-gui-android/pom.xml @@ -46,6 +46,13 @@ forge-android-${alpha-version} + + + jitpack.io + https://jitpack.io + + + com.google.android @@ -106,6 +113,12 @@ sentry-android 1.7.30 + + com.github.raeleus.TenPatch + tenpatch + 5.2.0 + compile + diff --git a/forge-gui-android/proguard.cfg b/forge-gui-android/proguard.cfg index fe7d5651d62..b5365a37c33 100644 --- a/forge-gui-android/proguard.cfg +++ b/forge-gui-android/proguard.cfg @@ -44,6 +44,7 @@ -keep class io.sentry.event.Event { *; } -keep class io.netty.util.internal.logging.** { *; } -keep class net.jpountz.** { *; } +-keep class com.ray3k.** { *; } -keepclassmembers class com.badlogic.gdx.backends.android.AndroidInput* { (com.badlogic.gdx.Application, android.content.Context, java.lang.Object, com.badlogic.gdx.backends.android.AndroidApplicationConfiguration); diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 148fa09023a..7e88021114c 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -151,6 +151,8 @@ public class Forge implements ApplicationListener { graphics = new Graphics(); splashScreen = new SplashScreen(); frameRate = new FrameRate(); + animationBatch = new SpriteBatch(); + transitionTexture = new Texture(Config.instance().getFile("ui/transition.png")); Gdx.input.setInputProcessor(new MainInputProcessor()); /* Set CatchBackKey here and exit the app when you hit the @@ -245,10 +247,6 @@ public class Forge implements ApplicationListener { return graphics; } - public static void initialize() { - animationBatch = new SpriteBatch(); - transitionTexture = new Texture(Config.instance().getFile("ui/transition.png")); - } public static Scene getCurrentScene() { return currentScene; } @@ -308,9 +306,7 @@ public class Forge implements ApplicationListener { for (SceneType sceneType : SceneType.values()) { sceneType.instance.resLoaded(); } - switchScene(SceneType.StartScene.instance); - initialize(); } catch (Exception e) { e.printStackTrace(); } } });