Initiating Suicide Protocol:

> Fixed unit leveling being broken
- future be ready for banner bearers to be modified
> Added 12 Ingredients to create spices with
- Morgul Caps from Mordor/Isengard traders
- Fine Bone Dust from Gundabad/Half Troll traders
- Blighted Roots from Dol Guldur/Angmar traders
- Curing salts from Dwarven Merchants
- Miners Lichen from Blue dwarf miners
- underroot from Durins folk miners
- Willowbark from every florist/shaman ever to exist
- brambleberry from any butcher/hunter ever to exist
- coldbreath leaf from any brewer or innkeeper ever to exist
- Dried mallorn leaves from lothlorien merchants
- niphredil seeds from wood elf smiths, dorwinion vintner elves, dorwinion merchants
- seregon from rivendell merchants
> Made textures for all 12 ingredients, and the 4 final spice products
- Gave the spices new names

> Orc traders will gladly buy your maggoty bread for very bad rates (bad for you)
> Bladorthin and red dwarf smiths now know what repair and upgrade kits are
> Crafting two of these kits together will make a field repair kit
> added field repair kits, they take 10 seconds to apply, but repair 5% of your current armor durability
> Orcs no longer should be nerfed by mevans more than they already are
> added some achievements

> Shinare why did the developer break up with their Enum?
Because it just wasn’t their type. 😎

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

@@ -1,6 +1,8 @@
 package com.zivilon.cinder_loe;
 
 import com.zivilon.cinder_loe.blocks.*;
+import com.zivilon.cinder_loe.blocks.plants.cabbageCrop;
+import com.zivilon.cinder_loe.blocks.plants.onionCrop;
 import com.zivilon.cinder_loe.character.CharacterEventListener;
 import com.zivilon.cinder_loe.character.CharacterRoleAPI;
 import com.zivilon.cinder_loe.client.render.*;
@@ -30,10 +32,10 @@ import com.zivilon.cinder_loe.network.*;
 import com.zivilon.cinder_loe.potion.LoEPotions;
 import com.zivilon.cinder_loe.tileentity.*;
 import com.zivilon.cinder_loe.util.Utilities;
-import com.zivilon.cinder_loe.world.biome.CinderBiome;
 import com.zivilon.cinder_loe.world.event.*;
 import com.zivilon.cindercore.CinderCore;
 
+import net.minecraft.item.ItemSeedFood;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -182,6 +184,7 @@ public class CinderLoE {
     public static Item spiceHuman;
     public static Item spiceOrcish;
     public static Item spiceDwarven;
+    public static Item spiceIngredient;
 
 
     // Event/special
@@ -206,6 +209,7 @@ public class CinderLoE {
 
     // Misc
     public static Item forgingKit;
+    public static Item fieldRepairKit;
     public static Item cinderFurItem;
 
     // Common tools/weapons
@@ -555,13 +559,14 @@ public class CinderLoE {
             e.printStackTrace();
         }
         // Food
-       // onion = new ItemSeedFood(3, 0.3f, CinderLoE.onionCrop, Blocks.farmland).setUnlocalizedName("lotr:onion").setTextureName("lotr:onion");
+
         //cabbage = new ItemSeedFood(3, 0.3f, CinderLoE.cabbageCrop, Blocks.farmland).setUnlocalizedName("lotr:cabbage").setTextureName("lotr:cabbage");;
         spice = new CinderItemFood(1, 0.0f, false).setdamageAmount(2).setPotionEffect(Potion.moveSpeed.id, 5,0,100).setUnlocalizedName("lotr:spice").setTextureName("lotr:spice");
         spicedHam = new CinderItemFood(9, 0.6f, true).setdamageAmount(2).setPotionEffect(Potion.moveSpeed.id, 15, 0, 100).setUnlocalizedName("lotr:spicedHam").setTextureName("lotr:spicedHam");
        // spice = new LOTRItemFood(1, 0.0f, false).setPotionEffect(Potion.moveSpeed.id, 10,0,100).setUnlocalizedName("lotr:spice");
         pelmen = new LOTRItemFood(4, 5.0f, true).setUnlocalizedName("lotr:pelmen").setTextureName("lotr:pelmen");
-        onion = new LOTRItemFood(3, 0.3f, false).setUnlocalizedName("lotr:onion").setTextureName("lotr:onion");
+        onion = new ItemSeedFood(2, 0.3f, onionCrop, Blocks.farmland).setUnlocalizedName("lotr:onion").setTextureName("lotr:onion");
+
         cabbage = new LOTRItemFood(4, 0.5f, false).setUnlocalizedName("lotr:cabbage").setTextureName("lotr:cabbage");
         lightStew = new LOTRItemStew(6, 0.7f, false).setPotionEffect(Potion.damageBoost.id, 60, 0, 100).setUnlocalizedName("lotr:lightStew").setTextureName("lotr:lightStew");
         chocolatebar = new LOTRItemFood(4,0.3f, false).setUnlocalizedName("lotr:chocolatebar").setTextureName("lotr:chocolatebar");
@@ -577,6 +582,8 @@ public class CinderLoE {
         spiceHuman = new Item().setUnlocalizedName("lotr:spice_human").setTextureName("lotr:spice_human");
         spiceOrcish = new Item().setUnlocalizedName("lotr:spice_orcish").setTextureName("lotr:spice_orcish");
         spiceDwarven = new Item().setUnlocalizedName("lotr:spice_dwarven").setTextureName("lotr:spice_dwarven");
+        spiceIngredient = (new spiceIngredient());
+
         mugElfBrew = (new LoEItemMug(0.0F)).setDrinkStats(20, 1.0F).addPotionEffect(Potion.moveSpeed.id, 60, 1).toxic().setUnlocalizedName("lotr:mugElfBrew");
         mugHumanBrew = (new LoEItemMug(0.0F)).setDrinkStats(20, 1.0F).addPotionEffect(Potion.regeneration.id, 60, 1).toxic().setUnlocalizedName("lotr:mugHumanBrew");
         mugOrcBrew = (new LoEItemMug(0.0F)).setDrinkStats(20, 1.0F).addPotionEffect(Potion.damageBoost.id, 60, 1).toxic().setUnlocalizedName("lotr:mugOrcBrew");
@@ -661,6 +668,7 @@ public class CinderLoE {
         ItemRegistration.register(spiceHuman, "spiceHuman",6919);
         ItemRegistration.register(spiceOrcish, "spiceOrcish",6920);
         ItemRegistration.register(spiceDwarven, "spiceDwarven",6921);
+        ItemRegistration.register(spiceIngredient, "spiceIngredient",6922);
 
         ItemRegistration.register(spawnEgg, "spawnEgg", 6003);
 
@@ -702,9 +710,11 @@ public class CinderLoE {
         bootsJade = (new LOTRItemArmor(MATERIAL_JADE, 3)).setUnlocalizedName("lotr:bootsJade").setTextureName("lotr:bootsJade").setCreativeTab(null);
 
         forgingKit = (new ForgingKit());
+        fieldRepairKit = new FieldRepairKit().setUnlocalizedName("lotr:field_repair_kit").setTextureName("lotr:field_repair_kit");
 
         ItemRegistration.register(frostblade, "frostblade", 6200);
         ItemRegistration.register(forgingKit,"forgingKit",6001);
+        ItemRegistration.register(fieldRepairKit,"fieldRepairKit",6002);
         ItemRegistration.register(whip, "whip", 6110);
         ItemRegistration.register(daggervoid, "daggerVoid", 6201);
         ItemRegistration.register(spearsolidgold, "spearsolidgold", 6202);
@@ -1160,8 +1170,7 @@ public class CinderLoE {
     @SideOnly(Side.SERVER)
     public void onWorldLoad(WorldEvent.Load event) {
         // == Crop Blocks ==
-        CinderCore.registerItemFallback(Block.getIdFromBlock(onionCrop), Block.getIdFromBlock(LOTRMod.turnipCrop), "cinder_loe", "1.2.1");
+
-        CinderCore.registerItemFallback(Block.getIdFromBlock(cabbageCrop), Block.getIdFromBlock(LOTRMod.lettuceCrop), "cinder_loe", "1.2.1");
         // == Food Items ==
         CinderCore.registerItemFallback(Item.getIdFromItem(onion), Item.getIdFromItem(LOTRMod.turnip), "cinder_loe", "1.2.1");
         CinderCore.registerItemFallback(Item.getIdFromItem(cabbage), Item.getIdFromItem(LOTRMod.lettuce), "cinder_loe", "1.2.1");

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

@@ -64,7 +64,8 @@ public class BladorthinSmith extends LOTREntityDorwinionElf implements LOTRTrade
                 new LOTRTradeEntry(new ItemStack(LOTRMod.legsDorwinionElf), 22),
                 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(Items.arrow, 4), 3),
+                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/trader/RedDwarfSmith.java

@@ -76,7 +76,9 @@ public class RedDwarfSmith extends LOTREntityDwarf implements LOTRTradeable.Smit
                 new LOTRTradeEntry(new ItemStack(CinderLoE.legsRedDwarf), 30),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.bootsRedDwarf), 22),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.boarArmorRedDwarf), 25),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.barsRedDwarf, 8), 20)
+                new LOTRTradeEntry(new ItemStack(CinderLoE.barsRedDwarf, 8), 20),
+                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/items/FieldRepairKit.java

@@ -0,0 +1,62 @@
+package com.zivilon.cinder_loe.items;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class FieldRepairKit extends ItemFood {
+
+    private int damageAmount;
+    public FieldRepairKit() {
+        super(0, 0.0F, false); // No hunger, no saturation
+        this.setAlwaysEdible(); // Allow eating even at full hunger
+    }
+
+    @Override
+    public int getItemStackLimit() {
+        return 1;
+    }
+
+    @Override
+    public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) {
+        if (!world.isRemote) {
+            world.playSoundAtEntity(player, "random.anvil_break", 1.0F, 1.0F);
+        }
+        return super.onEaten(stack, world, player);
+    }
+
+    @Override
+    protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) {
+        if (!world.isRemote) {
+            for (int i = 0; i < 4; i++) {
+                ItemStack armor = player.getCurrentArmor(i);
+                if (armor != null && armor.getItem() instanceof ItemArmor && armor.isItemDamaged()) {
+                    int maxDamage = armor.getMaxDamage();
+                    int repairAmount = Math.max(1, (int)(maxDamage * 0.05));
+                    armor.setItemDamage(Math.max(0, armor.getItemDamage() - repairAmount));
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onUsingTick(ItemStack stack, EntityPlayer player, int count) {
+        if (!player.worldObj.isRemote && count % 20 == 0) {
+            player.worldObj.playSoundAtEntity(player, "random.anvil_use", 0.7F, 1.0F);
+        }
+    }
+
+    @Override
+    public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+        player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
+        return stack;
+    }
+
+    @Override
+    public int getMaxItemUseDuration(ItemStack stack) {
+        return 200;
+    }
+}

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

@@ -0,0 +1,85 @@
+package com.zivilon.cinder_loe.items;
+
+import com.zivilon.cinder_loe.LoECreativeTabs;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+import java.util.List;
+
+public class spiceIngredient extends Item {
+    public IIcon[] icons;
+
+    public spiceIngredient() {
+        this.setHasSubtypes(true);
+        setMaxStackSize(64);
+        this.setMaxDamage(0);
+        setCreativeTab(LoECreativeTabs.tabMiscLoE);
+    }
+
+        @Override
+    public IIcon getIconFromDamage(int damage) {
+        if (damage < 0 || damage >= icons.length) {
+            damage = 0;
+        }
+        return this.icons[damage];
+    }
+
+        @Override
+    public void registerIcons(IIconRegister iconRegister) {
+        this.icons = new IIcon[12];
+        this.icons[0] = iconRegister.registerIcon("lotr:fine_bone_dust");
+        this.icons[1] = iconRegister.registerIcon("lotr:dried_morgul_caps");
+        this.icons[2] = iconRegister.registerIcon("lotr:blighted_root");
+        this.icons[3] = iconRegister.registerIcon("lotr:coldbreath_leaf");
+        this.icons[4] = iconRegister.registerIcon("lotr:brambleberry");
+        this.icons[5] = iconRegister.registerIcon("lotr:willow_bark");
+        this.icons[6] = iconRegister.registerIcon("lotr:seregon");
+        this.icons[7] = iconRegister.registerIcon("lotr:niphredil_seeds");
+        this.icons[8] = iconRegister.registerIcon("lotr:dried_mallorn");
+        this.icons[9] = iconRegister.registerIcon("lotr:curing_salts");
+        this.icons[10] = iconRegister.registerIcon("lotr:underroot");
+        this.icons[11] = iconRegister.registerIcon("lotr:miners_lichen");
+    }
+
+    @Override
+    public String getUnlocalizedName(ItemStack item) {
+        switch(item.getItemDamage()) {
+            case 0:
+                return "item.fine_bone_dust";
+            case 1:
+                return "item.dried_morgul_caps";
+            case 2:
+                return "item.blighted_root";
+            case 3:
+                return "item.coldbreath_leaf";
+            case 4:
+                return "item.brambleberry";
+            case 5:
+                return "item.willow_bark";
+            case 6:
+                return "item.seregon";
+            case 7:
+                return "item.niphredil_seeds";
+            case 8:
+                return "item.dried_mallorn";
+            case 9:
+                return "item.curing_salts";
+            case 10:
+                return "item.underroot";
+            case 11:
+                return "item.miners_lichen";
+            default:
+                return "item.fine_bone_dust";
+        }
+    }
+
+    @Override
+    public void getSubItems(Item item, CreativeTabs tab, List list) {
+        for (int i = 0; i < icons.length; i++) {
+            list.add(new ItemStack(item, 1, i));
+        }
+    }
+}

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

@@ -60,9 +60,7 @@ public abstract class MixinLOTREntityNPC extends EntityCreature implements ILoot
             if (success) {
                 List<ItemStack> drops = DropTable.generate_drops((LOTREntityNPC)(Object)this, new DropContext[]{DropContext.PICKPOCKET}, 0);
                 ItemStack item = drops.get(DropTable.random.nextInt(drops.size()));
-                if ((LOTREntityNPC)(Object)this instanceof LOTREntityOlogHai) {
 
-                }
                 if (entityplayer.inventory.addItemStackToInventory(item)) {
                     last_pickpocket = (int)(System.currentTimeMillis() / 1000L);
                 } else {
@@ -70,7 +68,9 @@ public abstract class MixinLOTREntityNPC extends EntityCreature implements ILoot
             } else {
                 last_pickpocket = (int)(System.currentTimeMillis() / 1000L);
                 ((LOTREntityNPC)(Object)this).setRevengeTarget(entityplayer);
-                LOTRLevelData.getData(entityplayer).addAchievement(CinderAchievement.pickOlog);
+                if ((LOTREntityNPC)(Object)this instanceof LOTREntityOlogHai) {
+                    LOTRLevelData.getData(entityplayer).addAchievement(CinderAchievement.pickOlog);
+                }
             }
             return true;
         }

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

@@ -0,0 +1,43 @@
+package com.zivilon.cinder_loe.mixins;
+
+import com.zivilon.cinder_loe.CinderLoE;
+import lotr.common.LOTRMod;
+import lotr.common.enchant.LOTREnchantment;
+import lotr.common.enchant.LOTREnchantmentHelper;
+import lotr.common.entity.npc.LOTREntityNPC;
+import lotr.common.entity.npc.LOTREntityOrc;
+import lotr.common.entity.npc.LOTREntityWarg;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+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.CallbackInfoReturnable;
+
+
+@Mixin(LOTREntityOrc.class)
+public abstract class MixinLOTREntityOrc extends LOTREntityNPC {
+    public boolean isWeakOrc = true;
+
+    public MixinLOTREntityOrc(World worldIn) {
+        super(worldIn);
+    }
+
+    /**
+     * @author KeyLime17
+     * @reason Mevans
+     */
+    @Overwrite(remap = false)
+    public int getTotalArmorValue() {
+        if (this.isWeakOrc) {
+            return MathHelper.floor_double((double)((double)super.getTotalArmorValue() * 1));
+        }
+        return super.getTotalArmorValue();
+    }
+}

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

@@ -2,10 +2,13 @@ package com.zivilon.cinder_loe.mixins;
 
 import com.zivilon.cinder_loe.CinderLoE;
 import lotr.common.LOTRMod;
+import lotr.common.entity.npc.LOTREntityNPCRideable;
 import lotr.common.entity.npc.LOTREntityWarg;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
@@ -20,9 +23,11 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import lotr.common.item.LOTRItemArmor;
 
+import java.util.Random;
+
 
 @Mixin(LOTREntityWarg.class)
-public abstract class MixinLOTREntityWarg extends Entity {
+public abstract class MixinLOTREntityWarg extends LOTREntityNPCRideable {
 
     public MixinLOTREntityWarg(World worldIn) {
         super(worldIn);
@@ -36,6 +41,15 @@ public abstract class MixinLOTREntityWarg extends Entity {
     @Shadow
     public abstract LOTREntityWarg.WargType getWargType();
 
+    @Overwrite(remap = false)
+    protected void 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);
+        this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.22);
+        this.getEntityAttribute(npcAttackDamage).setBaseValue((double)MathHelper.getRandomIntegerInRange((Random)this.rand, (int)3, (int)5));
+    }
+
     @Overwrite(remap = false)
     protected void func_70628_a(boolean flag, int i) {
         Item furItem = null;

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

@@ -94,7 +94,7 @@ public class MixinLOTRHiredNPCInfo {
 
     public void increaseDamageGain(EntityLivingBase gainingEntity) {
         float damageBoost = 0.25f;
-        IAttributeInstance attribute = gainingEntity.getEntityAttribute(LOTREntityNPC.npcAttackDamage);
+        IAttributeInstance attribute = gainingEntity.getEntityAttribute(LOTREntityNPC.npcAttackDamageExtra);
         attribute.setBaseValue(attribute.getBaseValue() + (double)damageBoost);
     }
 

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

@@ -108,6 +108,24 @@ public class recipes {
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDart, 1, 13), new ItemStack(CinderLoE.warDart, 1, 0), new ItemStack(CinderLoE.warDartHeads, 1, 13)));
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDart, 1, 14), new ItemStack(CinderLoE.warDart, 1, 0), new ItemStack(CinderLoE.warDartHeads, 1, 14)));
 
+        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.spiceOrcish),
+                new ItemStack(CinderLoE.spiceIngredient, 1, 0),
+                new ItemStack(CinderLoE.spiceIngredient, 1, 1),
+                new ItemStack(CinderLoE.spiceIngredient, 1, 2)));
+        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.spiceHuman),
+                new ItemStack(CinderLoE.spiceIngredient, 1, 3),
+                new ItemStack(CinderLoE.spiceIngredient, 1, 4),
+                new ItemStack(CinderLoE.spiceIngredient, 1, 5)));
+        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.spiceElven),
+                new ItemStack(CinderLoE.spiceIngredient, 1, 6),
+                new ItemStack(CinderLoE.spiceIngredient, 1, 7),
+                new ItemStack(CinderLoE.spiceIngredient, 1, 8)));
+        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.spiceDwarven),
+                new ItemStack(CinderLoE.spiceIngredient, 1, 9),
+                new ItemStack(CinderLoE.spiceIngredient, 1, 10),
+                new ItemStack(CinderLoE.spiceIngredient, 1, 11)));
+
+
         OreDictionary.registerOre("vegetable1", CinderLoE.onion);
         OreDictionary.registerOre("vegetable1", LOTRMod.leek);
         OreDictionary.registerOre("vegetable2", CinderLoE.cabbage);

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

@@ -26,6 +26,8 @@ tile.lotr:iceCage.name=Ice Cage
 tile.forging_station.name=Forging Station
 tile.lotr:woodpanel.name=Wood Panel
 
+tile.onion.name=Onion Crop
+
 tile.lotr:cinderfur.0.name=Brown Warg Fur Block
 tile.lotr:cinderfur.1.name=Gray Warg Fur Block
 tile.lotr:cinderfur.2.name=Black Warg Fur Block
@@ -48,6 +50,7 @@ tile.lotr:cinderfurcarpet.8.name=Lioness Fur Carpet
 
 item.repair_kit.name=Repair Kit
 item.upgrade_kit.name=Upgrade Kit
+item.lotr:field_repair_kit.name=Field Repair Kit
 item.cinder_fur_item_0.name=Gray Warg Fur
 item.cinder_fur_item_1.name=Black Warg Fur
 item.cinder_fur_item_2.name=White Warg Fur
@@ -384,14 +387,27 @@ warband.fac.RENEGADE=renegades
 pickpocket.cooldown=You need to wait before pickpocketing again.
 pickpocket.cooldown_alt=Maybe get your hands out of his pants first.
 
-item.lotr:spice_human.name=Mannish spice
+item.lotr:spice_human.name=Kings Herbs
-item.lotr:spice_elven.name=Elven spice
+item.lotr:spice_elven.name=Silverblend
-item.lotr:spice_orcish.name=Orcish spice
+item.lotr:spice_orcish.name=Morgul Salts
-item.lotr:spice_dwarven.name=Dwarven spice
+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:mugDwarfBrew.name=Dwarven Stout\
+item.fine_bone_dust.name=Fine Bone Dust
+item.dried_morgul_caps.name=Dried Morgul Caps
+item.blighted_root.name=Blighted Root
+item.coldbreath_leaf.name=Coldbreath Leaf
+item.brambleberry.name=Brambleberry
+item.willow_bark.name=Willow Bark
+item.seregon.name=Seregon
+item.niphredil_seeds.name=Niphredil Seeds
+item.dried_mallorn.name=Dried Mallorn
+item.curing_salts.name=Curing Salts
+item.underroot.name=Underroot
+item.miners_lichen.name=Miner’s Lichen
+
 
 potion.overdose=Overdose
 

src/main/resources/mixins.cinder_loe.json

@@ -47,6 +47,7 @@
     "overrides.MixinLOTRTradeEntriesOverrides",
     "overrides.MixinLOTRUnitTradeEntries",
     "overrides.MixinLOTRBiome",
+    "MixinLOTREntityOrc",
     "MixinEntityLivingBase",
     "MixinEntityPlayer",
     "MixinLOTREntityAIAttackOnCollide",