diff --git a/src/main/java/tconstruct/library/crafting/ToolBuilder.java b/src/main/java/tconstruct/library/crafting/ToolBuilder.java index 3d0ef5dc..8946f16a 100644 --- a/src/main/java/tconstruct/library/crafting/ToolBuilder.java +++ b/src/main/java/tconstruct/library/crafting/ToolBuilder.java @@ -268,12 +268,7 @@ public class ToolBuilder { if (name != null && !name.equals("")) { compound.setTag("display", new NBTTagCompound()); - compound.getCompoundTag("display").setString("Name", "\u00A7f" + name); - } - // set a nice default name - else { - compound.setTag("display", new NBTTagCompound()); - compound.getCompoundTag("display").setString("Name", "\u00A7f" + defaultToolName(headMat, item)); + compound.getCompoundTag("display").setString("Name", name); } ToolCraftEvent.NormalTool event = new ToolCraftEvent.NormalTool( diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 10a9696f..7be6a814 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -822,4 +822,10 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq return curTags.equals(prevTags); } // end of TE support section + + @Override + public String getItemStackDisplayName(ItemStack stack) { + String name = ToolBuilder.defaultToolName(stack); + return name != null ? name : super.getItemStackDisplayName(stack); + } } diff --git a/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java b/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java index 5c85edd4..22d4a026 100644 --- a/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java +++ b/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java @@ -6,12 +6,10 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import tconstruct.TConstruct; import tconstruct.library.crafting.ModifyBuilder; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.modifier.IModifyable; import tconstruct.tools.inventory.ToolForgeContainer; -import tconstruct.util.network.ToolStationPacket; /* * Simple class for storing items in the block @@ -67,15 +65,5 @@ public class ToolForgeLogic extends ToolStationLogic implements ISidedInventory output = tryRenameTool(output, name); } inventory[0] = output; - if (output != null && output.hasDisplayName()) { - TConstruct.packetPipeline - .sendToServer(new ToolStationPacket(xCoord, yCoord, zCoord, output.getDisplayName())); - } } - /* - * public void buildTool (String name) { toolName = name; ItemStack tool = - * ToolBuilder.instance.buildTool(inventory[1], inventory[2], inventory[3], inventory[4], name); if (inventory[0] == - * null) inventory[0] = tool; else { NBTTagCompound tags = inventory[0].getTagCompound(); if - * (!tags.getCompoundTag("InfiTool").hasKey("Built")) { inventory[0] = tool; } } } - */ } diff --git a/src/main/java/tconstruct/tools/logic/ToolStationLogic.java b/src/main/java/tconstruct/tools/logic/ToolStationLogic.java index 2e9c45ab..9a52bf1d 100644 --- a/src/main/java/tconstruct/tools/logic/ToolStationLogic.java +++ b/src/main/java/tconstruct/tools/logic/ToolStationLogic.java @@ -9,12 +9,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import mantle.blocks.abstracts.InventoryLogic; -import tconstruct.TConstruct; import tconstruct.library.crafting.ModifyBuilder; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.modifier.IModifyable; import tconstruct.tools.inventory.ToolStationContainer; -import tconstruct.util.network.ToolStationPacket; /* * Simple class for storing items in the block @@ -55,9 +53,25 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory return new ToolStationContainer(inventoryplayer, this); } + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + super.setInventorySlotContents(slot, stack); + if (slot != 0) { + buildTool(toolName); + } + } + + @Override + public ItemStack decrStackSize(int slot, int amount) { + ItemStack itemstack = super.decrStackSize(slot, amount); + if (slot != 0) { + buildTool(toolName); + } + return itemstack; + } + @Override public void markDirty() { - buildTool(toolName); if (this.worldObj != null) { this.blockMetadata = this.worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord); this.worldObj.markTileEntityChunkModified(this.xCoord, this.yCoord, this.zCoord, this); @@ -91,10 +105,6 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory output = tryRenameTool(output, name); } inventory[0] = output; - if (output != null && output.hasDisplayName()) { - TConstruct.packetPipeline - .sendToServer(new ToolStationPacket(xCoord, yCoord, zCoord, output.getDisplayName())); - } } public void setToolname(String name) { @@ -107,10 +117,6 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory if (output != null) temp = output; else temp = inventory[1].copy(); - if (temp == null) { - return null; // output is null or not a tool :( - } - NBTTagCompound tags = temp.getTagCompound(); if (tags == null) { tags = new NBTTagCompound(); @@ -118,17 +124,16 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory } NBTTagCompound display = null; - if (!(tags.hasKey("display"))) display = new NBTTagCompound(); - else if (tags.getCompoundTag("display").hasKey("Name")) display = tags.getCompoundTag("display"); - - if (display == null) return output; + if (tags.hasKey("display") && tags.getCompoundTag("display").hasKey("Name")) + display = tags.getCompoundTag("display"); boolean doRename = false; - if (canRename(display, temp)) { + if (display == null) { + display = new NBTTagCompound(); doRename = true; } // we only allow renaming with a nametag otherwise - else if (!("\u00A7f" + name).equals(display.getString("Name")) && !name.equals(display.getString("Name"))) { + else if (!name.equals(display.getString("Name"))) { int nametagCount = 0; for (ItemStack itemStack : inventory) if (itemStack != null && itemStack.getItem() == Items.name_tag) nametagCount++; @@ -138,8 +143,7 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory if (!doRename) return output; - String dName = temp.getItem() instanceof IModifyable ? "\u00A7f" + name : name; - display.setString("Name", dName); + display.setString("Name", name); tags.setTag("display", display); temp.setRepairCost(2); output = temp; diff --git a/src/main/resources/assets/tinker/manuals/zh_CN/diary.xml b/src/main/resources/assets/tinker/manuals/zh_CN/diary.xml index b68368a3..9a10f665 100644 --- a/src/main/resources/assets/tinker/manuals/zh_CN/diary.xml +++ b/src/main/resources/assets/tinker/manuals/zh_CN/diary.xml @@ -123,6 +123,7 @@ 日记 #21: 有些工具比我想象中有用。给武器加上烈焰粉给予它燃烧的效果。青金石有能在同一区域找到更多材料的奇怪能力,即使我知道那里有多少。 + 日记 #22: 我有了一些做工具的点子,需要一块大的地方来试验。熔炉的能力有限,我需要许多石头。将岩浆煤炭和地狱岩结合似乎能立刻处理石头,已经不需要熔炉了。 @@ -130,35 +131,22 @@ 日记 #23: - -今天我做了个奇怪的东西。它是圆的木头的而且不像我所见过的任何东西。来的人说这是“轮子”,能轻松转动起来,我很好奇他还能做什么? +我的工具散的到处都是每个都标记了用途。为了不分散我决定做个地方来存放它们 日记 #24: -我多做了些轮子以实验。让它们到处转动着跑,成对的转动, 有一个停在了我的船边。我觉得真该将它们放在一起。 +我今天去探索发现了些新的矿物。他们有我未见过的颜色,而且不能像铁那样粉碎处理。我该怎么做? + -日记 #25: - -我觉得我在做些什么,将船和轮子结合使它看起来像辆矿车,只有我能驾驭它,虽然有点小。。 - -日记 #26: - -我的工具散的到处都是每个都标记了用途。为了不分散我决定做个地方来存放它们 - - -日记 #27: - -我今天去探索发现了些新的矿物。他们有我未见过的颜色,而且不能像铁那样粉碎处理。我该怎么做? - -日记 #28: + +日记 #25: 普通熔炉取暖很容易,但它产出的金属还需要加工。我挖了个坑铺上粘土,在附近弄了些岩浆,然后把矿物放在里面,在设计上做些改动,结果很有趣。 - - -我加的岩浆越多材料就越热。最终全都熔化, 我破坏了槽的一部分尝试得到材料,但它跑的到处都是。还有一些残留着。 -原矿中仍有部分是石头,一定有方法去除它们 +我加的岩浆越多材料就越热。最终全都熔化, 我破坏了槽的一部分尝试得到材料,但它跑的到处都是。还有一些残留着。 + +原矿中仍有部分是石头,一定有方法去除它们