Display Armor/Accessories correctly in toolstations/forges

SlimeKnights · Sep 24, 2014 · c38a249 · c38a249
1 parent b91c0cb
commit c38a249
Show file tree

Hide file tree

Showing 3 changed files with 186 additions and 41 deletions.
diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang
@@ -758,6 +758,8 @@ gui.toolstation15=Mining Level:
 gui.toolstation16=Usage Speed: 
 gui.toolstation17=Modifiers
 gui.toolstation18=Modifiers remaining: 
+gui.toolstation19=Damage Reduction: 
+gui.toolstation20=Protection: 
 
 gui.mining1=Stone
 gui.mining2=Iron

diff --git a/src/main/java/tconstruct/library/armor/ArmorCore.java b/src/main/java/tconstruct/library/armor/ArmorCore.java
@@ -183,14 +183,26 @@ public ArmorProperties getProperties (EntityLivingBase player, ItemStack armor,
         if (tags.getBoolean("Broken"))
             return new ArmorProperties(0, 0, 0);
 
+        double current = getProtection(tags);
+
+        return new ArmorProperties(0, current / 100, 100);
+    }
+
+    public double getProtection(ItemStack stack)
+    {
+        return getProtection(stack.getTagCompound().getCompoundTag(getBaseTagName()));
+    }
+
+    public double getProtection(NBTTagCompound tags)
+    {
         float maxDurability = tags.getInteger("TotalDurability");
         float currentDurability = maxDurability - tags.getInteger("Damage");
         float ratio = currentDurability / maxDurability;
         double base = tags.getDouble("BaseDefense");
         double max = tags.getDouble("MaxDefense");
         double current = (max - base) * ratio + base;
 
-        return new ArmorProperties(0, current / 100, 100);
+        return current;
     }
 
     @Override
@@ -388,7 +400,7 @@ public int getItemMaxDamageFromStackForDisplay (ItemStack stack)
         return tags.getCompoundTag(getBaseTagName()).getInteger("Damage");
     }
 
-    DecimalFormat df = new DecimalFormat("##.#");
+    private DecimalFormat df = new DecimalFormat("##.#");
 
     @Override
     @SideOnly(Side.CLIENT)
@@ -400,12 +412,7 @@ public void addInformation (ItemStack stack, EntityPlayer player, List list, boo
         double protection = 0;
         if (!tags.getBoolean("Broken"))
         {
-            float maxDurability = tags.getInteger("TotalDurability");
-            float currentDurability = maxDurability - tags.getInteger("Damage");
-            float ratio = currentDurability / maxDurability;
-            double base = tags.getDouble("BaseDefense");
-            double max = tags.getDouble("MaxDefense");
-            protection = (max - base) * ratio + base;
+            protection = getProtection(tags);
         }
         if (protection > 0)
             list.add("\u00a77Protection: " + df.format(protection) + "%");