add new armor trims

CHANGELOG.txt

@@ -78,6 +78,12 @@ Do not use this mod in attempt to harass Mojang. They are hard workers and know
 
 ## ARMOR TRIMS
 - Added Undead Armor Trim, found in Catacombs
+- Added Matrix Armor Trim, found in Catacombs
+- Added Martyr Armor Trim, found in Badlands Ruins
+- Added Zephyr Armor Trim, found in Desert Ruins
+- Added Cot Armor Trim, found in Savanna Ruins
+- Added Overgrowth Armor Trim, found in Jungle Ruins
+- Added Geode Armor Trim, found in Deepslate Ruins
 
 ## CYAN ROSE
 - Sniffers can now dig up Cyan Rose Seeds
@@ -349,7 +355,7 @@ Do not use this mod in attempt to harass Mojang. They are hard workers and know
     - Wither Pottery Sherd -> Badlands Ruins
 
 ## DECORATED POTS
-- Decorated Pots' wobble animations now flip on consecutive triggers
+- The wobbling animation now mirrors each time it plays
 
 ## END CITIES
 - Choral End Stone Bricks will now generate

src/main/generated/data/minecraft/tags/item/trim_templates.json

@@ -1,9 +1,11 @@
 {
   "values": [
-    "trailiertales:desolation_armor_trim_smithing_template",
     "trailiertales:undead_armor_trim_smithing_template",
     "trailiertales:matrix_armor_trim_smithing_template",
     "trailiertales:geode_armor_trim_smithing_template",
-    "trailiertales:overgrowth_armor_trim_smithing_template"
+    "trailiertales:overgrowth_armor_trim_smithing_template",
+    "trailiertales:martyr_armor_trim_smithing_template",
+    "trailiertales:zephyr_armor_trim_smithing_template",
+    "trailiertales:cot_armor_trim_smithing_template"
   ]
 }

src/main/generated/data/trailiertales/advancement/recipes/misc/desolation_armor_trim_smithing_template_smithing_trim.json → src/main/generated/data/trailiertales/advancement/recipes/misc/cot_armor_trim_smithing_template.json

@@ -1,32 +1,32 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_smithing_trim_template": {
+    "has_cot_armor_trim_smithing_template": {
       "conditions": {
         "items": [
           {
-            "items": "trailiertales:desolation_armor_trim_smithing_template"
+            "items": "trailiertales:cot_armor_trim_smithing_template"
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "trailiertales:desolation_armor_trim_smithing_template_smithing_trim"
+        "recipe": "trailiertales:cot_armor_trim_smithing_template"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "has_the_recipe",
-      "has_smithing_trim_template"
+      "has_cot_armor_trim_smithing_template"
     ]
   ],
   "rewards": {
     "recipes": [
-      "trailiertales:desolation_armor_trim_smithing_template_smithing_trim"
+      "trailiertales:cot_armor_trim_smithing_template"
     ]
   }
 }

src/main/generated/data/trailiertales/advancement/recipes/misc/geode_armor_trim_smithing_template.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_geode_armor_trim_smithing_template": {
+      "conditions": {
+        "items": [
+          {
+            "items": "trailiertales:geode_armor_trim_smithing_template"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "trailiertales:geode_armor_trim_smithing_template"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_geode_armor_trim_smithing_template"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "trailiertales:geode_armor_trim_smithing_template"
+    ]
+  }
+}

src/main/generated/data/trailiertales/advancement/recipes/misc/martyr_armor_trim_smithing_template.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_martyr_armor_trim_smithing_template": {
+      "conditions": {
+        "items": [
+          {
+            "items": "trailiertales:martyr_armor_trim_smithing_template"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "trailiertales:martyr_armor_trim_smithing_template"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_martyr_armor_trim_smithing_template"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "trailiertales:martyr_armor_trim_smithing_template"
+    ]
+  }
+}

src/main/generated/data/trailiertales/advancement/recipes/misc/matrix_armor_trim_smithing_template.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_matrix_armor_trim_smithing_template": {
+      "conditions": {
+        "items": [
+          {
+            "items": "trailiertales:matrix_armor_trim_smithing_template"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "trailiertales:matrix_armor_trim_smithing_template"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_matrix_armor_trim_smithing_template"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "trailiertales:matrix_armor_trim_smithing_template"
+    ]
+  }
+}

src/main/generated/data/trailiertales/advancement/recipes/misc/desolation_armor_trim_smithing_template.json → src/main/generated/data/trailiertales/advancement/recipes/misc/overgrowth_armor_trim_smithing_template.json

@@ -1,32 +1,32 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_desolation_armor_trim_smithing_template": {
+    "has_overgrowth_armor_trim_smithing_template": {
       "conditions": {
         "items": [
           {
-            "items": "trailiertales:desolation_armor_trim_smithing_template"
+            "items": "trailiertales:overgrowth_armor_trim_smithing_template"
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "trailiertales:desolation_armor_trim_smithing_template"
+        "recipe": "trailiertales:overgrowth_armor_trim_smithing_template"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "has_the_recipe",
-      "has_desolation_armor_trim_smithing_template"
+      "has_overgrowth_armor_trim_smithing_template"
     ]
   ],
   "rewards": {
     "recipes": [
-      "trailiertales:desolation_armor_trim_smithing_template"
+      "trailiertales:overgrowth_armor_trim_smithing_template"
     ]
   }
 }

src/main/generated/data/trailiertales/advancement/recipes/misc/zephyr_armor_trim_smithing_template.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "trailiertales:zephyr_armor_trim_smithing_template"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_zephyr_armor_trim_smithing_template": {
+      "conditions": {
+        "items": [
+          {
+            "items": "trailiertales:zephyr_armor_trim_smithing_template"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_zephyr_armor_trim_smithing_template"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "trailiertales:zephyr_armor_trim_smithing_template"
+    ]
+  }
+}

src/main/generated/data/trailiertales/loot_table/archaeology/badlands_ruins.json

@@ -128,6 +128,11 @@
           "type": "minecraft:item",
           "name": "trailiertales:drought_pottery_sherd",
           "weight": 6
+        },
+        {
+          "type": "minecraft:item",
+          "name": "trailiertales:martyr_armor_trim_smithing_template",
+          "weight": 2
         }
       ],
       "rolls": 1.0

src/main/generated/data/trailiertales/loot_table/archaeology/deepslate_ruins.json

@@ -108,6 +108,11 @@
           "type": "minecraft:item",
           "name": "trailiertales:height_pottery_sherd",
           "weight": 7
+        },
+        {
+          "type": "minecraft:item",
+          "name": "trailiertales:geode_armor_trim_smithing_template",
+          "weight": 2
         }
       ],
       "rolls": 1.0

src/main/generated/data/trailiertales/loot_table/archaeology/desert_ruins.json

@@ -91,7 +91,8 @@
         },
         {
           "type": "minecraft:item",
-          "name": "minecraft:dune_armor_trim_smithing_template"
+          "name": "trailiertales:zephyr_armor_trim_smithing_template",
+          "weight": 2
         }
       ],
       "rolls": 1.0

src/main/generated/data/trailiertales/loot_table/archaeology/jungle_ruins.json

@@ -131,7 +131,8 @@
         },
         {
           "type": "minecraft:item",
-          "name": "minecraft:wild_armor_trim_smithing_template"
+          "name": "trailiertales:overgrowth_armor_trim_smithing_template",
+          "weight": 2
         }
       ],
       "rolls": 1.0

src/main/generated/data/trailiertales/loot_table/archaeology/savanna_ruins.json

@@ -133,6 +133,11 @@
           "type": "minecraft:item",
           "name": "minecraft:shelter_pottery_sherd",
           "weight": 7
+        },
+        {
+          "type": "minecraft:item",
+          "name": "trailiertales:cot_armor_trim_smithing_template",
+          "weight": 2
         }
       ],
       "rolls": 1.0

src/main/generated/data/trailiertales/loot_table/chests/catacombs/tomb_reward.json

@@ -382,7 +382,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "trailiertales:desolation_armor_trim_smithing_template"
+          "name": "trailiertales:matrix_armor_trim_smithing_template"
         },
         {
           "type": "minecraft:item",

src/main/generated/data/trailiertales/recipe/cot_armor_trim_smithing_template.json

@@ -0,0 +1,24 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "#": {
+      "item": "minecraft:diamond"
+    },
+    "C": {
+      "item": "minecraft:mud_bricks"
+    },
+    "S": {
+      "item": "trailiertales:cot_armor_trim_smithing_template"
+    }
+  },
+  "pattern": [
+    "#S#",
+    "#C#",
+    "###"
+  ],
+  "result": {
+    "count": 2,
+    "id": "trailiertales:cot_armor_trim_smithing_template"
+  }
+}

src/main/generated/data/trailiertales/recipe/geode_armor_trim_smithing_template.json

@@ -0,0 +1,24 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "#": {
+      "item": "minecraft:diamond"
+    },
+    "C": {
+      "item": "minecraft:smooth_basalt"
+    },
+    "S": {
+      "item": "trailiertales:geode_armor_trim_smithing_template"
+    }
+  },
+  "pattern": [
+    "#S#",
+    "#C#",
+    "###"
+  ],
+  "result": {
+    "count": 2,
+    "id": "trailiertales:geode_armor_trim_smithing_template"
+  }
+}