Orc Brewer causes you to crash because you shouldnt be trading with him anyways!!

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/AngmarOrcBrewer.java

@@ -20,30 +20,23 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 public class AngmarOrcBrewer extends AngmarOrcButcher implements LOTRTradeable {
-    public static LOTRTradeEntries ANGMAR_BUTCHER_BUY;
+    public static LOTRTradeEntries ANGMAR_BREWER_BUY;
-    public static LOTRTradeEntries ANGMAR_BUTCHER_SELL;
+    public static LOTRTradeEntries ANGMAR_BREWER_SELL;
 
     public AngmarOrcBrewer(World world) {
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerAngmarPoisoned));
-        this.npcItemsInv.setIdleItem(new ItemStack(LOTRMod.mugOrcDraught));
-        return data;
-    }
-
     public LOTRTradeEntries getBuyPool() {
-        return ANGMAR_BUTCHER_BUY;
+        return ANGMAR_BREWER_BUY;
     }
 
     public LOTRTradeEntries getSellPool() {
-        return ANGMAR_BUTCHER_SELL;
+        return ANGMAR_BREWER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerAngmarPoisoned));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));
@@ -55,10 +48,10 @@ public class AngmarOrcBrewer extends AngmarOrcButcher implements LOTRTradeable {
 
 
     static {
-        ANGMAR_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY,
+        ANGMAR_BREWER_BUY = new LOTRTradeEntries(TradeType.BUY,
-                new LOTRTradeEntry(new ItemStack(LOTRMod.mugOrcDraught, 1, 9999), 8),
+                new LOTRTradeEntry(new ItemStack(LOTRMod.mugOrcDraught, 1, 2), 8),
-                new LOTRTradeEntry(new ItemStack(LOTRMod.mugOrcDraught, 1, 9999), 8),
+                new LOTRTradeEntry(new ItemStack(LOTRMod.mugOrcDraught, 1, 2), 8),
-                new LOTRTradeEntry(new ItemStack(LOTRMod.mugOrcDraught, 1, 9999), 8),
+                new LOTRTradeEntry(new ItemStack(LOTRMod.mugOrcDraught, 1, 3), 8),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugOrcDraught, 1, 4), 8),
                 new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugOrcDraught, 1, 3), 180),
                 new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugOrcDraught, 1, 4), 300),
@@ -68,7 +61,7 @@ public class AngmarOrcBrewer extends AngmarOrcButcher implements LOTRTradeable {
                 new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 2), 6666));
         ((MixinLOTRTradeEntries)ANGMAR_BUTCHER_BUY).vessels(LOTRFoods.ORC_DRINK);
 
-        ANGMAR_BUTCHER_SELL = new LOTRTradeEntries(TradeType.SELL,
+        ANGMAR_BREWER_SELL = new LOTRTradeEntries(TradeType.SELL,
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mug), 1),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.waterskin), 2),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.barrel), 10),

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/AngmarOrcButcher.java

@@ -24,13 +24,6 @@ public class AngmarOrcButcher extends LOTREntityAngmarOrcTrader implements LOTRT
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.axeAngmar));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
-        return data;
-    }
-
     public LOTRTradeEntries getBuyPool() {
         return ANGMAR_BUTCHER_BUY;
     }
@@ -39,8 +32,8 @@ public class AngmarOrcButcher extends LOTREntityAngmarOrcTrader implements LOTRT
         return ANGMAR_BUTCHER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.axeAngmar));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/AngmarOrcSmith.java

@@ -18,30 +18,23 @@ import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 
 public class AngmarOrcSmith extends AngmarOrcButcher implements LOTRTradeable.Smith {
-    public static LOTRTradeEntries ANGMAR_BUTCHER_BUY;
+    public static LOTRTradeEntries ANGMAR_SMITH_BUY;
-    public static LOTRTradeEntries ANGMAR_BUTCHER_SELL;
+    public static LOTRTradeEntries ANGMAR_SMITH_SELL;
 
     public AngmarOrcSmith(World world) {
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.blacksmithHammer));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
-        return data;
-    }
-
     public LOTRTradeEntries getBuyPool() {
-        return ANGMAR_BUTCHER_BUY;
+        return ANGMAR_SMITH_BUY;
     }
 
     public LOTRTradeEntries getSellPool() {
-        return ANGMAR_BUTCHER_SELL;
+        return ANGMAR_SMITH_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.blacksmithHammer));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));
@@ -61,7 +54,7 @@ public class AngmarOrcSmith extends AngmarOrcButcher implements LOTRTradeable.Sm
 
 
     static {
-        ANGMAR_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY,
+        ANGMAR_SMITH_BUY = new LOTRTradeEntries(TradeType.BUY,
                 new LOTRTradeEntry(new ItemStack(CinderLoE.helmetRhudaur), 22),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.bodyRhudaur), 32),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.legsRhudaur), 28),
@@ -86,7 +79,7 @@ public class AngmarOrcSmith extends AngmarOrcButcher implements LOTRTradeable.Sm
                 new LOTRTradeEntry(new ItemStack(Items.arrow, 4), 3),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.wargArmorAngmar), 25));
 
-        ANGMAR_BUTCHER_SELL = new LOTRTradeEntries(TradeType.SELL,
+        ANGMAR_SMITH_SELL = new LOTRTradeEntries(TradeType.SELL,
                 new LOTRTradeEntry(new ItemStack(LOTRMod.orcSteel), 3),
                 new LOTRTradeEntry(new ItemStack(Items.string, 3), 1),
                 new LOTRTradeEntry(new ItemStack(Items.iron_ingot), 3),

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/DolGuldurOrcBrewer.java

@@ -24,12 +24,6 @@ public class DolGuldurOrcBrewer extends DolGuldurOrcButcher implements LOTRTrade
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerDolGuldurPoisoned));
-        this.npcItemsInv.setIdleItem(new ItemStack(LOTRMod.mugOrcDraught));
-        return data;
-    }
 
     public LOTRTradeEntries getBuyPool() {
         return ANGMAR_BUTCHER_BUY;
@@ -39,8 +33,8 @@ public class DolGuldurOrcBrewer extends DolGuldurOrcButcher implements LOTRTrade
         return ANGMAR_BUTCHER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerDolGuldurPoisoned));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/DolGuldurOrcButcher.java

@@ -21,13 +21,6 @@ public class DolGuldurOrcButcher extends LOTREntityDolGuldurOrcTrader implements
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.axeDolGuldur));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
-        return data;
-    }
-
     public LOTRTradeEntries getBuyPool() {
         return DOLGULDUR_BUTCHER_BUY;
     }
@@ -36,8 +29,8 @@ public class DolGuldurOrcButcher extends LOTREntityDolGuldurOrcTrader implements
         return DOLGULDUR_BUTCHER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.axeDolGuldur));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/DolGuldurOrcSmith.java

@@ -24,12 +24,6 @@ public class DolGuldurOrcSmith extends DolGuldurOrcButcher implements LOTRTradea
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.blacksmithHammer));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
-        return data;
-    }
 
     public LOTRTradeEntries getBuyPool() {
         return ANGMAR_BUTCHER_BUY;
@@ -39,8 +33,8 @@ public class DolGuldurOrcSmith extends DolGuldurOrcButcher implements LOTRTradea
         return ANGMAR_BUTCHER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.blacksmithHammer));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/GundabadOrcBrewer.java

@@ -24,12 +24,6 @@ public class GundabadOrcBrewer extends GundabadOrcButcher implements LOTRTradeab
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerGundabadUrukPoisoned));
-        this.npcItemsInv.setIdleItem(new ItemStack(LOTRMod.mugOrcDraught));
-        return data;
-    }
 
     public LOTRTradeEntries getBuyPool() {
         return ANGMAR_BUTCHER_BUY;
@@ -39,8 +33,8 @@ public class GundabadOrcBrewer extends GundabadOrcButcher implements LOTRTradeab
         return ANGMAR_BUTCHER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerGundabadUrukPoisoned));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/GundabadOrcButcher.java

@@ -22,12 +22,6 @@ public class GundabadOrcButcher extends LOTREntityGundabadOrcTrader implements L
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.axeBronze));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
-        return data;
-    }
 
     public LOTRTradeEntries getBuyPool() {
         return GUNDABAD_BUTCHER_BUY;
@@ -37,8 +31,8 @@ public class GundabadOrcButcher extends LOTREntityGundabadOrcTrader implements L
         return GUNDABAD_BUTCHER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.axeBronze));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/GundabadOrcSmith.java

@@ -34,12 +34,6 @@ public class GundabadOrcSmith extends GundabadOrcButcher implements LOTRTradeabl
         this.getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(24.0);
         this.getEntityAttribute(npcRangedAccuracy).setBaseValue(0.5);
     }
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.blacksmithHammer));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
-        return data;
-    }
 
     public LOTRTradeEntries getBuyPool() {
         return ANGMAR_BUTCHER_BUY;
@@ -49,8 +43,8 @@ public class GundabadOrcSmith extends GundabadOrcButcher implements LOTRTradeabl
         return ANGMAR_BUTCHER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.blacksmithHammer));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/HalfTrollBrewer.java

@@ -25,13 +25,6 @@ public class HalfTrollBrewer extends HalfTrollButcher implements LOTRTradeable {
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerHalfTrollPoisoned));
-        this.npcItemsInv.setIdleItem(new ItemStack(LOTRMod.mugTorogDraught));
-        return data;
-    }
-
     public LOTRTradeEntries getBuyPool() {
         return ANGMAR_BUTCHER_BUY;
     }
@@ -40,8 +33,8 @@ public class HalfTrollBrewer extends HalfTrollButcher implements LOTRTradeable {
         return ANGMAR_BUTCHER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerHalfTrollPoisoned));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
                 this.setCurrentItemOrArmor(4, new ItemStack(LOTRMod.helmetHalfTroll));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/HalfTrollButcher.java

@@ -21,13 +21,6 @@ public class HalfTrollButcher extends LOTREntityHalfTrollScavenger implements LO
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.battleaxeHalfTroll));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
-        return data;
-    }
-
     public LOTRTradeEntries getBuyPool() {
         return HALF_TROLL_BUTCHER_BUY;
     }
@@ -36,8 +29,8 @@ public class HalfTrollButcher extends LOTREntityHalfTrollScavenger implements LO
         return HALF_TROLL_BUTCHER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.battleaxeHalfTroll));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(3, new ItemStack(LOTRMod.bodyHalfTroll));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/IsengardOrcBrewer.java

@@ -24,13 +24,6 @@ public class IsengardOrcBrewer extends IsengardOrcButcher implements LOTRTradeab
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerUrukPoisoned));
-        this.npcItemsInv.setIdleItem(new ItemStack(LOTRMod.mugOrcDraught));
-        return data;
-    }
-
     public LOTRTradeEntries getBuyPool() {
         return ANGMAR_BUTCHER_BUY;
     }
@@ -39,8 +32,8 @@ public class IsengardOrcBrewer extends IsengardOrcButcher implements LOTRTradeab
         return ANGMAR_BUTCHER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerUrukPoisoned));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/IsengardOrcButcher.java

@@ -22,12 +22,6 @@ public class IsengardOrcButcher extends LOTREntityIsengardSnaga implements LOTRT
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.axeUruk));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
-        return data;
-    }
 
     public LOTRTradeEntries getBuyPool() {
         return URUK_BUTCHER_BUY;
@@ -37,8 +31,8 @@ public class IsengardOrcButcher extends LOTREntityIsengardSnaga implements LOTRT
         return URUK_BUTCHER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.axeUruk));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/IsengardOrcSmith.java

@@ -24,13 +24,6 @@ public class IsengardOrcSmith extends LOTREntityUrukHaiTrader implements LOTRTra
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.blacksmithHammer));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
-        return data;
-    }
-
     public LOTRTradeEntries getBuyPool() {
         return ANGMAR_BUTCHER_BUY;
     }
@@ -39,8 +32,8 @@ public class IsengardOrcSmith extends LOTREntityUrukHaiTrader implements LOTRTra
         return ANGMAR_BUTCHER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.blacksmithHammer));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(Items.leather_boots));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/MordorOrcBrewer.java

@@ -24,12 +24,6 @@ public class MordorOrcBrewer extends MordorOrcButcher implements LOTRTradeable {
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerOrcPoisoned));
-        this.npcItemsInv.setIdleItem(new ItemStack(LOTRMod.mugOrcDraught));
-        return data;
-    }
 
     public LOTRTradeEntries getBuyPool() {
         return ANGMAR_BUTCHER_BUY;
@@ -39,8 +33,8 @@ public class MordorOrcBrewer extends MordorOrcButcher implements LOTRTradeable {
         return ANGMAR_BUTCHER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerOrcPoisoned));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/MordorOrcButcher.java

@@ -21,13 +21,6 @@ public class MordorOrcButcher extends LOTREntityMordorOrcTrader implements LOTRT
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.axeOrc));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
-        return data;
-    }
-
     public LOTRTradeEntries getBuyPool() {
         return MORDOR_BUTCHER_BUY;
     }
@@ -36,8 +29,8 @@ public class MordorOrcButcher extends LOTREntityMordorOrcTrader implements LOTRT
         return MORDOR_BUTCHER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.axeOrc));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/MordorOrcSmith.java

@@ -24,13 +24,6 @@ public class MordorOrcSmith extends MordorOrcButcher implements LOTRTradeable.Sm
         super(world);
     }
 
-    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.onSpawnWithEgg(data);
-        this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.blacksmithHammer));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
-        return data;
-    }
-
     public LOTRTradeEntries getBuyPool() {
         return ANGMAR_BUTCHER_BUY;
     }
@@ -39,8 +32,8 @@ public class MordorOrcSmith extends MordorOrcButcher implements LOTRTradeable.Sm
         return ANGMAR_BUTCHER_SELL;
     }
 
-    public IEntityLivingData func_110161_a(IEntityLivingData data) {
+    public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
-        data = super.func_110161_a(data);
+        data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.blacksmithHammer));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));