Metallurgy 1.21 Feature Updates (Gamemode4Dev#1021)

* Metallurgy 1.21 Feature Updates

- add mace to weapon shamir validity
  - animi
  - ender bolt
  - hypexperia
  - musical
  - percurro

- add armadillo support to gemini

* Sort tags alphabetically

---------

Co-authored-by: Misode <misoloo64@gmail.com>

gm4_animi_shamir/data/gm4_animi_shamir/tags/item/valid_items.json

@@ -17,6 +17,7 @@
     "minecraft:elytra",
     "minecraft:fishing_rod",
     "minecraft:flint_and_steel",
+    "minecraft:mace",
     "minecraft:shears",
     "minecraft:shield",
     "minecraft:spyglass",

gm4_metallurgy/data/gm4_ender_bolt_shamir/tags/item/valid_items.json

@@ -1,6 +1,7 @@
 {
   "values": [
     "#minecraft:swords",
+    "minecraft:mace",
     "minecraft:trident"
   ]
 }

gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_armadillo.json

@@ -0,0 +1,15 @@
+{
+  "criteria": {
+    "breed_armadillos": {
+      "trigger": "minecraft:bred_animals",
+      "conditions": {
+        "child": {
+          "type": "armadillo"
+        }
+      }
+    }
+  },
+  "rewards": {
+    "function": "gm4_gemini_shamir:breed/check_armadillo"
+  }
+}

gm4_metallurgy/data/gm4_gemini_shamir/function/breed/check_armadillo.mcfunction

@@ -0,0 +1,6 @@
+# run from breed_armadillo.json (advancement)
+# @s = player who has bred a mob
+
+execute if predicate gm4_gemini_shamir:holding_gemini as @e[type=armadillo,distance=..10,limit=1,sort=nearest,nbt=!{InLove:0}] at @s run summon armadillo ~ ~ ~ {Age:-23999}
+
+advancement revoke @s only gm4_gemini_shamir:breed_armadillo

gm4_metallurgy/data/gm4_hypexperia_shamir/tags/item/valid_items.json

@@ -5,6 +5,7 @@
     "#minecraft:shovels",
     "#minecraft:swords",
     "minecraft:fishing_rod",
+    "minecraft:mace",
     "minecraft:trident"
   ]
 }

gm4_metallurgy/data/gm4_musical_shamir/tags/item/valid_items.json

@@ -1,6 +1,7 @@
 {
   "values": [
     "#minecraft:swords",
+    "minecraft:mace",
     "minecraft:trident"
   ]
 }

gm4_percurro_shamir/data/gm4_percurro_shamir/tags/item/valid_items.json

@@ -2,6 +2,7 @@
   "values": [
     "#minecraft:axes",
     "#minecraft:swords",
+    "minecraft:mace",
     "minecraft:trident"
   ]
 }