diff --git a/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java index 8cd37265..b48abcea 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java @@ -3,7 +3,6 @@ package crazypants.enderio.machine.capbank; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemArmor; @@ -12,10 +11,11 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.machine.capbank.network.InventoryImpl; +import crazypants.enderio.machine.gui.ContainerEIO; import crazypants.util.BaublesUtil; import crazypants.util.ShadowInventory; -public class ContainerCapBank extends Container { +public class ContainerCapBank extends ContainerEIO { private final TileCapBank tileEntity; private final InventoryImpl inv; @@ -39,33 +39,9 @@ public class ContainerCapBank extends Container { } int armorOffset = 21; - addSlotToContainer(new Slot(inv, 0, 59 + armorOffset, 59) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return inv.isItemValidForSlot(0, itemStack); - } - }); - - addSlotToContainer(new Slot(inv, 1, 79 + armorOffset, 59) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return inv.isItemValidForSlot(1, itemStack); - } - }); - - addSlotToContainer(new Slot(inv, 2, 99 + armorOffset, 59) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return inv.isItemValidForSlot(2, itemStack); - } - }); - - addSlotToContainer(new Slot(inv, 3, 119 + armorOffset, 59) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return inv.isItemValidForSlot(3, itemStack); - } - }); + for(int i = 0; i < 4; i++) { + addSlotToContainer(new SlotImpl(inv, i, 59 + armorOffset + i*20, 59)); + } // add players inventory for (int i = 0; i < 3; ++i) { @@ -225,4 +201,14 @@ public class ContainerCapBank extends Container { return false; } + private static class SlotImpl extends Slot { + public SlotImpl(IInventory inv, int idx, int x, int y) { + super(inv, idx, x, y); + } + + @Override + public boolean isItemValid(ItemStack itemStack) { + return inventory.isItemValidForSlot(getSlotIndex(), itemStack); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java index 17ad8d2d..90c7f1fe 100644 --- a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java @@ -19,7 +19,7 @@ import com.enderio.core.common.util.Util; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; -public abstract class AbstractMachineContainer extends Container { +public abstract class AbstractMachineContainer extends ContainerEIO { protected final AbstractMachineEntity tileEntity; @@ -209,93 +209,6 @@ public abstract class AbstractMachineContainer extends Container { return Collections.emptyList(); } - /** - * Added validation of slot input - */ - @Override - protected boolean mergeItemStack(ItemStack par1ItemStack, int fromIndex, int toIndex, boolean reversOrder) { - - boolean result = false; - int checkIndex = fromIndex; - - if(reversOrder) { - checkIndex = toIndex - 1; - } - - Slot slot; - ItemStack itemstack1; - - if(par1ItemStack.isStackable()) { - - while (par1ItemStack.stackSize > 0 && (!reversOrder && checkIndex < toIndex || reversOrder && checkIndex >= fromIndex)) { - slot = (Slot) this.inventorySlots.get(checkIndex); - itemstack1 = slot.getStack(); - - if (itemstack1 != null && itemstack1.getItem() == par1ItemStack.getItem() - && (!par1ItemStack.getHasSubtypes() || par1ItemStack.getItemDamage() == itemstack1.getItemDamage()) - && ItemStack.areItemStackTagsEqual(par1ItemStack, itemstack1) && slot.isItemValid(par1ItemStack) - && par1ItemStack != itemstack1) { - - int mergedSize = itemstack1.stackSize + par1ItemStack.stackSize; - int maxStackSize = Math.min(par1ItemStack.getMaxStackSize(), slot.getSlotStackLimit()); - if(mergedSize <= maxStackSize) { - par1ItemStack.stackSize = 0; - itemstack1.stackSize = mergedSize; - slot.onSlotChanged(); - result = true; - } else if(itemstack1.stackSize < maxStackSize) { - par1ItemStack.stackSize -= maxStackSize - itemstack1.stackSize; - itemstack1.stackSize = maxStackSize; - slot.onSlotChanged(); - result = true; - } - } - - if(reversOrder) { - --checkIndex; - } else { - ++checkIndex; - } - } - } - - if(par1ItemStack.stackSize > 0) { - if(reversOrder) { - checkIndex = toIndex - 1; - } else { - checkIndex = fromIndex; - } - - while (!reversOrder && checkIndex < toIndex || reversOrder && checkIndex >= fromIndex) { - slot = (Slot) this.inventorySlots.get(checkIndex); - itemstack1 = slot.getStack(); - - if(itemstack1 == null && slot.isItemValid(par1ItemStack)) { - ItemStack in = par1ItemStack.copy(); - in.stackSize = Math.min(in.stackSize, slot.getSlotStackLimit()); - - slot.putStack(in); - slot.onSlotChanged(); - if(in.stackSize >= par1ItemStack.stackSize) { - par1ItemStack.stackSize = 0; - } else { - par1ItemStack.stackSize -= in.stackSize; - } - result = true; - break; - } - - if(reversOrder) { - --checkIndex; - } else { - ++checkIndex; - } - } - } - - return result; - } - protected int getProgressScaled(int scale) { if(getTileEntity() instanceof IProgressTile) { Util.getProgressScaled(scale, (IProgressTile) getTileEntity()); diff --git a/src/main/java/crazypants/enderio/machine/gui/ContainerEIO.java b/src/main/java/crazypants/enderio/machine/gui/ContainerEIO.java new file mode 100644 index 00000000..0e6b9316 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/gui/ContainerEIO.java @@ -0,0 +1,96 @@ +package crazypants.enderio.machine.gui; + +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public abstract class ContainerEIO extends Container { + + /** + * Added validation of slot input + */ + @Override + protected boolean mergeItemStack(ItemStack par1ItemStack, int fromIndex, int toIndex, boolean reversOrder) { + + boolean result = false; + int checkIndex = fromIndex; + + if(reversOrder) { + checkIndex = toIndex - 1; + } + + Slot slot; + ItemStack itemstack1; + + if(par1ItemStack.isStackable()) { + + while (par1ItemStack.stackSize > 0 && (!reversOrder && checkIndex < toIndex || reversOrder && checkIndex >= fromIndex)) { + slot = (Slot) this.inventorySlots.get(checkIndex); + itemstack1 = slot.getStack(); + + if (itemstack1 != null && itemstack1.getItem() == par1ItemStack.getItem() + && (!par1ItemStack.getHasSubtypes() || par1ItemStack.getItemDamage() == itemstack1.getItemDamage()) + && ItemStack.areItemStackTagsEqual(par1ItemStack, itemstack1) && slot.isItemValid(par1ItemStack) + && par1ItemStack != itemstack1) { + + int mergedSize = itemstack1.stackSize + par1ItemStack.stackSize; + int maxStackSize = Math.min(par1ItemStack.getMaxStackSize(), slot.getSlotStackLimit()); + if(mergedSize <= maxStackSize) { + par1ItemStack.stackSize = 0; + itemstack1.stackSize = mergedSize; + slot.onSlotChanged(); + result = true; + } else if(itemstack1.stackSize < maxStackSize) { + par1ItemStack.stackSize -= maxStackSize - itemstack1.stackSize; + itemstack1.stackSize = maxStackSize; + slot.onSlotChanged(); + result = true; + } + } + + if(reversOrder) { + --checkIndex; + } else { + ++checkIndex; + } + } + } + + if(par1ItemStack.stackSize > 0) { + if(reversOrder) { + checkIndex = toIndex - 1; + } else { + checkIndex = fromIndex; + } + + while (!reversOrder && checkIndex < toIndex || reversOrder && checkIndex >= fromIndex) { + slot = (Slot) this.inventorySlots.get(checkIndex); + itemstack1 = slot.getStack(); + + if(itemstack1 == null && slot.isItemValid(par1ItemStack)) { + ItemStack in = par1ItemStack.copy(); + in.stackSize = Math.min(in.stackSize, slot.getSlotStackLimit()); + + slot.putStack(in); + slot.onSlotChanged(); + if(in.stackSize >= par1ItemStack.stackSize) { + par1ItemStack.stackSize = 0; + } else { + par1ItemStack.stackSize -= in.stackSize; + } + result = true; + break; + } + + if(reversOrder) { + --checkIndex; + } else { + ++checkIndex; + } + } + } + + return result; + } + +}