Fix buffer IO mode handling - #1627

This commit is contained in:
Matthias Mann committed 2015-01-11 00:17:09 +01:00
1 parent a68fd3e450
commit d55d1b231d
2 files changed
+6 -2

No files matched your search

@@ -651,6 +651,10 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi
if(!slotDefinition.isOutputSlot(slot)) {
return false;
}
return canExtractItem(slot, itemstack);
}
protected boolean canExtractItem(int slot, ItemStack itemstack) {
if(inventory[slot] == null || inventory[slot].stackSize < itemstack.stackSize) {
return false;
}
@@ -76,12 +76,12 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl
@Override
public boolean canInsertItem(int slot, ItemStack var2, int side) {
return hasInventory() && super.canInsertItem(slot, var2, side) && getIoMode(ForgeDirection.VALID_DIRECTIONS[side]).canRecieveInput();
return hasInventory() && getIoMode(ForgeDirection.VALID_DIRECTIONS[side]).canRecieveInput() && isMachineItemValidForSlot(slot, var2);
}
@Override
public boolean canExtractItem(int slot, ItemStack itemstack, int side) {
return hasInventory() && super.canExtractItem(slot, itemstack, side) && getIoMode(ForgeDirection.VALID_DIRECTIONS[side]).canOutput();
return hasInventory() && getIoMode(ForgeDirection.VALID_DIRECTIONS[side]).canOutput() && canExtractItem(slot, itemstack);
}
@Override