Clean up GUI stuff for tools! \o/

SlimeKnights · Oct 28, 2014 · 159b772 · 159b772
1 parent e646958
commit 159b772
Show file tree

Hide file tree

Showing 2 changed files with 235 additions and 317 deletions.
diff --git a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java
@@ -22,6 +22,7 @@
 import tconstruct.library.accessory.AccessoryCore;
 import tconstruct.library.armor.ArmorCore;
 import tconstruct.library.crafting.PatternBuilder;
+import tconstruct.library.modifier.IModifyable;
 import tconstruct.library.tools.*;
 import tconstruct.library.util.HarvestLevels;
 import tconstruct.tools.logic.CraftingStationLogic;
@@ -34,15 +35,6 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler
     public GuiTextField text;
     public String title, body = "";
     CraftingStationLogic logic;
-
-    boolean hasMaterial;
-    boolean hasTool;
-    boolean hasArmor;
-    boolean hasAccessory;
-    ItemStack centerStack;
-    ToolMaterial materialEnum;
-    String centerTitle;
-    NBTTagCompound tags;
 
     public static final int CHEST_WIDTH = 116;
 
@@ -139,30 +131,29 @@ else if (logic.isStackInSlot(5)) // center slot if no output item
 
     void drawToolStats (ItemStack stack)
     {
-        ToolStationGuiHelper.drawToolStats(stack, descTextLeft + 10, 0);
+        if(stack.getItem() instanceof IModifyable)
+            ToolStationGuiHelper.drawToolStats(stack, descTextLeft + 10, 0);
 
-        if (centerStack != stack)
-        {
-            centerStack = stack;
-            hasAccessory = hasArmor = hasMaterial = hasTool = false;
 
-            int matID = PatternBuilder.instance.getPartID(stack);
+        int matID = PatternBuilder.instance.getPartID(stack);
 
-            if (matID != Short.MAX_VALUE)
-            {
-                materialEnum = TConstructRegistry.getMaterial(matID);
-                hasMaterial = true;
-                centerTitle = "\u00A7n" + materialEnum.localizedName();
+        if (matID != Short.MAX_VALUE && matID > 0)
+        {
+            ToolMaterial material = TConstructRegistry.getMaterial(matID);
 
-                drawMaterialStats();
-            }
+            if(material != null)
+                drawMaterialStats(material);
         }
     }
 
-    protected void drawMaterialStats()
+    protected void drawMaterialStats(ToolMaterial materialEnum)
     {
         final int baseX = descTextLeft + 8;
-        final int baseY = 24;
+        final int baseY = 8;
+
+        String centerTitle = "\u00A7n" + materialEnum.localizedName();
+
+        drawCenteredString(this.fontRendererObj, centerTitle, baseX + 55, baseY, 16777215);
 
         this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter4") + materialEnum.durability(), baseX, baseY + 16, 16777215);
         this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter5") + materialEnum.handleDurability() + "x", baseX, baseY + 27, 16777215);