Refactor renaming

This commit is contained in:
Bernhard Bonigl committed 2014-09-01 23:20:56 +02:00
1 parent 8e5fa1118d
commit 7356bf7c93
1 file changed
+29 -30
@@ -113,42 +113,41 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
protected ItemStack tryRenameTool(ItemStack output, String name)
{
ItemStack temp = inventory[1].copy();
ItemStack temp;
if (output != null)
temp = output;
else
temp = inventory[1].copy();
if (temp != null)
if (temp == null)
return null; // output as well as inventory is null :(
NBTTagCompound tags = temp.getTagCompound();
if (tags == null)
{
NBTTagCompound tags = temp.getTagCompound();
if (tags == null)
{
tags = new NBTTagCompound();
temp.setTagCompound(tags);
}
if (!(tags.hasKey("display")))
{
NBTTagCompound display = new NBTTagCompound();
String dName = temp.getItem() instanceof IModifyable ? "\u00A7f" + name : name;
display.setString("Name", dName);
tags.setTag("display", display);
temp.setRepairCost(2);
output = temp;
}
else if(tags.getCompoundTag("display").hasKey("Name"))
{
NBTTagCompound display = tags.getCompoundTag("display");
if(display.getString("Name").equals("\u00A7f" + ToolBuilder.defaultToolName(temp)))
{
String dName = temp.getItem() instanceof IModifyable ? "\u00A7f" + name : name;
display.setString("Name", dName);
tags.setTag("display", display);
temp.setRepairCost(2);
output = temp;
}
}
tags = new NBTTagCompound();
temp.setTagCompound(tags);
}
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(display.hasKey("Name") && !display.getString("Name").equals("\u00A7f" + ToolBuilder.defaultToolName(temp)))
// no default name anymore
return output;
String dName = temp.getItem() instanceof IModifyable ? "\u00A7f" + name : name;
display.setString("Name", dName);
tags.setTag("display", display);
temp.setRepairCost(2);
output = temp;
return output;
}