Attempting to make Objective NPC's

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

@@ -4,15 +4,21 @@ import com.zivilon.cinder_loe.blocks.*;
 import com.zivilon.cinder_loe.character.CharacterEventListener;
 import com.zivilon.cinder_loe.character.CharacterRoleAPI;
 import com.zivilon.cinder_loe.client.render.*;
-import com.zivilon.cinder_loe.client.render.block.*;
 import com.zivilon.cinder_loe.client.render.corrupt.*;
 import com.zivilon.cinder_loe.client.render.projectile.*;
-import com.zivilon.cinder_loe.client.render.tileentity.*;
 import com.zivilon.cinder_loe.command.CommandCinderCharacter;
 import com.zivilon.cinder_loe.entity.*;
 import com.zivilon.cinder_loe.entity.corrupt.*;
 import com.zivilon.cinder_loe.entity.effect.*;
 import com.zivilon.cinder_loe.entity.npc.*;
+import com.zivilon.cinder_loe.entity.npc.dwarf.RedDwarfArbalest;
+import com.zivilon.cinder_loe.entity.npc.dwarf.RedDwarfBannerBearer;
+import com.zivilon.cinder_loe.entity.npc.dwarf.RedDwarfCommander;
+import com.zivilon.cinder_loe.entity.npc.dwarf.RedDwarfWarrior;
+import com.zivilon.cinder_loe.entity.npc.evil_human.*;
+import com.zivilon.cinder_loe.entity.npc.good_human.*;
+import com.zivilon.cinder_loe.entity.npc.orc.MorgulOrc;
+import com.zivilon.cinder_loe.entity.npc.radagast.*;
 import com.zivilon.cinder_loe.entity.projectile.*;
 import com.zivilon.cinder_loe.entity.trader.*;
 import com.zivilon.cinder_loe.items.*;
@@ -20,7 +26,6 @@ import com.zivilon.cinder_loe.potion.LoEPotions;
 import com.zivilon.cinder_loe.tileentity.*;
 import com.zivilon.cinder_loe.util.Utilities;
 import com.zivilon.cindercore.CinderCore;
-import lotr.common.LOTREventHandler;
 import lotr.common.item.*;
 import net.minecraft.potion.Potion;
 import org.apache.logging.log4j.LogManager;
@@ -40,7 +45,6 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -68,7 +72,6 @@ import lotr.common.world.spawning.LOTRSpawnList;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.client.renderer.entity.RenderLightningBolt;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.init.Blocks;
@@ -174,7 +177,7 @@ public class CinderLoE {
     public static Item pasta;
     public static Item pretzel;
     public static Item halva;
-    public static Item honey;
+   // public static Item honey;
 
     // Event/special
     public static Item frostblade;
@@ -322,7 +325,7 @@ public class CinderLoE {
     // Spawn lists
     public static LOTRSpawnList RED_DWARF;
     public static LOTRSpawnList LIMWAITH;
-    public static LOTRSpawnList Rhudaur;
+    public static LOTRSpawnList RHUDAUR;
 
     public static CinderEventHandler modEventHandler;
 
@@ -377,15 +380,13 @@ public class CinderLoE {
         event.registerServerCommand(new CommandCinderCharacter());
     }
 
-    public void registerEntities() { // Last ID added: 51
+    public void registerEntities() { // Last ID added: 53
         ///GameRegistry.registerTileEntity(TileEntityMistBlock.class, "TileEntityMistBlock");
 /*        GameRegistry.registerTileEntity(TileEntityShadowTile.class, "TileEntityShadowTile");
         GameRegistry.registerTileEntity(TileEntityForgingStation.class, "TileEntityForgingStation");*/
         ///.registerBlock(TileEntityRustedSword, "TileEntityRustedSword");
 
         int entityID = 7320; // Always increment entityID by 1 over the last entity to ensure unique IDs
-      //  EntityRegistry.registerModEntity(HaradLevy.class, "HaradLevy", (entityID + 36), this, 64, 1, true);
-      //  EntityRegistry.registerModEntity(DwarfLevy.class, "DwarfLevy", (entityID + 37), this, 64, 1, true);
 
         // Traders
         EntityRegistry.registerModEntity(RedDwarfSmith.class, "RedDwarfSmith", (entityID + 29), this, 64, 1, true);
@@ -394,34 +395,36 @@ public class CinderLoE {
         EntityRegistry.registerModEntity(BladorthinSmith.class, "BladorthinSmith", (entityID + 43), this, 64, 1, true);
 
 
-        // Others
+        // Event
-
         EntityRegistry.registerModEntity(DarkSpider.class, "DarkSpider", (entityID + 42), this, 64, 1, true);
-        EntityRegistry.registerModEntity(EntityWarDart.class, "WarDart", (entityID + 44), this, 64, 1, true);
-
         EntityRegistry.registerModEntity(CorruptDwarf.class, "CorruptDwarf", (entityID + 36), this, 64, 1, true);
         EntityRegistry.registerModEntity(CorruptElf.class, "CorruptElf", (entityID + 37), this, 64, 1, true);
         EntityRegistry.registerModEntity(CorruptEnt.class, "CorruptEnt", (entityID + 38), this, 64, 1, true);
         EntityRegistry.registerModEntity(CorruptHobbit.class, "CorruptHobit", (entityID + 39), this, 64, 1, true);
         EntityRegistry.registerModEntity(CorruptMan.class, "CorruptMan", (entityID + 40), this, 64, 1, true);
         EntityRegistry.registerModEntity(CorruptOrc.class, "CorruptOrc", (entityID + 41), this, 64, 1, true);
-
-        EntityRegistry.registerModEntity(SarumanFireball.class, "SarumanFireball", entityID + 0, this, 64, 10, true);
         EntityRegistry.registerModEntity(Renegade.class, "Renegade", (entityID + 1), this, 64, 1, true);
         EntityRegistry.registerModEntity(RenegadeCaptain.class, "RenegadeCaptain", (entityID + 16), this, 64, 1, true);
+        EntityRegistry.registerModEntity(FangornBear.class, "FangornBear", (entityID + 6), this, 64, 1, true);
+        EntityRegistry.registerModEntity(FangornWildBoar.class, "FangornWildBoar", (entityID + 7), this, 64, 1, true);
+        EntityRegistry.registerModEntity(FangornAuroch.class, "FangornAuroch", (entityID + 8), this, 64, 1, true);
+        EntityRegistry.registerModEntity(FangornElk.class, "FangornElk", (entityID + 9), this, 64, 1, true);
+        EntityRegistry.registerModEntity(FangornWolf.class, "FangornWolf", (entityID + 10), this, 64, 1, true);
+        EntityRegistry.registerModEntity(Wraith.class, "Wraith", (entityID + 15), this, 64, 1, true);
+
+        //Misc
+        EntityRegistry.registerModEntity(EntityWarDart.class, "WarDart", (entityID + 44), this, 64, 1, true);
+        EntityRegistry.registerModEntity(SarumanFireball.class, "SarumanFireball", entityID + 0, this, 64, 10, true);
+        EntityRegistry.registerModEntity(LOTREntitySauron.class, "LOTREntitySauron", (entityID + 28), this, 64, 1, true);
+        EntityRegistry.registerModEntity(UtumnoSlaveTrader.class, "UtumnoSlaveTrader", (entityID + 30), this, 64, 1, true);
 
+        // Faction Units
         EntityRegistry.registerModEntity(RedDwarfWarrior.class, "RedDwarfWarrior", (entityID + 2), this, 64, 1, true);
         EntityRegistry.registerModEntity(RedDwarfArbalest.class, "RedDwarfArbalest", (entityID + 3), this, 64, 1, true);
         EntityRegistry.registerModEntity(RedDwarfBannerBearer.class, "RedDwarfBannerBearer", (entityID + 4), this, 64, 1, true);
         EntityRegistry.registerModEntity(RedDwarfCommander.class, "RedDwarfCommander", (entityID + 5), this, 64, 1, true);
 
-        EntityRegistry.registerModEntity(FangornBear.class, "FangornBear", (entityID + 6), this, 64, 1, true);
-        EntityRegistry.registerModEntity(FangornWildBoar.class, "FangornWildBoar", (entityID + 7), this, 64, 1, true);
-        EntityRegistry.registerModEntity(FangornAuroch.class, "FangornAuroch", (entityID + 8), this, 64, 1, true);
-        EntityRegistry.registerModEntity(FangornElk.class, "FangornElk", (entityID + 9), this, 64, 1, true);
-        EntityRegistry.registerModEntity(FangornWolf.class, "FangornWolf", (entityID + 10), this, 64, 1, true);
       //  EntityRegistry.registerModEntity(FangornWolf.class, "TamedCrocodile", (entityID + 35), this, 64, 1, true);
-
         EntityRegistry.registerModEntity(Limwaith.class, "Limwaith", (entityID + 31), this, 64, 1, true);
         EntityRegistry.registerModEntity(LimwaithWarrior.class, "LimwaithWarrior", (entityID + 11), this, 64, 1, true);
         EntityRegistry.registerModEntity(LimwaithBoneWarrior.class, "LimwaithBoneWarrior", (entityID + 32), this, 64, 1, true);
@@ -429,8 +432,6 @@ public class CinderLoE {
         EntityRegistry.registerModEntity(LimwaithBannerBearer.class, "LimwaithBannerBearer", (entityID + 13), this, 64, 1, true);
         EntityRegistry.registerModEntity(LimwaithChieftain.class, "LimwaithChieftain", (entityID + 14), this, 64, 1, true);
 
-        EntityRegistry.registerModEntity(Wraith.class, "Wraith", (entityID + 15), this, 64, 1, true);
-
         EntityRegistry.registerModEntity(ArnorSoldier.class, "ArnorSoldier", (entityID + 17), this, 64, 1, true);
         EntityRegistry.registerModEntity(ArnorSoldierArcher.class, "ArnorSoldierArcher", (entityID + 19), this, 64, 1, true);
         EntityRegistry.registerModEntity(ArnorCaptain.class, "ArnorCaptain", (entityID + 20), this, 64, 1, true);
@@ -443,9 +444,9 @@ public class CinderLoE {
         EntityRegistry.registerModEntity(BreeSoldierBannerBearer.class, "BreeSoldierBannerBearer", (entityID + 25), this, 64, 1, true);
         EntityRegistry.registerModEntity(BreeOutrider.class, "BreeOutrider", (entityID + 26), this, 64, 1, true);
 
-        EntityRegistry.registerModEntity(LOTREntitySauron.class, "LOTREntitySauron", (entityID + 28), this, 64, 1, true);
+        EntityRegistry.registerModEntity(HobbitBannerBearer.class, "HobbitBannerBearer", (entityID + 52), this, 64, 1, true);
 
-        EntityRegistry.registerModEntity(UtumnoSlaveTrader.class, "UtumnoSlaveTrader", (entityID + 30), this, 64, 1, true);
+        EntityRegistry.registerModEntity(MorgulOrc.class, "MorgulOrc", (entityID + 53), this, 64, 1, true);
 
         // Frozen Dungeon
 /*        EntityRegistry.registerModEntity(Nex.class, "Nex", (entityID + 45), this, 64, 1, true);
@@ -584,7 +585,7 @@ public class CinderLoE {
         pasta = new LOTRItemFood(2,0.0f, false).setPotionEffect(Potion.hunger.id, 5,0,100).setUnlocalizedName("lotr:pasta").setTextureName("lotr:pasta");
         pretzel = new LOTRItemFood(4,1.0f, false).setUnlocalizedName("lotr:pretzel").setTextureName("lotr:pretzel");
         halva = new LOTRItemFood (7, 4.0f, false).setUnlocalizedName("lotr:halva").setTextureName("lotr:halva");
-        honey = new LOTRItemFood(3, 0.4f, false).setPotionEffect(Potion.regeneration.id, 5, 0, 100).setUnlocalizedName("lotr:honey").setTextureName("lotr:honey");
+       // honey = new LOTRItemFood(3, 0.4f, false).setPotionEffect(Potion.regeneration.id, 5, 0, 100).setUnlocalizedName("lotr:honey").setTextureName("lotr:honey");
 
         spawnEgg = new CinderLoESpawnEgg();
 
@@ -616,7 +617,7 @@ public class CinderLoE {
         ItemRegistration.registerItem(pasta, "pasta", 88);
         ItemRegistration.registerItem(pretzel, "pretzel", 89);
         ItemRegistration.registerItem(halva, "halva", 94);
-        ItemRegistration.registerItem(honey, "honey", 95);
+     //   ItemRegistration.registerItem(honey, "honey", 95);
 
         ItemRegistration.registerItem(spawnEgg, "spawnEgg", 42);
 
@@ -1061,6 +1062,8 @@ public class CinderLoE {
             RenderingRegistry.registerEntityRenderingHandler(BreeSoldierBannerBearer.class, new LOTRRenderBreeMan());
             RenderingRegistry.registerEntityRenderingHandler(BreeOutrider.class, new LOTRRenderBreeMan());
 
+            RenderingRegistry.registerEntityRenderingHandler(HobbitBannerBearer.class, new LOTRRenderHobbit());
+
             RenderingRegistry.registerEntityRenderingHandler(LOTREntitySauron.class, new LOTRRenderSauron());
             RenderingRegistry.registerEntityRenderingHandler(UtumnoSlaveTrader.class, new RenderUtumnoSlave());
 /*            RenderingRegistry.registerEntityRenderingHandler(NexShadow.class, new RenderNexMiniboss());
@@ -1184,7 +1187,7 @@ public class CinderLoE {
         CinderCore.registerItemFallback(Item.getIdFromItem(pasta),Item.getIdFromItem(Items.wheat), "cinder_loe", "1.2.5");
         CinderCore.registerItemFallback(Item.getIdFromItem(pretzel),Item.getIdFromItem(Items.bread), "cinder_loe", "1.2.5");
         CinderCore.registerItemFallback(Item.getIdFromItem(halva),Item.getIdFromItem(Items.bread),"cinder_loe", "1.2.5");
-        CinderCore.registerItemFallback(Item.getIdFromItem(honey),Item.getIdFromItem(LOTRMod.mapleSyrup), "cinder_loe", "1.2.5");
+       // CinderCore.registerItemFallback(Item.getIdFromItem(honey),Item.getIdFromItem(LOTRMod.mapleSyrup), "cinder_loe", "1.2.5");
 
         //== Blocks==
         CinderCore.registerItemFallback(Block.getIdFromBlock(cinderBlock), Block.getIdFromBlock(Blocks.netherrack), "cinder_loe", "1.0");
@@ -1308,8 +1311,6 @@ public class CinderLoE {
         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.registerEntityFallback(HaradLevy.class, LOTREntityNearHaradrim.class, "cinder_loe", "1.2.3");
-     //   CinderCore.registerEntityFallback(DwarfLevy.class, LOTREntityDwarf.class, "cinder_loe", "1.2.3");
         CinderCore.registerEntityFallback(DarkSpider.class, LOTREntityUtumnoIceSpider.class, "cinder_loe", "1.2.4");
 
         CinderCore.registerEntityFallback(BladorthinSmith.class, LOTREntityDorwinionElf.class, "cinder_loe", "1.2.4");
@@ -1361,6 +1362,7 @@ public class CinderLoE {
         CinderCore.registerEntityFallback(BreeSoldierBannerBearer.class, LOTREntityBreeMan.class, "cinder_loe", "1.1");
         CinderCore.registerEntityFallback(BreeOutrider.class, LOTREntityBreeMan.class, "cinder_loe", "1.1");
 
+
         CinderCore.registerCustomFallback(42, 16, "banner", "cinder_loe", "1.2");
         CinderCore.registerCustomFallback(43, 16, "banner", "cinder_loe", "1.2.4");
         CinderCore.registerCustomFallback(44, 16, "banner", "cinder_loe", "1.2.4");
@@ -1370,37 +1372,33 @@ public class CinderLoE {
 
     // Create unit trade entries here, out of the way of important code
     public void setupTradeEntries() {
-        RED_DWARF_COMMANDER = new LOTRUnitTradeEntries(200.0F, new LOTRUnitTradeEntry[]{
+        RED_DWARF_COMMANDER = new LOTRUnitTradeEntries(200.0F, new LOTRUnitTradeEntry(LOTREntityDwarf.class, 60, 0.0F),
-            new LOTRUnitTradeEntry(LOTREntityDwarf.class, 20, 0.0F),
+                (new LOTRUnitTradeEntry(RedDwarfWarrior.class, 400, 50.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF),
-            (new LOTRUnitTradeEntry(RedDwarfWarrior.class, 30, 50.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF),
+                (new LOTRUnitTradeEntry(RedDwarfArbalest.class, 400, 100.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF),
-            (new LOTRUnitTradeEntry(RedDwarfArbalest.class, 50, 100.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF),
+                (new LOTRUnitTradeEntry(RedDwarfWarrior.class, LOTREntityWildBoar.class, "RedDwarfWarrior_Boar", 500, 150.0F)).setMountArmor(boarArmorRedDwarf).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF),
-            (new LOTRUnitTradeEntry(RedDwarfWarrior.class, LOTREntityWildBoar.class, "RedDwarfWarrior_Boar", 50, 150.0F)).setMountArmor(boarArmorRedDwarf).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF),
+                (new LOTRUnitTradeEntry(RedDwarfArbalest.class, LOTREntityWildBoar.class, "RedDwarfArbalest_Boar", 500, 200.0F)).setMountArmor(boarArmorRedDwarf).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF),
-            (new LOTRUnitTradeEntry(RedDwarfArbalest.class, LOTREntityWildBoar.class, "RedDwarfArbalest_Boar", 70, 200.0F)).setMountArmor(boarArmorRedDwarf).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF),
+                (new LOTRUnitTradeEntry(RedDwarfBannerBearer.class, 400, 200.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF));
-            (new LOTRUnitTradeEntry(RedDwarfBannerBearer.class, 50, 200.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF) });
+
-
+        LIMWAITH_COMMANDER = new LOTRUnitTradeEntries(200.0F, new LOTRUnitTradeEntry(LimwaithWarrior.class, 150, 50.0F),
-        LIMWAITH_COMMANDER = new LOTRUnitTradeEntries(200.0F, new LOTRUnitTradeEntry[]{
+                (new LOTRUnitTradeEntry(LimwaithBlowgunner.class, 150, 100.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
-            new LOTRUnitTradeEntry(LimwaithWarrior.class, 30, 50.0F),
+                (new LOTRUnitTradeEntry(LimwaithBoneWarrior.class, 250, 200.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
-            (new LOTRUnitTradeEntry(LimwaithBlowgunner.class, 50, 100.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
+                (new LOTRUnitTradeEntry(LimwaithBannerBearer.class, 150, 200.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION));
-            (new LOTRUnitTradeEntry(LimwaithBoneWarrior.class, 70, 200.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
+
-            (new LOTRUnitTradeEntry(LimwaithBannerBearer.class, 50, 200.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION) });
+        ARNOR_CAPTAIN = new LOTRUnitTradeEntries(200.0F, (new LOTRUnitTradeEntry(ArnorSoldier.class, 250, 250.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
-
+                (new LOTRUnitTradeEntry(ArnorSoldierArcher.class, 250, 300.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
-        ARNOR_CAPTAIN = new LOTRUnitTradeEntries(200.0F, new LOTRUnitTradeEntry[]{
+                (new LOTRUnitTradeEntry(ArnorSoldier.class, LOTREntityHorse.class, "Arnor_Horse", 350, 150.0F)).setMountArmor(horseArmorIron).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
-            (new LOTRUnitTradeEntry(ArnorSoldier.class, 60, 250.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
+                (new LOTRUnitTradeEntry(ArnorSoldierArcher.class, LOTREntityHorse.class, "Arnor_Horse", 350, 200.0F)).setMountArmor(horseArmorIron).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
-            (new LOTRUnitTradeEntry(ArnorSoldierArcher.class, 100, 300.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
+                (new LOTRUnitTradeEntry(LOTREntityRangerNorth.class, 250, 0.0f)),
-            (new LOTRUnitTradeEntry(ArnorSoldier.class, LOTREntityHorse.class, "Arnor_Horse", 100, 150.0F)).setMountArmor(horseArmorIron).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
+                (new LOTRUnitTradeEntry(LOTREntityRangerNorth.class, LOTREntityHorse.class, "RangerNorth_Horse", 350, 100.0f)),
-            (new LOTRUnitTradeEntry(ArnorSoldierArcher.class, LOTREntityHorse.class, "Arnor_Horse", 140, 200.0F)).setMountArmor(horseArmorIron).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
+                (new LOTRUnitTradeEntry(LOTREntityRangerNorthBannerBearer.class, 250, 150.0f)),
-            (new LOTRUnitTradeEntry(LOTREntityRangerNorth.class, 50, 0.0f)),
+                (new LOTRUnitTradeEntry(ArnorBannerBearer.class, 250, 400.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION));
-            (new LOTRUnitTradeEntry(LOTREntityRangerNorth.class, LOTREntityHorse.class, "RangerNorth_Horse", 70, 100.0f)),
+
-            (new LOTRUnitTradeEntry(LOTREntityRangerNorthBannerBearer.class, 70, 150.0f)),
+        BREE_CAPTAIN = new LOTRUnitTradeEntries(150.0F, (new LOTRUnitTradeEntry(LOTREntityBreeGuard.class, 150, 0.0f)),
-            (new LOTRUnitTradeEntry(ArnorBannerBearer.class, 100, 400.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION) });
+                (new LOTRUnitTradeEntry(BreeSoldier.class, 250, 250.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
-
+                (new LOTRUnitTradeEntry(BreeCrossbowman.class, 250, 300.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
-        BREE_CAPTAIN = new LOTRUnitTradeEntries(150.0F, new LOTRUnitTradeEntry[]{
+                (new LOTRUnitTradeEntry(BreeOutrider.class, LOTREntityHorse.class, "Bree_Horse", 350, 400.0F)).setMountArmor(horseArmorIron).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
-            (new LOTRUnitTradeEntry(LOTREntityBreeGuard.class, 20, 0.0f)),
+                (new LOTRUnitTradeEntry(LOTREntityBreeBannerBearer.class, 150, 150.0f)),
-            (new LOTRUnitTradeEntry(BreeSoldier.class, 60, 250.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
+                (new LOTRUnitTradeEntry(BreeSoldierBannerBearer.class, 250, 400.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION));
-            (new LOTRUnitTradeEntry(BreeCrossbowman.class, 100, 300.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
-            (new LOTRUnitTradeEntry(BreeOutrider.class, LOTREntityHorse.class, "Bree_Horse", 150, 400.0F)).setMountArmor(horseArmorIron).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
-            (new LOTRUnitTradeEntry(LOTREntityBreeBannerBearer.class, 40, 150.0f)),
-            (new LOTRUnitTradeEntry(BreeSoldierBannerBearer.class, 100, 400.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION) });
     }
 
 

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

@@ -14,6 +14,15 @@ public class CinderLoE_Config {
     public static float enchantment_color_blue;
     public static String corrupt_faction;
 
+    public static boolean objective_lindon;
+    public static boolean objective_arnor;
+    public static boolean objective_angmar;
+    public static boolean objective_durin;
+    public static boolean objective_dolguldur;
+    public static boolean objective_woodelf;
+    public static boolean objective_lothlorien;
+
+
     public static void init(FMLPreInitializationEvent event) {
         File configFile = new File(event.getModConfigurationDirectory(), "CinderLoE.cfg");
         config = new Configuration(configFile);
@@ -31,6 +40,15 @@ public class CinderLoE_Config {
             enchantment_color_blue = config.getFloat("EnchantmentColorBlue", Configuration.CATEGORY_GENERAL, 0.608f, 0.0f, 1.0f, "Configure blue color for enchantments");
 
             corrupt_faction = config.getString("CorruptFaction", Configuration.CATEGORY_GENERAL, "MORDOR", "Configure the alignment the Corrupt npcs follow");
+
+            objective_lindon = config.getBoolean("Lindon Objective", Configuration.CATEGORY_GENERAL, false, "set true if Lindon Objective Complete");
+            objective_arnor = config.getBoolean("Arnor Objective", Configuration.CATEGORY_GENERAL, false,"set true if Arnor Objective Complete");
+            objective_angmar = config.getBoolean("Angmar Objective", Configuration.CATEGORY_GENERAL, false, "set true if Angmar Objective Complete");
+            objective_durin = config.getBoolean("Durin Objective", Configuration.CATEGORY_GENERAL, false, "set true if Durin Objective Complete");
+            objective_dolguldur = config.getBoolean("Dol Guldur Objective", Configuration.CATEGORY_GENERAL, false,"set true if Dol Guldur Objective Complete");
+            objective_woodelf = config.getBoolean("Wood Elf Objective", Configuration.CATEGORY_GENERAL, false,  "set true if Wood Elf Objective Complete");
+            objective_lothlorien = config.getBoolean("Lothlorien Objective", Configuration.CATEGORY_GENERAL, false, "set true if Lothlorien Objective Complete");
+
             // Save the configuration if it has changed
             if (config.hasChanged()) {
                 config.save();

src/main/java/com/zivilon/cinder_loe/character/CharacterEventListener.java

@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import com.zivilon.cinder_loe.entity.npc.FangornAnimal;
+import com.zivilon.cinder_loe.entity.npc.radagast.FangornAnimal;
 
 public class CharacterEventListener {
 

src/main/java/com/zivilon/cinder_loe/client/model/ModelFangornElk.java

@@ -7,7 +7,7 @@ import net.minecraft.entity.Entity;
 import net.minecraft.util.MathHelper;
 import org.lwjgl.opengl.GL11;
 
-import com.zivilon.cinder_loe.entity.npc.FangornElk;
+import com.zivilon.cinder_loe.entity.npc.radagast.FangornElk;
 
 public class ModelFangornElk extends ModelBase {
   private ModelRenderer body;

src/main/java/com/zivilon/cinder_loe/client/model/ModelFangornWolf.java

@@ -7,7 +7,7 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.MathHelper;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
-import com.zivilon.cinder_loe.entity.npc.FangornWolf;
+import com.zivilon.cinder_loe.entity.npc.radagast.FangornWolf;
 
 @SideOnly(Side.CLIENT)
 public class ModelFangornWolf extends ModelBase {

src/main/java/com/zivilon/cinder_loe/client/render/RenderBattleNun.java

@@ -1,6 +1,6 @@
 package com.zivilon.cinder_loe.client.render;
 
-import com.zivilon.cinder_loe.entity.npc.BattleNun;
+import com.zivilon.cinder_loe.entity.npc.good_human.BattleNun;
 import lotr.client.model.LOTRModelHuman;
 import lotr.client.render.entity.LOTRRenderBiped;
 import lotr.client.render.entity.LOTRRandomSkins;

src/main/java/com/zivilon/cinder_loe/client/render/RenderFangornAuroch.java

@@ -8,7 +8,7 @@ import net.minecraft.entity.Entity;
 import net.minecraft.util.ResourceLocation;
 
 import com.zivilon.cinder_loe.client.model.ModelFangornAuroch;
-import com.zivilon.cinder_loe.entity.npc.FangornAuroch;
+import com.zivilon.cinder_loe.entity.npc.radagast.FangornAuroch;
 
 public class RenderFangornAuroch extends RenderLiving {
   public static LOTRRandomSkins aurochsSkins;

src/main/java/com/zivilon/cinder_loe/client/render/RenderFangornBear.java

@@ -1,6 +1,6 @@
 package com.zivilon.cinder_loe.client.render;
 
-import com.zivilon.cinder_loe.entity.npc.FangornBear;
+import com.zivilon.cinder_loe.entity.npc.radagast.FangornBear;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/com/zivilon/cinder_loe/client/render/RenderFangornElk.java

@@ -8,7 +8,7 @@ import net.minecraft.entity.Entity;
 import net.minecraft.util.ResourceLocation;
 
 import com.zivilon.cinder_loe.client.model.ModelFangornElk;
-import com.zivilon.cinder_loe.entity.npc.FangornElk;
+import com.zivilon.cinder_loe.entity.npc.radagast.FangornElk;
 
 public class RenderFangornElk extends RenderLiving {
   private static LOTRRandomSkins elkSkins;

src/main/java/com/zivilon/cinder_loe/client/render/RenderLimwaith.java

@@ -11,7 +11,7 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.util.ResourceLocation;
 
-import com.zivilon.cinder_loe.entity.npc.Limwaith;
+import com.zivilon.cinder_loe.entity.npc.evil_human.Limwaith;
 
 public class RenderLimwaith extends LOTRRenderBiped {
     public static LOTRRandomSkins skinsMale;

src/main/java/com/zivilon/cinder_loe/client/render/RenderLimwaithShaman.java

@@ -1,6 +1,6 @@
 package com.zivilon.cinder_loe.client.render;
 
-import com.zivilon.cinder_loe.entity.npc.Limwaith;
+import com.zivilon.cinder_loe.entity.npc.evil_human.Limwaith;
 import lotr.client.render.entity.LOTRRandomSkins;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.entity.EntityLiving;

src/main/java/com/zivilon/cinder_loe/entity/npc/DwarfLevy.java

@@ -1,52 +0,0 @@
-package com.zivilon.cinder_loe.entity.npc;
-
-import com.zivilon.cinder_loe.CinderLoE;
-
-import lotr.common.LOTRMod;
-import lotr.common.LOTRShields;
-import lotr.common.entity.npc.LOTREntityDwarfWarrior;
-import net.minecraft.entity.IEntityLivingData;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-
-public class DwarfLevy extends LOTREntityDwarfWarrior {
-
-    private static ItemStack[] levyWeapons = new ItemStack[]{new ItemStack(LOTRMod.daggerDwarven), new ItemStack(LOTRMod.daggerDwarvenPoisoned), new ItemStack(LOTRMod.swordDwarven), new ItemStack(LOTRMod.axeDwarven), new ItemStack(LOTRMod.battleaxeDwarven), new ItemStack(LOTRMod.hammerDwarven), new ItemStack(Items.iron_axe), new ItemStack(LOTRMod.battleaxeIron), new ItemStack(LOTRMod.spearDwarven), new ItemStack(LOTRMod.spearIron)};
-    private static ItemStack[] levySpears = new ItemStack[]{new ItemStack(LOTRMod.spearDwarven), new ItemStack(LOTRMod.spearIron)};
-    private static ItemStack[] levyBodies = new ItemStack[]{new ItemStack(Items.leather_chestplate), new ItemStack(LOTRMod.bodyDaleGambeson)};
-    private static ItemStack[] levyLegs = new ItemStack[]{new ItemStack(Items.leather_leggings), new ItemStack(Items.iron_leggings)};
-    private static ItemStack[] levyBoots = new ItemStack[]{new ItemStack(Items.leather_boots), new ItemStack(LOTRMod.bootsBronze), null};
-    private static final int[] colors = new int[]{14823729, 5512477, 14196753, 11374145, 7366222};
-
-    public DwarfLevy(World world) {
-        super(world);
-        this.npcShield = null;
-    }
-
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        int i = (this).rand.nextInt(levyWeapons.length);
-        this.npcItemsInv.setMeleeWeapon(levyWeapons[i].copy());
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
-        if ((this).rand.nextInt(5) == 0) {
-            this.npcItemsInv.setSpearBackup(this.npcItemsInv.getMeleeWeapon());
-            i = (this).rand.nextInt(levySpears.length);
-            this.npcItemsInv.setMeleeWeapon(levySpears[i].copy());
-        }
-        i = (this).rand.nextInt(levyBoots.length);
-        this.setCurrentItemOrArmor(1, levyBoots[i].copy());
-        i = (this).rand.nextInt(levyLegs.length);
-        this.setCurrentItemOrArmor(2, levyLegs[i].copy());
-        i = (this).rand.nextInt(levyBodies.length);
-        this.setCurrentItemOrArmor(3, levyBodies[i].copy());
-        this.setCurrentItemOrArmor(4, null);
-        return data;
-    }
-    @Override
-    public ItemStack getPickedResult(MovingObjectPosition target) {
-        return new ItemStack(CinderLoE.spawnEgg, 1, 24);
-    }
-}

src/main/java/com/zivilon/cinder_loe/entity/npc/HaradLevy.java

@@ -1,60 +0,0 @@
-package com.zivilon.cinder_loe.entity.npc;
-
-import com.zivilon.cinder_loe.CinderLoE;
-
-import lotr.common.LOTRMod;
-import lotr.common.LOTRShields;
-import lotr.common.entity.npc.LOTREntityBreeGuard;
-import lotr.common.entity.npc.LOTREntityNearHaradrim;
-import lotr.common.item.LOTRItemHaradRobes;
-import net.minecraft.entity.IEntityLivingData;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraft.util.MovingObjectPosition;
-
-public class HaradLevy extends LOTREntityNearHaradrim {
-    private static ItemStack[] levyWeapons = new ItemStack[]{new ItemStack(LOTRMod.daggerHarad), new ItemStack(LOTRMod.daggerHaradPoisoned), new ItemStack(LOTRMod.swordHarad), new ItemStack(LOTRMod.swordMoredain), new ItemStack(LOTRMod.battleaxeBronze), new ItemStack(LOTRMod.maceNearHarad), new ItemStack(Items.iron_sword), new ItemStack(LOTRMod.swordBronze), new ItemStack(LOTRMod.battleaxeIron), new ItemStack(LOTRMod.poleaxeNearHarad), new ItemStack(LOTRMod.spearHarad), new ItemStack(LOTRMod.spearIron), new ItemStack(LOTRMod.spearBronze)};
-    private static ItemStack[] levySpears = new ItemStack[]{new ItemStack(LOTRMod.spearHarad), new ItemStack(LOTRMod.spearIron), new ItemStack(LOTRMod.spearBronze)};
-    private static ItemStack[] levyBodies = new ItemStack[]{new ItemStack(Items.leather_chestplate), new ItemStack(LOTRMod.bodyBronze), new ItemStack(LOTRMod.bodyHaradRobes)};
-    private static ItemStack[] levyLegs = new ItemStack[]{new ItemStack(Items.leather_leggings), new ItemStack(LOTRMod.legsBronze)};
-    private static ItemStack[] levyBoots = new ItemStack[]{new ItemStack(Items.leather_boots), new ItemStack(LOTRMod.bootsBronze), null};
-    private static final int[] colors = new int[]{14823729, 5512477, 14196753, 11374145, 7366222};
-
-    public HaradLevy(World world) {
-        super(world);
-        this.spawnRidingHorse = false;
-        this.addTargetTasks(true);
-        this.npcShield = null;
-    }
-
-    @Override
-    public void setupNPCGender() {
-        this.familyInfo.setMale(true);
-    }
-
-    @Override
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        int i = (this).rand.nextInt(levyWeapons.length);
-        this.npcItemsInv.setMeleeWeapon(levyWeapons[i].copy());
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
-        if ((this).rand.nextInt(5) == 0) {
-            this.npcItemsInv.setSpearBackup(this.npcItemsInv.getMeleeWeapon());
-            i = (this).rand.nextInt(levySpears.length);
-            this.npcItemsInv.setMeleeWeapon(levySpears[i].copy());
-        }
-        i = (this).rand.nextInt(levyBoots.length);
-        this.setCurrentItemOrArmor(1, levyBoots[i].copy());
-        i = (this).rand.nextInt(levyLegs.length);
-        this.setCurrentItemOrArmor(2, levyLegs[i].copy());
-        i = (this).rand.nextInt(levyBodies.length);
-        this.setCurrentItemOrArmor(3, levyBodies[i].copy());
-        this.setCurrentItemOrArmor(4, null);
-        return data;
-    }
-    @Override
-    public ItemStack getPickedResult(MovingObjectPosition target) {
-        return new ItemStack(CinderLoE.spawnEgg, 1, 25);
-    }
-}

src/main/java/com/zivilon/cinder_loe/entity/npc/HobbitBannerBearer.java

@@ -0,0 +1,29 @@
+package com.zivilon.cinder_loe.entity.npc;
+
+import com.zivilon.cinder_loe.CinderLoE;
+import lotr.common.entity.npc.LOTRBannerBearer;
+import lotr.common.entity.npc.LOTREntityHobbitBounder;
+import lotr.common.item.LOTRItemBanner;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+public class HobbitBannerBearer extends LOTREntityHobbitBounder implements LOTRBannerBearer {
+    public HobbitBannerBearer(World world) {
+        super(world);
+    }
+    @Override
+    public LOTRItemBanner.BannerType getBannerType() {
+        return LOTRItemBanner.BannerType.HOBBIT;
+    }
+    @Override
+    public ItemStack getPickedResult(MovingObjectPosition target) {
+        return new ItemStack(CinderLoE.spawnEgg, 1, 16);
+    }
+
+    @Override
+    public void attackEntityWithRangedAttack(EntityLivingBase p_82196_1_, float p_82196_2_) {
+
+    }
+}

src/main/java/com/zivilon/cinder_loe/entity/npc/dwarf/RedDwarfArbalest.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.dwarf;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/dwarf/RedDwarfBannerBearer.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.dwarf;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/dwarf/RedDwarfCommander.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.dwarf;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/dwarf/RedDwarfWarrior.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.dwarf;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

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

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.evil_human;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

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

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.evil_human;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

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

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.evil_human;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

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

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.evil_human;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

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

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.evil_human;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

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

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.evil_human;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/good_human/ArnorBannerBearer.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.good_human;
 
 import com.zivilon.cinder_loe.CinderLoE;
 import lotr.common.entity.npc.LOTRBannerBearer;

src/main/java/com/zivilon/cinder_loe/entity/npc/good_human/ArnorCaptain.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.good_human;
 
 import com.zivilon.cinder_loe.CinderLoE;
 import lotr.common.LOTRCapes;

src/main/java/com/zivilon/cinder_loe/entity/npc/good_human/ArnorSoldier.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.good_human;
 
 import lotr.common.entity.ai.LOTREntityAIAttackOnCollide;
 import lotr.common.entity.npc.LOTREntityDunedain;

src/main/java/com/zivilon/cinder_loe/entity/npc/good_human/ArnorSoldierArcher.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.good_human;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/good_human/BattleNun.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.good_human;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/good_human/BreeCaptain.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.good_human;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/good_human/BreeCrossbowman.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.good_human;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/good_human/BreeOutrider.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.good_human;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/good_human/BreeSoldier.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.good_human;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/good_human/BreeSoldierBannerBearer.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.good_human;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/MorgulOrc.java

@@ -0,0 +1,13 @@
+package com.zivilon.cinder_loe.entity.npc.orc;
+
+import lotr.common.LOTRShields;
+import lotr.common.entity.npc.LOTREntityMordorOrc;
+import net.minecraft.world.World;
+
+
+public class MorgulOrc extends LOTREntityMordorOrc {
+    public MorgulOrc(World world) {
+        super(world);
+        this.npcShield = LOTRShields.ALIGNMENT_MINAS_MORGUL;
+    }
+}

src/main/java/com/zivilon/cinder_loe/entity/npc/radagast/FangornAnimal.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.radagast;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/radagast/FangornAuroch.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.radagast;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/radagast/FangornBear.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.radagast;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/radagast/FangornElk.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.radagast;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/radagast/FangornWildBoar.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.radagast;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/npc/radagast/FangornWolf.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.entity.npc;
+package com.zivilon.cinder_loe.entity.npc.radagast;
 
 import com.zivilon.cinder_loe.CinderLoE;
 

src/main/java/com/zivilon/cinder_loe/entity/trader/LimwaithFishmonger.java

@@ -2,7 +2,7 @@ package com.zivilon.cinder_loe.entity.trader;
 
 import com.zivilon.cinder_loe.CinderLoE;
 
-import com.zivilon.cinder_loe.entity.npc.Limwaith;
+import com.zivilon.cinder_loe.entity.npc.evil_human.Limwaith;
 import lotr.common.LOTRLevelData;
 import lotr.common.LOTRMod;
 import lotr.common.entity.npc.LOTRTradeEntries;

src/main/java/com/zivilon/cinder_loe/entity/trader/LimwaithShaman.java

@@ -2,7 +2,7 @@ package com.zivilon.cinder_loe.entity.trader;
 
 import com.zivilon.cinder_loe.CinderLoE;
 
-import com.zivilon.cinder_loe.entity.npc.Limwaith;
+import com.zivilon.cinder_loe.entity.npc.evil_human.Limwaith;
 import lotr.common.LOTRLevelData;
 import lotr.common.LOTRMod;
 import lotr.common.entity.npc.LOTRTradeEntries;

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

@@ -1,11 +1,16 @@
 package com.zivilon.cinder_loe.items;
 
-import com.zivilon.cinder_loe.CinderLoE;
-
 import com.zivilon.cinder_loe.LoECreativeTabs;
 import com.zivilon.cinder_loe.entity.*;
 import com.zivilon.cinder_loe.entity.corrupt.*;
 import com.zivilon.cinder_loe.entity.npc.*;
+import com.zivilon.cinder_loe.entity.npc.dwarf.RedDwarfArbalest;
+import com.zivilon.cinder_loe.entity.npc.dwarf.RedDwarfBannerBearer;
+import com.zivilon.cinder_loe.entity.npc.dwarf.RedDwarfCommander;
+import com.zivilon.cinder_loe.entity.npc.dwarf.RedDwarfWarrior;
+import com.zivilon.cinder_loe.entity.npc.evil_human.*;
+import com.zivilon.cinder_loe.entity.npc.good_human.*;
+import com.zivilon.cinder_loe.entity.npc.radagast.*;
 import com.zivilon.cinder_loe.entity.trader.*;
 
 import net.minecraft.creativetab.CreativeTabs;
@@ -75,8 +80,6 @@ public class CinderLoESpawnEgg extends Item {
         ENTITY_CLASSES.add(BreeOutrider.class);
         ENTITY_CLASSES.add(BreeSoldierBannerBearer.class);
         ENTITY_CLASSES.add(BreeCaptain.class);
-        ENTITY_CLASSES.add(DwarfLevy.class); // unregistered
-        ENTITY_CLASSES.add(HaradLevy.class); // unregistered
         ENTITY_CLASSES.add(FangornElk.class);
         ENTITY_CLASSES.add(FangornBear.class);
         ENTITY_CLASSES.add(FangornWildBoar.class);
@@ -97,6 +100,7 @@ public class CinderLoESpawnEgg extends Item {
         ENTITY_CLASSES.add(NexFire.class);
         ENTITY_CLASSES.add(NexToxin.class);
         ENTITY_CLASSES.add(Nex.class);
+        ENTITY_CLASSES.add(HobbitBannerBearer.class);
     }
 
     @Override

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

@@ -11,11 +11,11 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 
 import com.zivilon.cinder_loe.util.BlockPos;
-import com.zivilon.cinder_loe.entity.npc.FangornBear;
+import com.zivilon.cinder_loe.entity.npc.radagast.FangornBear;
-import com.zivilon.cinder_loe.entity.npc.FangornWildBoar;
+import com.zivilon.cinder_loe.entity.npc.radagast.FangornWildBoar;
-import com.zivilon.cinder_loe.entity.npc.FangornAuroch;
+import com.zivilon.cinder_loe.entity.npc.radagast.FangornAuroch;
-import com.zivilon.cinder_loe.entity.npc.FangornElk;
+import com.zivilon.cinder_loe.entity.npc.radagast.FangornElk;
-import com.zivilon.cinder_loe.entity.npc.FangornAnimal;
+import com.zivilon.cinder_loe.entity.npc.radagast.FangornAnimal;
 
 import java.util.Random;
 

src/main/java/com/zivilon/cinder_loe/mixins/overrides/ILOTRUnitTradeEntry.java

@@ -0,0 +1,8 @@
+package com.zivilon.cinder_loe.mixins.overrides;
+
+import lotr.common.entity.npc.LOTRUnitTradeEntry;
+
+public interface ILOTRUnitTradeEntry {
+    LOTRUnitTradeEntry setObjective(String objectiveKey);
+}
+

src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRUnitTradeEntries.java

@@ -0,0 +1,366 @@
+package com.zivilon.cinder_loe.mixins.overrides;
+
+import com.zivilon.cinder_loe.entity.npc.HobbitBannerBearer;
+import com.zivilon.cinder_loe.entity.npc.orc.MorgulOrc;
+import lotr.common.LOTRMod;
+import lotr.common.entity.animal.*;
+import lotr.common.entity.npc.*;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(LOTRUnitTradeEntries.class)
+public class MixinLOTRUnitTradeEntries {
+
+    @Shadow
+    public static LOTRUnitTradeEntries MORDOR_ORC_MERCENARY_CAPTAIN = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityMordorOrc.class, 150, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityMordorOrcArcher.class, 150, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityMordorOrcBombardier.class, 250, 400.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityMordorWarg.class, 100, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityMordorOrc.class, LOTREntityMordorWarg.class, "MordorOrc_Warg", 250, 100.0f).setMountArmor(LOTRMod.wargArmorMordor, 0.5f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityMordorOrcArcher.class, LOTREntityMordorWarg.class, "MordorOrcArcher_Warg", 250, 150.0f).setMountArmor(LOTRMod.wargArmorMordor, 0.5f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityMordorWargBombardier.class, 400, 250.0f),
+            new LOTRUnitTradeEntry(LOTREntityOlogHai.class, 800, 350.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityMordorBannerBearer.class, 150, 150.0f),
+            new LOTRUnitTradeEntry(LOTREntityMordorBannerBearer.class, LOTREntityMordorWarg.class, "Banner_Warg", 150, 250.0f).setMountArmor(LOTRMod.wargArmorMordor, 0.5f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(MorgulOrc.class, 130, 750.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(MorgulOrc.class, LOTREntityMordorWarg.class, "MordorOrc_Warg", 230, 750.0f).setPledgeExclusive().setMountArmor(LOTRMod.wargArmorMordor, 1.0f),
+            new LOTRUnitTradeEntry(LOTREntityMinasMorgulBannerBearer.class, 130, 150.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityMinasMorgulBannerBearer.class, LOTREntityMordorWarg.class, "Banner_Warg", 230, 750.0f).setPledgeExclusive().setMountArmor(LOTRMod.wargArmorMordor, 1.0f));
+    @Shadow
+    public static LOTRUnitTradeEntries GONDORIAN_CAPTAIN = new LOTRUnitTradeEntries(200.0f,
+            new LOTRUnitTradeEntry(LOTREntityGondorLevyman.class, 150, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityGondorSoldier.class, 250, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityGondorArcher.class, 250, 100.0f),
+            new LOTRUnitTradeEntry(LOTREntityGondorSoldier.class, LOTREntityHorse.class, "GondorSoldier_Horse", 350, 150.0f).setMountArmor(LOTRMod.horseArmorGondor).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityGondorTowerGuard.class, 500, 250.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityGondorBannerBearer.class, 250, 200.0f),
+            new LOTRUnitTradeEntry(LOTREntityGondorBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 350, 300.0f).setMountArmor(LOTRMod.horseArmorGondor).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries DWARF_COMMANDER = new LOTRUnitTradeEntries(200.0f,
+            new LOTRUnitTradeEntry(LOTREntityDwarf.class, 60, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityDwarfWarrior.class, 400, 50.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityDwarfAxeThrower.class, 400, 100.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityDwarfWarrior.class, LOTREntityWildBoar.class, "DwarfWarrior_Boar", 500, 150.0f).setMountArmor(LOTRMod.boarArmorDwarven).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityDwarfAxeThrower.class, LOTREntityWildBoar.class, "DwarfAxeThrower_Boar", 500, 200.0f).setMountArmor(LOTRMod.boarArmorDwarven).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityDwarfBannerBearer.class, 400, 200.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityDwarfBannerBearer.class, LOTREntityWildBoar.class, "Banner_Horse", 500, 300.0f).setMountArmor(LOTRMod.boarArmorDwarven).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries URUK_HAI_MERCENARY_CAPTAIN = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityIsengardSnaga.class, 100, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityIsengardSnagaArcher.class, 100, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityUrukHai.class, 500, 0.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityUrukHaiCrossbower.class, 500, 50.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityUrukHaiSapper.class, 600, 100.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityUrukHaiBerserker.class, 600, 150.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityUrukWarg.class, 100, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityIsengardSnaga.class, LOTREntityUrukWarg.class, "IsengardSnaga_Warg", 200, 100.0f).setMountArmor(LOTRMod.wargArmorUruk, 0.5f),
+            new LOTRUnitTradeEntry(LOTREntityIsengardSnagaArcher.class, LOTREntityUrukWarg.class, "IsengardSnagaArcher_Warg", 200, 150.0f).setMountArmor(LOTRMod.wargArmorUruk, 0.5f),
+            new LOTRUnitTradeEntry(LOTREntityUrukWargBombardier.class, 400, 250.0f),
+            new LOTRUnitTradeEntry(LOTREntityUrukHaiBannerBearer.class, 500, 150.0f).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries ELF_LORD = new LOTRUnitTradeEntries(300.0f,
+            new LOTRUnitTradeEntry(LOTREntityGaladhrimElf.class, 60, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityGaladhrimWarden.class, 250, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityGaladhrimWarrior.class, 500, 100.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityGaladhrimWarrior.class, LOTREntityHorse.class, "GaladhrimWarrior_Horse", 600, 200.0f).setMountArmor(LOTRMod.horseArmorGaladhrim).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityGaladhrimBannerBearer.class, 500, 250.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityGaladhrimBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 600, 350.0f).setMountArmor(LOTRMod.horseArmorGaladhrim).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries ROHIRRIM_MARSHAL = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityRohirrimWarrior.class, 250, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityRohirrimArcher.class, 250, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityRohirrimWarrior.class, LOTREntityHorse.class, "Rohirrim_Horse", 350, 100.0f).setMountArmor(LOTRMod.horseArmorRohan).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityRohirrimArcher.class, LOTREntityHorse.class, "RohirrimArcher_Horse", 350, 150.0f).setMountArmor(LOTRMod.horseArmorRohan).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityRohanBannerBearer.class, 250, 150.0f),
+            new LOTRUnitTradeEntry(LOTREntityRohanBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 350, 250.0f).setMountArmor(LOTRMod.horseArmorRohan).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries HOBBIT_SHIRRIFF = new LOTRUnitTradeEntries(50.0f,
+            new LOTRUnitTradeEntry(LOTREntityHobbitBounder.class, 60, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityHobbitBounder.class, LOTREntityShirePony.class, "HobbitBounder_Pony", 160, 50.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(HobbitBannerBearer.class, 60, 100.0f),
+            new LOTRUnitTradeEntry(HobbitBannerBearer.class, LOTREntityShirePony.class, "Banner_Horse", 160, 200.0f).setPledgeExclusive()
+            );
+    @Shadow
+    public static LOTRUnitTradeEntries DUNLENDING_WARLORD = new LOTRUnitTradeEntries(100.0f,
+            new LOTRUnitTradeEntry(LOTREntityDunlending.class, 60, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityDunlendingWarrior.class, 250, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityDunlendingArcher.class, 250, 100.0f),
+            new LOTRUnitTradeEntry(LOTREntityDunlendingAxeThrower.class, 250, 100.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityDunlendingBerserker.class, 400, 200.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityDunlendingBannerBearer.class, 250, 200.0f));
+    @Shadow
+    public static LOTRUnitTradeEntries WOOD_ELF_CAPTAIN = new LOTRUnitTradeEntries(250.0f,
+            new LOTRUnitTradeEntry(LOTREntityWoodElf.class, 60, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityWoodElfScout.class, 250, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityWoodElfWarrior.class, 500, 100.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityWoodElfWarrior.class, LOTREntityElk.class, "WoodElfWarrior_Elk", 600, 200.0f).setMountArmor(LOTRMod.elkArmorWoodElven).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityWoodElfBannerBearer.class, 500, 250.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityWoodElfBannerBearer.class, LOTREntityElk.class, "Banner_Horse", 600, 350.0f).setMountArmor(LOTRMod.elkArmorWoodElven).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries ANGMAR_ORC_MERCENARY_CAPTAIN = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityAngmarOrc.class, 150, 0.0f),
+            ((ILOTRUnitTradeEntry) new LOTRUnitTradeEntry(LOTREntityNurnSlave.class, 100, 0.0f).setTask(LOTRHiredNPCInfo.Task.FARMER)).setObjective("Angmar Objective"),
+            new LOTRUnitTradeEntry(LOTREntityAngmarOrcArcher.class, 150, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityAngmarOrcBombardier.class, 250, 100.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityAngmarWarg.class, 100, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityAngmarOrc.class, LOTREntityAngmarWarg.class, "AngmarOrc_Warg", 250, 100.0f).setMountArmor(LOTRMod.wargArmorAngmar, 0.5f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityAngmarOrcArcher.class, LOTREntityAngmarWarg.class, "AngmarOrcArcher_Warg", 250, 150.0f).setMountArmor(LOTRMod.wargArmorAngmar, 0.5f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityAngmarWargBombardier.class, 400, 250.0f),
+            new LOTRUnitTradeEntry(LOTREntityTroll.class, 500, 250.0f),
+            new LOTRUnitTradeEntry(LOTREntityMountainTroll.class, 600, 350.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityAngmarBannerBearer.class, 150, 150.0f),
+            new LOTRUnitTradeEntry(LOTREntityAngmarBannerBearer.class, LOTREntityAngmarWarg.class, "Banner_Warg", 250, 250.0f).setMountArmor(LOTRMod.wargArmorAngmar, 0.5f).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries MORDOR_ORC_SLAVER = new LOTRUnitTradeEntries(200.0f,
+            new LOTRUnitTradeEntry(LOTREntityNurnSlave.class, 100, 0.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
+    @Shadow
+    public static LOTRUnitTradeEntries MORDOR_ORC_SPIDER_KEEPER = new LOTRUnitTradeEntries(250.0f,
+            new LOTRUnitTradeEntry(LOTREntityMordorSpider.class, 100, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityMordorOrc.class, 150, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityMordorOrcArcher.class, 150, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityMordorOrc.class, LOTREntityMordorSpider.class, "MordorOrc_Spider", 250, 50.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityMordorOrcArcher.class, LOTREntityMordorSpider.class, "MordorOrcArcher_Spider", 250, 100.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityNanUngolBannerBearer.class, 150, 150.0f),
+            new LOTRUnitTradeEntry(LOTREntityNanUngolBannerBearer.class, LOTREntityMordorSpider.class, "MordorOrcArcher_Spider", 250, 250.0f).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries GUNDABAD_ORC_MERCENARY_CAPTAIN = new LOTRUnitTradeEntries(100.0f,
+            new LOTRUnitTradeEntry(LOTREntityGundabadOrc.class, 100, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityGundabadOrcArcher.class, 100, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityGundabadWarg.class, 100, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityGundabadOrc.class, LOTREntityGundabadWarg.class, "GundabadOrc_Warg", 200, 100.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityGundabadOrcArcher.class, LOTREntityGundabadWarg.class, "GundabadOrcArcher_Warg", 200, 150.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityGundabadUruk.class, 500, 250.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityGundabadUrukArcher.class, 500, 300.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityGundabadBannerBearer.class, 100, 150.0f),
+            new LOTRUnitTradeEntry(LOTREntityGundabadBannerBearer.class, LOTREntityGundabadWarg.class, "Banner_Warg", 200, 250.0f).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries RANGER_NORTH_CAPTAIN = new LOTRUnitTradeEntries(300.0f,
+            new LOTRUnitTradeEntry(LOTREntityRangerNorth.class, 250, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityRangerNorth.class, LOTREntityHorse.class, "RangerNorth_Horse", 350, 100.0f),
+            new LOTRUnitTradeEntry(LOTREntityRangerNorthBannerBearer.class, 250, 150.0f));
+    @Shadow
+    public static LOTRUnitTradeEntries HOBBIT_FARMER = new LOTRUnitTradeEntries(0.0f,
+            new LOTRUnitTradeEntry(LOTREntityHobbitFarmhand.class, 100, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
+    @Shadow
+    public static LOTRUnitTradeEntries HIGH_ELF_LORD = new LOTRUnitTradeEntries(300.0f,
+            new LOTRUnitTradeEntry(LOTREntityHighElf.class, 60, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityHighElfWarrior.class, 500, 100.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityHighElfWarrior.class, LOTREntityHorse.class, "HighElfWarrior_Horse", 600, 200.0f).setMountArmor(LOTRMod.horseArmorHighElven).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityHighElfBannerBearer.class, 500, 250.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityHighElfBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 600, 350.0f).setMountArmor(LOTRMod.horseArmorHighElven).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries NEAR_HARADRIM_WARLORD = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityNearHaradrimWarrior.class, 250, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityNearHaradrimArcher.class, 250, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntitySouthronChampion.class, LOTREntityHorse.class, "SouthronChampion_Horse", 350, 100.0f).setMountArmor(LOTRMod.horseArmorNearHarad).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityNearHaradBannerBearer.class, 250, 150.0f),
+            new LOTRUnitTradeEntry(LOTREntityNearHaradBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 350, 250.0f).setMountArmor(LOTRMod.horseArmorNearHarad).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries BLUE_DWARF_COMMANDER = new LOTRUnitTradeEntries(200.0f,
+            new LOTRUnitTradeEntry(LOTREntityBlueDwarf.class, 60, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityBlueDwarfWarrior.class, 400, 50.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityBlueDwarfAxeThrower.class, 400, 100.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityBlueDwarfWarrior.class, LOTREntityWildBoar.class, "BlueDwarfWarrior_Boar", 500, 150.0f).setMountArmor(LOTRMod.boarArmorBlueDwarven).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityBlueDwarfAxeThrower.class, LOTREntityWildBoar.class, "BlueDwarfAxeThrower_Boar", 500, 200.0f).setMountArmor(LOTRMod.boarArmorBlueDwarven).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityBlueDwarfBannerBearer.class, 400, 200.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityBlueDwarfBannerBearer.class, LOTREntityWildBoar.class, "Banner_Horse", 500, 300.0f).setMountArmor(LOTRMod.boarArmorBlueDwarven).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries DOL_GULDUR_CAPTAIN = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityDolGuldurOrc.class, 150, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityDolGuldurOrcArcher.class, 150, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityMirkwoodSpider.class, 100, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityDolGuldurOrc.class, LOTREntityMirkwoodSpider.class, "DolGuldurOrc_Spider", 250, 100.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityDolGuldurOrcArcher.class, LOTREntityMirkwoodSpider.class, "DolGuldurOrcArcher_Spider", 250, 150.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityMirkTroll.class, 750, 350.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityDolGuldurBannerBearer.class, 150, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityDolGuldurBannerBearer.class, LOTREntityMirkwoodSpider.class, "DolGuldurOrc_Spider", 250, 100.0f).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries RANGER_ITHILIEN_CAPTAIN = new LOTRUnitTradeEntries(300.0f,
+            new LOTRUnitTradeEntry(LOTREntityRangerIthilien.class, 50, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityRangerIthilienBannerBearer.class, 70, 150.0f));
+    @Shadow
+    public static LOTRUnitTradeEntries HALF_TROLL_WARLORD = new LOTRUnitTradeEntries(200.0f,
+            new LOTRUnitTradeEntry(LOTREntityHalfTroll.class, 100, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityHalfTrollWarrior.class, 400, 100.0f),
+            new LOTRUnitTradeEntry(LOTREntityHalfTrollWarrior.class, LOTREntityRhino.class, "HalfTrollWarrior_Rhino", 500, 200.0f).setMountArmor(LOTRMod.rhinoArmorHalfTroll, 0.5f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityHalfTrollBannerBearer.class, 400, 150.0f),
+            new LOTRUnitTradeEntry(LOTREntityHalfTrollBannerBearer.class, LOTREntityRhino.class, "Banner_Horse", 500, 250.0f).setMountArmor(LOTRMod.rhinoArmorHalfTroll, 0.5f).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries DOL_AMROTH_CAPTAIN = new LOTRUnitTradeEntries(200.0f,
+            new LOTRUnitTradeEntry(LOTREntityDolAmrothSoldier.class, 150, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityDolAmrothArcher.class, 150, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntitySwanKnight.class, 500, 100.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityDolAmrothSoldier.class, LOTREntityHorse.class, "DolAmrothSoldier_Horse", 250, 100.0f).setMountArmor(LOTRMod.horseArmorDolAmroth, 0.5f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntitySwanKnight.class, LOTREntityHorse.class, "SwanKnight_Horse", 600, 200.0f).setMountArmor(LOTRMod.horseArmorDolAmroth).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityDolAmrothBannerBearer.class, 150, 150.0f),
+            new LOTRUnitTradeEntry(LOTREntityDolAmrothBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 250, 250.0f).setMountArmor(LOTRMod.horseArmorDolAmroth, 0.5f).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries MOREDAIN_CHIEFTAIN = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityMoredainWarrior.class, 250, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityMoredainWarrior.class, LOTREntityZebra.class, "MoredainWarrior_Zebra", 350, 100.0f),
+            new LOTRUnitTradeEntry(LOTREntityMoredainBannerBearer.class, 250, 150.0f),
+            new LOTRUnitTradeEntry(LOTREntityMoredainBannerBearer.class, LOTREntityZebra.class, "Banner_Horse", 350, 250.0f));
+    @Shadow
+    public static LOTRUnitTradeEntries ANGMAR_HILLMAN_CHIEFTAIN = new LOTRUnitTradeEntries(100.0f,
+            new LOTRUnitTradeEntry(LOTREntityAngmarHillman.class, 60, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityAngmarHillmanWarrior.class, 150, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityAngmarHillmanAxeThrower.class, 150, 100.0f),
+            new LOTRUnitTradeEntry(LOTREntityAngmarHillman.class, LOTREntityAngmarWarg.class, "AngmarHillman_Warg", 250, 100.0f),
+            new LOTRUnitTradeEntry(LOTREntityAngmarHillmanWarrior.class, LOTREntityAngmarWarg.class, "AngmarHillmanWarrior_Warg", 250, 150.0f).setMountArmor(LOTRMod.wargArmorAngmar, 0.3f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityAngmarHillmanAxeThrower.class, LOTREntityAngmarWarg.class, "AngmarHillmanAxeThrower_Warg", 250, 200.0f).setMountArmor(LOTRMod.wargArmorAngmar, 0.3f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityAngmarHillmanBannerBearer.class, 150, 200.0f),
+            new LOTRUnitTradeEntry(LOTREntityAngmarHillmanBannerBearer.class, LOTREntityAngmarWarg.class, "Banner_Warg", 250, 300.0f).setMountArmor(LOTRMod.wargArmorAngmar, 0.5f).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries TAUREDAIN_CHIEFTAIN = new LOTRUnitTradeEntries(200.0f,
+            new LOTRUnitTradeEntry(LOTREntityTauredainWarrior.class, 250, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityTauredainBlowgunner.class, 250, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityTauredainBannerBearer.class, 250, 150.0f));
+    @Shadow
+    public static LOTRUnitTradeEntries TAUREDAIN_FARMER = new LOTRUnitTradeEntries(0.0f,
+            new LOTRUnitTradeEntry(LOTREntityTauredainFarmhand.class, 100, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
+    @Shadow
+    public static LOTRUnitTradeEntries DALE_CAPTAIN = new LOTRUnitTradeEntries(100.0f,
+            new LOTRUnitTradeEntry(LOTREntityDaleLevyman.class, 150, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityDaleSoldier.class, 250, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityDaleArcher.class, 250, 100.0f),
+            new LOTRUnitTradeEntry(LOTREntityDaleSoldier.class, LOTREntityHorse.class, "DaleSoldier_Horse", 350, 150.0f).setMountArmor(LOTRMod.horseArmorDale).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityDaleBannerBearer.class, 250, 200.0f),
+            new LOTRUnitTradeEntry(LOTREntityDaleBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 350, 300.0f).setMountArmor(LOTRMod.horseArmorDale).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityEsgarothBannerBearer.class, 250, 200.0f),
+            new LOTRUnitTradeEntry(LOTREntityEsgarothBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 350, 300.0f).setMountArmor(LOTRMod.horseArmorDale).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries DORWINION_CAPTAIN = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityDorwinionGuard.class, 250, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityDorwinionCrossbower.class, 250, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityDorwinionBannerBearer.class, 250, 150.0f));
+    @Shadow
+    public static LOTRUnitTradeEntries DORWINION_ELF_CAPTAIN = new LOTRUnitTradeEntries(250.0f,
+            new LOTRUnitTradeEntry(LOTREntityDorwinionElfWarrior.class, 500, 0.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityDorwinionElfArcher.class, 500, 50.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityDorwinionElfBannerBearer.class, 500, 150.0f).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries DORWINION_VINEKEEPER = new LOTRUnitTradeEntries(0.0f,
+            new LOTRUnitTradeEntry(LOTREntityDorwinionVinehand.class, 100, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
+    @Shadow
+    public static LOTRUnitTradeEntries LOSSARNACH_CAPTAIN = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityGondorLevyman.class, 150, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityLossarnachAxeman.class, 250, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityLossarnachBannerBearer.class, 250, 200.0f));
+    @Shadow
+    public static LOTRUnitTradeEntries PELARGIR_CAPTAIN = new LOTRUnitTradeEntries(200.0f,
+            new LOTRUnitTradeEntry(LOTREntityLebenninLevyman.class, 150, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityPelargirMarine.class, 200, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityPelargirBannerBearer.class, 250, 200.0f));
+    @Shadow
+    public static LOTRUnitTradeEntries PINNATH_GELIN_CAPTAIN = new LOTRUnitTradeEntries(200.0f,
+            new LOTRUnitTradeEntry(LOTREntityGondorLevyman.class, 150, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityPinnathGelinSoldier.class, 200, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityPinnathGelinSoldier.class, LOTREntityHorse.class, "PinnathGelinSoldier_Horse", 350, 150.0f).setMountArmor(LOTRMod.horseArmorGondor).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityPinnathGelinBannerBearer.class, 250, 200.0f),
+            new LOTRUnitTradeEntry(LOTREntityPinnathGelinBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 350, 300.0f).setMountArmor(LOTRMod.horseArmorGondor).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries BLACKROOT_CAPTAIN = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityGondorLevyman.class, 150, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityBlackrootSoldier.class, 250, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityBlackrootArcher.class, 200, 100.0f),
+            new LOTRUnitTradeEntry(LOTREntityBlackrootSoldier.class, LOTREntityHorse.class, "BlackrootSoldier_Horse", 350, 150.0f).setMountArmor(LOTRMod.horseArmorGondor).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityBlackrootBannerBearer.class, 250, 200.0f),
+            new LOTRUnitTradeEntry(LOTREntityBlackrootBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 350, 300.0f).setMountArmor(LOTRMod.horseArmorGondor).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries GONDOR_FARMER = new LOTRUnitTradeEntries(0.0f,
+            new LOTRUnitTradeEntry(LOTREntityGondorFarmhand.class, 100, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
+    @Shadow
+    public static LOTRUnitTradeEntries LEBENNIN_CAPTAIN = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityLebenninLevyman.class, 100, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityGondorSoldier.class, 250, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityGondorArcher.class, 250, 100.0f),
+            new LOTRUnitTradeEntry(LOTREntityLebenninBannerBearer.class, 150, 150.0f));
+    @Shadow
+    public static LOTRUnitTradeEntries LAMEDON_CAPTAIN = new LOTRUnitTradeEntries(200.0f,
+            new LOTRUnitTradeEntry(LOTREntityLamedonHillman.class, 150, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityLamedonSoldier.class, 200, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityLamedonArcher.class, 250, 100.0f),
+            new LOTRUnitTradeEntry(LOTREntityLamedonSoldier.class, LOTREntityHorse.class, "LamedonSoldier_Horse", 300, 150.0f).setMountArmor(LOTRMod.horseArmorLamedon).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityLamedonBannerBearer.class, 250, 200.0f),
+            new LOTRUnitTradeEntry(LOTREntityLamedonBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 300, 300.0f).setMountArmor(LOTRMod.horseArmorLamedon).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries ROHAN_FARMER = new LOTRUnitTradeEntries(0.0f,
+            new LOTRUnitTradeEntry(LOTREntityRohanFarmhand.class, 100, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
+    @Shadow
+    public static LOTRUnitTradeEntries EASTERLING_WARLORD = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityEasterlingLevyman.class, 150, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityEasterlingWarrior.class, 250, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityEasterlingArcher.class, 250, 100.0f),
+            new LOTRUnitTradeEntry(LOTREntityEasterlingGoldWarrior.class, 500, 200.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityEasterlingWarrior.class, LOTREntityHorse.class, "EasterlingWarrior_Horse", 350, 150.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityEasterlingArcher.class, LOTREntityHorse.class, "EasterlingArcher_Horse", 350, 200.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityEasterlingGoldWarrior.class, LOTREntityHorse.class, "EasterlingGoldWarrior_Horse", 600, 300.0f).setMountArmor(LOTRMod.horseArmorRhunGold).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityEasterlingFireThrower.class, 260, 150.0f),
+            new LOTRUnitTradeEntry(LOTREntityEasterlingBannerBearer.class, 250, 200.0f),
+            new LOTRUnitTradeEntry(LOTREntityEasterlingBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 350, 150.0f).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries EASTERLING_FARMER = new LOTRUnitTradeEntries(0.0f,
+            new LOTRUnitTradeEntry(LOTREntityEasterlingFarmhand.class, 100, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
+    @Shadow
+    public static LOTRUnitTradeEntries RIVENDELL_LORD = new LOTRUnitTradeEntries(300.0f,
+            new LOTRUnitTradeEntry(LOTREntityRivendellElf.class, 60, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityRivendellWarrior.class, 500, 100.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityRivendellWarrior.class, LOTREntityHorse.class, "RivendellWarrior_Horse", 600, 200.0f).setMountArmor(LOTRMod.horseArmorRivendell).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityRivendellBannerBearer.class, 500, 250.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityRivendellBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 600, 350.0f).setMountArmor(LOTRMod.horseArmorRivendell).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries HARNEDOR_WARLORD = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityHarnedorWarrior.class, 250, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityHarnedorArcher.class, 200, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityHarnedorWarrior.class, LOTREntityHorse.class, "HarnedorWarrior_Horse", 350, 100.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityHarnedorArcher.class, LOTREntityHorse.class, "HarnedorArcher_Horse", 300, 150.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityHarnedorBannerBearer.class, 250, 150.0f),
+            new LOTRUnitTradeEntry(LOTREntityHarnedorBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 350, 250.0f).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries UMBAR_CAPTAIN = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityUmbarWarrior.class, 250, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityUmbarArcher.class, 250, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityUmbarWarrior.class, LOTREntityHorse.class, "UmbarWarrior_Horse", 350, 100.0f).setMountArmor(LOTRMod.horseArmorUmbar).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityUmbarBannerBearer.class, 250, 150.0f),
+            new LOTRUnitTradeEntry(LOTREntityUmbarBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 350, 250.0f).setMountArmor(LOTRMod.horseArmorUmbar).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries CORSAIR_CAPTAIN = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityCorsair.class, 200, 0.0f).setExtraInfo("Corsair"));
+    @Shadow
+    public static LOTRUnitTradeEntries NOMAD_WARLORD = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityNomadWarrior.class, 150, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityNomadArcher.class, 150, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityNomadWarrior.class, LOTREntityCamel.class, "NomadWarrior_Camel", 250, 100.0f),
+            new LOTRUnitTradeEntry(LOTREntityNomadArcher.class, LOTREntityCamel.class, "NomadArcher_Camel", 250, 150.0f),
+            new LOTRUnitTradeEntry(LOTREntityNomadBannerBearer.class, 150, 150.0f),
+            new LOTRUnitTradeEntry(LOTREntityNomadBannerBearer.class, LOTREntityCamel.class, "Banner_Horse", 250, 250.0f));
+    @Shadow
+    public static LOTRUnitTradeEntries GULF_WARLORD = new LOTRUnitTradeEntries(150.0f,
+            new LOTRUnitTradeEntry(LOTREntityGulfHaradWarrior.class, 200, 0.0f),
+            new LOTRUnitTradeEntry(LOTREntityGulfHaradArcher.class, 250, 50.0f),
+            new LOTRUnitTradeEntry(LOTREntityGulfHaradWarrior.class, LOTREntityHorse.class, "GulfWarrior_Horse", 300, 100.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityGulfHaradArcher.class, LOTREntityHorse.class, "GulfArcher_Horse", 350, 150.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityGulfHaradBannerBearer.class, 250, 150.0f),
+            new LOTRUnitTradeEntry(LOTREntityGulfHaradBannerBearer.class, LOTREntityHorse.class, "GulfWarrior_Horse", 350, 250.0f).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries CORSAIR_SLAVER = new LOTRUnitTradeEntries(0.0f,
+            new LOTRUnitTradeEntry(LOTREntityHaradSlave.class, 100, 0.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
+    @Shadow
+    public static LOTRUnitTradeEntries HARNEDOR_FARMER = new LOTRUnitTradeEntries(0.0f,
+            new LOTRUnitTradeEntry(LOTREntityHarnedorFarmhand.class, 100, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
+    @Shadow
+    public static LOTRUnitTradeEntries BLACK_URUK_CAPTAIN = new LOTRUnitTradeEntries(400.0f,
+            new LOTRUnitTradeEntry(LOTREntityBlackUruk.class, 500, 250.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityBlackUrukArcher.class, 500, 300.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityOlogHai.class, 800, 350.0f).setPledgeExclusive(),
+            new LOTRUnitTradeEntry(LOTREntityBlackUrukBannerBearer.class, 500, 400.0f).setPledgeExclusive());
+    @Shadow
+    public static LOTRUnitTradeEntries BREE_FARMER = new LOTRUnitTradeEntries(0.0f,
+            new LOTRUnitTradeEntry(LOTREntityBreeFarmhand.class, 40, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
+    @Final
+    @Shadow
+    public static final int MOREDAIN_MERCENARY_COST = 200;
+
+}

src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRUnitTradeEntry.java

@@ -0,0 +1,40 @@
+package com.zivilon.cinder_loe.mixins.overrides;
+
+import lotr.common.entity.npc.LOTRHireableBase;
+import lotr.common.entity.npc.LOTRUnitTradeEntry;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraftforge.common.config.Configuration;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.io.File;
+
+@Mixin(LOTRUnitTradeEntry.class)
+public class MixinLOTRUnitTradeEntry implements ILOTRUnitTradeEntry {
+    @Shadow private LOTRUnitTradeEntry.PledgeType pledgeType;
+
+    @Override
+    public LOTRUnitTradeEntry setObjective(String objective) {
+        Configuration config = new Configuration(new File("CinderLoE.cfg"));
+        boolean isObjectiveComplete =  config.getBoolean(objective, Configuration.CATEGORY_GENERAL, false, "Set true if " + objective + " is complete");
+
+        if (!isObjectiveComplete) {
+            this.pledgeType = LOTRUnitTradeEntry.PledgeType.NONE;
+        }
+        return  (LOTRUnitTradeEntry) (Object) this;
+    }
+
+    @Inject(method = "hasRequiredCostAndAlignment", at = @At("HEAD"), cancellable = true, remap = false)
+    private void checkObjectiveBeforeHiring(EntityPlayer entityPlayer, LOTRHireableBase trader, CallbackInfoReturnable<Boolean> cir) {
+        Configuration config = new Configuration(new File("CinderLoE.cfg"));
+        boolean isObjectiveComplete = config.getBoolean("objective_key", Configuration.CATEGORY_GENERAL, false, "Set true if the objective is complete");
+
+        if (!isObjectiveComplete) {
+            cir.setReturnValue(false);
+        }
+    }
+
+}

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

@@ -32,7 +32,7 @@ public class recipes {
         registerArnorRecipes();
         registerAngmarRecipes();
         ForgingRecipes.register_recipes();
-        registerBrewingRecipes();
+        //registerBrewingRecipes();
     }
 
     public static void registerGeneralRecipes() {
@@ -148,7 +148,7 @@ public class recipes {
         OreDictionary.registerOre("meat", LOTRMod.zebraCooked);
 
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.fruitsalad), Items.bowl, "fruit1", "fruit2", "fruit3"));
-        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.pasta, 4), LOTRMod.rollingPin, CinderLoE.dough, CinderLoE.dough));
+        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.pasta, 4), new ItemStack(LOTRMod.rollingPin, 1, OreDictionary.WILDCARD_VALUE), CinderLoE.dough, CinderLoE.dough));
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.halva), Items.sugar, CinderLoE.dough, CinderLoE.spice, LOTRMod.almond));
 
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.chocolatebar, 2), LOTRMod.mugChocolate));
@@ -324,7 +324,7 @@ public class recipes {
         LOTRRecipes.rangerRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.maceArnor), " XX", " XX", "Y  ",
                 Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), "stickWood"));
     }
-    public static void registerBrewingRecipes() {
+    //public static void registerBrewingRecipes() {
-        MixinLOTRBrewingRecipes.addRecipe(new ItemStack(CinderLoE.mugDemonicHealthPotion, 2), new Object[] { CinderLoE.demonbloodVial, new ItemStack(LOTRMod.tallGrass, 1, 4), new ItemStack(LOTRMod.tallGrass, 1, 4), new ItemStack(LOTRMod.tallGrass, 1, 4), CinderLoE.chocolatebar, CinderLoE.chocolatebar });
+    //    MixinLOTRBrewingRecipes.addRecipe(new ItemStack(CinderLoE.mugDemonicHealthPotion, 2), new Object[] { CinderLoE.demonbloodVial, new ItemStack(LOTRMod.tallGrass, 1, 4), new ItemStack(LOTRMod.tallGrass, 1, 4), new ItemStack(LOTRMod.tallGrass, 1, 4), CinderLoE.chocolatebar, CinderLoE.chocolatebar });
-    }
+    //}
 }

src/main/resources/assets/cinder_loe/lang/en_US.lang

@@ -260,6 +260,8 @@ lotr.unit.Bree_Horse=Bree-land Outrider
 entity.cinder_loe.LOTREntitySauron.name=Sauron
 entity.cinder_loe.UtumnoSlaveTrader.bound.name=Slave Mule
 entity.cinder_loe.UtumnoSlaveTrader.name=Freed Utumno Trader
+entity.cinder_loe.HobbitBannerBearer.name=Hobbit Banner Bearer
+entity.cinder_loe.MorgulOrc.name=Minas Morgul Orc
 
 lotr.enchant.protectWeak1=Dented
 lotr.enchant.protectWeak2=Defective
@@ -267,3 +269,6 @@ lotr.enchant.protectRangedWeak1=Punctured
 lotr.enchant.protectRangedWeak2=Pierced
 lotr.enchant.weak4=Bent
 lotr.enchant.rangedWeak3=Cracked
+
+lotr.unit.Banner_Warg=Warg Rider Banner
+lotr.unit.Banner_Horse=Mounted Banner Bearer

src/main/resources/mixins.cinder_loe.json

@@ -6,15 +6,22 @@
   "target": "@env(DEFAULT)",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
+    "MixinEnchantmentHelper",
+    "MixinEntity",
+    "MixinEntityArrow",
+    "MixinEntityLivingBase",
     "MixinItemRenderer",
-    "overrides.MixinLOTRReplacedMethods",
-    "overrides.MixinLOTRHiredNPCInfo",
-    "MixinLOTREnchantment",
     "MixinLOTRArmorModels",
+    "MixinLOTRBrewingRecipes",
     "MixinLOTRClientProxy",
     "MixinLOTRContainerAnvil",
+    "MixinLOTREnchantment",
+    "MixinLOTREnchantmentType",
+    "MixinLOTREntityAINearestAttackableTargetBasic",
+    "MixinLOTREntityProjectileBase",
     "MixinLOTREntitySauron",
     "MixinLOTRIntCache",
+    "MixinLOTRItemRendererManager",
     "MixinLOTRNPCRendering",
     "MixinLOTRRenderArmorStand",
     "MixinLOTRRenderBlownItem",
@@ -35,15 +42,10 @@
     "MixinRendererLivingEntity",
     "MixinRenderItem",
     "MixinSlotCrafting",
-    "MixinLOTREnchantmentType",
+    "overrides.MixinLOTRHiredNPCInfo",
-    "MixinEntity",
+    "overrides.MixinLOTRReplacedMethods",
-    "MixinEnchantmentHelper",
+    "overrides.MixinLOTRUnitTradeEntries",
-    "MixinEntityArrow",
+    "overrides.MixinLOTRUnitTradeEntry"
-    "MixinLOTREntityProjectileBase",
+  ],
-    "MixinLOTREntityAINearestAttackableTargetBasic",
-    "MixinLOTRItemRendererManager",
-    "MixinEntityLivingBase",
-    "MixinLOTRBrewingRecipes"
-    ],
   "client": []
 }