2
0
Fork 0

KeyLime update attempt 2

frozen
Shinare 2 years ago
parent 344c89dad4
commit 6dca010051

@ -11,6 +11,7 @@ import com.zivilon.cinder_loe.tileentity.*;
import com.zivilon.cinder_loe.util.Utilities; import com.zivilon.cinder_loe.util.Utilities;
import com.zivilon.cinder_loe.ItemRegistration; import com.zivilon.cinder_loe.ItemRegistration;
import com.zivilon.cindercore.CinderCore; import com.zivilon.cindercore.CinderCore;
import lotr.common.item.*;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassReader;
@ -48,19 +49,6 @@ import lotr.common.entity.npc.*;
import lotr.common.entity.npc.LOTREntityBarrowWight; import lotr.common.entity.npc.LOTREntityBarrowWight;
import lotr.common.entity.npc.LOTREntitySauron; import lotr.common.entity.npc.LOTREntitySauron;
import lotr.common.entity.projectile.LOTREntityGandalfFireball; import lotr.common.entity.projectile.LOTREntityGandalfFireball;
import lotr.common.item.LOTRItemArmor;
import lotr.common.item.LOTRItemBattleaxe;
import lotr.common.item.LOTRItemBlowgun;
import lotr.common.item.LOTRItemCrossbow;
import lotr.common.item.LOTRItemDagger;
import lotr.common.item.LOTRItemHammer;
import lotr.common.item.LOTRItemMountArmor;
import lotr.common.item.LOTRItemPike;
import lotr.common.item.LOTRItemSpear;
import lotr.common.item.LOTRItemSword;
import lotr.common.item.LOTRItemTrident;
import lotr.common.item.LOTRMaterial;
import lotr.common.item.LOTRWeaponStats;
import lotr.common.world.biome.LOTRBiome; import lotr.common.world.biome.LOTRBiome;
import lotr.common.world.spawning.LOTRBiomeSpawnList; import lotr.common.world.spawning.LOTRBiomeSpawnList;
import lotr.common.world.spawning.LOTRSpawnEntry; import lotr.common.world.spawning.LOTRSpawnEntry;
@ -101,10 +89,12 @@ public class CinderLoE {
public static LOTRMaterial MATERIAL_RED_DWARF; public static LOTRMaterial MATERIAL_RED_DWARF;
public static LOTRMaterial WIZARD; public static LOTRMaterial WIZARD;
public static LOTRMaterial MATERIAL_LIMWAITH_BONE; public static LOTRMaterial MATERIAL_LIMWAITH_BONE;
public static LOTRMaterial MATERIAL_BONEMOLD;
public static LOTRMaterial MATERIAL_LIMWAITH_WOOD; public static LOTRMaterial MATERIAL_LIMWAITH_WOOD;
public static LOTRMaterial EVENT; public static LOTRMaterial EVENT;
public static LOTRMaterial MATERIAL_BREE; public static LOTRMaterial MATERIAL_BREE;
public static LOTRMaterial MATERIAL_BATTLENUN; public static LOTRMaterial MATERIAL_BATTLENUN;
public static LOTRMaterial MATERIAL_ASH;
// Blocks // Blocks
public static Block cinderBlock; public static Block cinderBlock;
@ -118,14 +108,27 @@ public class CinderLoE {
public static Block dwarvenBrickRuned; public static Block dwarvenBrickRuned;
public static Block fishBarrel; public static Block fishBarrel;
public static Block mistBlock; public static Block mistBlock;
public static Block cutDrystone;
public static Block cobbleDrystone;
public static Block reeflessCoral;
public static Block silverChain; public static Block silverChain;
public static Block goldChain; public static Block goldChain;
public static Block ironChain; public static Block ironChain;
public static Block bronzeChain;
// Misc // Misc
public static Item frostblade; public static Item frostblade;
public static Item spearsolidgold; public static Item spearsolidgold;
public static Item whip; public static Item whip;
public static Item swordAsh;
public static Item daggerAsh;
public static Item spearAsh;
public static Item hammerAsh;
public static Item battleaxeAsh;
public static Item pikeAsh;
public static Item bowAsh;
public static Item ingotAsh;
// Red Dwarves // Red Dwarves
public static Item redDwarfSteel; public static Item redDwarfSteel;
@ -145,10 +148,15 @@ public class CinderLoE {
public static LOTRUnitTradeEntries RED_DWARF_COMMANDER; public static LOTRUnitTradeEntries RED_DWARF_COMMANDER;
// Limwaith // Limwaith
public static Item bonemold;
public static Item helmetLimwaith; public static Item helmetLimwaith;
public static Item bodyLimwaith; public static Item bodyLimwaith;
public static Item legsLimwaith; public static Item legsLimwaith;
public static Item bootsLimwaith; public static Item bootsLimwaith;
public static Item helmetboneLimwaith;
public static Item bodyboneLimwaith;
public static Item legsboneLimwaith;
public static Item bootsboneLimwaith;
public static Item tridentLimwaith; public static Item tridentLimwaith;
public static Item spearLimwaith; public static Item spearLimwaith;
public static Item truncheonLimwaith; public static Item truncheonLimwaith;
@ -188,10 +196,15 @@ public class CinderLoE {
public static Item redDwarfBannerBearerSpawnEgg; public static Item redDwarfBannerBearerSpawnEgg;
public static Item redDwarfSmithSpawnEgg; public static Item redDwarfSmithSpawnEgg;
public static Item limwaithSpawnEgg;
public static Item limwaithWarriorSpawnEgg; public static Item limwaithWarriorSpawnEgg;
public static Item limwaithBoneWarriorSpawnEgg;
public static Item limwaithBlowgunnerSpawnEgg; public static Item limwaithBlowgunnerSpawnEgg;
public static Item limwaithBannerBearerSpawnEgg; public static Item limwaithBannerBearerSpawnEgg;
public static Item limwaithChieftainSpawnEgg; public static Item limwaithChieftainSpawnEgg;
public static Item limwaithFishmongerSpawnEgg;
public static Item limwaithShamanSpawnEgg;
public static Item fangornBearSpawnEgg; public static Item fangornBearSpawnEgg;
public static Item fangornWildBoarSpawnEgg; public static Item fangornWildBoarSpawnEgg;
@ -266,7 +279,7 @@ public class CinderLoE {
event.registerServerCommand(new CommandCinderCharacter()); event.registerServerCommand(new CommandCinderCharacter());
} }
public void registerEntities() { // Last ID added: 29 public void registerEntities() { // Last ID added: 34
GameRegistry.registerTileEntity(TileEntityMistBlock.class, "TileEntityMistBlock"); GameRegistry.registerTileEntity(TileEntityMistBlock.class, "TileEntityMistBlock");
int entityID = 7320; // Always increment entityID by 1 over the last entity to ensure unique IDs int entityID = 7320; // Always increment entityID by 1 over the last entity to ensure unique IDs
@ -286,9 +299,13 @@ public class CinderLoE {
EntityRegistry.registerModEntity(FangornElk.class, "FangornElk", (entityID + 9), this, 64, 1, true); EntityRegistry.registerModEntity(FangornElk.class, "FangornElk", (entityID + 9), this, 64, 1, true);
EntityRegistry.registerModEntity(FangornWolf.class, "FangornWolf", (entityID + 10), this, 64, 1, true); EntityRegistry.registerModEntity(FangornWolf.class, "FangornWolf", (entityID + 10), this, 64, 1, true);
EntityRegistry.registerModEntity(Limwaith.class, "Limwaith", (entityID + 31), this, 64, 1, true);
EntityRegistry.registerModEntity(LimwaithWarrior.class, "LimwaithWarrior", (entityID + 11), this, 64, 1, true); EntityRegistry.registerModEntity(LimwaithWarrior.class, "LimwaithWarrior", (entityID + 11), this, 64, 1, true);
EntityRegistry.registerModEntity(LimwaithBoneWarrior.class, "LimwaithBoneWarrior", (entityID + 32), this, 64, 1, true);
EntityRegistry.registerModEntity(LimwaithBlowgunner.class, "LimwaithBlowgunner", (entityID + 12), this, 64, 1, true); EntityRegistry.registerModEntity(LimwaithBlowgunner.class, "LimwaithBlowgunner", (entityID + 12), this, 64, 1, true);
EntityRegistry.registerModEntity(LimwaithBannerBearer.class, "LimwaithBannerBearer", (entityID + 13), this, 64, 1, true); EntityRegistry.registerModEntity(LimwaithBannerBearer.class, "LimwaithBannerBearer", (entityID + 13), this, 64, 1, true);
EntityRegistry.registerModEntity(LimwaithFishmonger.class, "LimwaithFishmonger", (entityID + 33), this, 64, 1, true);
EntityRegistry.registerModEntity(LimwaithShaman.class, "LimwaithShaman", (entityID + 34), this, 64, 1, true);
EntityRegistry.registerModEntity(LimwaithChieftain.class, "LimwaithChieftain", (entityID + 14), this, 64, 1, true); EntityRegistry.registerModEntity(LimwaithChieftain.class, "LimwaithChieftain", (entityID + 14), this, 64, 1, true);
EntityRegistry.registerModEntity(Wraith.class, "Wraith", (entityID + 15), this, 64, 1, true); EntityRegistry.registerModEntity(Wraith.class, "Wraith", (entityID + 15), this, 64, 1, true);
@ -319,6 +336,10 @@ public class CinderLoE {
ivoryBlock = (new IvoryBlock()); ivoryBlock = (new IvoryBlock());
GameRegistry.registerBlock(ivoryBlock, "ivoryBlock"); GameRegistry.registerBlock(ivoryBlock, "ivoryBlock");
// Reefless Coral
reeflessCoral = (new reeflessCoral());
GameRegistry.registerBlock(reeflessCoral, "reeflessCoral");
// Red Dwarven Steel Block // Red Dwarven Steel Block
blockRedDwarfSteel = (new BlockRedDwarfSteel()); blockRedDwarfSteel = (new BlockRedDwarfSteel());
GameRegistry.registerBlock(blockRedDwarfSteel, "blockRedDwarfSteel"); GameRegistry.registerBlock(blockRedDwarfSteel, "blockRedDwarfSteel");
@ -331,15 +352,11 @@ public class CinderLoE {
chandelierRedDwarf = (new RedDwarfChandelier()); chandelierRedDwarf = (new RedDwarfChandelier());
GameRegistry.registerBlock(chandelierRedDwarf, "chandelierRedDwarf"); GameRegistry.registerBlock(chandelierRedDwarf, "chandelierRedDwarf");
// Fur bundle // Bundles
furBundle = (new FurBundle()); furBundle = (new FurBundle());
GameRegistry.registerBlock(furBundle, "furBundle"); GameRegistry.registerBlock(furBundle, "furBundle");
// Leather bundle
leatherBundle = (new LeatherBundle()); leatherBundle = (new LeatherBundle());
GameRegistry.registerBlock(leatherBundle, "leatherBundle"); GameRegistry.registerBlock(leatherBundle, "leatherBundle");
// Reed bale
reedBale = (new ReedBale()); reedBale = (new ReedBale());
GameRegistry.registerBlock(reedBale, "reedBale"); GameRegistry.registerBlock(reedBale, "reedBale");
@ -358,10 +375,18 @@ public class CinderLoE {
GameRegistry.registerBlock(goldChain, "goldChain"); GameRegistry.registerBlock(goldChain, "goldChain");
ironChain = (new ironChain()); ironChain = (new ironChain());
GameRegistry.registerBlock(ironChain, "ironChain"); GameRegistry.registerBlock(ironChain, "ironChain");
bronzeChain = (new bronzeChain());
GameRegistry.registerBlock(bronzeChain, "bronzeChain");
// Mist Block // Mist Block
mistBlock = (new MistBlock()); mistBlock = (new MistBlock());
GameRegistry.registerBlock(mistBlock, "mist"); GameRegistry.registerBlock(mistBlock, "mist");
// Drystones
cutDrystone = (new cutDrystone());
GameRegistry.registerBlock(cutDrystone, "cutDrystone");
cobbleDrystone = (new cobbleDrystone());
GameRegistry.registerBlock(cobbleDrystone, "cobbleDrystone");
} }
public void registerItems() { public void registerItems() {
@ -380,7 +405,11 @@ public class CinderLoE {
redDwarfBannerBearerSpawnEgg = new CinderLoESpawnEgg(RedDwarfBannerBearer.class).setTextureName("lotr:spawn_egg"); redDwarfBannerBearerSpawnEgg = new CinderLoESpawnEgg(RedDwarfBannerBearer.class).setTextureName("lotr:spawn_egg");
redDwarfSmithSpawnEgg = new CinderLoESpawnEgg(RedDwarfSmith.class).setTextureName("lotr:spawn_egg"); redDwarfSmithSpawnEgg = new CinderLoESpawnEgg(RedDwarfSmith.class).setTextureName("lotr:spawn_egg");
limwaithSpawnEgg = new CinderLoESpawnEgg(Limwaith.class).setTextureName("lotr:spawn_egg");
limwaithFishmongerSpawnEgg = new CinderLoESpawnEgg(LimwaithFishmonger.class).setTextureName("lotr:spawn_egg");
limwaithShamanSpawnEgg = new CinderLoESpawnEgg(LimwaithShaman.class).setTextureName("lotr:spawn_egg");
limwaithWarriorSpawnEgg = new CinderLoESpawnEgg(LimwaithWarrior.class).setTextureName("lotr:spawn_egg"); limwaithWarriorSpawnEgg = new CinderLoESpawnEgg(LimwaithWarrior.class).setTextureName("lotr:spawn_egg");
limwaithBoneWarriorSpawnEgg = new CinderLoESpawnEgg(LimwaithBoneWarrior.class).setTextureName("lotr:spawn_egg");
limwaithBlowgunnerSpawnEgg = new CinderLoESpawnEgg(LimwaithBlowgunner.class).setTextureName("lotr:spawn_egg"); limwaithBlowgunnerSpawnEgg = new CinderLoESpawnEgg(LimwaithBlowgunner.class).setTextureName("lotr:spawn_egg");
limwaithChieftainSpawnEgg = new CinderLoESpawnEgg(LimwaithChieftain.class).setTextureName("lotr:spawn_egg"); limwaithChieftainSpawnEgg = new CinderLoESpawnEgg(LimwaithChieftain.class).setTextureName("lotr:spawn_egg");
limwaithBannerBearerSpawnEgg = new CinderLoESpawnEgg(LimwaithBannerBearer.class).setTextureName("lotr:spawn_egg"); limwaithBannerBearerSpawnEgg = new CinderLoESpawnEgg(LimwaithBannerBearer.class).setTextureName("lotr:spawn_egg");
@ -416,7 +445,7 @@ public class CinderLoE {
utumnoSlaveSpawnEgg = new CinderLoESpawnEgg(UtumnoSlaveTrader.class).setTextureName("lotr:spawn_egg"); utumnoSlaveSpawnEgg = new CinderLoESpawnEgg(UtumnoSlaveTrader.class).setTextureName("lotr:spawn_egg");
// Last ID added: 68 // Last ID added: 86
ItemRegistration.registerItem(redDwarfWarriorSpawnEgg, "redDwarfWarriorSpawnEgg", 0); ItemRegistration.registerItem(redDwarfWarriorSpawnEgg, "redDwarfWarriorSpawnEgg", 0);
ItemRegistration.registerItem(redDwarfArbalestSpawnEgg, "redDwarfArbalestSpawnEgg", 1); ItemRegistration.registerItem(redDwarfArbalestSpawnEgg, "redDwarfArbalestSpawnEgg", 1);
ItemRegistration.registerItem(redDwarfCommanderSpawnEgg, "redDwarfCommanderSpawnEgg", 2); ItemRegistration.registerItem(redDwarfCommanderSpawnEgg, "redDwarfCommanderSpawnEgg", 2);
@ -431,7 +460,11 @@ public class CinderLoE {
ItemRegistration.registerItem(renegadeCaptainSpawnEgg, "renegadeCaptainSpawnEgg", 9); ItemRegistration.registerItem(renegadeCaptainSpawnEgg, "renegadeCaptainSpawnEgg", 9);
ItemRegistration.registerItem(wraithSpawnEgg, "wraithSpawnEgg", 10); ItemRegistration.registerItem(wraithSpawnEgg, "wraithSpawnEgg", 10);
ItemRegistration.registerItem(limwaithSpawnEgg, "limwaithSpawnEgg", 82);
ItemRegistration.registerItem(limwaithShamanSpawnEgg, "limwaithShamanSpawnEgg", 85);
ItemRegistration.registerItem(limwaithFishmongerSpawnEgg, "limwaithFishmongerSpawnEgg", 86);
ItemRegistration.registerItem(limwaithWarriorSpawnEgg, "limwaithWarriorSpawnEgg", 11); ItemRegistration.registerItem(limwaithWarriorSpawnEgg, "limwaithWarriorSpawnEgg", 11);
ItemRegistration.registerItem(limwaithBoneWarriorSpawnEgg, "limwaithBoneWarriorSpawnEgg", 84);
ItemRegistration.registerItem(limwaithBlowgunnerSpawnEgg, "limwaithBlowgunnerSpawnEgg", 12); ItemRegistration.registerItem(limwaithBlowgunnerSpawnEgg, "limwaithBlowgunnerSpawnEgg", 12);
ItemRegistration.registerItem(limwaithBannerBearerSpawnEgg, "limwaithBannerBearerSpawnEgg", 13); ItemRegistration.registerItem(limwaithBannerBearerSpawnEgg, "limwaithBannerBearerSpawnEgg", 13);
ItemRegistration.registerItem(limwaithChieftainSpawnEgg, "limwaithChieftainSpawnEgg", 14); ItemRegistration.registerItem(limwaithChieftainSpawnEgg, "limwaithChieftainSpawnEgg", 14);
@ -468,6 +501,7 @@ public class CinderLoE {
frostblade = (new LOTRItemSword(EVENT)).setUnlocalizedName("lotr:frostblade").setTextureName("lotr:frostblade"); frostblade = (new LOTRItemSword(EVENT)).setUnlocalizedName("lotr:frostblade").setTextureName("lotr:frostblade");
spearsolidgold = (new LOTRItemSpear(EVENT)).setUnlocalizedName("lotr:spearsolidgold").setTextureName("lotr:spearsolidgold"); spearsolidgold = (new LOTRItemSpear(EVENT)).setUnlocalizedName("lotr:spearsolidgold").setTextureName("lotr:spearsolidgold");
whip = (new Whip()).setUnlocalizedName("lotr:whip").setTextureName("lotr:whip"); whip = (new Whip()).setUnlocalizedName("lotr:whip").setTextureName("lotr:whip");
ItemRegistration.registerItem(frostblade, "frostblade", 30); ItemRegistration.registerItem(frostblade, "frostblade", 30);
ItemRegistration.registerItem(spearsolidgold, "spearsolidgold", 31); ItemRegistration.registerItem(spearsolidgold, "spearsolidgold", 31);
ItemRegistration.registerItem(whip, "whip", 32); ItemRegistration.registerItem(whip, "whip", 32);
@ -475,6 +509,39 @@ public class CinderLoE {
linkLOTRWeapon(spearsolidgold, "spearsolidgold"); linkLOTRWeapon(spearsolidgold, "spearsolidgold");
linkLOTRWeapon(whip, "whip"); linkLOTRWeapon(whip, "whip");
//ASH
MATERIAL_ASH = getLOTRMaterialByName("ASH");
ingotAsh = new Item().setUnlocalizedName("lotr:ingotAsh").setTextureName("lotr:ingotAsh").setCreativeTab((CreativeTabs) materials);
if (MATERIAL_ASH != null) {
swordAsh = (new LOTRItemSword(MATERIAL_ASH)).setUnlocalizedName("lotr:swordAsh").setTextureName("lotr:swordAsh");
daggerAsh = (new LOTRItemDagger(MATERIAL_ASH)).setUnlocalizedName("lotr:daggerAsh").setTextureName("lotr:daggerAsh");
hammerAsh = (new LOTRItemHammer(MATERIAL_ASH)).setUnlocalizedName("lotr:hammerAsh").setTextureName("lotr:hammerAsh");
battleaxeAsh = (new LOTRItemBattleaxe(MATERIAL_ASH)).setUnlocalizedName("lotr:battleaxeAsh").setTextureName("lotr:battleaxeAsh");
bowAsh = (new LOTRItemBow(MATERIAL_ASH)).setUnlocalizedName("lotr:bowAsh").setTextureName("lotr:bowAsh");
pikeAsh = (new LOTRItemPike(MATERIAL_ASH)).setUnlocalizedName("lotr:pikeAsh").setTextureName("lotr:pikeAsh");
spearAsh = (new LOTRItemSpear(MATERIAL_ASH)).setUnlocalizedName("lotr:spearAsh").setTextureName("lotr:spearAsh");
ItemRegistration.registerItem(ingotAsh, "ingotAsh", 74);
ItemRegistration.registerItem(swordAsh, "swordAsh", 75);
ItemRegistration.registerItem(daggerAsh, "daggerAsh", 76);
ItemRegistration.registerItem(hammerAsh, "hammerAsh", 77);
ItemRegistration.registerItem(battleaxeAsh, "battleaxeAsh", 78);
ItemRegistration.registerItem(bowAsh, "bowAsh", 79);
ItemRegistration.registerItem(pikeAsh, "pikeAsh", 80);
ItemRegistration.registerItem(spearAsh, "spearAsh", 81);
} else {
// Log an error or handle the case where the material could not be found
System.err.println("Failed to find MATERIAL_ASH material for armor initialization.");
}
linkLOTRWeapon(swordAsh, "swordAsh");
linkLOTRWeapon(daggerAsh, "daggerAsh");
linkLOTRWeapon(hammerAsh, "hammerAsh");
linkLOTRWeapon(battleaxeAsh, "battleaxeAsh");
linkLOTRWeapon(bowAsh, "bowAsh");
linkLOTRWeapon(pikeAsh, "pikeAsh");
linkLOTRWeapon(spearAsh, "spearAsh");
// Red Dwarves // Red Dwarves
redDwarfSteel = new Item().setUnlocalizedName("lotr:redDwarfSteel").setTextureName("lotr:redDwarfSteel").setCreativeTab((CreativeTabs) materials); redDwarfSteel = new Item().setUnlocalizedName("lotr:redDwarfSteel").setTextureName("lotr:redDwarfSteel").setCreativeTab((CreativeTabs) materials);
ItemRegistration.registerItem(redDwarfSteel, "redDwarfSteel", 33); ItemRegistration.registerItem(redDwarfSteel, "redDwarfSteel", 33);
@ -523,14 +590,24 @@ public class CinderLoE {
linkLOTRWeapon(crossbowRedDwarf, "crossbowRedDwarf"); linkLOTRWeapon(crossbowRedDwarf, "crossbowRedDwarf");
// Limwaith // Limwaith
bonemold = new Item().setUnlocalizedName("lotr:bonemold").setTextureName("lotr:bonemold").setCreativeTab((CreativeTabs) materials);
ItemRegistration.registerItem(bonemold, "bonemold", 83);
MATERIAL_LIMWAITH_BONE = getLOTRMaterialByName("LIMWAITH_BONE"); MATERIAL_LIMWAITH_BONE = getLOTRMaterialByName("LIMWAITH_BONE");
MATERIAL_LIMWAITH_WOOD = getLOTRMaterialByName("LIMWAITH_WOOD"); MATERIAL_LIMWAITH_WOOD = getLOTRMaterialByName("LIMWAITH_WOOD");
MATERIAL_BONEMOLD = getLOTRMaterialByName("BONEMOLD");
if (MATERIAL_LIMWAITH_WOOD != null && MATERIAL_LIMWAITH_BONE != null) { if (MATERIAL_LIMWAITH_WOOD != null && MATERIAL_LIMWAITH_BONE != null) {
helmetLimwaith = (new LOTRItemArmor(MATERIAL_LIMWAITH_WOOD, 0)).setUnlocalizedName("lotr:helmetLimwaith").setTextureName("lotr:helmetLimwaith"); helmetLimwaith = (new LOTRItemArmor(MATERIAL_LIMWAITH_WOOD, 0)).setUnlocalizedName("lotr:helmetLimwaith").setTextureName("lotr:helmetLimwaith");
bodyLimwaith = (new LOTRItemArmor(MATERIAL_LIMWAITH_WOOD, 1)).setUnlocalizedName("lotr:bodyLimwaith").setTextureName("lotr:bodyLimwaith"); bodyLimwaith = (new LOTRItemArmor(MATERIAL_LIMWAITH_WOOD, 1)).setUnlocalizedName("lotr:bodyLimwaith").setTextureName("lotr:bodyLimwaith");
legsLimwaith = (new LOTRItemArmor(MATERIAL_LIMWAITH_WOOD, 2)).setUnlocalizedName("lotr:legsLimwaith").setTextureName("lotr:legsLimwaith"); legsLimwaith = (new LOTRItemArmor(MATERIAL_LIMWAITH_WOOD, 2)).setUnlocalizedName("lotr:legsLimwaith").setTextureName("lotr:legsLimwaith");
bootsLimwaith = (new LOTRItemArmor(MATERIAL_LIMWAITH_WOOD, 3)).setUnlocalizedName("lotr:bootsLimwaith").setTextureName("lotr:bootsLimwaith"); bootsLimwaith = (new LOTRItemArmor(MATERIAL_LIMWAITH_WOOD, 3)).setUnlocalizedName("lotr:bootsLimwaith").setTextureName("lotr:bootsLimwaith");
helmetboneLimwaith = (new LOTRItemArmor(MATERIAL_BONEMOLD, 0)).setUnlocalizedName("lotr:helmetboneLimwaith").setTextureName("lotr:helmetboneLimwaith");
bodyboneLimwaith = (new LOTRItemArmor(MATERIAL_BONEMOLD, 1)).setUnlocalizedName("lotr:bodyboneLimwaith").setTextureName("lotr:bodyboneLimwaith");
legsboneLimwaith = (new LOTRItemArmor(MATERIAL_BONEMOLD, 2)).setUnlocalizedName("lotr:legsboneLimwaith").setTextureName("lotr:legsboneLimwaith");
bootsboneLimwaith = (new LOTRItemArmor(MATERIAL_BONEMOLD, 3)).setUnlocalizedName("lotr:bootsboneLimwaith").setTextureName("lotr:bootsboneLimwaith");
spearLimwaith = (new LOTRItemSpear(MATERIAL_LIMWAITH_BONE)).setUnlocalizedName("lotr:spearLimwaith").setTextureName("lotr:spearLimwaith"); spearLimwaith = (new LOTRItemSpear(MATERIAL_LIMWAITH_BONE)).setUnlocalizedName("lotr:spearLimwaith").setTextureName("lotr:spearLimwaith");
truncheonLimwaith = (new LOTRItemSword(MATERIAL_LIMWAITH_BONE)).setUnlocalizedName("lotr:truncheonLimwaith").setTextureName("lotr:truncheonLimwaith"); truncheonLimwaith = (new LOTRItemSword(MATERIAL_LIMWAITH_BONE)).setUnlocalizedName("lotr:truncheonLimwaith").setTextureName("lotr:truncheonLimwaith");
battleaxeLimwaith = (new LOTRItemBattleaxe(MATERIAL_LIMWAITH_BONE)).setUnlocalizedName("lotr:battleaxeLimwaith").setTextureName("lotr:battleaxeLimwaith"); battleaxeLimwaith = (new LOTRItemBattleaxe(MATERIAL_LIMWAITH_BONE)).setUnlocalizedName("lotr:battleaxeLimwaith").setTextureName("lotr:battleaxeLimwaith");
@ -543,6 +620,12 @@ public class CinderLoE {
ItemRegistration.registerItem(bodyLimwaith, "bodyLimwaith", 48); ItemRegistration.registerItem(bodyLimwaith, "bodyLimwaith", 48);
ItemRegistration.registerItem(legsLimwaith, "legsLimwaith", 49); ItemRegistration.registerItem(legsLimwaith, "legsLimwaith", 49);
ItemRegistration.registerItem(bootsLimwaith, "bootsLimwaith", 50); ItemRegistration.registerItem(bootsLimwaith, "bootsLimwaith", 50);
ItemRegistration.registerItem(helmetboneLimwaith, "helmetboneLimwaith", 70);
ItemRegistration.registerItem(bodyboneLimwaith, "bodyboneLimwaith", 71);
ItemRegistration.registerItem(legsboneLimwaith, "legsboneLimwaith", 72);
ItemRegistration.registerItem(bootsboneLimwaith, "bootsboneLimwaith", 73);
ItemRegistration.registerItem(spearLimwaith, "spearLimwaith", 51); ItemRegistration.registerItem(spearLimwaith, "spearLimwaith", 51);
ItemRegistration.registerItem(tridentLimwaith, "tridentLimwaith", 52); ItemRegistration.registerItem(tridentLimwaith, "tridentLimwaith", 52);
ItemRegistration.registerItem(truncheonLimwaith, "truncheonLimwaith", 53); ItemRegistration.registerItem(truncheonLimwaith, "truncheonLimwaith", 53);
@ -568,7 +651,7 @@ public class CinderLoE {
bodyBree = (new LOTRItemArmor(MATERIAL_BREE, 1)).setUnlocalizedName("lotr:bodyBree").setTextureName("lotr:bodyBree"); bodyBree = (new LOTRItemArmor(MATERIAL_BREE, 1)).setUnlocalizedName("lotr:bodyBree").setTextureName("lotr:bodyBree");
legsBree = (new LOTRItemArmor(MATERIAL_BREE, 2)).setUnlocalizedName("lotr:legsBree").setTextureName("lotr:legsBree"); legsBree = (new LOTRItemArmor(MATERIAL_BREE, 2)).setUnlocalizedName("lotr:legsBree").setTextureName("lotr:legsBree");
bootsBree = (new LOTRItemArmor(MATERIAL_BREE, 3)).setUnlocalizedName("lotr:bootsBree").setTextureName("lotr:bootsBree"); bootsBree = (new LOTRItemArmor(MATERIAL_BREE, 3)).setUnlocalizedName("lotr:bootsBree").setTextureName("lotr:bootsBree");
swordBree = (new LOTRItemSpear(MATERIAL_BREE)).setUnlocalizedName("lotr:swordBree").setTextureName("lotr:swordBree"); swordBree = (new LOTRItemSword(MATERIAL_BREE)).setUnlocalizedName("lotr:swordBree").setTextureName("lotr:swordBree");
ItemRegistration.registerItem(helmetBree, "helmetBree", 58); ItemRegistration.registerItem(helmetBree, "helmetBree", 58);
ItemRegistration.registerItem(bodyBree, "bodyBree", 59); ItemRegistration.registerItem(bodyBree, "bodyBree", 59);
@ -633,7 +716,11 @@ public class CinderLoE {
RenderingRegistry.registerEntityRenderingHandler(RedDwarfCommander.class, new LOTRRenderDwarf()); RenderingRegistry.registerEntityRenderingHandler(RedDwarfCommander.class, new LOTRRenderDwarf());
RenderingRegistry.registerEntityRenderingHandler(RedDwarfSmith.class, new LOTRRenderDwarf()); RenderingRegistry.registerEntityRenderingHandler(RedDwarfSmith.class, new LOTRRenderDwarf());
RenderingRegistry.registerEntityRenderingHandler(Limwaith.class, new RenderLimwaith());
RenderingRegistry.registerEntityRenderingHandler(LimwaithFishmonger.class, new RenderLimwaith());
RenderingRegistry.registerEntityRenderingHandler(LimwaithShaman.class, new RenderLimwaithShaman());
RenderingRegistry.registerEntityRenderingHandler(LimwaithWarrior.class, new RenderLimwaith()); RenderingRegistry.registerEntityRenderingHandler(LimwaithWarrior.class, new RenderLimwaith());
RenderingRegistry.registerEntityRenderingHandler(LimwaithBoneWarrior.class, new RenderLimwaith());
RenderingRegistry.registerEntityRenderingHandler(LimwaithBlowgunner.class, new RenderLimwaith()); RenderingRegistry.registerEntityRenderingHandler(LimwaithBlowgunner.class, new RenderLimwaith());
RenderingRegistry.registerEntityRenderingHandler(LimwaithBannerBearer.class, new RenderLimwaith()); RenderingRegistry.registerEntityRenderingHandler(LimwaithBannerBearer.class, new RenderLimwaith());
RenderingRegistry.registerEntityRenderingHandler(LimwaithChieftain.class, new RenderLimwaith()); RenderingRegistry.registerEntityRenderingHandler(LimwaithChieftain.class, new RenderLimwaith());
@ -683,8 +770,10 @@ public class CinderLoE {
}); });
LOTRSpawnList LIMWAITH = constructor.newInstance((Object) new LOTRSpawnEntry[]{ LOTRSpawnList LIMWAITH = constructor.newInstance((Object) new LOTRSpawnEntry[]{
new LOTRSpawnEntry(LimwaithWarrior.class, 100, 4, 4), new LOTRSpawnEntry(Limwaith.class, 100, 4, 6),
new LOTRSpawnEntry(LimwaithBlowgunner.class, 15, 1, 3) new LOTRSpawnEntry(LimwaithWarrior.class, 20, 4, 6),
new LOTRSpawnEntry(LimwaithBlowgunner.class, 15, 1, 3),
new LOTRSpawnEntry(LimwaithBoneWarrior.class, 10, 1, 3)
}); });
@ -766,7 +855,11 @@ public class CinderLoE {
CinderCore.registerItemFallback(Block.getIdFromBlock(silverChain), Block.getIdFromBlock(LOTRMod.orcChain), "cinder_loe", "1.1"); CinderCore.registerItemFallback(Block.getIdFromBlock(silverChain), Block.getIdFromBlock(LOTRMod.orcChain), "cinder_loe", "1.1");
CinderCore.registerItemFallback(Block.getIdFromBlock(goldChain), Block.getIdFromBlock(LOTRMod.orcChain), "cinder_loe", "1.1"); CinderCore.registerItemFallback(Block.getIdFromBlock(goldChain), Block.getIdFromBlock(LOTRMod.orcChain), "cinder_loe", "1.1");
CinderCore.registerItemFallback(Block.getIdFromBlock(ironChain), Block.getIdFromBlock(LOTRMod.orcChain), "cinder_loe", "1.1"); CinderCore.registerItemFallback(Block.getIdFromBlock(ironChain), Block.getIdFromBlock(LOTRMod.orcChain), "cinder_loe", "1.1");
CinderCore.registerItemFallback(Block.getIdFromBlock(bronzeChain), Block.getIdFromBlock(LOTRMod.orcChain), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Block.getIdFromBlock(mistBlock), Block.getIdFromBlock(LOTRMod.utumnoPortal), "cinder_loe", "1.1"); CinderCore.registerItemFallback(Block.getIdFromBlock(mistBlock), Block.getIdFromBlock(LOTRMod.utumnoPortal), "cinder_loe", "1.1");
CinderCore.registerItemFallback(Block.getIdFromBlock(cutDrystone), Block.getIdFromBlock(LOTRMod.cobblebrick), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Block.getIdFromBlock(cobbleDrystone), Block.getIdFromBlock(LOTRMod.cobblebrick), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Block.getIdFromBlock(reeflessCoral), Block.getIdFromBlock(LOTRMod.coralReef), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(redDwarfSteel), Item.getIdFromItem(LOTRMod.dwarfSteel), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(redDwarfSteel), Item.getIdFromItem(LOTRMod.dwarfSteel), "cinder_loe", "1.0");
CinderCore.registerItemFallback(Item.getIdFromItem(spearRedDwarf), Item.getIdFromItem(LOTRMod.spearDwarven), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(spearRedDwarf), Item.getIdFromItem(LOTRMod.spearDwarven), "cinder_loe", "1.0");
@ -792,6 +885,15 @@ public class CinderLoE {
CinderCore.registerItemFallback(Item.getIdFromItem(spearsolidgold), Item.getIdFromItem(LOTRMod.spearMithril), "cinder_loe", "1.1"); CinderCore.registerItemFallback(Item.getIdFromItem(spearsolidgold), Item.getIdFromItem(LOTRMod.spearMithril), "cinder_loe", "1.1");
CinderCore.registerItemFallback(Item.getIdFromItem(whip), Item.getIdFromItem(LOTRMod.balrogWhip), "cinder_loe", "1.2"); CinderCore.registerItemFallback(Item.getIdFromItem(whip), Item.getIdFromItem(LOTRMod.balrogWhip), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(ingotAsh), Item.getIdFromItem(LOTRMod.galvorn), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(daggerAsh), Item.getIdFromItem(LOTRMod.daggerBlackUruk), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(swordAsh), Item.getIdFromItem(LOTRMod.scimitarBlackUruk), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(hammerAsh), Item.getIdFromItem(LOTRMod.hammerBlackUruk), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(battleaxeAsh), Item.getIdFromItem(LOTRMod.battleaxeBlackUruk), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(pikeAsh), Item.getIdFromItem(LOTRMod.pikeDolGuldur), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(bowAsh), Item.getIdFromItem(LOTRMod.blackUrukBow), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(spearAsh), Item.getIdFromItem(LOTRMod.spearBlackUruk), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(fangornBearSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(fangornBearSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0");
CinderCore.registerItemFallback(Item.getIdFromItem(fangornAurochSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(fangornAurochSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0");
CinderCore.registerItemFallback(Item.getIdFromItem(fangornWildBoarSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(fangornWildBoarSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0");
@ -801,7 +903,13 @@ public class CinderLoE {
CinderCore.registerItemFallback(Item.getIdFromItem(redDwarfCommanderSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(redDwarfCommanderSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0");
CinderCore.registerItemFallback(Item.getIdFromItem(redDwarfBannerBearerSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(redDwarfBannerBearerSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0");
CinderCore.registerItemFallback(Item.getIdFromItem(redDwarfSmithSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.2.1"); CinderCore.registerItemFallback(Item.getIdFromItem(redDwarfSmithSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.2.1");
CinderCore.registerItemFallback(Item.getIdFromItem(bonemold), Item.getIdFromItem(LOTRMod.leekSoup), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(limwaithSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(limwaithFishmongerSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(limwaithShamanSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(limwaithWarriorSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(limwaithWarriorSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0");
CinderCore.registerItemFallback(Item.getIdFromItem(limwaithBoneWarriorSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(limwaithBlowgunnerSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(limwaithBlowgunnerSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0");
CinderCore.registerItemFallback(Item.getIdFromItem(limwaithBannerBearerSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(limwaithBannerBearerSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0");
CinderCore.registerItemFallback(Item.getIdFromItem(limwaithChieftainSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(limwaithChieftainSpawnEgg), Item.getIdFromItem(Items.spawn_egg), "cinder_loe", "1.0");
@ -824,6 +932,10 @@ public class CinderLoE {
CinderCore.registerItemFallback(Item.getIdFromItem(bodyLimwaith), Item.getIdFromItem(LOTRMod.bodyMoredain), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(bodyLimwaith), Item.getIdFromItem(LOTRMod.bodyMoredain), "cinder_loe", "1.0");
CinderCore.registerItemFallback(Item.getIdFromItem(legsLimwaith), Item.getIdFromItem(LOTRMod.legsMoredain), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(legsLimwaith), Item.getIdFromItem(LOTRMod.legsMoredain), "cinder_loe", "1.0");
CinderCore.registerItemFallback(Item.getIdFromItem(bootsLimwaith), Item.getIdFromItem(LOTRMod.bootsMoredain), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(bootsLimwaith), Item.getIdFromItem(LOTRMod.bootsMoredain), "cinder_loe", "1.0");
CinderCore.registerItemFallback(Item.getIdFromItem(helmetboneLimwaith), Item.getIdFromItem(LOTRMod.helmetBone), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(bodyboneLimwaith), Item.getIdFromItem(LOTRMod.bodyBone), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(legsboneLimwaith), Item.getIdFromItem(LOTRMod.legsBone), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(bootsboneLimwaith), Item.getIdFromItem(LOTRMod.bootsBone), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(spearLimwaith), Item.getIdFromItem(LOTRMod.spearMoredain), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(spearLimwaith), Item.getIdFromItem(LOTRMod.spearMoredain), "cinder_loe", "1.0");
CinderCore.registerItemFallback(Item.getIdFromItem(tridentLimwaith), Item.getIdFromItem(LOTRMod.dunlendingTrident), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(tridentLimwaith), Item.getIdFromItem(LOTRMod.dunlendingTrident), "cinder_loe", "1.0");
CinderCore.registerItemFallback(Item.getIdFromItem(truncheonLimwaith), Item.getIdFromItem(LOTRMod.swordMoredain), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(truncheonLimwaith), Item.getIdFromItem(LOTRMod.swordMoredain), "cinder_loe", "1.0");
@ -856,7 +968,11 @@ public class CinderLoE {
CinderCore.registerEntityFallback(RedDwarfCommander.class, LOTREntityDwarfCommander.class, "cinder_loe", "1.0"); CinderCore.registerEntityFallback(RedDwarfCommander.class, LOTREntityDwarfCommander.class, "cinder_loe", "1.0");
CinderCore.registerEntityFallback(RedDwarfSmith.class, LOTREntityDwarfSmith.class, "cinder_loe", "1.2.1"); CinderCore.registerEntityFallback(RedDwarfSmith.class, LOTREntityDwarfSmith.class, "cinder_loe", "1.2.1");
CinderCore.registerEntityFallback(Limwaith.class, LOTREntityMoredain.class, "cinder_loe", "1.2");
CinderCore.registerEntityFallback(LimwaithFishmonger.class, LOTREntityMoredain.class, "cinder_loe", "1.2");
CinderCore.registerEntityFallback(LimwaithShaman.class, LOTREntityTauredainShaman.class, "cinder_loe", "1.2");
CinderCore.registerEntityFallback(LimwaithWarrior.class, LOTREntityMoredain.class, "cinder_loe", "1.0"); CinderCore.registerEntityFallback(LimwaithWarrior.class, LOTREntityMoredain.class, "cinder_loe", "1.0");
CinderCore.registerEntityFallback(LimwaithBoneWarrior.class, LOTREntityMoredain.class, "cinder_loe", "1.2");
CinderCore.registerEntityFallback(LimwaithBlowgunner.class, LOTREntityMoredain.class, "cinder_loe", "1.0"); CinderCore.registerEntityFallback(LimwaithBlowgunner.class, LOTREntityMoredain.class, "cinder_loe", "1.0");
CinderCore.registerEntityFallback(LimwaithBannerBearer.class, LOTREntityMoredainBannerBearer.class, "cinder_loe", "1.0"); CinderCore.registerEntityFallback(LimwaithBannerBearer.class, LOTREntityMoredainBannerBearer.class, "cinder_loe", "1.0");
CinderCore.registerEntityFallback(LimwaithChieftain.class, LOTREntityMoredainChieftain.class, "cinder_loe", "1.0"); CinderCore.registerEntityFallback(LimwaithChieftain.class, LOTREntityMoredainChieftain.class, "cinder_loe", "1.0");
@ -893,6 +1009,7 @@ public class CinderLoE {
LIMWAITH_COMMANDER = new LOTRUnitTradeEntries(200.0F, new LOTRUnitTradeEntry[]{ LIMWAITH_COMMANDER = new LOTRUnitTradeEntries(200.0F, new LOTRUnitTradeEntry[]{
new LOTRUnitTradeEntry(LimwaithWarrior.class, 30, 50.0F), new LOTRUnitTradeEntry(LimwaithWarrior.class, 30, 50.0F),
(new LOTRUnitTradeEntry(LimwaithBlowgunner.class, 50, 100.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), (new LOTRUnitTradeEntry(LimwaithBlowgunner.class, 50, 100.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
(new LOTRUnitTradeEntry(LimwaithBoneWarrior.class, 70, 200.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION),
(new LOTRUnitTradeEntry(LimwaithBannerBearer.class, 50, 200.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION) }); (new LOTRUnitTradeEntry(LimwaithBannerBearer.class, 50, 200.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION) });
ARNOR_CAPTAIN = new LOTRUnitTradeEntries(200.0F, new LOTRUnitTradeEntry[]{ ARNOR_CAPTAIN = new LOTRUnitTradeEntries(200.0F, new LOTRUnitTradeEntry[]{

@ -16,10 +16,12 @@ public class Materials {
modifyMaterial("RED_DWARF", 700, 3.0F, 0.7F, 3, 7.0F, 10, CinderLoE.redDwarfSteel); modifyMaterial("RED_DWARF", 700, 3.0F, 0.7F, 3, 7.0F, 10, CinderLoE.redDwarfSteel);
modifyMaterial("WIZARD", 1000, 3.0F, 0.7F, 3, 7.0F, 10, null); modifyMaterial("WIZARD", 1000, 3.0F, 0.7F, 3, 7.0F, 10, null);
modifyMaterial("LIMWAITH_BONE", 250, 2.0F, 0.7F, 2, 6.0F, 10, null); modifyMaterial("LIMWAITH_BONE", 250, 2.0F, 0.7F, 2, 6.0F, 10, null);
modifyMaterial("BONEMOLD", 350, 2.0F, 0.6F, 2, 6.0F, 10, CinderLoE.bonemold);
modifyMaterial("LIMWAITH_WOOD", 230, 1.5F, 0.5F, 2, 5.0F, 10, null); modifyMaterial("LIMWAITH_WOOD", 230, 1.5F, 0.5F, 2, 5.0F, 10, null);
modifyMaterial("EVENT", 2400, 5.0F, 0.0F, 0, 9.0F, 10, null); modifyMaterial("EVENT", 2400, 5.0F, 0.0F, 0, 9.0F, 10, null);
modifyMaterial("BREE", 350, 2.5F, 0.6F, 2, 6.0F, 10, Items.iron_ingot); modifyMaterial("BREE", 350, 2.5F, 0.6F, 2, 6.0F, 10, Items.iron_ingot);
modifyMaterial("BATTLENUN", 300, 3F, 0.6F, 2, 6.0F, 10, Items.iron_ingot); modifyMaterial("BATTLENUN", 300, 3F, 0.6F, 2, 6.0F, 10, Items.iron_ingot);
modifyMaterial("ASH", 2000, 4.25F, 0.6F, 2, 7.0F, 10, CinderLoE.ingotAsh);
} }
public static void modifyMaterial(String fieldName, int uses, float weapon_damage, float protection, int harvest_level, float speed, int enchantability, Item crafting_item) { public static void modifyMaterial(String fieldName, int uses, float weapon_damage, float protection, int harvest_level, float speed, int enchantability, Item crafting_item) {

@ -0,0 +1,120 @@
package com.zivilon.cinder_loe.blocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import lotr.common.block.LOTRBlockChandelier;
import lotr.common.block.LOTRBlockOrcChain;
import net.minecraft.block.*;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
public class bronzeChain extends LOTRBlockOrcChain {
public IIcon icon;
@SideOnly(value= Side.CLIENT)
private IIcon iconMiddle;
@SideOnly(value=Side.CLIENT)
private IIcon iconTop;
@SideOnly(value=Side.CLIENT)
private IIcon iconBottom;
@SideOnly(value=Side.CLIENT)
private IIcon iconSingle;
public bronzeChain() {
this.setHardness(1.0f);
this.setStepSound(Block.soundTypeMetal);
this.textureName = "lotr:bronzeChain";
setBlockName("lotr:bronzeChain");
setBlockTextureName("lotr:bronzeChain");
float f = 0.2f;
this.setBlockBounds(0.5f - f, 0.0f, 0.5f - f, 0.5f + f, 1.0f, 0.5f + f);
}
@SideOnly(value=Side.CLIENT)
public void registerBlockIcons(IIconRegister iconregister) {
this.iconMiddle = iconregister.registerIcon(this.getTextureName() + "_mid");
this.iconTop = iconregister.registerIcon(this.getTextureName() + "_top");
this.iconBottom = iconregister.registerIcon(this.getTextureName() + "_bottom");
this.iconSingle = iconregister.registerIcon(this.getTextureName() + "_single");
this.blockIcon = iconregister.registerIcon(this.getTextureName());
}
@SideOnly(value=Side.CLIENT)
public IIcon getIcon(IBlockAccess world, int i, int j, int k, int side) {
boolean chainBelow;
Block above = world.getBlock(i, j + 1, k);
Block below = world.getBlock(i, j - 1, k);
boolean chainAbove = above instanceof bronzeChain;
boolean bl = chainBelow = below instanceof bronzeChain || below instanceof LOTRBlockChandelier;
if (chainAbove && chainBelow) {
return this.iconMiddle;
}
if (chainAbove) {
return this.iconBottom;
}
if (chainBelow) {
return this.iconTop;
}
return this.iconSingle;
}
@SideOnly(value=Side.CLIENT)
public IIcon getIcon(int i, int j) {
return this.iconMiddle;
}
@SideOnly(value=Side.CLIENT)
public String getItemIconName() {
return this.getTextureName();
}
public boolean canPlaceBlockAt(World world, int i, int j, int k) {
Block block = world.getBlock(i, j + 1, k);
int meta = world.getBlockMetadata(i, j + 1, k);
if (block instanceof bronzeChain) {
return true;
}
if (block instanceof BlockFence || block instanceof BlockWall) {
return true;
}
if (block instanceof BlockSlab && !block.isOpaqueCube() && (meta & 8) == 0) {
return true;
}
if (block instanceof BlockStairs && (meta & 4) == 0) {
return true;
}
return world.getBlock(i, j + 1, k).isSideSolid((IBlockAccess)world, i, j + 1, k, ForgeDirection.DOWN);
}
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int side, float f, float f1, float f2) {
ItemStack itemstack = entityplayer.getHeldItem();
if (itemstack != null && itemstack.getItem() == Item.getItemFromBlock((Block)this)) {
Block block;
int j1;
for (j1 = j; j1 >= 0 && j1 < world.getHeight() && (block = world.getBlock(i, j1, k)) == this; --j1) {
}
if (j1 >= 0 && j1 < world.getHeight()) {
block = world.getBlock(i, j1, k);
if (this.canPlaceBlockOnSide(world, i, j1, k, side) && block.isReplaceable((IBlockAccess)world, i, j1, k) && !block.getMaterial().isLiquid()) {
int thisMeta = world.getBlockMetadata(i, j, k);
world.setBlock(i, j1, k, (Block)this, thisMeta, 3);
world.playSoundEffect((double)((float)i + 0.5f), (double)((float)j1 + 0.5f), (double)((float)k + 0.5f), this.stepSound.func_150496_b(), (this.stepSound.getVolume() + 1.0f) / 2.0f, this.stepSound.getPitch() * 0.8f);
if (!entityplayer.capabilities.isCreativeMode) {
--itemstack.stackSize;
}
if (itemstack.stackSize <= 0) {
entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem, null);
}
return true;
}
}
}
return false;
}
}

@ -0,0 +1,28 @@
package com.zivilon.cinder_loe.blocks;
import com.zivilon.cinder_loe.util.Utilities;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class cobbleDrystone extends Block {
public cobbleDrystone() {
super(Material.rock); // Choose the appropriate material
// Set other properties like hardness, resistance, name, etc.
setHardness(2.0F);
setResistance(5.0F);
setBlockTextureName(Utilities.toSnakeCase("lotr:cobble_drystone"));
setBlockName("lotr:cobbleDrystone");
setCreativeTab((CreativeTabs)Utilities.reflected_tab_block);
}
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) {
this.blockIcon = iconRegister.registerIcon("lotr:cobbleDrystone");
}
}

@ -0,0 +1,28 @@
package com.zivilon.cinder_loe.blocks;
import com.zivilon.cinder_loe.util.Utilities;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class cutDrystone extends Block {
public cutDrystone() {
super(Material.rock); // Choose the appropriate material
// Set other properties like hardness, resistance, name, etc.
setHardness(2.0F);
setResistance(5.0F);
setBlockTextureName(Utilities.toSnakeCase("lotr:cut_drystone"));
setBlockName("lotr:cutDrystone");
setCreativeTab((CreativeTabs)Utilities.reflected_tab_block);
}
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) {
this.blockIcon = iconRegister.registerIcon("lotr:cutDrystone");
}
}

@ -0,0 +1,28 @@
package com.zivilon.cinder_loe.blocks;
import com.zivilon.cinder_loe.util.Utilities;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class reeflessCoral extends Block {
public reeflessCoral() {
super(Material.rock); // Choose the appropriate material
// Set other properties like hardness, resistance, name, etc.
setHardness(2.0F);
setResistance(5.0F);
setBlockTextureName(Utilities.toSnakeCase("lotr:reeflessCoral"));
setBlockName("lotr:reeflessCoral");
setCreativeTab((CreativeTabs)Utilities.reflected_tab_block);
}
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) {
this.blockIcon = iconRegister.registerIcon("lotr:reeflessCoral");
}
}

@ -0,0 +1,32 @@
package com.zivilon.cinder_loe.client.render;
import com.zivilon.cinder_loe.entity.Limwaith;
import lotr.client.model.LOTRModelHuman;
import lotr.client.render.entity.LOTRRandomSkins;
import lotr.client.render.entity.LOTRRenderBiped;
import lotr.common.entity.LOTRRandomSkinEntity;
import lotr.common.entity.npc.LOTREntityNPC;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.util.ResourceLocation;
public class RenderLimwaithShaman extends RenderLimwaith {
private static LOTRRandomSkins outfits;
public RenderLimwaithShaman() {
outfits = LOTRRandomSkins.loadSkinsList("cinder_loe:mob/limwaith/shaman_outfit");
}
@Override
public int shouldRenderPass(EntityLiving entity, int pass, float f) {
Limwaith shaman = (Limwaith) entity;
if (pass == 1 && shaman.getEquipmentInSlot(3) == null) {
this.setRenderPassModel((ModelBase)this.outfitModel);
this.bindTexture(outfits.getRandomSkin(shaman));
return 1;
}
return super.shouldRenderPass((EntityLiving)shaman, pass, f);
}
}

@ -22,10 +22,12 @@ public class LOTRMaterialTransformer implements IClassTransformer {
addMaterial("RED_DWARF", classNode); addMaterial("RED_DWARF", classNode);
addMaterial("WIZARD", classNode); addMaterial("WIZARD", classNode);
addMaterial("LIMWAITH_BONE", classNode); addMaterial("LIMWAITH_BONE", classNode);
addMaterial("BONEMOLD", classNode);
addMaterial("LIMWAITH_WOOD", classNode); addMaterial("LIMWAITH_WOOD", classNode);
addMaterial("EVENT", classNode); addMaterial("EVENT", classNode);
addMaterial("BREE", classNode); addMaterial("BREE", classNode);
addMaterial("BATTLENUN", classNode); addMaterial("BATTLENUN", classNode);
addMaterial("ASH", classNode);
// Convert your ClassNode back to byte array with ClassWriter // Convert your ClassNode back to byte array with ClassWriter
ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);

@ -24,7 +24,8 @@ public class LOTRWeaponLinker implements IClassTransformer {
"spearLimwaith", "tridentLimwaith", "daggerLimwaith", "daggerLimwaithPoisoned", "truncheonLimwaith", "battleaxeLimwaith", "blowgunLimwaith", "spearLimwaith", "tridentLimwaith", "daggerLimwaith", "daggerLimwaithPoisoned", "truncheonLimwaith", "battleaxeLimwaith", "blowgunLimwaith",
"frostblade", "spearsolidgold", "whip", "frostblade", "spearsolidgold", "whip",
"swordBree", "swordBree",
"maceArnor"); "maceArnor",
"daggerAsh","bowAsh","hammerAsh","pikeAsh","battleaxeAsh","swordAsh","spearAsh");
} }
return basicClass; return basicClass;
} }

@ -44,6 +44,6 @@ public class BattleNun extends ArnorSoldier {
@Override @Override
public LOTRMiniQuest createMiniQuest() { public LOTRMiniQuest createMiniQuest() {
return LOTRMiniQuestFactory.RANGER_NORTH_ARNOR_RELIC.createQuest(this); return LOTRMiniQuestFactory.RANGER_NORTH.createQuest(this);
} }
} }

@ -25,26 +25,19 @@ import net.minecraft.world.World;
public class BreeOutrider extends BreeCrossbowman { public class BreeOutrider extends BreeCrossbowman {
protected EntityAIBase rangedAttackAI = this.createBreeRangedAttackAI(); protected EntityAIBase rangedAttackAI = this.createBreeRangedAttackAI();
protected EntityAIBase meleeAttackAI = this.createBreeMeleeAttackAI(); protected EntityAIBase meleeAttackAI;
public BreeOutrider(World world) { public BreeOutrider(World world) {
super(world); super(world);
this.addTargetTasks(true);
this.npcCape = LOTRCapes.RANGER; this.npcCape = LOTRCapes.RANGER;
this.spawnRidingHorse = true; this.spawnRidingHorse = true;
this.npcShield = LOTRShields.ALIGNMENT_BREE; this.npcShield = LOTRShields.ALIGNMENT_BREE;
} }
@Override
protected int addBreeAttackAI(int prio) {
((EntityLiving)this).tasks.addTask(prio, (EntityAIBase)new LOTREntityAIRangedAttack(this, 1.25, 30, 50, 16.0f));
return prio;
}
protected EntityAIBase createBreeRangedAttackAI() { protected EntityAIBase createBreeRangedAttackAI() {
return new LOTREntityAIRangedAttack(this, 1.25, 30, 40, 16.0f); return new LOTREntityAIRangedAttack(this, 1.25, 30, 40, 16.0f);
} }
protected EntityAIBase addBreeAttackAI() {
protected EntityAIBase createBreeMeleeAttackAI() { return new LOTREntityAIAttackOnCollide(this, 1.45D, true);
return new LOTREntityAIAttackOnCollide(this, 1.45D, false);
} }
@Override @Override

@ -0,0 +1,46 @@
package com.zivilon.cinder_loe.entity;
import com.zivilon.cinder_loe.CinderLoE;
import lotr.common.LOTRShields;
import net.minecraft.entity.IEntityLivingData;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class LimwaithBoneWarrior extends Limwaith {
public LimwaithBoneWarrior(World world) {
super(world);
this.npcShield = LOTRShields.ALIGNMENT_MOREDAIN;
}
public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
data = super.onSpawnWithEgg(data);
int i = rand.nextInt(6);
if (i == 0) {
this.npcItemsInv.setMeleeWeapon(new ItemStack(CinderLoE.truncheonLimwaith));
} else if (i == 1 || i == 2) {
this.npcItemsInv.setMeleeWeapon(new ItemStack(CinderLoE.tridentLimwaith));
} else if (i == 3 || i == 4) {
this.npcItemsInv.setMeleeWeapon(new ItemStack(CinderLoE.spearLimwaith));
} else {
this.npcItemsInv.setMeleeWeapon(new ItemStack(CinderLoE.battleaxeLimwaith));
}
if (rand.nextInt(6) == 0) {
this.npcItemsInv.setSpearBackup(this.npcItemsInv.getMeleeWeapon());
this.npcItemsInv.setMeleeWeapon(new ItemStack(CinderLoE.spearLimwaith));
}
this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
setCurrentItemOrArmor(1, new ItemStack(CinderLoE.bootsboneLimwaith));
setCurrentItemOrArmor(2, new ItemStack(CinderLoE.legsboneLimwaith));
setCurrentItemOrArmor(3, new ItemStack(CinderLoE.bodyboneLimwaith));
if (rand.nextInt(10) != 0)
setCurrentItemOrArmor(4, new ItemStack(CinderLoE.helmetboneLimwaith));
return data;
}
@Override
public ItemStack getPickedResult(MovingObjectPosition target) {
return new ItemStack(CinderLoE.limwaithBoneWarriorSpawnEgg, 1);
}
}

@ -1,5 +1,7 @@
package com.zivilon.cinder_loe.entity; package com.zivilon.cinder_loe.entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IEntityLivingData;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -13,7 +15,7 @@ import lotr.common.world.spawning.LOTRInvasions;
import com.zivilon.cinder_loe.entity.LimwaithWarrior; import com.zivilon.cinder_loe.entity.LimwaithWarrior;
import com.zivilon.cinder_loe.CinderLoE; import com.zivilon.cinder_loe.CinderLoE;
public class LimwaithChieftain extends LimwaithWarrior implements LOTRUnitTradeable { public class LimwaithChieftain extends LimwaithBoneWarrior implements LOTRUnitTradeable {
public LimwaithChieftain(World world) { public LimwaithChieftain(World world) {
super(world); super(world);
addTargetTasks(false); addTargetTasks(false);
@ -33,7 +35,18 @@ public class LimwaithChieftain extends LimwaithWarrior implements LOTRUnitTradea
public void onUnitTrade(EntityPlayer entityplayer) { public void onUnitTrade(EntityPlayer entityplayer) {
} }
@Override
public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
data = super.onSpawnWithEgg(data);
this.npcItemsInv.setMeleeWeapon(new ItemStack(CinderLoE.truncheonLimwaith));
this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
setCurrentItemOrArmor(1, new ItemStack(CinderLoE.bootsboneLimwaith));
setCurrentItemOrArmor(2, new ItemStack(CinderLoE.legsboneLimwaith));
setCurrentItemOrArmor(3, new ItemStack(CinderLoE.bodyboneLimwaith));
setCurrentItemOrArmor(4, null);
return data;
}
public boolean canTradeWith(EntityPlayer entityplayer) { public boolean canTradeWith(EntityPlayer entityplayer) {
return (LOTRLevelData.getData(entityplayer).getAlignment(getFaction()) >= 150.0F && isFriendlyAndAligned(entityplayer)); return (LOTRLevelData.getData(entityplayer).getAlignment(getFaction()) >= 150.0F && isFriendlyAndAligned(entityplayer));
} }
@ -41,4 +54,9 @@ public class LimwaithChieftain extends LimwaithWarrior implements LOTRUnitTradea
public ItemStack getPickedResult(MovingObjectPosition target) { public ItemStack getPickedResult(MovingObjectPosition target) {
return new ItemStack(CinderLoE.limwaithChieftainSpawnEgg, 1); return new ItemStack(CinderLoE.limwaithChieftainSpawnEgg, 1);
} }
@Override
public void attackEntityWithRangedAttack(EntityLivingBase p_82196_1_, float p_82196_2_) {
}
} }

@ -0,0 +1,69 @@
package com.zivilon.cinder_loe.entity;
import com.zivilon.cinder_loe.CinderLoE;
import lotr.common.LOTRLevelData;
import lotr.common.LOTRMod;
import lotr.common.entity.npc.LOTREntityDwarf;
import lotr.common.entity.npc.LOTRTradeEntries;
import lotr.common.entity.npc.LOTRTradeEntries.TradeType;
import lotr.common.entity.npc.LOTRTradeEntry;
import lotr.common.entity.npc.LOTRTradeable;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IEntityLivingData;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import static lotr.common.entity.npc.LOTRTradeEntries.HARAD_FISHMONGER_BUY;
import static lotr.common.entity.npc.LOTRTradeEntries.HARAD_FISHMONGER_SELL;
public class LimwaithFishmonger extends Limwaith implements LOTRTradeable {
public LimwaithFishmonger(World world) {
super(world);
}
public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
data = super.onSpawnWithEgg(data);
this.npcItemsInv.setMeleeWeapon(new ItemStack(CinderLoE.tridentLimwaith));
this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
return data;
}
public LOTRTradeEntries getBuyPool() {
return HARAD_FISHMONGER_BUY;
}
public LOTRTradeEntries getSellPool() {
return HARAD_FISHMONGER_SELL;
}
public float getAlignmentBonus() {
return 2.0F;
}
protected void dropFewItems(boolean flag, int i) {
super.dropFewItems(flag, i);
dropItem(getLimwaithTraderDrop(), 1 + rand.nextInt(3) + rand.nextInt(i + 1));
}
protected Item getLimwaithTraderDrop() {
return LOTRMod.pearl;
}
public boolean canTradeWith(EntityPlayer entityplayer) {
return (LOTRLevelData.getData(entityplayer).getAlignment(getFaction()) >= 100.0F && isFriendlyAndAligned(entityplayer));
}
@Override
public void onPlayerTrade(EntityPlayer entityplayer, TradeType type, ItemStack itemstack) {
}
@Override
public void attackEntityWithRangedAttack(EntityLivingBase p_82196_1_, float p_82196_2_) {
}
}

@ -0,0 +1,113 @@
package com.zivilon.cinder_loe.entity;
import com.zivilon.cinder_loe.CinderLoE;
import lotr.common.LOTRFoods;
import lotr.common.LOTRLevelData;
import lotr.common.LOTRMod;
import lotr.common.entity.npc.LOTREntityDwarf;
import lotr.common.entity.npc.LOTRTradeEntries;
import lotr.common.entity.npc.LOTRTradeEntries.TradeType;
import lotr.common.entity.npc.LOTRTradeEntry;
import lotr.common.entity.npc.LOTRTradeable;
import lotr.common.item.LOTRItemMug;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IEntityLivingData;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public class LimwaithShaman extends Limwaith implements LOTRTradeable.Smith {
public static LOTRTradeEntries LIMWAITH_SHAMAN_BUY;
public static LOTRTradeEntries LIMWAITH_SHAMAN_SELL;
public LimwaithShaman(World world) {
super(world);
}
public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
data = super.onSpawnWithEgg(data);
this.npcItemsInv.setMeleeWeapon(new ItemStack(CinderLoE.daggerLimwaithPoisoned));
this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
return data;
}
public LOTRTradeEntries getBuyPool() {
return LIMWAITH_SHAMAN_BUY;
}
public LOTRTradeEntries getSellPool() {
return LIMWAITH_SHAMAN_SELL;
}
public float getAlignmentBonus() {
return 2.0F;
}
protected void dropFewItems(boolean flag, int i) {
super.dropFewItems(flag, i);
dropItem(getLimwaithTraderDrop(), 1 + rand.nextInt(2) + rand.nextInt(i + 1));
}
public boolean canTradeWith(EntityPlayer entityplayer) {
return (LOTRLevelData.getData(entityplayer).getAlignment(getFaction()) >= 100.0F && isFriendlyAndAligned(entityplayer));
}
static {
LIMWAITH_SHAMAN_BUY = new LOTRTradeEntries(TradeType.BUY,
new LOTRTradeEntry(new ItemStack(CinderLoE.daggerLimwaith), 12),
new LOTRTradeEntry(new ItemStack(CinderLoE.daggerLimwaithPoisoned), 20),
new LOTRTradeEntry(new ItemStack(CinderLoE.blowgunLimwaith), 25),
new LOTRTradeEntry(new ItemStack(LOTRMod.tauredainDart, 4), 5),
new LOTRTradeEntry(new ItemStack(LOTRMod.tauredainDartPoisoned, 4), 10),
new LOTRTradeEntry(new ItemStack(CinderLoE.bonemold, 2), 4),
new LOTRTradeEntry(new ItemStack(Items.bone, 1), 1),
new LOTRTradeEntry(new ItemStack(LOTRMod.bottlePoison), 10));
LIMWAITH_SHAMAN_SELL = new LOTRTradeEntries(TradeType.SELL,
new LOTRTradeEntry(new ItemStack(Items.gold_nugget), 2),
new LOTRTradeEntry(new ItemStack(LOTRMod.emerald), 15),
new LOTRTradeEntry(new ItemStack(LOTRMod.amber), 10),
new LOTRTradeEntry(new ItemStack(Items.glass_bottle), 2),
new LOTRTradeEntry(new ItemStack(LOTRMod.mug), 1),
new LOTRTradeEntry(new ItemStack(Items.bone), 1),
new LOTRTradeEntry(new ItemStack(LOTRMod.rhinoHorn), 5),
new LOTRTradeEntry(new ItemStack(Items.dye, 3, 15), 1),
new LOTRTradeEntry(new ItemStack(LOTRMod.gemsbokHorn), 4),
new LOTRTradeEntry(new ItemStack(LOTRMod.doubleFlower, 2, 2), 1),
new LOTRTradeEntry(new ItemStack(LOTRMod.doubleFlower, 2, 3), 1),
new LOTRTradeEntry(new ItemStack(Blocks.red_mushroom, 1, 0), 2),
new LOTRTradeEntry(new ItemStack(Blocks.brown_mushroom, 1, 0), 2),
new LOTRTradeEntry(new ItemStack(CinderLoE.bonemold, 2), 3),
new LOTRTradeEntry(new ItemStack(LOTRMod.mango), 1),
new LOTRTradeEntry(new ItemStack(LOTRMod.banana), 1),
new LOTRTradeEntry(new ItemStack(LOTRMod.corn, 2), 1));
}
@Override
public void onPlayerTrade(EntityPlayer entityplayer, TradeType type, ItemStack itemstack) {
}
@Override
public void attackEntityWithRangedAttack(EntityLivingBase p_82196_1_, float p_82196_2_) {
}
protected Item getLimwaithTraderDrop() {
return LOTRMod.pearl;
}
@Override
public String getSpeechBank(EntityPlayer entityplayer) {
if (this.isFriendlyAndAligned(entityplayer)) {
if (this.canTradeWith(entityplayer)) {
return "limwaith/shaman/friendly";
}
return "limwaith/shaman/neutral";
}
return "limwaith/shaman/hostile";
}
}

@ -33,12 +33,22 @@ public class recipes {
Character.valueOf('X'), LOTRMod.fur})); Character.valueOf('X'), LOTRMod.fur}));
GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.fishBarrel), new Object[] { "XXX", "XXX", "XXX", GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.fishBarrel), new Object[] { "XXX", "XXX", "XXX",
Character.valueOf('X'), Items.fish})); Character.valueOf('X'), Items.fish}));
GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.silverChain, 6), new Object[] { " X ", " X ", " X ", GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.silverChain, 8), new Object[] { "X", "X", "X",
Character.valueOf('X'), LOTRMod.silver})); Character.valueOf('X'), LOTRMod.silver}));
GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.goldChain, 6), new Object[] { " X ", " X ", " X ", GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.goldChain, 8), new Object[] { "X", "X", "X",
Character.valueOf('X'), Items.gold_ingot})); Character.valueOf('X'), Items.gold_ingot}));
GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.ironChain, 6), new Object[] { " X ", " X ", " X ", GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.ironChain, 8), new Object[] { "X", "X", "X",
Character.valueOf('X'), Items.iron_ingot})); Character.valueOf('X'), Items.iron_ingot}));
GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.bronzeChain, 8), new Object[] { "X", "X", "X",
Character.valueOf('X'), LOTRMod.bronze}));
GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.cobbleDrystone, 4), new Object[] { "XX", "XX",
Character.valueOf('X'), LOTRMod.cobblebrick}));
GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.cutDrystone, 4), new Object[] { "XX", "XX",
Character.valueOf('X'), CinderLoE.cobbleDrystone}));
GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(LOTRMod.cobblebrick, 4), new Object[] { "XX", "XX",
Character.valueOf('X'), CinderLoE.cutDrystone}));
GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.reeflessCoral, 1), new Object[] { "X",
Character.valueOf('X'), LOTRMod.coralReef}));
} }
public static void registerRedDwarvenRecipes() { public static void registerRedDwarvenRecipes() {
LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetRedDwarf), new Object[] { "XXX", "X X", LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetRedDwarf), new Object[] { "XXX", "X X",

@ -2,6 +2,7 @@ tile.lotr:cinderBlock.name=Cinder Block
tile.lotr:ironChain.name=Iron Chain tile.lotr:ironChain.name=Iron Chain
tile.lotr:silverChain.name=Silver Chain tile.lotr:silverChain.name=Silver Chain
tile.lotr:goldChain.name=Gold Chain tile.lotr:goldChain.name=Gold Chain
tile.lotr:bronzeChain.name=Bronze Chain
tile.lotr:blockRedDwarfSteel.name=Red Dwarven Steel Block tile.lotr:blockRedDwarfSteel.name=Red Dwarven Steel Block
tile.lotr:chandelierRedDwarf.name=Red Dwarven Chandelier tile.lotr:chandelierRedDwarf.name=Red Dwarven Chandelier
tile.lotr:barsRedDwarf.name=Red Dwarven Bars tile.lotr:barsRedDwarf.name=Red Dwarven Bars
@ -12,6 +13,9 @@ tile.lotr:dwarvenBrickRuned.name=Runed Dwarven Brick
tile.lotr:ivoryBlock.name=Ivory Block tile.lotr:ivoryBlock.name=Ivory Block
tile.lotr:mistBlock.name=Mist tile.lotr:mistBlock.name=Mist
tile.lotr:fishbarrel.name=Barrel of Fish tile.lotr:fishbarrel.name=Barrel of Fish
tile.lotr:reeflessCoral.name=Cut Coral
tile.lotr:cutDrystone.name=Cut Drystone
tile.lotr:cobbleDrystone.name=Cobbled Drystone
item.lotr:frostblade.name=Frostblade item.lotr:frostblade.name=Frostblade
item.lotr:whip.name=Whip item.lotr:whip.name=Whip
@ -30,14 +34,21 @@ item.lotr:daggerRedDwarf.name=Red Dwarven Dagger
item.lotr:daggerRedDwarfPoisoned.name=Poisoned Red Dwarven Dagger item.lotr:daggerRedDwarfPoisoned.name=Poisoned Red Dwarven Dagger
item.lotr:crossbowRedDwarf.name=Red Dwarven Crossbow item.lotr:crossbowRedDwarf.name=Red Dwarven Crossbow
item.lotr:boarArmorRedDwarf.name=Red Dwarven Boar Armor item.lotr:boarArmorRedDwarf.name=Red Dwarven Boar Armor
item.lotr:radagastStaff.name=Staff of Radagast the Brown item.lotr:radagastStaff.name=Staff of Radagast the Brown
item.lotr:pallandoStaff.name=Staff of Pallando the Blue item.lotr:pallandoStaff.name=Staff of Pallando the Blue
item.lotr:alatarStaff.name=Staff of Alatar the Blue item.lotr:alatarStaff.name=Staff of Alatar the Blue
item.lotr:sarumanStaff.name=Staff of Saruman of Many Colors item.lotr:sarumanStaff.name=Staff of Saruman of Many Colors
item.lotr:bonemold.name=Bonemold
item.lotr:helmetLimwaith.name=Limwaith Helmet item.lotr:helmetLimwaith.name=Limwaith Helmet
item.lotr:bodyLimwaith.name=Limwaith Chestplate item.lotr:bodyLimwaith.name=Limwaith Chestplate
item.lotr:legsLimwaith.name=Limwaith Leggings item.lotr:legsLimwaith.name=Limwaith Leggings
item.lotr:bootsLimwaith.name=Limwaith Boots item.lotr:bootsLimwaith.name=Limwaith Boots
item.lotr:helmetboneLimwaith.name=Bonemold Helmet
item.lotr:bodyboneLimwaith.name=Bonemold Chestplate
item.lotr:legsboneLimwaith.name=Bonemold Leggings
item.lotr:bootsboneLimwaith.name=Bonemold Boots
item.lotr:spearLimwaith.name=Limwaith Spear item.lotr:spearLimwaith.name=Limwaith Spear
item.lotr:tridentLimwaith.name=Limwaith Trident item.lotr:tridentLimwaith.name=Limwaith Trident
item.lotr:battleaxeLimwaith.name=Limwaith Battleaxe item.lotr:battleaxeLimwaith.name=Limwaith Battleaxe
@ -57,6 +68,15 @@ item.lotr:legsArnorBanner.name=Light Arnorian Leggings
item.lotr:bootsArnorBanner.name=Light Arnorian Boots item.lotr:bootsArnorBanner.name=Light Arnorian Boots
item.lotr:maceArnor.name=Arnorian Mace item.lotr:maceArnor.name=Arnorian Mace
item.lotr:ingotAsh.name=Ashen Ingot
item.lotr:swordAsh.name=Ash-Forged Sword
item.lotr:daggerAsh.name=Ash-Forged Dagger
item.lotr:hammerAsh.name=Ash-Forged Mace
item.lotr:battleaxeAsh.name=Ash-Forged Axe
item.lotr:bowAsh.name=Ash-Forged Bow
item.lotr:pikeAsh.name=Ash-Forged Pike
item.lotr:spearAsh.name=Ash-Forged Spear
item.spawn_egg_fangornauroch.name=Spawn Fangorn Auroch item.spawn_egg_fangornauroch.name=Spawn Fangorn Auroch
item.spawn_egg_fangornbear.name=Spawn Fangorn Bear item.spawn_egg_fangornbear.name=Spawn Fangorn Bear
item.spawn_egg_fangornwildboar.name=Spawn Fangorn Wild Boar item.spawn_egg_fangornwildboar.name=Spawn Fangorn Wild Boar
@ -66,7 +86,7 @@ item.spawn_egg_reddwarfarbalest.name=Spawn Red Dwarf Arbalest
item.spawn_egg_reddwarfbannerbearer.name=Spawn Red Dwarf Banner Bearer item.spawn_egg_reddwarfbannerbearer.name=Spawn Red Dwarf Banner Bearer
item.spawn_egg_reddwarfcommander.name=Spawn Red Dwarf Commander item.spawn_egg_reddwarfcommander.name=Spawn Red Dwarf Commander
item.spawn_egg_reddwarfsmith.name=Red Dwarven Smith item.spawn_egg_reddwarfsmith.name=Red Dwarven Smith
item.spawn_egg_limwaithwarrior.name=Spawn Limwaith Warrior item.spawn_egg_limwaithwarrior.name=Spawn Limwaith Clansman
item.spawn_egg_limwaithblowgunner.name=Spawn Limwaith Blowgunner item.spawn_egg_limwaithblowgunner.name=Spawn Limwaith Blowgunner
item.spawn_egg_limwaithbannerbearer.name=Spawn Limwaith Banner Bearer item.spawn_egg_limwaithbannerbearer.name=Spawn Limwaith Banner Bearer
item.spawn_egg_limwaithchieftain.name=Spawn Limwaith Chieftain item.spawn_egg_limwaithchieftain.name=Spawn Limwaith Chieftain
@ -84,13 +104,21 @@ item.spawn_egg_breecrossbowman.name=Spawn Bree-Land Crossbowman
item.spawn_egg_breecaptain.name=Spawn Bree-Land Captain item.spawn_egg_breecaptain.name=Spawn Bree-Land Captain
item.spawn_egg_breesoldierbannerbearer.name=Spawn Bree-Land Bannerbearer item.spawn_egg_breesoldierbannerbearer.name=Spawn Bree-Land Bannerbearer
item.spawn_egg_breeoutrider.name=Spawn Bree-Land Outrider item.spawn_egg_breeoutrider.name=Spawn Bree-Land Outrider
item.spawn_egg_utumnoslavetrader.name=Utumno Slave item.spawn_egg_utumnoslavetrader.name=Spawn Utumno Slave
item.spawn_egg_limwaith.name=Spawn Limwaith
item.spawn_egg_limwaithshaman.name=Spawn Limwaith Shaman
item.spawn_egg_limwaithfishmonger.name=Spawn Limwaith Fishmonger
item.spawn_egg_limwaithbonewarrior.name=Spawn Limwaith Warrior
entity.cinder_loe.RedDwarfWarrior.name=Red Dwarf Warrior entity.cinder_loe.RedDwarfWarrior.name=Red Dwarf Warrior
entity.cinder_loe.RedDwarfArbalest.name=Red Dwarf Arbalest entity.cinder_loe.RedDwarfArbalest.name=Red Dwarf Arbalest
entity.cinder_loe.RedDwarfBannerBearer.name=Red Dwarf Banner Bearer entity.cinder_loe.RedDwarfBannerBearer.name=Red Dwarf Banner Bearer
entity.cinder_loe.RedDwarfCommander.name=Red Dwarf Commander entity.cinder_loe.RedDwarfCommander.name=Red Dwarf Commander
entity.cinder_loe.LimwaithWarrior.name=Limwaith Warrior entity.cinder_loe.Limwaith.name=Limwaith
entity.cinder_loe.LimwaithFishmonger.name=Limwaith Fisherman
entity.cinder_loe.LimwaithShaman.name=Limwaith Shaman
entity.cinder_loe.LimwaithWarrior.name=Limwaith Clansman
entity.cinder_loe.LimwaithBoneWarrior.name=Limwaith Warrior
entity.cinder_loe.LimwaithBlowgunner.name=Limwaith Blowgunner entity.cinder_loe.LimwaithBlowgunner.name=Limwaith Blowgunner
entity.cinder_loe.LimwaithBannerBearer.name=Limwaith Banner Bearer entity.cinder_loe.LimwaithBannerBearer.name=Limwaith Banner Bearer
entity.cinder_loe.LimwaithChieftain.name=Limwaith Chieftain entity.cinder_loe.LimwaithChieftain.name=Limwaith Chieftain

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 190 B

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 B

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 B

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 5.0 KiB

Loading…
Cancel
Save