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/gregtech/api/recipe | |
| 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/gregtech/api/recipe')
3 files changed, 6 insertions, 40 deletions
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<B extends RecipeMapBackend> 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<B extends RecipeMapBackend> 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) |
