fix issue with tests and recipe matching

GregTechCEu · Jul 15, 2024 · fc38ac1 · fc38ac1
1 parent 36f6cc7
commit fc38ac1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java
@@ -404,7 +404,7 @@ protected void trySearchNewRecipe() {
  protected boolean checkPreviousRecipe() {
  if (this.previousRecipe == null) return false;
  if (this.previousRecipe.getEUt() > this.getMaxVoltage()) return false;
- return recipeMatch(this.previousRecipe, getInputInventory(), getInputTank());
+ return recipeMatch(this.previousRecipe, false);
  }
 
  /**
@@ -686,15 +686,15 @@ protected boolean setupAndConsumeRecipeInputs(@NotNull Recipe recipe,
  }
 
  this.isOutputsFull = false;
- if (recipeMatch(recipe, importInventory, importFluids)) {
+ if (recipeMatch(recipe, true)) {
  this.metaTileEntity.addNotifiedInput(importInventory);
  return true;
  }
  return false;
  }
 
- protected boolean recipeMatch(Recipe recipe, IItemHandlerModifiable inputItems, IMultipleTankHandler inputFluids) {
- return recipe.matches(true, inputItems, inputFluids);
+ protected boolean recipeMatch(Recipe recipe, boolean shouldConsume) {
+ return recipe.matches(shouldConsume, getInputInventory(), getInputTank());
  }
 
  protected List<ItemStack> gatherItems(IItemHandlerModifiable inputInventory, IMultipleTankHandler inputFluids) {

diff --git a/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java
@@ -261,11 +261,11 @@ protected void trySearchNewRecipeDistinct() {
  }
 
  @Override
- protected boolean recipeMatch(Recipe recipe, IItemHandlerModifiable inputItems, IMultipleTankHandler inputFluids) {
- List<ItemStack> items = gatherItems(inputItems, inputFluids);
- List<FluidStack> fluids = gatherFluids(inputItems, inputFluids);
+ protected boolean recipeMatch(Recipe recipe, boolean shouldConsume) {
+ List<ItemStack> items = gatherItems(getInputInventory(), getInputTank());
+ List<FluidStack> fluids = gatherFluids(getInputInventory(), getInputTank());
 
- return recipe.matches(true, items, fluids);
+ return recipe.matches(shouldConsume, items, fluids);
  }
 
  @Override