diff --git a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java index 1a6fded..f3962e4 100644 --- a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java +++ b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java @@ -82,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.*; +import static lotr.common.item.LOTRMaterial.GONDOR; import net.minecraft.command.ICommandSender; import net.minecraft.command.CommandBase; @@ -112,6 +112,9 @@ public class CinderLoE { 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; // Blocks @@ -141,6 +144,7 @@ public class CinderLoE { public static Block plaster; public static Block voidblock; public static Block entityBarrier; + public static Block woodpanel; //public static Block verticalWeaponRack; @@ -199,7 +203,7 @@ public class CinderLoE { public static Item warDart; public static Item warDartHeads; - // Elite Armors + // Elite Armors/weapons public static Item helmetserpent; public static Item bodyserpent; public static Item legsserpent; @@ -212,6 +216,10 @@ 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; @@ -493,6 +501,9 @@ public class CinderLoE { 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"); @@ -617,7 +628,7 @@ public class CinderLoE { //Relics 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"); @@ -641,7 +652,6 @@ public class CinderLoE { 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); @@ -652,18 +662,18 @@ public class CinderLoE { ItemRegistration.register(legsJade, "legsJade", 6207); ItemRegistration.register(bootsJade, "bootsJade", 6208); linkLOTRWeapon(frostblade, "frostblade"); - //linkLOTRWeapon(daggervoid, "daggerVoid"); + linkLOTRWeapon(daggervoid, "daggerVoid"); linkLOTRWeapon(spearsolidgold, "spearsolidgold"); linkLOTRWeapon(spearUnnamed, "spearUnnamed"); linkLOTRWeapon(whip, "whip"); // Common Tools/Weapons - cleaver = (new LOTRItemDagger(Item.ToolMaterial.IRON)).setUnlocalizedName("lotr:cleaver").setTextureName("lotr:cleaver"); + cleaver = (new LOTRItemDagger(GONDOR)).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.register(cleaver,"cleaver",6109); - // linkLOTRWeapon(cleaver, "cleaver"); + linkLOTRWeapon(cleaver, "cleaver"); ItemRegistration.register(warDart,"warDart",6111); ItemRegistration.register(warDartHeads,"warDartHeads",6500); @@ -815,8 +825,8 @@ 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.register(helmetBreeKettle, "breekettle", 6440); - ItemRegistration.register(helmetBree, "helmetBree", 6441); + ItemRegistration.register(helmetBree, "helmetBree", 6440); + ItemRegistration.register(helmetBreeKettle, "breekettle", 6441); ItemRegistration.register(bodyBree, "bodyBree", 6442); ItemRegistration.register(legsBree, "legsBree", 6443); ItemRegistration.register(bootsBree, "bootsBree", 6444); @@ -827,35 +837,51 @@ public class CinderLoE { linkLOTRWeapon(swordBree, "swordBree"); //Elite Armors - 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); + 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.register(helmetserpent, "helmetserpent", 6800); + ItemRegistration.register(bodyserpent, "bodyserpent", 6801); + ItemRegistration.register(legsserpent, "legsserpent", 6802); + ItemRegistration.register(bootsserpent, "bootsserpent", 6803); + } 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"); //Rhudaur MATERIAL_RHUDAUR = getLOTRMaterialByName("RHUDAUR"); diff --git a/src/main/resources/assets/lotr/armor/nex_fire_2.png b/src/main/resources/assets/lotr/armor/nex_fire_2.png index 7f7e021..6a59ecc 100644 Binary files a/src/main/resources/assets/lotr/armor/nex_fire_2.png and b/src/main/resources/assets/lotr/armor/nex_fire_2.png differ diff --git a/src/main/resources/assets/lotr/textures/items/nimveil_blade.png b/src/main/resources/assets/lotr/textures/items/large/macewarlord.png similarity index 50% rename from src/main/resources/assets/lotr/textures/items/nimveil_blade.png rename to src/main/resources/assets/lotr/textures/items/large/macewarlord.png index 0ebaca0..a917b7b 100644 Binary files a/src/main/resources/assets/lotr/textures/items/nimveil_blade.png and b/src/main/resources/assets/lotr/textures/items/large/macewarlord.png differ