Anvilcraft/buildcraft
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed blueprints names problems in client/server, fix #1566

Browse source
This commit is contained in:
SpaceToad 2014-04-05 15:09:46 +02:00
parent fea765d875
commit ee854df500
5 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/buildcraft/builders/ItemBlueprint.java
View file

@ -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")
+ " "

3
common/buildcraft/builders/ItemBlueprintStandard.java
View file

@ -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;

3
common/buildcraft/builders/ItemBlueprintTemplate.java
View file

@ -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;

1
common/buildcraft/core/blueprints/Blueprint.java
View file

@ -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;
}

1
common/buildcraft/core/blueprints/Template.java
View file

@ -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;
}