fix distinct recipe checking + misc

GregTechCEu · Jul 19, 2024 · 026f494 · 026f494
1 parent fc38ac1
commit 026f494
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git 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<ItemStack> items = gatherItems(previousBus, getInputTank());
+ List<FluidStack> 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
@@ -441,20 +441,14 @@ public int size() {
  public static void addHandlerToCollection(Collection<ItemStack> 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<FluidStack> 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);
  }
  }