From fdbdffd874a414dfb1899d14fe41301c288ca21e Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Fri, 10 Oct 2025 12:25:30 +0200 Subject: [PATCH] Update DeckRecognizer.java Remove extra manaSymbolsMap --- .../main/java/forge/deck/DeckRecognizer.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/forge-core/src/main/java/forge/deck/DeckRecognizer.java b/forge-core/src/main/java/forge/deck/DeckRecognizer.java index f62da14d13d..8ea96e9847a 100644 --- a/forge-core/src/main/java/forge/deck/DeckRecognizer.java +++ b/forge-core/src/main/java/forge/deck/DeckRecognizer.java @@ -22,6 +22,7 @@ import forge.StaticData; import forge.card.CardDb; import forge.card.CardEdition; import forge.card.CardType; +import forge.card.ColorSet; import forge.card.MagicColor; import forge.item.IPaperCard; import forge.item.PaperCard; @@ -997,26 +998,13 @@ public class DeckRecognizer { return String.format("%s %s", magicColor.getTranslatedName(), magicColor.getSymbol()); } - private static final HashMap manaSymbolsMap = new HashMap() {{ - put(MagicColor.WHITE | MagicColor.BLUE, "WU"); - put(MagicColor.BLUE | MagicColor.BLACK, "UB"); - put(MagicColor.BLACK | MagicColor.RED, "BR"); - put(MagicColor.RED | MagicColor.GREEN, "RG"); - put(MagicColor.GREEN | MagicColor.WHITE, "GW"); - put(MagicColor.WHITE | MagicColor.BLACK, "WB"); - put(MagicColor.BLUE | MagicColor.RED, "UR"); - put(MagicColor.BLACK | MagicColor.GREEN, "BG"); - put(MagicColor.RED | MagicColor.WHITE, "RW"); - put(MagicColor.GREEN | MagicColor.BLUE, "GU"); - }}; - private static String getMagicColourLabel(MagicColor.Color magicColor1, MagicColor.Color magicColor2){ + private static String getMagicColourLabel(MagicColor.Color magicColor1, MagicColor.Color magicColor2) { if (magicColor2 == null || magicColor2 == MagicColor.Color.COLORLESS || magicColor1 == MagicColor.Color.COLORLESS) return String.format("%s // %s", getMagicColourLabel(magicColor1), getMagicColourLabel(magicColor2)); String localisedName1 = magicColor1.getTranslatedName(); String localisedName2 = magicColor2.getTranslatedName(); - String comboManaSymbol = manaSymbolsMap.get(magicColor1.getColorMask() | magicColor2.getColorMask()); - return String.format("%s/%s {%s}", localisedName1, localisedName2, comboManaSymbol); + return String.format("%s/%s {%s}", localisedName1, localisedName2, ColorSet.fromEnums(magicColor1, magicColor2)); } private static MagicColor.Color getMagicColor(String colorName){