Patch: Fix datapack files not loading + misc fixes

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) -> {
@@ -37,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);
@@ -51,13 +52,20 @@ 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));
-		TITANIUM_COATED = Registry.registerReference(Registries.ARMOR_MATERIAL, Main.identifier("titanium_coated_glass"), new ArmorMaterial(Util.make(new EnumMap(ArmorItem.Type.class), (map) -> {
+		}), 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);
 			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));
 	}
 }

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);
+        }
     }
 }

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(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)));

src/main/resources/assets/enva/models/item/titanium_boots.json

@@ -1,5 +1,67 @@
 {
   "parent": "item/generated",
+  "overrides": [
+    {
+      "model": "enva:item/titanium_boots_quartz_trim",
+      "predicate": {
+        "trim_type": 0.1
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_iron_trim",
+      "predicate": {
+        "trim_type": 0.2
+      }
+    },
+    {
+      "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"
   }

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

src/main/resources/assets/enva/models/item/titanium_chestplate.json

@@ -1,5 +1,67 @@
 {
   "parent": "item/generated",
+  "overrides": [
+    {
+      "model": "enva:item/titanium_chestplate_quartz_trim",
+      "predicate": {
+        "trim_type": 0.1
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_iron_trim",
+      "predicate": {
+        "trim_type": 0.2
+      }
+    },
+    {
+      "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"
   }

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}