diff --git a/src/main/java/com/zivilon/cinder_loe/CinderBrewingRecipes.java b/src/main/java/com/zivilon/cinder_loe/CinderBrewingRecipes.java new file mode 100644 index 0000000..435ea47 --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/CinderBrewingRecipes.java @@ -0,0 +1,22 @@ +package com.zivilon.cinder_loe; + +import net.minecraft.item.ItemStack; + +import java.lang.reflect.Method; + +public class CinderBrewingRecipes { + public static void addCustomBrewingRecipe(ItemStack result, Object... ingredients) { + try { + Class brewingRecipesClass = Class.forName("lotr.common.recipe.LOTRBrewingRecipes"); + Method addBrewingRecipeMethod = brewingRecipesClass.getDeclaredMethod("addBrewingRecipe", ItemStack.class, Object[].class); + + addBrewingRecipeMethod.setAccessible(true); + + addBrewingRecipeMethod.invoke(null, result, ingredients); + + + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java index 3516e0e..1a6fded 100644 --- a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java +++ b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java @@ -4,23 +4,29 @@ import com.zivilon.cinder_loe.blocks.*; import com.zivilon.cinder_loe.character.CharacterEventListener; import com.zivilon.cinder_loe.character.CharacterRoleAPI; import com.zivilon.cinder_loe.client.render.*; -import com.zivilon.cinder_loe.client.render.block.*; -import com.zivilon.cinder_loe.client.render.projectile.*; import com.zivilon.cinder_loe.client.render.corrupt.*; +import com.zivilon.cinder_loe.client.render.projectile.*; import com.zivilon.cinder_loe.command.CommandCinderCharacter; import com.zivilon.cinder_loe.entity.*; -import com.zivilon.cinder_loe.entity.projectile.*; import com.zivilon.cinder_loe.entity.corrupt.*; import com.zivilon.cinder_loe.entity.npc.*; -import com.zivilon.cinder_loe.entity.trader.BladorthinSmith; -import com.zivilon.cinder_loe.entity.trader.LimwaithFishmonger; -import com.zivilon.cinder_loe.entity.trader.LimwaithShaman; -import com.zivilon.cinder_loe.entity.trader.RedDwarfSmith; +import com.zivilon.cinder_loe.entity.npc.dwarf.RedDwarfArbalest; +import com.zivilon.cinder_loe.entity.npc.dwarf.RedDwarfBannerBearer; +import com.zivilon.cinder_loe.entity.npc.dwarf.RedDwarfCommander; +import com.zivilon.cinder_loe.entity.npc.dwarf.RedDwarfWarrior; +import com.zivilon.cinder_loe.entity.npc.elf.Sirrandrai; +import com.zivilon.cinder_loe.entity.npc.evil_human.*; +import com.zivilon.cinder_loe.entity.npc.good_human.*; +import com.zivilon.cinder_loe.entity.npc.orc.MorgulOrc; +import com.zivilon.cinder_loe.entity.npc.orc.NorthernOrc; +import com.zivilon.cinder_loe.entity.npc.radagast.*; +import com.zivilon.cinder_loe.entity.projectile.*; +import com.zivilon.cinder_loe.entity.trader.*; import com.zivilon.cinder_loe.items.*; +import com.zivilon.cinder_loe.potion.LoEPotions; import com.zivilon.cinder_loe.tileentity.*; import com.zivilon.cinder_loe.util.Utilities; import com.zivilon.cindercore.CinderCore; -import lotr.common.LOTREventHandler; import lotr.common.item.*; import net.minecraft.potion.Potion; import org.apache.logging.log4j.LogManager; @@ -76,7 +82,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.WorldEvent; import static lotr.common.LOTRMod.horseArmorIron; -import static lotr.common.item.LOTRMaterial.GONDOR; +import static lotr.common.item.LOTRMaterial.*; import net.minecraft.command.ICommandSender; import net.minecraft.command.CommandBase; @@ -95,7 +101,7 @@ public class CinderLoE { @Instance("cinder_loe") public static CinderLoE instance; - public static final Logger LOG = LogManager.getLogger(Tags.MODID); + public static Logger LOG = LogManager.getLogger(Tags.MODID); // LOTR Materials public static LOTRMaterial MATERIAL_RED_DWARF; @@ -103,18 +109,10 @@ public class CinderLoE { public static LOTRMaterial MATERIAL_LIMWAITH_WOOD; public static LOTRMaterial EVENT; public static LOTRMaterial MATERIAL_BREE; - public static LOTRMaterial MATERIAL_RHUDUAR; + public static LOTRMaterial MATERIAL_RHUDAUR; public static LOTRMaterial MATERIAL_BATTLENUN; public static LOTRMaterial MATERIAL_ASH; - public static LOTRMaterial MATERIAL_SERPENT; - public static LOTRMaterial MATERIAL_USURPER; - public static LOTRMaterial MATERIAL_WARLORD; public static LOTRMaterial MATERIAL_JADE; - public static LOTRMaterial MATERIAL_NEX_ICE; - public static LOTRMaterial MATERIAL_NEX_FIRE; - public static LOTRMaterial MATERIAL_NEX_TOXIN; - public static LOTRMaterial MATERIAL_NEX_SHADOW; - // Blocks // public static Block barricade; @@ -132,18 +130,17 @@ public class CinderLoE { public static Block mistBlock; public static Block cutDrystone; public static Block cindercobble; + public static Block cinderfur; + public static Block furCarpet; public static Block reeflessCoral; public static Block silverChain; public static Block goldChain; public static Block ironChain; public static Block bronzeChain; + public static Block plaster; public static Block voidblock; - public static Block shadowTile; public static Block entityBarrier; - public static Block iceCage; - public static Block enchantedIce; - public static Block woodpanel; //public static Block verticalWeaponRack; @@ -153,6 +150,7 @@ public class CinderLoE { //Food Crop blocks public static Block onionCrop; public static Block cabbageCrop; + //Food! Yum :P public static Item onion; public static Item cabbage; @@ -160,6 +158,7 @@ public class CinderLoE { public static Item spice; public static Item spicedHam; public static Item lightStew; + public static Item chocolatebar; public static Item fruitsalad; public static Item flour; @@ -167,13 +166,13 @@ public class CinderLoE { public static Item pasta; public static Item pretzel; public static Item halva; - public static Item honey; + // public static Item honey; + public static Item doner_kebab; // Event/special public static Item frostblade; public static Item daggervoid; public static Item spearsolidgold; - public static Item spearblood; public static Item spearUnnamed; public static Item swordAsh; public static Item staffAsh; @@ -190,29 +189,9 @@ public class CinderLoE { public static Item legsJade; public static Item bootsJade; - // Frozen Dungeon - public static Item helmetNexIce; - public static Item bodyNexIce; - public static Item legsNexIce; - public static Item bootsNexIce; - public static Item helmetNexFire; - public static Item bodyNexFire; - public static Item legsNexFire; - public static Item bootsNexFire; - public static Item helmetNexToxin; - public static Item bodyNexToxin; - public static Item legsNexToxin; - public static Item bootsNexToxin; - public static Item helmetNexShadow; - public static Item bodyNexShadow; - public static Item legsNexShadow; - public static Item bootsNexShadow; - public static Item firstAgeGlaive; - public static Item toxicCore; - - - // Misc + public static Item forgingKit; + public static Item cinderFurItem; // Common tools/weapons public static Item whip; @@ -220,7 +199,7 @@ public class CinderLoE { public static Item warDart; public static Item warDartHeads; - // Elite Armors/weapons + // Elite Armors public static Item helmetserpent; public static Item bodyserpent; public static Item legsserpent; @@ -233,10 +212,6 @@ public class CinderLoE { public static Item bodyWarlord; public static Item legsWarlord; public static Item bootsWarlord; - public static Item maceWarlord; - public static Item bowserpent; - public static Item swordUsurper; - // Red Dwarves public static Item redDwarfSteel; @@ -307,22 +282,25 @@ public class CinderLoE { public static Item welfRelic; // Spawn eggs public static Item spawnEgg; + public static Item unitLevelTool; // Spawn lists public static LOTRSpawnList RED_DWARF; public static LOTRSpawnList LIMWAITH; - public static LOTRSpawnList Rhudaur; + public static LOTRSpawnList RHUDAUR; + + public static CinderEventHandler modEventHandler; - private static CinderEventHandler modEventHandler; @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { CinderLoE_Config.init(event); Materials.registerMaterials(); + registerBlocks(); registerItems(); ItemRegistration.registerItems(); - registerBlocks(); registerEntities(); modEventHandler = new CinderEventHandler(); + LoEPotions.registerPotions(); } @Mod.EventHandler @@ -334,10 +312,6 @@ public class CinderLoE { } MinecraftForge.EVENT_BUS.register(this); new CharacterEventListener(); - - if (event.getSide().isClient()) { - ClientCommandHandler.instance.registerCommand(new DevCommand()); - } } @@ -349,11 +323,9 @@ public class CinderLoE { modifySpawnLists(); } Utilities.initialize_reflects(); - recipes.registerRecipes(); // Register recipes at com.zivilon.cinder_loe.recipes.java + recipes.registerRecipes(); setupTradeEntries(); LOTRWeaponStats.registerMeleeReach(Whip.class, 1.5F); - LOTRWeaponStats.registerMeleeReach(FirstAgeGlaive.class, 1.8F); - LOTRWeaponStats.registerMeleeSpeed(FirstAgeGlaive.class, 1.0F); LoECreativeTabs.setupIcons(); } @@ -364,13 +336,11 @@ public class CinderLoE { event.registerServerCommand(new CommandCinderCharacter()); } - public void registerEntities() { // Last ID added: 45 + public void registerEntities() { // Last ID added: 58 ///GameRegistry.registerTileEntity(TileEntityMistBlock.class, "TileEntityMistBlock"); ///.registerBlock(TileEntityRustedSword, "TileEntityRustedSword"); int entityID = 7320; // Always increment entityID by 1 over the last entity to ensure unique IDs - // EntityRegistry.registerModEntity(HaradLevy.class, "HaradLevy", (entityID + 36), this, 64, 1, true); - // EntityRegistry.registerModEntity(DwarfLevy.class, "DwarfLevy", (entityID + 37), this, 64, 1, true); // Traders EntityRegistry.registerModEntity(RedDwarfSmith.class, "RedDwarfSmith", (entityID + 29), this, 64, 1, true); @@ -379,35 +349,36 @@ public class CinderLoE { EntityRegistry.registerModEntity(BladorthinSmith.class, "BladorthinSmith", (entityID + 43), this, 64, 1, true); - // Others - + // Event EntityRegistry.registerModEntity(DarkSpider.class, "DarkSpider", (entityID + 42), this, 64, 1, true); - EntityRegistry.registerModEntity(Nex.class, "Nex", (entityID + 44), this, 64, 1, true); - EntityRegistry.registerModEntity(EntityWarDart.class, "WarDart", (entityID + 45), this, 64, 1, true); - EntityRegistry.registerModEntity(CorruptDwarf.class, "CorruptDwarf", (entityID + 36), this, 64, 1, true); EntityRegistry.registerModEntity(CorruptElf.class, "CorruptElf", (entityID + 37), this, 64, 1, true); EntityRegistry.registerModEntity(CorruptEnt.class, "CorruptEnt", (entityID + 38), this, 64, 1, true); EntityRegistry.registerModEntity(CorruptHobbit.class, "CorruptHobit", (entityID + 39), this, 64, 1, true); EntityRegistry.registerModEntity(CorruptMan.class, "CorruptMan", (entityID + 40), this, 64, 1, true); EntityRegistry.registerModEntity(CorruptOrc.class, "CorruptOrc", (entityID + 41), this, 64, 1, true); - - EntityRegistry.registerModEntity(SarumanFireball.class, "SarumanFireball", entityID + 0, this, 64, 10, true); EntityRegistry.registerModEntity(Renegade.class, "Renegade", (entityID + 1), this, 64, 1, true); EntityRegistry.registerModEntity(RenegadeCaptain.class, "RenegadeCaptain", (entityID + 16), this, 64, 1, true); + EntityRegistry.registerModEntity(FangornBear.class, "FangornBear", (entityID + 6), this, 64, 1, true); + EntityRegistry.registerModEntity(FangornWildBoar.class, "FangornWildBoar", (entityID + 7), this, 64, 1, true); + EntityRegistry.registerModEntity(FangornAuroch.class, "FangornAuroch", (entityID + 8), 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(Wraith.class, "Wraith", (entityID + 15), this, 64, 1, true); + + //Misc + EntityRegistry.registerModEntity(EntityWarDart.class, "WarDart", (entityID + 44), this, 64, 1, true); + EntityRegistry.registerModEntity(SarumanFireball.class, "SarumanFireball", entityID + 0, this, 64, 10, true); + EntityRegistry.registerModEntity(LOTREntitySauron.class, "LOTREntitySauron", (entityID + 28), this, 64, 1, true); + EntityRegistry.registerModEntity(UtumnoSlaveTrader.class, "UtumnoSlaveTrader", (entityID + 30), this, 64, 1, true); + // Faction Units EntityRegistry.registerModEntity(RedDwarfWarrior.class, "RedDwarfWarrior", (entityID + 2), this, 64, 1, true); EntityRegistry.registerModEntity(RedDwarfArbalest.class, "RedDwarfArbalest", (entityID + 3), this, 64, 1, true); EntityRegistry.registerModEntity(RedDwarfBannerBearer.class, "RedDwarfBannerBearer", (entityID + 4), this, 64, 1, true); EntityRegistry.registerModEntity(RedDwarfCommander.class, "RedDwarfCommander", (entityID + 5), this, 64, 1, true); - EntityRegistry.registerModEntity(FangornBear.class, "FangornBear", (entityID + 6), this, 64, 1, true); - EntityRegistry.registerModEntity(FangornWildBoar.class, "FangornWildBoar", (entityID + 7), this, 64, 1, true); - EntityRegistry.registerModEntity(FangornAuroch.class, "FangornAuroch", (entityID + 8), 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, "TamedCrocodile", (entityID + 35), 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(LimwaithBoneWarrior.class, "LimwaithBoneWarrior", (entityID + 32), this, 64, 1, true); @@ -415,13 +386,10 @@ public class CinderLoE { EntityRegistry.registerModEntity(LimwaithBannerBearer.class, "LimwaithBannerBearer", (entityID + 13), 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(ArnorSoldier.class, "ArnorSoldier", (entityID + 17), this, 64, 1, true); EntityRegistry.registerModEntity(ArnorSoldierArcher.class, "ArnorSoldierArcher", (entityID + 19), this, 64, 1, true); EntityRegistry.registerModEntity(ArnorCaptain.class, "ArnorCaptain", (entityID + 20), this, 64, 1, true); EntityRegistry.registerModEntity(ArnorBannerBearer.class, "ArnorBannerBearer", (entityID + 21), this, 64, 1, true); - EntityRegistry.registerModEntity(BattleNun.class, "BattleNun", (entityID + 27), this, 64, 1, true); EntityRegistry.registerModEntity(BreeSoldier.class, "BreeSoldier", (entityID + 22), this, 64, 1, true); EntityRegistry.registerModEntity(BreeCrossbowman.class, "BreeCrossbowman", (entityID + 23), this, 64, 1, true); @@ -429,9 +397,16 @@ public class CinderLoE { EntityRegistry.registerModEntity(BreeSoldierBannerBearer.class, "BreeSoldierBannerBearer", (entityID + 25), this, 64, 1, true); EntityRegistry.registerModEntity(BreeOutrider.class, "BreeOutrider", (entityID + 26), this, 64, 1, true); - EntityRegistry.registerModEntity(LOTREntitySauron.class, "LOTREntitySauron", (entityID + 28), this, 64, 1, true); + EntityRegistry.registerModEntity(HobbitBannerBearer.class, "HobbitBannerBearer", (entityID + 52), this, 64, 1, true); + // Objective and Custom npcs + EntityRegistry.registerModEntity(BattleNun.class, "BattleNun", (entityID + 27), this, 64, 1, true); + EntityRegistry.registerModEntity(MorgulOrc.class, "MorgulOrc", (entityID + 53), this, 64, 1, true); + EntityRegistry.registerModEntity(RhudaurSoldier.class, "RhudaurSoldier", (entityID + 54), this, 64, 1, true); + EntityRegistry.registerModEntity(NorthernOrc.class, "NorthernOrc", (entityID + 55), this, 64, 1, true); + EntityRegistry.registerModEntity(EsgarothSoldier.class, "EsgarothSoldier", (entityID + 56), this, 64, 1, true); + EntityRegistry.registerModEntity(TauredainTrueBlood.class, "TauredainTrueBlood", (entityID + 57), this, 64, 1, true); + EntityRegistry.registerModEntity(Sirrandrai.class, "Sirrandrai", (entityID + 58), this, 64, 1, true); - EntityRegistry.registerModEntity(UtumnoSlaveTrader.class, "UtumnoSlaveTrader", (entityID + 30), this, 64, 1, true); } public void registerBlocks() { @@ -494,19 +469,14 @@ public class CinderLoE { bronzeChain = (new bronzeChain()); GameRegistry.registerBlock(bronzeChain, "bronzeChain"); + // Staff mistBlock = (new MistBlock()); GameRegistry.registerBlock(mistBlock, "mist"); voidblock = (new voidblock()); GameRegistry.registerBlock(voidblock, "voidblock"); - shadowTile = (new ShadowTile()); - GameRegistry.registerBlock(shadowTile, "shadow_tile"); entityBarrier = (new EntityBarrier()); GameRegistry.registerBlock(entityBarrier, "entity_barrier"); - iceCage = (new IceCage()); - GameRegistry.registerBlock(iceCage, "ice_cage"); - enchantedIce = (new EnchantedIce()); - GameRegistry.registerBlock(enchantedIce, "enchanted_ice"); // Building Blocks cutDrystone = (new cutDrystone()); @@ -515,12 +485,14 @@ public class CinderLoE { cindercobble = (new CobbleBlock()); GameRegistry.registerBlock(cindercobble, CinderBlockMetaData.class, "cindercobble"); + cinderfur = (new CinderFurBlock()); + GameRegistry.registerBlock(cinderfur, CinderBlockMetaData.class, "cinderfur"); + furCarpet = (new FurCarpet()); + GameRegistry.registerBlock(furCarpet, CinderBlockMetaData.class, "furCarpet"); + plaster = (new plaster()); GameRegistry.registerBlock(plaster, "plaster"); - woodpanel = (new woodpanel()); - GameRegistry.registerBlock(woodpanel, "woodpanel"); - // Gates //gatecharredportcullis = LOTRBlockGate.createWooden(false).setBlockName("lotr:gatecharredportcullis"); //GameRegistry.registerBlock(gatecharredportcullis, "gatecharredportcullis"); @@ -560,7 +532,8 @@ public class CinderLoE { pasta = new LOTRItemFood(2,0.0f, false).setPotionEffect(Potion.hunger.id, 5,0,100).setUnlocalizedName("lotr:pasta").setTextureName("lotr:pasta"); pretzel = new LOTRItemFood(4,1.0f, false).setUnlocalizedName("lotr:pretzel").setTextureName("lotr:pretzel"); halva = new LOTRItemFood (7, 4.0f, false).setUnlocalizedName("lotr:halva").setTextureName("lotr:halva"); - honey = new LOTRItemFood(3, 0.4f, false).setPotionEffect(Potion.regeneration.id, 5, 0, 100).setUnlocalizedName("lotr:honey").setTextureName("lotr:honey"); + doner_kebab = new LOTRItemFood (6, 6.0f, false).setUnlocalizedName("lotr:doner_kebab").setTextureName("lotr:doner_kebab"); + // honey = new LOTRItemFood(3, 0.4f, false).setPotionEffect(Potion.regeneration.id, 5, 0, 100).setUnlocalizedName("lotr:honey").setTextureName("lotr:honey"); spawnEgg = new CinderLoESpawnEgg(); @@ -571,36 +544,70 @@ public class CinderLoE { sarumanStaff = (new SarumanStaff()).setUnlocalizedName("lotr:sarumanStaff").setTextureName("lotr:sarumanStaff"); // Relics welfRelic = (new WoodElfRelic()).setUnlocalizedName("lotr:welfRelic").setTextureName("lotr:welfRelic"); + unitLevelTool = (new unitLevelTool()).setUnlocalizedName("lotr:unitLevelTool").setTextureName("stick"); - /* - * Item Registation, add up the "last ID added" upon adding a new item + /** + * Item Registation * Weapons will need to be linked - */ - // Last ID added: 119 + * + * ID 6000-6099 + * Misc / Materials + * + * ID 6100-6199 + * Misc equipment + * + * ID 6200-6399 + * Event + * + * ID 6400-6499 + * Faction equipment + * + * ID 6500-6699 + * Unassigned + * + * ID 6700-6799 + * Character or Objective + * + * ID 6800-6899 + * Elite armor + * + * ID 6900-6999 + * Food and crops + * + * ID 7000-7199 + * Unassigned + * + * ID 7200-7299 + * Frozen Dungeon + **/ + + // ==Admin Tools== + ItemRegistration.register(unitLevelTool, "unitLevelTool", 7000); + // ==Food Items== - ItemRegistration.registerItem(onion, "onion", 58); - ItemRegistration.registerItem(cabbage, "cabbage", 59); - ItemRegistration.registerItem(pelmen, "pelmen", 60); - ItemRegistration.registerItem(lightStew, "lightStew", 61); - ItemRegistration.registerItem(spice, "spice", 62); - ItemRegistration.registerItem(spicedHam, "spicedHam", 63); - ItemRegistration.registerItem(chocolatebar, "chocolatebar", 84); - ItemRegistration.registerItem(fruitsalad, "fruitsalad", 85); - ItemRegistration.registerItem(flour, "flour", 86); - ItemRegistration.registerItem(dough, "dough", 87); - ItemRegistration.registerItem(pasta, "pasta", 88); - ItemRegistration.registerItem(pretzel, "pretzel", 89); - ItemRegistration.registerItem(halva, "halva", 94); - ItemRegistration.registerItem(honey, "honey", 95); - - ItemRegistration.registerItem(spawnEgg, "spawnEgg", 42); + ItemRegistration.register(onion, "onion", 6900); + ItemRegistration.register(cabbage, "cabbage", 6901); + ItemRegistration.register(pelmen, "pelmen", 6902); + ItemRegistration.register(spice, "spice", 6903); + ItemRegistration.register(spicedHam, "spicedHam", 6904); + ItemRegistration.register(chocolatebar, "chocolatebar", 6905); + ItemRegistration.register(fruitsalad, "fruitsalad", 6906); + ItemRegistration.register(flour, "flour", 6907); + ItemRegistration.register(dough, "dough", 6908); + ItemRegistration.register(pasta, "pasta", 6909); + ItemRegistration.register(pretzel, "pretzel", 6910); + ItemRegistration.register(halva, "halva", 6911); + ItemRegistration.register(doner_kebab, "doner_kebab", 6912); + ItemRegistration.register(lightStew, "lightStew", 6913); + + ItemRegistration.register(spawnEgg, "spawnEgg", 6003); // Wizard Staves - ItemRegistration.registerItem(radagastStaff, "radagastStaff", 0); - ItemRegistration.registerItem(pallandoStaff, "pallandoStaff", 1); - ItemRegistration.registerItem(alatarStaff, "alatarStaff", 2); - ItemRegistration.registerItem(sarumanStaff, "sarumanStaff", 3); + ItemRegistration.register(radagastStaff, "radagastStaff", 6700); + ItemRegistration.register(pallandoStaff, "pallandoStaff", 6701); + ItemRegistration.register(alatarStaff, "alatarStaff", 6702); + ItemRegistration.register(sarumanStaff, "sarumanStaff", 6703); linkLOTRWeapon(radagastStaff, "radagastStaff"); linkLOTRWeapon(pallandoStaff, "pallandoStaff"); @@ -608,22 +615,20 @@ public class CinderLoE { linkLOTRWeapon(sarumanStaff, "sarumanStaff"); //Relics - ItemRegistration.registerItem(welfRelic, "welfRelic", 56); + ItemRegistration.register(welfRelic, "welfRelic", 6704); - linkLOTRWeapon(welfRelic, "welfRelic"); + //linkLOTRWeapon(welfRelic, "welfRelic"); // Misc + cinderFurItem = (new CinderFurItem()).setUnlocalizedName("cinder_fur_item").setTextureName("lotr:cinder_fur_item_0"); + ItemRegistration.register(cinderFurItem,"cinderFurItem",6004); + EVENT = getLOTRMaterialByName("EVENT"); MATERIAL_JADE = getLOTRMaterialByName("JADE"); - MATERIAL_NEX_ICE = getLOTRMaterialByName("NEX_ICE"); - MATERIAL_NEX_FIRE = getLOTRMaterialByName("NEX_FIRE"); - MATERIAL_NEX_TOXIN = getLOTRMaterialByName("NEX_TOXIN"); - MATERIAL_NEX_SHADOW = getLOTRMaterialByName("NEX_SHADOW"); frostblade = (new LOTRItemSword(EVENT)).setUnlocalizedName("lotr:frostblade").setTextureName("lotr:frostblade"); daggervoid = (new VoidDagger(EVENT)).addWeaponDamage(5.0F).setUnlocalizedName("lotr:daggerVoid").setTextureName("lotr:daggerVoid").setCreativeTab(null); spearsolidgold = (new LOTRItemSpear(EVENT)).setUnlocalizedName("lotr:spearsolidgold").setTextureName("lotr:spearsolidgold").setCreativeTab(null); - spearblood = (new LOTRItemSpear(EVENT)).setUnlocalizedName("lotr:spearblood").setTextureName("lotr:spearblood").setCreativeTab(null); spearUnnamed = (new UnnamedSpear(EVENT)).setUnlocalizedName("lotr:spearUnnamed").setTextureName("lotr:spearUnnamed").setCreativeTab(null); whip = (new Whip()).setUnlocalizedName("lotr:whip").setTextureName("lotr:whip"); helmetbrokenhalo = (new BrokenHalo(EVENT, 0, "helmet")).setUnlocalizedName("lotr:helmetbrokenhalo").setTextureName("lotr:helmetbrokenhalo").setCreativeTab(null); @@ -632,74 +637,36 @@ public class CinderLoE { legsJade = (new LOTRItemArmor(MATERIAL_JADE, 2,"leggings")).setUnlocalizedName("lotr:legsJade").setTextureName("lotr:legsJade").setCreativeTab(null); bootsJade = (new LOTRItemArmor(MATERIAL_JADE, 3)).setUnlocalizedName("lotr:bootsJade").setTextureName("lotr:bootsJade").setCreativeTab(null); - helmetNexIce = (new LOTRItemArmor(MATERIAL_NEX_ICE, 0)).setUnlocalizedName("lotr:helmetNexIce").setTextureName("lotr:helmetNexIce").setCreativeTab(LoECreativeTabs.tabCombatLoE); - bodyNexIce = (new LOTRItemArmor(MATERIAL_NEX_ICE, 1, "chestplate")).setUnlocalizedName("lotr:bodyNexIce").setTextureName("lotr:bodyNexIce").setCreativeTab(LoECreativeTabs.tabCombatLoE); - legsNexIce = (new LOTRItemArmor(MATERIAL_NEX_ICE, 2)).setUnlocalizedName("lotr:legsNexIce").setTextureName("lotr:legsNexIce").setCreativeTab(LoECreativeTabs.tabCombatLoE); - bootsNexIce = (new LOTRItemArmor(MATERIAL_NEX_ICE, 3)).setUnlocalizedName("lotr:bootsNexIce").setTextureName("lotr:bootsNexIce").setCreativeTab(LoECreativeTabs.tabCombatLoE); - helmetNexFire = (new LOTRItemArmor(MATERIAL_NEX_FIRE, 0)).setUnlocalizedName("lotr:helmetNexFire").setTextureName("lotr:helmetNexFire").setCreativeTab(LoECreativeTabs.tabCombatLoE); - bodyNexFire = (new LOTRItemArmor(MATERIAL_NEX_FIRE, 1, "chestplate")).setUnlocalizedName("lotr:bodyNexFire").setTextureName("lotr:bodyNexFire").setCreativeTab(LoECreativeTabs.tabCombatLoE); - legsNexFire = (new LOTRItemArmor(MATERIAL_NEX_FIRE, 2)).setUnlocalizedName("lotr:legsNexFire").setTextureName("lotr:legsNexFire").setCreativeTab(LoECreativeTabs.tabCombatLoE); - bootsNexFire = (new LOTRItemArmor(MATERIAL_NEX_FIRE, 3)).setUnlocalizedName("lotr:bootsNexFire").setTextureName("lotr:bootsNexFire").setCreativeTab(LoECreativeTabs.tabCombatLoE); - helmetNexToxin = (new LOTRItemArmor(MATERIAL_NEX_TOXIN, 0)).setUnlocalizedName("lotr:helmetNexToxin").setTextureName("lotr:helmetNexToxin").setCreativeTab(LoECreativeTabs.tabCombatLoE); - bodyNexToxin = (new LOTRItemArmor(MATERIAL_NEX_TOXIN, 1, "chestplate")).setUnlocalizedName("lotr:bodyNexToxin").setTextureName("lotr:bodyNexToxin").setCreativeTab(LoECreativeTabs.tabCombatLoE); - legsNexToxin = (new LOTRItemArmor(MATERIAL_NEX_TOXIN, 2)).setUnlocalizedName("lotr:legsNexToxin").setTextureName("lotr:legsNexToxin").setCreativeTab(LoECreativeTabs.tabCombatLoE); - bootsNexToxin = (new LOTRItemArmor(MATERIAL_NEX_TOXIN, 3)).setUnlocalizedName("lotr:bootsNexToxin").setTextureName("lotr:bootsNexToxin").setCreativeTab(LoECreativeTabs.tabCombatLoE); - helmetNexShadow = (new LOTRItemArmor(MATERIAL_NEX_SHADOW, 0)).setUnlocalizedName("lotr:helmetNexShadow").setTextureName("lotr:helmetNexShadow").setCreativeTab(LoECreativeTabs.tabCombatLoE); - bodyNexShadow = (new LOTRItemArmor(MATERIAL_NEX_SHADOW, 1)).setUnlocalizedName("lotr:bodyNexShadow").setTextureName("lotr:bodyNexShadow").setCreativeTab(LoECreativeTabs.tabCombatLoE); - legsNexShadow = (new LOTRItemArmor(MATERIAL_NEX_SHADOW, 2)).setUnlocalizedName("lotr:legsNexShadow").setTextureName("lotr:legsNexShadow").setCreativeTab(null); - bootsNexShadow = (new LOTRItemArmor(MATERIAL_NEX_SHADOW, 3)).setUnlocalizedName("lotr:bootsNexShadow").setTextureName("lotr:bootsNexShadow").setCreativeTab(LoECreativeTabs.tabCombatLoE); - firstAgeGlaive = (new FirstAgeGlaive()).setCreativeTab(LoECreativeTabs.tabCombatLoE); - toxicCore = (new ToxicCore()); - - linkLOTRWeapon(firstAgeGlaive, "firstAgeGlaive"); - - ItemRegistration.registerItem(helmetNexIce,"helmetNexIce",99); - ItemRegistration.registerItem(bodyNexIce,"bodyNexIce",100); - ItemRegistration.registerItem(legsNexIce,"legsNexIce",101); - ItemRegistration.registerItem(bootsNexIce,"bootsNexIce",102); - ItemRegistration.registerItem(helmetNexFire,"helmetNexFire",103); - ItemRegistration.registerItem(bodyNexFire,"bodyNexFire",104); - ItemRegistration.registerItem(legsNexFire,"legsNexFire",105); - ItemRegistration.registerItem(bootsNexFire,"bootsNexFire",106); - ItemRegistration.registerItem(helmetNexToxin,"helmetNexToxin",107); - ItemRegistration.registerItem(bodyNexToxin,"bodyNexToxin",108); - ItemRegistration.registerItem(legsNexToxin,"legsNexToxin",109); - ItemRegistration.registerItem(bootsNexToxin,"bootsNexToxin",110); - ItemRegistration.registerItem(helmetNexShadow,"helmetNexShadow",111); - ItemRegistration.registerItem(bodyNexShadow,"bodyNexShadow",112); - ItemRegistration.registerItem(legsNexShadow,"legsNexShadow",113); - ItemRegistration.registerItem(bootsNexShadow,"bootsNexShadow",114); - ItemRegistration.registerItem(firstAgeGlaive, "firstAgeGlaive",115); - ItemRegistration.registerItem(toxicCore,"toxicCore",116); - - ItemRegistration.registerItem(frostblade, "frostblade", 4); - ItemRegistration.registerItem(daggervoid, "daggerVoid", 65); - ItemRegistration.registerItem(spearsolidgold, "spearsolidgold", 5); - ItemRegistration.registerItem(spearblood, "spearblood", 119); - ItemRegistration.registerItem(spearUnnamed, "spearUnnamed", 66); - ItemRegistration.registerItem(whip, "whip", 6); - ItemRegistration.registerItem(helmetbrokenhalo, "brokenhalo", 67); - ItemRegistration.registerItem(helmetJade, "helmetJade", 90); - ItemRegistration.registerItem(bodyJade, "chestplateJade", 91); - ItemRegistration.registerItem(legsJade, "legsJade", 92); - ItemRegistration.registerItem(bootsJade, "bootsJade", 93); + forgingKit = (new ForgingKit()); + + ItemRegistration.register(frostblade, "frostblade", 6200); + ItemRegistration.register(forgingKit,"forgingKit",6001); + + ItemRegistration.register(whip, "whip", 6110); + ItemRegistration.register(daggervoid, "daggerVoid", 6201); + ItemRegistration.register(spearsolidgold, "spearsolidgold", 6202); + ItemRegistration.register(spearUnnamed, "spearUnnamed", 6203); + ItemRegistration.register(helmetbrokenhalo, "brokenhalo", 6204); + ItemRegistration.register(helmetJade, "helmetJade", 6205); + ItemRegistration.register(bodyJade, "chestplateJade", 6206); + ItemRegistration.register(legsJade, "legsJade", 6207); + ItemRegistration.register(bootsJade, "bootsJade", 6208); linkLOTRWeapon(frostblade, "frostblade"); - linkLOTRWeapon(daggervoid, "daggerVoid"); + //linkLOTRWeapon(daggervoid, "daggerVoid"); linkLOTRWeapon(spearsolidgold, "spearsolidgold"); - linkLOTRWeapon(spearblood, "spearblood"); linkLOTRWeapon(spearUnnamed, "spearUnnamed"); linkLOTRWeapon(whip, "whip"); // Common Tools/Weapons - cleaver = (new LOTRItemDagger(GONDOR)).setUnlocalizedName("lotr:cleaver").setTextureName("lotr:cleaver"); + cleaver = (new LOTRItemDagger(Item.ToolMaterial.IRON)).setUnlocalizedName("lotr:cleaver").setTextureName("lotr:cleaver"); warDart = (new WarDart()).setUnlocalizedName("war_dart").setTextureName("lotr:war_dart"); warDartHeads = (new WarDartHeads()).setUnlocalizedName("war_dart_heads").setTextureName("lotr:war_dart_heads_0"); - ItemRegistration.registerItem(cleaver,"cleaver",96); - linkLOTRWeapon(cleaver, "cleaver"); + ItemRegistration.register(cleaver,"cleaver",6109); + // linkLOTRWeapon(cleaver, "cleaver"); - ItemRegistration.registerItem(warDart,"warDart",97); - ItemRegistration.registerItem(warDartHeads,"warDartHeads",98); + ItemRegistration.register(warDart,"warDart",6111); + ItemRegistration.register(warDartHeads,"warDartHeads",6500); //ASH @@ -715,15 +682,15 @@ public class CinderLoE { pikeAsh = (new LOTRItemPike(MATERIAL_ASH)).addWeaponDamage(5.0F).setUnlocalizedName("lotr:pikeAsh").setTextureName("lotr:pikeAsh"); spearAsh = (new LOTRItemSpear(MATERIAL_ASH)).addWeaponDamage(5.0F).setUnlocalizedName("lotr:spearAsh").setTextureName("lotr:spearAsh"); - ItemRegistration.registerItem(ingotAsh, "ingotAsh", 47); - ItemRegistration.registerItem(swordAsh, "swordAsh", 48); - ItemRegistration.registerItem(daggerAsh, "daggerAsh", 49); - ItemRegistration.registerItem(hammerAsh, "hammerAsh", 50); - ItemRegistration.registerItem(battleaxeAsh, "battleaxeAsh", 51); - ItemRegistration.registerItem(bowAsh, "bowAsh", 52); - ItemRegistration.registerItem(pikeAsh, "pikeAsh", 53); - ItemRegistration.registerItem(spearAsh, "spearAsh", 54); - ItemRegistration.registerItem(staffAsh, "staffAsh", 64); + ItemRegistration.register(ingotAsh, "ingotAsh", 6100); + ItemRegistration.register(swordAsh, "swordAsh", 6101); + ItemRegistration.register(daggerAsh, "daggerAsh", 6102); + ItemRegistration.register(hammerAsh, "hammerAsh", 6103); + ItemRegistration.register(battleaxeAsh, "battleaxeAsh", 6104); + ItemRegistration.register(bowAsh, "bowAsh", 6105); + ItemRegistration.register(pikeAsh, "pikeAsh", 6106); + ItemRegistration.register(spearAsh, "spearAsh", 6107); + ItemRegistration.register(staffAsh, "staffAsh", 6108); } 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."); @@ -739,7 +706,7 @@ public class CinderLoE { // Red Dwarves redDwarfSteel = new Item().setUnlocalizedName("lotr:redDwarfSteel").setTextureName("lotr:redDwarfSteel").setCreativeTab((CreativeTabs) materials); - ItemRegistration.registerItem(redDwarfSteel, "redDwarfSteel", 7); + ItemRegistration.register(redDwarfSteel, "redDwarfSteel", 6002); MATERIAL_RED_DWARF = getLOTRMaterialByName("RED_DWARF"); if (MATERIAL_RED_DWARF != null) { @@ -757,19 +724,19 @@ public class CinderLoE { crossbowRedDwarf = (new LOTRItemCrossbow(MATERIAL_RED_DWARF)).setUnlocalizedName("lotr:crossbowRedDwarf").setTextureName("lotr:crossbowRedDwarf"); boarArmorRedDwarf = (new LOTRItemMountArmor(MATERIAL_RED_DWARF, LOTRItemMountArmor.Mount.BOAR)).setUnlocalizedName("lotr:boarArmorRedDwarf").setTextureName("lotr:boarArmorRedDwarf"); - ItemRegistration.registerItem(helmetRedDwarf, "helmetRedDwarf", 8); - ItemRegistration.registerItem(bodyRedDwarf, "bodyRedDwarf", 9); - ItemRegistration.registerItem(legsRedDwarf, "legsRedDwarf", 10); - ItemRegistration.registerItem(bootsRedDwarf, "bootsRedDwarf", 11); - ItemRegistration.registerItem(spearRedDwarf, "spearRedDwarf", 12); - ItemRegistration.registerItem(swordRedDwarf, "swordRedDwarf", 13); - ItemRegistration.registerItem(battleaxeRedDwarf, "battleaxeRedDwarf", 14); - ItemRegistration.registerItem(pikeRedDwarf, "pikeRedDwarf", 15); - ItemRegistration.registerItem(hammerRedDwarf, "hammerRedDwarf", 16); - ItemRegistration.registerItem(daggerRedDwarf, "daggerRedDwarf", 17); - ItemRegistration.registerItem(daggerRedDwarfPoisoned, "daggerRedDwarfPoisoned", 18); - ItemRegistration.registerItem(crossbowRedDwarf, "crossbowRedDwarf", 19); - ItemRegistration.registerItem(boarArmorRedDwarf, "boarArmorRedDwarf", 20); + ItemRegistration.register(helmetRedDwarf, "helmetRedDwarf", 6400); + ItemRegistration.register(bodyRedDwarf, "bodyRedDwarf", 6401); + ItemRegistration.register(legsRedDwarf, "legsRedDwarf", 6402); + ItemRegistration.register(bootsRedDwarf, "bootsRedDwarf", 6403); + ItemRegistration.register(spearRedDwarf, "spearRedDwarf", 6404); + ItemRegistration.register(swordRedDwarf, "swordRedDwarf", 6405); + ItemRegistration.register(battleaxeRedDwarf, "battleaxeRedDwarf", 6406); + ItemRegistration.register(pikeRedDwarf, "pikeRedDwarf", 6407); + ItemRegistration.register(hammerRedDwarf, "hammerRedDwarf", 6408); + ItemRegistration.register(daggerRedDwarf, "daggerRedDwarf", 6409); + ItemRegistration.register(daggerRedDwarfPoisoned, "daggerRedDwarfPoisoned", 6410); + ItemRegistration.register(crossbowRedDwarf, "crossbowRedDwarf", 6411); + ItemRegistration.register(boarArmorRedDwarf, "boarArmorRedDwarf", 6412); // System.out.println("Registered red dwarf equipment"); } else { // Log an error or handle the case where the material could not be found @@ -787,7 +754,7 @@ public class CinderLoE { // Limwaith bonemold = new Item().setUnlocalizedName("lotr:bonemold").setTextureName("lotr:bonemold").setCreativeTab((CreativeTabs) materials); - ItemRegistration.registerItem(bonemold, "bonemold", 55); + ItemRegistration.register(bonemold, "bonemold", 6000); MATERIAL_LIMWAITH_WOOD = getLOTRMaterialByName("LIMWAITH_WOOD"); MATERIAL_BONEMOLD = getLOTRMaterialByName("BONEMOLD"); @@ -810,23 +777,23 @@ public class CinderLoE { daggerLimwaithPoisoned = (new LOTRItemDagger(MATERIAL_BONEMOLD, LOTRItemDagger.DaggerEffect.POISON)).setUnlocalizedName("lotr:daggerLimwaithPoisoned").setTextureName("lotr:daggerLimwaithPoisoned"); blowgunLimwaith = (new LOTRItemBlowgun(LOTRMaterial.TAUREDAIN)).setUnlocalizedName("lotr:blowgunLimwaith").setTextureName("lotr:blowgunLimwaith"); - ItemRegistration.registerItem(helmetLimwaith, "helmetLimwaith", 21); - ItemRegistration.registerItem(bodyLimwaith, "bodyLimwaith", 22); - ItemRegistration.registerItem(legsLimwaith, "legsLimwaith", 23); - ItemRegistration.registerItem(bootsLimwaith, "bootsLimwaith", 24); - - ItemRegistration.registerItem(helmetboneLimwaith, "helmetboneLimwaith", 43); - ItemRegistration.registerItem(bodyboneLimwaith, "bodyboneLimwaith", 44); - ItemRegistration.registerItem(legsboneLimwaith, "legsboneLimwaith", 45); - ItemRegistration.registerItem(bootsboneLimwaith, "bootsboneLimwaith", 46); - - ItemRegistration.registerItem(spearLimwaith, "spearLimwaith", 25); - ItemRegistration.registerItem(tridentLimwaith, "tridentLimwaith", 26); - ItemRegistration.registerItem(truncheonLimwaith, "truncheonLimwaith", 27); - ItemRegistration.registerItem(battleaxeLimwaith, "battleaxeLimwaith", 28); - ItemRegistration.registerItem(daggerLimwaith, "daggerLimwaith", 29); - ItemRegistration.registerItem(daggerLimwaithPoisoned, "daggerLimwaithPoisoned", 30); - ItemRegistration.registerItem(blowgunLimwaith, "blowgunLimwaith", 31); + ItemRegistration.register(helmetLimwaith, "helmetLimwaith", 6420); + ItemRegistration.register(bodyLimwaith, "bodyLimwaith", 6421); + ItemRegistration.register(legsLimwaith, "legsLimwaith", 6422); + ItemRegistration.register(bootsLimwaith, "bootsLimwaith", 6423); + + ItemRegistration.register(helmetboneLimwaith, "helmetboneLimwaith", 6424); + ItemRegistration.register(bodyboneLimwaith, "bodyboneLimwaith", 6425); + ItemRegistration.register(legsboneLimwaith, "legsboneLimwaith", 6426); + ItemRegistration.register(bootsboneLimwaith, "bootsboneLimwaith", 6427); + + ItemRegistration.register(spearLimwaith, "spearLimwaith", 6428); + ItemRegistration.register(tridentLimwaith, "tridentLimwaith", 6429); + ItemRegistration.register(truncheonLimwaith, "truncheonLimwaith", 6430); + ItemRegistration.register(battleaxeLimwaith, "battleaxeLimwaith", 6431); + ItemRegistration.register(daggerLimwaith, "daggerLimwaith", 6432); + ItemRegistration.register(daggerLimwaithPoisoned, "daggerLimwaithPoisoned", 6433); + ItemRegistration.register(blowgunLimwaith, "blowgunLimwaith", 6434); } else { System.err.println("Failed to find LIMWAITH material for armor initialization."); } @@ -848,76 +815,60 @@ public class CinderLoE { bootsBree = (new LOTRItemArmor(MATERIAL_BREE, 3)).setUnlocalizedName("lotr:bootsBree").setTextureName("lotr:bootsBree"); swordBree = (new LOTRItemSword(MATERIAL_BREE)).setUnlocalizedName("lotr:swordBree").setTextureName("lotr:swordBree"); - ItemRegistration.registerItem(helmetBree, "helmetBree", 32); - ItemRegistration.registerItem(helmetBreeKettle, "breekettle", 57); - ItemRegistration.registerItem(bodyBree, "bodyBree", 33); - ItemRegistration.registerItem(legsBree, "legsBree", 34); - ItemRegistration.registerItem(bootsBree, "bootsBree", 35); - ItemRegistration.registerItem(swordBree, "swordBree", 36); + ItemRegistration.register(helmetBreeKettle, "breekettle", 6440); + ItemRegistration.register(helmetBree, "helmetBree", 6441); + ItemRegistration.register(bodyBree, "bodyBree", 6442); + ItemRegistration.register(legsBree, "legsBree", 6443); + ItemRegistration.register(bootsBree, "bootsBree", 6444); + ItemRegistration.register(swordBree, "swordBree", 6445); } else { System.err.println("Failed to find BREE material for armor initialization."); } linkLOTRWeapon(swordBree, "swordBree"); //Elite Armors - MATERIAL_SERPENT = getLOTRMaterialByName("SERPENT"); - if (MATERIAL_SERPENT != null) { - helmetserpent = (new LOTRItemArmor(MATERIAL_SERPENT, 0)).setUnlocalizedName("lotr:helmetserpent").setTextureName("lotr:helmetserpent").setCreativeTab(null); - bodyserpent = (new LOTRItemArmor(MATERIAL_SERPENT, 1, "chestplate")).setUnlocalizedName("lotr:bodyserpent").setTextureName("lotr:bodyserpent").setCreativeTab(null); - legsserpent = (new LOTRItemArmor(MATERIAL_SERPENT, 2)).setUnlocalizedName("lotr:legsserpent").setTextureName("lotr:legsserpent").setCreativeTab(null); - bootsserpent = (new LOTRItemArmor(MATERIAL_SERPENT, 3)).setUnlocalizedName("lotr:bootsserpent").setTextureName("lotr:bootsserpent").setCreativeTab(null); - - ItemRegistration.registerItem(helmetserpent, "helmetserpent", 72); - ItemRegistration.registerItem(bodyserpent, "bodyserpent", 73); - ItemRegistration.registerItem(legsserpent, "legsserpent", 74); - ItemRegistration.registerItem(bootsserpent, "bootsserpent", 75); - } else { - System.err.println("Failed to find SERPENT material for armor initialization."); - } - MATERIAL_USURPER = getLOTRMaterialByName("USURPER"); - if (MATERIAL_USURPER != null) { - helmetUsurper = (new LOTRItemArmor(MATERIAL_USURPER, 0, "helmet")).setUnlocalizedName("lotr:helmetUsurper").setTextureName("lotr:helmetUsurper").setCreativeTab(null); - bodyUsurper = (new LOTRItemArmor(MATERIAL_USURPER, 1)).setUnlocalizedName("lotr:bodyUsurper").setTextureName("lotr:bodyUsurper").setCreativeTab(null); - legsUsurper = (new LOTRItemArmor(MATERIAL_USURPER, 2)).setUnlocalizedName("lotr:legsUsurper").setTextureName("lotr:legsUsurper").setCreativeTab(null); - bootsUsurper = (new LOTRItemArmor(MATERIAL_USURPER, 3)).setUnlocalizedName("lotr:bootsUsurper").setTextureName("lotr:bootsUsurper").setCreativeTab(null); - - ItemRegistration.registerItem(helmetUsurper, "helmetUsurper", 76); - ItemRegistration.registerItem(bodyUsurper, "bodyUsurper", 77); - ItemRegistration.registerItem(legsUsurper, "legsUsurper", 78); - ItemRegistration.registerItem(bootsUsurper, "bootsUsurper", 79); - } else { - System.err.println("Failed to find USURPER material for armor initialization."); - } - MATERIAL_WARLORD = getLOTRMaterialByName("WARLORD"); - if (MATERIAL_WARLORD != null) { - helmetWarlord = (new LOTRItemArmor(MATERIAL_WARLORD, 0, "helmet")).setUnlocalizedName("lotr:helmetWarlord").setTextureName("lotr:helmetWarlord").setCreativeTab(null); - bodyWarlord = (new LOTRItemArmor(MATERIAL_WARLORD, 1)).setUnlocalizedName("lotr:bodyWarlord").setTextureName("lotr:bodyWarlord").setCreativeTab(null); - legsWarlord = (new LOTRItemArmor(MATERIAL_WARLORD, 2)).setUnlocalizedName("lotr:legsWarlord").setTextureName("lotr:legsWarlord").setCreativeTab(null); - bootsWarlord = (new LOTRItemArmor(MATERIAL_WARLORD, 3)).setUnlocalizedName("lotr:bootsWarlord").setTextureName("lotr:bootsWarlord").setCreativeTab(null); - maceWarlord = (new LOTRItemHammer(MATERIAL_WARLORD)).setUnlocalizedName("lotr:maceWarlord").setTextureName("lotr:maceWarlord").setCreativeTab(null); - - ItemRegistration.registerItem(helmetWarlord, "helmetWarlord", 80); - ItemRegistration.registerItem(bodyWarlord, "bodyWarlord", 81); - ItemRegistration.registerItem(legsWarlord, "legsWarlord", 82); - ItemRegistration.registerItem(bootsWarlord, "bootsWarlord", 83); - ItemRegistration.registerItem(maceWarlord, "maceWarlord", 118); - } else { - System.err.println("Failed to find WARLORD material for armor initialization."); - } - linkLOTRWeapon(maceWarlord, "maceWarlord"); + helmetserpent = (new LOTRItemArmor(NEAR_HARAD, 0)).setUnlocalizedName("lotr:helmetserpent").setTextureName("lotr:helmetserpent").setCreativeTab(null); + bodyserpent = (new LOTRItemArmor(NEAR_HARAD, 1, "chestplate")).setUnlocalizedName("lotr:bodyserpent").setTextureName("lotr:bodyserpent").setCreativeTab(null); + legsserpent = (new LOTRItemArmor(NEAR_HARAD, 2)).setUnlocalizedName("lotr:legsserpent").setTextureName("lotr:legsserpent").setCreativeTab(null); + bootsserpent = (new LOTRItemArmor(NEAR_HARAD, 3)).setUnlocalizedName("lotr:bootsserpent").setTextureName("lotr:bootsserpent").setCreativeTab(null); + + ItemRegistration.register(helmetserpent, "helmetserpent", 6800); + ItemRegistration.register(bodyserpent, "bodyserpent", 6801); + ItemRegistration.register(legsserpent, "legsserpent", 6802); + ItemRegistration.register(bootsserpent, "bootsserpent", 6803); + + helmetUsurper = (new LOTRItemArmor(UMBAR, 0, "helmet")).setUnlocalizedName("lotr:helmetUsurper").setTextureName("lotr:helmetUsurper").setCreativeTab(null); + bodyUsurper = (new LOTRItemArmor(UMBAR, 1)).setUnlocalizedName("lotr:bodyUsurper").setTextureName("lotr:bodyUsurper").setCreativeTab(null); + legsUsurper = (new LOTRItemArmor(UMBAR, 2)).setUnlocalizedName("lotr:legsUsurper").setTextureName("lotr:legsUsurper").setCreativeTab(null); + bootsUsurper = (new LOTRItemArmor(UMBAR, 3)).setUnlocalizedName("lotr:bootsUsurper").setTextureName("lotr:bootsUsurper").setCreativeTab(null); + + ItemRegistration.register(helmetUsurper, "helmetUsurper", 6804); + ItemRegistration.register(bodyUsurper, "bodyUsurper", 6805); + ItemRegistration.register(legsUsurper, "legsUsurper", 6806); + ItemRegistration.register(bootsUsurper, "bootsUsurper", 6807); + + helmetWarlord = (new LOTRItemArmor(MOREDAIN, 0, "helmet")).setUnlocalizedName("lotr:helmetWarlord").setTextureName("lotr:helmetWarlord").setCreativeTab(null); + bodyWarlord = (new LOTRItemArmor(MOREDAIN, 1)).setUnlocalizedName("lotr:bodyWarlord").setTextureName("lotr:bodyWarlord").setCreativeTab(null); + legsWarlord = (new LOTRItemArmor(MOREDAIN, 2)).setUnlocalizedName("lotr:legsWarlord").setTextureName("lotr:legsWarlord").setCreativeTab(null); + bootsWarlord = (new LOTRItemArmor(MOREDAIN, 3)).setUnlocalizedName("lotr:bootsWarlord").setTextureName("lotr:bootsWarlord").setCreativeTab(null); + + ItemRegistration.register(helmetWarlord, "helmetWarlord", 6808); + ItemRegistration.register(bodyWarlord, "bodyWarlord", 6809); + ItemRegistration.register(legsWarlord, "legsWarlord", 6810); + ItemRegistration.register(bootsWarlord, "bootsWarlord", 6811); //Rhudaur - MATERIAL_RHUDUAR = getLOTRMaterialByName("RHUDAUR"); - if (MATERIAL_RHUDUAR != null) { - helmetRhudaur = (new LOTRItemArmor(MATERIAL_RHUDUAR, 0, "helmet")).setUnlocalizedName("lotr:helmetRhudaur").setTextureName("lotr:helmetRhudaur"); - bodyRhudaur = (new LOTRItemArmor(MATERIAL_RHUDUAR, 1)).setUnlocalizedName("lotr:bodyRhudaur").setTextureName("lotr:bodyRhudaur"); - legsRhudaur = (new LOTRItemArmor(MATERIAL_RHUDUAR, 2)).setUnlocalizedName("lotr:legsRhudaur").setTextureName("lotr:legsRhudaur"); - bootsRhudaur = (new LOTRItemArmor(MATERIAL_RHUDUAR, 3)).setUnlocalizedName("lotr:bootsRhudaur").setTextureName("lotr:bootsRhudaur"); - - ItemRegistration.registerItem(helmetRhudaur, "helmetRhudaur",68); - ItemRegistration.registerItem(bodyRhudaur, "bodyRhudaur", 69); - ItemRegistration.registerItem(legsRhudaur, "legsRhudaur", 70); - ItemRegistration.registerItem(bootsRhudaur, "bootsRhudaur", 71); + MATERIAL_RHUDAUR = getLOTRMaterialByName("RHUDAUR"); + if (MATERIAL_RHUDAUR != null) { + helmetRhudaur = (new LOTRItemArmor(MATERIAL_RHUDAUR, 0, "helmet")).setUnlocalizedName("lotr:helmetRhudaur").setTextureName("lotr:helmetRhudaur"); + bodyRhudaur = (new LOTRItemArmor(MATERIAL_RHUDAUR, 1)).setUnlocalizedName("lotr:bodyRhudaur").setTextureName("lotr:bodyRhudaur"); + legsRhudaur = (new LOTRItemArmor(MATERIAL_RHUDAUR, 2)).setUnlocalizedName("lotr:legsRhudaur").setTextureName("lotr:legsRhudaur"); + bootsRhudaur = (new LOTRItemArmor(MATERIAL_RHUDAUR, 3)).setUnlocalizedName("lotr:bootsRhudaur").setTextureName("lotr:bootsRhudaur"); + + ItemRegistration.register(helmetRhudaur, "helmetRhudaur",6450); + ItemRegistration.register(bodyRhudaur, "bodyRhudaur", 6451); + ItemRegistration.register(legsRhudaur, "legsRhudaur", 6452); + ItemRegistration.register(bootsRhudaur, "bootsRhudaur", 6453); } else { System.err.println("Failed to find RHUDAUR material for armor initialization."); } @@ -930,11 +881,11 @@ public class CinderLoE { bootsArnorBanner = (new LOTRItemArmor(MATERIAL_BATTLENUN, 3)).setUnlocalizedName("lotr:bootsArnorBanner").setTextureName("lotr:bootsArnorBanner"); maceArnor = (new LOTRItemHammer(LOTRMaterial.ARNOR)).setUnlocalizedName("lotr:maceArnor").setTextureName("lotr:maceArnor"); - ItemRegistration.registerItem(helmetArnorBanner, "helmetArnorBanner", 37); - ItemRegistration.registerItem(bodyArnorBanner, "bodyArnorBanner", 38); - ItemRegistration.registerItem(legsArnorBanner, "legsArnorBanner", 39); - ItemRegistration.registerItem(bootsArnorBanner, "bootsArnorBanner", 40); - ItemRegistration.registerItem(maceArnor, "maceArnor", 41); + ItemRegistration.register(helmetArnorBanner, "helmetArnorBanner", 6460); + ItemRegistration.register(bodyArnorBanner, "bodyArnorBanner", 6461); + ItemRegistration.register(legsArnorBanner, "legsArnorBanner", 6462); + ItemRegistration.register(bootsArnorBanner, "bootsArnorBanner", 6463); + ItemRegistration.register(maceArnor, "maceArnor", 6464); } else { System.err.println("Failed to find ARNOR material for armor initialization."); } @@ -965,7 +916,6 @@ public class CinderLoE { public void setup() { // RenderingRegistry.registerEntityRenderingHandler(HaradLevy.class, new LOTRRenderNearHaradrim()); // RenderingRegistry.registerEntityRenderingHandler(DwarfLevy.class, new LOTRRenderDwarf()); - RenderingRegistry.registerBlockHandler(new RenderIceCage()); RenderingRegistry.registerEntityRenderingHandler(EntityWarDart.class, new RenderWarDart()); RenderingRegistry.registerEntityRenderingHandler(BladorthinSmith.class, new LOTRRenderDorwinionElfVintner()); @@ -981,7 +931,6 @@ public class CinderLoE { RenderingRegistry.registerEntityRenderingHandler(Renegade.class, new RenderRenegade()); RenderingRegistry.registerEntityRenderingHandler(RenegadeCaptain.class, new RenderRenegade()); RenderingRegistry.registerEntityRenderingHandler(Wraith.class, new RenderWraith()); - RenderingRegistry.registerEntityRenderingHandler(Nex.class, new RenderNex()); RenderingRegistry.registerEntityRenderingHandler(RedDwarfWarrior.class, new LOTRRenderDwarf()); RenderingRegistry.registerEntityRenderingHandler(RedDwarfArbalest.class, new LOTRRenderDwarf()); @@ -1017,9 +966,17 @@ public class CinderLoE { RenderingRegistry.registerEntityRenderingHandler(BreeSoldierBannerBearer.class, new LOTRRenderBreeMan()); RenderingRegistry.registerEntityRenderingHandler(BreeOutrider.class, new LOTRRenderBreeMan()); + RenderingRegistry.registerEntityRenderingHandler(HobbitBannerBearer.class, new LOTRRenderHobbit()); + RenderingRegistry.registerEntityRenderingHandler(LOTREntitySauron.class, new LOTRRenderSauron()); RenderingRegistry.registerEntityRenderingHandler(UtumnoSlaveTrader.class, new RenderUtumnoSlave()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMistBlock.class, (TileEntitySpecialRenderer)new LOTRRenderUtumnoPortal()); + + RenderingRegistry.registerEntityRenderingHandler(Sirrandrai.class, new LOTRRenderElf()); + RenderingRegistry.registerEntityRenderingHandler(TauredainTrueBlood.class, new LOTRRenderTauredain()); + RenderingRegistry.registerEntityRenderingHandler(EsgarothSoldier.class, new LOTRRenderDaleMan()); + RenderingRegistry.registerEntityRenderingHandler(MorgulOrc.class, new LOTRRenderOrc()); + RenderingRegistry.registerEntityRenderingHandler(NorthernOrc.class, new LOTRRenderOrc()); } } @@ -1133,7 +1090,8 @@ public class CinderLoE { CinderCore.registerItemFallback(Item.getIdFromItem(pasta),Item.getIdFromItem(Items.wheat), "cinder_loe", "1.2.5"); CinderCore.registerItemFallback(Item.getIdFromItem(pretzel),Item.getIdFromItem(Items.bread), "cinder_loe", "1.2.5"); CinderCore.registerItemFallback(Item.getIdFromItem(halva),Item.getIdFromItem(Items.bread),"cinder_loe", "1.2.5"); - CinderCore.registerItemFallback(Item.getIdFromItem(honey),Item.getIdFromItem(LOTRMod.mapleSyrup), "cinder_loe", "1.2.5"); + CinderCore.registerItemFallback(Item.getIdFromItem(doner_kebab),Item.getIdFromItem(Items.bread),"cinder_loe", "1.2.5"); + // CinderCore.registerItemFallback(Item.getIdFromItem(honey),Item.getIdFromItem(LOTRMod.mapleSyrup), "cinder_loe", "1.2.5"); //== Blocks== CinderCore.registerItemFallback(Block.getIdFromBlock(cinderBlock), Block.getIdFromBlock(Blocks.netherrack), "cinder_loe", "1.0"); @@ -1155,9 +1113,10 @@ public class CinderLoE { 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(cindercobble), Block.getIdFromBlock(LOTRMod.cobblebrick), "cinder_loe", "1.2"); + CinderCore.registerItemFallback(Block.getIdFromBlock(cinderfur), Block.getIdFromBlock(Blocks.wool), "cinder_loe", "1.2.4"); + CinderCore.registerItemFallback(Block.getIdFromBlock(furCarpet), Block.getIdFromBlock(Blocks.carpet), "cinder_loe", "1.2.4"); CinderCore.registerItemFallback(Block.getIdFromBlock(reeflessCoral), Block.getIdFromBlock(LOTRMod.coralReef), "cinder_loe", "1.2"); CinderCore.registerItemFallback(Block.getIdFromBlock(plaster), Block.getIdFromBlock(Blocks.brick_block), "cinder_loe", "1.2.1"); - CinderCore.registerItemFallback(Block.getIdFromBlock(woodpanel), Block.getIdFromBlock(Blocks.planks), "cinder_loe", "1.2.5"); CinderCore.registerItemFallback(Block.getIdFromBlock(voidblock), Block.getIdFromBlock(Blocks.coal_block), "cinder_loe", "1.2.1"); // CinderCore.registerItemFallback(Block.getIdFromBlock(verticalWeaponRack), Block.getIdFromBlock(Blocks.fence), "cinder_loe", "1.2.4"); // == Gates == @@ -1195,7 +1154,6 @@ public class CinderLoE { CinderCore.registerItemFallback(Item.getIdFromItem(bodyWarlord), Item.getIdFromItem(LOTRMod.bodyNomad), "cinder_loe", "1.2.5"); CinderCore.registerItemFallback(Item.getIdFromItem(legsWarlord), Item.getIdFromItem(LOTRMod.legsNomad), "cinder_loe", "1.2.5"); CinderCore.registerItemFallback(Item.getIdFromItem(bootsWarlord), Item.getIdFromItem(LOTRMod.bootsNomad), "cinder_loe", "1.2.5"); - CinderCore.registerItemFallback(Item.getIdFromItem(maceWarlord), Item.getIdFromItem(LOTRMod.maceNearHarad), "cinder_loe", "1.2.5"); // == Wizard Staves == CinderCore.registerItemFallback(Item.getIdFromItem(radagastStaff), Item.getIdFromItem(LOTRMod.gandalfStaffWhite), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(pallandoStaff), Item.getIdFromItem(LOTRMod.gandalfStaffWhite), "cinder_loe", "1.0"); @@ -1207,7 +1165,6 @@ public class CinderLoE { CinderCore.registerItemFallback(Item.getIdFromItem(frostblade), Item.getIdFromItem(LOTRMod.swordMithril), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(daggervoid), Item.getIdFromItem(LOTRMod.daggerMithril), "cinder_loe", "1.2.3"); CinderCore.registerItemFallback(Item.getIdFromItem(spearsolidgold), Item.getIdFromItem(LOTRMod.spearMithril), "cinder_loe", "1.1"); - CinderCore.registerItemFallback(Item.getIdFromItem(spearblood), Item.getIdFromItem(LOTRMod.spearMithril), "cinder_loe", "1.2.5"); CinderCore.registerItemFallback(Item.getIdFromItem(spearUnnamed), Item.getIdFromItem(LOTRMod.spearMithril), "cinder_loe", "1.2.4"); CinderCore.registerItemFallback(Item.getIdFromItem(whip), Item.getIdFromItem(LOTRMod.balrogWhip), "cinder_loe", "1.2"); CinderCore.registerItemFallback(Item.getIdFromItem(helmetbrokenhalo), Item.getIdFromItem(Items.golden_helmet),"cinder_loe", "1.2.5"); @@ -1260,8 +1217,6 @@ public class CinderLoE { CinderCore.registerItemFallback(Item.getIdFromItem(bootsArnorBanner), Item.getIdFromItem(Items.chainmail_boots), "cinder_loe", "1.1"); CinderCore.registerItemFallback(Item.getIdFromItem(maceArnor), Item.getIdFromItem(LOTRMod.blacksmithHammer), "cinder_loe", "1.1"); - // CinderCore.registerEntityFallback(HaradLevy.class, LOTREntityNearHaradrim.class, "cinder_loe", "1.2.3"); - // CinderCore.registerEntityFallback(DwarfLevy.class, LOTREntityDwarf.class, "cinder_loe", "1.2.3"); CinderCore.registerEntityFallback(DarkSpider.class, LOTREntityUtumnoIceSpider.class, "cinder_loe", "1.2.4"); CinderCore.registerEntityFallback(BladorthinSmith.class, LOTREntityDorwinionElf.class, "cinder_loe", "1.2.4"); @@ -1313,6 +1268,7 @@ public class CinderLoE { CinderCore.registerEntityFallback(BreeSoldierBannerBearer.class, LOTREntityBreeMan.class, "cinder_loe", "1.1"); CinderCore.registerEntityFallback(BreeOutrider.class, LOTREntityBreeMan.class, "cinder_loe", "1.1"); + CinderCore.registerCustomFallback(42, 16, "banner", "cinder_loe", "1.2"); CinderCore.registerCustomFallback(43, 16, "banner", "cinder_loe", "1.2.4"); CinderCore.registerCustomFallback(44, 16, "banner", "cinder_loe", "1.2.4"); @@ -1322,119 +1278,39 @@ public class CinderLoE { // Create unit trade entries here, out of the way of important code public void setupTradeEntries() { - RED_DWARF_COMMANDER = new LOTRUnitTradeEntries(200.0F, new LOTRUnitTradeEntry[]{ - new LOTRUnitTradeEntry(LOTREntityDwarf.class, 20, 0.0F), - (new LOTRUnitTradeEntry(RedDwarfWarrior.class, 30, 50.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF), - (new LOTRUnitTradeEntry(RedDwarfArbalest.class, 50, 100.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF), - (new LOTRUnitTradeEntry(RedDwarfWarrior.class, LOTREntityWildBoar.class, "RedDwarfWarrior_Boar", 50, 150.0F)).setMountArmor(boarArmorRedDwarf).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF), - (new LOTRUnitTradeEntry(RedDwarfArbalest.class, LOTREntityWildBoar.class, "RedDwarfArbalest_Boar", 70, 200.0F)).setMountArmor(boarArmorRedDwarf).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF), - (new LOTRUnitTradeEntry(RedDwarfBannerBearer.class, 50, 200.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF) }); - - LIMWAITH_COMMANDER = new LOTRUnitTradeEntries(200.0F, new LOTRUnitTradeEntry[]{ - new LOTRUnitTradeEntry(LimwaithWarrior.class, 30, 50.0F), - (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) }); - - ARNOR_CAPTAIN = new LOTRUnitTradeEntries(200.0F, new LOTRUnitTradeEntry[]{ - (new LOTRUnitTradeEntry(ArnorSoldier.class, 60, 250.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), - (new LOTRUnitTradeEntry(ArnorSoldierArcher.class, 100, 300.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), - (new LOTRUnitTradeEntry(ArnorSoldier.class, LOTREntityHorse.class, "Arnor_Horse", 100, 150.0F)).setMountArmor(horseArmorIron).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), - (new LOTRUnitTradeEntry(ArnorSoldierArcher.class, LOTREntityHorse.class, "Arnor_Horse", 140, 200.0F)).setMountArmor(horseArmorIron).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), - (new LOTRUnitTradeEntry(LOTREntityRangerNorth.class, 50, 0.0f)), - (new LOTRUnitTradeEntry(LOTREntityRangerNorth.class, LOTREntityHorse.class, "RangerNorth_Horse", 70, 100.0f)), - (new LOTRUnitTradeEntry(LOTREntityRangerNorthBannerBearer.class, 70, 150.0f)), - (new LOTRUnitTradeEntry(ArnorBannerBearer.class, 100, 400.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION) }); - - BREE_CAPTAIN = new LOTRUnitTradeEntries(150.0F, new LOTRUnitTradeEntry[]{ - (new LOTRUnitTradeEntry(LOTREntityBreeGuard.class, 20, 0.0f)), - (new LOTRUnitTradeEntry(BreeSoldier.class, 60, 250.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), - (new LOTRUnitTradeEntry(BreeCrossbowman.class, 100, 300.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), - (new LOTRUnitTradeEntry(BreeOutrider.class, LOTREntityHorse.class, "Bree_Horse", 150, 400.0F)).setMountArmor(horseArmorIron).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), - (new LOTRUnitTradeEntry(LOTREntityBreeBannerBearer.class, 40, 150.0f)), - (new LOTRUnitTradeEntry(BreeSoldierBannerBearer.class, 100, 400.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION) }); + RED_DWARF_COMMANDER = new LOTRUnitTradeEntries(200.0F, new LOTRUnitTradeEntry(LOTREntityDwarf.class, 60, 0.0F), + (new LOTRUnitTradeEntry(RedDwarfWarrior.class, 400, 50.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF), + (new LOTRUnitTradeEntry(RedDwarfArbalest.class, 400, 100.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF), + (new LOTRUnitTradeEntry(RedDwarfWarrior.class, LOTREntityWildBoar.class, "RedDwarfWarrior_Boar", 500, 150.0F)).setMountArmor(boarArmorRedDwarf).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF), + (new LOTRUnitTradeEntry(RedDwarfArbalest.class, LOTREntityWildBoar.class, "RedDwarfArbalest_Boar", 500, 200.0F)).setMountArmor(boarArmorRedDwarf).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF), + (new LOTRUnitTradeEntry(RedDwarfBannerBearer.class, 400, 200.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF), + (new LOTRUnitTradeEntry(RedDwarfArbalest.class, LOTREntityWildBoar.class, "Banner_Horse", 600, 300.0F)).setMountArmor(boarArmorRedDwarf).setPledgeType(LOTRUnitTradeEntry.PledgeType.ANY_DWARF)); + + LIMWAITH_COMMANDER = new LOTRUnitTradeEntries(200.0F, new LOTRUnitTradeEntry(LimwaithWarrior.class, 150, 50.0F), + (new LOTRUnitTradeEntry(LimwaithBlowgunner.class, 150, 100.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), + (new LOTRUnitTradeEntry(LimwaithBoneWarrior.class, 250, 200.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), + (new LOTRUnitTradeEntry(LimwaithBannerBearer.class, 150, 200.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION)); + + ARNOR_CAPTAIN = new LOTRUnitTradeEntries(200.0F, (new LOTRUnitTradeEntry(ArnorSoldier.class, 250, 250.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), + (new LOTRUnitTradeEntry(ArnorSoldierArcher.class, 250, 300.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), + (new LOTRUnitTradeEntry(ArnorSoldier.class, LOTREntityHorse.class, "Arnor_Horse", 350, 150.0F)).setMountArmor(horseArmorIron).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), + (new LOTRUnitTradeEntry(ArnorSoldierArcher.class, LOTREntityHorse.class, "Arnor_Horse", 350, 200.0F)).setMountArmor(horseArmorIron).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), + (new LOTRUnitTradeEntry(LOTREntityRangerNorth.class, 250, 0.0f)), + (new LOTRUnitTradeEntry(LOTREntityRangerNorth.class, LOTREntityHorse.class, "RangerNorth_Horse", 350, 100.0f)), + (new LOTRUnitTradeEntry(LOTREntityRangerNorthBannerBearer.class, 250, 150.0f)), + (new LOTRUnitTradeEntry(ArnorBannerBearer.class, 250, 400.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), + (new LOTRUnitTradeEntry(ArnorBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 450, 500.0F)).setMountArmor(horseArmorIron).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), + (new CinderUnitTradeEntry(BattleNun.class, 250, 400.0F).setObjective("Arnor").setExtraInfo("Arnor")).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION)); + + + BREE_CAPTAIN = new LOTRUnitTradeEntries(150.0F, (new LOTRUnitTradeEntry(LOTREntityBreeGuard.class, 150, 0.0f)), + (new LOTRUnitTradeEntry(BreeSoldier.class, 250, 250.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), + (new LOTRUnitTradeEntry(BreeCrossbowman.class, 250, 300.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), + (new LOTRUnitTradeEntry(BreeOutrider.class, LOTREntityHorse.class, "Bree_Horse", 350, 400.0F)).setMountArmor(horseArmorIron).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), + (new LOTRUnitTradeEntry(LOTREntityBreeBannerBearer.class, 150, 150.0f)), + (new LOTRUnitTradeEntry(BreeSoldierBannerBearer.class, 250, 400.0F)).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION), + (new LOTRUnitTradeEntry(BreeSoldierBannerBearer.class, LOTREntityHorse.class, "Banner_Horse", 350, 500.0F)).setMountArmor(horseArmorIron).setPledgeType(LOTRUnitTradeEntry.PledgeType.FACTION)); } - - public class DevCommand extends CommandBase { -/* - public static float box1 = -7F; - public static float box2 = -6F; - public static float box3 = -7F; - public static int box4 = 14; - public static int box5 = 0; - public static int box6 = 14; -*/ - public static float box1 = -7F; // X position - public static float box2 = -6.5F; // Y position - public static float box3 = -7F; // Z position - public static int box4 = 14; // X Texture map size - public static int box5 = 0; // Y Texture map size - public static int box6 = 14; // Z Texture map size - - @Override - public String getCommandName() { - return "dev"; // Command name - } - - @Override - public String getCommandUsage(ICommandSender sender) { - return "/dev"; // Usage - } - - @Override - public void processCommand(ICommandSender sender, String[] args) { - if (args.length < 1) { - sender.addChatMessage(new ChatComponentText("Usage: /dev ")); - return; - } else if (args.length < 2 && args[0].equals("print")) { - sender.addChatMessage(new ChatComponentText("Variable box1: " + box1)); - sender.addChatMessage(new ChatComponentText("Variable box2: " + box2)); - sender.addChatMessage(new ChatComponentText("Variable box3: " + box3)); - sender.addChatMessage(new ChatComponentText("Variable box4: " + box4)); - sender.addChatMessage(new ChatComponentText("Variable box5: " + box5)); - sender.addChatMessage(new ChatComponentText("Variable box6: " + box6)); - return; - } - - - String variableName = args[0]; - String value = args[1]; - - try { - switch (variableName) { - case "box1": - box1 = Float.parseFloat(value); - break; - case "box2": - box2 = Float.parseFloat(value); - break; - case "box3": - box3 = Float.parseFloat(value); - break; - case "box4": - box4 = Integer.parseInt(value); - break; - case "box5": - box5 = Integer.parseInt(value); - break; - case "box6": - box6 = Integer.parseInt(value); - break; - default: - sender.addChatMessage(new ChatComponentText("Unknown variable.")); - return; - } - sender.addChatMessage(new ChatComponentText(variableName + " set to " + value)); - } catch (NumberFormatException e) { - sender.addChatMessage(new ChatComponentText("Invalid value format for " + variableName)); - } - } - - @Override - public boolean canCommandSenderUseCommand(ICommandSender sender) { - return true; // Here you can add permission checks if necessary - } - } public int getRustedSwordID() {return 0;} } diff --git a/src/main/java/com/zivilon/cinder_loe/Materials.java b/src/main/java/com/zivilon/cinder_loe/Materials.java index 1c6d44f..6d134f3 100644 --- a/src/main/java/com/zivilon/cinder_loe/Materials.java +++ b/src/main/java/com/zivilon/cinder_loe/Materials.java @@ -21,9 +21,6 @@ public class Materials { modifyMaterial("RHUDAUR", 300, 2.5F, 0.6F, 2, 6.0F, 10, LOTRMod.fur); modifyMaterial("BATTLENUN", 300, 3F, 0.6F, 2, 6.0F, 10, Items.iron_ingot); modifyMaterial("ASH", 2000, 0.0F, 0.6F, 2, 7.0F, 10, CinderLoE.ingotAsh); - modifyMaterial("SERPENT", 650, 2.0F, 0.6F, 2, 6.0F, 10, LOTRMod.bronze); - modifyMaterial("USURPER",650, 2.0F, 0.6F, 2, 6.0F, 10, Items.iron_ingot); - modifyMaterial("WARLORD", 650, 2.0F, 0.6F, 2, 6.0F, 10, LOTRMod.bronze); modifyMaterial("JADE",2400, 5.0F, 0.8F, 0, 9.0F, 10, LOTRMod.emerald); } diff --git a/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java b/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java index 95f4a23..29e21ea 100644 --- a/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java +++ b/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java @@ -63,9 +63,6 @@ public class LOTRMaterialTransformer implements IClassTransformer { addMaterial("BATTLENUN", classNode); addMaterial("ASH", classNode); addMaterial("RHUDAUR", classNode); - addMaterial("SERPENT", classNode); - addMaterial("USURPER", classNode); - addMaterial("WARLORD",classNode); addMaterial("JADE",classNode); // Protection Conversion 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 cf9c4db..0935a31 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 @@ -99,7 +99,7 @@ public class MixinLOTRHiredNPCInfo { } public void increaseMovementGain(EntityLivingBase gainingEntity) { - float movementBoost = 0.005f; + float movementBoost = 0.0025f; IAttributeInstance attribute = gainingEntity.getEntityAttribute(SharedMonsterAttributes.movementSpeed); attribute.setBaseValue(attribute.getBaseValue() + (double)movementBoost); } diff --git a/src/main/java/com/zivilon/cinder_loe/recipes.java b/src/main/java/com/zivilon/cinder_loe/recipes.java index fa5d3c8..196a5e2 100644 --- a/src/main/java/com/zivilon/cinder_loe/recipes.java +++ b/src/main/java/com/zivilon/cinder_loe/recipes.java @@ -2,6 +2,8 @@ package com.zivilon.cinder_loe; import cpw.mods.fml.common.registry.GameRegistry; import lotr.common.LOTRMod; +import lotr.common.recipe.LOTRBrewingRecipes; +import lotr.common.recipe.LOTRMillstoneRecipes; import lotr.common.recipe.LOTRRecipePoisonWeapon; import lotr.common.recipe.LOTRRecipes; import com.zivilon.cinder_loe.CinderLoE; @@ -9,6 +11,7 @@ import com.zivilon.cinder_loe.mixins.MixinLOTRBrewingRecipes; import lotr.common.item.LOTRItemFood; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.crafting.IRecipe; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -18,6 +21,8 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; +import static lotr.common.recipe.LOTRBrewingRecipes.BARREL_CAPACITY; + public class recipes { @@ -31,6 +36,7 @@ public class recipes { registerArnorRecipes(); registerAngmarRecipes(); registerBrewingRecipes(); + registerMillstoneRecipes(); } public static void registerGeneralRecipes() { @@ -142,7 +148,7 @@ public class recipes { OreDictionary.registerOre("meat", LOTRMod.zebraCooked); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.fruitsalad), Items.bowl, "fruit1", "fruit2", "fruit3")); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.pasta, 4), LOTRMod.rollingPin, CinderLoE.dough, CinderLoE.dough)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.pasta, 4), new ItemStack(LOTRMod.rollingPin, 1, OreDictionary.WILDCARD_VALUE), CinderLoE.dough, CinderLoE.dough)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.halva), Items.sugar, CinderLoE.dough, CinderLoE.spice, LOTRMod.almond)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.chocolatebar, 2), LOTRMod.mugChocolate)); @@ -181,7 +187,7 @@ public class recipes { 'X', LOTRMod.coralReef)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.plaster, 4), "XYX", "YXY", "XYX", 'X', Items.paper, 'Y', Blocks.clay)); - // Mordor Cobblebrick + // Cinder Stony Blocks GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cindercobble, 4, 1), "XY", "YX", 'X', new ItemStack(LOTRMod.rock, 1, 0), 'Y', LOTRMod.mordorGravel)); @@ -192,6 +198,53 @@ public class recipes { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(LOTRMod.banner, 1, 46), " Y ", " X ", " Z ", 'X', "stickWood", 'Y', new ItemStack(Blocks.wool, 1, 13), 'Z', "plankWood")); + // Furs and then carpets + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 0), "XX", "XX", + 'X', new ItemStack(LOTRMod.fur, 1))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 0), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 0))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 1), "XX", "XX", + 'X', new ItemStack(CinderLoE.cinderFurItem, 1, 0))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 1), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 1))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 2), "XX", "XX", + 'X', new ItemStack(CinderLoE.cinderFurItem, 1, 1))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 2), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 2))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 3), "XX", "XX", + 'X', new ItemStack(CinderLoE.cinderFurItem, 1, 2))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 3), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 3))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 4), "XX", "XX", + 'X', new ItemStack(CinderLoE.cinderFurItem, 1, 3))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 4), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 4))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 5), "XX", "XX", + 'X', new ItemStack(CinderLoE.cinderFurItem, 1, 4))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 5), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 5))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 6), "XX", "XX", + 'X', new ItemStack(CinderLoE.cinderFurItem, 1, 5))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 6), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 6))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 7), "XX", "XX", + 'X', new ItemStack(LOTRMod.lionFur, 1))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 7), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 7))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 8), "XX", "XX", + 'X', new ItemStack(CinderLoE.cinderFurItem, 1, 6))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 8), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 8))); + + } public static void registerRedDwarvenRecipes() { LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetRedDwarf), "XXX", "X X", @@ -319,5 +372,22 @@ public class recipes { Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), "stickWood")); } public static void registerBrewingRecipes() { + System.out.println("[CinderLoE] Registering Brewing recipes... We like to drink! jk I hate alcohol"); + + CinderBrewingRecipes.addCustomBrewingRecipe(new ItemStack(LOTRMod.mugTauredainCocoa, BARREL_CAPACITY), + new ItemStack(Items.dye, 1, 3), + new ItemStack(Items.dye, 1, 3), + new ItemStack(Items.dye, 1, 3), + new ItemStack(LOTRMod.doubleFlower, 1, 2), + new ItemStack(LOTRMod.doubleFlower, 1, 3), + new ItemStack(LOTRMod.mugMilk)); } + + public static void registerMillstoneRecipes() { + System.out.println("[CinderLoE] Registering Millstone recipes..."); + + LOTRMillstoneRecipes.addRecipe(Items.wheat, new ItemStack(CinderLoE.flour)); + LOTRMillstoneRecipes.addRecipe(LOTRMod.corn, new ItemStack(CinderLoE.flour)); + } + } diff --git a/src/main/java/com/zivilon/cinder_loe/util/DurableItemCrafter.java b/src/main/java/com/zivilon/cinder_loe/util/DurableItemCrafter.java index 6e950f8..e91aedb 100644 --- a/src/main/java/com/zivilon/cinder_loe/util/DurableItemCrafter.java +++ b/src/main/java/com/zivilon/cinder_loe/util/DurableItemCrafter.java @@ -13,5 +13,7 @@ public class DurableItemCrafter { static { customItems.add(LOTRMod.rollingPin); + customItems.add(LOTRMod.chisel); + customItems.add(CinderLoE.cleaver); } } 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 debbe50..546d135 100644 --- a/src/main/resources/assets/cinder_loe/lang/en_US.lang +++ b/src/main/resources/assets/cinder_loe/lang/en_US.lang @@ -326,6 +326,7 @@ entity.cinder_loe.EsgarothSoldier.name=Esgarothi Soldier entity.cinder_loe.RhudaurSoldier.name=Rhudaur Soldier entity.cinder_loe.TauredainTrueBlood.name=Taurethrim True-Blood entity.cinder_loe.Sirrandrai.name=Rider of Sirrandrai +entity.cinder_loe.NorthernOrc.name=Northern Orc lotr.enchant.protectWeak1=Dented lotr.enchant.protectWeak2=Defective diff --git a/src/main/resources/assets/cinder_loe/sounds/boss/victory.ogg b/src/main/resources/assets/cinder_loe/sounds/boss/victory.ogg index 6abc3f2..0201b86 100644 Binary files a/src/main/resources/assets/cinder_loe/sounds/boss/victory.ogg and b/src/main/resources/assets/cinder_loe/sounds/boss/victory.ogg differ