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

Facades now store both block id and meta in nbt

Browse source
This commit is contained in:
Alex Binnie 2013-06-14 17:09:11 +01:00
parent 8933df795a
commit d62a0d440c
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/buildcraft/transport/ItemFacade.java
View file

@ -138,10 +138,6 @@ public class ItemFacade extends ItemBuildCraft {
} }
} }
public static int encode(int blockId, int metaData) {
return metaData & 0xF | ((blockId & 0xFFF) << 4);
}
public static int getMetaData(ItemStack stack) { public static int getMetaData(ItemStack stack) {
if(stack.hasTagCompound() && stack.getTagCompound().hasKey("meta")) if(stack.hasTagCompound() && stack.getTagCompound().hasKey("meta"))
return stack.getTagCompound().getInteger("meta"); return stack.getTagCompound().getInteger("meta");
@ -149,6 +145,8 @@ public class ItemFacade extends ItemBuildCraft {
} }
public static int getBlockId(ItemStack stack) { public static int getBlockId(ItemStack stack) {
if(stack.hasTagCompound() && stack.getTagCompound().hasKey("id"))
return stack.getTagCompound().getInteger("id");
return ((stack.getItemDamage() & 0xFFF0) >>> 4); return ((stack.getItemDamage() & 0xFFF0) >>> 4);
} }
@ -200,9 +198,10 @@ public class ItemFacade extends ItemBuildCraft {
} }
public static ItemStack getStack(int blockID, int metadata) { public static ItemStack getStack(int blockID, int metadata) {
ItemStack stack = new ItemStack(BuildCraftTransport.facadeItem, 1, ItemFacade.encode(blockID, 0)); ItemStack stack = new ItemStack(BuildCraftTransport.facadeItem, 1, 0);
NBTTagCompound nbt = new NBTTagCompound("tag"); NBTTagCompound nbt = new NBTTagCompound("tag");
nbt.setInteger("meta", metadata); nbt.setInteger("meta", metadata);
nbt.setInteger("id", blockID);
stack.setTagCompound(nbt); stack.setTagCompound(nbt);
return stack; return stack;
} }