Add ItemLike convenience function for addRecipeCatalyst

Author: mezz

CommonApi/src/main/java/mezz/jei/api/registration/IRecipeCatalystRegistration.java

@@ -6,6 +6,7 @@
 import mezz.jei.api.recipe.RecipeType;
 import mezz.jei.api.runtime.IIngredientManager;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.ItemLike;
 
 public interface IRecipeCatalystRegistration {
 	/**
@@ -20,6 +21,23 @@ public interface IRecipeCatalystRegistration {
 	 */
 	IJeiHelpers getJeiHelpers();
 
+	/**
+	 * Add an association between an {@link ItemStack} and what it can craft.
+	 * (i.e. Furnace ItemStack can craft Smelting and Fuel Recipes)
+	 * Allows players to see what ingredient they need to craft in order to make recipes from a recipe category.
+	 *
+	 * @param itemLike    the {@link ItemLike} that can craft recipes (like a furnace or crafting table)
+	 * @param recipeTypes the types of recipe that the ingredient is a catalyst for
+	 *
+	 * @see #addRecipeCatalyst(ItemStack, RecipeType...) to add {@link ItemStack} catalysts.
+	 * @see #addRecipeCatalyst(IIngredientType, Object, RecipeType...) to add non-{@link ItemLike} catalysts.
+	 *
+	 * @since 19.18.2
+	 */
+	default void addRecipeCatalyst(ItemLike itemLike, RecipeType<?>... recipeTypes) {
+		addRecipeCatalyst(VanillaTypes.ITEM_STACK, new ItemStack(itemLike), recipeTypes);
+	}
+
 	/**
 	 * Add an association between an {@link ItemStack} and what it can craft.
 	 * (i.e. Furnace ItemStack can craft Smelting and Fuel Recipes)

Library/src/main/java/mezz/jei/library/plugins/debug/JeiDebugPlugin.java

@@ -327,7 +327,7 @@ private <T> void registerRecipeCatalysts(IRecipeCatalystRegistration registratio
 
 		registration.addRecipeCatalyst(DebugIngredient.TYPE, new DebugIngredient(7), DebugRecipeCategory.TYPE);
 		registration.addRecipeCatalyst(fluidHelper.getFluidIngredientType(), fluidHelper.create(Fluids.WATER.defaultFluidState().holder(), bucketVolume), DebugRecipeCategory.TYPE);
-		registration.addRecipeCatalyst(new ItemStack(Items.STICK), DebugRecipeCategory.TYPE);
+		registration.addRecipeCatalyst(Items.STICK, DebugRecipeCategory.TYPE);
 
 		RegistryUtil.getRegistry(Registries.ITEM)
 			.stream()

Library/src/main/java/mezz/jei/library/plugins/vanilla/VanillaPlugin.java

@@ -322,19 +322,19 @@ public void registerRecipeTransferHandlers(IRecipeTransferRegistration registrat
 
 	@Override
 	public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) {
-		registration.addRecipeCatalyst(new ItemStack(Blocks.CRAFTING_TABLE), RecipeTypes.CRAFTING);
-		registration.addRecipeCatalyst(new ItemStack(Blocks.CRAFTER), RecipeTypes.CRAFTING);
-		registration.addRecipeCatalyst(new ItemStack(Blocks.STONECUTTER), RecipeTypes.STONECUTTING);
-		registration.addRecipeCatalyst(new ItemStack(Blocks.FURNACE), RecipeTypes.SMELTING, RecipeTypes.FUELING);
+		registration.addRecipeCatalyst(Blocks.CRAFTING_TABLE, RecipeTypes.CRAFTING);
+		registration.addRecipeCatalyst(Blocks.CRAFTER, RecipeTypes.CRAFTING);
+		registration.addRecipeCatalyst(Blocks.STONECUTTER, RecipeTypes.STONECUTTING);
+		registration.addRecipeCatalyst(Blocks.FURNACE, RecipeTypes.SMELTING, RecipeTypes.FUELING);
 
-		registration.addRecipeCatalyst(new ItemStack(Blocks.SMOKER), RecipeTypes.SMOKING, RecipeTypes.FUELING);
-		registration.addRecipeCatalyst(new ItemStack(Blocks.BLAST_FURNACE), RecipeTypes.BLASTING, RecipeTypes.FUELING);
-		registration.addRecipeCatalyst(new ItemStack(Blocks.CAMPFIRE), RecipeTypes.CAMPFIRE_COOKING);
-		registration.addRecipeCatalyst(new ItemStack(Blocks.SOUL_CAMPFIRE), RecipeTypes.CAMPFIRE_COOKING);
-		registration.addRecipeCatalyst(new ItemStack(Blocks.BREWING_STAND), RecipeTypes.BREWING);
-		registration.addRecipeCatalyst(new ItemStack(Blocks.ANVIL), RecipeTypes.ANVIL);
-		registration.addRecipeCatalyst(new ItemStack(Blocks.SMITHING_TABLE), RecipeTypes.SMITHING);
-		registration.addRecipeCatalyst(new ItemStack(Blocks.COMPOSTER), RecipeTypes.COMPOSTING);
+		registration.addRecipeCatalyst(Blocks.SMOKER, RecipeTypes.SMOKING, RecipeTypes.FUELING);
+		registration.addRecipeCatalyst(Blocks.BLAST_FURNACE, RecipeTypes.BLASTING, RecipeTypes.FUELING);
+		registration.addRecipeCatalyst(Blocks.CAMPFIRE, RecipeTypes.CAMPFIRE_COOKING);
+		registration.addRecipeCatalyst(Blocks.SOUL_CAMPFIRE, RecipeTypes.CAMPFIRE_COOKING);
+		registration.addRecipeCatalyst(Blocks.BREWING_STAND, RecipeTypes.BREWING);
+		registration.addRecipeCatalyst(Blocks.ANVIL, RecipeTypes.ANVIL);
+		registration.addRecipeCatalyst(Blocks.SMITHING_TABLE, RecipeTypes.SMITHING);
+		registration.addRecipeCatalyst(Blocks.COMPOSTER, RecipeTypes.COMPOSTING);
 	}
 
 	public Optional<CraftingRecipeCategory> getCraftingCategory() {

gradle.properties

@@ -74,4 +74,4 @@ modrinthId=u6dRKJwZ
 jUnitVersion=5.8.2
 
 # Version
-specificationVersion=19.18.1
+specificationVersion=19.18.2