Fix material abilities not getting localized for display

SlimeKnights · Aug 20, 2014 · fc0420d · fc0420d
1 parent 608de3a
commit fc0420d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/tconstruct/client/pages/MaterialPage.java b/src/main/java/tconstruct/client/pages/MaterialPage.java
@@ -156,9 +156,9 @@ public void renderContentLayer (int localWidth, int localHeight, boolean isTrans
         String ability = material.ability();
         if (!ability.equals(""))
         {
-            manual.fonts.drawString(materialTrait + ": " + material.ability(), localWidth, localHeight + 120 + 10 * offset, 0);
+            manual.fonts.drawString(materialTrait + ": " + material.localizedAbility(), localWidth, localHeight + 120 + 10 * offset, 0);
             offset++;
-            if (ability.equals("Writable"))
+            if (ability.equals("materialtraits.writable"))
                 manual.fonts.drawString(extraMod, localWidth, localHeight + 120 + 10 * offset, 0);
         }
 

diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java
@@ -433,9 +433,12 @@ public static String getStyleForType (int type)
         return TConstructRegistry.getMaterial(type).style();
     }
 
+    /**
+     * Returns the localized name of the materials ability. Only use this for display purposes, not for logic.
+     */
     public String getAbilityNameForType (int type)
     {
-        return TConstructRegistry.getMaterial(type).ability();
+        return TConstructRegistry.getMaterial(type).localizedAbility();
     }
 
     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
@@ -1,5 +1,7 @@
 package tconstruct.library.tools;
 
+import net.minecraft.util.StatCollector;
+
 /*
  * Dynamic substitute for an enum. It carries a lot of information
  */
@@ -89,4 +91,6 @@ public String ability ()
     {
         return this.ability;
     }
+
+    public String localizedAbility () { return StatCollector.translateToLocal(this.ability); }
 }