More datagen, trimmable Mistcloak

legobmw99 · Dec 31, 2024 · 4f26230 · 4f26230
1 parent 4c83635
commit 4f26230
Show file tree

Hide file tree

Showing 27 changed files with 365 additions and 180 deletions.
diff --git a/src/generated/resources/assets/allomancy/blockstates/iron_lever.json b/src/generated/resources/assets/allomancy/blockstates/iron_lever.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "face=ceiling,facing=east,powered=false": {
-      "model": "allomancy:block/iron_lever_off",
+      "model": "allomancy:block/iron_lever_on",
       "x": 180,
       "y": 270
     },
@@ -11,7 +11,7 @@
       "y": 270
     },
     "face=ceiling,facing=north,powered=false": {
-      "model": "allomancy:block/iron_lever_off",
+      "model": "allomancy:block/iron_lever_on",
       "x": 180,
       "y": 180
     },
@@ -21,15 +21,15 @@
       "y": 180
     },
     "face=ceiling,facing=south,powered=false": {
-      "model": "allomancy:block/iron_lever_off",
+      "model": "allomancy:block/iron_lever_on",
       "x": 180
     },
     "face=ceiling,facing=south,powered=true": {
       "model": "allomancy:block/iron_lever",
       "x": 180
     },
     "face=ceiling,facing=west,powered=false": {
-      "model": "allomancy:block/iron_lever_off",
+      "model": "allomancy:block/iron_lever_on",
       "x": 180,
       "y": 90
     },
@@ -39,37 +39,37 @@
       "y": 90
     },
     "face=floor,facing=east,powered=false": {
-      "model": "allomancy:block/iron_lever_off",
+      "model": "allomancy:block/iron_lever_on",
       "y": 90
     },
     "face=floor,facing=east,powered=true": {
       "model": "allomancy:block/iron_lever",
       "y": 90
     },
     "face=floor,facing=north,powered=false": {
-      "model": "allomancy:block/iron_lever_off"
+      "model": "allomancy:block/iron_lever_on"
     },
     "face=floor,facing=north,powered=true": {
       "model": "allomancy:block/iron_lever"
     },
     "face=floor,facing=south,powered=false": {
-      "model": "allomancy:block/iron_lever_off",
+      "model": "allomancy:block/iron_lever_on",
       "y": 180
     },
     "face=floor,facing=south,powered=true": {
       "model": "allomancy:block/iron_lever",
       "y": 180
     },
     "face=floor,facing=west,powered=false": {
-      "model": "allomancy:block/iron_lever_off",
+      "model": "allomancy:block/iron_lever_on",
       "y": 270
     },
     "face=floor,facing=west,powered=true": {
       "model": "allomancy:block/iron_lever",
       "y": 270
     },
     "face=wall,facing=east,powered=false": {
-      "model": "allomancy:block/iron_lever_off",
+      "model": "allomancy:block/iron_lever_on",
       "x": 90,
       "y": 90
     },
@@ -79,15 +79,15 @@
       "y": 90
     },
     "face=wall,facing=north,powered=false": {
-      "model": "allomancy:block/iron_lever_off",
+      "model": "allomancy:block/iron_lever_on",
       "x": 90
     },
     "face=wall,facing=north,powered=true": {
       "model": "allomancy:block/iron_lever",
       "x": 90
     },
     "face=wall,facing=south,powered=false": {
-      "model": "allomancy:block/iron_lever_off",
+      "model": "allomancy:block/iron_lever_on",
       "x": 90,
       "y": 180
     },
@@ -97,7 +97,7 @@
       "y": 180
     },
     "face=wall,facing=west,powered=false": {
-      "model": "allomancy:block/iron_lever_off",
+      "model": "allomancy:block/iron_lever_on",
       "x": 90,
       "y": 270
     },

diff --git a/src/generated/resources/assets/allomancy/items/mistcloak.json b/src/generated/resources/assets/allomancy/items/mistcloak.json
@@ -1,6 +1,89 @@
 {
   "model": {
-    "type": "minecraft:model",
-    "model": "allomancy:item/mistcloak"
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "allomancy:item/mistcloak_quartz_trim"
+        },
+        "when": "minecraft:quartz"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "allomancy:item/mistcloak_iron_trim"
+        },
+        "when": "minecraft:iron"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "allomancy:item/mistcloak_netherite_trim"
+        },
+        "when": "minecraft:netherite"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "allomancy:item/mistcloak_redstone_trim"
+        },
+        "when": "minecraft:redstone"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "allomancy:item/mistcloak_copper_trim"
+        },
+        "when": "minecraft:copper"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "allomancy:item/mistcloak_gold_trim"
+        },
+        "when": "minecraft:gold"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "allomancy:item/mistcloak_emerald_trim"
+        },
+        "when": "minecraft:emerald"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "allomancy:item/mistcloak_diamond_trim"
+        },
+        "when": "minecraft:diamond"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "allomancy:item/mistcloak_lapis_trim"
+        },
+        "when": "minecraft:lapis"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "allomancy:item/mistcloak_amethyst_trim"
+        },
+        "when": "minecraft:amethyst"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "allomancy:item/mistcloak_resin_trim"
+        },
+        "when": "minecraft:resin"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "allomancy:item/mistcloak"
+    },
+    "property": "minecraft:trim_material"
   }
 }
diff --git a/src/generated/resources/assets/allomancy/lang/en_us.json b/src/generated/resources/assets/allomancy/lang/en_us.json
@@ -170,7 +170,7 @@
   "allomancy.electrum.yellow": "Yellow Electrum Symbol",
   "allomancy.flake_storage.lore_count": "Contains %s metals",
   "allomancy.flake_storage.lore_inst": "Hold SHIFT to view",
-  "allomancy.flake_storage.lore_single": "Contains 1 metal",
+  "allomancy.flake_storage.lore_single": "Contains %s",
   "allomancy.gold.black": "Black Gold Symbol",
   "allomancy.gold.blue": "Blue Gold Symbol",
   "allomancy.gold.brown": "Brown Gold Symbol",

diff --git a/...llomancy/models/block/iron_lever_off.json → ...allomancy/models/block/iron_lever_on.json b/...llomancy/models/block/iron_lever_off.json → ...allomancy/models/block/iron_lever_on.json
diff --git a/src/generated/resources/assets/allomancy/models/item/koloss_blade.json b/src/generated/resources/assets/allomancy/models/item/koloss_blade.json
@@ -1,5 +1,77 @@
 {
-  "parent": "allomancy:item/handheld_large",
+  "parent": "minecraft:item/generated",
+  "display": {
+    "firstperson_lefthand": {
+      "rotation": [
+        0,
+        90,
+        -25
+      ],
+      "translation": [
+        0.5,
+        5,
+        0.5
+      ]
+    },
+    "firstperson_righthand": {
+      "rotation": [
+        0,
+        -90,
+        25
+      ],
+      "translation": [
+        0.5,
+        5,
+        0.5
+      ]
+    },
+    "ground": {
+      "scale": [
+        1.2,
+        1.2,
+        1.2
+      ],
+      "translation": [
+        0,
+        5,
+        0
+      ]
+    },
+    "thirdperson_lefthand": {
+      "rotation": [
+        0,
+        90,
+        -55
+      ],
+      "scale": [
+        1.2,
+        1.2,
+        1.2
+      ],
+      "translation": [
+        0,
+        8,
+        0.5
+      ]
+    },
+    "thirdperson_righthand": {
+      "rotation": [
+        0,
+        -90,
+        55
+      ],
+      "scale": [
+        1.2,
+        1.2,
+        1.2
+      ],
+      "translation": [
+        0,
+        8,
+        0.5
+      ]
+    }
+  },
   "textures": {
     "layer0": "allomancy:item/koloss_blade"
   }

diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_amethyst_trim.json b/src/generated/resources/assets/allomancy/models/item/mistcloak_amethyst_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "allomancy:item/mistcloak",
+    "layer1": "minecraft:trims/items/chestplate_trim_amethyst"
+  }
+}
diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_copper_trim.json b/src/generated/resources/assets/allomancy/models/item/mistcloak_copper_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "allomancy:item/mistcloak",
+    "layer1": "minecraft:trims/items/chestplate_trim_copper"
+  }
+}
diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_diamond_trim.json b/src/generated/resources/assets/allomancy/models/item/mistcloak_diamond_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "allomancy:item/mistcloak",
+    "layer1": "minecraft:trims/items/chestplate_trim_diamond"
+  }
+}
diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_emerald_trim.json b/src/generated/resources/assets/allomancy/models/item/mistcloak_emerald_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "allomancy:item/mistcloak",
+    "layer1": "minecraft:trims/items/chestplate_trim_emerald"
+  }
+}
diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_gold_trim.json b/src/generated/resources/assets/allomancy/models/item/mistcloak_gold_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "allomancy:item/mistcloak",
+    "layer1": "minecraft:trims/items/chestplate_trim_gold"
+  }
+}
diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_iron_trim.json b/src/generated/resources/assets/allomancy/models/item/mistcloak_iron_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "allomancy:item/mistcloak",
+    "layer1": "minecraft:trims/items/chestplate_trim_iron"
+  }
+}
diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_lapis_trim.json b/src/generated/resources/assets/allomancy/models/item/mistcloak_lapis_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "allomancy:item/mistcloak",
+    "layer1": "minecraft:trims/items/chestplate_trim_lapis"
+  }
+}
diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_netherite_trim.json b/src/generated/resources/assets/allomancy/models/item/mistcloak_netherite_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "allomancy:item/mistcloak",
+    "layer1": "minecraft:trims/items/chestplate_trim_netherite"
+  }
+}
diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_quartz_trim.json b/src/generated/resources/assets/allomancy/models/item/mistcloak_quartz_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "allomancy:item/mistcloak",
+    "layer1": "minecraft:trims/items/chestplate_trim_quartz"
+  }
+}
diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_redstone_trim.json b/src/generated/resources/assets/allomancy/models/item/mistcloak_redstone_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "allomancy:item/mistcloak",
+    "layer1": "minecraft:trims/items/chestplate_trim_redstone"
+  }
+}
diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_resin_trim.json b/src/generated/resources/assets/allomancy/models/item/mistcloak_resin_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "allomancy:item/mistcloak",
+    "layer1": "minecraft:trims/items/chestplate_trim_resin"
+  }
+}
diff --git a/...s/allomancy/particles/sound_particle.json → ...s/allomancy/particles/sound_particle.json b/...s/allomancy/particles/sound_particle.json → ...s/allomancy/particles/sound_particle.json
diff --git a/src/generated/resources/data/minecraft/tags/item/trimmable_armor.json b/src/generated/resources/data/minecraft/tags/item/trimmable_armor.json
@@ -1,5 +1,6 @@
 {
   "values": [
-    "allomancy:aluminum_helmet"
+    "allomancy:aluminum_helmet",
+    "allomancy:mistcloak"
   ]
 }