Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Smarter space check for buffer.

Browse source
This commit is contained in:
CovertJaguar 2013-05-29 09:49:53 -07:00
parent e43cf0a2b6
commit fa3d0bb7b6
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
common/buildcraft/factory/TileAutoWorkbench.java
View file

@ -19,7 +19,6 @@ import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import buildcraft.core.inventory.StackMergeHelper;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.CraftingHelper;
@ -266,7 +265,7 @@ public class TileAutoWorkbench extends TileBuildCraft implements ISidedInventory
inv.setInventorySlotContents(SLOT_RESULT, result);
// clean fake player inventory (crafting handler support)
for (IInvSlot slot : InventoryIterator.getIterable(internalPlayer.inventory, ForgeDirection.DOWN)) {
for (IInvSlot slot : InventoryIterator.getIterable(internalPlayer.inventory, ForgeDirection.UP)) {
ItemStack stack = slot.getStackInSlot();
if (stack != null) {
slot.setStackInSlot(null);
@ -321,20 +320,20 @@ public class TileAutoWorkbench extends TileBuildCraft implements ISidedInventory
}
/**
* Check if the item exists in the crafting grid.
* Check if there is room for the stack in the crafting grid.
*
* @param input
* @return true if in grid
*/
private boolean gridHasRoomFor(ItemStack input) {
int space = 0;
for (IInvSlot slot : InventoryIterator.getIterable(craftMatrix, ForgeDirection.UP)) {
ItemStack stack = slot.getStackInSlot();
if (MERGE_HELPER.canStacksMerge(stack, input)
&& input.stackSize + stack.stackSize <= craftMatrix.getInventoryStackLimit()) {
return true;
if (MERGE_HELPER.canStacksMerge(stack, input)) {
space += stack.getMaxStackSize() - stack.stackSize;
}
}
return false;
return space >= input.stackSize;
}
/**