Armor Models!

54 files changed, 70 insertions, 0 deletions

diff --git a/src/main/resources/assets/tinkersdefense/models/item/parts/armor_hood_cloth.tmat.json b/src/main/resources/assets/tinkersdefense/models/item/parts/armor_hood_cloth.tmat.json
new file mode 100644
index 0000000..0959514
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/parts/armor_hood_cloth.tmat.json
@@ -0,0 +1,5 @@
+{
+    "textures": {
+        "layer0": "tinkersdefense:armor/hood/_hood_cloth"
+    }
+}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/towershield.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/towershield.tcon.json
new file mode 100644
index 0000000..1b485ec
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/towershield.tcon.json
@@ -0,0 +1,65 @@
+{
+    "textures": {
+        "layer0": "tinkersdefense:items/towershield/edge",
+        "layer1": "tinkersdefense:items/towershield/plate",
+		"layer2": "tinkersdefense:items/towershield/face",
+		"layer3": "tinkersdefense:items/towershield/binding",
+		"broken1": "tinkersdefense:items/towershield/plate_broken"
+    },
+    "display": {
+        "thirdperson_righthand": {
+            "rotation": [ 0, 90, 0 ],
+            "translation": [ 2, 0, 2 ],
+            "scale": [ 1.5, 1.5, 1.5 ]
+        },
+        "thirdperson_lefthand": {
+            "rotation": [ 0, 90, 0 ],
+            "translation": [ 2, 0, 2 ],
+            "scale": [ 1.5, 1.5, 1.5 ]
+        },
+        "firstperson_righthand": {
+            "rotation": [ 0, 135, 5 ],
+            "translation": [ 10, -10, -10 ],
+            "scale": [ 3.5, 3.5, 3.5 ]
+        },
+        "firstperson_lefthand": {
+            "rotation": [ 0, 135, 5 ],
+            "translation": [ 10, -16, -10 ],
+            "scale": [ 3.5, 3.5, 3.5 ]
+        },
+        "fixed": {
+            "rotation": [ 0, 180, 0 ],
+            "translation": [ -2, 4, -5],
+            "scale":[ 0.5, 0.5, 0.5]
+        }
+	},
+    "overrides": [
+        {
+            "predicate": {
+                "block": 1
+            },
+            "display": {
+				"thirdperson_righthand": {
+					"rotation": [ 30, 145, 0 ],
+					"translation": [ 2, 0, -1 ],
+					"scale": [ 1.5, 1.5, 1.5 ]
+				},
+				"thirdperson_lefthand": {
+					"rotation": [ 30, 145, 0 ],
+					"translation": [ 2, 0, -1 ],
+					"scale": [ 1.5, 1.5, 1.5 ]
+				},
+				"firstperson_righthand": {
+					"rotation": [ 0, 180, 0 ],
+					"translation": [ 0, -8, -10 ],
+					"scale": [ 3.5, 3.5, 3.5 ]
+				},
+				"firstperson_lefthand": {
+					"rotation": [ 0, 180, 0 ],
+					"translation": [ 0, -8, -10 ],
+					"scale": [ 3.5, 3.5, 3.5 ]
+				}
+			}
+        }
+    ]
+}
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_chain.png b/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_chain.png
index a4b7283..1ab5a40 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_chain.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_plate.png b/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_plate.png
index 2cd472f..f8a3b83 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_plate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_smallplate.png b/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_smallplate.png
index 345412e..814db78 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_smallplate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_smallplate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_trim.png
index ec8eff9..94f63b7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_trim.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_chain.png b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_chain.png
index 41df89f..7a9dcfe 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_chain.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_plate.png b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_plate.png
index 65a112a..540ed4a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_plate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_trim.png
index 209517f..6d55841 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_trim.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_chain.png b/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_chain.png
index 2eb9b95..15fe2bb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_chain.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_top.png b/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_top.png
index 2f5ddcf..1cf7bb2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_top.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_top.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_visor.png b/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_visor.png
index 9946e88..bbe7f01 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_visor.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_visor.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/ModelBiped-texturemap.png b/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/ModelBiped-texturemap.png
deleted file mode 100644
index 361f889..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/ModelBiped-texturemap.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/TinkerHelm-texturemap.png b/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/TinkerHelm-texturemap.png
deleted file mode 100644
index 7d727a1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/TinkerHelm-texturemap.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_breastplate_plate (1).png b/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_breastplate_plate (1).png
deleted file mode 100644
index d021871..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_breastplate_plate (1).png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_breastplate_plate (2).png b/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_breastplate_plate (2).png
deleted file mode 100644
index d021871..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_breastplate_plate (2).png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_chain.png b/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_chain.png
deleted file mode 100644
index a8a38f3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_chain.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_plate.png b/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_plate.png
deleted file mode 100644
index dd6453b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_plate.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_plate_full.png b/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_plate_full.png
deleted file mode 100644
index 67eca00..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_plate_full.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_top.png b/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_top.png
deleted file mode 100644
index 2f5ddcf..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_top.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_visor #1.png b/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_visor #1.png
deleted file mode 100644
index a6dbbdb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_visor #1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_visor #2.png b/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_visor #2.png
deleted file mode 100644
index b96608e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_visor #2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_visor.png b/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_visor.png
deleted file mode 100644
index 857fb9a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/_helm_visor.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/char.png b/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/char.png
deleted file mode 100644
index e925635..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/char.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_grieves_cloth.png b/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_grieves_cloth.png
index 20cd3c5..1a17566 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_grieves_cloth.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_grieves_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_caps.png b/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_caps.png
index 0f11958..5bb5a0f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_caps.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_caps.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_plates.png b/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_plates.png
index 8fbbc17..4072c56 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_plates.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_plates.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_soles.png b/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_soles.png
index b3d9ade..fbf6e71 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_soles.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_soles.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_trim.png
index 59220d4..6eeb772 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_trim.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/helm/_helm_plate.png b/src/main/resources/assets/tinkersdefense/textures/armor/helm/_helm_plate.png
index 5f3362c..7abc400 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/helm/_helm_plate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/helm/_helm_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_cloth.png b/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_cloth.png
index add29be..4460911 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_cloth.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_metal.png b/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_metal.png
index 9ef285e..4582a72 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_metal.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_metal.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_trim.png
index 181e271..59e886e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_trim.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_cloth.png b/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_cloth.png
index 36fef4d..c832434 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_cloth.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_metal.png b/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_metal.png
index d8aad7e..7311009 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_metal.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_metal.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_trim.png
index d88f989..02319e1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_trim.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_hood_cloth.png b/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_hood_cloth.png
deleted file mode 100644
index fb9ef80..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_hood_cloth.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_hood_metal.png b/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_hood_metal.png
deleted file mode 100644
index b6702fc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_hood_metal.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_hood_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_hood_trim.png
deleted file mode 100644
index c22ee34..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_hood_trim.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_robe_cloth.png b/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_robe_cloth.png
deleted file mode 100644
index 88d9f2b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_robe_cloth.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_robe_metal.png b/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_robe_metal.png
deleted file mode 100644
index c58d76f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_robe_metal.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_robe_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_robe_trim.png
deleted file mode 100644
index 415cf32..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_robe_trim.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_cloth.png b/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_cloth.png
index 7838450..1ba3f9f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_cloth.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_metal.png b/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_metal.png
index e9980aa..911a4dd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_metal.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_metal.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_trim.png
index 6d5c3bd..de54095 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_trim.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_cloth.png b/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_cloth.png
index f64a2b6..50ba071 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_cloth.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_metal.png b/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_metal.png
index bcabf4a..b067ebf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_metal.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_metal.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_string.png b/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_string.png
new file mode 100644
index 0000000..e421fab
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_string.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_trim.png
new file mode 100644
index 0000000..962cac9
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/towershield/binding.png b/src/main/resources/assets/tinkersdefense/textures/items/towershield/binding.png
new file mode 100644
index 0000000..512924c
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/items/towershield/binding.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/towershield/edge.png b/src/main/resources/assets/tinkersdefense/textures/items/towershield/edge.png
new file mode 100644
index 0000000..8be92b4
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/items/towershield/edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/towershield/face.png b/src/main/resources/assets/tinkersdefense/textures/items/towershield/face.png
new file mode 100644
index 0000000..4ba3dc9
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/items/towershield/face.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/towershield/plate.png b/src/main/resources/assets/tinkersdefense/textures/items/towershield/plate.png
new file mode 100644
index 0000000..bd69638
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/items/towershield/plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/towershield/plate_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/towershield/plate_broken.png
new file mode 100644
index 0000000..39aa048
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/items/towershield/plate_broken.png