Fix the localization bug

I misunderstood GT6‘s API, it's my own fault.

8 files changed, 48 insertions, 71 deletions

diff --git a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
index b309425e64..b55e57f0a1 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
@@ -4,7 +4,6 @@ import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.relauncher.Side;
 import pers.gwyog.gtneioreplugin.util.GT6OreLayerHelper;
 import pers.gwyog.gtneioreplugin.util.GT6OreSmallHelper;
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6Base.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6Base.java
new file mode 100644
index 0000000000..f047fbb1ab
--- /dev/null
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6Base.java
@@ -0,0 +1,35 @@
+package pers.gwyog.gtneioreplugin.plugin.gregtech6;
+
+import gregapi.data.CS;
+import gregapi.lang.LanguageHandler;
+import net.minecraft.client.resources.I18n;
+import pers.gwyog.gtneioreplugin.plugin.PluginBase;
+
+public class PluginGT6Base extends PluginBase {
+    
+    public static String getLocalizedOreName(short meta) {
+        // meta==-1 means OreDictMaterial is MT.NULL
+        if (meta==-1)
+            return I18n.format("gtnop.ore.null.name");
+        else
+            return LanguageHandler.translate("oredict.ore" + CS.BlocksGT.ore.getMetaMaterial(meta).mNameInternal + ".name");
+    } 
+    
+    public static String getLocalizedSmallOreName(short meta) {
+        // meta==-1 means OreDictMaterial is MT.NULL
+        if (meta==-1)
+            return I18n.format("gtnop.ore.null.name");
+        else
+            return LanguageHandler.translate("oredict.oreSmall" + CS.BlocksGT.oreSmall.getMetaMaterial(meta).mNameInternal + ".name");
+    }
+    
+    public static String getLocalizedOreBedrockName(short meta) {
+        // meta==-1 means OreDictMaterial is MT.NULL
+        if (meta==-1)
+            return I18n.format("gtnop.ore.null.name");
+        else
+            return LanguageHandler.translate("oredict.oreBedrock" + CS.BlocksGT.ore.getMetaMaterial(meta).mNameInternal + ".name");
+    } 
+    
+    
+}
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6BedrockOreStat.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6BedrockOreStat.java
index ce46736597..daad693c56 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6BedrockOreStat.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6BedrockOreStat.java
@@ -11,13 +11,12 @@ import gregapi.data.CS;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
-import pers.gwyog.gtneioreplugin.plugin.PluginBase;
 import pers.gwyog.gtneioreplugin.util.GT6OreBedrockHelper;
 import pers.gwyog.gtneioreplugin.util.GT6OreLayerHelper;
 import pers.gwyog.gtneioreplugin.util.GT6OreSmallHelper;
 import pers.gwyog.gtneioreplugin.util.GT6OreBedrockHelper.OreBedrockWrapper;
 
-public class PluginGT6BedrockOreStat extends PluginBase {
+public class PluginGT6BedrockOreStat extends PluginGT6Base {
     
     public class CachedBedrockOreStatRecipe extends CachedRecipe {
         public String oreName;
@@ -90,10 +89,10 @@ public class PluginGT6BedrockOreStat extends PluginBase {
     public void drawExtras(int recipe) {
         CachedBedrockOreStatRecipe crecipe = (CachedBedrockOreStatRecipe) this.arecipes.get(recipe);
         OreBedrockWrapper oreLayer = GT6OreBedrockHelper.mapOreBedrockWrapper.get(crecipe.oreName);
-        GuiDraw.drawString(I18n.format("gtnop.gui.nei.oreName") + ": " + GT6OreBedrockHelper.mapMetaToLocalizedName.get(oreLayer.meta), 2, 18, 0x404040, false);
-        GuiDraw.drawString(I18n.format("gtnop.gui.nei.oreOthers") + ": " + GT6OreSmallHelper.mapMetaToLocalizedName.get(oreLayer.meta), 2, 31, 0x404040, false);
-        GuiDraw.drawString(I18n.format("gtnop.gui.nei.oreOthers") + ": " + GT6OreLayerHelper.mapMetaToLocalizedName.get(oreLayer.meta), 2, 44, 0x404040, false);
-        GuiDraw.drawString(I18n.format("gtnop.gui.nei.oreOthers") + ": " + GT6OreSmallHelper.mapMetaToLocalizedName.get(oreLayer.meta), 2, 57, 0x404040, false);
+        GuiDraw.drawString(I18n.format("gtnop.gui.nei.oreName") + ": " + getLocalizedOreBedrockName(oreLayer.meta), 2, 18, 0x404040, false);
+        GuiDraw.drawString(I18n.format("gtnop.gui.nei.oreOthers") + ": " + getLocalizedSmallOreName(oreLayer.meta), 2, 31, 0x404040, false);
+        GuiDraw.drawString(I18n.format("gtnop.gui.nei.oreOthers") + ": " + getLocalizedOreName(oreLayer.meta), 2, 44, 0x404040, false);
+        GuiDraw.drawString(I18n.format("gtnop.gui.nei.oreOthers") + ": " + getLocalizedSmallOreName(oreLayer.meta), 2, 57, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.genHeight") + ": " + "0-6", 2, 70, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.nei.genPosition") + ": " + I18n.format("gtnop.nei.genPositionInfo"), 2,83, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.weightedChance") + ": " + "1/" + oreLayer.probability, 2, 96, 0x404040, false);
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6SmallOreStat.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6SmallOreStat.java
index 02f43a02f9..effcb5cc16 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6SmallOreStat.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6SmallOreStat.java
@@ -16,11 +16,10 @@ import gregapi.oredict.OreDictMaterial;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
-import pers.gwyog.gtneioreplugin.plugin.PluginBase;
 import pers.gwyog.gtneioreplugin.util.GT6OreSmallHelper;
 import pers.gwyog.gtneioreplugin.util.GT6OreSmallHelper.OreSmallWrapper;
 
-public class PluginGT6SmallOreStat extends PluginBase {
+public class PluginGT6SmallOreStat extends PluginGT6Base {
 
     public class CachedOreSmallRecipe extends CachedRecipe {
         public String oreGenName;
@@ -60,7 +59,7 @@ public class PluginGT6SmallOreStat extends PluginBase {
     public void drawExtras(int recipe) {
         CachedOreSmallRecipe crecipe = (CachedOreSmallRecipe) this.arecipes.get(recipe);
         OreSmallWrapper oreSmall = GT6OreSmallHelper.mapOreSmallWrapper.get(crecipe.oreGenName);
-        GuiDraw.drawString(I18n.format("gtnop.gui.nei.oreName") + ": " + GT6OreSmallHelper.mapMetaToLocalizedName.get(oreSmall.oreMeta), 2, 18, 0x404040, false);
+        GuiDraw.drawString(I18n.format("gtnop.gui.nei.oreName") + ": " + getLocalizedSmallOreName(oreSmall.oreMeta), 2, 18, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.genHeight") + ": " + oreSmall.worldGenHeightRange, 2, 31, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.amount") + ": " + oreSmall.amountPerChunk, 2, 44, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.worldNames") + ": " + getWorldNameTranslated(oreSmall.genOverworld, oreSmall.genNether, oreSmall.genEnd, false, false), 2, 57, 0x404040, false);
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6VeinStat.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6VeinStat.java
index 83ebb1211e..82714dd374 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6VeinStat.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6VeinStat.java
@@ -12,11 +12,10 @@ import gregapi.data.CS;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
-import pers.gwyog.gtneioreplugin.plugin.PluginBase;
 import pers.gwyog.gtneioreplugin.util.GT6OreLayerHelper;
 import pers.gwyog.gtneioreplugin.util.GT6OreLayerHelper.OreLayerWrapper;
 
-public class PluginGT6VeinStat extends PluginBase {
+public class PluginGT6VeinStat extends PluginGT6Base {
 
     public class CachedVeinStatRecipe extends CachedRecipe {
         public String veinName;
@@ -108,10 +107,10 @@ public class PluginGT6VeinStat extends PluginBase {
         CachedVeinStatRecipe crecipe = (CachedVeinStatRecipe) this.arecipes.get(recipe);
         OreLayerWrapper oreLayer = GT6OreLayerHelper.mapOreLayerWrapper.get(crecipe.veinName);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.veinName") + ": " + getLocalizedVeinName(oreLayer.veinName), 2, 18, 0x404040, false);
-        GuiDraw.drawString(I18n.format("gtnop.gui.nei.primaryOre") + ": " + GT6OreLayerHelper.mapMetaToLocalizedName.get(oreLayer.primaryMeta), 2, 31, 0x404040, false);
-        GuiDraw.drawString(I18n.format("gtnop.gui.nei.secondaryOre") + ": " + GT6OreLayerHelper.mapMetaToLocalizedName.get(oreLayer.secondaryMeta), 2, 44, 0x404040, false);
-        GuiDraw.drawString(I18n.format("gtnop.gui.nei.betweenOre") + ": " + GT6OreLayerHelper.mapMetaToLocalizedName.get(oreLayer.betweenMeta), 2, 57, 0x404040, false);
-        GuiDraw.drawString(I18n.format("gtnop.gui.nei.sporadicOre") + ": " + GT6OreLayerHelper.mapMetaToLocalizedName.get(oreLayer.sporadicMeta), 2, 70, 0x404040, false);
+        GuiDraw.drawString(I18n.format("gtnop.gui.nei.primaryOre") + ": " + getLocalizedOreName(oreLayer.primaryMeta), 2, 31, 0x404040, false);
+        GuiDraw.drawString(I18n.format("gtnop.gui.nei.secondaryOre") + ": " + getLocalizedOreName(oreLayer.secondaryMeta), 2, 44, 0x404040, false);
+        GuiDraw.drawString(I18n.format("gtnop.gui.nei.betweenOre") + ": " + getLocalizedOreName(oreLayer.betweenMeta), 2, 57, 0x404040, false);
+        GuiDraw.drawString(I18n.format("gtnop.gui.nei.sporadicOre") + ": " + getLocalizedOreName(oreLayer.sporadicMeta), 2, 70, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.genHeight") + ": " + oreLayer.worldGenHeightRange, 2, 83, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.weightedChance") + ": " + oreLayer.weightedChance, 2, 96, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.worldNames") + ": " + getWorldNameTranslated(oreLayer.genOverworld, oreLayer.genNether, oreLayer.genEnd, false, false), 2, 109, 0x404040, false);
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT6OreBedrockHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT6OreBedrockHelper.java
index be95bcc7b3..acae062f7c 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT6OreBedrockHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT6OreBedrockHelper.java
@@ -2,18 +2,12 @@ package pers.gwyog.gtneioreplugin.util;
 
 import java.util.HashMap;
 
-import gregapi.data.CS;
-import gregapi.data.OP;
-import gregapi.lang.LanguageHandler;
-import gregapi.oredict.OreDictMaterial;
 import gregapi.worldgen.WorldgenObject;
 import gregapi.worldgen.Worldgen_GT_Ore_Bedrock;
 import gregapi.worldgen.Worldgenerator;
-import net.minecraft.client.resources.I18n;
 
 public class GT6OreBedrockHelper {
     public static HashMap<String, OreBedrockWrapper> mapOreBedrockWrapper = new HashMap<String, OreBedrockWrapper>();
-    public static HashMap<Short, String> mapMetaToLocalizedName = new HashMap<Short, String>();
     
     public GT6OreBedrockHelper() {
         for (WorldgenObject worldGenOreBedrock : Worldgenerator.sWorldgenList)
@@ -21,14 +15,6 @@ public class GT6OreBedrockHelper {
                 mapOreBedrockWrapper.put(worldGenOreBedrock.mWorldGenName, new OreBedrockWrapper((Worldgen_GT_Ore_Bedrock)worldGenOreBedrock));         
     }
     
-    public static String getLocalizedOreBedrockName(short meta) {
-        // meta==-1 means OreDictMaterial is MT.NULL
-        if (meta==-1)
-            return I18n.format("gtnop.ore.null.name");
-        else
-            return LanguageHandler.getLocalName(OP.oreBedrock, CS.BlocksGT.oreBedrock.getMetaMaterial(meta));
-    } 
-    
     public class OreBedrockWrapper {
         public String veinName;
         public short meta;
@@ -44,12 +30,6 @@ public class GT6OreBedrockHelper {
             this.genOverworld = worldGen.mOverworld;
             this.genNether = worldGen.mNether;
             this.genEnd = worldGen.mEnd;
-            if (!GT6OreLayerHelper.mapMetaToLocalizedName.keySet().contains(meta))
-                GT6OreLayerHelper.mapMetaToLocalizedName.put(meta, GT6OreLayerHelper.getLocalizedOreName(meta));
-            if (!GT6OreSmallHelper.mapMetaToLocalizedName.keySet().contains(meta))
-                GT6OreSmallHelper.mapMetaToLocalizedName.put(meta, GT6OreSmallHelper.getLocalizedSmallOreName(meta));
-            if (!mapMetaToLocalizedName.keySet().contains(meta))
-                mapMetaToLocalizedName.put(meta, getLocalizedOreBedrockName(meta));
         } 
     }
     
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT6OreLayerHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT6OreLayerHelper.java
index ce5da9feb8..70bddee30d 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT6OreLayerHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT6OreLayerHelper.java
@@ -5,21 +5,16 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
-import cpw.mods.fml.common.Loader;
 import gregapi.block.IBlockPlacable;
 import gregapi.block.prefixblock.PrefixBlock;
 import gregapi.data.CS;
-import gregapi.data.OP;
-import gregapi.lang.LanguageHandler;
 import gregapi.worldgen.Worldgen_GT_Ore_Layer;
 import gregtech.GT_Mod;
-import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
 
 public class GT6OreLayerHelper {
     public static HashMap<String, OreLayerWrapper> mapOreLayerWrapper = new HashMap<String, OreLayerWrapper>();
-    public static HashMap<Short, String> mapMetaToLocalizedName = new HashMap<Short, String>();
     public static Set<PrefixBlock> setOreNormalBasicTypes = new HashSet<PrefixBlock>();
     
     public GT6OreLayerHelper() {
@@ -29,15 +24,7 @@ public class GT6OreLayerHelper {
         for (IBlockPlacable block: setNormalOreBasicTypesTemp)
             if (block instanceof PrefixBlock)
                 setOreNormalBasicTypes.add((PrefixBlock)block);
-    }
-    
-    public static String getLocalizedOreName(short meta) {
-        // meta==-1 means OreDictMaterial is MT.NULL
-        if (meta==-1)
-            return I18n.format("gtnop.ore.null.name");
-        else
-            return LanguageHandler.getLocalName(OP.ore, CS.BlocksGT.ore.getMetaMaterial(meta));
-    }   
+    }  
     
     public class OreLayerWrapper {
         public String veinName;
@@ -62,14 +49,6 @@ public class GT6OreLayerHelper {
             this.genOverworld = worldGen.mOverworld;
             this.genNether = worldGen.mNether;
             this.genEnd = worldGen.mEnd;
-            if (!mapMetaToLocalizedName.keySet().contains(primaryMeta))
-                mapMetaToLocalizedName.put(primaryMeta, getLocalizedOreName(primaryMeta));
-            if (!mapMetaToLocalizedName.keySet().contains(secondaryMeta))
-                mapMetaToLocalizedName.put(secondaryMeta, getLocalizedOreName(secondaryMeta));
-            if (!mapMetaToLocalizedName.keySet().contains(betweenMeta))
-                mapMetaToLocalizedName.put(betweenMeta, getLocalizedOreName(betweenMeta));
-            if (!mapMetaToLocalizedName.keySet().contains(sporadicMeta))
-                mapMetaToLocalizedName.put(sporadicMeta, getLocalizedOreName(sporadicMeta));
         }    
     } 
     
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT6OreSmallHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT6OreSmallHelper.java
index 33598b0d98..873f049856 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT6OreSmallHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT6OreSmallHelper.java
@@ -10,14 +10,11 @@ import java.util.Set;
 import gregapi.block.IBlockPlacable;
 import gregapi.block.prefixblock.PrefixBlock;
 import gregapi.data.CS;
-import gregapi.data.MT;
 import gregapi.data.OP;
-import gregapi.lang.LanguageHandler;
 import gregapi.oredict.OreDictMaterial;
 import gregapi.worldgen.WorldgenObject;
 import gregapi.worldgen.Worldgen_GT_Ore_SmallPieces;
 import gregapi.worldgen.Worldgenerator;
-import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
 
@@ -26,7 +23,6 @@ public class GT6OreSmallHelper {
     public static HashMap<String, OreSmallWrapper> mapOreSmallWrapper = new HashMap<String, OreSmallWrapper>();
     public static HashMap<String, Short> mapOreDropUnlocalizedNameToOreMeta = new HashMap<String, Short>();
     public static HashMap<Short, List<ItemStack>> mapOreMetaToOreDrops = new HashMap<Short, List<ItemStack>>();    
-    public static HashMap<Short, String> mapMetaToLocalizedName = new HashMap<Short, String>();
     public static Set<PrefixBlock> setOreSmallBasicTypes = new HashSet<PrefixBlock>();
     
     public GT6OreSmallHelper() {
@@ -61,7 +57,6 @@ public class GT6OreSmallHelper {
                     oreSmallList.add(new ItemStack(oreSmall, 1, meta));
                     mapOreMetaToOreDrops.put(meta, stackList);
                 }
-                mapMetaToLocalizedName.put(meta, getLocalizedSmallOreName(meta));
                 Set<IBlockPlacable> setSmallOreBasicTypesTemp = new HashSet<IBlockPlacable>(CS.BlocksGT.stoneToSmallOres.values());
                 for (IBlockPlacable block: setSmallOreBasicTypesTemp)
                     if (block instanceof PrefixBlock)
@@ -69,14 +64,6 @@ public class GT6OreSmallHelper {
             }
     }
     
-    public static String getLocalizedSmallOreName(short meta) {
-        // meta==-1 means OreDictMaterial is MT.NULL
-        if (meta==-1)
-            return I18n.format("gtnop.ore.null.name");
-        else
-            return LanguageHandler.getLocalName(OP.oreSmall, CS.BlocksGT.oreSmall.getMetaMaterial(meta));
-    }
-    
     public class OreSmallWrapper {
         public String oreGenName;
         public short oreMeta;