From 559daf9fce89f36895b390fca8b744f1f7aa96d0 Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Mon, 12 May 2025 07:13:06 +0200
Subject: [PATCH] update ImageKey for Other

---
 forge-core/src/main/java/forge/StaticData.java      |  4 ++--
 forge-core/src/main/java/forge/item/PaperToken.java |  4 ++--
 forge-core/src/main/java/forge/token/TokenDb.java   | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java
index b758c4c7eaa..ceacb7dfbbf 100644
--- a/forge-core/src/main/java/forge/StaticData.java
+++ b/forge-core/src/main/java/forge/StaticData.java
@@ -1001,14 +1001,14 @@ public class StaticData {
             if (realSetCode != null) {
                 CardEdition.EditionEntry ee = this.editions.get(realSetCode).findOther(name);
                 if (ee != null) { // TODO add collector Number and new ImageKey format
-                    return ImageKeys.getTokenKey(name + "_" + realSetCode.toLowerCase());
+                    return ImageKeys.getTokenKey(String.format("%s|%s|%s", name, realSetCode, ee.collectorNumber()));
                 }
             }
         }
         for (CardEdition e : this.editions) {
             CardEdition.EditionEntry ee = e.findOther(name);
             if (ee != null) { // TODO add collector Number and new ImageKey format
-                return ImageKeys.getTokenKey(name + "_" + e.getCode().toLowerCase());
+                return ImageKeys.getTokenKey(String.format("%s|%s|%s", name, e.getCode(), ee.collectorNumber()));
             }
         }
         // final fallback
diff --git a/forge-core/src/main/java/forge/item/PaperToken.java b/forge-core/src/main/java/forge/item/PaperToken.java
index 624a0284922..76f94634093 100644
--- a/forge-core/src/main/java/forge/item/PaperToken.java
+++ b/forge-core/src/main/java/forge/item/PaperToken.java
@@ -65,9 +65,9 @@ public class PaperToken implements InventoryItemFromSet, IPaperCard {
         if (collectorNumber != null && !collectorNumber.isEmpty() && edition != null && edition.getTokens().containsKey(imageFileName)) {
             int idx = 0;
             // count the one with the same collectorNumber
-            for (CardEdition.TokenInSet t : edition.getTokens().get(imageFileName)) {
+            for (CardEdition.EditionEntry t : edition.getTokens().get(imageFileName)) {
                 ++idx;
-                if (!t.collectorNumber.equals(collectorNumber)) {
+                if (!t.collectorNumber().equals(collectorNumber)) {
                     continue;
                 }
                 // TODO make better image file names when collector number is known
diff --git a/forge-core/src/main/java/forge/token/TokenDb.java b/forge-core/src/main/java/forge/token/TokenDb.java
index b0d5e2c8d65..1fa8b500b0c 100644
--- a/forge-core/src/main/java/forge/token/TokenDb.java
+++ b/forge-core/src/main/java/forge/token/TokenDb.java
@@ -46,10 +46,10 @@ public class TokenDb implements ITokenDatabase {
 
     public void preloadTokens() {
         for (CardEdition edition : this.editions) {
-            for (Map.Entry<String, Collection<CardEdition.TokenInSet>> inSet : edition.getTokens().asMap().entrySet()) {
+            for (Map.Entry<String, Collection<CardEdition.EditionEntry>> inSet : edition.getTokens().asMap().entrySet()) {
                 String name = inSet.getKey();
                 String fullName = String.format("%s_%s", name, edition.getCode().toLowerCase());
-                for (CardEdition.TokenInSet t : inSet.getValue()) {
+                for (CardEdition.EditionEntry t : inSet.getValue()) {
                     allTokenByName.put(fullName, addTokenInSet(edition, name, t));
                 }
             }
@@ -65,14 +65,14 @@ public class TokenDb implements ITokenDatabase {
             return false;
         }
 
-        for (CardEdition.TokenInSet t : edition.getTokens().get(name)) {
+        for (CardEdition.EditionEntry t : edition.getTokens().get(name)) {
             allTokenByName.put(fullName, addTokenInSet(edition, name, t));
         }
         return true;
     }
 
-    protected PaperToken addTokenInSet(CardEdition edition, String name, CardEdition.TokenInSet t) {
-        return new PaperToken(rulesByName.get(name), edition, name, t.collectorNumber, t.artistName);
+    protected PaperToken addTokenInSet(CardEdition edition, String name, CardEdition.EditionEntry t) {
+        return new PaperToken(rulesByName.get(name), edition, name, t.collectorNumber(), t.artistName());
     }
 
     // try all editions to find token