aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity
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/api/metatileentity
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/api/metatileentity')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/MTEBasicGenerator.java8
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineBronze.java5
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineWithRecipe.java38
3 files changed, 28 insertions, 23 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicGenerator.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicGenerator.java
index ac923bc699..963acf191f 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicGenerator.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicGenerator.java
@@ -305,7 +305,9 @@ public abstract class MTEBasicGenerator extends MTEBasicTank implements RecipeMa
public long getFuelValue(ItemStack aStack, boolean aLong) {
if (GTUtility.isStackInvalid(aStack) || getRecipeMap() == null) return 0;
- GTRecipe tFuel = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
+ GTRecipe tFuel = getRecipeMap().findRecipeQuery()
+ .items(aStack)
+ .find();
if (tFuel == null) return 0;
long liters = 10L; // 1000mb/100
@@ -314,7 +316,9 @@ public abstract class MTEBasicGenerator extends MTEBasicTank implements RecipeMa
public ItemStack getEmptyContainer(ItemStack aStack) {
if (GTUtility.isStackInvalid(aStack) || getRecipeMap() == null) return null;
- GTRecipe tFuel = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
+ GTRecipe tFuel = getRecipeMap().findRecipeQuery()
+ .items(aStack)
+ .find();
if (tFuel != null) return GTUtility.copyOrNull(tFuel.getOutput(0));
return GTUtility.getContainerItem(aStack, true);
}
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineBronze.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineBronze.java
index 507a807a76..2ede5545d1 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineBronze.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineBronze.java
@@ -189,7 +189,10 @@ public abstract class MTEBasicMachineBronze extends MTEBasicMachine {
@Override
public int checkRecipe() {
- GTRecipe tRecipe = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, TierEU.LV, null, getAllInputs());
+ GTRecipe tRecipe = getRecipeMap().findRecipeQuery()
+ .items(getAllInputs())
+ .voltage(TierEU.LV)
+ .find();
if ((tRecipe != null) && (canOutput(tRecipe.mOutputs))
&& (tRecipe.isRecipeInputEqual(true, null, getAllInputs()))) {
this.mOutputItems[0] = tRecipe.getOutput(0);
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineWithRecipe.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineWithRecipe.java
index b5bd3d77e1..8d13ab18c4 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineWithRecipe.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineWithRecipe.java
@@ -14,7 +14,6 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import com.gtnewhorizons.modularui.api.drawable.FallbackableUITexture;
@@ -576,16 +575,15 @@ public class MTEBasicMachineWithRecipe extends MTEBasicMachine {
if (this.getFillableStack() == null) return this.getRecipeMap()
.containsInput(aStack);
else return this.getRecipeMap()
- .findRecipe(
- this.getBaseMetaTileEntity(),
- this.mLastRecipe,
- true,
- true,
- V[this.mTier],
- new FluidStack[] { this.getFillableStack() },
- this.getSpecialSlot(),
- appendSelectedCircuit(aStack))
- != null;
+ .findRecipeQuery()
+ .items(appendSelectedCircuit(aStack))
+ .fluids(this.getFillableStack())
+ .specialSlot(this.getSpecialSlot())
+ .voltage(V[this.mTier])
+ .cachedRecipe(this.mLastRecipe)
+ .dontCheckStackSizes(true)
+ .notUnificated(true)
+ .find() != null;
}
case 2 -> {
return ((this.getInputAt(0) != null && this.getInputAt(1) != null)
@@ -594,17 +592,17 @@ public class MTEBasicMachineWithRecipe extends MTEBasicMachine {
: (this.getRecipeMap()
.containsInput(aStack)
&& this.getRecipeMap()
- .findRecipe(
- this.getBaseMetaTileEntity(),
- this.mLastRecipe,
- true,
- true,
- V[this.mTier],
- new FluidStack[] { this.getFillableStack() },
- this.getSpecialSlot(),
+ .findRecipeQuery()
+ .items(
aIndex == this.getInputSlot() ? appendSelectedCircuit(aStack, this.getInputAt(1))
: appendSelectedCircuit(this.getInputAt(0), aStack))
- != null)));
+ .fluids(this.getFillableStack())
+ .specialSlot(this.getSpecialSlot())
+ .voltage(V[this.mTier])
+ .cachedRecipe(this.mLastRecipe)
+ .dontCheckStackSizes(true)
+ .notUnificated(true)
+ .find() != null)));
}
default -> {
int tID = this.getBaseMetaTileEntity()