From e4efd3c08fe2b36256512c8a417254fe94720e57 Mon Sep 17 00:00:00 2001
From: Devil2548 <animalmom2548@gmail.com>
Date: Sat, 26 Jul 2025 14:02:47 -0600
Subject: [PATCH 01/12] Update datapack folder names to match 1.21

---
 .../data/enva/{loot_tables => loot_table}/blocks/air_filter.json  | 0
 .../enva/{loot_tables => loot_table}/blocks/titanium_block.json   | 0
 .../enva/{loot_tables => loot_table}/blocks/titanium_ore.json     | 0
 src/main/resources/data/enva/{recipes => recipe}/air_filter.json  | 0
 src/main/resources/data/enva/{recipes => recipe}/glass_bowl.json  | 0
 .../resources/data/enva/{recipes => recipe}/glass_helmet.json     | 0
 src/main/resources/data/enva/{recipes => recipe}/glasses.json     | 0
 src/main/resources/data/enva/{recipes => recipe}/sunscreen.json   | 0
 .../resources/data/enva/{recipes => recipe}/titanium_block.json   | 0
 .../resources/data/enva/{recipes => recipe}/titanium_boots.json   | 0
 .../data/enva/{recipes => recipe}/titanium_chestplate.json        | 0
 .../data/enva/{recipes => recipe}/titanium_coated_glass_bowl.json | 0
 .../enva/{recipes => recipe}/titanium_coated_glass_helmet.json    | 0
 .../resources/data/enva/{recipes => recipe}/titanium_dust.json    | 0
 .../resources/data/enva/{recipes => recipe}/titanium_helmet.json  | 0
 .../data/enva/{recipes => recipe}/titanium_ingot_from_block.json  | 0
 .../data/enva/{recipes => recipe}/titanium_ingot_from_dust.json   | 0
 .../enva/{recipes => recipe}/titanium_ingot_from_ore_blast.json   | 0
 .../enva/{recipes => recipe}/titanium_ingot_from_ore_normal.json  | 0
 .../data/enva/{recipes => recipe}/titanium_leggings.json          | 0
 .../data/minecraft/tags/{blocks => block}/mineable/pickaxe.json   | 0
 .../data/minecraft/tags/{blocks => block}/needs_iron_tool.json    | 0
 22 files changed, 0 insertions(+), 0 deletions(-)
 rename src/main/resources/data/enva/{loot_tables => loot_table}/blocks/air_filter.json (100%)
 rename src/main/resources/data/enva/{loot_tables => loot_table}/blocks/titanium_block.json (100%)
 rename src/main/resources/data/enva/{loot_tables => loot_table}/blocks/titanium_ore.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/air_filter.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/glass_bowl.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/glass_helmet.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/glasses.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/sunscreen.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/titanium_block.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/titanium_boots.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/titanium_chestplate.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/titanium_coated_glass_bowl.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/titanium_coated_glass_helmet.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/titanium_dust.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/titanium_helmet.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/titanium_ingot_from_block.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/titanium_ingot_from_dust.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/titanium_ingot_from_ore_blast.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/titanium_ingot_from_ore_normal.json (100%)
 rename src/main/resources/data/enva/{recipes => recipe}/titanium_leggings.json (100%)
 rename src/main/resources/data/minecraft/tags/{blocks => block}/mineable/pickaxe.json (100%)
 rename src/main/resources/data/minecraft/tags/{blocks => block}/needs_iron_tool.json (100%)

diff --git a/src/main/resources/data/enva/loot_tables/blocks/air_filter.json b/src/main/resources/data/enva/loot_table/blocks/air_filter.json
similarity index 100%
rename from src/main/resources/data/enva/loot_tables/blocks/air_filter.json
rename to src/main/resources/data/enva/loot_table/blocks/air_filter.json
diff --git a/src/main/resources/data/enva/loot_tables/blocks/titanium_block.json b/src/main/resources/data/enva/loot_table/blocks/titanium_block.json
similarity index 100%
rename from src/main/resources/data/enva/loot_tables/blocks/titanium_block.json
rename to src/main/resources/data/enva/loot_table/blocks/titanium_block.json
diff --git a/src/main/resources/data/enva/loot_tables/blocks/titanium_ore.json b/src/main/resources/data/enva/loot_table/blocks/titanium_ore.json
similarity index 100%
rename from src/main/resources/data/enva/loot_tables/blocks/titanium_ore.json
rename to src/main/resources/data/enva/loot_table/blocks/titanium_ore.json
diff --git a/src/main/resources/data/enva/recipes/air_filter.json b/src/main/resources/data/enva/recipe/air_filter.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/air_filter.json
rename to src/main/resources/data/enva/recipe/air_filter.json
diff --git a/src/main/resources/data/enva/recipes/glass_bowl.json b/src/main/resources/data/enva/recipe/glass_bowl.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/glass_bowl.json
rename to src/main/resources/data/enva/recipe/glass_bowl.json
diff --git a/src/main/resources/data/enva/recipes/glass_helmet.json b/src/main/resources/data/enva/recipe/glass_helmet.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/glass_helmet.json
rename to src/main/resources/data/enva/recipe/glass_helmet.json
diff --git a/src/main/resources/data/enva/recipes/glasses.json b/src/main/resources/data/enva/recipe/glasses.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/glasses.json
rename to src/main/resources/data/enva/recipe/glasses.json
diff --git a/src/main/resources/data/enva/recipes/sunscreen.json b/src/main/resources/data/enva/recipe/sunscreen.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/sunscreen.json
rename to src/main/resources/data/enva/recipe/sunscreen.json
diff --git a/src/main/resources/data/enva/recipes/titanium_block.json b/src/main/resources/data/enva/recipe/titanium_block.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/titanium_block.json
rename to src/main/resources/data/enva/recipe/titanium_block.json
diff --git a/src/main/resources/data/enva/recipes/titanium_boots.json b/src/main/resources/data/enva/recipe/titanium_boots.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/titanium_boots.json
rename to src/main/resources/data/enva/recipe/titanium_boots.json
diff --git a/src/main/resources/data/enva/recipes/titanium_chestplate.json b/src/main/resources/data/enva/recipe/titanium_chestplate.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/titanium_chestplate.json
rename to src/main/resources/data/enva/recipe/titanium_chestplate.json
diff --git a/src/main/resources/data/enva/recipes/titanium_coated_glass_bowl.json b/src/main/resources/data/enva/recipe/titanium_coated_glass_bowl.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/titanium_coated_glass_bowl.json
rename to src/main/resources/data/enva/recipe/titanium_coated_glass_bowl.json
diff --git a/src/main/resources/data/enva/recipes/titanium_coated_glass_helmet.json b/src/main/resources/data/enva/recipe/titanium_coated_glass_helmet.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/titanium_coated_glass_helmet.json
rename to src/main/resources/data/enva/recipe/titanium_coated_glass_helmet.json
diff --git a/src/main/resources/data/enva/recipes/titanium_dust.json b/src/main/resources/data/enva/recipe/titanium_dust.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/titanium_dust.json
rename to src/main/resources/data/enva/recipe/titanium_dust.json
diff --git a/src/main/resources/data/enva/recipes/titanium_helmet.json b/src/main/resources/data/enva/recipe/titanium_helmet.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/titanium_helmet.json
rename to src/main/resources/data/enva/recipe/titanium_helmet.json
diff --git a/src/main/resources/data/enva/recipes/titanium_ingot_from_block.json b/src/main/resources/data/enva/recipe/titanium_ingot_from_block.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/titanium_ingot_from_block.json
rename to src/main/resources/data/enva/recipe/titanium_ingot_from_block.json
diff --git a/src/main/resources/data/enva/recipes/titanium_ingot_from_dust.json b/src/main/resources/data/enva/recipe/titanium_ingot_from_dust.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/titanium_ingot_from_dust.json
rename to src/main/resources/data/enva/recipe/titanium_ingot_from_dust.json
diff --git a/src/main/resources/data/enva/recipes/titanium_ingot_from_ore_blast.json b/src/main/resources/data/enva/recipe/titanium_ingot_from_ore_blast.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/titanium_ingot_from_ore_blast.json
rename to src/main/resources/data/enva/recipe/titanium_ingot_from_ore_blast.json
diff --git a/src/main/resources/data/enva/recipes/titanium_ingot_from_ore_normal.json b/src/main/resources/data/enva/recipe/titanium_ingot_from_ore_normal.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/titanium_ingot_from_ore_normal.json
rename to src/main/resources/data/enva/recipe/titanium_ingot_from_ore_normal.json
diff --git a/src/main/resources/data/enva/recipes/titanium_leggings.json b/src/main/resources/data/enva/recipe/titanium_leggings.json
similarity index 100%
rename from src/main/resources/data/enva/recipes/titanium_leggings.json
rename to src/main/resources/data/enva/recipe/titanium_leggings.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
rename to src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json
rename to src/main/resources/data/minecraft/tags/block/needs_iron_tool.json

From 2a90c3ed0507d75f5fc3f63eaa440657ecfd9419 Mon Sep 17 00:00:00 2001
From: Devil2548 <animalmom2548@gmail.com>
Date: Sat, 26 Jul 2025 14:11:29 -0600
Subject: [PATCH 02/12] Made the air filter mineable

---
 .../resources/data/minecraft/tags/block/mineable/pickaxe.json  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json
index fa9eb5e..1520568 100644
--- a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json
+++ b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json
@@ -2,6 +2,7 @@
   "replace": false,
   "values": [
     "enva:titanium_ore",
-    "enva:titanium_block"
+    "enva:titanium_block",
+	"enva:air_filter"
   ]
 }
\ No newline at end of file

From ce19b8c2312f9cfa425d6588b6ca2f82f3df750e Mon Sep 17 00:00:00 2001
From: Devil2548 <animalmom2548@gmail.com>
Date: Sat, 26 Jul 2025 14:36:36 -0600
Subject: [PATCH 03/12] Fixed recipes not parsing

---
 src/main/resources/data/enva/recipe/air_filter.json           | 2 +-
 src/main/resources/data/enva/recipe/glass_bowl.json           | 2 +-
 src/main/resources/data/enva/recipe/glass_helmet.json         | 2 +-
 src/main/resources/data/enva/recipe/glasses.json              | 2 +-
 src/main/resources/data/enva/recipe/sunscreen.json            | 2 +-
 src/main/resources/data/enva/recipe/titanium_block.json       | 2 +-
 src/main/resources/data/enva/recipe/titanium_boots.json       | 2 +-
 src/main/resources/data/enva/recipe/titanium_chestplate.json  | 2 +-
 .../data/enva/recipe/titanium_coated_glass_bowl.json          | 2 +-
 .../data/enva/recipe/titanium_coated_glass_helmet.json        | 2 +-
 src/main/resources/data/enva/recipe/titanium_dust.json        | 2 +-
 src/main/resources/data/enva/recipe/titanium_helmet.json      | 2 +-
 .../resources/data/enva/recipe/titanium_ingot_from_block.json | 2 +-
 .../resources/data/enva/recipe/titanium_ingot_from_dust.json  | 2 +-
 .../data/enva/recipe/titanium_ingot_from_ore_blast.json       | 4 +++-
 .../data/enva/recipe/titanium_ingot_from_ore_normal.json      | 4 +++-
 src/main/resources/data/enva/recipe/titanium_leggings.json    | 2 +-
 17 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/data/enva/recipe/air_filter.json b/src/main/resources/data/enva/recipe/air_filter.json
index 7805879..9a8023a 100644
--- a/src/main/resources/data/enva/recipe/air_filter.json
+++ b/src/main/resources/data/enva/recipe/air_filter.json
@@ -20,7 +20,7 @@
     }
   },
   "result": {
-    "item": "enva:air_filter",
+    "id": "enva:air_filter",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipe/glass_bowl.json b/src/main/resources/data/enva/recipe/glass_bowl.json
index fb2f422..c687379 100644
--- a/src/main/resources/data/enva/recipe/glass_bowl.json
+++ b/src/main/resources/data/enva/recipe/glass_bowl.json
@@ -10,7 +10,7 @@
     }
   },
   "result": {
-    "item": "enva:glass_bowl",
+    "id": "enva:glass_bowl",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipe/glass_helmet.json b/src/main/resources/data/enva/recipe/glass_helmet.json
index 0ca3146..c50d8a6 100644
--- a/src/main/resources/data/enva/recipe/glass_helmet.json
+++ b/src/main/resources/data/enva/recipe/glass_helmet.json
@@ -10,7 +10,7 @@
     }
   },
   "result": {
-    "item": "enva:glass_helmet",
+    "id": "enva:glass_helmet",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipe/glasses.json b/src/main/resources/data/enva/recipe/glasses.json
index a280df5..34cd84a 100644
--- a/src/main/resources/data/enva/recipe/glasses.json
+++ b/src/main/resources/data/enva/recipe/glasses.json
@@ -9,7 +9,7 @@
     }
   },
   "result": {
-    "item": "enva:glasses",
+    "id": "enva:glasses",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipe/sunscreen.json b/src/main/resources/data/enva/recipe/sunscreen.json
index dddb18b..a6577d8 100644
--- a/src/main/resources/data/enva/recipe/sunscreen.json
+++ b/src/main/resources/data/enva/recipe/sunscreen.json
@@ -20,7 +20,7 @@
     }
   },
   "result": {
-    "item": "enva:sunscreen",
+    "id": "enva:sunscreen",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipe/titanium_block.json b/src/main/resources/data/enva/recipe/titanium_block.json
index 4361f25..51cab7e 100644
--- a/src/main/resources/data/enva/recipe/titanium_block.json
+++ b/src/main/resources/data/enva/recipe/titanium_block.json
@@ -11,7 +11,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_block",
+    "id": "enva:titanium_block",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipe/titanium_boots.json b/src/main/resources/data/enva/recipe/titanium_boots.json
index 622b72e..0356717 100644
--- a/src/main/resources/data/enva/recipe/titanium_boots.json
+++ b/src/main/resources/data/enva/recipe/titanium_boots.json
@@ -10,7 +10,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_boots",
+    "id": "enva:titanium_boots",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipe/titanium_chestplate.json b/src/main/resources/data/enva/recipe/titanium_chestplate.json
index 5775855..192bf7c 100644
--- a/src/main/resources/data/enva/recipe/titanium_chestplate.json
+++ b/src/main/resources/data/enva/recipe/titanium_chestplate.json
@@ -11,7 +11,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_chestplate",
+    "id": "enva:titanium_chestplate",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipe/titanium_coated_glass_bowl.json b/src/main/resources/data/enva/recipe/titanium_coated_glass_bowl.json
index 3bf7ab3..b4f4494 100644
--- a/src/main/resources/data/enva/recipe/titanium_coated_glass_bowl.json
+++ b/src/main/resources/data/enva/recipe/titanium_coated_glass_bowl.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_coated_glass_bowl",
+    "id": "enva:titanium_coated_glass_bowl",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipe/titanium_coated_glass_helmet.json b/src/main/resources/data/enva/recipe/titanium_coated_glass_helmet.json
index 7a6f20b..e8e3f24 100644
--- a/src/main/resources/data/enva/recipe/titanium_coated_glass_helmet.json
+++ b/src/main/resources/data/enva/recipe/titanium_coated_glass_helmet.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_coated_glass_helmet",
+    "id": "enva:titanium_coated_glass_helmet",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipe/titanium_dust.json b/src/main/resources/data/enva/recipe/titanium_dust.json
index ce3c916..498ec25 100644
--- a/src/main/resources/data/enva/recipe/titanium_dust.json
+++ b/src/main/resources/data/enva/recipe/titanium_dust.json
@@ -6,7 +6,7 @@
     }
   ],
   "result": {
-    "item": "enva:titanium_dust",
+    "id": "enva:titanium_dust",
     "count": 9
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipe/titanium_helmet.json b/src/main/resources/data/enva/recipe/titanium_helmet.json
index f0b463c..e02dceb 100644
--- a/src/main/resources/data/enva/recipe/titanium_helmet.json
+++ b/src/main/resources/data/enva/recipe/titanium_helmet.json
@@ -10,7 +10,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_helmet",
+    "id": "enva:titanium_helmet",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipe/titanium_ingot_from_block.json b/src/main/resources/data/enva/recipe/titanium_ingot_from_block.json
index b306ebc..c40e548 100644
--- a/src/main/resources/data/enva/recipe/titanium_ingot_from_block.json
+++ b/src/main/resources/data/enva/recipe/titanium_ingot_from_block.json
@@ -6,7 +6,7 @@
     }
   ],
   "result": {
-    "item": "enva:titanium_ingot",
+    "id": "enva:titanium_ingot",
     "count": 9
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipe/titanium_ingot_from_dust.json b/src/main/resources/data/enva/recipe/titanium_ingot_from_dust.json
index e3bfed3..13de238 100644
--- a/src/main/resources/data/enva/recipe/titanium_ingot_from_dust.json
+++ b/src/main/resources/data/enva/recipe/titanium_ingot_from_dust.json
@@ -11,7 +11,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_ingot",
+    "id": "enva:titanium_ingot",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipe/titanium_ingot_from_ore_blast.json b/src/main/resources/data/enva/recipe/titanium_ingot_from_ore_blast.json
index cdc0c6f..29da86d 100644
--- a/src/main/resources/data/enva/recipe/titanium_ingot_from_ore_blast.json
+++ b/src/main/resources/data/enva/recipe/titanium_ingot_from_ore_blast.json
@@ -3,7 +3,9 @@
   "ingredient": {
     "item": "enva:titanium_ore"
   },
-  "result": "enva:titanium_ingot",
+  "result": {
+    "id": "enva:titanium_ingot"
+  },
   "experience": 0.3,
   "cookingtime": 100
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipe/titanium_ingot_from_ore_normal.json b/src/main/resources/data/enva/recipe/titanium_ingot_from_ore_normal.json
index 64684a7..3747ace 100644
--- a/src/main/resources/data/enva/recipe/titanium_ingot_from_ore_normal.json
+++ b/src/main/resources/data/enva/recipe/titanium_ingot_from_ore_normal.json
@@ -3,7 +3,9 @@
   "ingredient": {
     "item": "enva:titanium_ore"
   },
-  "result": "enva:titanium_ingot",
+  "result": {
+    "id": "enva:titanium_ingot"
+  },
   "experience": 0.3,
   "cookingtime": 200
 }
diff --git a/src/main/resources/data/enva/recipe/titanium_leggings.json b/src/main/resources/data/enva/recipe/titanium_leggings.json
index ee49120..d2a258b 100644
--- a/src/main/resources/data/enva/recipe/titanium_leggings.json
+++ b/src/main/resources/data/enva/recipe/titanium_leggings.json
@@ -11,7 +11,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_leggings",
+    "id": "enva:titanium_leggings",
     "count": 1
   }
 }
\ No newline at end of file

From ffd27fe3c24f4812e81814b514ad434679a9b783 Mon Sep 17 00:00:00 2001
From: Devil2548 <animalmom2548@gmail.com>
Date: Sat, 26 Jul 2025 14:38:12 -0600
Subject: [PATCH 04/12] Fix indentation in pickaxe.json

---
 .../resources/data/minecraft/tags/block/mineable/pickaxe.json   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json
index 1520568..11e701c 100644
--- a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json
+++ b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json
@@ -3,6 +3,6 @@
   "values": [
     "enva:titanium_ore",
     "enva:titanium_block",
-	"enva:air_filter"
+    "enva:air_filter"
   ]
 }
\ No newline at end of file

From 92c10800d84fae179037c9748ceb6d81e2d91b68 Mon Sep 17 00:00:00 2001
From: Devil2548 <animalmom2548@gmail.com>
Date: Mon, 28 Jul 2025 01:31:08 -0600
Subject: [PATCH 05/12] Fix not being able to apply armor trims or enchantments
 to titanium armor

---
 .../enva/models/item/titanium_boots.json      | 56 +++++++++++++++++++
 .../item/titanium_boots_amethyst_trim.json    |  7 +++
 .../item/titanium_boots_copper_trim.json      |  7 +++
 .../item/titanium_boots_diamond_trim.json     |  7 +++
 .../item/titanium_boots_emerald_trim.json     |  7 +++
 .../models/item/titanium_boots_gold_trim.json |  7 +++
 .../item/titanium_boots_lapis_trim.json       |  7 +++
 .../item/titanium_boots_netherite_trim.json   |  7 +++
 .../item/titanium_boots_quartz_trim.json      |  7 +++
 .../item/titanium_boots_redstone_trim.json    |  7 +++
 .../enva/models/item/titanium_chestplate.json | 56 +++++++++++++++++++
 .../titanium_chestplate_amethyst_trim.json    |  7 +++
 .../item/titanium_chestplate_copper_trim.json |  7 +++
 .../titanium_chestplate_diamond_trim.json     |  7 +++
 .../titanium_chestplate_emerald_trim.json     |  7 +++
 .../item/titanium_chestplate_gold_trim.json   |  7 +++
 .../item/titanium_chestplate_lapis_trim.json  |  7 +++
 .../titanium_chestplate_netherite_trim.json   |  7 +++
 .../item/titanium_chestplate_quartz_trim.json |  7 +++
 .../titanium_chestplate_redstone_trim.json    |  7 +++
 .../enva/models/item/titanium_helmet.json     | 56 +++++++++++++++++++
 .../item/titanium_helmet_amethyst_trim.json   |  7 +++
 .../item/titanium_helmet_copper_trim.json     |  7 +++
 .../item/titanium_helmet_diamond_trim.json    |  7 +++
 .../item/titanium_helmet_emerald_trim.json    |  7 +++
 .../item/titanium_helmet_gold_trim.json       |  7 +++
 .../item/titanium_helmet_lapis_trim.json      |  7 +++
 .../item/titanium_helmet_netherite_trim.json  |  7 +++
 .../item/titanium_helmet_quartz_trim.json     |  7 +++
 .../item/titanium_helmet_redstone_trim.json   |  7 +++
 .../enva/models/item/titanium_leggings.json   | 56 +++++++++++++++++++
 .../item/titanium_leggings_amethyst_trim.json |  7 +++
 .../item/titanium_leggings_copper_trim.json   |  7 +++
 .../item/titanium_leggings_diamond_trim.json  |  7 +++
 .../item/titanium_leggings_emerald_trim.json  |  7 +++
 .../item/titanium_leggings_gold_trim.json     |  7 +++
 .../item/titanium_leggings_lapis_trim.json    |  7 +++
 .../titanium_leggings_netherite_trim.json     |  7 +++
 .../item/titanium_leggings_quartz_trim.json   |  7 +++
 .../item/titanium_leggings_redstone_trim.json |  7 +++
 .../data/minecraft/tags/item/chest_armor.json |  6 ++
 .../data/minecraft/tags/item/foot_armor.json  |  6 ++
 .../data/minecraft/tags/item/head_armor.json  |  6 ++
 .../data/minecraft/tags/item/leg_armor.json   |  6 ++
 44 files changed, 500 insertions(+)
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_boots_amethyst_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_boots_copper_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_boots_diamond_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_boots_emerald_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_boots_gold_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_boots_lapis_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_boots_netherite_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_boots_quartz_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_boots_redstone_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_chestplate_amethyst_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_chestplate_copper_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_chestplate_diamond_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_chestplate_emerald_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_chestplate_gold_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_chestplate_lapis_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_chestplate_netherite_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_chestplate_quartz_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_chestplate_redstone_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_helmet_amethyst_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_helmet_copper_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_helmet_diamond_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_helmet_emerald_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_helmet_gold_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_helmet_lapis_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_helmet_netherite_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_helmet_quartz_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_helmet_redstone_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_leggings_amethyst_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_leggings_copper_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_leggings_diamond_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_leggings_emerald_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_leggings_gold_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_leggings_lapis_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_leggings_netherite_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_leggings_quartz_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_leggings_redstone_trim.json
 create mode 100644 src/main/resources/data/minecraft/tags/item/chest_armor.json
 create mode 100644 src/main/resources/data/minecraft/tags/item/foot_armor.json
 create mode 100644 src/main/resources/data/minecraft/tags/item/head_armor.json
 create mode 100644 src/main/resources/data/minecraft/tags/item/leg_armor.json

diff --git a/src/main/resources/assets/enva/models/item/titanium_boots.json b/src/main/resources/assets/enva/models/item/titanium_boots.json
index 183baf1..9f499e7 100644
--- a/src/main/resources/assets/enva/models/item/titanium_boots.json
+++ b/src/main/resources/assets/enva/models/item/titanium_boots.json
@@ -1,5 +1,61 @@
 {
   "parent": "item/generated",
+  "overrides": [
+    {
+      "model": "enva:item/titanium_boots_quartz_trim",
+      "predicate": {
+        "trim_type": 0.1
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_netherite_trim",
+      "predicate": {
+        "trim_type": 0.3
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_redstone_trim",
+      "predicate": {
+        "trim_type": 0.4
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_copper_trim",
+      "predicate": {
+        "trim_type": 0.5
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_gold_trim",
+      "predicate": {
+        "trim_type": 0.6
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_emerald_trim",
+      "predicate": {
+        "trim_type": 0.7
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_diamond_trim",
+      "predicate": {
+        "trim_type": 0.8
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_lapis_trim",
+      "predicate": {
+        "trim_type": 0.9
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_amethyst_trim",
+      "predicate": {
+        "trim_type": 1.0
+      }
+    }
+  ],
   "textures": {
     "layer0": "enva:item/titanium_boots"
   }
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_amethyst_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_amethyst_trim.json
new file mode 100644
index 0000000..6dc8b5b
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_amethyst_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_amethyst"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_copper_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_copper_trim.json
new file mode 100644
index 0000000..596af19
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_copper_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_copper"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_diamond_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_diamond_trim.json
new file mode 100644
index 0000000..3c3d08d
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_diamond_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_diamond"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_emerald_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_emerald_trim.json
new file mode 100644
index 0000000..86a1934
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_emerald_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_emerald"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_gold_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_gold_trim.json
new file mode 100644
index 0000000..66efb83
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_gold_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_gold"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_lapis_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_lapis_trim.json
new file mode 100644
index 0000000..a36c353
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_lapis_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_lapis"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_netherite_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_netherite_trim.json
new file mode 100644
index 0000000..e5a9792
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_netherite_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_netherite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_quartz_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_quartz_trim.json
new file mode 100644
index 0000000..efa2869
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_quartz_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_quartz"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_redstone_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_redstone_trim.json
new file mode 100644
index 0000000..486c8d3
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_redstone_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_redstone"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate.json b/src/main/resources/assets/enva/models/item/titanium_chestplate.json
index c2c7741..c2b7c4b 100644
--- a/src/main/resources/assets/enva/models/item/titanium_chestplate.json
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate.json
@@ -1,5 +1,61 @@
 {
   "parent": "item/generated",
+  "overrides": [
+    {
+      "model": "enva:item/titanium_chestplate_quartz_trim",
+      "predicate": {
+        "trim_type": 0.1
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_netherite_trim",
+      "predicate": {
+        "trim_type": 0.3
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_redstone_trim",
+      "predicate": {
+        "trim_type": 0.4
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_copper_trim",
+      "predicate": {
+        "trim_type": 0.5
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_gold_trim",
+      "predicate": {
+        "trim_type": 0.6
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_emerald_trim",
+      "predicate": {
+        "trim_type": 0.7
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_diamond_trim",
+      "predicate": {
+        "trim_type": 0.8
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_lapis_trim",
+      "predicate": {
+        "trim_type": 0.9
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_amethyst_trim",
+      "predicate": {
+        "trim_type": 1.0
+      }
+    }
+  ],
   "textures": {
     "layer0": "enva:item/titanium_chestplate"
   }
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_amethyst_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_amethyst_trim.json
new file mode 100644
index 0000000..3887715
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_amethyst_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_amethyst"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_copper_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_copper_trim.json
new file mode 100644
index 0000000..99d3360
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_copper_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_copper"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_diamond_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_diamond_trim.json
new file mode 100644
index 0000000..4546e9f
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_diamond_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_diamond"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_emerald_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_emerald_trim.json
new file mode 100644
index 0000000..b2c60ad
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_emerald_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_emerald"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_gold_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_gold_trim.json
new file mode 100644
index 0000000..b845634
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_gold_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_gold"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_lapis_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_lapis_trim.json
new file mode 100644
index 0000000..76c4516
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_lapis_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_lapis"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_netherite_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_netherite_trim.json
new file mode 100644
index 0000000..9f9f8d2
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_netherite_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_netherite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_quartz_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_quartz_trim.json
new file mode 100644
index 0000000..75ac6a5
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_quartz_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_quartz"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_redstone_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_redstone_trim.json
new file mode 100644
index 0000000..058661f
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_redstone_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_redstone"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet.json b/src/main/resources/assets/enva/models/item/titanium_helmet.json
index f7c57b2..248badd 100644
--- a/src/main/resources/assets/enva/models/item/titanium_helmet.json
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet.json
@@ -1,5 +1,61 @@
 {
   "parent": "item/generated",
+  "overrides": [
+    {
+      "model": "enva:item/titanium_helmet_quartz_trim",
+      "predicate": {
+        "trim_type": 0.1
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_netherite_trim",
+      "predicate": {
+        "trim_type": 0.3
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_redstone_trim",
+      "predicate": {
+        "trim_type": 0.4
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_copper_trim",
+      "predicate": {
+        "trim_type": 0.5
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_gold_trim",
+      "predicate": {
+        "trim_type": 0.6
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_emerald_trim",
+      "predicate": {
+        "trim_type": 0.7
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_diamond_trim",
+      "predicate": {
+        "trim_type": 0.8
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_lapis_trim",
+      "predicate": {
+        "trim_type": 0.9
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_amethyst_trim",
+      "predicate": {
+        "trim_type": 1.0
+      }
+    }
+  ],
   "textures": {
     "layer0": "enva:item/titanium_helmet"
   }
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_amethyst_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_amethyst_trim.json
new file mode 100644
index 0000000..27e4ab6
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_amethyst_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_amethyst"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_copper_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_copper_trim.json
new file mode 100644
index 0000000..a914fa8
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_copper_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_copper"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_diamond_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_diamond_trim.json
new file mode 100644
index 0000000..46ceba3
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_diamond_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_diamond"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_emerald_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_emerald_trim.json
new file mode 100644
index 0000000..a45a9d8
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_emerald_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_emerald"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_gold_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_gold_trim.json
new file mode 100644
index 0000000..9cb17d5
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_gold_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_gold"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_lapis_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_lapis_trim.json
new file mode 100644
index 0000000..48bb18a
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_lapis_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_lapis"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_netherite_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_netherite_trim.json
new file mode 100644
index 0000000..d8a20cf
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_netherite_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_netherite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_quartz_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_quartz_trim.json
new file mode 100644
index 0000000..32e44a2
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_quartz_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_quartz"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_redstone_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_redstone_trim.json
new file mode 100644
index 0000000..1e31a4e
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_redstone_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_redstone"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings.json b/src/main/resources/assets/enva/models/item/titanium_leggings.json
index fbd4943..d17452b 100644
--- a/src/main/resources/assets/enva/models/item/titanium_leggings.json
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings.json
@@ -1,5 +1,61 @@
 {
   "parent": "item/generated",
+  "overrides": [
+    {
+      "model": "enva:item/titanium_leggings_quartz_trim",
+      "predicate": {
+        "trim_type": 0.1
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_netherite_trim",
+      "predicate": {
+        "trim_type": 0.3
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_redstone_trim",
+      "predicate": {
+        "trim_type": 0.4
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_copper_trim",
+      "predicate": {
+        "trim_type": 0.5
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_gold_trim",
+      "predicate": {
+        "trim_type": 0.6
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_emerald_trim",
+      "predicate": {
+        "trim_type": 0.7
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_diamond_trim",
+      "predicate": {
+        "trim_type": 0.8
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_lapis_trim",
+      "predicate": {
+        "trim_type": 0.9
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_amethyst_trim",
+      "predicate": {
+        "trim_type": 1.0
+      }
+    }
+  ],
   "textures": {
     "layer0": "enva:item/titanium_leggings"
   }
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_amethyst_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_amethyst_trim.json
new file mode 100644
index 0000000..5b8d6b6
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_amethyst_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_amethyst"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_copper_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_copper_trim.json
new file mode 100644
index 0000000..7fd5947
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_copper_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_copper"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_diamond_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_diamond_trim.json
new file mode 100644
index 0000000..e3146cb
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_diamond_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_diamond"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_emerald_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_emerald_trim.json
new file mode 100644
index 0000000..e6f537e
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_emerald_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_emerald"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_gold_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_gold_trim.json
new file mode 100644
index 0000000..33db14e
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_gold_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_gold"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_lapis_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_lapis_trim.json
new file mode 100644
index 0000000..7c9b0ff
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_lapis_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_lapis"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_netherite_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_netherite_trim.json
new file mode 100644
index 0000000..72384b3
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_netherite_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_netherite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_quartz_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_quartz_trim.json
new file mode 100644
index 0000000..2a7a68e
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_quartz_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_quartz"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_redstone_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_redstone_trim.json
new file mode 100644
index 0000000..659aa2c
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_redstone_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_redstone"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/item/chest_armor.json b/src/main/resources/data/minecraft/tags/item/chest_armor.json
new file mode 100644
index 0000000..7dc3503
--- /dev/null
+++ b/src/main/resources/data/minecraft/tags/item/chest_armor.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "enva:titanium_chestplate"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/item/foot_armor.json b/src/main/resources/data/minecraft/tags/item/foot_armor.json
new file mode 100644
index 0000000..154efcb
--- /dev/null
+++ b/src/main/resources/data/minecraft/tags/item/foot_armor.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "enva:titanium_boots"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/item/head_armor.json b/src/main/resources/data/minecraft/tags/item/head_armor.json
new file mode 100644
index 0000000..db44432
--- /dev/null
+++ b/src/main/resources/data/minecraft/tags/item/head_armor.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "enva:titanium_helmet"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/item/leg_armor.json b/src/main/resources/data/minecraft/tags/item/leg_armor.json
new file mode 100644
index 0000000..1823f7d
--- /dev/null
+++ b/src/main/resources/data/minecraft/tags/item/leg_armor.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "enva:titanium_leggings"
+  ]
+}
\ No newline at end of file

From 0f1a68f45e938c281c267bca8c08494a955026bd Mon Sep 17 00:00:00 2001
From: Devil2548 <animalmom2548@gmail.com>
Date: Wed, 30 Jul 2025 14:34:13 -0600
Subject: [PATCH 06/12] Fix iron being left out of the item models for trimmed
 armor

---
 .../resources/assets/enva/models/item/titanium_boots.json  | 6 ++++++
 .../assets/enva/models/item/titanium_boots_iron_trim.json  | 7 +++++++
 .../assets/enva/models/item/titanium_chestplate.json       | 6 ++++++
 .../enva/models/item/titanium_chestplate_iron_trim.json    | 7 +++++++
 .../resources/assets/enva/models/item/titanium_helmet.json | 6 ++++++
 .../assets/enva/models/item/titanium_helmet_iron_trim.json | 7 +++++++
 .../assets/enva/models/item/titanium_leggings.json         | 6 ++++++
 .../enva/models/item/titanium_leggings_iron_trim.json      | 7 +++++++
 8 files changed, 52 insertions(+)
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_boots_iron_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_chestplate_iron_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_helmet_iron_trim.json
 create mode 100644 src/main/resources/assets/enva/models/item/titanium_leggings_iron_trim.json

diff --git a/src/main/resources/assets/enva/models/item/titanium_boots.json b/src/main/resources/assets/enva/models/item/titanium_boots.json
index 9f499e7..f79604b 100644
--- a/src/main/resources/assets/enva/models/item/titanium_boots.json
+++ b/src/main/resources/assets/enva/models/item/titanium_boots.json
@@ -7,6 +7,12 @@
         "trim_type": 0.1
       }
     },
+    {
+      "model": "enva:item/titanium_boots_iron_trim",
+      "predicate": {
+        "trim_type": 0.2
+      }
+    },
     {
       "model": "enva:item/titanium_boots_netherite_trim",
       "predicate": {
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_iron_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_iron_trim.json
new file mode 100644
index 0000000..a3bc073
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_iron_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_iron"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate.json b/src/main/resources/assets/enva/models/item/titanium_chestplate.json
index c2b7c4b..d6eb8f2 100644
--- a/src/main/resources/assets/enva/models/item/titanium_chestplate.json
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate.json
@@ -7,6 +7,12 @@
         "trim_type": 0.1
       }
     },
+    {
+      "model": "enva:item/titanium_chestplate_iron_trim",
+      "predicate": {
+        "trim_type": 0.2
+      }
+    },
     {
       "model": "enva:item/titanium_chestplate_netherite_trim",
       "predicate": {
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_iron_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_iron_trim.json
new file mode 100644
index 0000000..9dbf404
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_iron_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_iron"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet.json b/src/main/resources/assets/enva/models/item/titanium_helmet.json
index 248badd..ac6d945 100644
--- a/src/main/resources/assets/enva/models/item/titanium_helmet.json
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet.json
@@ -7,6 +7,12 @@
         "trim_type": 0.1
       }
     },
+    {
+      "model": "enva:item/titanium_helmet_iron_trim",
+      "predicate": {
+        "trim_type": 0.2
+      }
+    },
     {
       "model": "enva:item/titanium_helmet_netherite_trim",
       "predicate": {
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_iron_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_iron_trim.json
new file mode 100644
index 0000000..48bfb14
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_iron_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_iron"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings.json b/src/main/resources/assets/enva/models/item/titanium_leggings.json
index d17452b..57911e3 100644
--- a/src/main/resources/assets/enva/models/item/titanium_leggings.json
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings.json
@@ -7,6 +7,12 @@
         "trim_type": 0.1
       }
     },
+    {
+      "model": "enva:item/titanium_leggings_iron_trim",
+      "predicate": {
+        "trim_type": 0.2
+      }
+    },
     {
       "model": "enva:item/titanium_leggings_netherite_trim",
       "predicate": {
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_iron_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_iron_trim.json
new file mode 100644
index 0000000..9f14ba1
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_iron_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_iron"
+  }
+}
\ No newline at end of file

From 5e85866b02eda9349aeb09a1d363afc39abb76ca Mon Sep 17 00:00:00 2001
From: Devil2548 <animalmom2548@gmail.com>
Date: Sun, 3 Aug 2025 20:01:59 -0600
Subject: [PATCH 07/12] Fix the water glass bowl and ender glasses lacking
 textures, and give the titanium coated glass bowl a unique texture

---
 .../environmentalarmor/armor/Materials.java    |  12 ++++++++++--
 .../environmentalarmor/registry/ModArmor.java  |   4 ++--
 .../textures/models/armor/glasses_layer_1.png  | Bin 132 -> 737 bytes
 .../titanium_coated_water_glass_layer_1.png    | Bin 0 -> 4809 bytes
 .../models/armor/water_glass_layer_1.png       | Bin 132 -> 4813 bytes
 5 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 src/main/resources/assets/enva/textures/models/armor/titanium_coated_water_glass_layer_1.png

diff --git a/src/main/java/io/github/magicquartz/environmentalarmor/armor/Materials.java b/src/main/java/io/github/magicquartz/environmentalarmor/armor/Materials.java
index 637e1a0..a4d8ea0 100644
--- a/src/main/java/io/github/magicquartz/environmentalarmor/armor/Materials.java
+++ b/src/main/java/io/github/magicquartz/environmentalarmor/armor/Materials.java
@@ -21,7 +21,8 @@ public class Materials {
 	public static final RegistryEntry<ArmorMaterial> WATER_GLASS;
 	public static final RegistryEntry<ArmorMaterial> GLASSES;
 	public static final RegistryEntry<ArmorMaterial> TITANIUM;
-	public static final RegistryEntry<ArmorMaterial> TITANIUM_COATED;
+	public static final RegistryEntry<ArmorMaterial> TITANIUM_COATED_GLASS;
+	public static final RegistryEntry<ArmorMaterial> TITANIUM_COATED_WATER_GLASS;
 	
 	static {
 		GLASS = Registry.registerReference(Registries.ARMOR_MATERIAL, Main.identifier("glass"), new ArmorMaterial(Util.make(new EnumMap(ArmorItem.Type.class), (map) -> {
@@ -52,12 +53,19 @@ public class Materials {
 			map.put(ArmorItem.Type.HELMET, 2);
 			map.put(ArmorItem.Type.BODY, 4);
 		}), 10, SoundEvents.ITEM_ARMOR_EQUIP_CHAIN, () -> Ingredient.ofItems(ModItems.TITANIUM_INGOT), List.of(new ArmorMaterial.Layer(Main.identifier("titanium"))), 4F, 0.5F));
-		TITANIUM_COATED = Registry.registerReference(Registries.ARMOR_MATERIAL, Main.identifier("titanium_coated_glass"), new ArmorMaterial(Util.make(new EnumMap(ArmorItem.Type.class), (map) -> {
+		TITANIUM_COATED_GLASS = Registry.registerReference(Registries.ARMOR_MATERIAL, Main.identifier("titanium_coated_glass"), new ArmorMaterial(Util.make(new EnumMap(ArmorItem.Type.class), (map) -> {
 			map.put(ArmorItem.Type.BOOTS, 2);
 			map.put(ArmorItem.Type.LEGGINGS, 2);
 			map.put(ArmorItem.Type.CHESTPLATE, 2);
 			map.put(ArmorItem.Type.HELMET, 2);
 			map.put(ArmorItem.Type.BODY, 2);
 		}), 0, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, () -> Ingredient.ofItems(ModItems.TITANIUM_INGOT), List.of(new ArmorMaterial.Layer(Main.identifier("titanium_coated_glass"))), 1, 0));
+		TITANIUM_COATED_WATER_GLASS = Registry.registerReference(Registries.ARMOR_MATERIAL, Main.identifier("titanium_coated_water_glass"), new ArmorMaterial(Util.make(new EnumMap(ArmorItem.Type.class), (map) -> {
+			map.put(ArmorItem.Type.BOOTS, 2);
+			map.put(ArmorItem.Type.LEGGINGS, 2);
+			map.put(ArmorItem.Type.CHESTPLATE, 2);
+			map.put(ArmorItem.Type.HELMET, 2);
+			map.put(ArmorItem.Type.BODY, 2);
+		}), 0, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, () -> Ingredient.ofItems(ModItems.TITANIUM_INGOT), List.of(new ArmorMaterial.Layer(Main.identifier("titanium_coated_water_glass"))), 1, 0));
 	}
 }
diff --git a/src/main/java/io/github/magicquartz/environmentalarmor/registry/ModArmor.java b/src/main/java/io/github/magicquartz/environmentalarmor/registry/ModArmor.java
index e441a47..76806b7 100644
--- a/src/main/java/io/github/magicquartz/environmentalarmor/registry/ModArmor.java
+++ b/src/main/java/io/github/magicquartz/environmentalarmor/registry/ModArmor.java
@@ -17,8 +17,8 @@ public class ModArmor {
     public static final Item GLASSES = new ArmorItem(Materials.GLASSES, ArmorItem.Type.HELMET, new Item.Settings().rarity(Rarity.COMMON).maxDamage(ArmorItem.Type.HELMET.getMaxDamage(5)));
 
     //Titanium Coated
-    public static final Item TITANIUM_COATED_GLASS_HELMET = new ArmorItem(Materials.TITANIUM_COATED, ArmorItem.Type.HELMET, new Item.Settings().maxDamage(ArmorItem.Type.HELMET.getMaxDamage(165)));
-    public static final Item TITANIUM_COATED_WATER_GLASS_BOWL = new ArmorItem(Materials.TITANIUM_COATED, ArmorItem.Type.HELMET, new Item.Settings().maxDamage(ArmorItem.Type.HELMET.getMaxDamage(165)));
+    public static final Item TITANIUM_COATED_GLASS_HELMET = new ArmorItem(Materials.TITANIUM_COATED_GLASS, ArmorItem.Type.HELMET, new Item.Settings().maxDamage(ArmorItem.Type.HELMET.getMaxDamage(165)));
+    public static final Item TITANIUM_COATED_WATER_GLASS_BOWL = new ArmorItem(Materials.TITANIUM_COATED_WATER_GLASS, ArmorItem.Type.HELMET, new Item.Settings().maxDamage(ArmorItem.Type.HELMET.getMaxDamage(165)));
 
     // Titanium armor
     public static final Item TITANIUM_HELMET = new ArmorItem(Materials.TITANIUM, ArmorItem.Type.HELMET, new Item.Settings().maxDamage(ArmorItem.Type.HELMET.getMaxDamage(30)));
diff --git a/src/main/resources/assets/enva/textures/models/armor/glasses_layer_1.png b/src/main/resources/assets/enva/textures/models/armor/glasses_layer_1.png
index bd65c9bc84c4fcca70e86360c901f13bb419ccf2..ae94c3b3497c309d16f40e5b3f3bc61a3579c99e 100644
GIT binary patch
literal 737
zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|?*`baoE#baqxKD9TUE%t>Wn
z(3n^|(bnT|fJm$VWv}iKnKueblNMUtbagG6tR;5PDN}pPtAtON>@zM+ShB-{YaJ_l
zz1V6#y>q*)c5pR4;P2S|V95(5)qB%LqK;HN{AhP>_wx_;Y8x)BF}lighH+Jz<V%;B
zGf%^hKG1gJIM6P5#_P<L$up1Y*t~u{&uZnnB%9N_-=BXK%%#R$qx4bcGH-W9b4AtV
zOP242-6JA{I?i_<=iR07QTcl6^!pamWyC7dj+|Kbyi@r|(#r0qdTFW7s`Hfkv{t$O
zbUK&X`dKV}YgGE%>QCZr+_${iUT<lectB{9hhs~RmDY+wPCaG4BEp$g{nbC(W$L?P
zjCN`zJc)4N)lxam|BrotdbXIl`kf^OGA}AOzU>cG*ulL;YTMu1oZD-K5B%qe$&{^M
z%Xy||(!CcM7nK*(OYhk6F5{D2!A@o#yO)y`Eho*N7NEoQKK+YtWx@lo7qP|9uh|`c
z$vk0cr0#tN_Vxo2otv)P-jjVb@AiJ%w?F?f>|9@TIJoyw5-?ualDyqr82*Fcg1yTp
z14TFsJR*x381$4un6YB1eHl=Yy~NYkmHj0L3!^3f-I8MoKq1Kz*N775{M_8syb=cI
zqSVBa)D(sC%#sWRcTeAd@J2pyprRd~E{-7;x87c}<zsXdVR*28(VZ0k4Z5lepG(NJ
z1Q!S%U!cAvN_4J^y%y{032RcE_pPrznewSFEsh1K845n!-n5H-$&^>I3a3LBI=;=9
z*>vZPR&0P+rBBt|H>Po7l`bxG)@`5B%eLx2Kd*qGp*;WmuALG2mtPh5EPt(gN~u3{
ze{`pJ{pYBl2dpdB>U`QR{Pzb_SbOrV_;YIagfcjhtb*G3<B05>Jz8?CzodSGL_A&n
KT-G@yGywqC7c*J_

literal 132
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq
zxP?KOkzv*x37{ZzfKP}kkX~M8dkdtYB*-tA!Qt7BG$4o9)5S5QVoq{`1nUo=lmY{z
T&g{T+pag@btDnm{r-UW|xl0^>

diff --git a/src/main/resources/assets/enva/textures/models/armor/titanium_coated_water_glass_layer_1.png b/src/main/resources/assets/enva/textures/models/armor/titanium_coated_water_glass_layer_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..327787056e9d6bbe7bfc9f3e10832d631eac74f8
GIT binary patch
literal 4809
zcmeHKdsGuw8Xxcpi0Ep?B1kq+rPd^q7fHq-3PFexpojwX0h5_Y9L<YlAORFX>LS?n
zRM=W|QLLgAU8}Wj6`v@@THlDG6;T%z1mq>#0?MOz0w|vLoIRei{g0e8ukZVPzx#c^
z``vqTGs8jx9qnE0AqaAm2g$<0GZkEOMvnydn-y!<f=6jmL=+W{ni&S8UPWpM29;<a
z7=(pXL6GI1Htd{Z31dtbKOhjQO!XN{h8Iqux~9hN&aanmEm4nsY*_u^P|LGjo^y@2
zm3w7#f<JTFa3RxMnZ>Iv&NiHRnm#k_bLI2r&RKU3twtPcDvDo}2Ia9e=5t*mZn}G{
z-H;qO{K(18MdQmSW=}cVc`z!t;TMO>@y$1i{G66%w39EAw`A2dzAvAKh~s2<#m`Xt
z7sEv3+{P=ux>#&SI7$<zPri6o!upic;2O;=%jy+Dkj<y0zkitA-+!PWP)6>W%|1aT
zb6iVf%CiDyj7=C9cQI_o^WEXYzYH&BMtN!1FLn!Ncdwh~D9_rs=g}vI7VO*lN7es2
zkbZzMIwkeELr4}oyt+5rZ{uXAO|M#;9z1SxV;o%>EF2a$=k`pGoZt<e=l9?3&0^R>
zHRE!&78V@YD6wohl-$vg<oq=HL2Zv~`us9HHPmwxzv}P?(FW|FTdpPMiLcDa_FEky
zC2x$#bT49`?7C3&{BSY9WFDIz>N;)GWuKYt@PWxQTF1o6J{Debe!>1I_n7#=zehIQ
z&p8W6+**8OX@TT#o?AZmb7A6wumHzNyN|BS-+J*z%J~xC`i}A^**`5B;qjwweb`?m
zDJ{MoRR^QD?=<H4+3jjB{oeONTF<gwRYx0}u}WPY)T4ehzu{#AEB4o%|EeN4y4v_x
z7MI3H=Cr3?c8h%?|8mSvo4W+-!|g1-d-OA)l4Hfi+bfr--3y%NY&!AD8Jn?V(=vI)
zq2yDu?p9WwRU_TqP=|~0{<+p4c7w)CAVGsgDS{D9uVtgSUP-VmS_9}j2$K3*3@EmW
zpcqO*P3nA@%_q+?86@t*j1($hg~6X#K?WrmiG@ia5m?eHOoB6gXWL6H2q4fB6w0t@
zH98Yw@nKqd5%5l%IZTEXLap*)Mk&G={(2+95U>Som=$0l6L`$o_6(^JS0UlDdHodN
z%ZIswq6`R!V>X-FW<FbQRCBlziG&05I6NK;AXuhE9few0I+F)Y(Z?YpOqh{0P^4bR
zpgB>cKA!SnGJ&5lke}9|P`swsnfg@#dT=bLfx~6P9Ici!IKo5)Bmk2Bg#IwX6am&L
zC!8?p<Bb>*kU;1tkHHi;_B!4WZ`4@J!7&b@A+!K$0;6)@8ZuC>2zwntOQ0sT25S@$
z`z<6zs@{n8R&KP%TF&4^K=^Ckx6lK%TfqROP#`ir7Eh-qm-#U1@ey2)kvL*~<#KTm
zF5<#0m{3Vr0s)uDQW87?3lj=(p$JzIC{HzrO0F|es174&DnQOA0gsY^RYDamVTo{w
zk|hv&i&zqYm|%HxVIB|m7N9(oH;5wCNP@0JHG{LFsc=Ar;V_0PF_=Y2R6;<7b6FCe
z2xqByn722<hb2M*Y^B06WS-urMZt8ET2xJN3_7*dK?{z|4U_vYdF(!@)e@#bDHR9+
zYk<_@db8;bID*s?3n`S=lPeMmcp_LR;fe)fSS)-4T1*&CpciRYF3jeOtsZ(}5Ks<~
z7Nt8C5LoS?8pPj7pp@Piq1S7Cm~;vZI`Xw!0TvXFQm7222tW$+ga|A~V15Kwg7EkV
zm&<~^5qJ<@kCUpz|AnTP4@25F=|Q9kjGt&V^{uIeL|orj-=~JOE+z)Ux-1YB>np*8
zCJ?waPr%jZ!d9R<H39aI{)Qc}lYh_*TolEWT$O<3%@bjupZG9K!sV)1pr<6>0!$#r
z1>SG7oAfHmj2el#YM>*~3N)xyD~4D9RDJk1-n@dK=K)B@g2k*sk})~`#d7E!W1w0o
z=XZKYt$;yW42bKqfvpSdgq+t~VZUDVrt>HM`sd+K905=d4f0O<4#_nn*E=cjPT-;L
z8j|as6nH1_P<Q>`<g$Nrm?CuGACMUwmGUZrZNV{Xq;f%^%zEI0I{i=5hkiRlP_zkx
z946404YWOXGBA#!<cfe%b)$#dI6IV0byx&JwkEl3ZiMAt<2~-G32~EuY>l~;HV*MD
zVlo9``-hJzbB=9ax3D&OJlhTFu$_3~<zIA7_pX*+4WR7b&ua9v2-7Fpr-?m#YqDME
zw)wVA=t^Pan@>-_+*_3K>S3E;VqtH*bh+r)>Xl!guG*rkc8WPV<@~*DBqiURtNt!V
zvp7a@A{vSBsV9~PN-K^n3U#?U>0ob-*PUnc%z3+R?^v_%j?>8Wr0V}1gwU^E7DPXo
zCAoa7KIB?&*O}E?apakD>@gaWN=lk`<SOQOwit{2{&9WL%;g&C6+1&m)0%x{SMj*)
zeMe98*N!@N;=9LnZV&6Il^ZkoHs{@<&+wfuo5dmS3tSeo=heS_xhKE-qNQWPuG7=C
zAB2CL<hA5fdb;6iW7rP0Q$uD(qI1imPEFa(z?(T9b<2~DuGcb}Tg-`ZAc1e7m`jzd
z3+gIsJ9{%m9dFqos6A%+wiS*{eXn^$)25u7`%_b%=B(C8z0W#)oy0jzojQK{)soh`
zOGg|(?$Q%SJj+uhE~DX>R3VEJcg{ZbON{%I(~qSNcYe4~k_&xdHhBGvZvNh!Uo}h~
z-rQI)^VBVQxd53Ow|hxpt$WI69~64o?<M!|_DcCk7uQ<x_X0Q9ZBSFnnOQw+LwCtu
zw6|@WZfLf>-@UrV?ut`dQ_AeN;XTVzPv%{hrb%q9=3Kkj#@c3nXly8C_RUMQZDSW#
zU03fcUfSor@?PwRtSfXps35AdLQ`&ij~wv!fpfu_fO@&3+4rH_b*W8XH~#M4ai`n%
XRpGY1>#t|7qMh=95ZO0=vFm;Vupb_v

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/enva/textures/models/armor/water_glass_layer_1.png b/src/main/resources/assets/enva/textures/models/armor/water_glass_layer_1.png
index bd65c9bc84c4fcca70e86360c901f13bb419ccf2..cf837b8682814612b770f4b3921ebf92af9a2da9 100644
GIT binary patch
literal 4813
zcmeHKc~BEs8V{fja>*8>xC$DBs{$tJBqXFGAsj)8$|0hH%F*fWU?Vw98WKPhJP}tw
zaMfi1XVldh9gk5Q9bJVL@mMW9Sa)0jWnEX~5Mcy~$g!^zM5vjnDXVt=BURn6-+RCB
z_rCA<zVB7uj_}Y0_BK;&Xf&F=ELa)=+D!2HS&swn2mjo-5j5A*BBRI%L{Haf)e0gB
zr<17~oQ@j^1&wBStPEe`P)WD$>;8P+CQA>O8z*DVOl>u$dk9{g*=HSAG21cs?)!<;
zT=&cjKDqMSJ=WPfmRQ{v-rp9oWSeW0d!4$2?&)vM@p-@bS(j&NXjapds4Lb@HBPl+
zq~EG3FMs2;%Wjtcin+Nuo0wH#TLv$md!$QrHRakovh<$)k6&fv^gj8EJUxAW{tkyw
z7v#^$f{MQ97538YK}+XwH3899ac;<rfwyIjS6Y&yXV#=mw58E3wh)1V;j+NM5AlE~
ziZgbLgDd@9s^V&Lf;=2j9M|0pFKIm(F=k&x6(eena_e%}#jL(fv+QL#I}bIi)U>1D
zH8(u__W0)Gbn6Y77i>dwSP{<#3IcXco{;;#qwUFm+Fa>niHrGG>--+hbt_z){qE|q
zM*}%@OWF&^!u{VIJ+l)w<eo}58q=Kr8~voQ-(~Z{`&ee!%v@gm>1^+8^ozaKsRx92
zJPHEVhx!or#_pK@1M5=n^&eVKSMVz5vv^@HvnJgZ&+UeePxk1rTPIz@|GV=~EYITe
z!sF-0wbT`sLy`YjerEMic-zdq`2kZHm{)j^{iK6siHG;!ytm<MrKH(d^St2JvaxPA
zEStk;z#G~n#`+V{MWx!pfbn0xuKHebJ*z+F%lficuhCl70a|}T!@`!H7H0h0!cN7C
zoh}xEwG~y#D+;?aZ@b1nm+iB=wY%4AYs7ei<dE8fR(ZanqNsLN!t|pP{Bkd@ykg<t
zkhO!0pGyDhyhpXQ<q4v`KALfgw(f5o*A9ZbOCdmhMTIODp=u=y!PIh`Wl(BB;?Zb6
z5`zXo*Wx5yjwcW*G2`{6at58i#EcdE5GX_wh_4}n)3o@~w9rU2Z7m9842iFek3j?o
zlsJjd4ay{yPGk@>OuQoSO%1adbQ6SJD`rH6gwq4nTAc31@?t^EAOn%YW%%0AeYBWD
z6d|2INCA3c#u}2;h}dksUeD6=SZZwon*+lz8{)FLTqZy;b*U;6F)&p+H;Tf{A;op5
zme7!dT1BTg5xF{<6f+oLp8ml<r6wd~h+d@|Q~~J0HXs@{hXt{fO7?II9T}7YNCqAH
zMGIXdC{uO>u2Uy#Q9LLGSCMYRDKK=%UX!d%GKGVoY&;290;mqG${Dfb0$E7-kOd_{
z0-@BHtbo`fkR+k_DAowys2Ni@!yN(UL%bu<A7VFw0V*U!BvqrylzTF%m_e;C!qg~%
ziA<jyKFs%)BN$WQ%@s1e5SYh=y-@)ZLFACPP=Ud)7jGDqOr;|c6^c_-fSg4D9xe{S
z7@rF>F-XW^dT}v80Shsv9D?~m2=W#PF?1M3n3e!pi6jm8ilV{*6^9FPgt$P?6e3=L
z3Ka;MLWMWN<RJo-i}D2+S1vbEVW?=nTB}6Bb`nY?0cUGe38o23aFKtwOw8c2ppPTr
zNeHO`2A~EA6{gnfK2AjvN_;7aP<nE_`CeRah!681NZ>6r2X10qj%#%w7b#W_#Nr7}
z=G4ZBKsZ2JgvwMvU>XO}hyt}ZLaMcqYITyBK~c~t%c1EIP*4~`B2t9J0V%}giy)y0
z;ze>`5tk?8@R*Q51P#NhF+!30YiO!`=sxC64<>YA{Z!MCxu%xl>&!iKH;FJ66P<1<
z3lV~vL(m~9IA-z_aG9sjHHaz!2j|CN!hRShejynI3ORy8d?AyA3UH7NTm=&rA{?eS
zE`T{g4i^T>j%3%V6{H@~;{FLhN1zo*P?J{lIfGl}J`%5AgH!teBx6EC<}k?^?7?8!
z)QRySS|9e$^zbnOh8;1$&O8Q=E^rdEhmOKQy{JRyH~bCm!*93(pdMZ1lk^>xYgDdJ
zQs9%oquDho*C#3PN#N1!`oGC#^YJo;tH3`XJ-90Ewtq4iT(ic>7cG#QE?l&CftRQ|
z|9DMsw2nrzb)p^%T2V0t`;3%@1bx<IJ;uV>UYKz*o<_4Y$fW*}hR3fS-%WH{^7)O9
zxP^XmvW`eM1uu2n(;TpWm*?+RWMsD4q;6sL&{TC7G))Kd9ACOw$LJ+dTXOCN*=}8E
z>%L`Ec=pccitBfbY<=;8hHk4FB~8UiZ6&<!YS=z#VfpGmI`0zuPH*n$`(FO+eBrKb
zr%x*;N(x$CI?u+fW|hBudqk5s@bIkv#Ez)C2!73+sb!t@Z?aTsulHkKb+z&?_rH98
zxX57O`Az<sRO|9vr@eg`d!TrF%%oHHjX&wrl6>ws#TVrk)>q0rrk76QN&8pdYN)zi
z`OZ4OtnV$laqpQgZbu(;*!(9+>5=Y~qpPBQihobHi|DT|4tx6V3vYrSL^b<9Y;V4N
z_}oo{adt(s74eOGOh$F}xwgHM%1VCR_Qdkm<xUgcxHZHU*spB-suNpu@vI1TXspy5
z=SePn*8wGD9_mf$jl5`V?;EJJWUb%cXjs<K&bHjx85^Hc9QUX%@ek9d=JlM<!e5WI
zx$&m<Qu)NZ9&Sa)yY@U@;KlRs*B;Ye*oCjW<G$!_P1UL%1)2}EspJFZu*?VZgaZMy
z?P6bVo#~!h5*pi;%X+wq2)f}GO1dXY`n>iYKHIW8&68OYlefWBwV{2|uA?q4uti<h
zdVTMJZ&p!3d1;s=E8V%_WMfTOeC(KuE$=#=jCzZ<G~d24FP!~NZM9weiN;g+!{QIn
z%;O6(FHvT&)ddsWIcw{(H@)jhy4LrMZ+<$izw<<Nz3Kb*Al}YQUuy2g+UvznUBe_6
g=9K)|+xTOKReV^U>uHz6$EZnJP^k1|K>Viv0X(-GJOBUy

literal 132
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq
zxP?KOkzv*x37{ZzfKP}kkX~M8dkdtYB*-tA!Qt7BG$4o9)5S5QVoq{`1nUo=lmY{z
T&g{T+pag@btDnm{r-UW|xl0^>


From d9bfb8491c31f2e66233b67eefd1fe28e5ac6f53 Mon Sep 17 00:00:00 2001
From: Devil2548 <animalmom2548@gmail.com>
Date: Sun, 3 Aug 2025 21:15:47 -0600
Subject: [PATCH 08/12] Update water vulnerability and burn in daylight powers
 to match versions from origins

---
 .../resources/data/origins/powers/burn_in_daylight.json   | 2 +-
 .../data/origins/powers/water_vulnerability.json          | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/data/origins/powers/burn_in_daylight.json b/src/main/resources/data/origins/powers/burn_in_daylight.json
index d04ec00..86ea23b 100644
--- a/src/main/resources/data/origins/powers/burn_in_daylight.json
+++ b/src/main/resources/data/origins/powers/burn_in_daylight.json
@@ -4,7 +4,7 @@
   "interval": 20,
   "burn_duration": 6,
   "condition": {
-    "type": "origins:and",
+    "type": "origins:all_of",
     "conditions": [
       {
         "type": "origins:exposed_to_sun"
diff --git a/src/main/resources/data/origins/powers/water_vulnerability.json b/src/main/resources/data/origins/powers/water_vulnerability.json
index f73ce64..c132880 100644
--- a/src/main/resources/data/origins/powers/water_vulnerability.json
+++ b/src/main/resources/data/origins/powers/water_vulnerability.json
@@ -5,11 +5,7 @@
   "onset_delay": 1,
   "damage": 2,
   "damage_easy": 1,
-  "damage_source": {
-    "name": "hurt_by_water",
-    "unblockable": true,
-    "bypasses_armor": true
-  },
+  "damage_type": "origins:hurt_by_water",
   "protection_enchantment": "origins:water_protection",
   "protection_effectiveness": 1.0,
   "condition": {
@@ -27,7 +23,6 @@
           {
             "type": "origins:status_effect",
             "effect": "enva:water_resistance",
-            "min_amplifier": 0,
             "inverted": true
           }
         ]
@@ -41,7 +36,6 @@
           {
             "type": "origins:status_effect",
             "effect": "enva:water_resistance",
-            "min_amplifier": 0,
             "inverted": true
           }
         ]

From 3240eef50e56222105b62e4e576d1c57cd29a1fb Mon Sep 17 00:00:00 2001
From: Devil2548 <animalmom2548@gmail.com>
Date: Sun, 3 Aug 2025 21:23:23 -0600
Subject: [PATCH 09/12] Rebalance knockback resistance values

---
 .../magicquartz/environmentalarmor/armor/Materials.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/github/magicquartz/environmentalarmor/armor/Materials.java b/src/main/java/io/github/magicquartz/environmentalarmor/armor/Materials.java
index a4d8ea0..059a577 100644
--- a/src/main/java/io/github/magicquartz/environmentalarmor/armor/Materials.java
+++ b/src/main/java/io/github/magicquartz/environmentalarmor/armor/Materials.java
@@ -38,7 +38,7 @@ public class Materials {
 			map.put(ArmorItem.Type.CHESTPLATE, 1);
 			map.put(ArmorItem.Type.HELMET, 1);
 			map.put(ArmorItem.Type.BODY, 1);
-		}), 0, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, () -> Ingredient.ofItems(Items.GLASS), List.of(new ArmorMaterial.Layer(Main.identifier("water_glass"))), 1, 2));
+		}), 0, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, () -> Ingredient.ofItems(Items.GLASS), List.of(new ArmorMaterial.Layer(Main.identifier("water_glass"))), 1, 0));
 		GLASSES = Registry.registerReference(Registries.ARMOR_MATERIAL, Main.identifier("glasses"), new ArmorMaterial(Util.make(new EnumMap(ArmorItem.Type.class), (map) -> {
 			map.put(ArmorItem.Type.BOOTS, 1);
 			map.put(ArmorItem.Type.LEGGINGS, 1);
@@ -52,7 +52,7 @@ public class Materials {
 			map.put(ArmorItem.Type.CHESTPLATE, 5);
 			map.put(ArmorItem.Type.HELMET, 2);
 			map.put(ArmorItem.Type.BODY, 4);
-		}), 10, SoundEvents.ITEM_ARMOR_EQUIP_CHAIN, () -> Ingredient.ofItems(ModItems.TITANIUM_INGOT), List.of(new ArmorMaterial.Layer(Main.identifier("titanium"))), 4F, 0.5F));
+		}), 10, SoundEvents.ITEM_ARMOR_EQUIP_CHAIN, () -> Ingredient.ofItems(ModItems.TITANIUM_INGOT), List.of(new ArmorMaterial.Layer(Main.identifier("titanium"))), 4F, 0.25F));
 		TITANIUM_COATED_GLASS = Registry.registerReference(Registries.ARMOR_MATERIAL, Main.identifier("titanium_coated_glass"), new ArmorMaterial(Util.make(new EnumMap(ArmorItem.Type.class), (map) -> {
 			map.put(ArmorItem.Type.BOOTS, 2);
 			map.put(ArmorItem.Type.LEGGINGS, 2);

From 4500a5e569bff36a0042504548365ce001cd7b16 Mon Sep 17 00:00:00 2001
From: Devil2548 <animalmom2548@gmail.com>
Date: Sun, 3 Aug 2025 21:41:02 -0600
Subject: [PATCH 10/12] Make the non-titanium helmets enchantable

---
 .../minecraft/tags/item/enchantable/head_armor.json    | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 src/main/resources/data/minecraft/tags/item/enchantable/head_armor.json

diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/head_armor.json b/src/main/resources/data/minecraft/tags/item/enchantable/head_armor.json
new file mode 100644
index 0000000..ab0fc43
--- /dev/null
+++ b/src/main/resources/data/minecraft/tags/item/enchantable/head_armor.json
@@ -0,0 +1,10 @@
+{
+  "replace": false,
+  "values": [
+    "enva:glass_helmet",
+    "enva:water_glass_bowl",
+    "enva:glasses",
+    "enva:titanium_coated_glass_helmet",
+    "enva:titanium_coated_water_glass_bowl"
+  ]
+}
\ No newline at end of file

From bd5d6560b1a5c63a0b9bc9060af37e3d34e241ef Mon Sep 17 00:00:00 2001
From: Devil2548 <animalmom2548@gmail.com>
Date: Sun, 3 Aug 2025 21:51:43 -0600
Subject: [PATCH 11/12] Disable our potion recipes if Alliegaytor's water
 resistance potion mod is installed, as their mod is more customizable than
 ours

---
 .../mixin/BrewingRecipeRegistryMixin.java                  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/github/magicquartz/environmentalarmor/mixin/BrewingRecipeRegistryMixin.java b/src/main/java/io/github/magicquartz/environmentalarmor/mixin/BrewingRecipeRegistryMixin.java
index 317ce62..f491b42 100644
--- a/src/main/java/io/github/magicquartz/environmentalarmor/mixin/BrewingRecipeRegistryMixin.java
+++ b/src/main/java/io/github/magicquartz/environmentalarmor/mixin/BrewingRecipeRegistryMixin.java
@@ -1,6 +1,7 @@
 package io.github.magicquartz.environmentalarmor.mixin;
 
 import io.github.magicquartz.environmentalarmor.registry.ModEffects;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.item.Items;
 import net.minecraft.potion.Potions;
 import net.minecraft.recipe.BrewingRecipeRegistry;
@@ -14,7 +15,9 @@ public class BrewingRecipeRegistryMixin {
 
     @Inject(method = "registerDefaults", at = @At("HEAD"))
     private static void addPotionRecipes(BrewingRecipeRegistry.Builder builder, CallbackInfo ci) {
-        builder.registerPotionRecipe(Potions.AWKWARD, Items.TURTLE_SCUTE, ModEffects.WATER_RESISTANCE_POTION_SHORT);
-        builder.registerPotionRecipe(ModEffects.WATER_RESISTANCE_POTION_SHORT, Items.REDSTONE, ModEffects.WATER_RESISTANCE_POTION_LONG);
+        if(!FabricLoader.getInstance().isModLoaded("hwr")) {
+            builder.registerPotionRecipe(Potions.AWKWARD, Items.TURTLE_SCUTE, ModEffects.WATER_RESISTANCE_POTION_SHORT);
+            builder.registerPotionRecipe(ModEffects.WATER_RESISTANCE_POTION_SHORT, Items.REDSTONE, ModEffects.WATER_RESISTANCE_POTION_LONG);
+        }
     }
 }
\ No newline at end of file

From c31fac799f0806b7e80f414e75e6fe74edc02750 Mon Sep 17 00:00:00 2001
From: Devil2548 <animalmom2548@gmail.com>
Date: Sun, 3 Aug 2025 22:58:19 -0600
Subject: [PATCH 12/12] Reduce titanium-coated items' durability to more
 reasonable values

---
 .../magicquartz/environmentalarmor/registry/ModArmor.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/github/magicquartz/environmentalarmor/registry/ModArmor.java b/src/main/java/io/github/magicquartz/environmentalarmor/registry/ModArmor.java
index 76806b7..2a8ed54 100644
--- a/src/main/java/io/github/magicquartz/environmentalarmor/registry/ModArmor.java
+++ b/src/main/java/io/github/magicquartz/environmentalarmor/registry/ModArmor.java
@@ -17,8 +17,8 @@ public class ModArmor {
     public static final Item GLASSES = new ArmorItem(Materials.GLASSES, ArmorItem.Type.HELMET, new Item.Settings().rarity(Rarity.COMMON).maxDamage(ArmorItem.Type.HELMET.getMaxDamage(5)));
 
     //Titanium Coated
-    public static final Item TITANIUM_COATED_GLASS_HELMET = new ArmorItem(Materials.TITANIUM_COATED_GLASS, ArmorItem.Type.HELMET, new Item.Settings().maxDamage(ArmorItem.Type.HELMET.getMaxDamage(165)));
-    public static final Item TITANIUM_COATED_WATER_GLASS_BOWL = new ArmorItem(Materials.TITANIUM_COATED_WATER_GLASS, ArmorItem.Type.HELMET, new Item.Settings().maxDamage(ArmorItem.Type.HELMET.getMaxDamage(165)));
+    public static final Item TITANIUM_COATED_GLASS_HELMET = new ArmorItem(Materials.TITANIUM_COATED_GLASS, ArmorItem.Type.HELMET, new Item.Settings().maxDamage(ArmorItem.Type.HELMET.getMaxDamage(15)));
+    public static final Item TITANIUM_COATED_WATER_GLASS_BOWL = new ArmorItem(Materials.TITANIUM_COATED_WATER_GLASS, ArmorItem.Type.HELMET, new Item.Settings().maxDamage(ArmorItem.Type.HELMET.getMaxDamage(15)));
 
     // Titanium armor
     public static final Item TITANIUM_HELMET = new ArmorItem(Materials.TITANIUM, ArmorItem.Type.HELMET, new Item.Settings().maxDamage(ArmorItem.Type.HELMET.getMaxDamage(30)));