upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-10-26 14:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bernhard Bonigl committed 2014-08-08 10:26:51 +02:00
1 parent 92ab16edec
commit cf0d0cc0dd
6 files changed
+9 -61
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/items/tools/Arrow.java
+3 -27
View File
@@ -103,15 +103,7 @@ public class Arrow extends ToolCore
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 class Arrow extends ToolCore
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 class Arrow extends ToolCore
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);
src/main/java/tconstruct/items/tools/BowBase.java
+4 -12
View File
@@ -776,17 +776,9 @@ public abstract class BowBase extends ToolCore
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);
}
}
src/main/java/tconstruct/items/tools/Mattock.java
+1 -9
View File
@@ -120,15 +120,7 @@ public class Mattock extends DualHarvestTool
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);
src/main/java/tconstruct/library/tools/ToolCore.java
+1 -9
View File
@@ -555,15 +555,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo
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);
src/main/java/tconstruct/tools/TinkerTools.java
-3
View File
@@ -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
src/main/java/tconstruct/util/config/PHConstruct.java
-1
View File
@@ -42,7 +42,6 @@ public class PHConstruct
//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);