diff --git a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java index 3652b2d..7a072c4 100644 --- a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java +++ b/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"); diff --git a/src/main/java/com/zivilon/cinder_loe/entity/trader/BladorthinSmith.java b/src/main/java/com/zivilon/cinder_loe/entity/trader/BladorthinSmith.java index 1d01f60..293c420 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/trader/BladorthinSmith.java +++ b/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) } ); diff --git a/src/main/java/com/zivilon/cinder_loe/entity/trader/RedDwarfSmith.java b/src/main/java/com/zivilon/cinder_loe/entity/trader/RedDwarfSmith.java index 074ea5d..bb87cc3 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/trader/RedDwarfSmith.java +++ b/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) } ); diff --git a/src/main/java/com/zivilon/cinder_loe/items/FieldRepairKit.java b/src/main/java/com/zivilon/cinder_loe/items/FieldRepairKit.java new file mode 100644 index 0000000..2fecabe --- /dev/null +++ b/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; + } +} \ No newline at end of file diff --git a/src/main/java/com/zivilon/cinder_loe/items/spiceIngredient.java b/src/main/java/com/zivilon/cinder_loe/items/spiceIngredient.java new file mode 100644 index 0000000..ecf8021 --- /dev/null +++ b/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)); + } + } +} diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityNPC.java b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityNPC.java index 88f9530..4736405 100644 --- a/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityNPC.java +++ b/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 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; } diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityOrc.java b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityOrc.java new file mode 100644 index 0000000..3e5e790 --- /dev/null +++ b/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(); + } +} diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityWarg.java b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityWarg.java index f5e23cb..8a65c72 100644 --- a/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityWarg.java +++ b/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; diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRHiredNPCInfo.java b/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRHiredNPCInfo.java index 0935a31..2a1b796 100644 --- a/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRHiredNPCInfo.java +++ b/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); } diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRTradeEntriesOverrides.java b/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRTradeEntriesOverrides.java index 0cf1491..87a41c9 100644 --- a/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRTradeEntriesOverrides.java +++ b/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRTradeEntriesOverrides.java @@ -134,6 +134,32 @@ public abstract class MixinLOTRTradeEntriesOverrides { @Inject(method = "setupTrades1", at = @At("RETURN"), remap = false) private static void newTrades(CallbackInfo ci) { + DWARF_MINER_BUY = + new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(Items.coal, 2), 4), + new LOTRTradeEntry(new ItemStack(Blocks.iron_ore), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.oreCopper), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.oreTin), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.oreSilver), 12), + new LOTRTradeEntry(new ItemStack(Blocks.gold_ore), 22), + new LOTRTradeEntry(new ItemStack(Items.glowstone_dust, 4), 3), + new LOTRTradeEntry(new ItemStack(Blocks.cobblestone, 8), 1), + new LOTRTradeEntry(new ItemStack(Blocks.stone, 8), 1), + new LOTRTradeEntry(new ItemStack(Items.lava_bucket), 20), + new LOTRTradeEntry(new ItemStack(Items.flint), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.sulfur), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.saltpeter), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.diamond), 40), + new LOTRTradeEntry(new ItemStack(LOTRMod.emerald), 25), + new LOTRTradeEntry(new ItemStack(LOTRMod.sapphire), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.ruby), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.opal), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.amber), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.amethyst), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.topaz), 12), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 10), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)DWARF_MINER_BUY).setVessels(LOTRFoods.DWARF_DRINK); + DWARF_MINER_SELL = new LOTRTradeEntries(TradeType.SELL, new LOTRTradeEntry(new ItemStack(Items.cooked_beef), 3), new LOTRTradeEntry(new ItemStack(Items.cooked_porkchop), 3), @@ -181,8 +207,31 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(LOTRMod.wargArmorMordor), 25), new LOTRTradeEntry(new ItemStack(CinderLoE.cinderFurItem, 1, 1), 2), new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 1), 200), - new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 0), 200)); + new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 0), 200), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 1), 6666)); ((MixinLOTRTradeEntriesOverrides)(Object)MORDOR_TRADER_BUY).setVessels(LOTRFoods.ORC_DRINK); + + MORDOR_TRADER_SELL = new LOTRTradeEntries(TradeType.SELL, + new LOTRTradeEntry(new ItemStack(LOTRMod.orcSteel), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.blackUrukSteel), 3), + new LOTRTradeEntry(new ItemStack(Items.iron_ingot), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.bronze), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.nauriteGem), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.diamond), 25), + new LOTRTradeEntry(new ItemStack(LOTRMod.ruby), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.amber), 10), + new LOTRTradeEntry(new ItemStack(Items.string, 3), 1), + new LOTRTradeEntry(new ItemStack(Items.feather), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mug), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.waterskin), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.morgulShroom), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.elfBone), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.dwarfBone), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.hobbitBone), 1), + new LOTRTradeEntry(new ItemStack(Items.bone), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.manFlesh), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.maggotyBread, 2), 2)); + GONDOR_BLACKSMITH_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.gondorianTable), 100), new LOTRTradeEntry(new ItemStack(LOTRMod.swordGondor), 15), @@ -202,6 +251,37 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 1), 200), new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 0), 200)); ((MixinLOTRTradeEntriesOverrides)(Object)GONDOR_BLACKSMITH_BUY).setVessels(LOTRFoods.GONDOR_DRINK); + + GALADHRIM_TRADER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.swordElven), 21), + new LOTRTradeEntry(new ItemStack(LOTRMod.daggerElven), 13), + new LOTRTradeEntry(new ItemStack(LOTRMod.spearElven), 21), + new LOTRTradeEntry(new ItemStack(LOTRMod.polearmElven), 21), + new LOTRTradeEntry(new ItemStack(LOTRMod.longspearElven), 21), + new LOTRTradeEntry(new ItemStack(LOTRMod.axeElven), 18), + new LOTRTradeEntry(new ItemStack(LOTRMod.elvenBow), 21), + new LOTRTradeEntry(new ItemStack(LOTRMod.swordMallorn), 18), + new LOTRTradeEntry(new ItemStack(LOTRMod.mallornBow), 17), + new LOTRTradeEntry(new ItemStack(LOTRMod.helmetElven), 25), + new LOTRTradeEntry(new ItemStack(LOTRMod.bodyElven), 36), + new LOTRTradeEntry(new ItemStack(LOTRMod.legsElven), 30), + new LOTRTradeEntry(new ItemStack(LOTRMod.bootsElven), 22), + new LOTRTradeEntry(new ItemStack(LOTRMod.planks, 4, 1), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.elanor), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.niphredil), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mallornTorchSilver, 4), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mallornTorchBlue, 4), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mallornTorchGold, 4), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mallornTorchGreen, 4), 8), + 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(LOTRMod.hithlain), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.chestMallorn), 20), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 8), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)GALADHRIM_TRADER_BUY).setVessels(LOTRFoods.ELF_DRINK); + + URUK_HAI_TRADER_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.urukTable), 100), new LOTRTradeEntry(new ItemStack(LOTRMod.helmetUruk), 24), @@ -231,8 +311,29 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(CinderLoE.cinderFurItem, 1, 0), 2), new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 1), 200), new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 0), 200), - new LOTRTradeEntry(new ItemStack(LOTRMod.wargArmorUruk), 25)); + new LOTRTradeEntry(new ItemStack(LOTRMod.wargArmorUruk), 25), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 1), 6666)); ((MixinLOTRTradeEntriesOverrides)(Object)URUK_HAI_TRADER_BUY).setVessels(LOTRFoods.ORC_DRINK); + + URUK_HAI_TRADER_SELL = new LOTRTradeEntries(TradeType.SELL, + new LOTRTradeEntry(new ItemStack(LOTRMod.urukSteel), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.orcSteel), 3), + new LOTRTradeEntry(new ItemStack(Items.iron_ingot), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.bronze), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.diamond), 25), + new LOTRTradeEntry(new ItemStack(LOTRMod.ruby), 12), + new LOTRTradeEntry(new ItemStack(Items.coal, 2, Short.MAX_VALUE), 1), + new LOTRTradeEntry(new ItemStack(Items.leather), 2), + new LOTRTradeEntry(new ItemStack(Items.string, 3), 1), + new LOTRTradeEntry(new ItemStack(Items.feather), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.elfBone), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.dwarfBone), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.hobbitBone), 1), + new LOTRTradeEntry(new ItemStack(Items.bone), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.pipeweed, 3), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.manFlesh), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.maggotyBread, 2), 2)); + ROHAN_BLACKSMITH_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.rohirricTable), 100), new LOTRTradeEntry(new ItemStack(LOTRMod.swordRohan), 15), @@ -258,6 +359,127 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(LOTRMod.horseArmorRohan), 25)); ((MixinLOTRTradeEntriesOverrides)(Object)ROHAN_BLACKSMITH_BUY).setVessels(LOTRFoods.ROHAN_DRINK); + DUNLENDING_BARTENDER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.dunlendingTable), 100), + new LOTRTradeEntry(new ItemStack(Items.cooked_beef), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_porkchop), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.muttonCooked), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_chicken), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.deerCooked), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitCooked), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitStew), 10), + new LOTRTradeEntry(new ItemStack(Items.bread), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.mug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.ceramicMug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.waterskin), 2), + new LOTRTradeEntry(new ItemStack(Items.baked_potato, 2), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_fished), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.gammon), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.woodPlate), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAle, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugMead, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCider, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugRum, 1, 9999), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAppleJuice), 6), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)DUNLENDING_BARTENDER_BUY).setVessels(LOTRFoods.DUNLENDING_DRINK); + + ROHAN_MEADHOST_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(Items.cooked_beef), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_porkchop), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.muttonCooked), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_chicken), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.deerCooked), 6), + new LOTRTradeEntry(new ItemStack(Items.bread), 5), + new LOTRTradeEntry(new ItemStack(Items.apple, 2), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.woodPlate), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.ceramicPlate), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.ceramicMug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.aleHorn), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.aleHornGold), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugWater), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugMead, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugMilk), 3), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)ROHAN_MEADHOST_BUY).setVessels(LOTRFoods.ROHAN_DRINK); + + BLUE_DWARF_MINER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(Items.coal, 2), 4), + new LOTRTradeEntry(new ItemStack(Blocks.iron_ore), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.oreCopper), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.oreTin), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.oreSilver), 12), + new LOTRTradeEntry(new ItemStack(Blocks.gold_ore), 22), + new LOTRTradeEntry(new ItemStack(Items.glowstone_dust, 4), 3), + new LOTRTradeEntry(new ItemStack(Blocks.cobblestone, 8), 1), + new LOTRTradeEntry(new ItemStack(Items.lava_bucket), 20), + new LOTRTradeEntry(new ItemStack(Items.flint), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.sulfur), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.saltpeter), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.diamond), 40), + new LOTRTradeEntry(new ItemStack(LOTRMod.emerald), 25), + new LOTRTradeEntry(new ItemStack(LOTRMod.sapphire), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.ruby), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.opal), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.amber), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.amethyst), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.topaz), 12), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 11), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)BLUE_DWARF_MINER_BUY).setVessels(LOTRFoods.DWARF_DRINK); + + BLUE_DWARF_MINER_SELL = new LOTRTradeEntries(TradeType.SELL, + 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), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAle, 1, Short.MAX_VALUE), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugMead, 1, Short.MAX_VALUE), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCider, 1, Short.MAX_VALUE), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugPerry, 1, Short.MAX_VALUE), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugDwarvenAle, 1, Short.MAX_VALUE), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.pickaxeBlueDwarven), 10)); + + BLUE_DWARF_MERCHANT_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.dwarvenForge), 40), + new LOTRTradeEntry(new ItemStack(LOTRMod.dwarvenRing), 16), + new LOTRTradeEntry(new ItemStack(LOTRMod.swordBlueDwarven), 16), + new LOTRTradeEntry(new ItemStack(LOTRMod.spearBlueDwarven), 18), + new LOTRTradeEntry(new ItemStack(LOTRMod.battleaxeBlueDwarven), 18), + new LOTRTradeEntry(new ItemStack(LOTRMod.hammerBlueDwarven), 18), + new LOTRTradeEntry(new ItemStack(LOTRMod.pikeBlueDwarven), 18), + new LOTRTradeEntry(new ItemStack(LOTRMod.daggerBlueDwarven), 13), + new LOTRTradeEntry(new ItemStack(LOTRMod.axeBlueDwarven), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.pickaxeBlueDwarven), 14), + new LOTRTradeEntry(new ItemStack(LOTRMod.shovelBlueDwarven), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.mattockBlueDwarven), 18), + new LOTRTradeEntry(new ItemStack(LOTRMod.throwingAxeBlueDwarven), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.helmetBlueDwarven), 25), + new LOTRTradeEntry(new ItemStack(LOTRMod.bodyBlueDwarven), 36), + new LOTRTradeEntry(new ItemStack(LOTRMod.legsBlueDwarven), 30), + new LOTRTradeEntry(new ItemStack(LOTRMod.bootsBlueDwarven), 22), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugDwarvenAle, 1, 9999), 9), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugDwarvenTonic, 1, 9999), 14), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugDwarvenAle, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugDwarvenAle, 1, 3), 160), + new LOTRTradeEntry(new ItemStack(LOTRMod.dwarfHerb), 10), + new LOTRTradeEntry(new ItemStack(Items.glowstone_dust, 4), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.brick3, 1, 12), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.rock, 8, 3), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.emerald), 25), + new LOTRTradeEntry(new ItemStack(LOTRMod.ruby), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.amethyst), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.topaz), 12), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 9), 6666)); + ((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)); + ANGMAR_TRADER_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.angmarTable), 100), new LOTRTradeEntry(new ItemStack(LOTRMod.helmetAngmar), 20), @@ -286,7 +508,29 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(CinderLoE.cinderFurItem, 1, 0), 2), new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 1), 200), new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 0), 200), - new LOTRTradeEntry(new ItemStack(LOTRMod.wargArmorAngmar), 25)); + new LOTRTradeEntry(new ItemStack(LOTRMod.wargArmorAngmar), 25), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 2), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)ANGMAR_TRADER_BUY).setVessels(LOTRFoods.ORC_DRINK); + + ANGMAR_TRADER_SELL = new LOTRTradeEntries(TradeType.SELL, + new LOTRTradeEntry(new ItemStack(LOTRMod.orcSteel), 3), + new LOTRTradeEntry(new ItemStack(Items.iron_ingot), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.bronze), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.guldurilCrystal), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.emerald), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.ruby), 12), + new LOTRTradeEntry(new ItemStack(Items.string, 3), 1), + new LOTRTradeEntry(new ItemStack(Items.feather), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mug), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.waterskin), 2), + new LOTRTradeEntry(new ItemStack(Items.wheat, 2), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.elfBone), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.dwarfBone), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.hobbitBone), 1), + new LOTRTradeEntry(new ItemStack(Items.bone), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.maggotyBread, 2), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.manFlesh), 3)); + DOL_GULDUR_TRADER_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.dolGuldurTable), 100), @@ -310,9 +554,75 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(LOTRMod.maggotyBread), 4), new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 1), 200), new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 0), 200), - new LOTRTradeEntry(new ItemStack(Items.string), 2)); - ((MixinLOTRTradeEntriesOverrides)(Object)ANGMAR_TRADER_BUY).setVessels(LOTRFoods.ORC_DRINK); + new LOTRTradeEntry(new ItemStack(Items.string), 2), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 2), 6666)); ((MixinLOTRTradeEntriesOverrides)(Object)DOL_GULDUR_TRADER_BUY).setVessels(LOTRFoods.ORC_DRINK); + + DOL_GULDUR_TRADER_SELL = new LOTRTradeEntries(TradeType.SELL, + new LOTRTradeEntry(new ItemStack(LOTRMod.orcSteel), 3), + new LOTRTradeEntry(new ItemStack(Items.iron_ingot), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.bronze), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.guldurilCrystal), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.emerald), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.ruby), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.amethyst), 8), + new LOTRTradeEntry(new ItemStack(Items.feather), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mug), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.waterskin), 2), + new LOTRTradeEntry(new ItemStack(Items.wheat, 2), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.elfBone), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.dwarfBone), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.hobbitBone), 1), + new LOTRTradeEntry(new ItemStack(Items.bone), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.maggotyBread, 2), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.manFlesh), 3)); + + HALF_TROLL_SCAVENGER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.halfTrollTable), 100), + new LOTRTradeEntry(new ItemStack(Items.gold_ingot), 22), + new LOTRTradeEntry(new ItemStack(Items.gold_nugget), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.silver), 18), + new LOTRTradeEntry(new ItemStack(LOTRMod.silverNugget), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.bronze), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugTorogDraught, 1, 9999), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.scimitarNearHarad), 16), + new LOTRTradeEntry(new ItemStack(LOTRMod.spearNearHarad), 16), + new LOTRTradeEntry(new ItemStack(LOTRMod.swordHarad), 14), + new LOTRTradeEntry(new ItemStack(LOTRMod.spearHarad), 14), + new LOTRTradeEntry(new ItemStack(LOTRMod.helmetNearHarad), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.scimitarOrc), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.battleaxeOrc), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.helmetOrc), 14), + new LOTRTradeEntry(new ItemStack(LOTRMod.scimitarHalfTroll), 16), + new LOTRTradeEntry(new ItemStack(LOTRMod.maceHalfTroll), 16), + new LOTRTradeEntry(new ItemStack(LOTRMod.pikeHalfTroll), 16), + new LOTRTradeEntry(new ItemStack(LOTRMod.daggerHalfTroll), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.daggerHalfTrollPoisoned), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.hammerHalfTroll), 16), + new LOTRTradeEntry(new ItemStack(LOTRMod.swordGondor), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.hammerGondor), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.spearMoredain), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.battleaxeMoredain), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.daggerMoredain), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.clubMoredain), 14), + new LOTRTradeEntry(new ItemStack(LOTRMod.swordMoredain), 15), + new LOTRTradeEntry(new ItemStack(Items.arrow, 4), 3), + new LOTRTradeEntry(new ItemStack(Items.bone), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.orcBone), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.trollBone), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.manFlesh), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.diamond), 40), + new LOTRTradeEntry(new ItemStack(LOTRMod.emerald), 25), + new LOTRTradeEntry(new ItemStack(LOTRMod.sapphire), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.ruby), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.opal), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.amber), 15), + 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, 0), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)HALF_TROLL_SCAVENGER_BUY).setVessels(LOTRFoods.HALF_TROLL_DRINK); + GALADHRIM_SMITH_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.elvenTable), 100), new LOTRTradeEntry(new ItemStack(LOTRMod.swordElven), 18), @@ -355,6 +665,7 @@ public abstract class MixinLOTRTradeEntriesOverrides { ((MixinLOTRTradeEntriesOverrides)(Object)GALADHRIM_SMITH_BUY).setVessels(LOTRFoods.ELF_DRINK); ((MixinLOTRTradeEntriesOverrides)(Object)HIGH_ELF_SMITH_BUY).setVessels(LOTRFoods.ELF_DRINK); ((MixinLOTRTradeEntriesOverrides)(Object)WOOD_ELF_SMITH_BUY).setVessels(LOTRFoods.WOOD_ELF_DRINK); + WOOD_ELF_SMITH_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.woodElvenTable), 100), new LOTRTradeEntry(new ItemStack(LOTRMod.swordWoodElven), 18), @@ -373,7 +684,75 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(LOTRMod.mirkwoodBow), 15), 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(Items.arrow, 4), 3), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 7), 6666)); + + MOREDAIN_HUNTSMAN_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.lionFur), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.gemsbokHide), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.gemsbokHorn), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhinoHorn), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.lionRaw), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.zebraRaw), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhinoRaw), 6), + new LOTRTradeEntry(new ItemStack(Items.rotten_flesh), 3), + new LOTRTradeEntry(new ItemStack(Items.feather), 3), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 4), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)MOREDAIN_HUNTSMAN_BUY).setVessels(LOTRFoods.MOREDAIN_DRINK); + + IRON_HILLS_MERCHANT_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.dwarvenForge), 40), + new LOTRTradeEntry(new ItemStack(LOTRMod.dwarvenRing), 16), + new LOTRTradeEntry(new ItemStack(LOTRMod.swordDwarven), 16), + new LOTRTradeEntry(new ItemStack(LOTRMod.spearDwarven), 18), + new LOTRTradeEntry(new ItemStack(LOTRMod.battleaxeDwarven), 18), + new LOTRTradeEntry(new ItemStack(LOTRMod.hammerDwarven), 18), + new LOTRTradeEntry(new ItemStack(LOTRMod.pikeDwarven), 18), + new LOTRTradeEntry(new ItemStack(LOTRMod.daggerDwarven), 13), + new LOTRTradeEntry(new ItemStack(LOTRMod.axeDwarven), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.pickaxeDwarven), 14), + new LOTRTradeEntry(new ItemStack(LOTRMod.shovelDwarven), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.mattockDwarven), 18), + new LOTRTradeEntry(new ItemStack(LOTRMod.throwingAxeDwarven), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.helmetDwarven), 25), + new LOTRTradeEntry(new ItemStack(LOTRMod.bodyDwarven), 36), + new LOTRTradeEntry(new ItemStack(LOTRMod.legsDwarven), 30), + new LOTRTradeEntry(new ItemStack(LOTRMod.bootsDwarven), 22), + new LOTRTradeEntry(new ItemStack(LOTRMod.helmetDwarvenSilver), 50), + new LOTRTradeEntry(new ItemStack(LOTRMod.bodyDwarvenSilver), 60), + new LOTRTradeEntry(new ItemStack(LOTRMod.legsDwarvenSilver), 55), + new LOTRTradeEntry(new ItemStack(LOTRMod.bootsDwarvenSilver), 50), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugDwarvenAle, 1, 9999), 9), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugDwarvenTonic, 1, 9999), 14), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugDwarvenAle, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugDwarvenAle, 1, 3), 160), + new LOTRTradeEntry(new ItemStack(LOTRMod.dwarfHerb), 10), + new LOTRTradeEntry(new ItemStack(Items.glowstone_dust, 4), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.brick3, 1, 12), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.cram), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.dalishPastryItem), 16), + new LOTRTradeEntry(new ItemStack(Blocks.cobblestone, 8), 2), + new LOTRTradeEntry(new ItemStack(Blocks.stone, 8), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.amber), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.amethyst), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.topaz), 12), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 9), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)IRON_HILLS_MERCHANT_BUY).setVessels(LOTRFoods.DWARF_DRINK); + + TAUREDAIN_SHAMAN_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.daggerTauredain), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.daggerTauredainPoisoned), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.tauredainBlowgun), 25), + new LOTRTradeEntry(new ItemStack(LOTRMod.tauredainDart, 4), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.tauredainDartPoisoned, 4), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.bottlePoison), 10), + new LOTRTradeEntry(new ItemStack(Blocks.sapling, 1, 3), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.sapling6, 1, 0), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugChocolate), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugTauredainCocoa, 1, 9999), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugTauredainCure), 20), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)TAUREDAIN_SHAMAN_BUY).setVessels(LOTRFoods.TAUREDAIN_DRINK); DWARF_SMITH_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.dwarvenTable), 100), @@ -406,6 +785,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(LOTRMod.dwarfBars, 8), 20)); + BLUE_DWARF_SMITH_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.blueDwarvenTable), 100), new LOTRTradeEntry(new ItemStack(LOTRMod.blacksmithHammer), 18), @@ -454,6 +834,204 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(LOTRMod.horseArmorDale), 25)); ((MixinLOTRTradeEntriesOverrides)(Object)DALE_BLACKSMITH_BUY).setVessels(LOTRFoods.DALE_DRINK); + DORWINION_VINTNER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.dorwinionTable), 100), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugRedWine, 1, 0), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugRedWine, 1, 1), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugRedWine, 1, 2), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugRedWine, 1, 3), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugRedWine, 1, 4), 25), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugWhiteWine, 1, 0), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugWhiteWine, 1, 1), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugWhiteWine, 1, 2), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugWhiteWine, 1, 3), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugWhiteWine, 1, 4), 25), + 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)); + ((MixinLOTRTradeEntriesOverrides)(Object)DORWINION_VINTNER_BUY).setVessels(LOTRFoods.DORWINION_DRINK); + + DORWINION_MERCHANT_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.helmetDorwinion), 25), + new LOTRTradeEntry(new ItemStack(LOTRMod.bodyDorwinion), 35), + new LOTRTradeEntry(new ItemStack(LOTRMod.legsDorwinion), 30), + new LOTRTradeEntry(new ItemStack(LOTRMod.bootsDorwinion), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.grapeRed), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.grapeWhite), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.raisins), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugRedWine, 1, 9999), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugWhiteWine, 1, 9999), 15), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugRedWine, 1, 2), 160), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugRedWine, 1, 3), 220), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugWhiteWine, 1, 2), 160), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugWhiteWine, 1, 3), 220), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugRedGrapeJuice), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugWhiteGrapeJuice), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.banner, 1, LOTRItemBanner.BannerType.DORWINION.bannerID), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.brick5, 1, 2), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhunFlower, 1, 0), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhunFlower, 1, 1), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhunFlower, 1, 2), 10), + 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)); + ((MixinLOTRTradeEntriesOverrides)(Object)DORWINION_MERCHANT_BUY).setVessels(LOTRFoods.DORWINION_DRINK); + + GONDOR_BARTENDER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(Items.cooked_beef), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_porkchop), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.muttonCooked), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_chicken), 6), + new LOTRTradeEntry(new ItemStack(Items.bread), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.mug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.ceramicMug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.aleHorn), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.aleHornGold), 8), + new LOTRTradeEntry(new ItemStack(Items.baked_potato, 2), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_fished), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugChocolate), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAppleJuice), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugOrangeJuice), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.gammon), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.deerCooked), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitCooked), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitStew), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.plate), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.ceramicPlate), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAle, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCider, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugPerry, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugMead, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugRedWine, 1, 9999), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugWhiteWine, 1, 9999), 12), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)GONDOR_BARTENDER_BUY).setVessels(LOTRFoods.GONDOR_DRINK); + + GONDOR_BREWER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAle, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugAle, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugAle, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugMead, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugMead, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugMead, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCider, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCider, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCider, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugPerry, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPerry, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPerry, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugPlumKvass, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPlumKvass, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPlumKvass, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCherryLiqueur, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCherryLiqueur, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCherryLiqueur, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCarrotWine, 1, 9999), 12), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCarrotWine, 1, 2), 140), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCarrotWine, 1, 3), 180), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugLemonLiqueur, 1, 9999), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugLimeLiqueur, 1, 9999), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugPomegranateWine, 1, 9999), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAppleJuice), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugOrangeJuice), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugChocolate), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugBlueberryJuice), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugBlackberryJuice), 5), + 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(LOTRMod.mugPomegranateJuice), 10), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)GONDOR_BREWER_BUY).setVessels(LOTRFoods.GONDOR_DRINK); + + GONDOR_FLORIST_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 0), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 1), 8), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 2), 6), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 3), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 4), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 5), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 6), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 7), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 8), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.yellow_flower, 1, 8), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.bluebell, 1, 0), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.marigold, 1, 0), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.lavender, 1, 0), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.double_plant, 1, 0), 15), + new LOTRTradeEntry(new ItemStack((Block)Blocks.double_plant, 1, 1), 8), + new LOTRTradeEntry(new ItemStack((Block)Blocks.double_plant, 1, 4), 8), + new LOTRTradeEntry(new ItemStack((Block)Blocks.double_plant, 1, 5), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.doubleFlower, 1, 1), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhunFlower, 1, 0), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhunFlower, 1, 1), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhunFlower, 1, 2), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhunFlower, 1, 3), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhunFlower, 1, 4), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.doubleFlower, 1, 0), 25), + new LOTRTradeEntry(new ItemStack(LOTRMod.haradFlower, 1, 0), 30), + new LOTRTradeEntry(new ItemStack(LOTRMod.haradFlower, 1, 1), 30), + new LOTRTradeEntry(new ItemStack(LOTRMod.haradFlower, 1, 2), 30), + 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)); + ((MixinLOTRTradeEntriesOverrides)(Object)GONDOR_FLORIST_BUY).setVessels(LOTRFoods.GONDOR_DRINK); + + GONDOR_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(Items.beef), 5), + new LOTRTradeEntry(new ItemStack(Items.porkchop), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.gammon), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.muttonRaw), 5), + new LOTRTradeEntry(new ItemStack(Items.chicken), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitRaw), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.deerRaw), 4), + 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)); + ((MixinLOTRTradeEntriesOverrides)(Object)GONDOR_BUTCHER_BUY).setVessels(LOTRFoods.GONDOR_DRINK); + + ROHAN_BREWER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAle, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugAle, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugAle, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugMead, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugMead, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugMead, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCider, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCider, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCider, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugPerry, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPerry, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPerry, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugPlumKvass, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPlumKvass, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPlumKvass, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAppleJuice), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugOrangeJuice), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugBlueberryJuice), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugBlackberryJuice), 5), + 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)); + ((MixinLOTRTradeEntriesOverrides)(Object)ROHAN_BREWER_BUY).setVessels(LOTRFoods.ROHAN_DRINK); + + ROHAN_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(Items.beef), 5), + new LOTRTradeEntry(new ItemStack(Items.porkchop), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.gammon), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.muttonRaw), 5), + new LOTRTradeEntry(new ItemStack(Items.chicken), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitRaw), 4), + 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)); + ((MixinLOTRTradeEntriesOverrides)(Object)ROHAN_BUTCHER_BUY).setVessels(LOTRFoods.ROHAN_DRINK);; DUNEDAIN_BLACKSMITH_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.rangerTable), 100), @@ -506,6 +1084,85 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(LOTRMod.horseArmorRhunGold), 25)); ((MixinLOTRTradeEntriesOverrides)(Object)RHUN_BLACKSMITH_BUY).setVessels(LOTRFoods.RHUN_DRINK); + RHUN_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(Items.beef), 5), + new LOTRTradeEntry(new ItemStack(Items.porkchop), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.gammon), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.muttonRaw), 5), + new LOTRTradeEntry(new ItemStack(Items.chicken), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitRaw), 4), + 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)); + ((MixinLOTRTradeEntriesOverrides)(Object)RHUN_BUTCHER_BUY).setVessels(LOTRFoods.RHUN_DRINK); + + RHUN_BREWER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAle, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugAle, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugAle, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugMead, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugMead, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugMead, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCider, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCider, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCider, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAraq, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugAraq, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugAraq, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugSourMilk, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugSourMilk, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugSourMilk, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugPlumKvass, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPlumKvass, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPlumKvass, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugVodka, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugVodka, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugVodka, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugRedWine, 1, 9999), 15), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugRedWine, 1, 2), 160), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugRedWine, 1, 3), 200), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugWhiteWine, 1, 9999), 15), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugWhiteWine, 1, 2), 160), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugWhiteWine, 1, 3), 200), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugPomegranateWine, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPomegranateWine, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPomegranateWine, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAppleJuice), 6), new LOTRTradeEntry(new ItemStack(LOTRMod.mugBlueberryJuice), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugBlackberryJuice), 5), 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(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)); + ((MixinLOTRTradeEntriesOverrides)(Object)RHUN_BREWER_BUY).setVessels(LOTRFoods.RHUN_DRINK); + + RHUN_BARTENDER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(Items.cooked_beef), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_porkchop), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.muttonCooked), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_chicken), 6), + new LOTRTradeEntry(new ItemStack(Items.bread), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.oliveBread), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.mug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.ceramicMug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.gobletCopper), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.gobletWood), 2), + new LOTRTradeEntry(new ItemStack(Items.baked_potato, 2), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_fished), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugPomegranateJuice), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.deerCooked), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitCooked), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.ceramicPlate), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.woodPlate), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAle, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugRedWine, 1, 9999), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugWhiteWine, 1, 9999), 12), + 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)); + ((MixinLOTRTradeEntriesOverrides)(Object)RHUN_BARTENDER_BUY).setVessels(LOTRFoods.RHUN_DRINK); + RIVENDELL_SMITH_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.rivendellTable), 100), @@ -527,6 +1184,26 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 0), 200), new LOTRTradeEntry(new ItemStack(Items.arrow, 4), 3)); ((MixinLOTRTradeEntriesOverrides)(Object)RIVENDELL_SMITH_BUY).setVessels(LOTRFoods.ELF_DRINK); + + RIVENDELL_TRADER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.swordRivendell), 21), + new LOTRTradeEntry(new ItemStack(LOTRMod.daggerRivendell), 13), + new LOTRTradeEntry(new ItemStack(LOTRMod.spearRivendell), 21), + new LOTRTradeEntry(new ItemStack(LOTRMod.polearmRivendell), 21), + new LOTRTradeEntry(new ItemStack(LOTRMod.longspearRivendell), 21), + new LOTRTradeEntry(new ItemStack(LOTRMod.rivendellBow), 21), + new LOTRTradeEntry(new ItemStack(LOTRMod.helmetRivendell), 25), + new LOTRTradeEntry(new ItemStack(LOTRMod.bodyRivendell), 36), + new LOTRTradeEntry(new ItemStack(LOTRMod.legsRivendell), 30), + new LOTRTradeEntry(new ItemStack(LOTRMod.bootsRivendell), 22), + new LOTRTradeEntry(new ItemStack(LOTRMod.planks, 4, 9), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.highElvenTorch, 4), 8), + 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)); + ((MixinLOTRTradeEntriesOverrides)(Object)RIVENDELL_TRADER_BUY).setVessels(LOTRFoods.ELF_DRINK); + GUNDABAD_TRADER_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.gundabadTable), 100), new LOTRTradeEntry(new ItemStack(LOTRMod.helmetBronze), 20), @@ -559,8 +1236,33 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 0), 200), 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(LOTRMod.bootsFur), 12), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 0), 6666)); ((MixinLOTRTradeEntriesOverrides)(Object)GUNDABAD_TRADER_BUY).setVessels(LOTRFoods.ORC_DRINK); + + GUNDABAD_TRADER_SELL = new LOTRTradeEntries(TradeType.SELL, + new LOTRTradeEntry(new ItemStack(LOTRMod.orcSteel), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.urukSteel), 3), + new LOTRTradeEntry(new ItemStack(Items.iron_ingot), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.bronze), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.diamond), 25), + new LOTRTradeEntry(new ItemStack(LOTRMod.emerald), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.sapphire), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.ruby), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.opal), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.pearl), 25), + new LOTRTradeEntry(new ItemStack(Items.string, 3), 1), + new LOTRTradeEntry(new ItemStack(Items.feather), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mug), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.waterskin), 2), + new LOTRTradeEntry(new ItemStack(Items.wheat, 2), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.elfBone), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.dwarfBone), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.hobbitBone), 1), + new LOTRTradeEntry(new ItemStack(Items.bone), 1), + new LOTRTradeEntry(new ItemStack(LOTRMod.maggotyBread, 2), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.manFlesh), 3)); + } /** @@ -665,6 +1367,123 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 0), 200), new LOTRTradeEntry(new ItemStack(LOTRMod.bronzeCrossbow), 12)); ((MixinLOTRTradeEntriesOverrides)(Object)GULF_BLACKSMITH_BUY).setVessels(LOTRFoods.SOUTHRON_DRINK); + + HARNEDOR_BARTENDER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(Items.cooked_beef), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.muttonCooked), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_porkchop), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_chicken), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.deerCooked), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitCooked), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitStew), 10), + new LOTRTradeEntry(new ItemStack(Items.cooked_fished), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.camelCooked), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.kebab), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.shishKebab), 8), + new LOTRTradeEntry(new ItemStack(Items.bread), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.oliveBread), 6), + new LOTRTradeEntry(new ItemStack(Items.baked_potato, 2), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.orange), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.plum), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugOrangeJuice), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.ceramicPlate), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.woodPlate), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.ceramicMug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.gobletCopper), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.gobletWood), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.waterskin), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAle, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCider, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAraq, 1, 9999), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugLemonLiqueur, 1, 9999), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugLimeLiqueur, 1, 9999), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCactusLiqueur, 1, 9999), 15), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)HARNEDOR_BARTENDER_BUY).setVessels(LOTRFoods.HARNEDOR_DRINK); + + HARAD_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(Items.beef), 5), + new LOTRTradeEntry(new ItemStack(Items.porkchop), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.muttonRaw), 5), + new LOTRTradeEntry(new ItemStack(Items.chicken), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitRaw), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.deerRaw), 4), + 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)); + ((MixinLOTRTradeEntriesOverrides)(Object)HARAD_BUTCHER_BUY).setVessels(LOTRFoods.SOUTHRON_DRINK); + + HARAD_BREWER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAle, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugAle, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugAle, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCider, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCider, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCider, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAraq, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugAraq, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugAraq, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCactusLiqueur, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCactusLiqueur, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCactusLiqueur, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugLemonLiqueur, 1, 9999), 12), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugLemonLiqueur, 1, 2), 140), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugLemonLiqueur, 1, 3), 180), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugLimeLiqueur, 1, 9999), 12), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugLimeLiqueur, 1, 2), 140), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugLimeLiqueur, 1, 3), 180), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugMead, 1, 9999), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugPomegranateWine, 1, 9999), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCherryLiqueur, 1, 9999), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugMelonLiqueur, 1, 9999), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugBananaBeer, 1, 9999), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAppleJuice), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugOrangeJuice), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugChocolate), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugBlueberryJuice), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugBlackberryJuice), 5), + 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(LOTRMod.mugPomegranateJuice), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugMangoJuice), 8), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)HARAD_BREWER_BUY).setVessels(LOTRFoods.SOUTHRON_DRINK); + + HARAD_FLORIST_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.haradFlower, 1, 0), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.haradFlower, 1, 1), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.haradFlower, 1, 2), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.haradFlower, 1, 3), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.doubleFlower, 1, 2), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.doubleFlower, 1, 3), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhunFlower, 1, 0), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhunFlower, 1, 1), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhunFlower, 1, 2), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhunFlower, 1, 3), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhunFlower, 1, 4), 20), + new LOTRTradeEntry(new ItemStack(LOTRMod.doubleFlower, 1, 0), 25), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 0), 6), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 4), 10), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 5), 10), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 6), 10), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 7), 10), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 8), 6), + new LOTRTradeEntry(new ItemStack((Block)Blocks.yellow_flower, 1, 8), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.bluebell, 1, 0), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.marigold, 1, 0), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.lavender, 1, 0), 10), + new LOTRTradeEntry(new ItemStack((Block)Blocks.double_plant, 1, 0), 10), + new LOTRTradeEntry(new ItemStack((Block)Blocks.double_plant, 1, 1), 15), + new LOTRTradeEntry(new ItemStack((Block)Blocks.double_plant, 1, 4), 15), + new LOTRTradeEntry(new ItemStack((Block)Blocks.double_plant, 1, 5), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.doubleFlower, 1, 1), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.morgulShroom, 1, 0), 20), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 5), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)HARAD_FLORIST_BUY).setVessels(LOTRFoods.SOUTHRON_DRINK); + NOMAD_ARMOURER_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.nearHaradTable), 100), new LOTRTradeEntry(new ItemStack(LOTRMod.swordHarad), 14), @@ -688,6 +1507,100 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(LOTRMod.bronzeCrossbow), 12)); ((MixinLOTRTradeEntriesOverrides)(Object)NOMAD_ARMOURER_BUY).setVessels(LOTRFoods.NOMAD_DRINK); + GULF_HUNTER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitRaw), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.deerRaw), 4), + new LOTRTradeEntry(new ItemStack(Items.leather), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.fur), 3), + new LOTRTradeEntry(new ItemStack(Items.feather), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.horn), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.lionFur), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.gemsbokHide), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.gemsbokHorn), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhinoHorn), 15), + new LOTRTradeEntry(new ItemStack(LOTRMod.lionRaw), 8), + 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)); + ((MixinLOTRTradeEntriesOverrides)(Object)GULF_HUNTER_BUY).setVessels(LOTRFoods.GULF_HARAD_DRINK); + + SOUTHRON_BARTENDER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(Items.cooked_beef), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.muttonCooked), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_porkchop), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_chicken), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.deerCooked), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitCooked), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitStew), 10), + new LOTRTradeEntry(new ItemStack(Items.cooked_fished), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.camelCooked), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.kebab), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.shishKebab), 8), + new LOTRTradeEntry(new ItemStack(Items.bread), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.oliveBread), 6), + new LOTRTradeEntry(new ItemStack(Items.baked_potato, 2), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.orange), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.plum), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.lemonCakeItem), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugOrangeJuice), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.ceramicPlate), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.woodPlate), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.ceramicMug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.gobletCopper), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.gobletWood), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.waterskin), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAle, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCider, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAraq, 1, 9999), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugLemonLiqueur, 1, 9999), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugLimeLiqueur, 1, 9999), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCactusLiqueur, 1, 9999), 12), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)SOUTHRON_BARTENDER_BUY).setVessels(LOTRFoods.SOUTHRON_DRINK); + + GULF_BARTENDER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(Items.cooked_beef), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.muttonCooked), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_porkchop), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_chicken), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.deerCooked), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitCooked), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitStew), 10), + new LOTRTradeEntry(new ItemStack(Items.cooked_fished), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.camelCooked), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.kebab), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.shishKebab), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.lionCooked), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.zebraCooked), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.rhinoCooked), 12), + new LOTRTradeEntry(new ItemStack(Items.bread), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.oliveBread), 6), + new LOTRTradeEntry(new ItemStack(Items.baked_potato, 2), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.orange), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.plum), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.lemonCakeItem), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugOrangeJuice), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.ceramicPlate), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.woodPlate), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.ceramicMug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.gobletCopper), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.gobletWood), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.waterskin), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.skullCup), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAle, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCider, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAraq, 1, 9999), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugLemonLiqueur, 1, 9999), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugLimeLiqueur, 1, 9999), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCactusLiqueur, 1, 9999), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugBananaBeer, 1, 9999), 12), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugMangoJuice), 10), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)GULF_BARTENDER_BUY).setVessels(LOTRFoods.GULF_HARAD_DRINK); + TAUREDAIN_SMITH_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.tauredainTable), 100), new LOTRTradeEntry(new ItemStack(LOTRMod.blacksmithHammer), 18), @@ -706,6 +1619,7 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 0), 200), new LOTRTradeEntry(new ItemStack(LOTRMod.bronzeBars, 8), 20)); ((MixinLOTRTradeEntriesOverrides)(Object)TAUREDAIN_SMITH_BUY).setVessels(LOTRFoods.TAUREDAIN_DRINK); + WICKED_DWARF_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.blacksmithHammer), 18), new LOTRTradeEntry(new ItemStack(LOTRMod.swordDwarven), 25), @@ -743,6 +1657,7 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 0), 200), new LOTRTradeEntry(new ItemStack(LOTRMod.gateDwarven, 1, 0), 12)); ((MixinLOTRTradeEntriesOverrides)(Object)WICKED_DWARF_BUY).setVessels(LOTRFoods.DWARF_DRINK); + BREE_BLACKSMITH_BUY = new LOTRTradeEntries(TradeType.BUY, new LOTRTradeEntry(new ItemStack(LOTRMod.breeTable), 100), new LOTRTradeEntry(new ItemStack(Items.iron_sword), 12), @@ -771,6 +1686,105 @@ public abstract class MixinLOTRTradeEntriesOverrides { new LOTRTradeEntry(new ItemStack(CinderLoE.forgingKit, 1, 0), 200), new LOTRTradeEntry(new ItemStack(LOTRMod.bronzeCrossbow), 12)); ((MixinLOTRTradeEntriesOverrides)(Object)BREE_BLACKSMITH_BUY).setVessels(LOTRFoods.BREE_DRINK); + + BREE_INNKEEPER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(Items.cooked_beef), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_porkchop), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.muttonCooked), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_chicken), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.deerCooked), 7), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitCooked), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitStew), 10), + new LOTRTradeEntry(new ItemStack(Items.bread), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.mug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.ceramicMug), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.gobletCopper), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.gobletWood), 2), + new LOTRTradeEntry(new ItemStack(Items.baked_potato, 2), 7), + new LOTRTradeEntry(new ItemStack(Items.cooked_fished), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.gammon), 7), + new LOTRTradeEntry(new ItemStack(Items.mushroom_stew), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.mushroomPie), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.leekSoup), 10), + new LOTRTradeEntry(new ItemStack(LOTRMod.plate), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.ceramicPlate), 2), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAle, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCider, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugPerry, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugMead, 1, 9999), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAppleJuice), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.pipeweed, 4), 8), + new LOTRTradeEntry(new ItemStack(LOTRMod.hobbitPipe), 25), + new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 3), 6666)); + ((MixinLOTRTradeEntriesOverrides)(Object)BREE_INNKEEPER_BUY).setVessels(LOTRFoods.BREE_DRINK); + + BREE_BUTCHER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(Items.beef), 5), + new LOTRTradeEntry(new ItemStack(Items.porkchop), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.gammon), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.muttonRaw), 5), + new LOTRTradeEntry(new ItemStack(Items.chicken), 4), + new LOTRTradeEntry(new ItemStack(LOTRMod.rabbitRaw), 4), + 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)); + ((MixinLOTRTradeEntriesOverrides)(Object)BREE_BUTCHER_BUY).setVessels(LOTRFoods.BREE_DRINK); + + BREE_BREWER_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAle, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugAle, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugAle, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCider, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCider, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCider, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugPerry, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPerry, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPerry, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugMapleBeer, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugMapleBeer, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugMapleBeer, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugPlumKvass, 1, 9999), 10), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPlumKvass, 1, 2), 120), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugPlumKvass, 1, 3), 170), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugMead, 1, 9999), 12), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugMead, 1, 2), 140), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugMead, 1, 3), 180), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugCherryLiqueur, 1, 9999), 12), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCherryLiqueur, 1, 2), 140), + new LOTRTradeEntryBarrel(new ItemStack(LOTRMod.mugCherryLiqueur, 1, 3), 180), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugAppleJuice), 6), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugBlueberryJuice), 5), + new LOTRTradeEntry(new ItemStack(LOTRMod.mugBlackberryJuice), 5), + 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)); + ((MixinLOTRTradeEntriesOverrides)(Object)BREE_BREWER_BUY).setVessels(LOTRFoods.BREE_DRINK); + + BREE_FLORIST_BUY = new LOTRTradeEntries(TradeType.BUY, + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 0), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 1), 8), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 2), 6), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 3), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 4), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 5), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 6), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 7), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.red_flower, 1, 8), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.yellow_flower, 1, 8), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.bluebell, 1, 0), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.marigold, 1, 0), 3), + new LOTRTradeEntry(new ItemStack(LOTRMod.lavender, 1, 0), 3), + new LOTRTradeEntry(new ItemStack((Block)Blocks.double_plant, 1, 0), 10), + new LOTRTradeEntry(new ItemStack((Block)Blocks.double_plant, 1, 1), 8), + new LOTRTradeEntry(new ItemStack((Block)Blocks.double_plant, 1, 4), 8), + new LOTRTradeEntry(new ItemStack((Block)Blocks.double_plant, 1, 5), 8), + 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)); + ((MixinLOTRTradeEntriesOverrides)(Object)BREE_FLORIST_BUY).setVessels(LOTRFoods.BREE_DRINK); } } diff --git a/src/main/java/com/zivilon/cinder_loe/recipes.java b/src/main/java/com/zivilon/cinder_loe/recipes.java index 4f8fcdc..4080bb1 100644 --- a/src/main/java/com/zivilon/cinder_loe/recipes.java +++ b/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); diff --git a/src/main/resources/assets/cinder_loe/lang/en_US.lang b/src/main/resources/assets/cinder_loe/lang/en_US.lang index 0faae93..30894e0 100644 --- a/src/main/resources/assets/cinder_loe/lang/en_US.lang +++ b/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_elven.name=Elven spice -item.lotr:spice_orcish.name=Orcish spice -item.lotr:spice_dwarven.name=Dwarven spice +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: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 diff --git a/src/main/resources/assets/lotr/textures/items/blighted_root.png b/src/main/resources/assets/lotr/textures/items/blighted_root.png new file mode 100644 index 0000000..6a8e20e Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/blighted_root.png differ diff --git a/src/main/resources/assets/lotr/textures/items/brambleberry.png b/src/main/resources/assets/lotr/textures/items/brambleberry.png new file mode 100644 index 0000000..89ce63b Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/brambleberry.png differ diff --git a/src/main/resources/assets/lotr/textures/items/coldbreath_leaf.png b/src/main/resources/assets/lotr/textures/items/coldbreath_leaf.png new file mode 100644 index 0000000..f9ce3da Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/coldbreath_leaf.png differ diff --git a/src/main/resources/assets/lotr/textures/items/curing_salts.png b/src/main/resources/assets/lotr/textures/items/curing_salts.png new file mode 100644 index 0000000..58f3110 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/curing_salts.png differ diff --git a/src/main/resources/assets/lotr/textures/items/dried_mallorn.png b/src/main/resources/assets/lotr/textures/items/dried_mallorn.png new file mode 100644 index 0000000..626faac Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/dried_mallorn.png differ diff --git a/src/main/resources/assets/lotr/textures/items/dried_morgul_caps.png b/src/main/resources/assets/lotr/textures/items/dried_morgul_caps.png new file mode 100644 index 0000000..da32a50 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/dried_morgul_caps.png differ diff --git a/src/main/resources/assets/lotr/textures/items/field_repair_kit.png b/src/main/resources/assets/lotr/textures/items/field_repair_kit.png new file mode 100644 index 0000000..1ee5390 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/field_repair_kit.png differ diff --git a/src/main/resources/assets/lotr/textures/items/fine_bone_dust.png b/src/main/resources/assets/lotr/textures/items/fine_bone_dust.png new file mode 100644 index 0000000..5a6eb81 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/fine_bone_dust.png differ diff --git a/src/main/resources/assets/lotr/textures/items/miners_lichen.png b/src/main/resources/assets/lotr/textures/items/miners_lichen.png new file mode 100644 index 0000000..294365e Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/miners_lichen.png differ diff --git a/src/main/resources/assets/lotr/textures/items/niphredil_seeds.png b/src/main/resources/assets/lotr/textures/items/niphredil_seeds.png new file mode 100644 index 0000000..9121228 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/niphredil_seeds.png differ diff --git a/src/main/resources/assets/lotr/textures/items/repair_kit.png b/src/main/resources/assets/lotr/textures/items/repair_kit.png index 1ee5390..5f7d429 100644 Binary files a/src/main/resources/assets/lotr/textures/items/repair_kit.png and b/src/main/resources/assets/lotr/textures/items/repair_kit.png differ diff --git a/src/main/resources/assets/lotr/textures/items/seregon.png b/src/main/resources/assets/lotr/textures/items/seregon.png new file mode 100644 index 0000000..a4f8577 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/seregon.png differ diff --git a/src/main/resources/assets/lotr/textures/items/spice_dwarven.png b/src/main/resources/assets/lotr/textures/items/spice_dwarven.png index 3b7e29b..8a1f926 100644 Binary files a/src/main/resources/assets/lotr/textures/items/spice_dwarven.png and b/src/main/resources/assets/lotr/textures/items/spice_dwarven.png differ diff --git a/src/main/resources/assets/lotr/textures/items/spice_elven.png b/src/main/resources/assets/lotr/textures/items/spice_elven.png index 094abdc..f9fcd24 100644 Binary files a/src/main/resources/assets/lotr/textures/items/spice_elven.png and b/src/main/resources/assets/lotr/textures/items/spice_elven.png differ diff --git a/src/main/resources/assets/lotr/textures/items/spice_human.png b/src/main/resources/assets/lotr/textures/items/spice_human.png index 9310d7c..730d0fd 100644 Binary files a/src/main/resources/assets/lotr/textures/items/spice_human.png and b/src/main/resources/assets/lotr/textures/items/spice_human.png differ diff --git a/src/main/resources/assets/lotr/textures/items/spice_orcish.png b/src/main/resources/assets/lotr/textures/items/spice_orcish.png index fdeb2f9..becb69b 100644 Binary files a/src/main/resources/assets/lotr/textures/items/spice_orcish.png and b/src/main/resources/assets/lotr/textures/items/spice_orcish.png differ diff --git a/src/main/resources/assets/lotr/textures/items/underroot.png b/src/main/resources/assets/lotr/textures/items/underroot.png new file mode 100644 index 0000000..dd057f4 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/underroot.png differ diff --git a/src/main/resources/assets/lotr/textures/items/upgrade_kit.png b/src/main/resources/assets/lotr/textures/items/upgrade_kit.png index 5f7d429..1ee5390 100644 Binary files a/src/main/resources/assets/lotr/textures/items/upgrade_kit.png and b/src/main/resources/assets/lotr/textures/items/upgrade_kit.png differ diff --git a/src/main/resources/assets/lotr/textures/items/willow_bark.png b/src/main/resources/assets/lotr/textures/items/willow_bark.png new file mode 100644 index 0000000..75ff5b6 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/willow_bark.png differ diff --git a/src/main/resources/mixins.cinder_loe.json b/src/main/resources/mixins.cinder_loe.json index b7787c5..6a39d4f 100644 --- a/src/main/resources/mixins.cinder_loe.json +++ b/src/main/resources/mixins.cinder_loe.json @@ -47,6 +47,7 @@ "overrides.MixinLOTRTradeEntriesOverrides", "overrides.MixinLOTRUnitTradeEntries", "overrides.MixinLOTRBiome", + "MixinLOTREntityOrc", "MixinEntityLivingBase", "MixinEntityPlayer", "MixinLOTREntityAIAttackOnCollide",