Fix autogenerating mortar recipes (#4498)

Author: jurrejelle

docs/content/Modpacks/Changes/v7.5.0.md

@@ -23,3 +23,6 @@ You also need to adjust the generics of `getType()` and `createTemplate()` to ma
 
 ## Machine & Cover Copy/Paste System
 A new system for copying machines using the Machine Memory Card has been added, see [this page](../Other-Topics/Cover-Machine-Copy-Paste-Support.md) if you want to add extra copy/paste behaviour to your own machines and covers.
+
+## Mortar Recipe Fix
+Previously, adding GTToolType.MORTAR to your tool did not automatically generate the recipe. This has been fixed. If you previously generated a recipe using this, you need to remove your manual recipe.

src/main/java/com/gregtechceu/gtceu/data/recipe/generated/ToolRecipeHandler.java

@@ -25,6 +25,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.level.block.Blocks;
 
 import com.tterrag.registrate.util.entry.ItemEntry;
 import it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap;
@@ -63,14 +64,19 @@ public static void run(@NotNull Consumer<FinishedRecipe> provider, @NotNull Mate
     }
 
     private static void processTool(@NotNull Consumer<FinishedRecipe> provider, @NotNull Material material) {
+        ItemStack stick = new ItemStack(Items.STICK);
+        MaterialEntry ingot = new MaterialEntry(
+                material.hasProperty(PropertyKey.GEM) ? TagPrefix.gem : TagPrefix.ingot, material);
+        addToolRecipe(provider, material, GTToolType.MORTAR, false,
+                " I ", "SIS", "SSS",
+                'I', ingot,
+                'S', new ItemStack(Blocks.STONE));
+
         if (!material.shouldGenerateRecipesFor(plate)) {
             return;
         }
 
-        ItemStack stick = new ItemStack(Items.STICK);
         MaterialEntry plate = new MaterialEntry(TagPrefix.plate, material);
-        MaterialEntry ingot = new MaterialEntry(
-                material.hasProperty(PropertyKey.GEM) ? TagPrefix.gem : TagPrefix.ingot, material);
 
         if (material.hasFlag(GENERATE_PLATE)) {
             addToolRecipe(provider, material, GTToolType.MINING_HAMMER, true,

src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CustomToolRecipes.java

@@ -130,7 +130,6 @@ private static void registerPowerUnitRecipes(@NotNull Consumer<FinishedRecipe> p
 
     private static void registerCustomToolRecipes(@NotNull Consumer<FinishedRecipe> provider) {
         registerFlintToolRecipes(provider);
-        registerMortarRecipes(provider);
         registerSoftToolRecipes(provider);
         registerElectricRecipes(provider);
 
@@ -178,20 +177,6 @@ private static void registerFlintToolRecipes(@NotNull Consumer<FinishedRecipe> p
                 'S', stick);
     }
 
-    private static void registerMortarRecipes(@NotNull Consumer<FinishedRecipe> provider) {
-        for (Material material : new Material[] {
-                GTMaterials.Bronze, GTMaterials.Iron, GTMaterials.Invar, GTMaterials.Steel,
-                GTMaterials.DamascusSteel, GTMaterials.CobaltBrass, GTMaterials.WroughtIron }) {
-
-            addToolRecipe(provider, material, GTToolType.MORTAR, false,
-                    " I ", "SIS", "SSS",
-                    'I',
-                    new MaterialEntry(material.hasProperty(PropertyKey.GEM) ? TagPrefix.gem : TagPrefix.ingot,
-                            material),
-                    'S', new ItemStack(Blocks.STONE));
-        }
-    }
-
     private static void registerSoftToolRecipes(@NotNull Consumer<FinishedRecipe> provider) {
         final ItemStack stick = new ItemStack(Items.STICK);