Metallurgy, desire lines, crossbow cartridges (#1168)

* Remove deprecated `CanDuplicate` nbt from Gemini Shamir breed allay
- This data field was removed in 1.21.5

* Add copper torch to Crossbow Cartridges

* Metallurgy Copper Tools (not RP)

* Replace `#gm4:boots` with `#minecraft:foot_armor`

* Update `shamir_model_template.py` with copper

* Adjust gold max damage + remove redundancy (#1167)

* Update overlays with gold arborenda PR changes

* Swap most overlays to `backport_81`
- Disassemblers was left as `since_88` as the contents are generated
- Standard Crafting was left as `since_88` because inverting it is not easy without errors in prior versions

* More resource pack stuff?

* Update `modeldata_registry` with copper

Metallurgy Expansions - Update `modeldata_registry` with copper

Author: runcows

gm4/modeldata_registry.json

@@ -240,12 +240,77 @@
       "gm4_fulcio_shamir:shamir/fulcio": 115,
       "gm4_animi_shamir:shamir/animi": 124
     },
+    "copper_axe": {
+      "gm4_metallurgy:shamir/hypexperia": 110,
+      "gm4_metallurgy:shamir/arborenda": 112,
+      "gm4_metallurgy:shamir/moneo": 113,
+      "gm4_percurro_shamir:shamir/percurro": 117,
+      "gm4_audere_shamir:shamir/audere": 120,
+      "gm4_animi_shamir:shamir/animi": 124
+    },
     "copper_block": {
       "gm4_auto_crafting:guidebook_icon/auto_crafting": 1
     },
+    "copper_boots": {
+      "gm4_weighted_armour:shamir/helious": 103,
+      "gm4_metallurgy:shamir/defuse": 106,
+      "gm4_desire_lines:shamir/celaro": 118,
+      "gm4_vecto_shamir:shamir/vecto": 121,
+      "gm4_metallurgy:shamir/vibro": 123,
+      "gm4_animi_shamir:shamir/animi": 124
+    },
+    "copper_chestplate": {
+      "gm4_weighted_armour:shamir/helious": 103,
+      "gm4_metallurgy:shamir/defuse": 106,
+      "gm4_iacio_shamir:shamir/iacio": 122,
+      "gm4_animi_shamir:shamir/animi": 124
+    },
+    "copper_helmet": {
+      "gm4_weighted_armour:shamir/helious": 103,
+      "gm4_metallurgy:shamir/defuse": 106,
+      "gm4_animi_shamir:shamir/animi": 124
+    },
+    "copper_hoe": {
+      "gm4_metallurgy:shamir/gemini": 109,
+      "gm4_metallurgy:shamir/tinker": 111,
+      "gm4_metallurgy:shamir/moneo": 113,
+      "gm4_audere_shamir:shamir/audere": 120,
+      "gm4_animi_shamir:shamir/animi": 124
+    },
+    "copper_leggings": {
+      "gm4_weighted_armour:shamir/helious": 103,
+      "gm4_metallurgy:shamir/defuse": 106,
+      "gm4_animi_shamir:shamir/animi": 124
+    },
     "copper_ore": {
       "gm4_smelteries:block/ore_display/copper_ore": 2
     },
+    "copper_pickaxe": {
+      "gm4_metallurgy:shamir/forterra": 107,
+      "gm4_metallurgy:shamir/hypexperia": 110,
+      "gm4_metallurgy:shamir/tinker": 111,
+      "gm4_metallurgy:shamir/moneo": 113,
+      "gm4_lumos_shamir:shamir/lumos": 114,
+      "gm4_audere_shamir:shamir/audere": 120,
+      "gm4_animi_shamir:shamir/animi": 124
+    },
+    "copper_shovel": {
+      "gm4_metallurgy:shamir/hypexperia": 110,
+      "gm4_metallurgy:shamir/tinker": 111,
+      "gm4_metallurgy:shamir/moneo": 113,
+      "gm4_lumos_shamir:shamir/lumos": 114,
+      "gm4_audere_shamir:shamir/audere": 120,
+      "gm4_animi_shamir:shamir/animi": 124
+    },
+    "copper_sword": {
+      "gm4_metallurgy:shamir/ender_bolt": 105,
+      "gm4_metallurgy:shamir/musical": 108,
+      "gm4_metallurgy:shamir/hypexperia": 110,
+      "gm4_metallurgy:shamir/tinker": 111,
+      "gm4_orb_of_ankou:shamir/corripio": 116,
+      "gm4_percurro_shamir:shamir/percurro": 117,
+      "gm4_animi_shamir:shamir/animi": 124
+    },
     "crafting_table": {
       "gm4_custom_crafters:block/custom_crafter": 1,
       "gm4_standard_crafting:guidebook_icon/standard_crafting": 2,

gm4/plugins/resource_pack.py

@@ -68,7 +68,7 @@
 JsonType = dict[str,Any]
 
 CUSTOM_MODEL_PREFIX = 3420000
-MINECRAFT_REFERENECE_VERSION = "1.21.6"
+MINECRAFT_REFERENECE_VERSION = "1.21.9"
 
 parent_logger = logging.getLogger("gm4.resource_pack")
 

gm4_audere_shamir/data/gm4_audere_shamir/function/active_tool.mcfunction

@@ -4,18 +4,21 @@
 
 data modify storage gm4_audere_shamir:temp/player/tool SelectedItem set from entity @s SelectedItem
 execute store result score $tool_current_damage gm4_ml_data run data get storage gm4_audere_shamir:temp/player/tool SelectedItem.components."minecraft:damage"
-execute store result score $tool_max_damage gm4_ml_data run data get storage gm4_audere_shamir:temp/player/tool SelectedItem.components."minecraft:custom_data".gm4_audere_shamir.max_durability
+execute store result score $tool_max_damage gm4_ml_data run data get storage gm4_audere_shamir:temp/player/tool SelectedItem.components."minecraft:custom_data".MaxDurability
+# | MaxDamage is set by gm4_moneo_shamir:store_maximum
 
 # update newly upgraded netherite gear
 execute if score $tool_max_damage gm4_ml_data matches 1561 if predicate gm4_audere_shamir:holding_netherite run function gm4_audere_shamir:update_netherite
 
 # activate audere
 execute if score $tool_max_damage gm4_ml_data matches 59 run function gm4_audere_shamir:tools/materials/wood
 execute if score $tool_max_damage gm4_ml_data matches 131 run function gm4_audere_shamir:tools/materials/stone
+execute if score $tool_max_damage gm4_ml_data matches 190 run function gm4_audere_shamir:tools/materials/copper
 execute if score $tool_max_damage gm4_ml_data matches 250 run function gm4_audere_shamir:tools/materials/iron
 execute if score $tool_max_damage gm4_ml_data matches 1561 run function gm4_audere_shamir:tools/materials/diamond
 execute if score $tool_max_damage gm4_ml_data matches 2031 run function gm4_audere_shamir:tools/materials/netherite
-execute if score $tool_max_damage gm4_ml_data matches 33 run function gm4_audere_shamir:tools/materials/gold
+# | gold used to be listed as 33 max damage, this is kept for compatibility with old items
+execute if score $tool_max_damage gm4_ml_data matches 32..33 run function gm4_audere_shamir:tools/materials/gold
 execute if score $tool_max_damage gm4_ml_data matches 237 run function gm4_audere_shamir:tools/shears
 
 # reset storage and fake players

gm4_audere_shamir/data/gm4_audere_shamir/function/store_maximum.mcfunction

@@ -0,0 +1,10 @@
+# @s = player holding an Audere tool
+# at @s
+# run from active_tool
+
+scoreboard players operation $tool_max_damage gm4_ml_data -= $tool_current_damage gm4_ml_data
+
+execute if score $tool_max_damage gm4_ml_data matches 52..139 run effect give @s minecraft:haste 2 0
+execute if score $tool_max_damage gm4_ml_data matches 20..51 run effect give @s minecraft:haste 2 1
+execute if score $tool_max_damage gm4_ml_data matches 8..19 run effect give @s minecraft:haste 2 2
+execute if score $tool_max_damage gm4_ml_data matches ..7 run effect give @s minecraft:haste 2 3

gm4_audere_shamir/data/gm4_audere_shamir/function/tools/materials/copper.mcfunction

@@ -0,0 +1,33 @@
+# Check item in offhand to shoot
+# @s = player using the crossbow
+# at arrow
+# run from shoot/any_arrow
+
+# tripwire
+execute if entity @s[gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/string,x_rotation=-15..15] align xyz positioned ~0.5 ~ ~0.5 run function gm4_crossbow_cartridges:cables/shoot_arrow
+
+# bucket with fish/axolotl
+execute if entity @s[tag=!gm4_cb_use,predicate=gm4_crossbow_cartridges:items/bucket] run function gm4_crossbow_cartridges:projectile/bucket
+
+# torch
+execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/torch] run function gm4_crossbow_cartridges:projectile/torch
+execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/redstone_torch] run function gm4_crossbow_cartridges:projectile/redstone_torch
+execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/soul_torch] run function gm4_crossbow_cartridges:projectile/soul_torch
+
+# potions
+execute if entity @s[tag=!gm4_cb_use,predicate=gm4_crossbow_cartridges:items/potions] run function gm4_crossbow_cartridges:projectile/potions
+
+# fireball
+execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/fire_charge] run function gm4_crossbow_cartridges:projectile/fireball
+
+# wind charge
+execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/wind_charge] run function gm4_crossbow_cartridges:projectile/wind_charge
+
+# tnt
+execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/tnt] run function gm4_crossbow_cartridges:projectile/tnt
+
+# beehive
+execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/beehive] run function gm4_crossbow_cartridges:projectile/beehive
+
+tag @s remove gm4_cb_use
+data remove storage gm4_crossbow_cartridges:temp projectile

gm4_audere_shamir/data/gm4_metallurgy/tags/function/apply_band.json

@@ -0,0 +1,6 @@
+# Check blocks, to place or drop copper torch
+# @s = arrow with tag gm4_cb_ctorch, in a block
+# at @s
+# run from projectile/copper_torch/loop
+
+# EMPTY TO AVOID ERRORS

gm4_crossbow_cartridges/backport_81/data/gm4_crossbow_cartridges/function/check_projectile.mcfunction

@@ -0,0 +1,6 @@
+# Place copper torch on a valid adjacent block
+# @s = arrow with tag gm4_cb_ctorch, in a block
+# at @s
+# run from projectile/copper_torch/check
+
+# EMPTY TO AVOID ERRORS

gm4_crossbow_cartridges/backport_81/data/gm4_crossbow_cartridges/function/projectile/copper_torch/check.mcfunction

@@ -0,0 +1,11 @@
+{
+  "condition": "minecraft:entity_properties",
+  "entity": "this",
+  "predicate": {
+    "equipment": {
+      "offhand": {
+        "items": []
+      }
+    }
+  }
+}