🐛 修复nableMinecraft1_21ExperimentalRecipes规则在1.20.5/1.20.6中不可用的问题

common.gradle

@@ -87,6 +87,13 @@ if (mcVersion >= 12005) {
 }
 JavaVersion MIXIN_COMPATIBILITY_LEVEL = JAVA_VERSION
 
+def COMPAT_RECIPES_ITEM_ID
+if (mcVersion >= 12005) {
+	COMPAT_RECIPES_ITEM_ID = "id"
+} else {
+	COMPAT_RECIPES_ITEM_ID = "item"
+}
+
 String versionSuffix = ''
 // detect github action environment variables
 // https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
@@ -121,6 +128,12 @@ processResources {
 			text -> text.replace("/*JAVA_VERSION*/", "JAVA_${MIXIN_COMPATIBILITY_LEVEL.ordinal() + 1}")
 		}
 	}
+
+	filesMatching("assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/*.json") {
+		filter {
+			text -> text.replace("/*ams_recipes_item_id*/", COMPAT_RECIPES_ITEM_ID)
+		}
+	}
 }
 
 java {

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/bolt_armor_trim_smithing_template.json

@@ -0,0 +1,24 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "#": {
+      "item": "minecraft:diamond"
+    },
+    "C": {
+      "item": "minecraft:copper_block"
+    },
+    "S": {
+      "item": "minecraft:bolt_armor_trim_smithing_template"
+    }
+  },
+  "pattern": [
+    "#S#",
+    "#C#",
+    "###"
+  ],
+  "result": {
+    "count": 2,
+    "/*ams_recipes_item_id*/": "minecraft:bolt_armor_trim_smithing_template"
+  }
+}

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/bolt_armor_trim_smithing_template_smithing_trim.json

@@ -0,0 +1,12 @@
+{
+  "type": "minecraft:smithing_trim",
+  "addition": {
+    "tag": "minecraft:trim_materials"
+  },
+  "base": {
+    "tag": "minecraft:trimmable_armor"
+  },
+  "template": {
+    "item": "minecraft:bolt_armor_trim_smithing_template"
+  }
+}

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/bone_block.json

@@ -11,7 +11,7 @@
     }
   },
   "result":{
-    "item":"minecraft:bone_block",
+    "/*ams_recipes_item_id*/":"minecraft:bone_block",
     "count":3
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/bundle.json

@@ -14,7 +14,7 @@
     }
   },
   "result":{
-    "item":"minecraft:bundle",
+    "/*ams_recipes_item_id*/":"minecraft:bundle",
     "count":1
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/chiseled_copper.json

@@ -11,6 +11,6 @@
     "#"
   ],
   "result": {
-    "item": "minecraft:chiseled_copper"
+    "/*ams_recipes_item_id*/": "minecraft:chiseled_copper"
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/chiseled_copper_from_copper_block_stonecutting.json

@@ -1,8 +1,10 @@
 {
   "type": "minecraft:stonecutting",
-  "count": 4,
   "ingredient": {
     "item": "minecraft:copper_block"
   },
-  "result": "minecraft:chiseled_copper"
+  "result": {
+    "count": 4,
+    "/*ams_recipes_item_id*/": "minecraft:chiseled_copper"
+  }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/chiseled_copper_from_cut_copper_stonecutting.json

@@ -1,8 +1,10 @@
 {
   "type": "minecraft:stonecutting",
-  "count": 1,
   "ingredient": {
     "item": "minecraft:cut_copper"
   },
-  "result": "minecraft:chiseled_copper"
+  "result": {
+    "count": 1,
+    "/*ams_recipes_item_id*/": "minecraft:chiseled_copper"
+  }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/chiseled_tuff.json

@@ -11,6 +11,6 @@
     "#"
   ],
   "result": {
-    "item": "minecraft:chiseled_tuff"
+    "/*ams_recipes_item_id*/": "minecraft:chiseled_tuff"
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/chiseled_tuff_bricks.json

@@ -11,6 +11,6 @@
     "#"
   ],
   "result": {
-    "item": "minecraft:chiseled_tuff_bricks"
+    "/*ams_recipes_item_id*/": "minecraft:chiseled_tuff_bricks"
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/chiseled_tuff_bricks_from_polished_tuff_stonecutting.json

@@ -1,8 +1,10 @@
 {
   "type": "minecraft:stonecutting",
-  "count": 1,
   "ingredient": {
     "item": "minecraft:polished_tuff"
   },
-  "result": "minecraft:chiseled_tuff_bricks"
+  "result": {
+    "count": 1,
+    "/*ams_recipes_item_id*/": "minecraft:chiseled_tuff_bricks"
+  }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/chiseled_tuff_bricks_from_tuff_bricks_stonecutting.json

@@ -1,8 +1,10 @@
 {
   "type": "minecraft:stonecutting",
-  "count": 1,
   "ingredient": {
     "item": "minecraft:tuff_bricks"
   },
-  "result": "minecraft:chiseled_tuff_bricks"
+  "result": {
+    "count": 1,
+    "/*ams_recipes_item_id*/": "minecraft:chiseled_tuff_bricks"
+  }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/chiseled_tuff_bricks_from_tuff_stonecutting.json

@@ -1,8 +1,10 @@
 {
   "type": "minecraft:stonecutting",
-  "count": 1,
   "ingredient": {
     "item": "minecraft:tuff"
   },
-  "result": "minecraft:chiseled_tuff_bricks"
+  "result": {
+    "count": 1,
+    "/*ams_recipes_item_id*/": "minecraft:chiseled_tuff_bricks"
+  }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/chiseled_tuff_from_tuff_stonecutting.json

@@ -1,8 +1,10 @@
 {
   "type": "minecraft:stonecutting",
-  "count": 1,
   "ingredient": {
     "item": "minecraft:tuff"
   },
-  "result": "minecraft:chiseled_tuff"
+  "result": {
+    "count": 1,
+    "/*ams_recipes_item_id*/": "minecraft:chiseled_tuff"
+  }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/copper_bulb.json

@@ -19,6 +19,6 @@
   ],
   "result": {
     "count": 4,
-    "item": "minecraft:copper_bulb"
+    "/*ams_recipes_item_id*/": "minecraft:copper_bulb"
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/copper_door.json

@@ -13,6 +13,6 @@
   ],
   "result": {
     "count": 3,
-    "item": "minecraft:copper_door"
+    "/*ams_recipes_item_id*/": "minecraft:copper_door"
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/copper_grate.json

@@ -13,6 +13,6 @@
   ],
   "result": {
     "count": 4,
-    "item": "minecraft:copper_grate"
+    "/*ams_recipes_item_id*/": "minecraft:copper_grate"
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/copper_grate_from_copper_block_stonecutting.json

@@ -1,8 +1,10 @@
 {
   "type": "minecraft:stonecutting",
-  "count": 4,
   "ingredient": {
     "item": "minecraft:copper_block"
   },
-  "result": "minecraft:copper_grate"
+  "result": {
+    "count": 4,
+    "/*ams_recipes_item_id*/": "minecraft:copper_grate"
+  }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/copper_trapdoor.json

@@ -12,6 +12,6 @@
   ],
   "result": {
     "count": 2,
-    "item": "minecraft:copper_trapdoor"
+    "/*ams_recipes_item_id*/": "minecraft:copper_trapdoor"
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/crafter.json

@@ -21,6 +21,6 @@
     "RDR"
   ],
   "result": {
-    "item": "minecraft:crafter"
+    "/*ams_recipes_item_id*/": "minecraft:crafter"
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/dispenser1.json

@@ -9,7 +9,7 @@
     }
   ],
   "result":{
-    "item":"minecraft:dispenser",
+    "/*ams_recipes_item_id*/":"minecraft:dispenser",
     "count":1
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/dispenser2.json

@@ -17,7 +17,7 @@
     }
   },
   "result":{
-    "item":"minecraft:dispenser",
+    "/*ams_recipes_item_id*/":"minecraft:dispenser",
     "count":1
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/elytra.json

@@ -20,7 +20,7 @@
     }
   },
   "result":{
-    "item":"minecraft:elytra",
+    "/*ams_recipes_item_id*/":"minecraft:elytra",
     "count":1
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/enchanted_golden_apples.json

@@ -14,7 +14,7 @@
         }
     },
     "result": {
-        "item": "minecraft:enchanted_golden_apple",
+        "/*ams_recipes_item_id*/": "minecraft:enchanted_golden_apple",
         "count": 1
     }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/exposed_chiseled_copper.json

@@ -11,6 +11,6 @@
     "#"
   ],
   "result": {
-    "item": "minecraft:exposed_chiseled_copper"
+    "/*ams_recipes_item_id*/": "minecraft:exposed_chiseled_copper"
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/exposed_chiseled_copper_from_exposed_copper_stonecutting.json

@@ -1,8 +1,10 @@
 {
   "type": "minecraft:stonecutting",
-  "count": 4,
   "ingredient": {
     "item": "minecraft:exposed_copper"
   },
-  "result": "minecraft:exposed_chiseled_copper"
+  "result": {
+    "count": 4,
+    "/*ams_recipes_item_id*/": "minecraft:exposed_chiseled_copper"
+  }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/exposed_chiseled_copper_from_exposed_cut_copper_stonecutting.json

@@ -1,8 +1,10 @@
 {
   "type": "minecraft:stonecutting",
-  "count": 1,
   "ingredient": {
     "item": "minecraft:exposed_cut_copper"
   },
-  "result": "minecraft:exposed_chiseled_copper"
+  "result": {
+    "count": 1,
+    "/*ams_recipes_item_id*/": "minecraft:exposed_chiseled_copper"
+  }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/exposed_copper_bulb.json

@@ -19,6 +19,6 @@
   ],
   "result": {
     "count": 4,
-    "item": "minecraft:exposed_copper_bulb"
+    "/*ams_recipes_item_id*/": "minecraft:exposed_copper_bulb"
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/exposed_copper_door.json

@@ -13,6 +13,6 @@
   ],
   "result": {
     "count": 3,
-    "item": "minecraft:exposed_copper_door"
+    "/*ams_recipes_item_id*/": "minecraft:exposed_copper_door"
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/exposed_copper_grate.json

@@ -13,6 +13,6 @@
   ],
   "result": {
     "count": 4,
-    "item": "minecraft:exposed_copper_grate"
+    "/*ams_recipes_item_id*/": "minecraft:exposed_copper_grate"
   }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/exposed_copper_grate_from_exposed_copper_stonecutting.json

@@ -1,8 +1,10 @@
 {
   "type": "minecraft:stonecutting",
-  "count": 4,
   "ingredient": {
     "item": "minecraft:exposed_copper"
   },
-  "result": "minecraft:exposed_copper_grate"
+  "result": {
+    "count": 4,
+    "/*ams_recipes_item_id*/": "minecraft:exposed_copper_grate"
+  }
 }

src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipes/exposed_copper_trapdoor.json

@@ -12,6 +12,6 @@
   ],
   "result": {
     "count": 2,
-    "item": "minecraft:exposed_copper_trapdoor"
+    "/*ams_recipes_item_id*/": "minecraft:exposed_copper_trapdoor"
   }
 }