From c43cdd94e65c6e19d8380d1b2c87ce19d5d49011 Mon Sep 17 00:00:00 2001 From: miozune Date: Mon, 9 Sep 2024 09:21:25 +0900 Subject: Remove findRecipe methods (#3084) Co-authored-by: Martin Robertz Co-authored-by: boubou19 --- src/main/java/gregtech/GTMod.java | 1 - .../implementations/MTEBasicGenerator.java | 8 +++-- .../implementations/MTEBasicMachineBronze.java | 5 ++- .../implementations/MTEBasicMachineWithRecipe.java | 38 ++++++++++---------- .../java/gregtech/api/recipe/FindRecipeQuery.java | 2 +- src/main/java/gregtech/api/recipe/RecipeMap.java | 38 -------------------- .../api/recipe/check/SingleRecipeCheck.java | 6 +++- .../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 ++++--- 15 files changed, 92 insertions(+), 109 deletions(-) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/GTMod.java b/src/main/java/gregtech/GTMod.java index 4b3bae4056..3434d1bbbd 100644 --- a/src/main/java/gregtech/GTMod.java +++ b/src/main/java/gregtech/GTMod.java @@ -240,7 +240,6 @@ public class GTMod implements IGTMod { public static GTProxy gregtechproxy; public static final boolean DEBUG = Boolean.getBoolean("gt.debug"); - public static int MAX_IC2 = 2147483647; public static GTAchievements achievements; @Deprecated public static final String aTextGeneral = "general"; 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() diff --git a/src/main/java/gregtech/api/recipe/FindRecipeQuery.java b/src/main/java/gregtech/api/recipe/FindRecipeQuery.java index 16702b6be6..3f63043d6c 100644 --- a/src/main/java/gregtech/api/recipe/FindRecipeQuery.java +++ b/src/main/java/gregtech/api/recipe/FindRecipeQuery.java @@ -142,7 +142,7 @@ public final class FindRecipeQuery { /** * @param voltage Recipes that exceed this voltage won't match. It will be automatically multiplied by amperage - * of the recipemap. + * of the recipemap. By default, voltage is set to max Integer, meaning no voltage check. */ public FindRecipeQuery voltage(long voltage) { this.voltage = voltage; diff --git a/src/main/java/gregtech/api/recipe/RecipeMap.java b/src/main/java/gregtech/api/recipe/RecipeMap.java index 669c7de2cf..9fb504c0a4 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMap.java +++ b/src/main/java/gregtech/api/recipe/RecipeMap.java @@ -21,7 +21,6 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.Unmodifiable; import gregtech.api.interfaces.IRecipeMap; -import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; import gregtech.api.util.FieldsAreNonnullByDefault; import gregtech.api.util.GTRecipe; import gregtech.api.util.GTRecipeBuilder; @@ -207,8 +206,6 @@ public final class RecipeMap implements IRecipeMap { return aFluid != null && backend.containsInput(aFluid); } - // region find recipe - /** * @return Entrypoint for fluent API for finding recipe. */ @@ -216,41 +213,6 @@ public final class RecipeMap implements IRecipeMap { return new FindRecipeQuery(this); } - @Nullable - public GTRecipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, boolean aNotUnificated, long aVoltage, - @Nullable FluidStack[] aFluids, @Nullable ItemStack... aInputs) { - return findRecipe(aTileEntity, null, aNotUnificated, aVoltage, aFluids, null, aInputs); - } - - @Nullable - public GTRecipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, boolean aNotUnificated, - boolean aDontCheckStackSizes, long aVoltage, @Nullable FluidStack[] aFluids, @Nullable ItemStack... aInputs) { - return findRecipe(aTileEntity, null, aNotUnificated, aDontCheckStackSizes, aVoltage, aFluids, null, aInputs); - } - - @Nullable - public GTRecipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, @Nullable GTRecipe aRecipe, - boolean aNotUnificated, long aVoltage, @Nullable FluidStack[] aFluids, @Nullable ItemStack aSpecialSlot, - @Nullable ItemStack... aInputs) { - return findRecipe(aTileEntity, aRecipe, aNotUnificated, false, aVoltage, aFluids, aSpecialSlot, aInputs); - } - - @Nullable - public GTRecipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, @Nullable GTRecipe aRecipe, - boolean aNotUnificated, boolean aDontCheckStackSizes, long aVoltage, @Nullable FluidStack[] aFluids, - @Nullable ItemStack aSpecialSlot, @Nullable ItemStack... aInputs) { - return findRecipeQuery().items(aInputs != null ? aInputs : new ItemStack[0]) - .fluids(aFluids != null ? aFluids : new FluidStack[0]) - .specialSlot(aSpecialSlot) - .voltage(aVoltage) - .cachedRecipe(aRecipe) - .notUnificated(aNotUnificated) - .dontCheckStackSizes(aDontCheckStackSizes) - .find(); - } - - // endregion - @Override public String toString() { return "RecipeMap{" + "unlocalizedName='" diff --git a/src/main/java/gregtech/api/recipe/check/SingleRecipeCheck.java b/src/main/java/gregtech/api/recipe/check/SingleRecipeCheck.java index d339f8acfd..12d8a38757 100644 --- a/src/main/java/gregtech/api/recipe/check/SingleRecipeCheck.java +++ b/src/main/java/gregtech/api/recipe/check/SingleRecipeCheck.java @@ -302,7 +302,11 @@ public class SingleRecipeCheck { .map(FluidStack::loadFluidStackFromNBT) .toArray(FluidStack[]::new); int eut = tag.getInteger("eut"); - GTRecipe found = recipeMap.findRecipe(null, false, GTValues.V[GTUtility.getTier(eut)], fInputs, inputs); + GTRecipe found = recipeMap.findRecipeQuery() + .items(inputs) + .fluids(fInputs) + .voltage(GTValues.V[GTUtility.getTier(eut)]) + .find(); int[] chances = tag.getIntArray("chances"); if (chances.length == 0) chances = null; if (found == null || !GTUtility.equals(inputs, found.mInputs) 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 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 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