From 1a0f025ca70e6ace81e5622765f4b69e187d8c68 Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Sun, 21 Jul 2024 07:51:40 +0200
Subject: [PATCH] forge-gui-mobile: fix symbolLookup init too early

---
 .../src/forge/assets/TextRenderer.java             | 14 --------------
 .../src/forge/card/CardFaceSymbols.java            | 12 ++++++++++++
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/forge-gui-mobile/src/forge/assets/TextRenderer.java b/forge-gui-mobile/src/forge/assets/TextRenderer.java
index 4fafa1ce7f8..74c50d0ff4d 100644
--- a/forge-gui-mobile/src/forge/assets/TextRenderer.java
+++ b/forge-gui-mobile/src/forge/assets/TextRenderer.java
@@ -4,7 +4,6 @@ import java.text.BreakIterator;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.utils.Align;
@@ -14,24 +13,11 @@ import forge.Graphics;
 import forge.card.CardFaceSymbols;
 import forge.localinstance.properties.ForgePreferences;
 import forge.localinstance.properties.ForgePreferences.FPref;
-import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.util.TextBounds;
 
 //Encodes text for drawing with symbols and reminder text
 public class TextRenderer {
-    static {
-        for (Map.Entry<String, FSkinProp> e : FSkinProp.MANA_IMG.entrySet()) {
-            Forge.getAssets().symbolLookup().put(e.getKey(), Forge.getAssets().images().get(e.getValue()));
-        }
-
-        Forge.getAssets().symbolLookup().put("E", FSkinImage.ENERGY);
-        Forge.getAssets().symbolLookup().put("TK", FSkinImage.TICKET);
-        Forge.getAssets().symbolLookup().put("AE", FSkinImage.AETHER_SHARD);
-        Forge.getAssets().symbolLookup().put("PW", FSkinImage.PW_BADGE_COMMON);
-        Forge.getAssets().symbolLookup().put("CR", FSkinImage.QUEST_COINSTACK);
-        Forge.getAssets().symbolLookup().put("M", FSkinImage.MANASHARD);
-    }
 
     public static String startColor(Color color) {
         return "<clr " + Color.rgba8888(color) + ">";
diff --git a/forge-gui-mobile/src/forge/card/CardFaceSymbols.java b/forge-gui-mobile/src/forge/card/CardFaceSymbols.java
index 3dd4869cdb3..b3544da21cb 100644
--- a/forge-gui-mobile/src/forge/card/CardFaceSymbols.java
+++ b/forge-gui-mobile/src/forge/card/CardFaceSymbols.java
@@ -129,6 +129,18 @@ public class CardFaceSymbols {
         Forge.getAssets().manaImages().put("protectU", FSkinImage.IMG_ABILITY_PROTECT_U);
         Forge.getAssets().manaImages().put("protectUW", FSkinImage.IMG_ABILITY_PROTECT_UW);
         Forge.getAssets().manaImages().put("protectW", FSkinImage.IMG_ABILITY_PROTECT_W);
+
+        // symbol lookup for text render
+        for (Map.Entry<String, FSkinProp> e : FSkinProp.MANA_IMG.entrySet()) {
+            Forge.getAssets().symbolLookup().put(e.getKey(), Forge.getAssets().images().get(e.getValue()));
+        }
+
+        Forge.getAssets().symbolLookup().put("E", FSkinImage.ENERGY);
+        Forge.getAssets().symbolLookup().put("TK", FSkinImage.TICKET);
+        Forge.getAssets().symbolLookup().put("AE", FSkinImage.AETHER_SHARD);
+        Forge.getAssets().symbolLookup().put("PW", FSkinImage.PW_BADGE_COMMON);
+        Forge.getAssets().symbolLookup().put("CR", FSkinImage.QUEST_COINSTACK);
+        Forge.getAssets().symbolLookup().put("M", FSkinImage.MANASHARD);
     }
 
     public static void drawManaCost(Graphics g, ManaCost manaCost, float x, float y, final float imageSize) {