Fixed Shields, Did Armor things

38 files changed, 41 insertions, 5 deletions

diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/breastplate.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/breastplate.tcon.json
new file mode 100644
index 0000000..027bed7
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/breastplate.tcon.json
@@ -0,0 +1,9 @@
+{
+    "textures": {
+        "layer0": "tinkersdefense:items/armor/breastplate/_plate",
+        "layer1": "tinkersdefense:items/armor/breastplate/_smallplate",
+		"layer2": "tinkersdefense:items/armor/breastplate/_trim",
+		"layer3": "tinkersdefense:items/armor/breastplate/_chain",
+		"broken1": "tinkersdefense:items/armor/breastplate/_plate"
+    }
+}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/fishingrod.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/fishingrod.tcon.json
index 5f34dde..fe11a40 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/fishingrod.tcon.json
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/fishingrod.tcon.json
@@ -3,7 +3,7 @@
         "layer0": "tinkersdefense:items/fishingrod/_rod",
         "layer1": "tinkersdefense:items/fishingrod/_string",
 		"layer2": "tinkersdefense:items/fishingrod/_hook",
-		"broken1": "tinkersdefense:items/fishingrod/broken"
+		"broken1": "tinkersdefense:items/fishingrod/_rod"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/grieves.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/grieves.tcon.json
new file mode 100644
index 0000000..d89ec36
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/grieves.tcon.json
@@ -0,0 +1,9 @@
+{
+    "textures": {
+        "layer0": "tinkersdefense:items/armor/grieves/_plate",
+        "layer1": "tinkersdefense:items/armor/grieves/_trim",
+		"layer2": "tinkersdefense:items/armor/grieves/_chain",
+		"layer3": "tinkersdefense:items/armor/grieves/_cloth",
+		"broken1": "tinkersdefense:items/armor/grieves/_plate"
+    }
+}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/helm.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/helm.tcon.json
new file mode 100644
index 0000000..94fc15e
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/helm.tcon.json
@@ -0,0 +1,9 @@
+{
+    "textures": {
+        "layer0": "tinkersdefense:items/armor/helm/_top",
+        "layer1": "tinkersdefense:items/armor/helm/_plate",
+		"layer2": "tinkersdefense:items/armor/helm/_visor",
+		"layer3": "tinkersdefense:items/armor/helm/_chain",
+		"broken1": "tinkersdefense:items/armor/helm/_plate"
+    }
+}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/hood.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/hood.tcon.json
index e8f6988..3cec161 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/hood.tcon.json
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/hood.tcon.json
@@ -3,7 +3,7 @@
         "layer0": "tinkersdefense:items/armor/hood/_cloth",
         "layer1": "tinkersdefense:items/armor/hood/_trim",
 		"layer2": "tinkersdefense:items/armor/hood/_rivet",
-		"broken1": "tinkersdefense:items/armor/hood/_broken"
+		"broken1": "tinkersdefense:items/armor/hood/_cloth"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/robe.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/robe.tcon.json
index d2bf7e2..b8b24d6 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/robe.tcon.json
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/robe.tcon.json
@@ -3,7 +3,7 @@
         "layer0": "tinkersdefense:items/armor/robe/_cloth",
         "layer1": "tinkersdefense:items/armor/robe/_trim",
 		"layer2": "tinkersdefense:items/armor/robe/_plate",
-		"broken1": "tinkersdefense:items/armor/robe/_broken"
+		"broken1": "tinkersdefense:items/armor/robe/_cloth"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/sabatons.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/sabatons.tcon.json
new file mode 100644
index 0000000..8d9c486
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/sabatons.tcon.json
@@ -0,0 +1,9 @@
+{
+    "textures": {
+        "layer0": "tinkersdefense:items/armor/sabatons/_plates",
+        "layer1": "tinkersdefense:items/armor/sabatons/_trim",
+		"layer2": "tinkersdefense:items/armor/sabatons/_caps",
+		"layer3": "tinkersdefense:items/armor/sabatons/_soles",
+		"broken1": "tinkersdefense:items/armor/sabatons/_plates"
+    }
+}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/shawl.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/shawl.tcon.json
index 85a6162..e8b242e 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/shawl.tcon.json
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/shawl.tcon.json
@@ -3,7 +3,7 @@
         "layer0": "tinkersdefense:items/armor/shawl/_cloth",
         "layer1": "tinkersdefense:items/armor/shawl/_trim",
 		"layer2": "tinkersdefense:items/armor/shawl/_clasp",
-		"broken1": "tinkersdefense:items/armor/shawl/_broken"
+		"broken1": "tinkersdefense:items/armor/shawl/_cloth"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/shoes.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/shoes.tcon.json
index a69cf82..4a295de 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/shoes.tcon.json
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/shoes.tcon.json
@@ -3,7 +3,7 @@
         "layer0": "tinkersdefense:items/armor/shoes/_cloth",
         "layer1": "tinkersdefense:items/armor/shoes/_sole",
 		"layer2": "tinkersdefense:items/armor/shoes/_clasp",
-		"broken1": "tinkersdefense:items/armor/shoes/_broken"
+		"broken1": "tinkersdefense:items/armor/shoes/_cloth"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_chain.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_chain.png
index 5b242c1..5b242c1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_chain.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_plate.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_plate.png
index 624403e..624403e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_plate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_smallplate.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_smallplate.png
index 9d8aa6b..9d8aa6b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_smallplate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_smallplate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_trim.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_trim.png
index 5eea928..5eea928 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_trim.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/ModelBiped-texturemap.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/ModelBiped-texturemap.png
deleted file mode 100644
index 361f889..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/ModelBiped-texturemap.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_chain.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_chain.png
deleted file mode 100644
index 0f84905..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_chain.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_plate.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_plate.png
deleted file mode 100644
index d021871..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_plate.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_smallplate.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_smallplate.png
deleted file mode 100644
index 345412e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_smallplate.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_trim.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_trim.png
deleted file mode 100644
index ec8eff9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_trim.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_chain.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_chain.png
index 8f7789a..8f7789a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_chain.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_cloth.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_cloth.png
index 32985ad..32985ad 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_cloth.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_cod.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_cod.png
deleted file mode 100644
index a32b425..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_cod.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_plate.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_plate.png
index 2bc04d2..2bc04d2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_plate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_trim.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_trim.png
index f24bcf8..f24bcf8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_trim.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/blastprotection_breastplate_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/blastprotection_breastplate_effect.png
deleted file mode 100644
index 3ba28ec..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/blastprotection_breastplate_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/char.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/char.png
deleted file mode 100644
index e925635..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/char.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/fireprotection_breastplate_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/fireprotection_breastplate_effect.png
deleted file mode 100644
index 696957c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/fireprotection_breastplate_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/healthboost_breastplate_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/healthboost_breastplate_effect.png
deleted file mode 100644
index 3e0b0f4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/healthboost_breastplate_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/projprotection_breastplate_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/projprotection_breastplate_effect.png
deleted file mode 100644
index b031458..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/projprotection_breastplate_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/protection_breastplate_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/protection_breastplate_effect.png
deleted file mode 100644
index a29232f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/protection_breastplate_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/runicshielding_breastplate_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/runicshielding_breastplate_effect.png
deleted file mode 100644
index b13c9df..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/runicshielding_breastplate_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_chain.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_chain.png
index 13b051f..13b051f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_chain.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_plate.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_plate.png
index a20421c..a20421c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_plate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_top.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_top.png
index 061027c..061027c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_top.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_top.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_visor.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_visor.png
index 6b89cd0..6b89cd0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_visor.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_visor.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_caps.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_caps.png
index 8225f2f..8225f2f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_caps.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_caps.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_plates.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_plates.png
index a841231..a841231 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_plates.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_plates.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_soles.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_soles.png
index 4bf2a87..4bf2a87 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_soles.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_soles.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_trim.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_trim.png
index 54ac3e9..54ac3e9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_trim.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_trim.png