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

Fixed manipulator crate input

Browse source
This commit is contained in:
Robert Seifert 2013-05-15 22:54:58 -04:00
parent e6a35a6a72
commit b2a712b89e
3 changed files with 54 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -350,14 +350,14 @@ public class BlockCrate extends BlockALMachine
{
ItemStack slotStack = tileEntity.getStackInSlot(slot);
int insertStackSize = Math.min(Math.min(itemStack.getItem().getItemStackLimit(), tileEntity.getInventoryStackLimit()), itemStack.stackSize);
int insertStackSize = Math.min(Math.min(itemStack.getMaxStackSize(), tileEntity.getInventoryStackLimit()), itemStack.stackSize);
if (slotStack != null)
{
if (slotStack.stackSize < slotStack.getItem().getItemStackLimit())
{
insertStackSize = Math.min(insertStackSize, Math.min(slotStack.getItem().getItemStackLimit() - slotStack.stackSize, 0));
tileEntity.setInventorySlotContents(slot, new ItemStack(itemStack.itemID, insertStackSize, itemStack.getItemDamage()));
insertStackSize = Math.min(insertStackSize, Math.max(slotStack.getMaxStackSize() - slotStack.stackSize, 0));
tileEntity.setInventorySlotContents(slot, new ItemStack(itemStack.itemID, slotStack.stackSize + insertStackSize, itemStack.getItemDamage()));
itemStack.stackSize -= insertStackSize;
}
}
@ -366,7 +366,7 @@ public class BlockCrate extends BlockALMachine
tileEntity.setInventorySlotContents(slot, new ItemStack(itemStack.itemID, insertStackSize, itemStack.getItemDamage()));
itemStack.stackSize -= insertStackSize;
}
if (itemStack.stackSize <= 0)
if (itemStack == null || itemStack.stackSize <= 0)
{
return null;
}

2
src/minecraft/assemblyline/common/block/TileEntityCrate.java
View file

@ -63,7 +63,7 @@ public class TileEntityCrate extends TileEntityAdvanced implements ITier, IInven
for (int i = 0; i < this.items.length; i++)
{
ItemStack stack = this.items[i];
if (stack != null && stack.itemID != 0)
if (stack != null && stack.itemID > 0 && stack.stackSize > 0)
{
id = this.items[i].itemID;
meta = this.items[i].getItemDamage();

59
src/minecraft/assemblyline/common/machine/TileEntityManipulator.java
View file

@ -89,7 +89,8 @@ public class TileEntityManipulator extends TileEntityFilterable implements IRota
}
/**
* Find items going into the manipulator and input them into an inventory behind this manipulator.
* Find items going into the manipulator and input them into an inventory behind this
* manipulator.
*/
@Override
public void inject()
@ -110,7 +111,10 @@ public class TileEntityManipulator extends TileEntityFilterable implements IRota
*/
if (outputPosition.getTileEntity(this.worldObj) instanceof TileEntityManipulator)
{
if (((TileEntityManipulator) outputPosition.getTileEntity(this.worldObj)).getDirection() == this.getDirection().getOpposite()) { return; }
if (((TileEntityManipulator) outputPosition.getTileEntity(this.worldObj)).getDirection() == this.getDirection().getOpposite())
{
return;
}
}
AxisAlignedBB bounds = AxisAlignedBB.getBoundingBox(inputPosition.x, inputPosition.y, inputPosition.z, inputPosition.x + 1, inputPosition.y + 1, inputPosition.z + 1);
@ -122,7 +126,8 @@ public class TileEntityManipulator extends TileEntityFilterable implements IRota
continue;
/**
* Try top first, then bottom, then the sides to see if it is possible to insert the item into a inventory.
* Try top first, then bottom, then the sides to see if it is possible to insert the
* item into a inventory.
*/
ItemStack remainingStack = entity.getEntityItem().copy();
@ -265,25 +270,47 @@ public class TileEntityManipulator extends TileEntityFilterable implements IRota
{
itemStack = this.addStackToInventory(i, chest, itemStack);
if (itemStack == null)
{
return null;
}
}
}
}
}
else if (tileEntity instanceof TileEntityCrate)
{
return BlockCrate.addStackToCrate((TileEntityCrate) tileEntity, itemStack);
return BlockCrate.addStackToCrate((TileEntityCrate) tileEntity, itemStack);
}
else if (tileEntity instanceof net.minecraft.inventory.ISidedInventory)
{
net.minecraft.inventory.ISidedInventory inventory = (net.minecraft.inventory.ISidedInventory) tileEntity;
int[] slots = inventory.getAccessibleSlotsFromSide(direction.getOpposite().ordinal());
for (int i = 0; i < slots.length; i++)
{
if (inventory.canInsertItem(slots[i], itemStack, direction.getOpposite().ordinal()))
{
itemStack = this.addStackToInventory(i, inventory, itemStack);
}
if (itemStack == null)
{
return null;
}
}
}
else if (tileEntity instanceof ISidedInventory)
{
ISidedInventory inventory = (ISidedInventory) tileEntity;
int startIndex = inventory.getStartInventorySide(direction);
int startIndex = inventory.getStartInventorySide(direction.getOpposite());
for (int i = startIndex; i < startIndex + inventory.getSizeInventorySide(direction); i++)
{
itemStack = this.addStackToInventory(i, inventory, itemStack);
if (itemStack == null) { return null; }
if (itemStack == null)
{
return null;
}
}
}
else if (tileEntity instanceof IInventory)
@ -293,12 +320,18 @@ public class TileEntityManipulator extends TileEntityFilterable implements IRota
for (int i = 0; i < inventory.getSizeInventory(); i++)
{
itemStack = this.addStackToInventory(i, inventory, itemStack);
if (itemStack == null) { return null; }
if (itemStack == null)
{
return null;
}
}
}
}
if (itemStack.stackSize <= 0) { return null; }
if (itemStack.stackSize <= 0)
{
return null;
}
return itemStack;
}
@ -312,7 +345,10 @@ public class TileEntityManipulator extends TileEntityFilterable implements IRota
if (stackInInventory == null)
{
inventory.setInventorySlotContents(slotIndex, itemStack);
if (inventory.getStackInSlot(slotIndex) == null) { return itemStack; }
if (inventory.getStackInSlot(slotIndex) == null)
{
return itemStack;
}
return null;
}
else if (stackInInventory.isItemEqual(itemStack) && stackInInventory.isStackable())
@ -326,7 +362,10 @@ public class TileEntityManipulator extends TileEntityFilterable implements IRota
}
}
if (itemStack.stackSize <= 0) { return null; }
if (itemStack.stackSize <= 0)
{
return null;
}
return itemStack;
}