From fd4c0cfe1c17f00ad7cdb1b52310ae2c850abc7d Mon Sep 17 00:00:00 2001 From: Qowyn Date: Sat, 13 Sep 2014 22:34:12 +0200 Subject: [PATCH] Use default name for tool subItems --- src/main/java/tconstruct/library/tools/ToolCore.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index af2cf0a8..54216dfa 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -536,7 +536,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo { Map.Entry pairs = (Map.Entry) iter.next(); tconstruct.library.tools.ToolMaterial material = (tconstruct.library.tools.ToolMaterial) pairs.getValue(); - buildTool((Integer) pairs.getKey(), material.prefixName(), list); + buildTool((Integer) pairs.getKey(), ToolBuilder.defaultToolName(material, this), list); } } @@ -546,8 +546,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, id) : null; Item extra = getExtraItem(); ItemStack extraStack = extra != null ? new ItemStack(extra, 1, id) : null; - String completeName = String.format("%s %s", name, getLocalizedToolName()); - ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, completeName); + ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name); if (tool != null) { tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);