Add grindstone category [1.21.1] (#4050)

Sleepy-Horse · web-flow · commit 5d1ca56c2ee8 · 2025-07-30T04:53:55.000-10:00
diff --git a/Common/src/main/java/mezz/jei/common/platform/IPlatformRecipeHelper.java b/Common/src/main/java/mezz/jei/common/platform/IPlatformRecipeHelper.java
@@ -3,9 +3,12 @@
 import mezz.jei.api.recipe.vanilla.IJeiBrewingRecipe;
 import mezz.jei.api.recipe.vanilla.IVanillaRecipeFactory;
 import mezz.jei.api.runtime.IIngredientManager;
+import net.minecraft.core.Holder;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.alchemy.PotionBrewing;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.SmithingRecipe;
+import net.minecraft.world.item.enchantment.Enchantment;
 
 import java.util.List;
 
@@ -15,4 +18,6 @@ public interface IPlatformRecipeHelper {
 	Ingredient getTemplate(SmithingRecipe recipe);
 
 	List<IJeiBrewingRecipe> getBrewingRecipes(IIngredientManager ingredientManager, IVanillaRecipeFactory vanillaRecipeFactory, PotionBrewing potionBrewing);
+
+	boolean isItemEnchantable(ItemStack stack, Holder<Enchantment> enchantment);
 }
diff --git a/Common/src/main/resources/assets/jei/lang/en_us.json b/Common/src/main/resources/assets/jei/lang/en_us.json
@@ -297,6 +297,7 @@
   "gui.jei.category.brewing.steps": "Steps: %s",
   "gui.jei.category.compostable": "Composting",
   "gui.jei.category.compostable.chance": "Chance: %s%%",
+  "gui.jei.category.grindstone.experience": "%s to %s XP",
   "gui.jei.category.itemInformation": "Information",
   "gui.jei.category.tagInformation": "%s Tags",
   "gui.jei.category.tagInformation.block": "Block Tags",
diff --git a/CommonApi/src/main/java/mezz/jei/api/constants/RecipeTypes.java b/CommonApi/src/main/java/mezz/jei/api/constants/RecipeTypes.java
@@ -5,6 +5,7 @@
 import mezz.jei.api.recipe.vanilla.IJeiBrewingRecipe;
 import mezz.jei.api.recipe.vanilla.IJeiCompostingRecipe;
 import mezz.jei.api.recipe.vanilla.IJeiFuelingRecipe;
+import mezz.jei.api.recipe.vanilla.IJeiGrindstoneRecipe;
 import mezz.jei.api.recipe.vanilla.IJeiIngredientInfoRecipe;
 import mezz.jei.api.recipe.vanilla.IVanillaRecipeFactory;
 import mezz.jei.api.registration.IRecipeRegistration;
@@ -117,6 +118,16 @@ public final class RecipeTypes {
 	public static final RecipeType<IJeiAnvilRecipe> ANVIL =
 		RecipeType.create(ModIds.MINECRAFT_ID, "anvil", IJeiAnvilRecipe.class);
 
+	/**
+	 * The grindstone recipe type.
+	 *
+	 * @see IVanillaRecipeFactory#createGrindstoneRecipe to create new grindstone recipes in JEI.
+	 *
+	 * @since 19.22.1
+	 */
+	public static final RecipeType<IJeiGrindstoneRecipe> GRINDSTONE =
+			RecipeType.create(ModIds.MINECRAFT_ID, "grindstone", IJeiGrindstoneRecipe.class);
+
 	/**
 	 * The smithing recipe type.
 	 * Automatically includes every
diff --git a/CommonApi/src/main/java/mezz/jei/api/recipe/vanilla/IJeiGrindstoneRecipe.java b/CommonApi/src/main/java/mezz/jei/api/recipe/vanilla/IJeiGrindstoneRecipe.java
@@ -0,0 +1,71 @@
+package mezz.jei.api.recipe.vanilla;
+
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.util.List;
+
+/**
+ * There is no vanilla registry of Grindstone Recipes,
+ * so JEI creates these Grindstone recipes to use internally.
+ *
+ * Create your own with {@link IVanillaRecipeFactory#createGrindstoneRecipe}
+ * @since 19.22.1
+ */
+public interface IJeiGrindstoneRecipe {
+	/**
+	 * Get the inputs that go into the top slot of the Grindstone.
+	 *
+	 * @since 19.22.1
+	 */
+	@Unmodifiable
+	List<ItemStack> getTopInputs();
+
+	/**
+	 * Get the inputs that go into the bottom slot of the Grindstone.
+	 *
+	 * @since 19.22.1
+	 */
+	@Unmodifiable
+	List<ItemStack> getBottomInputs();
+
+	/**
+	 * Get the outputs of the Grindstone recipe.
+	 *
+	 * @since 19.22.1
+	 */
+	@Unmodifiable
+	List<ItemStack> getOutputs();
+
+	/**
+	 * The minimum XP that a player can receive.
+	 *
+	 * @since 19.22.1
+	 */
+	int getMinXpReward();
+
+	/**
+	 * The maximum XP that a player can receive.
+	 *
+	 * @since 19.22.1
+	 */
+	int getMaxXpReward();
+
+	/**
+	 * Unique ID for this recipe.
+	 *
+	 * @since 19.22.1
+	 */
+	@Nullable
+	ResourceLocation getUid();
+
+	/**
+	 * Make the output render only, to avoid displaying unnecessary crafting recipes when looking up outputs.
+	 *
+	 * @since 19.22.1
+	 */
+	@Unmodifiable
+	boolean isOutputRenderOnly();
+}
diff --git a/CommonApi/src/main/java/mezz/jei/api/recipe/vanilla/IVanillaRecipeFactory.java b/CommonApi/src/main/java/mezz/jei/api/recipe/vanilla/IVanillaRecipeFactory.java
@@ -42,6 +42,21 @@ public interface IVanillaRecipeFactory {
 	 */
 	IJeiAnvilRecipe createAnvilRecipe(List<ItemStack> leftInputs, List<ItemStack> rightInputs, List<ItemStack> outputs, ResourceLocation uid);
 
+	/**
+	 * Create a grindstone recipe for the given inputs and output.
+	 * The number of inputs in the top and bottom must match.
+	 *
+	 * @param topInputs    The itemStack(s) placed on the top slot.
+	 * @param bottomInputs The itemStack(s) placed on the bottom slot.
+	 * @param outputs      The resulting itemStack(s).
+	 * @param minXp        The minimum amount of XP that a player can receive.
+	 * @param maxXp        The maximum amount of XP that a player can receive.
+	 * @param uid		   The unique ID for this recipe.
+	 *
+	 * @since 19.22.1
+	 */
+	IJeiGrindstoneRecipe createGrindstoneRecipe(List<ItemStack> topInputs, List<ItemStack> bottomInputs, List<ItemStack> outputs, int minXp, int maxXp, ResourceLocation uid);
+
 	/**
 	 * Create a new brewing recipe.
 	 * By default, all brewing recipes are already detected and added by JEI.
diff --git a/Fabric/src/main/java/mezz/jei/fabric/platform/RecipeHelper.java b/Fabric/src/main/java/mezz/jei/fabric/platform/RecipeHelper.java
@@ -4,11 +4,14 @@
 import mezz.jei.api.recipe.vanilla.IVanillaRecipeFactory;
 import mezz.jei.api.runtime.IIngredientManager;
 import mezz.jei.common.platform.IPlatformRecipeHelper;
+import net.minecraft.core.Holder;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.alchemy.PotionBrewing;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.SmithingRecipe;
 import net.minecraft.world.item.crafting.SmithingTransformRecipe;
 import net.minecraft.world.item.crafting.SmithingTrimRecipe;
+import net.minecraft.world.item.enchantment.Enchantment;
 
 import java.util.List;
 
@@ -50,4 +53,9 @@ public Ingredient getTemplate(SmithingRecipe recipe) {
 	public List<IJeiBrewingRecipe> getBrewingRecipes(IIngredientManager ingredientManager, IVanillaRecipeFactory vanillaRecipeFactory, PotionBrewing potionBrewing) {
 		return BrewingRecipeMaker.getBrewingRecipes(ingredientManager, vanillaRecipeFactory, potionBrewing);
 	}
+
+	@Override
+	public boolean isItemEnchantable(ItemStack stack, Holder<Enchantment> enchantment) {
+		return true;
+	}
 }
diff --git a/Forge/src/main/java/mezz/jei/forge/platform/RecipeHelper.java b/Forge/src/main/java/mezz/jei/forge/platform/RecipeHelper.java
@@ -4,11 +4,14 @@
 import mezz.jei.api.recipe.vanilla.IVanillaRecipeFactory;
 import mezz.jei.api.runtime.IIngredientManager;
 import mezz.jei.common.platform.IPlatformRecipeHelper;
+import net.minecraft.core.Holder;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.alchemy.PotionBrewing;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.SmithingRecipe;
 import net.minecraft.world.item.crafting.SmithingTransformRecipe;
 import net.minecraft.world.item.crafting.SmithingTrimRecipe;
+import net.minecraft.world.item.enchantment.Enchantment;
 
 import java.util.List;
 
@@ -50,4 +53,9 @@ public Ingredient getTemplate(SmithingRecipe recipe) {
 	public List<IJeiBrewingRecipe> getBrewingRecipes(IIngredientManager ingredientManager, IVanillaRecipeFactory vanillaRecipeFactory, PotionBrewing potionBrewing) {
 		return BrewingRecipeMaker.getBrewingRecipes(ingredientManager, vanillaRecipeFactory, potionBrewing);
 	}
+
+	@Override
+	public boolean isItemEnchantable(ItemStack stack, Holder<Enchantment> enchantment) {
+		return stack.getItem().isEnchantable(stack);
+	}
 }
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/VanillaPlugin.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/VanillaPlugin.java
@@ -56,6 +56,8 @@
 import mezz.jei.library.plugins.vanilla.crafting.replacers.ShulkerBoxColoringRecipeMaker;
 import mezz.jei.library.plugins.vanilla.crafting.replacers.SuspiciousStewRecipeMaker;
 import mezz.jei.library.plugins.vanilla.crafting.replacers.TippedArrowRecipeMaker;
+import mezz.jei.library.plugins.vanilla.grindstone.GrindstoneRecipeCategory;
+import mezz.jei.library.plugins.vanilla.grindstone.GrindstoneRecipeMaker;
 import mezz.jei.library.plugins.vanilla.gui.InventoryEffectRendererGuiHandler;
 import mezz.jei.library.plugins.vanilla.gui.RecipeBookGuiHandler;
 import mezz.jei.library.plugins.vanilla.gui.ToastGuiHandler;
@@ -84,6 +86,7 @@
 import net.minecraft.client.gui.screens.inventory.CraftingScreen;
 import net.minecraft.client.gui.screens.inventory.EffectRenderingInventoryScreen;
 import net.minecraft.client.gui.screens.inventory.FurnaceScreen;
+import net.minecraft.client.gui.screens.inventory.GrindstoneScreen;
 import net.minecraft.client.gui.screens.inventory.InventoryScreen;
 import net.minecraft.client.gui.screens.inventory.SmithingScreen;
 import net.minecraft.client.gui.screens.inventory.SmokerScreen;
@@ -224,7 +227,8 @@ public void registerCategories(IRecipeCategoryRegistration registration) {
 			new CompostableRecipeCategory(guiHelper),
 			new FurnaceFuelCategory(textures),
 			new BrewingRecipeCategory(guiHelper),
-			new AnvilRecipeCategory(guiHelper)
+			new AnvilRecipeCategory(guiHelper),
+			new GrindstoneRecipeCategory(guiHelper)
 		);
 	}
 
@@ -280,6 +284,7 @@ public void registerRecipes(IRecipeRegistration registration) {
 		List<IJeiBrewingRecipe> brewingRecipes = recipeHelper.getBrewingRecipes(ingredientManager, vanillaRecipeFactory, potionBrewing);
 		brewingRecipes.sort(Comparator.comparingInt(IJeiBrewingRecipe::getBrewingSteps));
 		registration.addRecipes(RecipeTypes.BREWING, brewingRecipes);
+		registration.addRecipes(RecipeTypes.GRINDSTONE, GrindstoneRecipeMaker.getGrindstoneRecipes(ingredientManager, recipeHelper));
 	}
 
 	@Override
@@ -292,6 +297,7 @@ public void registerGuiHandlers(IGuiHandlerRegistration registration) {
 		registration.addRecipeClickArea(SmokerScreen.class, 78, 32, 28, 23, RecipeTypes.SMOKING, RecipeTypes.FUELING);
 		registration.addRecipeClickArea(BlastFurnaceScreen.class, 78, 32, 28, 23, RecipeTypes.BLASTING, RecipeTypes.FUELING);
 		registration.addRecipeClickArea(AnvilScreen.class, 102, 48, 22, 15, RecipeTypes.ANVIL);
+		registration.addRecipeClickArea(GrindstoneScreen.class, 92, 31, 28, 21, RecipeTypes.GRINDSTONE);
 		registration.addRecipeClickArea(SmithingScreen.class, 68, 49, 22, 15, RecipeTypes.SMITHING);
 
 		registration.addGenericGuiContainerHandler(EffectRenderingInventoryScreen.class, new InventoryEffectRendererGuiHandler<>());
@@ -341,6 +347,7 @@ public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) {
 		registration.addRecipeCatalyst(Blocks.BLAST_FURNACE, RecipeTypes.BLASTING);
 		registration.addRecipeCatalyst(Blocks.BREWING_STAND, RecipeTypes.BREWING);
 		registration.addRecipeCatalyst(Blocks.ANVIL, RecipeTypes.ANVIL);
+		registration.addRecipeCatalyst(Blocks.GRINDSTONE, RecipeTypes.GRINDSTONE);
 		registration.addRecipeCatalyst(Blocks.SMITHING_TABLE, RecipeTypes.SMITHING);
 		registration.addRecipeCatalyst(Blocks.COMPOSTER, RecipeTypes.COMPOSTING);
 	}
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/VanillaRecipeFactory.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/VanillaRecipeFactory.java
@@ -12,9 +12,11 @@
 import mezz.jei.library.plugins.vanilla.brewing.BrewingRecipeUtil;
 import mezz.jei.library.plugins.vanilla.brewing.JeiBrewingRecipe;
 import mezz.jei.library.plugins.vanilla.crafting.JeiShapedRecipeBuilder;
+import mezz.jei.library.plugins.vanilla.grindstone.GrindstoneRecipe;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.CraftingBookCategory;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -64,6 +66,15 @@ public AnvilRecipe createAnvilRecipe(List<ItemStack> leftInputs, List<ItemStack>
 		return new AnvilRecipe(List.copyOf(leftInputs), List.copyOf(rightInputs), List.copyOf(outputs), null);
 	}
 
+	@Override
+	public GrindstoneRecipe createGrindstoneRecipe(List<ItemStack> topInputs, List<ItemStack> bottomInputs, List<ItemStack> outputs, int minXp, int maxXp, @Nullable ResourceLocation uid) {
+		ErrorUtil.checkNotEmpty(topInputs, "topInputs");
+		ErrorUtil.checkNotNull(bottomInputs, "bottomInputs");
+		ErrorUtil.checkNotEmpty(outputs, "outputs");
+
+		return new GrindstoneRecipe(List.copyOf(topInputs), List.copyOf(bottomInputs), List.copyOf(outputs), minXp, maxXp, uid);
+	}
+
 	@Override
 	public IJeiBrewingRecipe createBrewingRecipe(List<ItemStack> ingredients, ItemStack potionInput, ItemStack potionOutput, ResourceLocation uid) {
 		ErrorUtil.checkNotEmpty(ingredients, "ingredients");
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/anvil/AnvilRecipeMaker.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/anvil/AnvilRecipeMaker.java
@@ -287,7 +287,7 @@ private static Stream<IJeiAnvilRecipe> getRepairRecipes(
 					damagedThreeQuartersSingletonList,
 					damagedThreeQuartersSingletonList,
 					List.of(damagedHalf),
-					ResourceLocation.fromNamespaceAndPath(itemModId, "self_repair." + ingredientIdPath)
+					ResourceLocation.fromNamespaceAndPath(itemModId, "anvil.self_repair." + ingredientIdPath)
 				);
 				consumer.accept(repairWithSame);
 
@@ -298,7 +298,7 @@ private static Stream<IJeiAnvilRecipe> getRepairRecipes(
 						List.of(damagedFully),
 						repairMaterials,
 						damagedThreeQuartersSingletonList,
-						ResourceLocation.fromNamespaceAndPath(itemModId, "materials_repair." + ingredientIdPath)
+						ResourceLocation.fromNamespaceAndPath(itemModId, "anvil.materials_repair." + ingredientIdPath)
 					);
 					consumer.accept(repairWithMaterial);
 				}
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/grindstone/GrindstoneRecipe.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/grindstone/GrindstoneRecipe.java
@@ -0,0 +1,74 @@
+package mezz.jei.library.plugins.vanilla.grindstone;
+
+import mezz.jei.api.recipe.vanilla.IJeiGrindstoneRecipe;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.util.List;
+
+public record GrindstoneRecipe(
+		List<ItemStack> topInputs,
+		List<ItemStack> bottomInputs,
+		List<ItemStack> outputs,
+		int minXpReward,
+		int maxXpReward,
+		@Nullable ResourceLocation uid,
+		boolean isOutputRenderOnly
+) implements IJeiGrindstoneRecipe {
+
+	public GrindstoneRecipe(
+			List<ItemStack> topInputs,
+			List<ItemStack> bottomInputs,
+			List<ItemStack> outputs,
+			int minXpReward,
+			int maxXpReward,
+			@Nullable ResourceLocation uid) {
+		this(topInputs, bottomInputs, outputs, minXpReward, maxXpReward, uid, true);
+	}
+
+	@Override
+	@Unmodifiable
+	@NotNull
+	public List<ItemStack> getTopInputs() {
+		return topInputs;
+	}
+
+	@Override
+	@Unmodifiable
+	@NotNull
+	public List<ItemStack> getBottomInputs() {
+		return bottomInputs;
+	}
+
+	@Override
+	@Unmodifiable
+	@NotNull
+	public List<ItemStack> getOutputs() {
+		return outputs;
+	}
+
+	@Override
+	public int getMinXpReward() {
+		return minXpReward;
+	}
+
+	@Override
+	public int getMaxXpReward() {
+		return maxXpReward;
+	}
+
+	@Override
+	@Nullable
+	public ResourceLocation getUid() {
+		return uid;
+	}
+
+	@Override
+	@Unmodifiable
+	public boolean isOutputRenderOnly() {
+		return isOutputRenderOnly;
+	}
+}
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/grindstone/GrindstoneRecipeCategory.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/grindstone/GrindstoneRecipeCategory.java
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/grindstone/GrindstoneRecipeMaker.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/grindstone/GrindstoneRecipeMaker.java
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/grindstone/package-info.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/grindstone/package-info.java
diff --git a/NeoForge/src/main/java/mezz/jei/neoforge/platform/RecipeHelper.java b/NeoForge/src/main/java/mezz/jei/neoforge/platform/RecipeHelper.java
diff --git a/gradle.properties b/gradle.properties
