Implement custom crafting recipes as official JSON recipes (#1053)

* Port custom crafting recipes to official JSON recipes when possible

Leaving out: auto crafter, heart canister tier 2, relocators, scuba gear
Slightly modifiers: ender hopper minecart, liquid minecart
Discarding item data: boots of ostara, mountaineering

* Add recipe unlock advancements

* Update record crafting advancement

* Optimize scuba gear advancement

* Fix red_nether_bricks unlock was missing

* Add group field to forming press recipes

* Add standard crafting recipes except stairs and slabs

* Generate standard crafting slabs and stairs recipes

* Group stairs and slabs recipes together with vanilla recipes

* Revert forming press changes

* Update recipes to 1.21.3

* Update standard crafting recipes

* Remove attribute prefix from crampons recipe

* Keep the old format for gm4_recipes

* Backport recipes with beet

* Handle when both attributes and recipe rewrites affect the same file

* Catch recipe rewrite errors

* Remove manually backported soul glass recipe

Author: misode

beet-dev.yaml

@@ -7,7 +7,7 @@ pipeline:
       - gm4.plugins.output
       - gm4.plugins.player_heads
       - gm4.plugins.resource_pack
-      - gm4.plugins.attribute_rewrite
+      - gm4.plugins.backwards
       - beet.contrib.model_merging
       - beet.contrib.optifine
       - beet.contrib.babelbox

beet-release.yaml

@@ -39,7 +39,7 @@ pipeline:
       - gm4.plugins.manifest.update_patch
       - gm4.plugins.player_heads
       - gm4.plugins.resource_pack
-      - gm4.plugins.attribute_rewrite
+      - gm4.plugins.backwards
       - beet.contrib.model_merging
       - beet.contrib.optifine
       - beet.contrib.babelbox

beet-test.yaml

@@ -9,7 +9,7 @@ pipeline:
       - gm4.plugins.output.test
       - gm4.plugins.player_heads
       - gm4.plugins.resource_pack
-      - gm4.plugins.attribute_rewrite
+      - gm4.plugins.backwards
       - gm4_guidebook.generate_guidebooks.load_page_data
       - gm4_guidebook.generate_guidebooks.load_custom_recipes
       - gm4.plugins.test.load_tests

gm4/plugins/attribute_rewrite.py gm4/plugins/backwards.pygm4/plugins/attribute_rewrite.py renamed to gm4/plugins/backwards.py

@@ -1,5 +1,17 @@
-from beet import Context, TextFileBase
 import re
+import logging
+from typing import Any
+from beet import Context, TextFileBase, Recipe
+
+logger = logging.getLogger("gm4.backwards")
+
+# Generates overlays to support older versions
+def beet_default(ctx: Context):
+  yield
+
+  rewrite_attributes(ctx)
+  rewrite_recipes(ctx)
+
 
 ATTRIBUTES_RENAMES = {
   "minecraft:armor": "minecraft:generic.armor",
@@ -36,9 +48,8 @@
   "minecraft:water_movement_efficiency": "minecraft:generic.water_movement_efficiency",
 }
 
-def beet_default(ctx: Context):
-  yield
-
+# Removes the generic. and other prefixes from attribute IDs
+def rewrite_attributes(ctx: Context):
   for id, resource in ctx.data.all():
     if isinstance(resource, TextFileBase):
       resource.source_stop
@@ -51,3 +62,50 @@ def beet_default(ctx: Context):
         overlay = ctx.data.overlays["overlay_48"]
         overlay.supported_formats = { "min_inclusive": 48, "max_inclusive": 48 }
         overlay[id] = overlay_resource
+
+
+# Rewrites the recipe ingredients to the old {"item": "..."} format
+def rewrite_recipes(ctx: Context):
+  
+  def rewrite_ingredient(ingr: str | list[str]) -> Any:
+    if isinstance(ingr, list):
+      return [rewrite_ingredient(item) for item in ingr]
+    if ingr.startswith("#"):
+      return { "tag": ingr[1:] }
+    return { "item": ingr }
+  
+  def rewrite_recipe(id: str, resource: Recipe):
+    # If an overlay already exists for this recipe, us the contents of that
+    # TODO: generalize this for all rewrite functions and handle multiple overlays
+    for overlay in ctx.data.overlays.values():
+      if id in overlay.recipes:
+        resource = overlay.recipes[id]
+        break
+
+    overlay_resource = resource.copy()
+    data = overlay_resource.data
+
+    if "crafting_transmute" in data["type"]:
+      logger.warning(f"Cannot backport crafting_transmute recipe {id}")
+      return
+
+    if "base" in data:
+      data["base"] = rewrite_ingredient(data["base"])
+    if "addition" in data:
+      data["addition"] = rewrite_ingredient(data["addition"])
+    if "ingredient" in data:
+      data["ingredient"] = rewrite_ingredient(data["ingredient"])
+    if "ingredients" in data:
+      data["ingredients"] = [rewrite_ingredient(ingr) for ingr in data["ingredients"]]
+    if "key" in data:
+      data["key"] = {k: rewrite_ingredient(ingr) for k, ingr in data["key"].items()}
+
+    overlay = ctx.data.overlays["overlay_48"]
+    overlay.supported_formats = { "min_inclusive": 48, "max_inclusive": 48 }
+    overlay[id] = overlay_resource
+
+  for id, resource in ctx.data.recipes.items():
+    try:
+      rewrite_recipe(id, resource)
+    except BaseException as e:
+      logger.error(f"Failed to backport recipe {id}: {e}")

gm4_block_compressors/data/gm4_block_compressors/advancement/recipes/compressor.json

@@ -0,0 +1,37 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "gm4_block_compressors:compressor"
+      }
+    },
+    "has_materials": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:purpur_block",
+              "minecraft:purpur_pillar",
+              "minecraft:piston",
+              "minecraft:obsidian"
+            ]
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_materials"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "gm4_block_compressors:compressor"
+    ]
+  }
+}

gm4_block_compressors/data/gm4_block_compressors/recipe/compressor.json

@@ -0,0 +1,25 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "redstone",
+  "pattern": [
+    "IPI",
+    "pOp",
+    "CCC"
+  ],
+  "key": {
+    "I": "minecraft:iron_ingot",
+    "P": "minecraft:purpur_block",
+    "p": "minecraft:piston",
+    "O": "minecraft:obsidian",
+    "C": "minecraft:cobblestone"
+  },
+  "result": {
+    "id": "minecraft:player_head",
+    "components": {
+      "minecraft:custom_model_data": "block/block_compressor_full",
+      "minecraft:profile": "$block_compressor",
+      "minecraft:custom_data": "{gm4_machines:{id:'block_compressor'}}",
+      "minecraft:custom_name": "{\"translate\":\"block.gm4.block_compressor\",\"fallback\":\"Compressor\",\"color\":\"white\",\"italic\":false}"
+    }
+  }
+}

gm4_boots_of_ostara/data/gm4_boots_of_ostara/advancement/recipes/boots_of_ostara.json

@@ -0,0 +1,36 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "gm4_boots_of_ostara:boots_of_ostara"
+      }
+    },
+    "has_materials": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:leather_boots",
+              "minecraft:moss_block",
+              "minecraft:grass_block"
+            ]
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_materials"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "gm4_boots_of_ostara:boots_of_ostara"
+    ]
+  }
+}

gm4_boots_of_ostara/data/gm4_boots_of_ostara/recipe/boots_of_ostara.json

@@ -0,0 +1,31 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "equipment",
+  "pattern": [
+    " S ",
+    "MLG",
+    " W "
+  ],
+  "key": {
+    "S": "minecraft:wheat_seeds",
+    "M": "minecraft:moss_block",
+    "L": "minecraft:leather_boots",
+    "G": "minecraft:grass_block",
+    "W": "minecraft:water_bucket"
+  },
+  "result": {
+    "id": "minecraft:leather_boots",
+    "components": {
+      "minecraft:dyed_color": {
+        "rgb": 3705899,
+        "show_in_tooltip": false
+      },
+      "minecraft:custom_model_data": "item/boots_of_ostara",
+      "minecraft:custom_data": "{gm4_boots_of_ostara:1b}",
+      "minecraft:custom_name": "{\"translate\": \"item.gm4.boots_of_ostara\",\"fallback\": \"Boots of Ostara\",\"italic\": false}",
+      "minecraft:lore": [
+        "{\"translate\":\"item.gm4.boots_of_ostara.lore\",\"fallback\":\"Brings abundance beneath you!\",\"color\":\"dark_gray\",\"italic\":false}"
+      ]
+    }
+  }
+}

gm4_disassemblers/data/gm4_disassemblers/advancement/recipes/disassembler.json

@@ -0,0 +1,36 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "gm4_disassemblers:disassembler"
+      }
+    },
+    "has_materials": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:tnt",
+              "minecraft:stonecutter",
+              "minecraft:obsidian"
+            ]
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_materials"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "gm4_disassemblers:disassembler"
+    ]
+  }
+}

gm4_disassemblers/data/gm4_disassemblers/recipe/disassembler.json

@@ -0,0 +1,25 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "redstone",
+  "pattern": [
+    "ITI",
+    "OSO",
+    "CCC"
+  ],
+  "key": {
+    "I": "minecraft:iron_ingot",
+    "T": "minecraft:tnt",
+    "O": "minecraft:obsidian",
+    "S": "minecraft:stonecutter",
+    "C": "minecraft:cobblestone"
+  },
+  "result": {
+    "id": "minecraft:player_head",
+    "components": {
+      "minecraft:custom_model_data": "item/disassembler",
+      "minecraft:profile": "$disassembler",
+      "minecraft:custom_data": "{gm4_machines:{id:'disassembler'}}",
+      "minecraft:custom_name": "{\"translate\":\"block.gm4.disassembler\",\"fallback\":\"Disassembler\",\"color\":\"white\",\"italic\":false}"
+    }
+  }
+}