Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Item Crate can add items to Block Crate

Browse source 
If you have a crate, with items in it, clicking on a create that is
empty or contains the same item will result in the held crate giving
some of its items to the block crate. So far now bugs but futhur testing
will be need to make sure that the max limit is held as well as the item
crate can still be used.

Also not sure why the two computer craft api files think there new.
This commit is contained in:
Rseifert 2013-02-01 01:55:12 -05:00
parent 6419ced007
commit a445890fcc
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/minecraft/assemblyline/common/block/BlockCrate.java
View file

@ -49,7 +49,7 @@ public class BlockCrate extends BlockMachine
} }
tileEntity.prevClickTime = world.getWorldTime(); tileEntity.prevClickTime = world.getWorldTime();
// add items
if (side == 1 || (side > 1 && hitY > 0.5)) if (side == 1 || (side > 1 && hitY > 0.5))
{ {
if (allMode) if (allMode)
@ -61,6 +61,7 @@ public class BlockCrate extends BlockMachine
this.insertCurrentItem(tileEntity, player); this.insertCurrentItem(tileEntity, player);
} }
} }
// remove items
else if (side == 0 || (side > 1 && hitY <= 0.5)) else if (side == 0 || (side > 1 && hitY <= 0.5))
{ {
if (allMode) if (allMode)
@ -100,6 +101,18 @@ public class BlockCrate extends BlockMachine
{ {
player.inventory.setInventorySlotContents(player.inventory.currentItem, this.putIn(tileEntity, currentStack)); player.inventory.setInventorySlotContents(player.inventory.currentItem, this.putIn(tileEntity, currentStack));
return true; return true;
}// if the item being used is a create then try to merge the items inside
else if (currentStack.getItem().itemID == AssemblyLine.blockCrate.blockID)
{
ItemStack containedStack = ItemBlockCrate.getContainingItemStack(currentStack);
ItemStack crateStack = tileEntity.getStackInSlot(0);
if (containedStack != null && (crateStack == null || (crateStack != null && containedStack.getItem().itemID == crateStack.getItem().itemID && containedStack.getItemDamage() == crateStack.getItemDamage())))
{
ItemStack returned = this.putIn(tileEntity, containedStack);
ItemBlockCrate.setContainingItemStack(currentStack, returned );
return true;
}
} }
} }

6
src/minecraft/assemblyline/common/block/ItemBlockCrate.java
View file

@ -50,7 +50,7 @@ public class ItemBlockCrate extends ItemBlock
} }
} }
} }
public static void setContainingItemStack(ItemStack itemStack, ItemStack containingStack) public static void setContainingItemStack(ItemStack itemStack, ItemStack containingStack)
{ {
if (itemStack.stackTagCompound == null) if (itemStack.stackTagCompound == null)
@ -66,6 +66,10 @@ public class ItemBlockCrate extends ItemBlock
itemStack.getTagCompound().setTag("Item", itemTagCompound); itemStack.getTagCompound().setTag("Item", itemTagCompound);
itemStack.getTagCompound().setInteger("Count", containingStack.stackSize); itemStack.getTagCompound().setInteger("Count", containingStack.stackSize);
}else
{
itemStack.getTagCompound().setTag("Item", new NBTTagCompound());
itemStack.getTagCompound().setInteger("Count", 0);
} }
} }