diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java index 1fa0b022e94..32c872ba1a3 100644 --- a/forge-core/src/main/java/forge/ImageKeys.java +++ b/forge-core/src/main/java/forge/ImageKeys.java @@ -31,12 +31,17 @@ public final class ImageKeys { private static Map editionImageLookup = new HashMap<>(); + private static boolean isLibGDXPort = false; + /** * Private constructor to prevent instantiation. */ private ImageKeys() { } + public static void setIsLibGDXPort(boolean value) { + isLibGDXPort = value; + } public static void initializeDirs(String cards, Map cardsSub, String tokens, String icons, String boosters, String fatPacks, String boosterBoxes, String precons, String tournamentPacks) { CACHE_CARD_PICS_DIR = cards; @@ -244,8 +249,9 @@ public final class ImageKeys { } // System.out.println("File not found, no image created: " + key); - //add missing cards - missingCards.add(filename); + //add missing cards - disable for desktop version for compatibility reasons with autodownloader + if (isLibGDXPort) + missingCards.add(filename); return null; } diff --git a/forge-gui-desktop/src/main/java/forge/Singletons.java b/forge-gui-desktop/src/main/java/forge/Singletons.java index 8e1321f8611..dc3d141a302 100644 --- a/forge-gui-desktop/src/main/java/forge/Singletons.java +++ b/forge-gui-desktop/src/main/java/forge/Singletons.java @@ -19,6 +19,7 @@ package forge; import forge.control.FControl; import forge.gui.FThreads; +import forge.gui.GuiBase; import forge.model.FModel; import forge.view.FView; @@ -51,6 +52,7 @@ public final class Singletons { view = FView.SINGLETON_INSTANCE; } + ImageKeys.setIsLibGDXPort(GuiBase.getInterface().isLibgdxPort()); FModel.initialize(view == null ? null : view.getSplash().getProgressBar(), null); if (withUi) { diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 2d9135f6a14..45253bb7ffa 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -185,6 +185,7 @@ public class Forge implements ApplicationListener { AssetsDownloader.checkForUpdates(splashScreen); if (exited) { return; } //don't continue if user chose to exit or couldn't download required assets + ImageKeys.setIsLibGDXPort(GuiBase.getInterface().isLibgdxPort()); FModel.initialize(splashScreen.getProgressBar(), null); splashScreen.getProgressBar().setDescription(localizer.getMessage("lblLoadingFonts"));