From 4baf524978ffee574679f49f2ef087d741773631 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Fri, 8 Nov 2013 17:53:58 -0500 Subject: [PATCH] add in boolean for plugins to toggle if they remove tools to supress console spam --- src/tconstruct/common/TContent.java | 1 + src/tconstruct/items/tools/Arrow.java | 18 +++++---- src/tconstruct/items/tools/BowBase.java | 8 +++- src/tconstruct/items/tools/Mattock.java | 43 +++++++++++++--------- src/tconstruct/library/tools/ToolCore.java | 8 +++- 5 files changed, 49 insertions(+), 29 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index c76bb7d1..2a8fa773 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -44,6 +44,7 @@ import tconstruct.util.config.*; public class TContent implements IFuelHandler { + public static boolean supressMissingToolLogs = false; //Patterns and other materials public static Item blankPattern; public static Item materials; diff --git a/src/tconstruct/items/tools/Arrow.java b/src/tconstruct/items/tools/Arrow.java index a3518826..4b6ec7a5 100644 --- a/src/tconstruct/items/tools/Arrow.java +++ b/src/tconstruct/items/tools/Arrow.java @@ -105,8 +105,11 @@ public class Arrow extends ToolCore ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, 3), new ItemStack(getHandleItem(), 1, 0), accessoryStack, extraStack, ""); if (tool == null) { - TConstruct.logger.warning("Creative builder failed tool for Vanilla style" + this.getToolName()); - TConstruct.logger.warning("Make sure you do not have item ID conflicts"); + if (!TContent.supressMissingToolLogs) + { + TConstruct.logger.warning("Creative builder failed tool for Vanilla style" + this.getToolName()); + TConstruct.logger.warning("Make sure you do not have item ID conflicts"); + } } else { @@ -226,9 +229,10 @@ public class Arrow extends ToolCore } } } - - @Override - public boolean isOffhandHandDualWeapon() { - return false; - } + + @Override + public boolean isOffhandHandDualWeapon () + { + return false; + } } diff --git a/src/tconstruct/items/tools/BowBase.java b/src/tconstruct/items/tools/BowBase.java index ff1e8914..1c4cab4a 100644 --- a/src/tconstruct/items/tools/BowBase.java +++ b/src/tconstruct/items/tools/BowBase.java @@ -771,8 +771,12 @@ public abstract class BowBase extends ToolCore ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, 0), accessoryStack, extraStack, name + getToolName()); if (tool == null) { - TConstruct.logger.warning("Creative builder failed tool for " + name + this.getToolName()); - TConstruct.logger.warning("Make sure you do not have item ID conflicts"); + if (!TContent.supressMissingToolLogs) + { + TConstruct.logger.warning("Creative builder failed tool for " + name + this.getToolName()); + TConstruct.logger.warning("Make sure you do not have item ID conflicts"); + + } } else { diff --git a/src/tconstruct/items/tools/Mattock.java b/src/tconstruct/items/tools/Mattock.java index f6c4ed19..c6bb9513 100644 --- a/src/tconstruct/items/tools/Mattock.java +++ b/src/tconstruct/items/tools/Mattock.java @@ -120,8 +120,11 @@ public class Mattock extends DualHarvestTool ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name + getToolName()); if (tool == null) { - TConstruct.logger.warning("Creative builder failed tool for " + name + this.getToolName()); - TConstruct.logger.warning("Make sure you do not have item ID conflicts"); + if (!TContent.supressMissingToolLogs) + { + TConstruct.logger.warning("Creative builder failed tool for " + name + this.getToolName()); + TConstruct.logger.warning("Make sure you do not have item ID conflicts"); + } } else { @@ -141,24 +144,28 @@ public class Mattock extends DualHarvestTool } return true; } - + @Override - public boolean willAllowOffhandWeapon() { - return false; - } + public boolean willAllowOffhandWeapon () + { + return false; + } - @Override - public boolean willAllowShield() { - return false; - } + @Override + public boolean willAllowShield () + { + return false; + } - @Override - public boolean isOffhandHandDualWeapon() { - return false; - } + @Override + public boolean isOffhandHandDualWeapon () + { + return false; + } - @Override - public boolean sheatheOnBack() { - return true; - } + @Override + public boolean sheatheOnBack () + { + return true; + } } \ No newline at end of file diff --git a/src/tconstruct/library/tools/ToolCore.java b/src/tconstruct/library/tools/ToolCore.java index 7ca46995..d0520612 100644 --- a/src/tconstruct/library/tools/ToolCore.java +++ b/src/tconstruct/library/tools/ToolCore.java @@ -28,6 +28,7 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import tconstruct.TConstruct; +import tconstruct.common.TContent; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; @@ -541,8 +542,11 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name + getToolName()); if (tool == null) { - TConstruct.logger.warning("Creative builder failed tool for " + name + this.getToolName()); - TConstruct.logger.warning("Make sure you do not have item ID conflicts"); + if (!TContent.supressMissingToolLogs) + { + TConstruct.logger.warning("Creative builder failed tool for " + name + this.getToolName()); + TConstruct.logger.warning("Make sure you do not have item ID conflicts"); + } } else {