From 4b13e55d83a561bbc86d1a254a3faa5a50637f36 Mon Sep 17 00:00:00 2001 From: kevlahnota Date: Fri, 15 Nov 2024 16:26:05 +0800 Subject: [PATCH] fix infinite notice for missing tokens --- forge-core/src/main/java/forge/ImageKeys.java | 4 ++-- forge-gui/src/main/java/forge/util/ImageFetcher.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java index aa0d4912565..803d437aa83 100644 --- a/forge-core/src/main/java/forge/ImageKeys.java +++ b/forge-core/src/main/java/forge/ImageKeys.java @@ -85,7 +85,7 @@ public final class ImageKeys { } private static final Map cachedCards = new HashMap<>(50000); - private static HashSet missingCards = new HashSet<>(); + public static HashSet missingCards = new HashSet<>(); public static void clearMissingCards() { missingCards.clear(); } @@ -310,7 +310,7 @@ public final class ImageKeys { } // System.out.println("File not found, no image created: " + key); - //add missing cards - disable for desktop version for compatibility reasons with autodownloader + // add missing cards - disable for desktop version for compatibility reasons with autodownloader if (isLibGDXPort && !hasSetLookup(filename)) //missing cards with setlookup is handled differently missingCards.add(filename); return null; diff --git a/forge-gui/src/main/java/forge/util/ImageFetcher.java b/forge-gui/src/main/java/forge/util/ImageFetcher.java index 516988793c2..45f87d9dfc8 100644 --- a/forge-gui/src/main/java/forge/util/ImageFetcher.java +++ b/forge-gui/src/main/java/forge/util/ImageFetcher.java @@ -228,6 +228,11 @@ public abstract class ImageFetcher { } if (filename.equalsIgnoreCase("null.jpg")) return; + + if (ImageKeys.missingCards.contains(filename)) + return; + + ImageKeys.missingCards.add(filename); System.err.println("No specified file for '" + filename + "'.. Attempting to download from default Url"); tokenUrl = String.format("%s%s", ForgeConstants.URL_TOKEN_DOWNLOAD, filename); }