From 40a58add8967781ee1df58cf9ab8818aec7105e2 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 19 Sep 2014 15:44:01 -0700 Subject: [PATCH] Fix #200, Squeezer not working with automation --- .../factory/gadgets/MachineSqueezer.java | 45 ++++++++++++------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index f1bc9e5d2..15e24e659 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -11,6 +11,7 @@ package forestry.factory.gadgets; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; @@ -89,12 +90,15 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I public static class RecipeManager implements ISqueezerManager { public static ArrayList recipes = new ArrayList(); public static HashSet recipeFluids = new HashSet(); + public static HashSet recipeInputs = new HashSet(); @Override public void addRecipe(int timePerItem, ItemStack[] resources, FluidStack liquid, ItemStack remnants, int chance) { recipes.add(new MachineSqueezer.Recipe(timePerItem, resources, liquid, remnants, chance)); if (liquid != null) recipeFluids.add(liquid.getFluid()); + if (resources != null) + recipeInputs.addAll(Arrays.asList(resources)); } @Override @@ -112,6 +116,15 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I return null; } + public static boolean canUse(ItemStack itemStack) { + if (recipeInputs.contains(itemStack)) + return true; + for (ItemStack recipeInput : recipeInputs) + if (StackUtils.isCraftingEquivalent(recipeInput, itemStack)) + return true; + return false; + } + @Override public Map getRecipes() { HashMap recipeList = new HashMap(); @@ -427,12 +440,22 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I return super.hasCustomInventoryName(); } - /** - * TODO: just a specialsource workaround - */ @Override public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - return super.isItemValidForSlot(slotIndex, itemstack); + + if(slotIndex == SLOT_CAN_INPUT) { + return LiquidHelper.isEmptyContainer(itemstack); + } + + if(slotIndex >= SLOT_RESOURCE_1 && slotIndex < SLOT_RESOURCE_1 + SLOTS_RESOURCE_COUNT) { + if (LiquidHelper.isEmptyContainer(itemstack)) + return false; + + if (RecipeManager.canUse(itemstack)) + return true; + } + + return false; } /** @@ -481,19 +504,9 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I if(!super.canPutStackFromSide(slotIndex, itemstack, side)) return false; - if(slotIndex == SLOT_CAN_INPUT) { - return LiquidHelper.isEmptyContainer(itemstack); - } - - if(slotIndex >= SLOT_RESOURCE_1 && slotIndex < SLOT_RESOURCE_1 + SLOTS_RESOURCE_COUNT) { - if (LiquidHelper.isEmptyContainer(itemstack)) - return false; - FluidStack fluid = LiquidHelper.getFluidStackInContainer(itemstack); - return fluid != null && productTank.accepts(fluid.getFluid()); - } - - return false; + return slotIndex == SLOT_CAN_INPUT || (slotIndex >= SLOT_RESOURCE_1 && slotIndex < SLOT_RESOURCE_1 + SLOTS_RESOURCE_COUNT); } + /* ISPECIALINVENTORY */ @Override public int addItem(ItemStack stack, boolean doAdd, ForgeDirection from) {