Add helpers for checking matches on our recipes using the vanilla system

Author: pupnewfster

src/api/java/mekanism/api/recipes/ChemicalCrystallizerRecipe.java

@@ -7,12 +7,15 @@
 import mekanism.api.chemical.ChemicalStack;
 import mekanism.api.chemical.merged.BoxedChemicalStack;
 import mekanism.api.recipes.ingredients.ChemicalStackIngredient;
+import mekanism.api.recipes.vanilla_input.SingleBoxedChemicalInput;
 import net.minecraft.core.Holder;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeType;
+import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
@@ -25,7 +28,7 @@
  * @apiNote Chemical Crystallizers can process this recipe type.
  */
 @NothingNullByDefault
-public abstract class ChemicalCrystallizerRecipe extends MekanismRecipe implements Predicate<@NotNull BoxedChemicalStack> {
+public abstract class ChemicalCrystallizerRecipe extends MekanismRecipe<SingleBoxedChemicalInput> implements Predicate<@NotNull BoxedChemicalStack> {
 
     private static final Holder<Item> CHEMICAL_CRYSTALLIZER = DeferredHolder.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(MekanismAPI.MEKANISM_MODID, "chemical_crystallizer"));
 
@@ -50,6 +53,21 @@ public abstract class ChemicalCrystallizerRecipe extends MekanismRecipe implemen
      */
     public abstract List<ItemStack> getOutputDefinition();
 
+    @NotNull
+    @Override
+    public ItemStack assemble(SingleBoxedChemicalInput input, HolderLookup.Provider provider) {
+        if (!isIncomplete() && test(input.chemical())) {
+            return getOutput(input.chemical());
+        }
+        return ItemStack.EMPTY;
+    }
+
+    @Override
+    public boolean matches(SingleBoxedChemicalInput input, Level level) {
+        //Don't match incomplete recipes or ones that don't match
+        return !isIncomplete() && test(input.chemical());
+    }
+
     @Override
     public abstract boolean test(BoxedChemicalStack chemicalStack);
 

src/api/java/mekanism/api/recipes/ChemicalDissolutionRecipe.java

@@ -4,22 +4,26 @@
 import java.util.function.BiPredicate;
 import mekanism.api.MekanismAPI;
 import mekanism.api.annotations.NothingNullByDefault;
+import mekanism.api.chemical.gas.Gas;
 import mekanism.api.chemical.gas.GasStack;
 import mekanism.api.chemical.merged.BoxedChemicalStack;
 import mekanism.api.recipes.ingredients.GasStackIngredient;
 import mekanism.api.recipes.ingredients.ItemStackIngredient;
+import mekanism.api.recipes.vanilla_input.SingleItemChemicalRecipeInput;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeType;
+import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
 @NothingNullByDefault
-public abstract class ChemicalDissolutionRecipe extends MekanismRecipe implements BiPredicate<@NotNull ItemStack, @NotNull GasStack> {
+public abstract class ChemicalDissolutionRecipe extends MekanismRecipe<SingleItemChemicalRecipeInput<Gas, GasStack>>
+      implements BiPredicate<@NotNull ItemStack, @NotNull GasStack> {
 
     private static final Holder<Item> CHEMICAL_DISSOLUTION_CHAMBER = DeferredHolder.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(MekanismAPI.MEKANISM_MODID, "chemical_dissolution_chamber"));
 
@@ -51,6 +55,12 @@ public abstract class ChemicalDissolutionRecipe extends MekanismRecipe implement
     @Override
     public abstract boolean test(ItemStack itemStack, GasStack gasStack);
 
+    @Override
+    public boolean matches(SingleItemChemicalRecipeInput<Gas, GasStack> input, Level level) {
+        //Don't match incomplete recipes or ones that don't match
+        return !isIncomplete() && test(input.item(), input.chemical());
+    }
+
     /**
      * For JEI, gets the output representations to display.
      *

src/api/java/mekanism/api/recipes/CombinerRecipe.java

@@ -11,7 +11,9 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.RecipeInput;
 import net.minecraft.world.item.crafting.RecipeType;
+import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
@@ -26,7 +28,7 @@
  * @apiNote Combiners and Combining Factories can process this recipe type.
  */
 @NothingNullByDefault
-public abstract class CombinerRecipe extends MekanismRecipe implements BiPredicate<@NotNull ItemStack, @NotNull ItemStack> {
+public abstract class CombinerRecipe extends MekanismRecipe<RecipeInput> implements BiPredicate<@NotNull ItemStack, @NotNull ItemStack> {
 
     private static final Holder<Item> COMBINER = DeferredHolder.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(MekanismAPI.MEKANISM_MODID, "combiner"));
 
@@ -43,6 +45,30 @@ public abstract class CombinerRecipe extends MekanismRecipe implements BiPredica
      */
     public abstract ItemStackIngredient getExtraInput();
 
+    @NotNull
+    @Override
+    public ItemStack assemble(RecipeInput input, HolderLookup.Provider provider) {
+        if (!isIncomplete() && input.size() == 2) {
+            ItemStack mainInput = input.getItem(0);
+            ItemStack extraInput = input.getItem(1);
+            if (test(mainInput, extraInput)) {
+                return getOutput(mainInput, extraInput);
+            }
+        }
+        return ItemStack.EMPTY;
+    }
+
+    @Override
+    public boolean matches(RecipeInput input, Level level) {
+        //Don't match incomplete recipes or ones that don't match
+        return !isIncomplete() && input.size() == 2 && test(input.getItem(0), input.getItem(1));
+    }
+
+    @Override
+    public boolean canCraftInDimensions(int width, int height) {
+        return width * height > 1;
+    }
+
     /**
      * Gets a new output based on the given inputs.
      *

src/api/java/mekanism/api/recipes/ElectrolysisRecipe.java

@@ -8,12 +8,14 @@
 import mekanism.api.chemical.gas.GasStack;
 import mekanism.api.math.FloatingLong;
 import mekanism.api.recipes.ingredients.FluidStackIngredient;
+import mekanism.api.recipes.vanilla_input.SingleFluidRecipeInput;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeType;
+import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.fluids.FluidStack;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import org.jetbrains.annotations.Contract;
@@ -29,7 +31,7 @@
  * @apiNote Electrolytic Separators can process this recipe type.
  */
 @NothingNullByDefault
-public abstract class ElectrolysisRecipe extends MekanismRecipe implements Predicate<@NotNull FluidStack> {
+public abstract class ElectrolysisRecipe extends MekanismRecipe<SingleFluidRecipeInput> implements Predicate<@NotNull FluidStack> {
 
     private static final Holder<Item> ELECTROLYTIC_SEPARATOR = DeferredHolder.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(MekanismAPI.MEKANISM_MODID, "electrolytic_separator"));
 
@@ -48,6 +50,12 @@ public abstract class ElectrolysisRecipe extends MekanismRecipe implements Predi
     @Override
     public abstract boolean test(FluidStack fluidStack);
 
+    @Override
+    public boolean matches(SingleFluidRecipeInput input, Level level) {
+        //Don't match incomplete recipes or ones that don't match
+        return !isIncomplete() && test(input.fluid());
+    }
+
     /**
      * Gets a new output based on the given input.
      *

src/api/java/mekanism/api/recipes/FluidToFluidRecipe.java

@@ -5,12 +5,14 @@
 import mekanism.api.MekanismAPI;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.recipes.ingredients.FluidStackIngredient;
+import mekanism.api.recipes.vanilla_input.SingleFluidRecipeInput;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeType;
+import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.fluids.FluidStack;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import org.jetbrains.annotations.Contract;
@@ -24,13 +26,19 @@
  * @apiNote Thermal Evaporation Towers can process this recipe type.
  */
 @NothingNullByDefault
-public abstract class FluidToFluidRecipe extends MekanismRecipe implements Predicate<@NotNull FluidStack> {
+public abstract class FluidToFluidRecipe extends MekanismRecipe<SingleFluidRecipeInput> implements Predicate<@NotNull FluidStack> {
 
     private static final Holder<Item> THERMAL_EVAPORATION_CONTROLLER = DeferredHolder.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(MekanismAPI.MEKANISM_MODID, "thermal_evaporation_controller"));
 
     @Override
     public abstract boolean test(FluidStack fluidStack);
 
+    @Override
+    public boolean matches(SingleFluidRecipeInput input, Level level) {
+        //Don't match incomplete recipes or ones that don't match
+        return !isIncomplete() && test(input.fluid());
+    }
+
     /**
      * Gets the input ingredient.
      */

src/api/java/mekanism/api/recipes/ItemStackToEnergyRecipe.java

@@ -12,6 +12,8 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeType;
+import net.minecraft.world.item.crafting.SingleRecipeInput;
+import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import org.jetbrains.annotations.NotNull;
 
@@ -23,13 +25,19 @@
  * @apiNote Energy conversion recipes can be used in any slots in Mekanism machines that are able to convert items into energy.
  */
 @NothingNullByDefault
-public abstract class ItemStackToEnergyRecipe extends MekanismRecipe implements Predicate<@NotNull ItemStack> {
+public abstract class ItemStackToEnergyRecipe extends MekanismRecipe<SingleRecipeInput> implements Predicate<@NotNull ItemStack> {
 
     private static final Holder<Item> ENERGY_TABLET = DeferredHolder.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(MekanismAPI.MEKANISM_MODID, "energy_tablet"));
 
     @Override
     public abstract boolean test(ItemStack itemStack);
 
+    @Override
+    public boolean matches(SingleRecipeInput input, Level level) {
+        //Don't match incomplete recipes or ones that don't match
+        return !isIncomplete() && test(input.item());
+    }
+
     /**
      * Gets the input ingredient.
      */

src/api/java/mekanism/api/recipes/ItemStackToFluidRecipe.java

@@ -5,6 +5,8 @@
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.recipes.ingredients.ItemStackIngredient;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.SingleRecipeInput;
+import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.fluids.FluidStack;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
@@ -22,11 +24,17 @@
  * </ul>
  */
 @NothingNullByDefault
-public abstract class ItemStackToFluidRecipe extends MekanismRecipe implements Predicate<@NotNull ItemStack> {
+public abstract class ItemStackToFluidRecipe extends MekanismRecipe<SingleRecipeInput> implements Predicate<@NotNull ItemStack> {
 
     @Override
     public abstract boolean test(ItemStack itemStack);
 
+    @Override
+    public boolean matches(SingleRecipeInput input, Level level) {
+        //Don't match incomplete recipes or ones that don't match
+        return !isIncomplete() && test(input.item());
+    }
+
     /**
      * Gets the input ingredient.
      */

src/api/java/mekanism/api/recipes/ItemStackToItemStackRecipe.java

@@ -8,6 +8,8 @@
 import net.minecraft.core.HolderLookup;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeType;
+import net.minecraft.world.item.crafting.SingleRecipeInput;
+import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
@@ -24,7 +26,7 @@
  * </ul>
  */
 @NothingNullByDefault
-public abstract class ItemStackToItemStackRecipe extends MekanismRecipe implements Predicate<@NotNull ItemStack> {
+public abstract class ItemStackToItemStackRecipe extends MekanismRecipe<SingleRecipeInput> implements Predicate<@NotNull ItemStack> {
 
     protected final RecipeType<ItemStackToItemStackRecipe> recipeType;
 
@@ -35,6 +37,21 @@ public ItemStackToItemStackRecipe(RecipeType<ItemStackToItemStackRecipe> recipeT
     @Override
     public abstract boolean test(ItemStack input);
 
+    @NotNull
+    @Override
+    public ItemStack assemble(SingleRecipeInput input, HolderLookup.Provider provider) {
+        if (!isIncomplete() && test(input.item())) {
+            return getOutput(input.item());
+        }
+        return ItemStack.EMPTY;
+    }
+
+    @Override
+    public boolean matches(SingleRecipeInput input, Level level) {
+        //Don't match incomplete recipes or ones that don't match
+        return !isIncomplete() && test(input.item());
+    }
+
     /**
      * Gets the input ingredient.
      */

src/api/java/mekanism/api/recipes/MekanismRecipe.java

@@ -1,24 +1,16 @@
 package mekanism.api.recipes;
 
-import mekanism.api.inventory.IgnoredIInventory;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Recipe;
-import net.minecraft.world.level.Level;
+import net.minecraft.world.item.crafting.RecipeInput;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * Base class for helping wrap our recipes into IRecipes.
  */
-public abstract class MekanismRecipe implements Recipe<IgnoredIInventory> {//TODO: Should we make implementations override equals and hashcode?
-
-    @Override
-    public boolean matches(@NotNull IgnoredIInventory inv, @NotNull Level world) {
-        //TODO - 1.21: Decide if we ever want to make use of this method, as with the changes in 1.21 to allow for extending RecipeInput
-        // instead of Container, we potentially could implement this even for things that don't use items
-        //Default to not being able to match incomplete recipes though
-        return !isIncomplete();
-    }
+public abstract class MekanismRecipe<INPUT extends RecipeInput> implements Recipe<INPUT> {
+    //TODO: Should we make implementations override equals and hashcode?
 
     @Override
     public boolean isSpecial() {
@@ -33,7 +25,7 @@ public boolean isSpecial() {
 
     @NotNull
     @Override
-    public ItemStack assemble(@NotNull IgnoredIInventory inv, @NotNull HolderLookup.Provider provider) {
+    public ItemStack assemble(@NotNull INPUT input, @NotNull HolderLookup.Provider provider) {
         return ItemStack.EMPTY;
     }
 

src/api/java/mekanism/api/recipes/PressurizedReactionRecipe.java

@@ -6,15 +6,17 @@
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.gas.GasStack;
 import mekanism.api.math.FloatingLong;
-import mekanism.api.recipes.ingredients.GasStackIngredient;
 import mekanism.api.recipes.ingredients.FluidStackIngredient;
+import mekanism.api.recipes.ingredients.GasStackIngredient;
 import mekanism.api.recipes.ingredients.ItemStackIngredient;
+import mekanism.api.recipes.vanilla_input.ReactionRecipeInput;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeType;
+import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.common.util.TriPredicate;
 import net.neoforged.neoforge.fluids.FluidStack;
 import net.neoforged.neoforge.registries.DeferredHolder;
@@ -35,7 +37,7 @@
  * @apiNote Pressurized Reaction Chambers can process this recipe type.
  */
 @NothingNullByDefault
-public abstract class PressurizedReactionRecipe extends MekanismRecipe implements TriPredicate<@NotNull ItemStack, @NotNull FluidStack, @NotNull GasStack> {
+public abstract class PressurizedReactionRecipe extends MekanismRecipe<ReactionRecipeInput> implements TriPredicate<@NotNull ItemStack, @NotNull FluidStack, @NotNull GasStack> {
 
     private static final Holder<Item> PRESSURIZED_REACTION_CHAMBER = DeferredHolder.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(MekanismAPI.MEKANISM_MODID, "pressurized_reaction_chamber"));
 
@@ -67,6 +69,12 @@ public abstract class PressurizedReactionRecipe extends MekanismRecipe implement
     @Override
     public abstract boolean test(ItemStack solid, FluidStack liquid, GasStack gas);
 
+    @Override
+    public boolean matches(ReactionRecipeInput input, Level level) {
+        //Don't match incomplete recipes or ones that don't match
+        return !isIncomplete() && test(input.item(), input.fluid(), input.gas());
+    }
+
     /**
      * For JEI, gets the output representations to display.
      *