diff options
| author | miozune <miozune@gmail.com> | 2024-09-09 09:21:25 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-09 02:21:25 +0200 |
| commit | c43cdd94e65c6e19d8380d1b2c87ce19d5d49011 (patch) | |
| tree | 67e104846c6122fdc2eaf2dcc29717facd6a51df /src/main/java/gtPlusPlus | |
| parent | b15f89a14827bdb621d45745d165e1caf4265fef (diff) | |
| download | GT5-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/gtPlusPlus')
3 files changed, 16 insertions, 11 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java index 386c5634f8..c81164cacb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java @@ -295,7 +295,9 @@ public abstract class MTERocketFuelGeneratorBase extends MTEBasicTank implements return 0; } final GTRecipe tFuel = this.getRecipeMap() - .findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack); + .findRecipeQuery() + .items(aStack) + .find(); if (tFuel != null) { return (int) ((tFuel.mSpecialValue * 1000L * this.getEfficiency()) / 100); } @@ -307,7 +309,9 @@ public abstract class MTERocketFuelGeneratorBase extends MTEBasicTank implements return null; } final GTRecipe tFuel = this.getRecipeMap() - .findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack); + .findRecipeQuery() + .items(aStack) + .find(); if (tFuel != null) { return GTUtility.copy(tFuel.getOutput(0)); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java index 00a915b89c..d94c764e53 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java @@ -100,12 +100,9 @@ public class MTERTGenerator extends MTEBasicGenerator { final NBTTagCompound data = list.getCompoundTagAt(0); ItemStack lastUsedFuel = ItemStack.loadItemStackFromNBT(data); if (lastUsedFuel != null) { - this.mCurrentRecipe = getRecipeMap().findRecipe( - getBaseMetaTileEntity(), - false, - 9223372036854775807L, - null, - new ItemStack[] { lastUsedFuel }); + this.mCurrentRecipe = getRecipeMap().findRecipeQuery() + .items(lastUsedFuel) + .find(); } } @@ -306,8 +303,9 @@ public class MTERTGenerator extends MTEBasicGenerator { @Override public int getFuelValue(ItemStack aStack) { if ((GTUtility.isStackInvalid(aStack)) || (getRecipeMap() == null)) return 0; - GTRecipe tFuel = getRecipeMap() - .findRecipe(getBaseMetaTileEntity(), false, 9223372036854775807L, null, new ItemStack[] { aStack }); + GTRecipe tFuel = getRecipeMap().findRecipeQuery() + .items(aStack) + .find(); if (tFuel != null) { this.mCurrentRecipe = tFuel; int voltage = tFuel.mEUt; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java index d78bbc0e45..e401e907bb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java @@ -202,7 +202,10 @@ public class MTESpargeTower extends GTPPMultiBlockBase<MTESpargeTower> implement byte tTier = (byte) Math.max(0, GTUtility.getTier(tVoltage)); FluidStack[] tFluids = tFluidList.toArray(new FluidStack[0]); if (tFluids.length > 0) { - GTRecipe tRecipe = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, GTValues.V[tTier], tFluids); + GTRecipe tRecipe = getRecipeMap().findRecipeQuery() + .fluids(tFluids) + .voltage(GTValues.V[tTier]) + .find(); if (tRecipe != null) { FluidStack[] possibleOutputs = getPossibleByproductsOfSparge( tRecipe.mFluidInputs[0], |