Remove all tool-build messages (no more IDs) and its config option

SlimeKnights · Aug 8, 2014 · cf0d0cc · cf0d0cc
1 parent 92ab16e
commit cf0d0cc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 61 deletions.
diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java
@@ -103,15 +103,7 @@ public void getSubItems (Item id, CreativeTabs tab, List list)
         Item extra = getExtraItem();
         ItemStack extraStack = extra != null ? new ItemStack(extra, 1, 0) : null;
         ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, 3), new ItemStack(getHandleItem(), 1, 0), accessoryStack, extraStack, "");
-        if (tool == null)
-        {
-            if (!TinkerTools.supressMissingToolLogs)
-            {
-                TConstruct.logger.warn("Creative builder failed tool for Vanilla style" + this.getToolName());
-                TConstruct.logger.warn("Make sure you do not have item ID conflicts");
-            }
-        }
-        else
+        if (tool != null)
         {
             tool.stackSize = 1;
             tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);
@@ -126,18 +118,7 @@ public void getSubItems (Item id, CreativeTabs tab, List list)
         tool = ToolBuilder.instance
                 .buildTool(new ItemStack(getHeadItem(), 1, random.nextInt(18)), new ItemStack(getHandleItem(), 1, random.nextInt(18)), accessoryStack, extraStack, StatCollector.translateToLocal("item.tool.randomarrow"));
 
-        if (tool == null)
-        {
-            if (!TinkerTools.supressMissingToolLogs)
-            {
-                if (!TinkerTools.supressMissingToolLogs)
-                {
-                    TConstruct.logger.warn("Creative builder failed tool for Vanilla style" + this.getToolName());
-                    TConstruct.logger.warn("Make sure you do not have item ID conflicts");
-                }
-            }
-        }
-        else
+        if (tool != null)
         {
             tool.stackSize = 1;
             tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);
@@ -154,12 +135,7 @@ public void buildTool (int id, String name, List list)
         Item extra = getExtraItem();
         ItemStack extraStack = extra != null ? new ItemStack(getExtraItem(), 1, id) : null;
         ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name + getToolName());
-        if (tool == null)
-        {
-            TConstruct.logger.warn("Creative builder failed tool for " + name + this.getToolName());
-            TConstruct.logger.warn("Make sure you do not have item ID conflicts");
-        }
-        else
+        if (tool != null)
         {
             tool.stackSize = 1;
             tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);

diff --git a/src/main/java/tconstruct/items/tools/BowBase.java b/src/main/java/tconstruct/items/tools/BowBase.java
@@ -776,17 +776,9 @@ public void buildTool (int id, String name, List list)
         ItemStack extraStack = extra != null ? new ItemStack(getExtraItem(), 1, id) : null;
         ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, 0), accessoryStack, extraStack, name + getToolName());
         if (tool == null)
-        {
-            if (!TinkerTools.supressMissingToolLogs)
-            {
-                TConstruct.logger.warn("Creative builder failed tool for " + name + this.getToolName());
-                TConstruct.logger.warn("Make sure you do not have item ID conflicts");
-            }
-        }
-        else
-        {
-            tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);
-            list.add(tool);
-        }
+            return;
+
+        tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);
+        list.add(tool);
     }
 }
diff --git a/src/main/java/tconstruct/items/tools/Mattock.java b/src/main/java/tconstruct/items/tools/Mattock.java
@@ -120,15 +120,7 @@ public void buildTool (int id, String name, List list)
             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());
-            if (tool == null)
-            {
-                if (!TinkerTools.supressMissingToolLogs)
-                {
-                    TConstruct.logger.warn("Creative builder failed tool for " + name + this.getToolName());
-                    TConstruct.logger.warn("Make sure you do not have item ID conflicts");
-                }
-            }
-            else
+            if (tool != null)
             {
                 tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);
                 list.add(tool);

diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java
@@ -555,15 +555,7 @@ public void buildTool (int id, String name, List list)
         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());
-        if (tool == null)
-        {
-            if (!TinkerTools.supressMissingToolLogs)
-            {
-                TConstructRegistry.logger.error("Creative builder failed tool for " + name + this.getToolName());
-                TConstructRegistry.logger.error("Make sure you do not have item ID conflicts");
-            }
-        }
-        else
+        if (tool != null)
         {
             tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);
             list.add(tool);

diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java
@@ -143,9 +143,6 @@ public class TinkerTools
     public static Item knifeBlade;
     public static Item wideGuard;
 
-    // Supresses console spam when iguana's tweaks remove stuff
-    public static boolean supressMissingToolLogs = false;
-
     // Patterns and other materials
     public static Item blankPattern;
     public static Item materials; //TODO: Untwine this item

diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java
@@ -42,7 +42,6 @@ public static void initProps (File location)
         //config.load(); /* Load happens in the constructor */
 
         superfunWorld = config.get("Superfun", "All the world is Superfun", false).getBoolean(false);
-        TinkerTools.supressMissingToolLogs = config.get("Logging", "Disable tool build messages", false).getBoolean(false);
 
         keepHunger = config.get("Difficulty Changes", "Keep hunger on death", true).getBoolean(true);
         keepLevels = config.get("Difficulty Changes", "Keep levels on death", true).getBoolean(true);