Fixed mixin harmless mixin warnings and organized mixin classes.

build.gradle

@@ -76,7 +76,7 @@ minecraft {
     }
 
     if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
-        extraRunJvmArguments.add("-Dmixin.env.disableRefMap=true")
+        extraRunJvmArguments.add("-Dmixin.env.disableRefMap=true ")
     }
 
     if (coreModClass) {
@@ -84,6 +84,20 @@ minecraft {
     }
 }
 
+tasks.withType(JavaCompile).configureEach {
+    options.fork = true
+
+    options.forkOptions.jvmArgs += [
+        "-Dmixin.env.verbose=false",
+        "-Dmixin.debug=false"
+    ]
+
+    options.compilerArgs += [
+        "-AdisableOverwriteChecker=true",
+        "-Xlint:-deprecation",
+        "-Xlint:-unchecked"
+    ]
+}
 
 repositories {
     flatDir { dirs 'libs' }

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

@@ -23,5 +23,4 @@ public class CinderAchievement {
         spiceDwarfBrew = new LOTRAchievement(LOTRAchievement.Category.GENERAL, 83,CinderLoE.spiceDwarven , "spiceDwarfBrew");
         Overdose = new LOTRAchievement(LOTRAchievement.Category.GENERAL, 84, LOTRMod.barrel , "Overdose");
     }
-
 }

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

@@ -2,7 +2,7 @@ package com.zivilon.cinder_loe.entity.npc.orc.trader;
 
 import com.zivilon.cinder_loe.CinderLoE;
 import com.zivilon.cinder_loe.mixins.MixinLOTRTradeEntries;
-import com.zivilon.cinder_loe.mixins.overrides.MixinLOTRTradeEntriesOverrides;
+import com.zivilon.cinder_loe.mixins.MixinLOTRTradeEntriesOverrides;
 import lotr.common.LOTRAchievement;
 import lotr.common.LOTRFoods;
 import lotr.common.LOTRLevelData;

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

@@ -1,7 +1,7 @@
 package com.zivilon.cinder_loe.entity.npc.orc.trader;
 
 import com.zivilon.cinder_loe.CinderLoE;
-import com.zivilon.cinder_loe.mixins.overrides.MixinLOTRTradeEntriesOverrides;
+import com.zivilon.cinder_loe.mixins.MixinLOTRTradeEntriesOverrides;
 import lotr.common.LOTRAchievement;
 import lotr.common.LOTRFoods;
 import lotr.common.LOTRLevelData;

src/main/java/com/zivilon/cinder_loe/mixins/lotr/client/gui/MixinLOTRGuiTrade.java

@@ -25,13 +25,17 @@ import java.util.Map;
 
 @Mixin(LOTRGuiTrade.class)
 public abstract class MixinLOTRGuiTrade {
-    @Shadow
+    @Shadow(remap = false)
     private void renderCost(String s, int x, int y) {}
-    @Shadow
+    @Shadow(remap = false)
     private static int lockedTradeColor = -1610612736;
-    @Shadow
+    @Shadow(remap = false)
     private void drawCenteredString(String s, int i, int j, int k) {}
 
+    /**
+     * @author Shinare
+     * @reason Made spices show up permanently locked after being bought
+     */
     @Overwrite(remap = false)
     private void renderTradeSlot(LOTRSlotTrade slot) {
         LOTRTradeEntry trade = slot.getTrade();

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/coremod/MixinLOTRReplacedMethods.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.mixins.overrides;
+package com.zivilon.cinder_loe.mixins;
 
 import lotr.common.coremod.LOTRReplacedMethods;
 import lotr.common.enchant.LOTREnchantmentHelper;

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/enchant/MixinLOTREnchantmenHelper.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.mixins.overrides;
+package com.zivilon.cinder_loe.mixins;
 
 import lotr.common.enchant.LOTREnchantment;
 import lotr.common.enchant.LOTREnchantmentHelper;

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/enchant/MixinLOTREnchantment.java

@@ -19,7 +19,7 @@ import java.util.Map;
 
 @Mixin(LOTREnchantment.class)
 public class MixinLOTREnchantment {
-    @Shadow
+    @Shadow(remap = false)
     private boolean bypassAnvilLimit;
 
     @Inject(method = "<clinit>", at = @At("TAIL"))

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/enchant/MixinLOTREnchantmentWeaponSpecial.java

@@ -23,6 +23,10 @@ public abstract class MixinLOTREnchantmentWeaponSpecial extends LOTREnchantment
         super(s, type);
     }
 
+    /**
+     * @author Shinare
+     * @reason Made Wrathful exclusive to heavy weapons
+     */
     @Overwrite(remap = false)
     public boolean canApply(ItemStack itemstack, boolean considering) {
         if (super.canApply(itemstack, considering)) {

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/entity/ai/MixinLOTREntityAIAttackOnCollide.java

@@ -41,8 +41,12 @@ public class MixinLOTREntityAIAttackOnCollide {
     public UUID leader_id;
     public Entity leader;
 
-    @Overwrite
+    /**
-    public void updateTask() {
+     * @author Shinare
+     * @reason If warband leader is too far, move to leader instead of attacking target
+     */
+    @Overwrite(remap = false)
+    public void func_75246_d() { // updateTask()
         if (warband_task()) return;
         update_vanilla_task();
     }

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/entity/ai/MixinLOTREntityAINearestAttackableTargetBasic.java

@@ -36,11 +36,16 @@ import lotr.common.enchant.LOTREnchantmentHelper;
 @Mixin(LOTREntityAINearestAttackableTargetBasic.class)
 public abstract class MixinLOTREntityAINearestAttackableTargetBasic extends EntityAITarget {
 
-    @Shadow private final Class targetClass;
+    @Shadow(remap = false)
-    @Shadow private EntityLivingBase targetEntity;
+    private final Class targetClass;
-    @Shadow private final TargetSorter targetSorter;
+    @Shadow(remap = false)
-    @Shadow private final IEntitySelector targetSelector;
+    private EntityLivingBase targetEntity;
-    @Shadow private final int targetChance;
+    @Shadow(remap = false)
+    private final TargetSorter targetSorter;
+    @Shadow(remap = false)
+    private final IEntitySelector targetSelector;
+    @Shadow(remap = false)
+    private final int targetChance;
 
     public MixinLOTREntityAINearestAttackableTargetBasic(EntityCreature p_i1669_1_, boolean p_i1669_2_) {
         super(p_i1669_1_, p_i1669_2_);
@@ -51,8 +56,12 @@ public abstract class MixinLOTREntityAINearestAttackableTargetBasic extends Enti
         targetChance = 0;
     }
 
-    @Overwrite(remap = true)
+    /**
-    public boolean shouldExecute() {
+     * @author Shinare
+     * @reason Made NPCs abandon targets if too far from warband leader
+     */
+    @Overwrite(remap = false)
+    public boolean func_75250_a() { // shouldExecute()
         if (warband_should_execute()) return false;
         return original_should_execute();
     }

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/entity/ai/MixinLOTREntityAIOrcSkirmish.java

@@ -14,6 +14,10 @@ import org.spongepowered.asm.mixin.injection.callback.*;
 @Mixin(LOTREntityAIOrcSkirmish.class)
 public class MixinLOTREntityAIOrcSkirmish {
 
+    /**
+     * @author Shinare
+     * @reason Disabled skirmishing for warbands
+     */
     @Overwrite(remap = false)
     private boolean canOrcSkirmish(EntityLivingBase entity) {
         if (entity instanceof LOTREntityOrc) {

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/entity/ai/MixinLOTREntityAIRangedAttack.java

@@ -59,8 +59,12 @@ public class MixinLOTREntityAIRangedAttack {
     public UUID leader_id;
     public Entity leader;
 
-    @Overwrite
+    /**
-    public void updateTask() {
+     * @author Shinare
+     * @reason If warband leader is too far, move to leader instead of attacking target
+     */
+    @Overwrite(remap = false)
+    public void func_75246_d() { // updateTask()
         if (warband_task()) return;
         update_vanilla_task();
     }

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/entity/animal/MixinLOTREntityBear.java

@@ -20,14 +20,14 @@ public abstract class MixinLOTREntityBear extends Entity {
         super(worldIn);
     }
 
+
+    @Shadow(remap = false)
+    public abstract LOTREntityBear.BearType getBearType();
+
     /**
      * @author KeyLime17
      * @reason Mevans
      */
-
-    @Shadow
-    public abstract LOTREntityBear.BearType getBearType();
-
     @Overwrite(remap = false)
     protected void func_70628_a(boolean flag, int i) {
         Item furItem = null;

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/entity/animal/MixinLOTREntityLioness.java

@@ -20,16 +20,14 @@ public abstract class MixinLOTREntityLioness extends Entity {
         super(worldIn);
     }
 
-    /**
-     * @author KeyLime17
-     * @reason Mevans
-     */
-
-
     protected LOTRItemLionRug.LionRugType getLionRugType() {
         return LOTRItemLionRug.LionRugType.LIONESS;
     }
 
+    /**
+     * @author KeyLime17
+     * @reason Lions now drop lion fur
+     */
     @Overwrite(remap = false)
     protected void func_70628_a(boolean flag, int i) {
         Item furItem = CinderLoE.cinderFurItem;

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/entity/npc/MixinLOTREntityMountainTrollChieftain.java

@@ -16,17 +16,21 @@ import com.zivilon.cinder_loe.util.IBossEntity;
 
 @Mixin(LOTREntityMountainTrollChieftain.class)
 public class MixinLOTREntityMountainTrollChieftain extends LOTREntityMountainTroll implements IBossEntity {
-    @Shadow
+    @Shadow(remap = false)
     public int getTrollArmorLevel() {return 1;}
-    @Shadow
+    @Shadow(remap = false)
     public void setTrollArmorLevel(int i) {}
 
     public MixinLOTREntityMountainTrollChieftain(World world) {
         super(world);
     }
 
-    @Overwrite
+    /**
-    protected void damageEntity(DamageSource damagesource, float f) {
+     * @author Shinare
+     * @reason I don't remember, test later if even necessary
+     */
+    @Overwrite(remap = false)
+    protected void func_70665_d(DamageSource damagesource, float f) { // damageEntity()
         super.damageEntity(damagesource, f);
     }
 

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/entity/npc/MixinLOTREntityNPC.java

@@ -37,11 +37,11 @@ public abstract class MixinLOTREntityNPC extends EntityCreature implements ILoot
     public int last_pickpocket = 0;
     public float pickpocket_chance = 0.0F;
 
-    @Shadow
+    @Shadow(remap = false)
     public LOTREntityQuestInfo questInfo;
-    @Shadow
+    @Shadow(remap = false)
     public boolean speakTo(EntityPlayer entityplayer) {return false;}
-    @Shadow
+    @Shadow(remap = false)
     public boolean canNPCTalk() {return false;}
 
     public MixinLOTREntityNPC(World world) {
@@ -52,8 +52,8 @@ public abstract class MixinLOTREntityNPC extends EntityCreature implements ILoot
      * @author
      * @reason
      */
-    @Overwrite
+    @Overwrite(remap = false)
-    public boolean interact(EntityPlayer entityplayer) {
+    public boolean func_70085_c(EntityPlayer entityplayer) { // interact()
         if (PickpocketUtils.can_pickpocket(entityplayer, (LOTREntityNPC)(Object)this)) {
             boolean success = PickpocketUtils.pickpocket(entityplayer, (LOTREntityNPC)(Object)this);
             ((IMixinEntityPlayer)entityplayer).set_last_pickpocket_attempt((int)(System.currentTimeMillis() / 1000L));

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/entity/npc/MixinLOTREntityOrc.java

@@ -31,13 +31,10 @@ public abstract class MixinLOTREntityOrc extends LOTREntityNPC {
 
     /**
      * @author KeyLime17
-     * @reason Mevans
+     * @reason Removed armor reduction for weak orcs
      */
     @Overwrite(remap = false)
-    public int getTotalArmorValue() {
+    public int func_70658_aO() { // getTotalArmorValue()
-        if (this.isWeakOrc) {
-            return MathHelper.floor_double((double)((double)super.getTotalArmorValue() * 1));
-        }
         return super.getTotalArmorValue();
     }
 }

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/entity/npc/MixinLOTREntityWarg.java

@@ -38,11 +38,11 @@ public abstract class MixinLOTREntityWarg extends LOTREntityNPCRideable {
      * @reason Mevans
      */
 
-    @Shadow
+    @Shadow(remap = false)
     public abstract LOTREntityWarg.WargType getWargType();
 
     @Overwrite(remap = false)
-    protected void applyEntityAttributes() {
+    protected void func_110147_ax() { // applyEntityAttributes()
         super.applyEntityAttributes();
         this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue((double) MathHelper.getRandomIntegerInRange((Random)this.rand, (int)20, (int)40));
         this.getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(32.0);

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/entity/npc/MixinLOTRHiredNPCInfo.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.mixins.overrides;
+package com.zivilon.cinder_loe.mixins;
 
 import com.zivilon.cinder_loe.util.Utilities;
 import com.zivilon.cinder_loe.CinderLoE_Config;
@@ -40,17 +40,20 @@ public abstract class MixinLOTRHiredNPCInfo {
     private static double DAMAGE_PER_UPGRADE = 0.25D;
     private static double SPEED_PER_UPGRADE = 0.0025D;
 
-    @Shadow
+    @Shadow(remap = false)
     private LOTREntityNPC theEntity;
-    @Shadow
+    @Shadow(remap = false)
     private UUID hiringPlayerUUID;
-    @Shadow
+    @Shadow(remap = false)
     public int xpLevel = 1;
-    @Shadow
+    @Shadow(remap = false)
     private boolean canMove;
 
+    @Shadow(remap = false)
+    public void sendClientPacket(boolean shouldOpenGui) {}
+
     /**
-     * @author
+     * @author KeyLime17
      * @reason
      */
     @Overwrite(remap = false)
@@ -89,9 +92,10 @@ public abstract class MixinLOTRHiredNPCInfo {
     }
 
     /**
-     * @author
+     * @author KeyLime17
      * @reason
      */
+    @SuppressWarnings("OverwriteModifiers")
     @Overwrite(remap = false)
     public void addLevelUpHealthGain(EntityLivingBase entity) {
         IAttributeInstance attr = entity.getEntityAttribute(SharedMonsterAttributes.maxHealth);
@@ -113,7 +117,7 @@ public abstract class MixinLOTRHiredNPCInfo {
 
 
     /**
-     * @author
+     * @author KeyLime17
      * @reason
      */
     @Overwrite(remap = false)
@@ -153,9 +157,10 @@ public abstract class MixinLOTRHiredNPCInfo {
         world.spawnEntityInWorld((Entity)firework);
     }
 
-    @Shadow
+    /**
-    public void sendClientPacket(boolean shouldOpenGui) {}
+     * @author KeyLime17
-
+     * @reason
+     */
     @Overwrite(remap = false)
     public void ready() {
         this.canMove = true;

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/entity/npc/MixinLOTRTradeEntriesOverrides.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.mixins.overrides;
+package com.zivilon.cinder_loe.mixins;
 
 import com.zivilon.cinder_loe.CinderLoE;
 import lotr.common.LOTRFoods;
@@ -27,104 +27,107 @@ import static lotr.common.entity.npc.LOTRTradeEntries.*;
 
 @Mixin(LOTRTradeEntries.class)
 public abstract class MixinLOTRTradeEntriesOverrides {
-    @Shadow
+    @Shadow(remap = false)
     public LOTRTradeEntries setVessels(LOTRFoods foods) {
         return null;
     }
 
-    @Shadow public static LOTRTradeEntries MORDOR_TRADER_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries MORDOR_TRADER_BUY;
-    @Shadow public static LOTRTradeEntries MORDOR_TRADER_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries MORDOR_TRADER_SELL;
-    @Shadow public static LOTRTradeEntries GONDOR_BLACKSMITH_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries GONDOR_BLACKSMITH_SELL;
-    @Shadow public static LOTRTradeEntries GALADHRIM_TRADER_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries GALADHRIM_TRADER_BUY;
-    @Shadow public static LOTRTradeEntries GALADHRIM_TRADER_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries GALADHRIM_TRADER_SELL;
-    @Shadow public static LOTRTradeEntries URUK_HAI_TRADER_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries URUK_HAI_TRADER_SELL;
-    @Shadow public static LOTRTradeEntries DWARF_MINER_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries DWARF_MINER_BUY;
-    @Shadow public static LOTRTradeEntries DWARF_MINER_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries DWARF_MINER_SELL;
-    @Shadow public static LOTRTradeEntries ROHAN_BLACKSMITH_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries ROHAN_BLACKSMITH_SELL;
-    @Shadow public static LOTRTradeEntries DUNLENDING_BARTENDER_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries DUNLENDING_BARTENDER_BUY;
-    @Shadow public static LOTRTradeEntries ROHAN_MEADHOST_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries ROHAN_MEADHOST_BUY;
-    @Shadow public static LOTRTradeEntries DUNLENDING_BARTENDER_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries DUNLENDING_BARTENDER_SELL;
-    @Shadow public static LOTRTradeEntries ROHAN_MEADHOST_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries ROHAN_MEADHOST_SELL;
-    @Shadow public static LOTRTradeEntries HOBBIT_ORCHARDER_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries HOBBIT_ORCHARDER_BUY;
-    @Shadow public static LOTRTradeEntries HOBBIT_ORCHARDER_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries HOBBIT_ORCHARDER_SELL;
-    @Shadow public static LOTRTradeEntries HOBBIT_FARMER_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries HOBBIT_FARMER_BUY;
-    @Shadow public static LOTRTradeEntries HOBBIT_FARMER_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries HOBBIT_FARMER_SELL;
-    @Shadow public static LOTRTradeEntries BLUE_DWARF_MINER_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries BLUE_DWARF_MINER_BUY;
-    @Shadow public static LOTRTradeEntries BLUE_DWARF_MINER_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries BLUE_DWARF_MINER_SELL;
-    @Shadow public static LOTRTradeEntries BLUE_DWARF_MERCHANT_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries BLUE_DWARF_MERCHANT_BUY;
-    @Shadow public static LOTRTradeEntries BLUE_DWARF_MERCHANT_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries BLUE_DWARF_MERCHANT_SELL;
-    @Shadow public static LOTRTradeEntries NEAR_HARAD_MERCHANT_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries NEAR_HARAD_MERCHANT_BUY;
-    @Shadow public static LOTRTradeEntries NEAR_HARAD_MERCHANT_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries NEAR_HARAD_MERCHANT_SELL;
-    @Shadow public static LOTRTradeEntries ANGMAR_TRADER_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries ANGMAR_TRADER_BUY;
-    @Shadow public static LOTRTradeEntries ANGMAR_TRADER_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries ANGMAR_TRADER_SELL;
-    @Shadow public static LOTRTradeEntries DOL_GULDUR_TRADER_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries DOL_GULDUR_TRADER_BUY;
-    @Shadow public static LOTRTradeEntries DOL_GULDUR_TRADER_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries DOL_GULDUR_TRADER_SELL;
-    @Shadow public static LOTRTradeEntries HALF_TROLL_SCAVENGER_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries HALF_TROLL_SCAVENGER_BUY;
-    @Shadow public static LOTRTradeEntries HALF_TROLL_SCAVENGER_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries HALF_TROLL_SCAVENGER_SELL;
-    @Shadow public static LOTRTradeEntries HIGH_ELF_SMITH_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries HIGH_ELF_SMITH_BUY;
-    @Shadow public static LOTRTradeEntries HIGH_ELF_SMITH_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries HIGH_ELF_SMITH_SELL;
-    @Shadow public static LOTRTradeEntries WOOD_ELF_SMITH_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries WOOD_ELF_SMITH_BUY;
-    @Shadow public static LOTRTradeEntries MOREDAIN_HUNTSMAN_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries MOREDAIN_HUNTSMAN_BUY;
-    @Shadow public static LOTRTradeEntries MOREDAIN_HUTMAKER_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries MOREDAIN_HUTMAKER_BUY;
-    @Shadow public static LOTRTradeEntries MOREDAIN_HUTMAKER_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries MOREDAIN_HUTMAKER_SELL;
-    @Shadow public static LOTRTradeEntries IRON_HILLS_MERCHANT_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries IRON_HILLS_MERCHANT_BUY;
-    @Shadow public static LOTRTradeEntries IRON_HILLS_MERCHANT_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries IRON_HILLS_MERCHANT_SELL;
-    @Shadow public static LOTRTradeEntries TAUREDAIN_SHAMAN_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries TAUREDAIN_SHAMAN_BUY;
-    @Shadow public static LOTRTradeEntries TAUREDAIN_SHAMAN_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries TAUREDAIN_SHAMAN_SELL;
-    @Shadow public static LOTRTradeEntries TAUREDAIN_FARMER_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries TAUREDAIN_FARMER_BUY;
-    @Shadow public static LOTRTradeEntries TAUREDAIN_FARMER_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries TAUREDAIN_FARMER_SELL;
-    @Shadow public static LOTRTradeEntries DWARF_SMITH_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries DWARF_SMITH_BUY;
-    @Shadow public static LOTRTradeEntries DWARF_SMITH_SELL;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries DWARF_SMITH_SELL;
-    @Shadow public static LOTRTradeEntries BLUE_DWARF_SMITH_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries BLUE_DWARF_SMITH_BUY;
-    @Shadow public static LOTRTradeEntries DALE_BLACKSMITH_BUY;
+    @Shadow(remap = false)
-
+    public static LOTRTradeEntries DALE_BLACKSMITH_BUY;
-    @Shadow public static LOTRTradeEntries DALE_BLACKSMITH_SELL;
+    @Shadow(remap = false)
-    @Shadow public static LOTRTradeEntries WICKED_DWARF_BUY;
+    public static LOTRTradeEntries DALE_BLACKSMITH_SELL;
-    @Shadow public static LOTRTradeEntries DALE_BAKER_BUY;
+    @Shadow(remap = false)
+    public static LOTRTradeEntries WICKED_DWARF_BUY;
+    @Shadow(remap = false)
+    public static LOTRTradeEntries DALE_BAKER_BUY;
 
     @Redirect(
             method = "getRandomTrades",

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/entity/npc/MixinLOTRTraderNPCInfo.java

@@ -19,13 +19,13 @@ import java.util.Map;
 
 @Mixin(LOTRTraderNPCInfo.class)
 public class MixinLOTRTraderNPCInfo {
-    @Shadow
+    @Shadow(remap = false)
     private LOTREntityNPC theEntity;
-    @Shadow
+    @Shadow(remap = false)
     private int valueSinceRefresh;
-    @Shadow
+    @Shadow(remap = false)
     private int timeSinceTrade;
-    @Shadow
+    @Shadow(remap = false)
     public void sendClientPacket(EntityPlayer entityplayer) {}
 
     public void onTrade(EntityPlayer entityplayer, LOTRTradeEntry trade, LOTRTradeEntries.TradeType type, int value) {

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/entity/npc/MixinLOTRUnitTradeEntries.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.mixins.overrides;
+package com.zivilon.cinder_loe.mixins;
 
 import com.zivilon.cinder_loe.CinderUnitTradeEntry;
 import com.zivilon.cinder_loe.entity.npc.HobbitBannerBearer;
@@ -23,7 +23,7 @@ import org.spongepowered.asm.mixin.Unique;
 @Mixin(LOTRUnitTradeEntries.class)
 public class MixinLOTRUnitTradeEntries {
 
-    @Shadow
+    @Shadow(remap = false)
     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),
@@ -39,7 +39,7 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries GONDORIAN_CAPTAIN = new LOTRUnitTradeEntries(200.0f,
             new LOTRUnitTradeEntry(LOTREntityGondorLevyman.class, 150, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityGondorSoldier.class, 250, 50.0f),
@@ -48,7 +48,7 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries DWARF_COMMANDER = new LOTRUnitTradeEntries(200.0f,
             new LOTRUnitTradeEntry(LOTREntityDwarf.class, 60, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityDwarfWarrior.class, 400, 50.0f).setPledgeExclusive(),
@@ -57,7 +57,7 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     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),
@@ -70,7 +70,7 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries ELF_LORD = new LOTRUnitTradeEntries(300.0f,
             new LOTRUnitTradeEntry(LOTREntityGaladhrimElf.class, 60, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityGaladhrimWarden.class, 250, 50.0f),
@@ -78,7 +78,7 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries ROHIRRIM_MARSHAL = new LOTRUnitTradeEntries(150.0f,
             new LOTRUnitTradeEntry(LOTREntityRohirrimWarrior.class, 250, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityRohirrimArcher.class, 250, 50.0f),
@@ -86,14 +86,14 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries DUNLENDING_WARLORD = new LOTRUnitTradeEntries(100.0f,
             new LOTRUnitTradeEntry(LOTREntityDunlending.class, 60, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityDunlendingWarrior.class, 250, 50.0f),
@@ -101,7 +101,7 @@ public class MixinLOTRUnitTradeEntries {
             new LOTRUnitTradeEntry(LOTREntityDunlendingAxeThrower.class, 250, 100.0f).setPledgeExclusive(),
             new LOTRUnitTradeEntry(LOTREntityDunlendingBerserker.class, 400, 200.0f).setPledgeExclusive(),
             new LOTRUnitTradeEntry(LOTREntityDunlendingBannerBearer.class, 250, 200.0f));
-    @Shadow
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries WOOD_ELF_CAPTAIN = new LOTRUnitTradeEntries(250.0f,
             new LOTRUnitTradeEntry(LOTREntityWoodElf.class, 60, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityWoodElfScout.class, 250, 50.0f),
@@ -109,7 +109,7 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries ANGMAR_ORC_MERCENARY_CAPTAIN = new LOTRUnitTradeEntries(150.0f,
             new LOTRUnitTradeEntry(LOTREntityAngmarOrc.class, 150, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityAngmarOrcArcher.class, 150, 50.0f),
@@ -123,10 +123,10 @@ public class MixinLOTRUnitTradeEntries {
             new LOTRUnitTradeEntry(LOTREntityAngmarBannerBearer.class, 150, 150.0f),
             new LOTRUnitTradeEntry(LOTREntityAngmarBannerBearer.class, LOTREntityAngmarWarg.class, "Banner_Warg", 250, 250.0f).setMountArmor(LOTRMod.wargArmorAngmar, 0.5f).setPledgeExclusive(),
             (new CinderUnitTradeEntry(NorthernOrc.class, 500, 400.0F).setObjective("Angmar").setExtraInfo("Angmar")).setPledgeExclusive());
-    @Shadow
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries MORDOR_ORC_SLAVER = new LOTRUnitTradeEntries(200.0f,
             new LOTRUnitTradeEntry(LOTREntityNurnSlave.class, 100, 0.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
-    @Shadow
+    @Shadow(remap = false)
     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),
@@ -147,7 +147,7 @@ public class MixinLOTRUnitTradeEntries {
 //        return options[LOTRMod.proxy.getClientWorld().rand.nextInt(options.length)];
 //    }
 
-    @Shadow
+    @Shadow(remap = false)
     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),
@@ -158,15 +158,15 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries HOBBIT_FARMER = new LOTRUnitTradeEntries(0.0f,
             new LOTRUnitTradeEntry(LOTREntityHobbitFarmhand.class, 100, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
-    @Shadow
+    @Shadow(remap = false)
     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(),
@@ -174,14 +174,14 @@ public class MixinLOTRUnitTradeEntries {
             new LOTRUnitTradeEntry(LOTREntityHighElfBannerBearer.class, 500, 250.0f).setPledgeExclusive(),
             new LOTRUnitTradeEntry(LOTREntityHighElfBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 600, 350.0f).setMountArmor(LOTRMod.horseArmorHighElven).setPledgeExclusive(),
             (new CinderUnitTradeEntry(Sirrandrai.class, LOTREntityHorse.class, "Sirrandrai", 600, 400.0F).setObjective("Lindon").setExtraInfo("Lindon")).setPledgeExclusive().setMountArmor(LOTRMod.horseArmorHighElven));
-    @Shadow
+    @Shadow(remap = false)
     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
+    @Shadow(remap = false)
     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(),
@@ -190,7 +190,7 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries DOL_GULDUR_CAPTAIN = new LOTRUnitTradeEntries(150.0f,
             new LOTRUnitTradeEntry(LOTREntityDolGuldurOrc.class, 150, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityDolGuldurOrcArcher.class, 150, 50.0f),
@@ -200,18 +200,18 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     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
+    @Shadow(remap = false)
     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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries DOL_AMROTH_CAPTAIN = new LOTRUnitTradeEntries(200.0f,
             new LOTRUnitTradeEntry(LOTREntityDolAmrothSoldier.class, 150, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityDolAmrothArcher.class, 150, 50.0f),
@@ -220,13 +220,13 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries ANGMAR_HILLMAN_CHIEFTAIN = new LOTRUnitTradeEntries(100.0f,
             new LOTRUnitTradeEntry(LOTREntityAngmarHillman.class, 60, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityAngmarHillmanWarrior.class, 150, 50.0f),
@@ -237,16 +237,16 @@ public class MixinLOTRUnitTradeEntries {
             new LOTRUnitTradeEntry(LOTREntityAngmarHillmanBannerBearer.class, 150, 200.0f),
             new LOTRUnitTradeEntry(LOTREntityAngmarHillmanBannerBearer.class, LOTREntityAngmarWarg.class, "Banner_Warg", 250, 300.0f).setMountArmor(LOTRMod.wargArmorAngmar, 0.5f).setPledgeExclusive(),
             (new CinderUnitTradeEntry(RhudaurSoldier.class, 500, 400.0F).setObjective("Rhudaur").setExtraInfo("Rhudaur")));
-    @Shadow
+    @Shadow(remap = false)
     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),
             new LOTRUnitTradeEntry(TauredainTrueBlood.class, 500, 800.0f).setPledgeExclusive());
-    @Shadow
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries TAUREDAIN_FARMER = new LOTRUnitTradeEntries(0.0f,
             new LOTRUnitTradeEntry(LOTREntityTauredainFarmhand.class, 100, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
-    @Shadow
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries DALE_CAPTAIN = new LOTRUnitTradeEntries(100.0f,
             new LOTRUnitTradeEntry(LOTREntityDaleLevyman.class, 150, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityDaleSoldier.class, 250, 50.0f),
@@ -256,37 +256,37 @@ public class MixinLOTRUnitTradeEntries {
             new LOTRUnitTradeEntry(LOTREntityDaleBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 350, 300.0f).setMountArmor(LOTRMod.horseArmorDale).setPledgeExclusive(),
             (new CinderUnitTradeEntry(EsgarothSoldier.class, 500, 400.0F).setObjective("Dale").setExtraInfo("Dale")),
             (new CinderUnitTradeEntry(LOTREntityEsgarothBannerBearer.class, 500, 400.0F).setObjective("Dale").setExtraInfo("Dale")));
-    @Shadow
+    @Shadow(remap = false)
     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
+    @Shadow(remap = false)
     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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries DORWINION_VINEKEEPER = new LOTRUnitTradeEntries(0.0f,
             new LOTRUnitTradeEntry(LOTREntityDorwinionVinehand.class, 100, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
-    @Shadow
+    @Shadow(remap = false)
     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
+    @Shadow(remap = false)
     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
+    @Shadow(remap = false)
     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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries BLACKROOT_CAPTAIN = new LOTRUnitTradeEntries(150.0f,
             new LOTRUnitTradeEntry(LOTREntityGondorLevyman.class, 150, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityBlackrootSoldier.class, 250, 50.0f),
@@ -294,16 +294,16 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries GONDOR_FARMER = new LOTRUnitTradeEntries(0.0f,
             new LOTRUnitTradeEntry(LOTREntityGondorFarmhand.class, 100, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
-    @Shadow
+    @Shadow(remap = false)
     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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries LAMEDON_CAPTAIN = new LOTRUnitTradeEntries(200.0f,
             new LOTRUnitTradeEntry(LOTREntityLamedonHillman.class, 150, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityLamedonSoldier.class, 200, 50.0f),
@@ -311,10 +311,10 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries ROHAN_FARMER = new LOTRUnitTradeEntries(0.0f,
             new LOTRUnitTradeEntry(LOTREntityRohanFarmhand.class, 100, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
-    @Shadow
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries EASTERLING_WARLORD = new LOTRUnitTradeEntries(150.0f,
             new LOTRUnitTradeEntry(LOTREntityEasterlingLevyman.class, 150, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityEasterlingWarrior.class, 250, 50.0f),
@@ -326,17 +326,17 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries EASTERLING_FARMER = new LOTRUnitTradeEntries(0.0f,
             new LOTRUnitTradeEntry(LOTREntityEasterlingFarmhand.class, 100, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
-    @Shadow
+    @Shadow(remap = false)
     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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries HARNEDOR_WARLORD = new LOTRUnitTradeEntries(150.0f,
             new LOTRUnitTradeEntry(LOTREntityHarnedorWarrior.class, 250, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityHarnedorArcher.class, 200, 50.0f),
@@ -344,7 +344,7 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries UMBAR_CAPTAIN = new LOTRUnitTradeEntries(150.0f,
             new LOTRUnitTradeEntry(LOTREntityUmbarWarrior.class, 250, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityUmbarArcher.class, 250, 50.0f),
@@ -352,10 +352,10 @@ public class MixinLOTRUnitTradeEntries {
             new LOTRUnitTradeEntry(LOTREntityUmbarBannerBearer.class, 250, 150.0f),
             new LOTRUnitTradeEntry(LOTREntityUmbarBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 350, 250.0f).setMountArmor(LOTRMod.horseArmorUmbar).setPledgeExclusive(),
             new LOTRUnitTradeEntry(UmbarUsurper.class, 400, 500.0f).setPledgeExclusive());
-    @Shadow
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries CORSAIR_CAPTAIN = new LOTRUnitTradeEntries(150.0f,
             new LOTRUnitTradeEntry(LOTREntityCorsair.class, 200, 0.0f).setExtraInfo("Corsair"));
-    @Shadow
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries NOMAD_WARLORD = new LOTRUnitTradeEntries(150.0f,
             new LOTRUnitTradeEntry(LOTREntityNomadWarrior.class, 150, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityNomadArcher.class, 150, 50.0f),
@@ -363,7 +363,7 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries GULF_WARLORD = new LOTRUnitTradeEntries(150.0f,
             new LOTRUnitTradeEntry(LOTREntityGulfHaradWarrior.class, 200, 0.0f),
             new LOTRUnitTradeEntry(LOTREntityGulfHaradArcher.class, 250, 50.0f),
@@ -371,23 +371,23 @@ public class MixinLOTRUnitTradeEntries {
             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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries CORSAIR_SLAVER = new LOTRUnitTradeEntries(0.0f,
             new LOTRUnitTradeEntry(LOTREntityHaradSlave.class, 100, 0.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
-    @Shadow
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries HARNEDOR_FARMER = new LOTRUnitTradeEntries(0.0f,
             new LOTRUnitTradeEntry(LOTREntityHarnedorFarmhand.class, 100, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
-    @Shadow
+    @Shadow(remap = false)
     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
+    @Shadow(remap = false)
     public static LOTRUnitTradeEntries BREE_FARMER = new LOTRUnitTradeEntries(0.0f,
             new LOTRUnitTradeEntry(LOTREntityBreeFarmhand.class, 40, 50.0f).setTask(LOTRHiredNPCInfo.Task.FARMER));
     @Final
-    @Shadow
+    @Shadow(remap = false)
     public static final int MOREDAIN_MERCENARY_COST = 200;
 
 }

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/fac/MixinLOTRFaction.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.mixins.overrides;
+package com.zivilon.cinder_loe.mixins;
 
 import lotr.common.LOTRLevelData;
 import lotr.common.fac.LOTRFactionRelations;
@@ -49,7 +49,7 @@ public class MixinLOTRFaction {
     private static LOTRFaction HOSTILE = LOTRFaction.HOSTILE;
     private static LOTRFaction UNALIGNED = LOTRFaction.UNALIGNED;
 
-    @Shadow
+    @Shadow(remap = false)
     public static LOTRFaction[] values() {return null;}
 
     @Overwrite(remap = false)

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/inventory/MixinLOTRContainerAnvil.java

@@ -43,43 +43,43 @@ import org.apache.commons.lang3.StringUtils;
 
 @Mixin(LOTRContainerAnvil.class)
 public abstract class MixinLOTRContainerAnvil {
-    @Shadow
+    @Shadow(remap = false)
     public IInventory invInput;
-    @Shadow
+    @Shadow(remap = false)
     public IInventory invOutput;
-    @Shadow
+    @Shadow(remap = false)
     public LOTRTradeable theTrader;
-    @Shadow
+    @Shadow(remap = false)
     public EntityPlayer thePlayer;
-    @Shadow
+    @Shadow(remap = false)
     public int materialCost;
-    @Shadow
+    @Shadow(remap = false)
     public int reforgeCost;
-    @Shadow
+    @Shadow(remap = false)
     public int engraveOwnerCost;
-    @Shadow
+    @Shadow(remap = false)
     public boolean isSmithScrollCombine;
-    @Shadow
+    @Shadow(remap = false)
     public boolean isTrader;
-    @Shadow
+    @Shadow(remap = false)
     private String repairedItemName;
-    @Shadow
+    @Shadow(remap = false)
-    abstract void detectAndSendChanges();
+    public abstract void func_75142_b(); // detectAndSendChanges()
-    @Shadow
+    @Shadow(remap = false)
     abstract float getTraderMaterialPrice(ItemStack inputItem);
-    @Shadow
+    @Shadow(remap = false)
     static boolean costsToRename(ItemStack itemstack) {
         return false;
     }
-    @Shadow
+    @Shadow(remap = false)
     static String stripFormattingCodes(String name) {
         return null;
     }
-    @Shadow
+    @Shadow(remap = false)
     static String applyFormattingCodes(String name, List<EnumChatFormatting> colors) {
         return null;
     }
-    @Shadow
+    @Shadow(remap = false)
     static List<EnumChatFormatting> getAppliedFormattingCodes(String name) {
         return null;
     }
@@ -543,7 +543,7 @@ public abstract class MixinLOTRContainerAnvil {
                 this.invOutput.setInventorySlotContents(0, null);
                 this.materialCost = 0;
             }
-            detectAndSendChanges();
+            func_75142_b();
         }
     }
 }

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/item/MixinLOTRItemEntDraught.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.mixins.overrides;
+package com.zivilon.cinder_loe.mixins;
 
 import lotr.common.LOTRAchievement;
 import lotr.common.LOTRLevelData;

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/item/MixinLOTRItemMug.java

@@ -22,9 +22,13 @@ import java.util.*;
 
 @Mixin(LOTRItemMug.class)
 public class MixinLOTRItemMug {
-    @Shadow
+    @Shadow(remap = false)
     protected List<PotionEffect> potionEffects = new ArrayList<PotionEffect>();
 
+    /**
+     * @author Shinare
+     * @reason Added amplifier value to brew effects
+     */
     @Overwrite(remap = false)
     private List<PotionEffect> convertPotionEffectsForStrength(float strength) {
         List<PotionEffect> list = new ArrayList<PotionEffect>();

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/world/biome/MixinLOTRBiome.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.mixins.overrides;
+package com.zivilon.cinder_loe.mixins;
 
 import com.zivilon.cinder_loe.world.biome.CinderBiome;
 import com.zivilon.cinder_loe.world.biome.GenMistyForest;

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/world/structure2/MixinLOTRWorldGenAngmarCamp.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.mixins.structures;
+package com.zivilon.cinder_loe.mixins;
 
 import com.zivilon.cinder_loe.entity.npc.orc.trader.AngmarOrcBrewer;
 import com.zivilon.cinder_loe.entity.npc.orc.trader.AngmarOrcButcher;
@@ -15,6 +15,10 @@ import java.util.Random;
 @Mixin(LOTRWorldGenAngmarCamp.class)
 public class MixinLOTRWorldGenAngmarCamp {
 
+    /**
+     * @author KeyLime17
+     * @reason Made orc camps select trader from multiple options
+     */
     @Overwrite(remap = false)
     protected LOTREntityNPC getCampCaptain(World world, Random random) {
         int pick = random.nextInt(5);

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/world/structure2/MixinLOTRWorldGenDolGuldurCamp.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.mixins.structures;
+package com.zivilon.cinder_loe.mixins;
 
 import com.zivilon.cinder_loe.entity.npc.orc.trader.*;
 import lotr.common.entity.npc.LOTREntityDolGuldurOrcTrader;
@@ -13,6 +13,10 @@ import java.util.Random;
 @Mixin(LOTRWorldGenDolGuldurCamp.class)
 public class MixinLOTRWorldGenDolGuldurCamp {
 
+    /**
+     * @author KeyLime17
+     * @reason Made orc camps select trader from multiple options
+     */
     @Overwrite(remap = false)
     protected LOTREntityNPC getCampCaptain(World world, Random random) {
         int pick = random.nextInt(5);

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/world/structure2/MixinLOTRWorldGenGundabadCamp.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.mixins.structures;
+package com.zivilon.cinder_loe.mixins;
 
 import com.zivilon.cinder_loe.entity.npc.orc.trader.*;
 import lotr.common.entity.npc.LOTREntityDolGuldurOrcTrader;
@@ -16,6 +16,10 @@ import java.util.Random;
 @Mixin(LOTRWorldGenGundabadCamp.class)
 public class MixinLOTRWorldGenGundabadCamp {
 
+    /**
+     * @author KeyLime17
+     * @reason Made orc camps select trader from multiple options
+     */
     @Overwrite(remap = false)
     protected LOTREntityNPC getCampCaptain(World world, Random random) {
         int pick = random.nextInt(5);

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/world/structure2/MixinLOTRWorldGenHalfTrollHouse.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.mixins.structures;
+package com.zivilon.cinder_loe.mixins;
 
 import com.google.common.math.IntMath;
 import com.zivilon.cinder_loe.entity.npc.orc.trader.HalfTrollBrewer;

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/world/structure2/MixinLOTRWorldGenIsengardCamp.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.mixins.structures;
+package com.zivilon.cinder_loe.mixins;
 
 import com.zivilon.cinder_loe.entity.npc.orc.trader.*;
 import lotr.common.entity.npc.LOTREntityAngmarOrcTrader;
@@ -16,6 +16,10 @@ import java.util.Random;
 @Mixin(LOTRWorldGenUrukCamp.class)
 public class MixinLOTRWorldGenIsengardCamp {
 
+    /**
+     * @author KeyLime17
+     * @reason Made orc camps select trader from multiple options
+     */
     @Overwrite(remap = false)
     protected LOTREntityNPC getCampCaptain(World world, Random random) {
         int pick = random.nextInt(5);

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/world/structure2/MixinLOTRWorldGenMordorCamp.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.mixins.structures;
+package com.zivilon.cinder_loe.mixins;
 
 import com.zivilon.cinder_loe.entity.npc.orc.trader.*;
 import lotr.common.entity.npc.LOTREntityDolGuldurOrcTrader;
@@ -15,6 +15,10 @@ import java.util.Random;
 @Mixin(LOTRWorldGenMordorCamp.class)
 public class MixinLOTRWorldGenMordorCamp {
 
+    /**
+     * @author KeyLime17
+     * @reason Made orc camps select trader from multiple options
+     */
     @Overwrite(remap = false)
     protected LOTREntityNPC getCampCaptain(World world, Random random) {
         int pick = random.nextInt(5);

src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/world/structure2/MixinLOTRWorldGenMumakSkeleton.java

@@ -1,4 +1,4 @@
-package com.zivilon.cinder_loe.mixins.structures;
+package com.zivilon.cinder_loe.mixins;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;

src/main/java/com/zivilon/cinder_loe/mixins/metweaks/guards/customranged/MixinMETweaksCategory.java

@@ -30,6 +30,10 @@ public class MixinMETweaksCategory {
     private static Category FIREPOT = Category.FIREPOT;
     private static Category TERMITE = Category.TERMITE;
 
+    /**
+     * @author Shinare
+     * @reason Changed blowgun check from direct item check to instance check to support Limwaith blowguns
+     */
     @Overwrite(remap = false)
     public static Category getCategory(Item item) {
       if (item instanceof LOTRItemCrossbow)

src/main/java/com/zivilon/cinder_loe/mixins/minecraft/entity/MixinEntityLiving.java

@@ -32,15 +32,22 @@ import net.minecraft.entity.monster.EntityEnderman;
 
 @Mixin(EntityLiving.class)
 public abstract class MixinEntityLiving extends Entity {
-    @Shadow private boolean getLeashed(){return false;};
+    @Shadow
-public MixinEntityLiving(World world) {
+    private boolean getLeashed(){return false;};
+
+    public MixinEntityLiving(World world) {
         super(world);
     }
-@Overwrite
+
-public boolean allowLeashing() {
+    /**
-    if(this.riddenByEntity != null) {
+     * @author MrJeep20
-        return false;
+     * @reason Made ridden entities unleashable
-    }
+     */
-    return !this.getLeashed() && !(this instanceof IMob); 
+    @Overwrite
+    public boolean allowLeashing() {
+        if(this.riddenByEntity != null) {
+            return false;
+        }
+        return !this.getLeashed() && !(this instanceof IMob);
     }
 }

src/main/java/com/zivilon/cinder_loe/mixins/minecraft/entity/player/MixinEntityPlayer.java

@@ -50,11 +50,11 @@ public abstract class MixinEntityPlayer extends EntityLivingBase implements IMix
         super(world);
     }
 
-    @Shadow
+    @Shadow(remap = false)
     public static final String PERSISTED_NBT_TAG = "PlayerPersisted";
-    @Shadow
+    @Shadow(remap = false)
     private HashMap<Integer, ChunkCoordinates> spawnChunkMap;
-    @Shadow
+    @Shadow(remap = false)
     private HashMap<Integer, Boolean> spawnForcedMap;
     @Shadow
     public InventoryPlayer inventory;
@@ -155,6 +155,10 @@ public abstract class MixinEntityPlayer extends EntityLivingBase implements IMix
         return this.last_pickpocket_attempt;
     }
 
+    /**
+     * @author Shinare
+     * @reason Made critical hits not occur if overdosed
+     */
     @Overwrite
     public void attackTargetEntityWithCurrentItem(Entity p_71059_1_)
     {

src/main/java/com/zivilon/cinder_loe/mixins/minecraft/util/MixinFoodStats.java

@@ -32,6 +32,7 @@ public class MixinFoodStats {
     @Shadow
     public void addExhaustion(float p_71020_1_) {};
 
+
     @Overwrite
     public void onUpdate(EntityPlayer player) {
         EnumDifficulty enumdifficulty = player.worldObj.difficultySetting;

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

@@ -1,17 +0,0 @@
-package com.zivilon.cinder_loe.mixins.overrides;
-
-import lotr.client.gui.LOTRGuiMap;
-import net.minecraft.util.ResourceLocation;
-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.CallbackInfo;
-
-
-@Mixin(LOTRGuiMap.class)
-public class MixinSepiaOverride {
-
-
-
-}

src/main/resources/mixins.cinder_loe.json

@@ -38,24 +38,24 @@
     "MixinLOTRTileEntityDwarvenForge",
     "MixinLOTRTileEntityForgeBase",
     "MixinLOTRTradeEntries",
-    "structures.MixinLOTRWorldGenMumakSkeleton",
+    "MixinLOTRWorldGenMumakSkeleton",
-    "structures.MixinLOTRWorldGenHalfTrollHouse",
+    "MixinLOTRWorldGenHalfTrollHouse",
-    "structures.MixinLOTRWorldGenDolGuldurCamp",
+    "MixinLOTRWorldGenDolGuldurCamp",
-    "structures.MixinLOTRWorldGenGundabadCamp",
+    "MixinLOTRWorldGenGundabadCamp",
-    "structures.MixinLOTRWorldGenAngmarCamp",
+    "MixinLOTRWorldGenAngmarCamp",
-    "structures.MixinLOTRWorldGenMordorCamp",
+    "MixinLOTRWorldGenMordorCamp",
-    "structures.MixinLOTRWorldGenIsengardCamp",
+    "MixinLOTRWorldGenIsengardCamp",
     "MixinRendererLivingEntity",
     "MixinRenderItem",
     "MixinSlotCrafting",
     "MixinLOTREntityWarg",
-    "overrides.MixinLOTRHiredNPCInfo",
+    "MixinLOTRHiredNPCInfo",
-    "overrides.MixinLOTRItemEntDraught",
+    "MixinLOTRItemEntDraught",
-    "overrides.MixinLOTRReplacedMethods",
+    "MixinLOTRReplacedMethods",
-    "overrides.MixinLOTRTradeEntriesOverrides",
+    "MixinLOTRTradeEntriesOverrides",
-    "overrides.MixinLOTRUnitTradeEntries",
+    "MixinLOTRUnitTradeEntries",
-    "overrides.MixinLOTRBiome",
+    "MixinLOTRBiome",
-    "overrides.MixinLOTREnchantmenHelper",
+    "MixinLOTREnchantmenHelper",
     "MixinLOTREntityOrc",
     "MixinEntityLivingBase",
     "MixinEntityPlayer",
@@ -67,7 +67,7 @@
     "MixinLOTRGuiMap",
     "MixinLOTREntityAIOrcSkirmish",
     "MixinLOTREntityMountainTrollChieftain",
-    "overrides.MixinLOTRFaction",
+    "MixinLOTRFaction",
     "MixinLOTREnchantmentWeaponSpecial",
     "MixinLOTRTraderNPCInfo",
     "MixinLOTRGuiTrade",