From 9287a46dc2982586fa2a7f82d31615bff962e6ee Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Wed, 9 Oct 2013 11:29:10 +0100 Subject: [PATCH] Remove deprecated language loader --- src/tconstruct/common/TProxyCommon.java | 104 +----------------------- 1 file changed, 1 insertion(+), 103 deletions(-) diff --git a/src/tconstruct/common/TProxyCommon.java b/src/tconstruct/common/TProxyCommon.java index c3097584..06a2789f 100644 --- a/src/tconstruct/common/TProxyCommon.java +++ b/src/tconstruct/common/TProxyCommon.java @@ -95,88 +95,12 @@ public class TProxyCommon implements IGuiHandler /* Ties an internal name to a visible one. */ public void addNames () { + // As of 1.6.x, this is now handled by Minecraft itself for the most part. - String langDir = "/assets/tinker/lang/"; - String[] langFiles = { "en_US.xml", "de_DE.xml","pl_Pl.xml", "ru_RU.xml", "zh_CN.xml" }; - - for (String langFile : langFiles) - { - try - { - LanguageRegistry.instance().loadLocalization(langDir + langFile, langFile.substring(langFile.lastIndexOf('/') + 1, langFile.lastIndexOf('.')), true); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - /*for (int mat = 0; mat < materialTypes.length; mat++) - { - for (int type = 0; type < toolMaterialNames.length; type++) - { - String internalName = new StringBuilder().append("item.tconstruct.").append(materialTypes[mat]).append(".").append(toolMaterialNames[type]).append(".name").toString(); - String visibleName = new StringBuilder().append(toolMaterialNames[type]).append(materialNames[mat]).toString(); - LanguageRegistry.instance().addStringLocalization(internalName, "en_US", visibleName); - } - }*/ - - for (int i = 0; i < shardNames.length; i++) - { - String internalName = "item.tconstruct.ToolShard." + toolMaterialNames[i] + ".name"; - String visibleName = shardNames[i]; - LanguageRegistry.instance().addStringLocalization(internalName, "en_US", visibleName); - } - - /*for (int i = 0; i < materialItemNames.length; i++) - { - String internalName = "item.tconstruct.Materials." + materialItemInternalNames[i] + ".name"; - String visibleName = materialItemNames[i]; - LanguageRegistry.instance().addStringLocalization(internalName, "en_US", visibleName); - }*/ - - for (int i = 0; i < patterns.length; i++) - { - String internalName = "item.tconstruct.Pattern." + patterns[i] + ".name"; - String visibleName = patternNames[i] + " Pattern"; - LanguageRegistry.instance().addStringLocalization(internalName, "en_US", visibleName); - internalName = "item.tconstruct.MetalPattern." + patterns[i] + ".name"; - visibleName = patternNames[i] + " Cast"; - LanguageRegistry.instance().addStringLocalization(internalName, "en_US", visibleName); - } - - //LanguageRegistry.addName(TContent.manualBook, "Tinker's Log"); - - //LanguageRegistry.instance().addStringLocalization("entity.TConstruct.UnstableCreeper.name", "en_US", "Nitro Creeper"); - //LanguageRegistry.instance().addStringLocalization("entity.TConstruct.EdibleSlime.name", "en_US", "Blue Slime"); - //LanguageRegistry.instance().addStringLocalization("entity.TConstruct.MetalSlime.name", "en_US", "Metal Slime"); - //LanguageRegistry.instance().addStringLocalization("item.tconstruct.diary.diary.name", "en_US", "Tinker's Log"); - //LanguageRegistry.addName(TContent.blankPattern, "Blank Pattern"); - /*LanguageRegistry.addName(TContent.pickaxe, "Pickaxe"); - LanguageRegistry.addName(TContent.shovel, "Shovel"); - LanguageRegistry.addName(TContent.hatchet, "Hatchet"); - LanguageRegistry.addName(TContent.broadsword, "Broadsword"); - LanguageRegistry.addName(TContent.longsword, "Longsword"); - LanguageRegistry.addName(TContent.rapier, "Rapier"); - LanguageRegistry.addName(TContent.frypan, "Frying Pan"); - LanguageRegistry.addName(TContent.battlesign, "Battlesign"); - LanguageRegistry.addName(TContent.mattock, "Mattock");*/ LanguageRegistry.addName(TContent.potionLauncher, "Potion Launcher"); - /*LanguageRegistry.addName(TContent.dagger, "Dagger"); - LanguageRegistry.addName(TContent.chisel, "Chisel"); - LanguageRegistry.addName(TContent.scythe, "Scythe"); - LanguageRegistry.addName(TContent.lumberaxe, "Lumber Axe"); - LanguageRegistry.addName(TContent.cleaver, "Cleaver"); - LanguageRegistry.addName(TContent.excavator, "Excavator"); - LanguageRegistry.addName(TContent.hammer, "Hammer"); - LanguageRegistry.addName(TContent.battleaxe, "Battleaxe"); - LanguageRegistry.addName(TContent.cutlass, "Cutlass");*/ LanguageRegistry.addName(TContent.knapsack, "Knapsack"); - //LanguageRegistry.addName(TContent.shortbow, "Shortbow"); - //LanguageRegistry.addName(TContent.arrow, "Arrow"); LanguageRegistry.addName(TContent.meatBlock, "Hambone"); - } public void readManuals () @@ -191,34 +115,8 @@ public class TProxyCommon implements IGuiHandler { } - public static final String[] shardNames = new String[] { "Wood", "Stone Shard", "Iron Chunk", "Flint Shard", "Cactus Shard", "Bone", "Obsidian Shard", "Netherrack Shard", - "Slime Crystal Fragment", "Paper", "Cobalt Chunk", "Ardite Chunk", "Manyullyn Chunk", "Copper Chunk", "Bronze Chunk", "Alumite Chunk", "Steel Chunk", "Slime Crystal Fragment" }; - - /*public static final String[] materialItemInternalNames = new String[] { - "IronNugget", - "CopperNugget", "TinNugget", "AluminumNugget", "SilverNugget" }; - - public static final String[] materialItemNames = new String[] { - "Iron Nugget", - "Copper Nugget", "Tin Nugget", "Aluminum Nugget", "Silver Nugget" };*/ - - public static final String[] toolMaterialNames = new String[] { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", - "Copper", "Bronze", "Alumite", "Steel", "Blue Slime", "", "", "", "", "", "", "", "", "", "", "", "", "", "Thaumium" }; - - public static final String[] materialTypes = new String[] { "ToolRod", "PickaxeHead", "ShovelHead", "AxeHead", "SwordBlade", "LargeGuard", "MediumGuard", "Crossbar", "Binding", "FrypanHead", - "SignHead", "LumberHead", "KnifeBlade", "ChiselHead", "ScytheBlade", "LumberHead", "ThickRod", "ThickBinding", "LargeSwordBlade", "LargePlate", "ExcavatorHead", "HammerHead", "FullGuard", - "Bowstring", "Fletching", "Arrowhead" }; - - public static final String[] materialNames = new String[] { " Rod", " Pickaxe Head", " Shovel Head", " Axe Head", " Sword Blade", " Wide Guard", " Hand Guard", " Crossbar", " Binding", " Pan", - " Board", " Broad Axe Head", " Knife Blade", " Chisel Head", " Scythe Blade", " Broad Axe Head", " Tough Tool Rod", " Tough Binding", " Large Sword Blade", " Large Plate", - " Excavator Head", " Hammer Head", " Full Guard", " Bowstring", " Fletching", " Arrowhead" }; - public static final String[] patterns = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "bowstring", "fletching", "arrowhead" }; - - public static final String[] patternNames = new String[] { "Ingot", "Tool Rod", "Pickaxe Head", "Shovel Head", "Axe Head", "Sword Blade", "Wide Guard", "Hand Guard", "Crossbar", "Tool Binding", - "Pan", "Board", "Knife Blade", "Chisel Head", "Tough Tool Rod", "Tough Binding", "Large Plate", "Broad Axe Head", "Scythe Head", "Broad Shovel Head", "Large Blade", "Hammer Head", - "Full Guard", "Bowstring", "Fletching", "Arrowhead" }; public void postInit(){