diff --git a/forge-gui-android/proguard.cfg b/forge-gui-android/proguard.cfg index ab6fbdeecf0..d70e73b946f 100644 --- a/forge-gui-android/proguard.cfg +++ b/forge-gui-android/proguard.cfg @@ -5,6 +5,7 @@ -dontpreverify -verbose -optimizations !code/simplification/arithmetic,!field/*,!class/merging/*,!code/allocation/variable +-libraryjars /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar -dontwarn afu.org.checkerframework.** -dontwarn io.netty.** diff --git a/forge-gui-mobile-dev/src/forge/app/Main.java b/forge-gui-mobile-dev/src/forge/app/Main.java index fb86479e7c3..e2585036658 100644 --- a/forge-gui-mobile-dev/src/forge/app/Main.java +++ b/forge-gui-mobile-dev/src/forge/app/Main.java @@ -43,12 +43,12 @@ public class Main { } // Set this to "true" to make the mobile game port run as a full-screen desktop application - boolean desktopMode = cmd.hasOption("fullscreen"); + boolean desktopMode = true;//cmd.hasOption("fullscreen"); // Set this to the location where you want the mobile game port to look for assets when working as a full-screen desktop application // (uncomment the bottom version and comment the top one to load the res folder from the current folder the .jar is in if you would // like to make the game load from a desktop game folder configuration). - String desktopModeAssetsDir = "../forge-gui/"; - //String desktopModeAssetsDir = "./"; + //String desktopModeAssetsDir = "../forge-gui/"; + String desktopModeAssetsDir = "./"; // Assets directory used when the game fully emulates smartphone/tablet mode (desktopMode = false), useful when debugging from IDE String assetsDir = AssetsDownloader.SHARE_DESKTOP_ASSETS ? "../forge-gui/" : "testAssets/"; diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java index 45c71d83811..e1cb480795a 100644 --- a/forge-gui-mobile/src/forge/assets/FSkin.java +++ b/forge-gui-mobile/src/forge/assets/FSkin.java @@ -17,7 +17,6 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion; import forge.FThreads; import forge.assets.FSkinImage.SourceFile; import forge.card.CardFaceSymbols; -import forge.card.CardImageRenderer; import forge.model.FModel; import forge.properties.ForgeConstants; import forge.properties.ForgePreferences;