diff options
Diffstat (limited to 'src/main/java')
16 files changed, 23 insertions, 72 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 1aa06a39ab..69f9447998 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -420,7 +420,6 @@ public class GT_Mod implements IGT_Mod { new GT_ExtremeDieselFuelLoader().run(); GT_TooltipEventHandler.init(); MinecraftForge.EVENT_BUS.register(new GT_TooltipEventHandler()); - GT_LanguageManager.propagateLocalizationServerSide(); /* * Until this point most crafting recipe additions, and removals, have been buffered. diff --git a/src/main/java/gregtech/api/util/GT_LanguageManager.java b/src/main/java/gregtech/api/util/GT_LanguageManager.java index b134f3c726..d6cd1553eb 100644 --- a/src/main/java/gregtech/api/util/GT_LanguageManager.java +++ b/src/main/java/gregtech/api/util/GT_LanguageManager.java @@ -3,7 +3,6 @@ package gregtech.api.util; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.ReflectionHelper; import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -12,12 +11,9 @@ import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import java.lang.reflect.Field; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import static gregtech.api.enums.GT_Values.E; @@ -41,6 +37,19 @@ public class GT_LanguageManager { public static String[] FACES = {FACE_BOTTOM, FACE_TOP, FACE_LEFT, FACE_FRONT, FACE_RIGHT, FACE_BACK, FACE_NONE}; + private static Map<String, String> stringTranslateLanguageList = null; + + static { + try { + Field fieldStringTranslateLanguageList = ReflectionHelper.findField(net.minecraft.util.StringTranslate.class, "languageList", "field_74816_c"); + Field fieldStringTranslateInstance = ReflectionHelper.findField(net.minecraft.util.StringTranslate.class, "instance", "field_74817_a"); + //noinspection unchecked + stringTranslateLanguageList = (Map<String, String>) fieldStringTranslateLanguageList.get(fieldStringTranslateInstance.get(null)); + } catch (Exception e) { + e.printStackTrace(); + } + } + public static String addStringLocalization(String aKey, String aEnglish) { return addStringLocalization(aKey, aEnglish, true); @@ -52,6 +61,7 @@ public class GT_LanguageManager { aEnglish = writeToLangFile(aKey, aEnglish); if (!LANGMAP.containsKey(aKey)) { LANGMAP.put(aKey, aEnglish); + addToMCLangList(aKey, aEnglish); } } TEMPMAP.put(aKey.trim(), aEnglish); @@ -62,6 +72,7 @@ public class GT_LanguageManager { Property tProperty = sEnglishFile.get("LanguageFile", aKey, aEnglish); aEnglish = tProperty.getString(); LANGMAP.put(aKey, aEnglish); + addToMCLangList(aKey, aEnglish); } else aEnglish = LANGMAP.get(aKey); } return aEnglish; @@ -400,19 +411,9 @@ public class GT_LanguageManager { addStringLocalization(FACE_NONE, "None"); } - @SuppressWarnings("rawtypes, unchecked") - public static void propagateLocalizationServerSide() { - if (!GT_Values.GT.isServerSide()) - return; - try { - Field languageList = ReflectionHelper.findField(net.minecraft.util.StringTranslate.class, "languageList", "field_74816_c"); - Field instance = ReflectionHelper.findField(net.minecraft.util.StringTranslate.class, "instance", "field_74817_a"); - Object m = languageList.get(instance.get(null)); - if (!(m instanceof Map)) - return; - ((Map)m).putAll(LANGMAP); - } catch (Throwable ex) { - ex.printStackTrace(); + private static void addToMCLangList(String aKey, String aEnglish) { + if (stringTranslateLanguageList != null) { + stringTranslateLanguageList.put(aKey, aEnglish); } } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller1.java index c432330f95..af1468396b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller1.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller1.java @@ -31,11 +31,6 @@ public class GT_MetaTileEntity_ConcreteBackfiller1 extends GT_MetaTileEntity_Con } @Override - protected String getCasingName() { - return "Solid Steel Machine Casing"; - } - - @Override protected Materials getFrameMaterial() { return Materials.Steel; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java index d045bd15ff..05646676e7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java @@ -31,11 +31,6 @@ public class GT_MetaTileEntity_ConcreteBackfiller2 extends GT_MetaTileEntity_Con } @Override - protected String getCasingName() { - return "Stable Titanium Machine"; - } - - @Override protected Materials getFrameMaterial() { return Materials.Titanium; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java index e83aba4b1d..52bc0b66e4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java @@ -24,7 +24,7 @@ public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTi } protected GT_Multiblock_Tooltip_Builder createTooltip(String aStructureName) { - String casings = getCasingName() != null ? getCasingName() : "Casing"; + String casings = getCasingBlockItem().get(0).getDisplayName(); final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Concrete Backfiller") diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java index cf9ccdfc35..b98b1f7b81 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java @@ -450,6 +450,7 @@ public abstract class GT_MetaTileEntity_DrillerBase extends GT_MetaTileEntity_En protected abstract ItemList getCasingBlockItem(); + @Deprecated protected String getCasingName() { return null; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill1.java index 840e59a2d4..610c21e89b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill1.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill1.java @@ -31,11 +31,6 @@ public class GT_MetaTileEntity_OilDrill1 extends GT_MetaTileEntity_OilDrillBase } @Override - protected String getCasingName() { - return "Solid Steel Machine Casing"; - } - - @Override protected Materials getFrameMaterial() { return Materials.Steel; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill2.java index 925a063d0b..eab1ebf614 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill2.java @@ -31,11 +31,6 @@ public class GT_MetaTileEntity_OilDrill2 extends GT_MetaTileEntity_OilDrillBase } @Override - protected String getCasingName() { - return "Stable Titanium Machine"; - } - - @Override protected Materials getFrameMaterial() { return Materials.Titanium; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill3.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill3.java index c2b50faacc..738f60544b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill3.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill3.java @@ -31,11 +31,6 @@ public class GT_MetaTileEntity_OilDrill3 extends GT_MetaTileEntity_OilDrillBase } @Override - protected String getCasingName() { - return "Robust Tungstensteel Machine Casing"; - } - - @Override protected Materials getFrameMaterial() { return Materials.TungstenSteel; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java index 83864a99be..9af495bcb3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java @@ -79,7 +79,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D } protected GT_Multiblock_Tooltip_Builder createTooltip(String tierSuffix) { - String casings = getCasingName() != null ? getCasingName() : "Casing"; + String casings = getCasingBlockItem().get(0).getDisplayName(); final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Pump") diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillInfinite.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillInfinite.java index a7d01d0cb1..5eb5333045 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillInfinite.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillInfinite.java @@ -21,7 +21,7 @@ public class GT_MetaTileEntity_OilDrillInfinite extends GT_MetaTileEntity_OilDri @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { - String casings = getCasingName() != null ? getCasingName() : "Casing"; + String casings = getCasingBlockItem().get(0).getDisplayName(); final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Pump") @@ -57,11 +57,6 @@ public class GT_MetaTileEntity_OilDrillInfinite extends GT_MetaTileEntity_OilDri } @Override - protected String getCasingName() { - return "Mining Neutronium Casing"; - } - - @Override protected Materials getFrameMaterial() { return Materials.Neutronium; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java index e94140d5de..ac3e40c5f5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java @@ -33,11 +33,6 @@ public class GT_MetaTileEntity_OreDrillingPlant1 extends GT_MetaTileEntity_OreDr } @Override - protected String getCasingName() { - return "Solid Steel Machine Casing"; - } - - @Override protected Materials getFrameMaterial() { return Materials.Steel; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant2.java index ee286e024d..bf9c628911 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant2.java @@ -33,11 +33,6 @@ public class GT_MetaTileEntity_OreDrillingPlant2 extends GT_MetaTileEntity_OreDr } @Override - protected String getCasingName() { - return "Stable Titanium Machine"; - } - - @Override protected Materials getFrameMaterial() { return Materials.Titanium; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant3.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant3.java index 7c784234ff..411bbef3a7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant3.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant3.java @@ -33,11 +33,6 @@ public class GT_MetaTileEntity_OreDrillingPlant3 extends GT_MetaTileEntity_OreDr } @Override - protected String getCasingName() { - return "Robust Tungstensteel Machine Casing"; - } - - @Override protected Materials getFrameMaterial() { return Materials.TungstenSteel; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java index b393b019f8..d7daea327c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java @@ -33,11 +33,6 @@ public class GT_MetaTileEntity_OreDrillingPlant4 extends GT_MetaTileEntity_OreDr } @Override - protected String getCasingName() { - return "Mining Osmiridium Casing"; - } - - @Override protected Materials getFrameMaterial() { return Materials.Osmiridium; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java index e2d5026551..188525c7c9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java @@ -365,7 +365,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile protected abstract int getBaseProgressTime(); protected GT_Multiblock_Tooltip_Builder createTooltip(String tierSuffix) { - String casings = getCasingName() != null ? getCasingName() : "Casing"; + String casings = getCasingBlockItem().get(0).getDisplayName(); final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Miner") |