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

ISidedInventory done, fixed crash.

Browse source 
CONTRACTOR BASE CODE IS DONE!
This commit is contained in:
Aidan Brady 2013-08-03 19:04:06 -04:00
parent e832a4ae55
commit 05eca54839
1 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/resonantinduction/contractor/TileEntityEMContractor.java
View file

@ -117,7 +117,7 @@ public class TileEntityEMContractor extends TileEntity implements IPacketReceive
if(!(inventoryTile instanceof ISidedInventory)) if(!(inventoryTile instanceof ISidedInventory))
{ {
for(int i = 0; i < inventory.getSizeInventory()-1; i++) for(int i = 0; i <= inventory.getSizeInventory()-1; i++)
{ {
if(inventory.isItemValidForSlot(i, itemStack)) if(inventory.isItemValidForSlot(i, itemStack))
{ {
@ -160,10 +160,45 @@ public class TileEntityEMContractor extends TileEntity implements IPacketReceive
ISidedInventory sidedInventory = (ISidedInventory)inventoryTile; ISidedInventory sidedInventory = (ISidedInventory)inventoryTile;
int[] slots = sidedInventory.getAccessibleSlotsFromSide(facing.ordinal()); int[] slots = sidedInventory.getAccessibleSlotsFromSide(facing.ordinal());
for(int get = 0; get < slots.length-1; get++) for(int get = 0; get <= slots.length-1; get++)
{ {
int slotID = slots[get]; int slotID = slots[get];
if(sidedInventory.isItemValidForSlot(slotID, itemStack) && sidedInventory.canInsertItem(slotID, itemStack, facing.ordinal()))
{
ItemStack inSlot = inventory.getStackInSlot(slotID);
if(inSlot == null)
{
inventory.setInventorySlotContents(slotID, itemStack);
item.setDead();
break;
}
else if(inSlot.isItemEqual(itemStack) && inSlot.stackSize < inSlot.getMaxStackSize())
{
if(inSlot.stackSize+itemStack.stackSize <= inSlot.getMaxStackSize())
{
ItemStack toSet = itemStack.copy();
toSet.stackSize+=inSlot.stackSize;
inventory.setInventorySlotContents(slotID, toSet);
item.setDead();
break;
}
else {
int rejects = (inSlot.stackSize+itemStack.stackSize) - inSlot.getMaxStackSize();
ItemStack toSet = itemStack.copy();
toSet.stackSize = inSlot.getMaxStackSize();
ItemStack remains = itemStack.copy();
remains.stackSize = rejects;
inventory.setInventorySlotContents(slotID, toSet);
item.setEntityItemStack(remains);
}
}
}
} }
} }
} }