runcows misc 1.21.9 commits (Gamemode4Dev#1165)

* Add copper weapons and armor to SR

* Add copper golem to Reeling Rods

* Disassembler copper tools and armor
- untested overlay because beet is still broken

* Update base tag lists

* Add copper horse armor to Standard Crafting
- overlay may be broken due to beet not being fully updated

* Add mannequin to Reeling Rods steal_equipment

Author: runcows

base/data/gm4/tags/block/no_collision.json

@@ -27,6 +27,7 @@
     "minecraft:cave_vines_plant",
     "minecraft:cherry_sapling",
     "minecraft:cobweb",
+    {"id": "minecraft:copper_torch", "required": false},
     "minecraft:crimson_fungus",
     "minecraft:crimson_roots",
     "minecraft:dark_oak_sapling",

base/data/gm4/tags/block/waterloggable.json

@@ -1,27 +1,33 @@
 {
   "values": [
-    "#minecraft:rails",
+    "#minecraft:all_signs",
+    "minecraft:amethyst_cluster",
+    {"id": "#minecraft:bars", "required": false},
     "#minecraft:campfires",
     "#minecraft:candles",
+    {"id": "#minecraft:chains", "required": false},
+    {"id": "#minecraft:copper_chests", "required": false},
+    {"id": "#minecraft:copper_golem_statues", "required": false},
+    "#minecraft:corals",
     "#minecraft:fences",
+    {"id": "#minecraft:lanterns", "required": false},
     "#minecraft:leaves",
-    "#minecraft:all_signs",
+    {"id": "#minecraft:lightning_rods", "required": false},
+    "#minecraft:rails",
     "#minecraft:slabs",
     "#minecraft:stairs",
     "#minecraft:trapdoors",
-    "#minecraft:corals",
     "#minecraft:wall_corals",
     "#minecraft:wall_signs",
     "#minecraft:walls",
-    "minecraft:amethyst_cluster",
+    {"id": "#minecraft:wooden_shelves", "required": false},
     "minecraft:big_dripleaf",
     "minecraft:big_dripleaf_stem",
     "minecraft:black_stained_glass_pane",
     "minecraft:blue_stained_glass_pane",
     "minecraft:brown_stained_glass_pane",
     "minecraft:calibrated_sculk_sensor",
     { "id": "minecraft:chain", "required": false },
-    { "id": "minecraft:iron_chain", "required": false },
     "minecraft:chest",
     "minecraft:conduit",
     "minecraft:cyan_stained_glass_pane",

base/data/gm4/tags/entity_type/passive.json

@@ -8,10 +8,12 @@
         "minecraft:cat",
         "minecraft:chicken",
         "minecraft:cod",
+        {"id": "minecraft:copper_golem", "required": false},
         "minecraft:cow",
         "minecraft:donkey",
         "minecraft:frog",
         "minecraft:glow_squid",
+        {"id": "minecraft:happy_ghast", "required": false},
         "minecraft:horse",
         "minecraft:mooshroom",
         "minecraft:mule",

gm4_disassemblers/beet.yaml

@@ -4,6 +4,13 @@ version: 2.5.X
 
 data_pack:
   load: .
+  overlays:
+    - formats:
+        min_inclusive: 88
+        max_inclusive: 88
+      min_format: 88
+      max_format: 88
+      directory: since_88
 
 resource_pack:
   load: .

gm4_disassemblers/generate_disassembly.py

@@ -4,6 +4,16 @@
 from typing import Any
 
 ITEMS = {
+  "copper_sword": 191,
+  "copper_pickaxe": 191, 
+  "copper_axe": 191,
+  "copper_shovel": 191,
+  "copper_hoe": 191,
+  "copper_helmet": 122,
+  "copper_chestplate": 177,
+  "copper_leggings": 166,
+  "copper_boots": 144,
+
   "diamond_sword": 1562,
   "diamond_pickaxe": 1562,
   "diamond_axe": 1562,
@@ -51,10 +61,12 @@
 def beet_default(ctx: Context):
   """Creates a loot table for dropping the 9 result items when disassembling an item."""
   vanilla = ctx.inject(Vanilla)
-  vanilla.minecraft_version = '1.21.5'
+  vanilla.minecraft_version = '1.21.9'
   recipes = vanilla.data.recipes
 
   for item, durability in ITEMS.items():
+    output_pack = ctx.data.overlays["since_88"] if "copper" in item else ctx.data
+
     recipe = recipes[f"minecraft:{item}"].data
     ingredients: list[tuple[str, int]] = []
     if recipe["type"] == "minecraft:crafting_shaped":
@@ -117,13 +129,14 @@ def beet_default(ctx: Context):
         }]
       })
 
-    ctx.data[f"{ctx.project_id}:disassembleables/{item}"] = LootTable({
+    output_pack[f"{ctx.project_id}:disassembleables/{item}"] = LootTable({
       "__comment": "Generated by generate_disassembly.py",
       "type": "minecraft:generic",
       "pools": pools
     })
 
-  caller: Any = {
+  # base pack
+  caller: dict[str, Any] = {
     "__comment": "Generated by generate_disassembly.py",
     "type": "minecraft:fishing",
     "pools": [{
@@ -132,6 +145,8 @@ def beet_default(ctx: Context):
     }]
   }  
   for item in ITEMS:
+    if "copper" in item:
+      continue
     caller["pools"][0]["entries"][0]["children"].append({
       "type": "minecraft:loot_table",
       "value": f'gm4_disassemblers:disassembleables/{item}',
@@ -150,3 +165,32 @@ def beet_default(ctx: Context):
       })
 
   ctx.data[f"{ctx.project_id}:caller"] = LootTable(caller)
+
+  # since 88 overlay
+  caller_88: dict[str, Any] = {
+    "__comment": "Generated by generate_disassembly.py",
+    "type": "minecraft:fishing",
+    "pools": [{
+      "rolls": 1,
+      "entries": [{"type":"minecraft:alternatives","children":[]}]
+    }]
+  }  
+  for item in ITEMS:
+    caller_88["pools"][0]["entries"][0]["children"].append({
+      "type": "minecraft:loot_table",
+      "value": f'gm4_disassemblers:disassembleables/{item}',
+      "conditions": [{
+        "condition": "match_tool",
+        "predicate": {
+          "items": [f"minecraft:{item}"]
+        }
+      }]
+    })
+    if item.startswith("diamond_"):
+      caller_88["pools"][0]["entries"][0]["children"][-1]["conditions"].append({
+        "condition": "value_check",
+        "range": 1,
+        "value": {"type":"score","target":{"type":"fixed","name":"disassemble_diamonds"},"score":"gm4_disassembler"}
+      })
+
+  ctx.data.overlays["since_88"][f"{ctx.project_id}:caller"] = LootTable(caller_88)

gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/leashable.json

@@ -11,6 +11,7 @@
         "minecraft:camel",
         "minecraft:cat",
         "minecraft:chicken",
+        {"id": "minecraft:copper_golem", "required": false},
         "minecraft:cow",
         "minecraft:dolphin",
         "minecraft:donkey",

gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_equipment.json

@@ -4,6 +4,7 @@
     "minecraft:bogged",
     "minecraft:drowned",
     "minecraft:husk",
+    {"id": "minecraft:mannequin", "required": false},
     "minecraft:piglin",
     "minecraft:piglin_brute",
     "minecraft:player",

gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_hand.json

@@ -1,6 +1,7 @@
 {
   "values": [
     "minecraft:allay",
+    {"id": "minecraft:copper_golem", "required": false},
     "minecraft:fox",
     "minecraft:illusioner",
     "minecraft:panda",

gm4_standard_crafting/beet.yaml

@@ -4,6 +4,13 @@ version: 1.6.X
 
 data_pack:
   load: .
+  overlays:
+    - formats:
+        min_inclusive: 88
+        max_inclusive: 88
+      min_format: 88
+      max_format: 88
+      directory: since_88
 
 pipeline:
   - generate_recipes

gm4_standard_crafting/data/gm4_standard_crafting/guidebook/standard_crafting.json

@@ -409,7 +409,7 @@
         [
           {
             "translate": "text.gm4.guidebook.standard_crafting.horse_armor",
-            "fallback": "Diamond, iron, and golden armor can be crafted"
+            "fallback": "Diamond, iron, copper, and golden armor can be crafted"
           },
           "\n",
           {