diff --git a/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java index 3c92191f0d6..5b95918a246 100644 --- a/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java +++ b/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java @@ -281,7 +281,10 @@ public void invalidateInputs() { } protected boolean checkPreviousRecipeDistinct(IItemHandlerModifiable previousBus) { - return previousRecipe != null && previousRecipe.matches(false, previousBus, getInputTank()); + List items = gatherItems(previousBus, getInputTank()); + List fluids = gatherFluids(previousBus, getInputTank()); + + return previousRecipe != null && previousRecipe.matches(false, items, fluids); } protected boolean prepareRecipeDistinct(Recipe recipe) { diff --git a/src/main/java/gregtech/api/util/GTUtility.java b/src/main/java/gregtech/api/util/GTUtility.java index 394d5ea7342..ad626c4c5cb 100644 --- a/src/main/java/gregtech/api/util/GTUtility.java +++ b/src/main/java/gregtech/api/util/GTUtility.java @@ -441,20 +441,14 @@ public int size() { public static void addHandlerToCollection(Collection collection, IItemHandler handler) { for (int i = 0; i < handler.getSlots(); i++) { var stack = handler.getStackInSlot(i); - if (stack.isEmpty()) - continue; - - collection.add(stack); + if (!stack.isEmpty()) collection.add(stack); } } public static void addHandlerToCollection(Collection collection, IMultipleTankHandler handler) { for (var entry : handler.getFluidTanks()) { var fluid = entry.getFluid(); - if (fluid == null) - continue; - - collection.add(fluid); + if (fluid != null) collection.add(fluid); } }