stuffs broken again...

src/main/java/com/zivilon/cinder_loe/CinderLoE.java

@@ -216,9 +216,9 @@ public class CinderLoE {
     public static Item bodyWarlord;
     public static Item legsWarlord;
     public static Item bootsWarlord;
-    public static Item maceWarlord;
+   // public static Item maceWarlord;
-    public static Item bowserpent;
+   // public static Item bowserpent;
-    public static Item swordUsurper;
+    //public static Item swordUsurper;
 
 
     // Red Dwarves
@@ -668,7 +668,7 @@ public class CinderLoE {
         linkLOTRWeapon(whip, "whip");
 
         // Common Tools/Weapons
-        cleaver = (new LOTRItemDagger(GONDOR)).setUnlocalizedName("lotr:cleaver").setTextureName("lotr:cleaver");
+        cleaver = (new LOTRItemDagger(Item.ToolMaterial.IRON)).setUnlocalizedName("lotr:cleaver").setTextureName("lotr:cleaver");
         warDart = (new WarDart()).setUnlocalizedName("war_dart").setTextureName("lotr:war_dart");
         warDartHeads = (new WarDartHeads()).setUnlocalizedName("war_dart_heads").setTextureName("lotr:war_dart_heads_0");
 
@@ -858,30 +858,31 @@ public class CinderLoE {
             legsUsurper = (new LOTRItemArmor(MATERIAL_USURPER, 2)).setUnlocalizedName("lotr:legsUsurper").setTextureName("lotr:legsUsurper").setCreativeTab(null);
             bootsUsurper = (new LOTRItemArmor(MATERIAL_USURPER, 3)).setUnlocalizedName("lotr:bootsUsurper").setTextureName("lotr:bootsUsurper").setCreativeTab(null);
 
-            ItemRegistration.registerItem(helmetUsurper, "helmetUsurper", 76);
+            ItemRegistration.registerItem(helmetUsurper, "helmetUsurper", 6804);
-            ItemRegistration.registerItem(bodyUsurper, "bodyUsurper", 77);
+            ItemRegistration.registerItem(bodyUsurper, "bodyUsurper", 6805);
-            ItemRegistration.registerItem(legsUsurper, "legsUsurper", 78);
+            ItemRegistration.registerItem(legsUsurper, "legsUsurper", 6806);
-            ItemRegistration.registerItem(bootsUsurper, "bootsUsurper", 79);
+            ItemRegistration.registerItem(bootsUsurper, "bootsUsurper", 6807);
         } else {
             System.err.println("Failed to find USURPER material for armor initialization.");
         }
+
         MATERIAL_WARLORD = getLOTRMaterialByName("WARLORD");
         if (MATERIAL_WARLORD != null) {
             helmetWarlord = (new LOTRItemArmor(MATERIAL_WARLORD, 0, "helmet")).setUnlocalizedName("lotr:helmetWarlord").setTextureName("lotr:helmetWarlord").setCreativeTab(null);
             bodyWarlord = (new LOTRItemArmor(MATERIAL_WARLORD, 1)).setUnlocalizedName("lotr:bodyWarlord").setTextureName("lotr:bodyWarlord").setCreativeTab(null);
             legsWarlord = (new LOTRItemArmor(MATERIAL_WARLORD, 2)).setUnlocalizedName("lotr:legsWarlord").setTextureName("lotr:legsWarlord").setCreativeTab(null);
             bootsWarlord = (new LOTRItemArmor(MATERIAL_WARLORD, 3)).setUnlocalizedName("lotr:bootsWarlord").setTextureName("lotr:bootsWarlord").setCreativeTab(null);
-            maceWarlord = (new LOTRItemHammer(MATERIAL_WARLORD)).setUnlocalizedName("lotr:maceWarlord").setTextureName("lotr:maceWarlord").setCreativeTab(null);
+           // maceWarlord = (new LOTRItemHammer(MATERIAL_WARLORD)).setUnlocalizedName("lotr:maceWarlord").setTextureName("lotr:maceWarlord").setCreativeTab(null);
 
-            ItemRegistration.registerItem(helmetWarlord, "helmetWarlord", 80);
+            ItemRegistration.registerItem(helmetWarlord, "helmetWarlord", 6808);
-            ItemRegistration.registerItem(bodyWarlord, "bodyWarlord", 81);
+            ItemRegistration.registerItem(bodyWarlord, "bodyWarlord", 6809);
-            ItemRegistration.registerItem(legsWarlord, "legsWarlord", 82);
+            ItemRegistration.registerItem(legsWarlord, "legsWarlord", 6810);
-            ItemRegistration.registerItem(bootsWarlord, "bootsWarlord", 83);
+            ItemRegistration.registerItem(bootsWarlord, "bootsWarlord", 6811);
-            ItemRegistration.registerItem(maceWarlord, "maceWarlord", 118);
+          //  ItemRegistration.registerItem(maceWarlord, "maceWarlord", 6812);
         } else {
             System.err.println("Failed to find WARLORD material for armor initialization.");
         }
-        linkLOTRWeapon(maceWarlord, "maceWarlord");
+        //linkLOTRWeapon(maceWarlord, "maceWarlord");
 
         //Rhudaur
         MATERIAL_RHUDAUR = getLOTRMaterialByName("RHUDAUR");

src/main/java/com/zivilon/cinder_loe/Materials.java

@@ -21,7 +21,11 @@ public class Materials {
         modifyMaterial("RHUDAUR", 300, 2.5F, 0.6F, 2, 6.0F, 10, LOTRMod.fur);
         modifyMaterial("BATTLENUN", 300, 3F, 0.6F, 2, 6.0F, 10, Items.iron_ingot);
         modifyMaterial("ASH", 2000, 0.0F, 0.6F, 2, 7.0F, 10, CinderLoE.ingotAsh);
+        modifyMaterial("SERPENT", 650, 2.0F, 0.6F, 2, 6.0F, 10, LOTRMod.bronze);
+        modifyMaterial("USURPER",650, 2.0F, 0.6F, 2, 6.0F, 10, Items.iron_ingot);
+        modifyMaterial("WARLORD", 650, 2.0F, 0.6F, 2, 6.0F, 10, LOTRMod.bronze);
         modifyMaterial("JADE",2400, 5.0F, 0.8F, 0, 9.0F, 10, LOTRMod.emerald);
+
     }
 
     public static void modifyMaterial(String fieldName, int uses, float weapon_damage, float protection, int harvest_level, float speed, int enchantability, Item crafting_item) {

src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java

@@ -64,6 +64,9 @@ public class LOTRMaterialTransformer implements IClassTransformer {
             addMaterial("ASH", classNode);
             addMaterial("RHUDAUR", classNode);
             addMaterial("JADE",classNode);
+            addMaterial("USURPER", classNode);
+            addMaterial("WARLORD",classNode);
+            addMaterial("SERPENT", classNode);
 
             // Protection Conversion
 

src/main/java/com/zivilon/cinder_loe/coremod/LOTRWeaponLinker.java

@@ -22,10 +22,10 @@ public class LOTRWeaponLinker implements IClassTransformer {
                 "spearRedDwarf", "crossbowRedDwarf", "swordRedDwarf", "battleaxeRedDwarf", "pikeRedDwarf", "daggerRedDwarf", "daggerRedDwarfPoisoned", "hammerRedDwarf",
                 "radagastStaff", "alatarStaff", "pallandoStaff", "sarumanStaff",
                 "spearLimwaith", "tridentLimwaith", "daggerLimwaith", "daggerLimwaithPoisoned", "truncheonLimwaith", "battleaxeLimwaith", "blowgunLimwaith",
-                "frostblade", "spearsolidgold", "whip", "spearUnnamed",
+                "frostblade", "spearsolidgold", "whip", "spearUnnamed", "welfRelic", "daggerVoid",
                 "swordBree",
                 "maceArnor",
-                "daggerAsh","bowAsh","hammerAsh","pikeAsh","battleaxeAsh","swordAsh","spearAsh", "staffAsh");
+                "daggerAsh","bowAsh","hammerAsh","pikeAsh","battleaxeAsh","swordAsh","spearAsh", "staffAsh", "cleaver");
         }
         return basicClass;
     }

src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRArmorModels.java

@@ -102,9 +102,6 @@ public class MixinLOTRArmorModels {
             map.put(CinderLoE.bodyJade, new ModelBodyJade(1.0f));
             map.put(CinderLoE.legsJade, new ModelLegsJade(1.0f));
             map.put(CinderLoE.helmetJade, new ModelJadeHelmet(1.0f));
-            map.put(CinderLoE.bodyNexFire, new ModelNexFireChestplate(1.0f));
-            map.put(CinderLoE.bodyNexToxin, new ModelNexToxinChestplate(1.0f));
-            map.put(CinderLoE.bodyNexIce, new ModelNexIceChestplate(1.0f));
             map.put(LOTRMod.plate, new LOTRModelHeadPlate());
             map.put(LOTRMod.woodPlate, new LOTRModelHeadPlate());
             map.put(LOTRMod.ceramicPlate, new LOTRModelHeadPlate());

src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRContainerAnvil.java

@@ -126,6 +126,8 @@ public abstract class MixinLOTRContainerAnvil {
             return LOTRMod.isOreNameEqual(materialItem, "ice");
         if (material == CinderLoE.MATERIAL_BREE.toToolMaterial())
             return (materialItem.getItem() == Items.iron_ingot);
+        if (material == CinderLoE.MATERIAL_WARLORD.toToolMaterial())
+            return (materialItem.getItem() == LOTRMod.bronze);
         if (item instanceof ItemArmor armor) {
             ItemArmor.ArmorMaterial armorMaterial = armor.getArmorMaterial();
             if (armorMaterial == LOTRMaterial.BONE.toArmorMaterial())
@@ -144,6 +146,12 @@ public abstract class MixinLOTRContainerAnvil {
                 return (materialItem.getItem() == Items.iron_ingot);
             if (armorMaterial == CinderLoE.MATERIAL_JADE.toArmorMaterial())
                 return (materialItem.getItem() == LOTRMod.emerald);
+            if (armorMaterial == CinderLoE.MATERIAL_SERPENT.toArmorMaterial())
+                return (materialItem.getItem() == LOTRMod.bronze);
+            if (armorMaterial == CinderLoE.MATERIAL_WARLORD.toArmorMaterial())
+                return (materialItem.getItem() == LOTRMod.bronze);
+            if (armorMaterial == CinderLoE.MATERIAL_USURPER.toArmorMaterial())
+                return (materialItem.getItem() == Items.iron_ingot);
         }
 
         return false;

src/main/resources/assets/cinder_loe/sounds.json

@@ -4,7 +4,7 @@
         "category": "neutral",
         "sounds":
         [
-            "boss/Battle"
+            "boss/battle"
         ]
     },
     "boss.Battle2":
@@ -12,7 +12,7 @@
         "category": "neutral",
         "sounds":
         [
-            "boss/Battle2"
+            "boss/combat"
         ]
     },
     "boss.Victory":
@@ -20,7 +20,7 @@
         "category": "neutral",
         "sounds":
         [
-            "boss/Victory"
+            "boss/victory"
         ]
     },
     "boss.Spiders":
@@ -28,7 +28,7 @@
         "category": "neutral",
         "sounds":
         [
-            "boss/Spiders"
+            "boss/spiders"
         ]
     }
 }

src/main/resources/assets/cinder_loe/sounds2.json

@@ -1,4 +0,0 @@
-   boss.Battle
-   boss.Battle2
-   boss.Spiders
-   boss.Victory