diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 41aa1e5d1ed..052d30c315a 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -764,6 +764,7 @@ gui.mining5=Cobalt gui.mining6=Manyullyn material.wood=Wood +material.wood.display=Wooden material.stone=Stone material.iron=Iron material.flint=Flint @@ -774,6 +775,7 @@ material.netherrack=Netherrack material.slime=Slime material.paper=Paper material.blueslime=BlueSlime +material.blueslime.display=Slime material.cobalt=Cobalt material.ardite=Ardite material.manyullyn=Manyullyn @@ -782,6 +784,7 @@ material.bronze=Bronze material.alumite=Alumite material.steel=Steel material.pigiron=Pigiron +material.pigiron.display=Pig Iron material.thaumium=Thaumium gui.modifier.blaze=Blaze diff --git a/src/main/java/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java index 8cf8343134a..7b768c0a848 100644 --- a/src/main/java/tconstruct/library/TConstructRegistry.java +++ b/src/main/java/tconstruct/library/TConstructRegistry.java @@ -284,7 +284,7 @@ public static void addToolMaterial (int materialID, String materialName, int har * @param materialName * Unique name for data lookup purposes * @param displayName - * Prefix for creative mode tools + * Unused. * @param harvestLevel * The materials which the tool can harvest. Pickaxe levels - 0: * Wood, 1: Stone, 2: Redstone/Diamond, 3: Obsidian, 4: @@ -304,18 +304,12 @@ public static void addToolMaterial (int materialID, String materialName, int har * Spiny. */ + @Deprecated public static void addToolMaterial (int materialID, String materialName, String displayName, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced, float stonebound, String style, String ability) { - ToolMaterial mat = toolMaterials.get(materialID); - if (mat == null) - { - mat = new ToolMaterial(materialName, displayName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, style, ability); - toolMaterials.put(materialID, mat); - toolMaterialStrings.put(materialName, mat); - } - else - throw new IllegalArgumentException("[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName); + logger.warn("[TCon API] Using deprecated addToolMaterial with display name. displayName will be ignored, use languages files for it."); + addToolMaterial(materialID, materialName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, style, ability); } /** diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 72bd81c90c9..3ee60710b93 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -543,7 +543,7 @@ public void getSubItems (Item id, CreativeTabs tab, List list) { Map.Entry pairs = (Map.Entry) iter.next(); tconstruct.library.tools.ToolMaterial material = (tconstruct.library.tools.ToolMaterial) pairs.getValue(); - buildTool((Integer) pairs.getKey(), material.displayName, list); + buildTool((Integer) pairs.getKey(), material.prefixName(), list); } } @@ -553,7 +553,8 @@ public void buildTool (int id, String name, List list) ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, id) : null; Item extra = getExtraItem(); ItemStack extraStack = extra != null ? new ItemStack(extra, 1, id) : null; - ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name + getToolName()); + String completeName = String.format("%s %s", name, getToolName()); + ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, completeName); if (tool != null) { tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); diff --git a/src/main/java/tconstruct/library/tools/ToolMaterial.java b/src/main/java/tconstruct/library/tools/ToolMaterial.java index afb721b769a..94feb7135cc 100644 --- a/src/main/java/tconstruct/library/tools/ToolMaterial.java +++ b/src/main/java/tconstruct/library/tools/ToolMaterial.java @@ -11,7 +11,6 @@ public class ToolMaterial // Reinforced level, shoddy/spiny level, color/style on name public final String materialName; - public final String displayName; public final int harvestLevel; public final int durability; public final int miningspeed; // <-- divided by 100 @@ -23,14 +22,8 @@ public class ToolMaterial public final String ability; public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability) - { - this(name, name + " ", level, durability, speed, damage, handle, reinforced, stonebound, style, ability); - } - - public ToolMaterial(String name, String displayName, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability) { this.materialName = name; - this.displayName = displayName; this.harvestLevel = level; this.durability = durability; this.miningspeed = speed; @@ -47,6 +40,16 @@ public String name () return materialName; } + public String localizedName() { return StatCollector.translateToLocal("material." + materialName.toLowerCase()); } + + public String prefixName() + { + // check if there's a special name, otherwise use the regular one + if(StatCollector.canTranslate(String.format("material.%s.display", materialName.toLowerCase()))) + return StatCollector.translateToLocal(String.format("material.%s.display", materialName.toLowerCase())); + return localizedName(); + } + public int durability () { return this.durability; diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index 5b5299e25d9..716c6d6331d 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -814,7 +814,7 @@ private void modIntegration() void registerMaterials () { - TConstructRegistry.addToolMaterial(0, "Wood", "Wooden ", 1, 97, 350, 0, 1.0F, 0, 0f, "\u00A7e", ""); + TConstructRegistry.addToolMaterial(0, "Wood", 1, 97, 350, 0, 1.0F, 0, 0f, "\u00A7e", ""); TConstructRegistry.addToolMaterial(1, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, "", "materialtraits.stonebound"); TConstructRegistry.addToolMaterial(2, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, "\u00A7f", ""); TConstructRegistry.addToolMaterial(3, "Flint", 1, 171, 525, 2, 0.7F, 0, 0f, "\u00A78", ""); @@ -831,8 +831,8 @@ void registerMaterials () TConstructRegistry.addToolMaterial(14, "Bronze", 2, 550, 800, 2, 1.3F, 1, 0f, "\u00A76", ""); TConstructRegistry.addToolMaterial(15, "Alumite", 4, 700, 800, 3, 1.3F, 2, 0f, "\u00A7d", ""); TConstructRegistry.addToolMaterial(16, "Steel", 4, 750, 1000, 4, 1.3F, 2, 0f, "", ""); - TConstructRegistry.addToolMaterial(17, "BlueSlime", "Slime ", 0, 1200, 150, 0, 2.0F, 0, 0f, "\u00A7b", ""); - TConstructRegistry.addToolMaterial(18, "PigIron", "Pig Iron ", 3, 250, 600, 2, 1.3F, 1, 0f, "\u00A7c", "materialtraits.tasty"); + TConstructRegistry.addToolMaterial(17, "BlueSlime", 0, 1200, 150, 0, 2.0F, 0, 0f, "\u00A7b", ""); + TConstructRegistry.addToolMaterial(18, "PigIron", 3, 250, 600, 2, 1.3F, 1, 0f, "\u00A7c", "materialtraits.tasty"); TConstructRegistry.addBowMaterial(0, 384, 20, 1.0f); // Wood TConstructRegistry.addBowMaterial(1, 10, 80, 0.2f); // Stone diff --git a/src/main/java/tconstruct/tools/gui/PartCrafterGui.java b/src/main/java/tconstruct/tools/gui/PartCrafterGui.java index 545ca9c483c..60c6034a832 100644 --- a/src/main/java/tconstruct/tools/gui/PartCrafterGui.java +++ b/src/main/java/tconstruct/tools/gui/PartCrafterGui.java @@ -72,7 +72,7 @@ void drawMaterialInformation () { topEnum = TConstructRegistry.getMaterial(topID); hasTop = true; - title = "\u00A7n" + topEnum.name(); + title = "\u00A7n" + topEnum.localizedName(); } else hasTop = false; @@ -87,7 +87,7 @@ void drawMaterialInformation () { bottomEnum = TConstructRegistry.getMaterial(bottomID); hasBottom = true; - otherTitle = "\u00A7n" + bottomEnum.name(); + otherTitle = "\u00A7n" + bottomEnum.localizedName(); } else hasBottom = false;