From f581682158ad998eb8ae95baa8e52c27f643d97a Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Tue, 28 May 2013 19:00:24 -0700 Subject: [PATCH] Added some comments --- .../core/gui/slots/SlotWorkbench.java | 5 ++ .../buildcraft/factory/TileAutoWorkbench.java | 49 ++++++++++++++----- 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/common/buildcraft/core/gui/slots/SlotWorkbench.java b/common/buildcraft/core/gui/slots/SlotWorkbench.java index 23f93422..5185e732 100644 --- a/common/buildcraft/core/gui/slots/SlotWorkbench.java +++ b/common/buildcraft/core/gui/slots/SlotWorkbench.java @@ -13,4 +13,9 @@ public class SlotWorkbench extends SlotBase { public boolean isItemValid(ItemStack stack) { return stack != null && stack.isStackable() && !stack.getItem().hasContainerItem(); } + + @Override + public boolean canShift() { + return false; + } } diff --git a/common/buildcraft/factory/TileAutoWorkbench.java b/common/buildcraft/factory/TileAutoWorkbench.java index 3033147a..34e18685 100644 --- a/common/buildcraft/factory/TileAutoWorkbench.java +++ b/common/buildcraft/factory/TileAutoWorkbench.java @@ -184,19 +184,9 @@ public class TileAutoWorkbench extends TileEntity implements ISidedInventory { if (CoreProxy.proxy.isRenderWorld(worldObj)) { return; } - for (IInvSlot slot : InventoryIterator.getIterable(invBuffer, ForgeDirection.UP)) { - ItemStack stack = slot.getStackInSlot(); - if (stack != null) { - if (gridHasItem(stack)) { - stack.stackSize -= transactor.add(stack, ForgeDirection.DOWN, true).stackSize; - if (stack.stackSize <= 0) { - slot.setStackInSlot(null); - } - } else { - Utils.dropItems(worldObj, stack, xCoord, yCoord + 1, zCoord); - } - } - } + + processHiddenBuffer(); + if (craftSlot == null) { internalPlayer = new InternalPlayer(); craftSlot = new SlotCrafting(internalPlayer, craftMatrix, craftResult, 0, 0, 0); @@ -214,6 +204,28 @@ public class TileAutoWorkbench extends TileEntity implements ISidedInventory { return (progress * i) / CRAFT_TIME; } + /** + * Moves items out of the hidden input buffer into the craft grid. + */ + private void processHiddenBuffer() { + for (IInvSlot slot : InventoryIterator.getIterable(invBuffer, ForgeDirection.UP)) { + ItemStack stack = slot.getStackInSlot(); + if (stack != null) { + if (gridHasItem(stack)) { + stack.stackSize -= transactor.add(stack, ForgeDirection.DOWN, true).stackSize; + if (stack.stackSize <= 0) { + slot.setStackInSlot(null); + } + } else { + Utils.dropItems(worldObj, stack, xCoord, yCoord + 1, zCoord); + } + } + } + } + + /** + * Increment craft job, find recipes, produce output + */ private void updateCrafting() { IRecipe recipe = findRecipe(); if (recipe == null) { @@ -278,6 +290,12 @@ public class TileAutoWorkbench extends TileEntity implements ISidedInventory { return slot == SLOT_RESULT && !isLast(); } + /** + * Check if the item exists in the crafting grid. + * + * @param input + * @return true if in grid + */ private boolean gridHasItem(ItemStack input) { for (IInvSlot slot : InventoryIterator.getIterable(craftMatrix, ForgeDirection.UP)) { ItemStack stack = slot.getStackInSlot(); @@ -288,6 +306,11 @@ public class TileAutoWorkbench extends TileEntity implements ISidedInventory { return false; } + /** + * Returns true if there are only enough inputs for a single craft job. + * + * @return true or false + */ public boolean isLast() { int minStackSize = 64; for (IInvSlot slot : InventoryIterator.getIterable(craftMatrix, ForgeDirection.UP)) {