From ee854df500b54dc9acc80b04adcbabd775774a11 Mon Sep 17 00:00:00 2001 From: SpaceToad Date: Sat, 5 Apr 2014 15:09:46 +0200 Subject: [PATCH] fixed blueprints names problems in client/server, fix #1566 --- common/buildcraft/builders/ItemBlueprint.java | 9 ++++----- common/buildcraft/builders/ItemBlueprintStandard.java | 3 ++- common/buildcraft/builders/ItemBlueprintTemplate.java | 3 ++- common/buildcraft/core/blueprints/Blueprint.java | 1 + common/buildcraft/core/blueprints/Template.java | 1 + 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/common/buildcraft/builders/ItemBlueprint.java b/common/buildcraft/builders/ItemBlueprint.java index fab83498..8612b421 100644 --- a/common/buildcraft/builders/ItemBlueprint.java +++ b/common/buildcraft/builders/ItemBlueprint.java @@ -30,16 +30,15 @@ public abstract class ItemBlueprint extends ItemBuildCraft { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) { - BlueprintId blueprint = getId(stack); + if (NBTUtils.getItemData(stack).hasKey("name")) { + String name = NBTUtils.getItemData(stack).getString("name"); - if (blueprint != null) { - if (blueprint.name.equals("")) { + if (name.equals("")) { list.add(String.format(StringUtils.localize("item.blueprint.unnamed"))); } else { - list.add(String.format(blueprint.name)); + list.add(String.format (name)); } - list.add(String.format(StringUtils .localize("item.blueprint.author") + " " diff --git a/common/buildcraft/builders/ItemBlueprintStandard.java b/common/buildcraft/builders/ItemBlueprintStandard.java index 0af21a5d..69c26d1c 100644 --- a/common/buildcraft/builders/ItemBlueprintStandard.java +++ b/common/buildcraft/builders/ItemBlueprintStandard.java @@ -11,6 +11,7 @@ package buildcraft.builders; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import buildcraft.core.utils.NBTUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -25,7 +26,7 @@ public class ItemBlueprintStandard extends ItemBlueprint { @Override public IIcon getIconIndex(ItemStack stack) { - if (getId(stack) == null) { + if (!NBTUtils.getItemData(stack).hasKey("name")) { return cleanBlueprint; } else { return usedBlueprint; diff --git a/common/buildcraft/builders/ItemBlueprintTemplate.java b/common/buildcraft/builders/ItemBlueprintTemplate.java index 04a4ff3f..1afd7498 100644 --- a/common/buildcraft/builders/ItemBlueprintTemplate.java +++ b/common/buildcraft/builders/ItemBlueprintTemplate.java @@ -11,6 +11,7 @@ package buildcraft.builders; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import buildcraft.core.utils.NBTUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -23,7 +24,7 @@ public class ItemBlueprintTemplate extends ItemBlueprint { @Override public IIcon getIconIndex(ItemStack stack) { - if (getId(stack) == null) { + if (!NBTUtils.getItemData(stack).hasKey("name")) { return itemIcon; } else { return usedTemplate; diff --git a/common/buildcraft/core/blueprints/Blueprint.java b/common/buildcraft/core/blueprints/Blueprint.java index 53e33862..0f43c62b 100644 --- a/common/buildcraft/core/blueprints/Blueprint.java +++ b/common/buildcraft/core/blueprints/Blueprint.java @@ -184,6 +184,7 @@ public class Blueprint extends BlueprintBase { NBTTagCompound nbt = NBTUtils.getItemData(stack); id.write (nbt); nbt.setString("author", author); + nbt.setString("name", id.name); return stack; } diff --git a/common/buildcraft/core/blueprints/Template.java b/common/buildcraft/core/blueprints/Template.java index 900c2b37..eb9b3424 100644 --- a/common/buildcraft/core/blueprints/Template.java +++ b/common/buildcraft/core/blueprints/Template.java @@ -88,6 +88,7 @@ public class Template extends BlueprintBase { NBTTagCompound nbt = NBTUtils.getItemData(stack); id.write (nbt); nbt.setString("author", author); + nbt.setString("name", id.name); return stack; }