From c43cdd94e65c6e19d8380d1b2c87ce19d5d49011 Mon Sep 17 00:00:00 2001
From: miozune <miozune@gmail.com>
Date: Mon, 9 Sep 2024 09:21:25 +0900
Subject: Remove findRecipe methods (#3084)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: boubou19 <miisterunknown@gmail.com>
---
 .../tileentities/machines/basic/MTEBoxinator.java  | 12 +++----
 .../machines/multi/MTEIntegratedOreFactory.java    | 41 +++++++++++-----------
 .../machines/multi/MTEOreDrillingPlantBase.java    |  6 ++--
 .../machines/multi/MTEPrimitiveBlastFurnace.java   |  4 ++-
 .../machines/steam/MTESteamMaceratorBronze.java    |  7 ++--
 .../machines/steam/MTESteamMaceratorSteel.java     |  7 ++--
 .../java/gregtech/common/tools/ToolHardHammer.java | 14 ++++----
 .../java/gregtech/common/tools/ToolJackHammer.java | 12 ++++---
 8 files changed, 58 insertions(+), 45 deletions(-)

(limited to 'src/main/java/gregtech/common')

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTEBoxinator.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEBoxinator.java
index 43d2d6b295..d7edfec413 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/MTEBoxinator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEBoxinator.java
@@ -206,13 +206,11 @@ public class MTEBoxinator extends MTEBasicMachine {
         if ((ItemList.Schematic_1by1.isStackEqual(tInput1)) || (ItemList.Schematic_2by2.isStackEqual(tInput1))
             || (ItemList.Schematic_3by3.isStackEqual(tInput1))) {
             if (hasValidCache(aStack, aTypeCache, false)) return true;
-            if (RecipeMaps.packagerRecipes.findRecipe(
-                getBaseMetaTileEntity(),
-                true,
-                GTValues.V[mTier],
-                null,
-                GTUtility.copyAmount(64, aStack),
-                tInput1) != null) {
+            if (RecipeMaps.packagerRecipes.findRecipeQuery()
+                .items(GTUtility.copyAmount(64, aStack), tInput1)
+                .voltage(GTValues.V[mTier])
+                .notUnificated(true)
+                .find() != null) {
                 return true;
             }
             if (ItemList.Schematic_1by1.isStackEqual(getInputAt(1)) && GTModHandler.getRecipeOutput(aStack) != null)
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java
index 7de3fb8dbe..187bf4ed69 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java
@@ -46,7 +46,6 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import gregtech.api.GregTechAPI;
-import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -463,8 +462,9 @@ public class MTEIntegratedOreFactory extends MTEExtendedPowerMultiBlockBase<MTEI
             for (ItemStack aStack : sMidProduct) {
                 int tID = GTUtility.stackToInt(aStack);
                 if (checkTypes(tID, aTables)) {
-                    GTRecipe tRecipe = RecipeMaps.maceratorRecipes
-                        .findRecipe(getBaseMetaTileEntity(), false, GTValues.V[15], null, aStack);
+                    GTRecipe tRecipe = RecipeMaps.maceratorRecipes.findRecipeQuery()
+                        .items(aStack)
+                        .find();
                     if (tRecipe != null) {
                         tProduct.addAll(getOutputStack(tRecipe, aStack.stackSize));
                     } else {
@@ -485,12 +485,10 @@ public class MTEIntegratedOreFactory extends MTEExtendedPowerMultiBlockBase<MTEI
             for (ItemStack aStack : sMidProduct) {
                 int tID = GTUtility.stackToInt(aStack);
                 if (checkTypes(tID, aTables)) {
-                    GTRecipe tRecipe = RecipeMaps.oreWasherRecipes.findRecipe(
-                        getBaseMetaTileEntity(),
-                        false,
-                        GTValues.V[15],
-                        new FluidStack[] { GTModHandler.getDistilledWater(Integer.MAX_VALUE) },
-                        aStack);
+                    GTRecipe tRecipe = RecipeMaps.oreWasherRecipes.findRecipeQuery()
+                        .items(aStack)
+                        .fluids(GTModHandler.getDistilledWater(Integer.MAX_VALUE))
+                        .find();
                     if (tRecipe != null) {
                         tProduct.addAll(getOutputStack(tRecipe, aStack.stackSize));
                     } else {
@@ -511,8 +509,9 @@ public class MTEIntegratedOreFactory extends MTEExtendedPowerMultiBlockBase<MTEI
             for (ItemStack aStack : sMidProduct) {
                 int tID = GTUtility.stackToInt(aStack);
                 if (checkTypes(tID, aTables)) {
-                    GTRecipe tRecipe = RecipeMaps.thermalCentrifugeRecipes
-                        .findRecipe(getBaseMetaTileEntity(), false, GTValues.V[15], null, aStack);
+                    GTRecipe tRecipe = RecipeMaps.thermalCentrifugeRecipes.findRecipeQuery()
+                        .items(aStack)
+                        .find();
                     if (tRecipe != null) {
                         tProduct.addAll(getOutputStack(tRecipe, aStack.stackSize));
                     } else {
@@ -533,8 +532,9 @@ public class MTEIntegratedOreFactory extends MTEExtendedPowerMultiBlockBase<MTEI
             for (ItemStack aStack : sMidProduct) {
                 int tID = GTUtility.stackToInt(aStack);
                 if (checkTypes(tID, aTables)) {
-                    GTRecipe tRecipe = RecipeMaps.centrifugeRecipes
-                        .findRecipe(getBaseMetaTileEntity(), false, GTValues.V[15], null, aStack);
+                    GTRecipe tRecipe = RecipeMaps.centrifugeRecipes.findRecipeQuery()
+                        .items(aStack)
+                        .find();
                     if (tRecipe != null) {
                         tProduct.addAll(getOutputStack(tRecipe, aStack.stackSize));
                     } else {
@@ -555,8 +555,9 @@ public class MTEIntegratedOreFactory extends MTEExtendedPowerMultiBlockBase<MTEI
             for (ItemStack aStack : sMidProduct) {
                 int tID = GTUtility.stackToInt(aStack);
                 if (checkTypes(tID, aTables)) {
-                    GTRecipe tRecipe = RecipeMaps.sifterRecipes
-                        .findRecipe(getBaseMetaTileEntity(), false, GTValues.V[15], null, aStack);
+                    GTRecipe tRecipe = RecipeMaps.sifterRecipes.findRecipeQuery()
+                        .items(aStack)
+                        .find();
                     if (tRecipe != null) {
                         tProduct.addAll(getOutputStack(tRecipe, aStack.stackSize));
                     } else {
@@ -577,12 +578,10 @@ public class MTEIntegratedOreFactory extends MTEExtendedPowerMultiBlockBase<MTEI
             for (ItemStack aStack : sMidProduct) {
                 int tID = GTUtility.stackToInt(aStack);
                 if (checkTypes(tID, aTables)) {
-                    GTRecipe tRecipe = RecipeMaps.chemicalBathRecipes.findRecipe(
-                        getBaseMetaTileEntity(),
-                        false,
-                        GTValues.V[15],
-                        getStoredFluids().toArray(new FluidStack[0]),
-                        aStack);
+                    GTRecipe tRecipe = RecipeMaps.chemicalBathRecipes.findRecipeQuery()
+                        .items(aStack)
+                        .fluids(getStoredFluids().toArray(new FluidStack[0]))
+                        .find();
                     if (tRecipe != null && tRecipe.getRepresentativeFluidInput(0) != null) {
                         FluidStack tInputFluid = tRecipe.getRepresentativeFluidInput(0)
                             .copy();
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlantBase.java
index 47504c574e..6acc48c772 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlantBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlantBase.java
@@ -501,8 +501,10 @@ public abstract class MTEOreDrillingPlantBase extends MTEDrillerBase implements
                 outputItems.add(multiplyStackSize(currentItem));
                 return;
             }
-            GTRecipe tRecipe = RecipeMaps.maceratorRecipes
-                .findRecipe(getBaseMetaTileEntity(), false, voltage, null, currentItem);
+            GTRecipe tRecipe = RecipeMaps.maceratorRecipes.findRecipeQuery()
+                .items(currentItem)
+                .voltage(voltage)
+                .find();
             if (tRecipe == null) {
                 outputItems.add(currentItem);
                 return;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPrimitiveBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPrimitiveBlastFurnace.java
index c95abda9d7..0011a0efad 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPrimitiveBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPrimitiveBlastFurnace.java
@@ -370,7 +370,9 @@ public abstract class MTEPrimitiveBlastFurnace extends MetaTileEntity
         }
         ItemStack[] inputs = new ItemStack[INPUT_SLOTS];
         System.arraycopy(mInventory, 0, inputs, 0, INPUT_SLOTS);
-        GTRecipe recipe = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, 0, null, inputs);
+        GTRecipe recipe = getRecipeMap().findRecipeQuery()
+            .items(inputs)
+            .find();
         if (recipe == null) {
             this.mOutputItems = null;
             return false;
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamMaceratorBronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamMaceratorBronze.java
index 441bf266bf..6c55b1228c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamMaceratorBronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamMaceratorBronze.java
@@ -79,8 +79,11 @@ public class MTESteamMaceratorBronze extends MTEBasicMachineBronze {
 
     @Override
     public int checkRecipe() {
-        GTRecipe tRecipe = getRecipeMap()
-            .findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, TierEU.LV, null, null, getAllInputs());
+        GTRecipe tRecipe = getRecipeMap().findRecipeQuery()
+            .items(getAllInputs())
+            .voltage(TierEU.LV)
+            .cachedRecipe(mLastRecipe)
+            .find();
         if (tRecipe == null) return DID_NOT_FIND_RECIPE;
         if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe;
         if (!canOutput(tRecipe)) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamMaceratorSteel.java b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamMaceratorSteel.java
index 226d0d387a..9aaad8ef38 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamMaceratorSteel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamMaceratorSteel.java
@@ -78,8 +78,11 @@ public class MTESteamMaceratorSteel extends MTEBasicMachineSteel {
 
     @Override
     public int checkRecipe() {
-        GTRecipe tRecipe = getRecipeMap()
-            .findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, TierEU.LV, null, null, getAllInputs());
+        GTRecipe tRecipe = getRecipeMap().findRecipeQuery()
+            .items(getAllInputs())
+            .voltage(TierEU.LV)
+            .cachedRecipe(mLastRecipe)
+            .find();
         if (tRecipe == null) return DID_NOT_FIND_RECIPE;
         if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe;
         if (!canOutput(tRecipe)) {
diff --git a/src/main/java/gregtech/common/tools/ToolHardHammer.java b/src/main/java/gregtech/common/tools/ToolHardHammer.java
index d26fe2b43d..a5b0a38ee5 100644
--- a/src/main/java/gregtech/common/tools/ToolHardHammer.java
+++ b/src/main/java/gregtech/common/tools/ToolHardHammer.java
@@ -1,7 +1,5 @@
 package gregtech.common.tools;
 
-import static gregtech.GTMod.MAX_IC2;
-
 import java.util.Arrays;
 import java.util.List;
 
@@ -133,12 +131,16 @@ public class ToolHardHammer extends GTTool {
     public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
         int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
         int rConversions = 0;
-        GTRecipe tRecipe = RecipeMaps.hammerRecipes
-            .findRecipe(null, true, MAX_IC2, null, new ItemStack(aBlock, 1, aMetaData));
+        GTRecipe tRecipe = RecipeMaps.hammerRecipes.findRecipeQuery()
+            .items(new ItemStack(aBlock, 1, aMetaData))
+            .notUnificated(true)
+            .find();
         if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) {
             for (ItemStack tDrop : aDrops) {
-                tRecipe = RecipeMaps.hammerRecipes
-                    .findRecipe(null, true, MAX_IC2, null, GTUtility.copyAmount(1, tDrop));
+                tRecipe = RecipeMaps.hammerRecipes.findRecipeQuery()
+                    .items(GTUtility.copyAmount(1, tDrop))
+                    .notUnificated(true)
+                    .find();
                 if (tRecipe != null) {
                     ItemStack tHammeringOutput = tRecipe.getOutput(0);
                     if (tHammeringOutput != null) {
diff --git a/src/main/java/gregtech/common/tools/ToolJackHammer.java b/src/main/java/gregtech/common/tools/ToolJackHammer.java
index 6c46a4c9be..bc0a7ddcc0 100644
--- a/src/main/java/gregtech/common/tools/ToolJackHammer.java
+++ b/src/main/java/gregtech/common/tools/ToolJackHammer.java
@@ -78,12 +78,16 @@ public class ToolJackHammer extends ToolDrillLV {
     public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
         int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
         int rConversions = 0;
-        GTRecipe tRecipe = RecipeMaps.hammerRecipes
-            .findRecipe(null, true, 2147483647L, null, new ItemStack(aBlock, 1, aMetaData));
+        GTRecipe tRecipe = RecipeMaps.hammerRecipes.findRecipeQuery()
+            .items(new ItemStack(aBlock, 1, aMetaData))
+            .notUnificated(true)
+            .find();
         if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) {
             for (ItemStack tDrop : aDrops) {
-                tRecipe = RecipeMaps.hammerRecipes
-                    .findRecipe(null, true, 2147483647L, null, GTUtility.copyAmount(1, tDrop));
+                tRecipe = RecipeMaps.hammerRecipes.findRecipeQuery()
+                    .items(GTUtility.copyAmount(1, tDrop))
+                    .notUnificated(true)
+                    .find();
                 if (tRecipe != null) {
                     ItemStack tHammeringOutput = tRecipe.getOutput(0);
                     if (tHammeringOutput != null) {
-- 
cgit