Great Swords added, minor issue dunno why its crashing on registry

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

@@ -177,7 +177,7 @@ public class CinderEventHandler implements IFuelHandler {
             if (item == null || item.getItem() != CinderLoE.bowLurtz) return;
             event.setCanceled(true);
             if (entity.isPotionActive(Potion.poison.id)) entity.removePotionEffect(Potion.poison.id);
-            entity.addPotionEffect(new PotionEffect(LOTRPoisonedDrinks.killingPoison.id, 5));
+            entity.addPotionEffect(new PotionEffect(LOTRPoisonedDrinks.killingPoison.id, 100));
         }
 
         //Elven Arrow, deals more damage to orc kind

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

@@ -259,6 +259,11 @@ public class CinderLoE {
    // public static Item bowserpent;
     //public static Item swordUsurper;
 
+    // Great swords, idk where else to put them
+    public static Item greatswordAngmar;
+    public static Item greatswordLindon;
+    public static Item greatswordDale;
+    public static Item greatswordNumenor;
 
     // Red Dwarves
     public static Item redDwarfSteel;
@@ -540,10 +545,8 @@ public class CinderLoE {
       //  verticalWeaponRack = new VerticalWeaponRack();
       //  GameRegistry.registerTileEntity(LOTRTileEntityWeaponRack.class, "verticalWeaponRack");
       //  GameRegistry.registerBlock(verticalWeaponRack, "verticalWeaponRack");
+
         //Decor
-        ///rustedsword = (new RustedSword());
-       ///GameRegistry.registerBlock(rustedsword, "rustedsword");
-        // Barrel
         fishBarrel = (new FishBarrel());
         GameRegistry.registerBlock(fishBarrel, "fishbarrel");
 
@@ -645,16 +648,7 @@ public class CinderLoE {
 
         spawnEgg = new CinderLoESpawnEgg();
 
-        // Wizard Staves
+
-        radagastStaff = (new RadagastStaff()).setUnlocalizedName("lotr:radagastStaff").setTextureName("lotr:radagastStaff");
-        pallandoStaff = (new PallandoStaff()).setUnlocalizedName("lotr:pallandoStaff").setTextureName("lotr:pallandoStaff");
-        alatarStaff = (new AlatarStaff()).setUnlocalizedName("lotr:alatarStaff").setTextureName("lotr:alatarStaff");
-        sarumanStaff = (new SarumanStaff()).setUnlocalizedName("lotr:sarumanStaff").setTextureName("lotr:sarumanStaff");
-        sarumanWhiteStaff = (new SarumanWhiteStaff()).setUnlocalizedName("lotr:sarumanWhiteStaff").setTextureName("lotr:sarumanStaff");
-        // Relics
-        welfRelic = (new WoodElfRelic()).setUnlocalizedName("lotr:welfRelic").setTextureName("lotr:welfRelic");
-        ulukai = (new Ulukai()).setUnlocalizedName("lotr:ulukai").setTextureName("lotr:ulukai");
-        unitLevelTool = (new unitLevelTool()).setUnlocalizedName("lotr:unitLevelTool").setTextureName("stick");
 
         /**
         * Item Registation
@@ -737,13 +731,39 @@ public class CinderLoE {
         linkLOTRWeapon(sarumanStaff, "sarumanStaff");
         linkLOTRWeapon(sarumanWhiteStaff, "sarumanWhiteStaff");
 
-        //Relics
+        // Wizard Staves
+        radagastStaff = (new RadagastStaff()).setUnlocalizedName("lotr:radagastStaff").setTextureName("lotr:radagastStaff");
+        pallandoStaff = (new PallandoStaff()).setUnlocalizedName("lotr:pallandoStaff").setTextureName("lotr:pallandoStaff");
+        alatarStaff = (new AlatarStaff()).setUnlocalizedName("lotr:alatarStaff").setTextureName("lotr:alatarStaff");
+        sarumanStaff = (new SarumanStaff()).setUnlocalizedName("lotr:sarumanStaff").setTextureName("lotr:sarumanStaff");
+        sarumanWhiteStaff = (new SarumanWhiteStaff()).setUnlocalizedName("lotr:sarumanWhiteStaff").setTextureName("lotr:sarumanStaff");
+        // Relics
+        welfRelic = (new WoodElfRelic()).setUnlocalizedName("lotr:welfRelic").setTextureName("lotr:welfRelic");
+        ulukai = (new Ulukai()).setUnlocalizedName("lotr:ulukai").setTextureName("lotr:ulukai");
         ItemRegistration.register(welfRelic, "welfRelic", 6704);
         ItemRegistration.register(ulukai, "ulukai", 6706);
 
         linkLOTRWeapon(welfRelic, "welfRelic");
+        unitLevelTool = (new unitLevelTool()).setUnlocalizedName("lotr:unitLevelTool").setTextureName("stick");
+
+        // Great Swords
+        greatswordAngmar = (new LoEGreatSword(LOTRMaterial.ANGMAR)).setUnlocalizedName("lotr:greatswordAngmar").setTextureName("lotr:greatswordAngmar");
+        greatswordLindon = (new LoEGreatSword(LOTRMaterial.HIGH_ELVEN).setIsElvenBlade()).setUnlocalizedName("lotr:greatswordLindon").setTextureName("lotr:greatswordLindon");
+        greatswordDale = (new LoEGreatSword(LOTRMaterial.DALE)).setUnlocalizedName("lotr:greatswordDale").setTextureName("lotr:greatswordDale");
+        greatswordNumenor = (new LoEGreatSword(LOTRMaterial.BLACK_NUMENOREAN)).setUnlocalizedName("lotr:greatswordNumenor").setTextureName("lotr:greatswordNumenor");
+
+        ItemRegistration.register(greatswordAngmar,"greatswordAngmar",6707);
+        ItemRegistration.register(greatswordLindon,"greatswordLindon",6708);
+        ItemRegistration.register(greatswordDale,"greatswordDale",6709);
+        ItemRegistration.register(greatswordNumenor,"greatswordNumenor",6710);
+
+        linkLOTRWeapon(greatswordAngmar, "greatswordAngmar");
+        linkLOTRWeapon(greatswordLindon, "greatswordLindon");
+        linkLOTRWeapon(greatswordDale, "greatswordDale");
+        linkLOTRWeapon(greatswordNumenor, "greatswordNumenor");
 
         // Misc
+        MATERIAL_JADE = getLOTRMaterialByName("JADE");
         cinderFurItem = (new CinderFurItem()).setUnlocalizedName("cinder_fur_item").setTextureName("lotr:cinder_fur_item_0");
         ItemRegistration.register(cinderFurItem,"cinderFurItem",6004);
 
@@ -800,7 +820,6 @@ public class CinderLoE {
 
         ItemRegistration.register(cleaver,"cleaver",6109);
 
-
         ItemRegistration.register(warDart,"warDart",6111);
         ItemRegistration.register(warDartHeads,"warDartHeads",6500);
 

src/main/java/com/zivilon/cinder_loe/entity/npc/evil_human/UmbarUsurper.java

@@ -58,7 +58,7 @@ public class UmbarUsurper extends LOTREntityUmbarWarrior {
     @Override
     protected void applyEntityAttributes() {
         super.applyEntityAttributes();
-        this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(30.0);
+        this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(26.0);
         this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.2);
     }
 }

src/main/java/com/zivilon/cinder_loe/items/LoEGreatSword.java

@@ -0,0 +1,42 @@
+package com.zivilon.cinder_loe.items;
+
+import com.zivilon.cinder_loe.LoECreativeTabs;
+import lotr.common.item.LOTRItemSword;
+import lotr.common.item.LOTRMaterial;
+import lotr.common.item.LOTRWeaponStats;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class LoEGreatSword extends LOTRItemSword {
+    public Item repair_item;
+
+    public LoEGreatSword(LOTRMaterial material) {
+        this(material, (Item) null);
+    }
+    public LoEGreatSword(LOTRMaterial material, Block repair_block) {
+        this(material, Item.getItemFromBlock(repair_block));
+    }
+    public LoEGreatSword(LOTRMaterial material, Item item) {
+        super(material);
+        repair_item = item;
+        setCreativeTab(LoECreativeTabs.tabCombatLoE);
+    }
+
+    public LoEGreatSword setWeaponDamage(float damage) {
+        this.lotrWeaponDamage = damage;
+        return this;
+    }
+
+    @Override
+    public boolean getIsRepairable(ItemStack item, ItemStack repair_material) {
+        if (repair_material.getItem() == repair_item)
+            return true;
+        return false;
+    }
+
+    static {
+        LOTRWeaponStats.registerMeleeSpeed(LoEGreatSword.class, 0.833f);
+        LOTRWeaponStats.registerMeleeReach(LoEGreatSword.class, 1.25f);
+    }
+}