Give ore mixes localized names (#3290)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

3 files changed, 6 insertions, 27 deletions

diff --git a/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java b/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java
index 86117f099a..859ea87bb2 100644
--- a/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java
+++ b/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java
@@ -3,38 +3,16 @@ package gtneioreplugin.plugin.gregtech5;
 import net.minecraft.client.resources.I18n;
 
 import codechicken.lib.gui.GuiDraw;
-import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GTLanguageManager;
 import gtneioreplugin.plugin.PluginBase;
 
 public abstract class PluginGT5Base extends PluginBase {
 
-    protected static String getLocalizedNameForItem(Materials aMaterial, String aFormat) {
-        return String.format(
-            aFormat.replace("%s", "%temp")
-                .replace("%material", "%s"),
-            aMaterial.mLocalizedName)
-            .replace("%temp", "%s");
-    }
-
-    protected static String getLocalizedNameForItem(String aFormat, int aMaterialID) {
-        if (aMaterialID >= 0 && aMaterialID < 1000) {
-            Materials aMaterial = GregTechAPI.sGeneratedMaterials[aMaterialID];
-            if (aMaterial != null) {
-                return getLocalizedNameForItem(aMaterial, aFormat);
-            }
-        }
-        return aFormat;
-    }
-
     public static String getGTOreLocalizedName(short index) {
-
-        if (!getLocalizedNameForItem(GTLanguageManager.getTranslation(getGTOreUnlocalizedName(index)), index % 1000)
-            .contains("Awakened"))
-            return getLocalizedNameForItem(
-                GTLanguageManager.getTranslation(getGTOreUnlocalizedName(index)),
-                index % 1000);
+        String name = Materials
+            .getLocalizedNameForItem(GTLanguageManager.getTranslation(getGTOreUnlocalizedName(index)), index % 1000);
+        if (!name.contains("Awakened")) return name;
         else return "Aw. Draconium Ore";
     }
 
diff --git a/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java b/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
index 6e02539a87..cb89a0bc7b 100644
--- a/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
+++ b/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
@@ -91,7 +91,7 @@ public class PluginGT5VeinStat extends PluginGT5Base {
     }
 
     private static void drawVeinName(OreLayerWrapper oreLayer) {
-        drawVeinNameLine(I18n.format(oreLayer.veinName) + " ");
+        drawVeinNameLine(oreLayer.localizedName + " ");
     }
 
     private static void drawVeinNameLine(String veinName) {
diff --git a/src/main/java/gtneioreplugin/util/GT5OreLayerHelper.java b/src/main/java/gtneioreplugin/util/GT5OreLayerHelper.java
index ac4d6c4aca..0e8e5b3462 100644
--- a/src/main/java/gtneioreplugin/util/GT5OreLayerHelper.java
+++ b/src/main/java/gtneioreplugin/util/GT5OreLayerHelper.java
@@ -71,7 +71,7 @@ public class GT5OreLayerHelper {
 
     public static class OreLayerWrapper {
 
-        public final String veinName, worldGenHeightRange;
+        public final String veinName, worldGenHeightRange, localizedName;
         public final short[] Meta = new short[4];
         public final short randomWeight, size, density;
         public final Map<String, Boolean> allowedDimWithOrigNames;
@@ -83,6 +83,7 @@ public class GT5OreLayerHelper {
 
         public OreLayerWrapper(OreMixBuilder mix) {
             this.veinName = mix.oreMixName;
+            this.localizedName = mix.localizedName;
             this.Meta[0] = (short) mix.primary.mMetaItemSubID;
             this.Meta[1] = (short) mix.secondary.mMetaItemSubID;
             this.Meta[2] = (short) mix.between.mMetaItemSubID;