From 7f5ce21e29a9306c80b0eac6083bfcf50ce65e3a Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Wed, 3 Sep 2014 11:50:57 +0200 Subject: [PATCH] Move material-abilities to the language files. They are DISPLAY ONLY. Don't use them for anything else. --- resources/assets/tinker/lang/en_US.lang | 13 +++--- .../tconstruct/client/pages/MaterialPage.java | 4 +- .../library/TConstructRegistry.java | 9 ++--- .../tconstruct/library/tools/ToolCore.java | 2 +- .../library/tools/ToolMaterial.java | 14 ++++--- .../java/tconstruct/tools/TinkerTools.java | 40 +++++++++---------- 6 files changed, 42 insertions(+), 40 deletions(-) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index d74b4b70..7a198b6a 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -766,18 +766,23 @@ gui.mining6=Manyullyn material.wood=Wood material.wood.display=Wooden material.stone=Stone +material.stone.ability=Stonebound material.iron=Iron material.flint=Flint material.cactus=Cactus +material.cactus.ability=Jagged material.bone=Bone material.obsidian=Obsidian material.netherrack=Netherrack +material.netherrack.ability=Stonebound material.slime=Slime material.paper=Paper +material.paper.ability=Writable material.blueslime=BlueSlime material.blueslime.display=Slime material.cobalt=Cobalt material.ardite=Ardite +material.ardite.ability=Stonebound material.manyullyn=Manyullyn material.copper=Copper material.bronze=Bronze @@ -785,7 +790,9 @@ material.alumite=Alumite material.steel=Steel material.pigiron=Pigiron material.pigiron.display=Pig Iron +material.pigiron.ability=Tasty material.thaumium=Thaumium +material.thaumium.ability=Thaumic gui.modifier.blaze=Blaze gui.modifier.silk=Silk Touch @@ -821,12 +828,6 @@ modifier.tool.lava=Auto-Smelt modifier.tool.necro=Life Steal modifier.tool.beheading=Beheading -materialtraits.stonebound=Stonebound -materialtraits.jagged=Jagged -materialtraits.writable=Writable -materialtraits.tasty=Tasty -materialtraits.thaumic=Thaumic - creativeModLock.tooltip=Target Lock: attribute.name.ammo.attackDamage=Average Shot Damage diff --git a/src/main/java/tconstruct/client/pages/MaterialPage.java b/src/main/java/tconstruct/client/pages/MaterialPage.java index b39f5a3a..60ec51fb 100644 --- a/src/main/java/tconstruct/client/pages/MaterialPage.java +++ b/src/main/java/tconstruct/client/pages/MaterialPage.java @@ -157,9 +157,9 @@ public class MaterialPage extends BookPage String ability = material.ability(); if (!ability.equals("")) { - manual.fonts.drawString(materialTrait + ": " + material.localizedAbility(), localWidth, localHeight + 120 + 10 * offset, 0); + manual.fonts.drawString(materialTrait + ": " + ability, localWidth, localHeight + 120 + 10 * offset, 0); offset++; - if (ability.equals("materialtraits.writable")) + if(material.name().equals("Paper") || material.name().equals("Thaumium")) manual.fonts.drawString(extraMod, localWidth, localHeight + 120 + 10 * offset, 0); } diff --git a/src/main/java/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java index 7b768c0a..5898543f 100644 --- a/src/main/java/tconstruct/library/TConstructRegistry.java +++ b/src/main/java/tconstruct/library/TConstructRegistry.java @@ -262,13 +262,12 @@ public class TConstructRegistry * Spiny. */ - public static void addToolMaterial (int materialID, String materialName, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced, float stonebound, - String style, String ability) + public static void addToolMaterial (int materialID, String materialName, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced, float stonebound, String style) { ToolMaterial mat = toolMaterials.get(materialID); if (mat == null) { - mat = new ToolMaterial(materialName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, style, ability); + mat = new ToolMaterial(materialName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, style); toolMaterials.put(materialID, mat); toolMaterialStrings.put(materialName, mat); } @@ -308,8 +307,8 @@ public class TConstructRegistry 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) { - 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); + logger.warn("[TCon API] Using deprecated addToolMaterial with display name. displayName and ability will be ignored, use languages files for that."); + addToolMaterial(materialID, materialName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, style); } /** diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 143f5f3c..b53b3cd8 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -439,7 +439,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo */ public String getAbilityNameForType (int type) { - return TConstructRegistry.getMaterial(type).localizedAbility(); + return TConstructRegistry.getMaterial(type).ability(); } public String getReinforcedName (int head, int handle, int accessory, int extra, int unbreaking) diff --git a/src/main/java/tconstruct/library/tools/ToolMaterial.java b/src/main/java/tconstruct/library/tools/ToolMaterial.java index 94feb713..09c139f8 100644 --- a/src/main/java/tconstruct/library/tools/ToolMaterial.java +++ b/src/main/java/tconstruct/library/tools/ToolMaterial.java @@ -19,9 +19,8 @@ public class ToolMaterial public final int reinforced; public final float stonebound; public final String tipStyle; - 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) + public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style) { this.materialName = name; this.harvestLevel = level; @@ -32,7 +31,6 @@ public class ToolMaterial this.reinforced = reinforced; this.stonebound = stonebound; this.tipStyle = style; - this.ability = ability; } public String name () @@ -90,10 +88,14 @@ public class ToolMaterial return this.tipStyle; } + /** + * Returns the ability of the tool to display. + * ONLY USE THIS FOR DISPLAY PURPOSES. It is not data you can rely on. Use the material-ids for that. + */ public String ability () { - return this.ability; + if(StatCollector.canTranslate(String.format("material.%s.ability", materialName.toLowerCase()))) + return StatCollector.translateToLocal(String.format("material.%s.ability", materialName.toLowerCase())); + return ""; } - - public String localizedAbility () { return StatCollector.translateToLocal(this.ability); } } diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index bde8f4d9..0eda3168 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -782,7 +782,7 @@ public class TinkerTools TConstruct.logger.info("Thaumcraft detected. Adding thaumium tools."); TinkerTools.thaumcraftAvailable = true; TConstructClientRegistry.addMaterialRenderMapping(31, "tinker", "thaumium", true); - TConstructRegistry.addToolMaterial(MaterialID.Thaumium, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75", "materialtraits.thaumic"); + TConstructRegistry.addToolMaterial(MaterialID.Thaumium, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75"); PatternBuilder.instance.registerFullMaterial(new ItemStack((Item) obj, 1, 2), 2, "Thaumium", new ItemStack(TinkerTools.toolShard, 1, 31), new ItemStack(TinkerTools.toolRod, 1, 31), 31); for (int meta = 0; meta < TinkerTools.patternOutputs.length; meta++) { @@ -814,25 +814,25 @@ public class TinkerTools void registerMaterials () { - TConstructRegistry.addToolMaterial(MaterialID.Wood, "Wood", 1, 97, 350, 0, 1.0F, 0, 0f, "\u00A7e", ""); - TConstructRegistry.addToolMaterial(MaterialID.Stone, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, "", "materialtraits.stonebound"); - TConstructRegistry.addToolMaterial(MaterialID.Iron, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, "\u00A7f", ""); - TConstructRegistry.addToolMaterial(MaterialID.Flint, "Flint", 1, 171, 525, 2, 0.7F, 0, 0f, "\u00A78", ""); - TConstructRegistry.addToolMaterial(MaterialID.Cactus, "Cactus", 1, 150, 500, 2, 1.0F, 0, -1f, "\u00A72", "materialtraits.jagged"); - TConstructRegistry.addToolMaterial(MaterialID.Bone, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, "\u00A7e", ""); - TConstructRegistry.addToolMaterial(MaterialID.Obsidian, "Obsidian", 3, 89, 700, 2, 0.8F, 3, 0f, "\u00A7d", ""); - TConstructRegistry.addToolMaterial(MaterialID.Netherrack,"Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, "\u00A74", "materialtraits.stonebound"); - TConstructRegistry.addToolMaterial(MaterialID.Slime, "Slime", 0, 500, 150, 0, 1.5F, 0, 0f, "\u00A7a", ""); - TConstructRegistry.addToolMaterial(MaterialID.Paper, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, "\u00A7f", "materialtraits.writable"); - TConstructRegistry.addToolMaterial(MaterialID.Cobalt, "Cobalt", 4, 800, 1400, 3, 1.75F, 2, 0f, "\u00A73", ""); - TConstructRegistry.addToolMaterial(MaterialID.Ardite, "Ardite", 4, 500, 800, 3, 2.0F, 0, 2f, "\u00A74", "materialtraits.stonebound"); - TConstructRegistry.addToolMaterial(MaterialID.Manyullyn, "Manyullyn", 5, 1200, 900, 4, 2.5F, 0, 0f, "\u00A75", ""); - TConstructRegistry.addToolMaterial(MaterialID.Copper, "Copper", 1, 180, 500, 2, 1.15F, 0, 0f, "\u00A7c", ""); - TConstructRegistry.addToolMaterial(MaterialID.Bronze, "Bronze", 2, 550, 800, 2, 1.3F, 1, 0f, "\u00A76", ""); - TConstructRegistry.addToolMaterial(MaterialID.Alumite, "Alumite", 4, 700, 800, 3, 1.3F, 2, 0f, "\u00A7d", ""); - TConstructRegistry.addToolMaterial(MaterialID.Steel, "Steel", 4, 750, 1000, 4, 1.3F, 2, 0f, "", ""); - TConstructRegistry.addToolMaterial(MaterialID.BlueSlime, "BlueSlime", 0, 1200, 150, 0, 2.0F, 0, 0f, "\u00A7b", ""); - TConstructRegistry.addToolMaterial(MaterialID.PigIron, "PigIron", 3, 250, 600, 2, 1.3F, 1, 0f, "\u00A7c", "materialtraits.tasty"); + TConstructRegistry.addToolMaterial(MaterialID.Wood, "Wood", 1, 97, 350, 0, 1.0F, 0, 0f, "\u00A7e"); + TConstructRegistry.addToolMaterial(MaterialID.Stone, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, ""); + TConstructRegistry.addToolMaterial(MaterialID.Iron, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, "\u00A7f"); + TConstructRegistry.addToolMaterial(MaterialID.Flint, "Flint", 1, 171, 525, 2, 0.7F, 0, 0f, "\u00A78"); + TConstructRegistry.addToolMaterial(MaterialID.Cactus, "Cactus", 1, 150, 500, 2, 1.0F, 0, -1f, "\u00A72"); + TConstructRegistry.addToolMaterial(MaterialID.Bone, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, "\u00A7e"); + TConstructRegistry.addToolMaterial(MaterialID.Obsidian, "Obsidian", 3, 89, 700, 2, 0.8F, 3, 0f, "\u00A7d"); + TConstructRegistry.addToolMaterial(MaterialID.Netherrack,"Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, "\u00A74"); + TConstructRegistry.addToolMaterial(MaterialID.Slime, "Slime", 0, 500, 150, 0, 1.5F, 0, 0f, "\u00A7a"); + TConstructRegistry.addToolMaterial(MaterialID.Paper, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, "\u00A7f"); + TConstructRegistry.addToolMaterial(MaterialID.Cobalt, "Cobalt", 4, 800, 1400, 3, 1.75F, 2, 0f, "\u00A73"); + TConstructRegistry.addToolMaterial(MaterialID.Ardite, "Ardite", 4, 500, 800, 3, 2.0F, 0, 2f, "\u00A74"); + TConstructRegistry.addToolMaterial(MaterialID.Manyullyn, "Manyullyn", 5, 1200, 900, 4, 2.5F, 0, 0f, "\u00A75"); + TConstructRegistry.addToolMaterial(MaterialID.Copper, "Copper", 1, 180, 500, 2, 1.15F, 0, 0f, "\u00A7c"); + TConstructRegistry.addToolMaterial(MaterialID.Bronze, "Bronze", 2, 550, 800, 2, 1.3F, 1, 0f, "\u00A76"); + TConstructRegistry.addToolMaterial(MaterialID.Alumite, "Alumite", 4, 700, 800, 3, 1.3F, 2, 0f, "\u00A7d"); + TConstructRegistry.addToolMaterial(MaterialID.Steel, "Steel", 4, 750, 1000, 4, 1.3F, 2, 0f, ""); + TConstructRegistry.addToolMaterial(MaterialID.BlueSlime, "BlueSlime", 0, 1200, 150, 0, 2.0F, 0, 0f, "\u00A7b"); + TConstructRegistry.addToolMaterial(MaterialID.PigIron, "PigIron", 3, 250, 600, 2, 1.3F, 1, 0f, "\u00A7c"); TConstructRegistry.addBowMaterial(0, 384, 20, 1.0f); // Wood TConstructRegistry.addBowMaterial(1, 10, 80, 0.2f); // Stone