fixed blueprints names problems in client/server, fix #1566
This commit is contained in:
parent
fea765d875
commit
ee854df500
5 changed files with 10 additions and 7 deletions
|
@ -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")
|
||||
+ " "
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue