Added bismuth ingot to be used as armor trim material

src/main/resources/assets/etcetera/lang/en_us.json

@@ -191,5 +191,7 @@
   "advancements.etcetera.story.obtain_trader_armor.title": "Trading with Style!",
   "advancements.etcetera.story.obtain_trader_armor.description": "Trade with a Wandering Trader and acquire some exclusive clothing",
   "advancements.etcetera.husbandry.plant_cotton.title": "A Seedy Soft Spot",
-  "advancements.etcetera.husbandry.plant_cotton.description": "Plant a Cotton seed"
+  "advancements.etcetera.husbandry.plant_cotton.description": "Plant a Cotton seed",
+
+  "trim_material.etcetera.bismuth": "Bismuth Material"
 }

src/main/resources/assets/etcetera/models/item/chainmail_boots_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/chainmail_boots",
+    "layer1": "minecraft:trims/items/boots_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/chainmail_chestplate_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/chainmail_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/chainmail_helmet_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/chainmail_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/chainmail_leggings_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/chainmail_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/diamond_boots_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/diamond_boots",
+    "layer1": "minecraft:trims/items/boots_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/diamond_chestplate_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/diamond_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/diamond_helmet_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/diamond_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/diamond_leggings_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/diamond_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/golden_boots_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/golden_boots",
+    "layer1": "minecraft:trims/items/boots_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/golden_chestplate_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/golden_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/golden_helmet_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/golden_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/golden_leggings_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/golden_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/iron_boots_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/iron_boots",
+    "layer1": "minecraft:trims/items/boots_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/iron_chestplate_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/iron_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/iron_helmet_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/iron_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/iron_leggings_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/iron_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/leather_boots_bismuth_trim.json

@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/leather_boots",
+    "layer1": "minecraft:item/leather_boots_overlay",
+    "layer2": "minecraft:trims/items/boots_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/leather_chestplate_bismuth_trim.json

@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/leather_chestplate",
+    "layer1": "minecraft:item/leather_chestplate_overlay",
+    "layer2": "minecraft:trims/items/chestplate_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/leather_helmet_bismuth_trim.json

@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/leather_helmet",
+    "layer1": "minecraft:item/leather_helmet_overlay",
+    "layer2": "minecraft:trims/items/helmet_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/leather_leggings_bismuth_trim.json

@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/leather_leggings",
+    "layer1": "minecraft:item/leather_leggings_overlay",
+    "layer2": "minecraft:trims/items/leggings_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/netherite_boots_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/netherite_boots",
+    "layer1": "minecraft:trims/items/boots_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/netherite_chestplate_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/netherite_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/netherite_helmet_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/netherite_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/netherite_leggings_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/netherite_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_bismuth"
+  }
+}

src/main/resources/assets/etcetera/models/item/turtle_helmet_bismuth_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/turtle_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_bismuth"
+  }
+}

src/main/resources/assets/minecraft/atlases/armor_trims.json

@@ -0,0 +1,45 @@
+{
+  "sources": [
+    {
+      "type": "paletted_permutations",
+      "textures": [
+        "trims/models/armor/coast",
+        "trims/models/armor/coast_leggings",
+        "trims/models/armor/sentry",
+        "trims/models/armor/sentry_leggings",
+        "trims/models/armor/dune",
+        "trims/models/armor/dune_leggings",
+        "trims/models/armor/wild",
+        "trims/models/armor/wild_leggings",
+        "trims/models/armor/ward",
+        "trims/models/armor/ward_leggings",
+        "trims/models/armor/eye",
+        "trims/models/armor/eye_leggings",
+        "trims/models/armor/vex",
+        "trims/models/armor/vex_leggings",
+        "trims/models/armor/tide",
+        "trims/models/armor/tide_leggings",
+        "trims/models/armor/snout",
+        "trims/models/armor/snout_leggings",
+        "trims/models/armor/rib",
+        "trims/models/armor/rib_leggings",
+        "trims/models/armor/spire",
+        "trims/models/armor/spire_leggings",
+        "trims/models/armor/wayfinder",
+        "trims/models/armor/wayfinder_leggings",
+        "trims/models/armor/shaper",
+        "trims/models/armor/shaper_leggings",
+        "trims/models/armor/silence",
+        "trims/models/armor/silence_leggings",
+        "trims/models/armor/raiser",
+        "trims/models/armor/raiser_leggings",
+        "trims/models/armor/host",
+        "trims/models/armor/host_leggings"
+      ],
+      "palette_key": "trims/color_palettes/trim_palette",
+      "permutations": {
+        "bismuth": "etcetera:trims/color_palettes/bismuth"
+      }
+    }
+  ]
+}

src/main/resources/assets/minecraft/atlases/blocks.json

@@ -0,0 +1,17 @@
+{
+  "sources": [
+    {
+      "type": "paletted_permutations",
+      "textures": [
+        "trims/items/leggings_trim",
+        "trims/items/chestplate_trim",
+        "trims/items/helmet_trim",
+        "trims/items/boots_trim"
+      ],
+      "palette_key": "trims/color_palettes/trim_palette",
+      "permutations": {
+        "bismuth": "etcetera:trims/color_palettes/bismuth"
+      }
+    }
+  ]
+}

src/main/resources/assets/minecraft/models/item/chainmail_boots.json

@@ -0,0 +1,74 @@
+{
+  "parent": "minecraft:item/generated",
+  "overrides": [
+    {
+      "model": "minecraft:item/chainmail_boots_quartz_trim",
+      "predicate": {
+        "trim_type": 0.1
+      }
+    },
+    {
+      "model": "minecraft:item/chainmail_boots_iron_trim",
+      "predicate": {
+        "trim_type": 0.2
+      }
+    },
+    {
+      "model": "minecraft:item/chainmail_boots_netherite_trim",
+      "predicate": {
+        "trim_type": 0.3
+      }
+    },
+    {
+      "model": "minecraft:item/chainmail_boots_redstone_trim",
+      "predicate": {
+        "trim_type": 0.4
+      }
+    },
+    {
+      "model": "minecraft:item/chainmail_boots_copper_trim",
+      "predicate": {
+        "trim_type": 0.5
+      }
+    },
+    {
+      "model": "minecraft:item/chainmail_boots_gold_trim",
+      "predicate": {
+        "trim_type": 0.6
+      }
+    },
+    {
+      "model": "minecraft:item/chainmail_boots_emerald_trim",
+      "predicate": {
+        "trim_type": 0.7
+      }
+    },
+    {
+      "model": "etcetera:item/chainmail_boots_bismuth_trim",
+      "predicate": {
+        "trim_type": 0.75
+      }
+    },
+    {
+      "model": "minecraft:item/chainmail_boots_diamond_trim",
+      "predicate": {
+        "trim_type": 0.8
+      }
+    },
+    {
+      "model": "minecraft:item/chainmail_boots_lapis_trim",
+      "predicate": {
+        "trim_type": 0.9
+      }
+    },
+    {
+      "model": "minecraft:item/chainmail_boots_amethyst_trim",
+      "predicate": {
+        "trim_type": 1.0
+      }
+    }
+  ],
+  "textures": {
+    "layer0": "minecraft:item/chainmail_boots"
+  }
+}