From 454abdd2ed9e3356d43436a7a7962f1d95e8de8f Mon Sep 17 00:00:00 2001 From: Nirek-K Date: Wed, 15 Jul 2015 20:41:10 -0500 Subject: [PATCH] Restrict Fabricator inventory more like Carpenter. Only accept related items while recipe is active, never accept casts/meltables. --- .../factory/gadgets/MachineFabricator.java | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index cd2c10bd0..1d43f5ff7 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -169,19 +169,6 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT return null; } - public static boolean isInventoryResource(ItemStack resource) - { - if(resource == null) { - return false; - } - - for (Recipe recipe: recipes) { - if (recipe.internal.isIngredient(resource)) { - return true; - } - } - return false; - } public static boolean isPlan(ItemStack plan) { for (Recipe recipe : recipes) { if (StackUtils.isIdenticalItem(recipe.getPlan(), plan)) { @@ -590,10 +577,21 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT return RecipeManager.findMatchingSmelting(itemStack) != null; } else if (slotIndex == SLOT_PLAN) { return RecipeManager.isPlan(itemStack); - } else if (GuiUtil.isIndexInRange(slotIndex, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT)) { - return RecipeManager.isInventoryResource(itemStack); } - return false; + return GuiUtil.isIndexInRange(slotIndex, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); + } + @Override + public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { + if (GuiUtil.isIndexInRange(slotIndex, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT)) { + if (tile.getRecipe() != null) { + return tile.getRecipe().internal.isIngredient(itemStack); + }else if (RecipeManager.isPlan(itemStack) ) { + return false; + }else if (RecipeManager.findMatchingSmelting(itemStack) != null) { + return false; + } + } + return true; } @Override