stuffs broken again...

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

@@ -216,7 +216,7 @@ 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 swordUsurper;
 
@@ -836,6 +836,7 @@ public class CinderLoE {
         }
         linkLOTRWeapon(swordBree, "swordBree");
 
+        //Elite Armors
         //Elite Armors
         MATERIAL_SERPENT = getLOTRMaterialByName("SERPENT");
         if (MATERIAL_SERPENT != null) {
@@ -858,31 +859,32 @@ 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", 6804);
-            ItemRegistration.registerItem(bodyUsurper, "bodyUsurper", 6805);
-            ItemRegistration.registerItem(legsUsurper, "legsUsurper", 6806);
-            ItemRegistration.registerItem(bootsUsurper, "bootsUsurper", 6807);
+
+            ItemRegistration.register(helmetUsurper, "helmetUsurper", 6804);
+            ItemRegistration.register(bodyUsurper, "bodyUsurper", 6805);
+            ItemRegistration.register(legsUsurper, "legsUsurper", 6806);
+            ItemRegistration.register(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");
 
-            ItemRegistration.registerItem(helmetWarlord, "helmetWarlord", 6808);
-            ItemRegistration.registerItem(bodyWarlord, "bodyWarlord", 6809);
-            ItemRegistration.registerItem(legsWarlord, "legsWarlord", 6810);
-            ItemRegistration.registerItem(bootsWarlord, "bootsWarlord", 6811);
-          //  ItemRegistration.registerItem(maceWarlord, "maceWarlord", 6812);
+            ItemRegistration.register(helmetWarlord, "helmetWarlord", 6808);
+            ItemRegistration.register(bodyWarlord, "bodyWarlord", 6809);
+            ItemRegistration.register(legsWarlord, "legsWarlord", 6810);
+            ItemRegistration.register(bootsWarlord, "bootsWarlord", 6811);
+            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");
@@ -1243,6 +1245,7 @@ public class CinderLoE {
         CinderCore.registerItemFallback(Item.getIdFromItem(legsArnorBanner), Item.getIdFromItem(Items.chainmail_leggings), "cinder_loe", "1.1");
         CinderCore.registerItemFallback(Item.getIdFromItem(bootsArnorBanner), Item.getIdFromItem(Items.chainmail_boots), "cinder_loe", "1.1");
         CinderCore.registerItemFallback(Item.getIdFromItem(maceArnor), Item.getIdFromItem(LOTRMod.blacksmithHammer), "cinder_loe", "1.1");
+        CinderCore.registerItemFallback(Item.getIdFromItem(maceWarlord), Item.getIdFromItem(LOTRMod.blacksmithHammer), "cinder_loe", "1.2.5");
 
         CinderCore.registerEntityFallback(DarkSpider.class, LOTREntityUtumnoIceSpider.class, "cinder_loe", "1.2.4");
 

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

@@ -25,7 +25,6 @@ public class Materials {
         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

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

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

@@ -20,7 +20,7 @@ public class LOTRWeaponLinker implements IClassTransformer {
             // Can add any number of items, append with comma
             return addLinks(basicClass,
                 "spearRedDwarf", "crossbowRedDwarf", "swordRedDwarf", "battleaxeRedDwarf", "pikeRedDwarf", "daggerRedDwarf", "daggerRedDwarfPoisoned", "hammerRedDwarf",
-                "radagastStaff", "alatarStaff", "pallandoStaff", "sarumanStaff",
+                "radagastStaff", "alatarStaff", "pallandoStaff", "sarumanStaff", "maceWarlord",
                 "spearLimwaith", "tridentLimwaith", "daggerLimwaith", "daggerLimwaithPoisoned", "truncheonLimwaith", "battleaxeLimwaith", "blowgunLimwaith",
                 "frostblade", "spearsolidgold", "whip", "spearUnnamed", "welfRelic", "daggerVoid",
                 "swordBree",