From 70f710231d5950c2438a46bf1e04affc01bf8128 Mon Sep 17 00:00:00 2001 From: bdew Date: Wed, 9 Sep 2015 11:45:27 +0300 Subject: [PATCH] Changed squeezer recipes to prioritize specific recipes over OD and fixed accepting items --- .../factory/gadgets/MachineSqueezer.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index b53d5ca0b..8afa38983 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -76,8 +76,8 @@ public class MachineSqueezer extends TilePowered implements ISidedInventory, ILi this.chance = chance; } - public boolean matches(ItemStack[] res) { - return StackUtils.containsSets(resources, res, true, true) > 0; + public boolean matches(ItemStack[] res, boolean oreDict) { + return StackUtils.containsSets(resources, res, oreDict, true) > 0; } } @@ -104,8 +104,16 @@ public class MachineSqueezer extends TilePowered implements ISidedInventory, ILi } public static Recipe findMatchingRecipe(ItemStack[] items) { + // First try to match a specific recipe (without OD) for (Recipe recipe : recipes) { - if (recipe.matches(items)) { + if (recipe.matches(items, false)) { + return recipe; + } + } + + // If that fails - try again with oredict support enabled + for (Recipe recipe : recipes) { + if (recipe.matches(items, true)) { return recipe; } } @@ -118,7 +126,7 @@ public class MachineSqueezer extends TilePowered implements ISidedInventory, ILi return true; } for (ItemStack recipeInput : recipeInputs) { - if (StackUtils.isCraftingEquivalent(recipeInput, itemStack)) { + if (StackUtils.isCraftingEquivalent(recipeInput, itemStack, true, true)) { return true; } }