Made spice trades lock on purchase. Reduced chill overlay.

gradle.properties

@@ -1,5 +1,5 @@
 modName = CinderLoE
-modVersion = 1.5.2
+modVersion = 1.6.0
 modId = cinder_loe
 modGroup = com.zivilon.cinder_loe
 

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

@@ -99,11 +99,11 @@ import static lotr.common.LOTRMod.horseArmorIron;
 
 @Mod(
     modid = "cinder_loe",
-    version = "1.5.2",
+    version = "1.6.0",
     name = "CinderLoE",
     dependencies = "required-after:spongemixins@[1.1.0,);required-after:lotr",
     acceptedMinecraftVersions = "[1.7.10]",
-    acceptableRemoteVersions = "[1.5.2]")
+    acceptableRemoteVersions = "[1.6.0]")
 public class CinderLoE {
 
     @Instance("cinder_loe")
@@ -1091,10 +1091,10 @@ public class CinderLoE {
 
         MATERIAL_DORWINIONELITE = getLOTRMaterialByName("DORWINIONELITE");
         if (MATERIAL_DORWINIONELITE != null) {
-            helmetDorwinionElite = (new LoEArmor(MATERIAL_DORWINIONELITE, 0, "helmet", LOTRMod.elfSteel)).setUnlocalizedName("lotr:helmetDorwinionElite").setTextureName("lotr:helmetDorwinionElite").setCreativeTab(null);
-            bodyDorwinionElite = (new LoEArmor(MATERIAL_DORWINIONELITE, 1, "chestplate", LOTRMod.elfSteel)).setUnlocalizedName("lotr:bodyDorwinionElite").setTextureName("lotr:bodyDorwinionElite").setCreativeTab(null);
-            legsDorwinionElite = (new LoEArmor(MATERIAL_DORWINIONELITE, 2, LOTRMod.elfSteel)).setUnlocalizedName("lotr:legsDorwinionElite").setTextureName("lotr:legsDorwinionElite").setCreativeTab(null);
-            bootsDorwinionElite = (new LoEArmor(MATERIAL_DORWINIONELITE, 3, LOTRMod.elfSteel)).setUnlocalizedName("lotr:bootsDorwinionElite").setTextureName("lotr:bootsDorwinionElite").setCreativeTab(null);
+            helmetDorwinionElite = (new LoEArmor(MATERIAL_DORWINIONELITE, 0, "helmet", LOTRMod.elfSteel)).setUnlocalizedName("lotr:helmetDorwinionElite").setTextureName("lotr:helmetDorwinionElite");
+            bodyDorwinionElite = (new LoEArmor(MATERIAL_DORWINIONELITE, 1, "chestplate", LOTRMod.elfSteel)).setUnlocalizedName("lotr:bodyDorwinionElite").setTextureName("lotr:bodyDorwinionElite");
+            legsDorwinionElite = (new LoEArmor(MATERIAL_DORWINIONELITE, 2, LOTRMod.elfSteel)).setUnlocalizedName("lotr:legsDorwinionElite").setTextureName("lotr:legsDorwinionElite");
+            bootsDorwinionElite = (new LoEArmor(MATERIAL_DORWINIONELITE, 3, LOTRMod.elfSteel)).setUnlocalizedName("lotr:bootsDorwinionElite").setTextureName("lotr:bootsDorwinionElite");
 
 
             ItemRegistration.register(helmetDorwinionElite, "helmetDorwinionElite", 6821);

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

@@ -52,7 +52,7 @@ public class LOTRMaterialTransformer implements IClassTransformer {
 
             // Custom
             modifyMaterial("UTUMNO", 1500, 0.7F, 3.5F, classNode);
-            modifyMaterial("GONDOLIN", 1500, 0.7F, 4.5F, classNode);
+            modifyMaterial("GONDOLIN", 1500, 0.7F, 4.0F, classNode);
 
             addMaterial("RED_DWARF", classNode);
             addMaterial("WIZARD", classNode);

src/main/java/com/zivilon/cinder_loe/entity/npc/elf/trader/BladorthinSmith.java

@@ -63,6 +63,10 @@ public class BladorthinSmith extends LOTREntityDorwinionElf implements LOTRTrade
                 new LOTRTradeEntry(new ItemStack(LOTRMod.bootsDorwinionElf), 16),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.dorwinionElfBow), 15),
                 new LOTRTradeEntry(new ItemStack(Items.arrow, 4), 3),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.helmetDorwinionElite), 100),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.bodyDorwinionElite), 100),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.legsDorwinionElite), 100),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.bootsDorwinionElite), 100),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 1), 200), new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 0), 200)
             }
         );

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

@@ -59,7 +59,7 @@ public class AngmarOrcBrewer extends LOTREntityAngmarOrc implements LOTRTradeabl
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugMorgulDraught, 1, 9999), 8),
                 new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugMorgulDraught, 1, 3), 150),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.mugOrcBrew, 1, 9999), 200),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 2), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 2), 500));
         ((MixinLOTRTradeEntries)ANGMAR_BREWER_BUY).vessels(LOTRFoods.ORC_DRINK);
 
         ANGMAR_BREWER_SELL = new LOTRTradeEntries(TradeType.SELL,

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

@@ -53,7 +53,7 @@ public class AngmarOrcButcher extends LOTREntityAngmarOrc implements LOTRTradeab
         ANGMAR_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY,
                 new LOTRTradeEntry(new ItemStack(CinderLoE.flatbread), 2),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.maggotlessbread), 3),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 0), 6666),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 0), 500),
                 new LOTRTradeEntry(new ItemStack(Items.bread), 2),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.axeAngmar), 10),
                 new LOTRTradeEntry(new ItemStack(Items.cooked_chicken), 5),

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

@@ -62,7 +62,7 @@ public class DolGuldurOrcBrewer extends LOTREntityDolGuldurOrc implements LOTRTr
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugMorgulDraught, 1, 9999), 8),
                 new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugMorgulDraught, 1, 3), 150),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.mugOrcBrew, 1, 9999), 200),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 2), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 2), 500));
         ((MixinLOTRTradeEntries)DOLGULDUR_BREWER_BUY).vessels(LOTRFoods.ORC_DRINK);
 
         DOLGULDUR_BREWER_SELL = new LOTRTradeEntries(TradeType.SELL,

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

@@ -54,7 +54,7 @@ public class DolGuldurOrcButcher extends LOTREntityDolGuldurOrc implements LOTRT
         DOLGULDUR_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY,
                 new LOTRTradeEntry(new ItemStack(CinderLoE.flatbread), 2),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.maggotlessbread), 3),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 0), 6666),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 0), 500),
                 new LOTRTradeEntry(new ItemStack(Items.bread), 2),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.axeDolGuldur), 10),
                 new LOTRTradeEntry(new ItemStack(Items.cooked_chicken), 5),

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

@@ -60,7 +60,7 @@ public class GundabadOrcBrewer extends LOTREntityGundabadOrc implements LOTRTrad
                 new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugOrcDraught, 1, 3), 180),
                 new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugOrcDraught, 1, 4), 300),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.mugOrcBrew, 1, 9999), 200),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 2), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 2), 500));
         ((MixinLOTRTradeEntries)GUNDABAD_BREWER_BUY).vessels(LOTRFoods.ORC_DRINK);
 
         GUNDABAD_BREWER_SELL = new LOTRTradeEntries(TradeType.SELL,

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

@@ -55,7 +55,7 @@ public class GundabadOrcButcher extends LOTREntityGundabadOrc implements LOTRTra
         GUNDABAD_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY,
                 new LOTRTradeEntry(new ItemStack(CinderLoE.flatbread), 2),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.maggotlessbread), 3),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 0), 6666),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 0), 500),
                 new LOTRTradeEntry(new ItemStack(Items.bread), 2),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.axeBronze), 10),
                 new LOTRTradeEntry(new ItemStack(Items.iron_axe), 12),

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

@@ -59,7 +59,7 @@ public class HalfTrollBrewer extends LOTREntityHalfTroll implements LOTRTradeabl
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugOrcDraught, 1, 9999), 8),
                 new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugOrcDraught, 1, 3), 150),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.mugOrcBrew, 1, 9999), 200),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 2), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 2), 500));
         ((MixinLOTRTradeEntries)HALF_TROLL_BREWER_BUY).vessels(LOTRFoods.HALF_TROLL_DRINK);
 
         HALF_TROLL_BREWER_SELL = new LOTRTradeEntries(TradeType.SELL,

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

@@ -51,7 +51,7 @@ public class HalfTrollButcher extends LOTREntityHalfTroll implements LOTRTradeab
         HALF_TROLL_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY,
                 new LOTRTradeEntry(new ItemStack(CinderLoE.flatbread), 2),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.maggotlessbread), 3),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 0), 6666),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 0), 500),
                 new LOTRTradeEntry(new ItemStack(Items.bread), 2),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.battleaxeHalfTroll), 10),
                 new LOTRTradeEntry(new ItemStack(Items.flint, 3), 8),

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

@@ -59,7 +59,7 @@ public class IsengardOrcBrewer extends LOTREntityIsengardSnaga implements LOTRTr
                 new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugOrcDraught, 1, 3), 180),
                 new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugOrcDraught, 1, 4), 300),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.mugOrcBrew, 1, 9999), 200),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 2), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 2), 500));
         ((MixinLOTRTradeEntries)URUK_BREWER_BUY).vessels(LOTRFoods.ORC_DRINK);
 
         URUK_BREWER_SELL = new LOTRTradeEntries(TradeType.SELL,

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

@@ -55,7 +55,7 @@ public class IsengardOrcButcher extends LOTREntityIsengardSnaga implements LOTRT
         URUK_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY,
                 new LOTRTradeEntry(new ItemStack(CinderLoE.flatbread), 2),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.maggotlessbread), 3),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 0), 6666),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 0), 500),
                 new LOTRTradeEntry(new ItemStack(Items.bread), 2),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.axeUruk), 10),
                 new LOTRTradeEntry(new ItemStack(Items.cooked_chicken), 5),

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

@@ -62,7 +62,7 @@ public class MordorOrcBrewer extends LOTREntityMordorOrc implements LOTRTradeabl
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugMorgulDraught, 1, 9999), 8),
                 new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugMorgulDraught, 1, 3), 150),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.mugOrcBrew, 1, 9999), 200),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 2), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 2), 500));
         ((MixinLOTRTradeEntries)MORDOR_BREWER_BUY).vessels(LOTRFoods.ORC_DRINK);
 
         MORDOR_BREWER_SELL = new LOTRTradeEntries(TradeType.SELL,

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

@@ -54,7 +54,7 @@ public class MordorOrcButcher extends LOTREntityMordorOrc implements LOTRTradeab
         MORDOR_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY,
                 new LOTRTradeEntry(new ItemStack(CinderLoE.flatbread), 2),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.maggotlessbread), 3),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 0), 6666),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 0), 500),
                 new LOTRTradeEntry(new ItemStack(Items.bread), 2),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.axeOrc), 10),
                 new LOTRTradeEntry(new ItemStack(Items.cooked_chicken), 5),

src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRGuiTrade.java

@@ -0,0 +1,103 @@
+package com.zivilon.cinder_loe.mixins;
+
+import lotr.common.inventory.LOTRSlotTrade;
+import com.zivilon.cinder_loe.util.Utilities;
+import lotr.client.gui.LOTRGuiTrade;
+import lotr.common.entity.npc.*;
+import lotr.common.entity.npc.LOTRTradeEntries.TradeType;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
+import net.minecraft.client.gui.Gui;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+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;
+import org.lwjgl.opengl.GL11;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.util.StatCollector;
+
+import java.lang.reflect.Field;
+import java.util.Map;
+
+@Mixin(LOTRGuiTrade.class)
+public abstract class MixinLOTRGuiTrade {
+    @Shadow
+    private void renderCost(String s, int x, int y) {}
+    @Shadow
+    private static int lockedTradeColor = -1610612736;
+    @Shadow
+    private void drawCenteredString(String s, int i, int j, int k) {}
+
+    @Overwrite(remap = false)
+    private void renderTradeSlot(LOTRSlotTrade slot) {
+        LOTRTradeEntry trade = slot.getTrade();
+        if (trade != null) {
+            int lockedPixels = 0;
+            boolean inFront = false;
+            if (!trade.isAvailable()) {
+                lockedPixels = 16;
+                inFront = true;
+            } else {
+                lockedPixels = trade.getLockedProgressForSlot();
+                inFront = false;
+            }
+            if (lockedPixels > 0) {
+                GL11.glPushMatrix();
+                if (inFront)
+                    GL11.glTranslatef(0.0F, 0.0F, 200.0F);
+                int x = slot.xDisplayPosition;
+                int y = slot.yDisplayPosition;
+                drawRect(x, y, x + lockedPixels, y + 16, lockedTradeColor);
+                GL11.glPopMatrix();
+            }
+            if (trade.isAvailable()) {
+                int cost = slot.cost();
+                if (cost > 0)
+                    renderCost(Integer.toString(cost), slot.xDisplayPosition + 8, slot.yDisplayPosition + 22);
+            } else {
+                if (trade.getLockedProgress() > 75.0F) {
+                    renderCost(StatCollector.translateToLocal("container.lotr.trade.spice_locked"), slot.xDisplayPosition + 8, slot.yDisplayPosition + 22);
+                } else {
+                    drawCenteredString(StatCollector.translateToLocal("container.lotr.trade.locked"), slot.xDisplayPosition + 8, slot.yDisplayPosition + 22, 4210752);
+                }
+            }
+        }
+    }
+    private static void drawRect(int p_73734_0_, int p_73734_1_, int p_73734_2_, int p_73734_3_, int p_73734_4_) {
+        int j1;
+
+        if (p_73734_0_ < p_73734_2_) {
+            j1 = p_73734_0_;
+            p_73734_0_ = p_73734_2_;
+            p_73734_2_ = j1;
+        }
+
+        if (p_73734_1_ < p_73734_3_) {
+            j1 = p_73734_1_;
+            p_73734_1_ = p_73734_3_;
+            p_73734_3_ = j1;
+        }
+
+        float f3 = (float)(p_73734_4_ >> 24 & 255) / 255.0F;
+        float f = (float)(p_73734_4_ >> 16 & 255) / 255.0F;
+        float f1 = (float)(p_73734_4_ >> 8 & 255) / 255.0F;
+        float f2 = (float)(p_73734_4_ & 255) / 255.0F;
+        Tessellator tessellator = Tessellator.instance;
+        GL11.glEnable(GL11.GL_BLEND);
+        GL11.glDisable(GL11.GL_TEXTURE_2D);
+        OpenGlHelper.glBlendFunc(770, 771, 1, 0);
+        GL11.glColor4f(f, f1, f2, f3);
+        tessellator.startDrawingQuads();
+        tessellator.addVertex((double)p_73734_0_, (double)p_73734_3_, 0.0D);
+        tessellator.addVertex((double)p_73734_2_, (double)p_73734_3_, 0.0D);
+        tessellator.addVertex((double)p_73734_2_, (double)p_73734_1_, 0.0D);
+        tessellator.addVertex((double)p_73734_0_, (double)p_73734_1_, 0.0D);
+        tessellator.draw();
+        GL11.glEnable(GL11.GL_TEXTURE_2D);
+        GL11.glDisable(GL11.GL_BLEND);
+    }
+}

src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRTickHandlerClient.java

@@ -0,0 +1,14 @@
+package com.zivilon.cinder_loe.mixins;
+
+import lotr.client.LOTRTickHandlerClient;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+
+@Mixin({LOTRTickHandlerClient.class})
+public class MixinLOTRTickHandlerClient {
+  @ModifyConstant(method = {"onPreRenderGameOverlay(Lnet/minecraftforge/client/event/RenderGameOverlayEvent$Pre;)V"}, constant = {@Constant(floatValue = 80.0F, ordinal = 1)}, remap = false)
+  public float modify_frost_intensity(float original) {
+    return 160.0F;
+  }
+}

src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRTraderNPCInfo.java

@@ -0,0 +1,41 @@
+package com.zivilon.cinder_loe.mixins;
+
+import com.zivilon.cinder_loe.CinderLoE;
+import lotr.common.LOTRLevelData;
+import lotr.common.entity.npc.*;
+import lotr.common.entity.npc.LOTRTradeEntries.TradeType;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+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;
+
+import java.lang.reflect.Field;
+import java.util.Map;
+
+@Mixin(LOTRTraderNPCInfo.class)
+public class MixinLOTRTraderNPCInfo {
+    @Shadow
+    private LOTREntityNPC theEntity;
+    @Shadow
+    private int valueSinceRefresh;
+    @Shadow
+    private int timeSinceTrade;
+    @Shadow
+    public void sendClientPacket(EntityPlayer entityplayer) {}
+
+    public void onTrade(EntityPlayer entityplayer, LOTRTradeEntry trade, LOTRTradeEntries.TradeType type, int value) {
+        ItemStack trade_item = trade.createTradeItem();
+        ((LOTRTradeable)this.theEntity).onPlayerTrade(entityplayer, type, trade_item);
+        LOTRLevelData.getData(entityplayer).getFactionData(this.theEntity.getFaction()).addTrade();
+        if (trade_item.getItem() == CinderLoE.spiceIngredient) trade.doTransaction(999999999);
+        trade.doTransaction(value);
+        this.timeSinceTrade = 0;
+        this.valueSinceRefresh += value;
+        sendClientPacket(entityplayer);
+    }
+}

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

@@ -220,7 +220,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                         new LOTRTradeEntry(new ItemStack(LOTRMod.amethyst), 12),
                         new LOTRTradeEntry(new ItemStack(LOTRMod.topaz), 12),
                         new LOTRTradeEntry(new ItemStack(CinderLoE.spicedHam, 1), 6),
-                        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 10), 6666));
+                        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 10), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)DWARF_MINER_BUY).setVessels(LOTRFoods.DWARF_DRINK);
 
         DWARF_MINER_SELL = new LOTRTradeEntries(TradeType.SELL,
@@ -269,7 +269,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.bootsFur), 12),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.wargArmorMordor), 25),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.cinderFurItem, 1, 1), 2),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 1), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 1), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)MORDOR_TRADER_BUY).setVessels(LOTRFoods.ORC_DRINK);
 
         MORDOR_TRADER_SELL = new LOTRTradeEntries(TradeType.SELL,
@@ -338,7 +338,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(Items.arrow, 4), 3),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.hithlain), 4),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.chestMallorn), 20),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 8), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 8), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)GALADHRIM_TRADER_BUY).setVessels(LOTRFoods.ELF_DRINK);
 
 
@@ -370,7 +370,11 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(CinderLoE.cinderFurItem, 1, 1), 2),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.cinderFurItem, 1, 0), 2),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.wargArmorUruk), 25),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 1), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.helmetOrthancGuard), 100),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.bodyOrthancGuard), 100),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.legsOrthancGuard), 100),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.bootsOrthancGuard), 100),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 1), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)URUK_HAI_TRADER_BUY).setVessels(LOTRFoods.ORC_DRINK);
 
         URUK_HAI_TRADER_SELL = new LOTRTradeEntries(TradeType.SELL,
@@ -440,7 +444,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugAppleJuice), 6),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.flatbread, 1), 3),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.lightStew, 1), 6),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)DUNLENDING_BARTENDER_BUY).setVessels(LOTRFoods.DUNLENDING_DRINK);
 
         ROHAN_MEADHOST_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -462,7 +466,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugMilk), 3),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.flatbread, 1), 3),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.lightStew, 1), 6),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)ROHAN_MEADHOST_BUY).setVessels(LOTRFoods.ROHAN_DRINK);
 
         BLUE_DWARF_MINER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -487,7 +491,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.amethyst), 12),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.topaz), 12),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.spicedHam, 1), 6),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 11), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 11), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)BLUE_DWARF_MINER_BUY).setVessels(LOTRFoods.DWARF_DRINK);
 
         BLUE_DWARF_MINER_SELL = new LOTRTradeEntries(TradeType.SELL,
@@ -538,7 +542,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.amethyst), 12),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.topaz), 12),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.spicedHam, 1), 6),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 9), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 9), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)BLUE_DWARF_MERCHANT_BUY).setVessels(LOTRFoods.DWARF_DRINK);
 
         BLUE_DWARF_MERCHANT_SELL = new LOTRTradeEntries(TradeType.SELL, new LOTRTradeEntry(new ItemStack(Items.iron_ingot), 3), new LOTRTradeEntry(new ItemStack(Items.coal, 2, Short.MAX_VALUE), 1), new LOTRTradeEntry(new ItemStack(Items.gold_ingot), 15), new LOTRTradeEntry(new ItemStack(LOTRMod.copper), 3), new LOTRTradeEntry(new ItemStack(LOTRMod.tin), 3), new LOTRTradeEntry(new ItemStack(LOTRMod.bronze), 3), new LOTRTradeEntry(new ItemStack(LOTRMod.diamond), 25), new LOTRTradeEntry(new ItemStack(LOTRMod.sapphire), 12), new LOTRTradeEntry(new ItemStack(LOTRMod.opal), 10), new LOTRTradeEntry(new ItemStack(LOTRMod.pearl), 25), new LOTRTradeEntry(new ItemStack(Items.cooked_beef), 3), new LOTRTradeEntry(new ItemStack(Items.cooked_porkchop), 3), new LOTRTradeEntry(new ItemStack(LOTRMod.muttonCooked), 3), new LOTRTradeEntry(new ItemStack(Items.cooked_chicken), 3), new LOTRTradeEntry(new ItemStack(LOTRMod.gammon), 3), new LOTRTradeEntry(new ItemStack(LOTRMod.deerCooked), 3), new LOTRTradeEntry(new ItemStack(Items.cooked_fished), 3), new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitCooked), 3), new LOTRTradeEntry(new ItemStack(Items.bread), 2));
@@ -570,7 +574,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.bootsFur), 12),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.cinderFurItem, 1, 0), 2),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.wargArmorAngmar), 25),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 1), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 1), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)ANGMAR_TRADER_BUY).setVessels(LOTRFoods.ORC_DRINK);
 
         ANGMAR_TRADER_SELL = new LOTRTradeEntries(TradeType.SELL,
@@ -613,7 +617,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.hammerDolGuldur), 16),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.maggotyBread), 4),
                 new LOTRTradeEntry(new ItemStack(Items.string), 2),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 1), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 1), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)DOL_GULDUR_TRADER_BUY).setVessels(LOTRFoods.ORC_DRINK);
 
         DOL_GULDUR_TRADER_SELL = new LOTRTradeEntries(TradeType.SELL,
@@ -677,7 +681,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.amethyst), 12),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.topaz), 12),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.pearl), 50),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 1), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 1), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)HALF_TROLL_SCAVENGER_BUY).setVessels(LOTRFoods.HALF_TROLL_DRINK);
 
         GALADHRIM_SMITH_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -754,7 +758,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 1), 200),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 0), 200),
                 new LOTRTradeEntry(new ItemStack(Items.arrow, 4), 3),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 7), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 7), 500));
 
         MOREDAIN_HUNTSMAN_BUY = new LOTRTradeEntries(TradeType.BUY,
                 new LOTRTradeEntry(new ItemStack(LOTRMod.lionFur), 5),
@@ -770,7 +774,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(CinderLoE.bodyWarlord), 100),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.legsWarlord), 100),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.bootsWarlord), 100),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 4), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 4), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)MOREDAIN_HUNTSMAN_BUY).setVessels(LOTRFoods.MOREDAIN_DRINK);
 
         IRON_HILLS_MERCHANT_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -810,7 +814,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.amethyst), 12),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.topaz), 12),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.spicedHam, 1), 6),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 9), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 9), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)IRON_HILLS_MERCHANT_BUY).setVessels(LOTRFoods.DWARF_DRINK);
 
         TAUREDAIN_SHAMAN_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -826,7 +830,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugTauredainCocoa, 1, 9999), 12),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugTauredainCure), 20),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.chocolatebar, 1), 6),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)TAUREDAIN_SHAMAN_BUY).setVessels(LOTRFoods.TAUREDAIN_DRINK);
 
         DWARF_SMITH_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -930,7 +934,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugRedGrapeJuice), 6),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugWhiteGrapeJuice), 6),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mug), 2),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 7), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 7), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)DORWINION_VINTNER_BUY).setVessels(LOTRFoods.DORWINION_DRINK);
 
         DORWINION_MERCHANT_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -957,7 +961,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.rhunFlower, 1, 3), 5),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.rhunFlower, 1, 4), 5),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.doubleFlower, 1, 0), 12),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 7), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 7), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)DORWINION_MERCHANT_BUY).setVessels(LOTRFoods.DORWINION_DRINK);
 
         GONDOR_BARTENDER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -989,7 +993,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugWhiteWine, 1, 9999), 12),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.flatbread, 1), 3),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.lightStew, 1), 6),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)GONDOR_BARTENDER_BUY).setVessels(LOTRFoods.GONDOR_DRINK);
 
         GONDOR_BREWER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1026,7 +1030,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugCranberryJuice), 5),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugElderberryJuice), 5),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugPomegranateJuice), 10),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)GONDOR_BREWER_BUY).setVessels(LOTRFoods.GONDOR_DRINK);
 
         GONDOR_FLORIST_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1060,7 +1064,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.haradFlower, 1, 3), 30),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.doubleFlower, 1, 2), 45),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.doubleFlower, 1, 3), 45),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 5), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 5), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)GONDOR_FLORIST_BUY).setVessels(LOTRFoods.GONDOR_DRINK);
 
         GONDOR_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1074,7 +1078,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.camelRaw), 8),
                 new LOTRTradeEntry(new ItemStack(Items.leather), 3),
                 new LOTRTradeEntry(new ItemStack(Items.feather), 3),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 4), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 4), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)GONDOR_BUTCHER_BUY).setVessels(LOTRFoods.GONDOR_DRINK);
 
         ROHAN_BREWER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1100,7 +1104,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugRaspberryJuice), 5),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugCranberryJuice), 5),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugElderberryJuice), 5),
-        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666));
+        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)ROHAN_BREWER_BUY).setVessels(LOTRFoods.ROHAN_DRINK);
 
         ROHAN_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1113,7 +1117,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.deerRaw), 4),
                 new LOTRTradeEntry(new ItemStack(Items.leather), 3),
                 new LOTRTradeEntry(new ItemStack(Items.feather), 3),
-        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 4), 6666));
+        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 4), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)ROHAN_BUTCHER_BUY).setVessels(LOTRFoods.ROHAN_DRINK);;
 
         DUNEDAIN_BLACKSMITH_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1178,7 +1182,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(Items.leather), 3),
                 new LOTRTradeEntry(new ItemStack(Items.feather), 3),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.spicedHam, 1), 6),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 4), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 4), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)RHUN_BUTCHER_BUY).setVessels(LOTRFoods.RHUN_DRINK);
 
         RHUN_BREWER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1217,7 +1221,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugCranberryJuice), 5), new LOTRTradeEntry(new ItemStack(LOTRMod.mugElderberryJuice), 5),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugRedGrapeJuice), 8), new LOTRTradeEntry(new ItemStack(LOTRMod.mugWhiteGrapeJuice), 8),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugPomegranateJuice), 5),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)RHUN_BREWER_BUY).setVessels(LOTRFoods.RHUN_DRINK);
 
         RHUN_BARTENDER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1244,7 +1248,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugPomegranateWine, 1, 9999), 12),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugAraq, 1, 9999), 10),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugSourMilk, 1, 9999), 8),
-        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666));
+        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)RHUN_BARTENDER_BUY).setVessels(LOTRFoods.RHUN_DRINK);
 
 
@@ -1285,7 +1289,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.lembas), 16),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugMiruvor, 1, 9999), 8),
                 new LOTRTradeEntry(new ItemStack(Items.arrow, 4), 3),
-        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 6), 6666));
+        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 6), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)RIVENDELL_TRADER_BUY).setVessels(LOTRFoods.ELF_DRINK);
 
         GUNDABAD_TRADER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1319,7 +1323,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(CinderLoE.cinderFurItem, 1, 1), 2),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.cinderFurItem, 1, 0), 2),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.bootsFur), 12),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 1), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 1), 500));
                 ((MixinLOTRTradeEntriesOverrides)(Object)GUNDABAD_TRADER_BUY).setVessels(LOTRFoods.ORC_DRINK);
 
         GUNDABAD_TRADER_SELL = new LOTRTradeEntries(TradeType.SELL,
@@ -1491,7 +1495,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(CinderLoE.flatbread, 1), 3),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.lightStew, 1), 6),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.fruitsalad, 1), 6),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666));
+                new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)HARNEDOR_BARTENDER_BUY).setVessels(LOTRFoods.HARNEDOR_DRINK);
 
         HARAD_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1504,7 +1508,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.camelRaw), 4),
                 new LOTRTradeEntry(new ItemStack(Items.leather), 3),
                 new LOTRTradeEntry(new ItemStack(Items.feather), 3),
-        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 4), 6666));
+        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 4), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)HARAD_BUTCHER_BUY).setVessels(LOTRFoods.SOUTHRON_DRINK);
 
         HARAD_BREWER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1541,7 +1545,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugElderberryJuice), 5),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugPomegranateJuice), 10),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugMangoJuice), 8),
-        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666));
+        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)HARAD_BREWER_BUY).setVessels(LOTRFoods.SOUTHRON_DRINK);
 
         HARAD_FLORIST_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1574,7 +1578,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.doubleFlower, 1, 1), 15),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.morgulShroom, 1, 0), 20),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.spice, 1), 10),
-        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 5), 6666));
+        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 5), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)HARAD_FLORIST_BUY).setVessels(LOTRFoods.SOUTHRON_DRINK);
 
         NOMAD_ARMOURER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1615,7 +1619,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.zebraRaw), 6),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.rhinoRaw), 8),
                 new LOTRTradeEntry(new ItemStack(Items.rotten_flesh), 3),
-        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 4), 6666));
+        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 4), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)GULF_HUNTER_BUY).setVessels(LOTRFoods.GULF_HARAD_DRINK);
 
         SOUTHRON_BARTENDER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1653,7 +1657,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(CinderLoE.flatbread, 1), 3),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.lightStew, 1), 6),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.fruitsalad, 1), 6),
-        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666));
+        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)SOUTHRON_BARTENDER_BUY).setVessels(LOTRFoods.SOUTHRON_DRINK);
 
         GULF_BARTENDER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1697,7 +1701,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(CinderLoE.flatbread, 1), 3),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.lightStew, 1), 6),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.fruitsalad, 1), 6),
-        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666));
+        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)GULF_BARTENDER_BUY).setVessels(LOTRFoods.GULF_HARAD_DRINK);
 
         TAUREDAIN_SMITH_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1817,7 +1821,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.hobbitPipe), 25),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.flatbread, 1), 3),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.lightStew, 1), 6),
-        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666));
+        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)BREE_INNKEEPER_BUY).setVessels(LOTRFoods.BREE_DRINK);
 
         BREE_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1830,7 +1834,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.deerRaw), 4),
                 new LOTRTradeEntry(new ItemStack(Items.leather), 3),
                 new LOTRTradeEntry(new ItemStack(Items.feather), 3),
-        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 4), 6666));
+        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 4), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)BREE_BUTCHER_BUY).setVessels(LOTRFoods.BREE_DRINK);
 
         BREE_BREWER_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1861,7 +1865,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugRaspberryJuice), 5),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugCranberryJuice), 5),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.mugElderberryJuice), 5),
-        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666));
+        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)BREE_BREWER_BUY).setVessels(LOTRFoods.BREE_DRINK);
 
         BREE_FLORIST_BUY = new LOTRTradeEntries(TradeType.BUY,
@@ -1885,7 +1889,7 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(LOTRMod.doubleFlower, 1, 1), 10),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.doubleFlower, 1, 0), 25),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.shireHeather, 1, 0), 6),
-        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 5), 6666));
+        new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 5), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)BREE_FLORIST_BUY).setVessels(LOTRFoods.BREE_DRINK);
     }
 

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

@@ -110,8 +110,8 @@ item.lotr:mouthofsauronSword.name=Sword of the Lieutenant
 
 item.lotr:welfRelic.name=Horn of the Greenwood Stag
 item.lotr:ulukai.name=Ulûkai
-item.lotr:helmetDorLomin.name=Dragonhelm of Dor-Lomin
-item.lotr:bodyIsildur.name=Isildurs Chestplate
+item.lotr:helmetDorLomin.name=Dragon-helm of Dor-Lomin
+item.lotr:bodyIsildur.name=Isildur's Chestplate
 item.lotr:bowLurtz.name=Lurtz' Bow
 
 item.lotr:greatswordAngmar.name=Angmar Greatsword
@@ -454,10 +454,10 @@ item.lotr:spice_human.name=Kings Herbs
 item.lotr:spice_elven.name=Silverblend
 item.lotr:spice_orcish.name=Morgul Salts
 item.lotr:spice_dwarven.name=Stonegrit
-item.lotr:mugElfBrew.name=Saturated Miruvor
-item.lotr:mugOrcBrew.name=Concentrated Orc Draught
-item.lotr:mugHumanBrew.name=Athelas Tea
-item.lotr:mugDwarfBrew.name=Dwarven Stout
+item.lotr:mugElfBrew.name=Eldamar Brew
+item.lotr:mugOrcBrew.name=Angband Draught
+item.lotr:mugHumanBrew.name=Westernesse Brew
+item.lotr:mugDwarfBrew.name=Mirrormere Tonic
 item.fine_bone_dust.name=Fine Bone Dust
 item.dried_morgul_caps.name=Dried Morgul Caps
 item.blighted_root.name=Blighted Root
@@ -501,3 +501,5 @@ cinder_loe.creativetab.tabCharacterLoE=LoE Character
 
 #Biomes
 lotr.biome.mistyForest.name=Misty Forest
+
+container.lotr.trade.spice_locked=N/A

src/main/resources/mixins.cinder_loe.json

@@ -66,7 +66,10 @@
     "MixinLOTREntityAIOrcSkirmish",
     "MixinLOTREntityMountainTrollChieftain",
     "overrides.MixinLOTRFaction",
-    "MixinLOTREnchantmentWeaponSpecial"
+    "MixinLOTREnchantmentWeaponSpecial",
+    "MixinLOTRTraderNPCInfo",
+    "MixinLOTRGuiTrade",
+    "MixinLOTRTickHandlerClient"
   ],
   "client": []
 }