aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines/multi
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2024-09-09 09:21:25 +0900
committerGitHub <noreply@github.com>2024-09-09 02:21:25 +0200
commitc43cdd94e65c6e19d8380d1b2c87ce19d5d49011 (patch)
tree67e104846c6122fdc2eaf2dcc29717facd6a51df /src/main/java/gregtech/common/tileentities/machines/multi
parentb15f89a14827bdb621d45745d165e1caf4265fef (diff)
downloadGT5-Unofficial-c43cdd94e65c6e19d8380d1b2c87ce19d5d49011.tar.gz
GT5-Unofficial-c43cdd94e65c6e19d8380d1b2c87ce19d5d49011.tar.bz2
GT5-Unofficial-c43cdd94e65c6e19d8380d1b2c87ce19d5d49011.zip
Remove findRecipe methods (#3084)
Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/multi')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java41
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlantBase.java6
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEPrimitiveBlastFurnace.java4
3 files changed, 27 insertions, 24 deletions
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;