diff --git a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java index 6af591f..3516e0e 100644 --- a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java +++ b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java @@ -143,6 +143,7 @@ public class CinderLoE { public static Block entityBarrier; public static Block iceCage; public static Block enchantedIce; + public static Block woodpanel; //public static Block verticalWeaponRack; @@ -172,6 +173,7 @@ public class CinderLoE { 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; @@ -218,7 +220,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; @@ -231,6 +233,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; @@ -512,6 +518,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"); @@ -567,7 +576,7 @@ public class CinderLoE { * Item Registation, add up the "last ID added" upon adding a new item * Weapons will need to be linked */ - // Last ID added: 117 + // Last ID added: 119 // ==Food Items== ItemRegistration.registerItem(onion, "onion", 58); @@ -614,6 +623,7 @@ public class CinderLoE { 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); @@ -623,15 +633,15 @@ public class CinderLoE { 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)).setUnlocalizedName("lotr:bodyNexIce").setTextureName("lotr:bodyNexIce").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)).setUnlocalizedName("lotr:bodyNexFire").setTextureName("lotr:bodyNexFire").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)).setUnlocalizedName("lotr:bodyNexToxin").setTextureName("lotr:bodyNexToxin").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); @@ -665,6 +675,7 @@ public class CinderLoE { 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); @@ -675,6 +686,7 @@ public class CinderLoE { linkLOTRWeapon(frostblade, "frostblade"); linkLOTRWeapon(daggervoid, "daggerVoid"); linkLOTRWeapon(spearsolidgold, "spearsolidgold"); + linkLOTRWeapon(spearblood, "spearblood"); linkLOTRWeapon(spearUnnamed, "spearUnnamed"); linkLOTRWeapon(whip, "whip"); @@ -882,14 +894,17 @@ public class CinderLoE { 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_RHUDUAR = getLOTRMaterialByName("RHUDAUR"); @@ -1142,6 +1157,7 @@ public class CinderLoE { CinderCore.registerItemFallback(Block.getIdFromBlock(cindercobble), Block.getIdFromBlock(LOTRMod.cobblebrick), "cinder_loe", "1.2"); 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 == @@ -1179,6 +1195,7 @@ 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"); @@ -1190,6 +1207,7 @@ 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"); diff --git a/src/main/java/com/zivilon/cinder_loe/blocks/woodpanel.java b/src/main/java/com/zivilon/cinder_loe/blocks/woodpanel.java new file mode 100644 index 0000000..2e8fc23 --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/blocks/woodpanel.java @@ -0,0 +1,17 @@ +package com.zivilon.cinder_loe.blocks; + +import com.zivilon.cinder_loe.LoECreativeTabs; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + + +public class woodpanel extends RotatableBlockBase3{ + public woodpanel() { + super(Material.wood, "lotr:woodpanel"); + setCreativeTab(LoECreativeTabs.tabBlockLoE); + setStepSound(Block.soundTypeWood); + setHardness(2.0F); + setResistance(5.0F); + setBlockName("lotr:woodpanel"); + } +} diff --git a/src/main/java/com/zivilon/cinder_loe/client/model/ModelNexFireChestplate.java b/src/main/java/com/zivilon/cinder_loe/client/model/ModelNexFireChestplate.java new file mode 100644 index 0000000..f473029 --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/client/model/ModelNexFireChestplate.java @@ -0,0 +1,93 @@ +package com.zivilon.cinder_loe.client.model; + +import lotr.client.model.LOTRModelBiped; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +/** + * chestplatenex - Cleric_red + * Created using Tabula 4.1.1 + */ +public class ModelNexFireChestplate extends LOTRModelBiped { + + public ModelRenderer upperrightarm; + public ModelRenderer upperleftarm; + public ModelRenderer banner; + public ModelRenderer hood; + public ModelRenderer rightribbon; + public ModelRenderer leftribbon; + + public ModelNexFireChestplate(float f) { + super (f); + this.textureWidth = 64; + this.textureHeight = 32; + this.bipedBody.cubeList.clear(); + this.bipedRightArm.cubeList.clear(); + this.bipedLeftArm.cubeList.clear(); + + this.banner = new ModelRenderer(this, 0, 17); + this.banner.setRotationPoint(0.0F, 0.0F, 0.0F); + this.banner.addBox(-4.0F, 0.0F, -2.7F, 8, 15, 0, 0.0F); + this.bipedRightArm = new ModelRenderer(this, 40, 16); + this.bipedRightArm.mirror = true; + this.bipedRightArm.setRotationPoint(5.0F, 2.0F, 0.0F); + this.bipedRightArm.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, 0.1F); + this.setRotateAngle(bipedRightArm, 0.0F, 0.0F, -0.026354471705114374F); + this.bipedLeftArm = new ModelRenderer(this, 40, 16); + this.bipedLeftArm.setRotationPoint(-5.0F, 2.0F, 0.0F); + this.bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, 0.1F); + this.setRotateAngle(bipedLeftArm, 0.0F, 0.0F, 0.026354471705114374F); + this.hood = new ModelRenderer(this, 0, 0); + this.hood.setRotationPoint(0.0F, 0.0F, 0.0F); + this.hood.addBox(-5.4F, 0.0F, 0.7F, 11, 4, 7, 0.0F); + this.setRotateAngle(hood, 0.5009094953223726F, 0.0F, 0.0F); + this.rightribbon = new ModelRenderer(this, 57, 17); + this.rightribbon.mirror = true; + this.rightribbon.setRotationPoint(0.0F, 0.0F, 0.0F); + this.rightribbon.addBox(-4.0F, -0.8F, 8.3F, 3, 15, 0, 0.0F); + this.leftribbon = new ModelRenderer(this, 57, 17); + this.leftribbon.setRotationPoint(0.0F, 0.0F, 0.0F); + this.leftribbon.addBox(1.0F, -0.8F, 8.3F, 3, 15, 0, 0.0F); + this.bipedBody = new ModelRenderer(this, 16, 16); + this.bipedBody.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, 0.5F); + this.upperleftarm = new ModelRenderer(this, 40, 16); + this.upperleftarm.mirror = true; + this.upperleftarm.setRotationPoint(5.0F, 2.0F, 0.0F); + this.upperleftarm.addBox(-6.0F, -4.0F, -2.0F, 4, 7, 4, 0.5F); + this.setRotateAngle(upperleftarm, 0.0F, 0.0F, -0.026354471705114374F); + this.upperrightarm = new ModelRenderer(this, 40, 16); + this.upperrightarm.setRotationPoint(-5.0F, 2.0F, 0.0F); + this.upperrightarm.addBox(2.0F, -4.0F, -2.0F, 4, 7, 4, 0.5F); + this.setRotateAngle(upperrightarm, 0.0F, 0.0F, 0.026354471705114374F); + this.bipedRightArm.addChild(this.upperrightarm); + this.bipedLeftArm.addChild(this.upperleftarm); + this.bipedBody.addChild(this.banner); + this.bipedBody.addChild(this.hood); + this.bipedBody.addChild(this.rightribbon); + this.bipedBody.addChild(this.leftribbon); + + this.bipedHead.cubeList.clear(); + this.bipedHeadwear.cubeList.clear(); + this.bipedRightLeg.cubeList.clear(); + this.bipedLeftLeg.cubeList.clear(); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + this.bipedRightArm.render(f5); + this.bipedLeftArm.render(f5); + this.bipedBody.render(f5); + + } + + /** + * This is a helper function from Tabula to set the rotation of model parts + */ + public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/com/zivilon/cinder_loe/client/model/ModelNexIceChestplate.java b/src/main/java/com/zivilon/cinder_loe/client/model/ModelNexIceChestplate.java new file mode 100644 index 0000000..f386746 --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/client/model/ModelNexIceChestplate.java @@ -0,0 +1,84 @@ +package com.zivilon.cinder_loe.client.model; + +import lotr.client.model.LOTRModelBiped; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelNexIceChestplate extends LOTRModelBiped { + + public ModelRenderer upperrightarm; + public ModelRenderer upperleftarm; + public ModelRenderer banner; + public ModelRenderer hood; + public ModelRenderer rightribbon; + public ModelRenderer leftribbon; + + public ModelNexIceChestplate(float f) { + super (f); + this.textureWidth = 64; + this.textureHeight = 32; + this.bipedBody.cubeList.clear(); + this.bipedRightArm.cubeList.clear(); + this.bipedLeftArm.cubeList.clear(); + + this.banner = new ModelRenderer(this, 0, 17); + this.banner.setRotationPoint(0.0F, 0.0F, 0.0F); + this.banner.addBox(-4.0F, 0.0F, -2.7F, 8, 15, 0, 0.0F); + this.bipedRightArm = new ModelRenderer(this, 40, 16); + this.bipedRightArm.mirror = true; + this.bipedRightArm.setRotationPoint(5.0F, 2.0F, 0.0F); + this.bipedRightArm.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, 0.1F); + this.setRotateAngle(bipedRightArm, 0.0F, 0.0F, -0.026354471705114374F); + this.bipedLeftArm = new ModelRenderer(this, 40, 16); + this.bipedLeftArm.setRotationPoint(-5.0F, 2.0F, 0.0F); + this.bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, 0.1F); + this.setRotateAngle(bipedLeftArm, 0.0F, 0.0F, 0.026354471705114374F); + this.hood = new ModelRenderer(this, 0, 0); + this.hood.setRotationPoint(0.0F, 0.0F, 0.0F); + this.hood.addBox(-5.4F, 0.0F, 0.7F, 11, 4, 7, 0.0F); + this.setRotateAngle(hood, 0.5009094953223726F, 0.0F, 0.0F); + this.rightribbon = new ModelRenderer(this, 57, 17); + this.rightribbon.mirror = true; + this.rightribbon.setRotationPoint(0.0F, 0.0F, 0.0F); + this.rightribbon.addBox(-4.0F, -0.8F, 8.3F, 3, 15, 0, 0.0F); + this.leftribbon = new ModelRenderer(this, 57, 17); + this.leftribbon.setRotationPoint(0.0F, 0.0F, 0.0F); + this.leftribbon.addBox(1.0F, -0.8F, 8.3F, 3, 15, 0, 0.0F); + this.bipedBody = new ModelRenderer(this, 16, 16); + this.bipedBody.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, 0.5F); + this.upperleftarm = new ModelRenderer(this, 40, 16); + this.upperleftarm.mirror = true; + this.upperleftarm.setRotationPoint(5.0F, 2.0F, 0.0F); + this.upperleftarm.addBox(-6.0F, -4.0F, -2.0F, 4, 7, 4, 0.5F); + this.setRotateAngle(upperleftarm, 0.0F, 0.0F, -0.026354471705114374F); + this.upperrightarm = new ModelRenderer(this, 40, 16); + this.upperrightarm.setRotationPoint(-5.0F, 2.0F, 0.0F); + this.upperrightarm.addBox(2.0F, -4.0F, -2.0F, 4, 7, 4, 0.5F); + this.setRotateAngle(upperrightarm, 0.0F, 0.0F, 0.026354471705114374F); + this.bipedRightArm.addChild(this.upperrightarm); + this.bipedLeftArm.addChild(this.upperleftarm); + this.bipedBody.addChild(this.banner); + this.bipedBody.addChild(this.hood); + this.bipedBody.addChild(this.rightribbon); + this.bipedBody.addChild(this.leftribbon); + + this.bipedHead.cubeList.clear(); + this.bipedHeadwear.cubeList.clear(); + this.bipedRightLeg.cubeList.clear(); + this.bipedLeftLeg.cubeList.clear(); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + this.bipedRightArm.render(f5); + this.bipedLeftArm.render(f5); + this.bipedBody.render(f5); + + } + public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/com/zivilon/cinder_loe/client/model/ModelNexToxinChestplate.java b/src/main/java/com/zivilon/cinder_loe/client/model/ModelNexToxinChestplate.java new file mode 100644 index 0000000..89a6a31 --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/client/model/ModelNexToxinChestplate.java @@ -0,0 +1,88 @@ +package com.zivilon.cinder_loe.client.model; + +import lotr.client.model.LOTRModelBiped; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelNexToxinChestplate extends LOTRModelBiped { + + public ModelRenderer upperrightarm; + public ModelRenderer upperleftarm; + public ModelRenderer banner; + public ModelRenderer hood; + public ModelRenderer rightribbon; + public ModelRenderer leftribbon; + + public ModelNexToxinChestplate(float f) { + super (f); + this.textureWidth = 64; + this.textureHeight = 32; + this.bipedBody.cubeList.clear(); + this.bipedRightArm.cubeList.clear(); + this.bipedLeftArm.cubeList.clear(); + + this.banner = new ModelRenderer(this, 0, 17); + this.banner.setRotationPoint(0.0F, 0.0F, 0.0F); + this.banner.addBox(-4.0F, 0.0F, -2.7F, 8, 15, 0, 0.0F); + this.bipedRightArm = new ModelRenderer(this, 40, 16); + this.bipedRightArm.mirror = true; + this.bipedRightArm.setRotationPoint(5.0F, 2.0F, 0.0F); + this.bipedRightArm.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, 0.1F); + this.setRotateAngle(bipedRightArm, 0.0F, 0.0F, -0.026354471705114374F); + this.bipedLeftArm = new ModelRenderer(this, 40, 16); + this.bipedLeftArm.setRotationPoint(-5.0F, 2.0F, 0.0F); + this.bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, 0.1F); + this.setRotateAngle(bipedLeftArm, 0.0F, 0.0F, 0.026354471705114374F); + this.hood = new ModelRenderer(this, 0, 0); + this.hood.setRotationPoint(0.0F, 0.0F, 0.0F); + this.hood.addBox(-5.4F, 0.0F, 0.7F, 11, 4, 7, 0.0F); + this.setRotateAngle(hood, 0.5009094953223726F, 0.0F, 0.0F); + this.rightribbon = new ModelRenderer(this, 57, 17); + this.rightribbon.mirror = true; + this.rightribbon.setRotationPoint(0.0F, 0.0F, 0.0F); + this.rightribbon.addBox(-4.0F, -0.8F, 8.3F, 3, 15, 0, 0.0F); + this.leftribbon = new ModelRenderer(this, 57, 17); + this.leftribbon.setRotationPoint(0.0F, 0.0F, 0.0F); + this.leftribbon.addBox(1.0F, -0.8F, 8.3F, 3, 15, 0, 0.0F); + this.bipedBody = new ModelRenderer(this, 16, 16); + this.bipedBody.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, 0.5F); + this.upperleftarm = new ModelRenderer(this, 40, 16); + this.upperleftarm.mirror = true; + this.upperleftarm.setRotationPoint(5.0F, 2.0F, 0.0F); + this.upperleftarm.addBox(-6.0F, -4.0F, -2.0F, 4, 7, 4, 0.5F); + this.setRotateAngle(upperleftarm, 0.0F, 0.0F, -0.026354471705114374F); + this.upperrightarm = new ModelRenderer(this, 40, 16); + this.upperrightarm.setRotationPoint(-5.0F, 2.0F, 0.0F); + this.upperrightarm.addBox(2.0F, -4.0F, -2.0F, 4, 7, 4, 0.5F); + this.setRotateAngle(upperrightarm, 0.0F, 0.0F, 0.026354471705114374F); + this.bipedRightArm.addChild(this.upperrightarm); + this.bipedLeftArm.addChild(this.upperleftarm); + this.bipedBody.addChild(this.banner); + this.bipedBody.addChild(this.hood); + this.bipedBody.addChild(this.rightribbon); + this.bipedBody.addChild(this.leftribbon); + + this.bipedHead.cubeList.clear(); + this.bipedHeadwear.cubeList.clear(); + this.bipedRightLeg.cubeList.clear(); + this.bipedLeftLeg.cubeList.clear(); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + this.bipedRightArm.render(f5); + this.bipedLeftArm.render(f5); + this.bipedBody.render(f5); + + } + + /** + * This is a helper function from Tabula to set the rotation of model parts + */ + public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRArmorModels.java b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRArmorModels.java index 4d71ca6..568065e 100644 --- a/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRArmorModels.java +++ b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRArmorModels.java @@ -102,6 +102,9 @@ public class MixinLOTRArmorModels { map.put(CinderLoE.bodyJade, new ModelBodyJade(1.0f)); map.put(CinderLoE.legsJade, new ModelLegsJade(1.0f)); map.put(CinderLoE.helmetJade, new ModelJadeHelmet(1.0f)); + map.put(CinderLoE.bodyNexFire, new ModelNexFireChestplate(1.0f)); + map.put(CinderLoE.bodyNexToxin, new ModelNexToxinChestplate(1.0f)); + map.put(CinderLoE.bodyNexIce, new ModelNexIceChestplate(1.0f)); map.put(LOTRMod.plate, new LOTRModelHeadPlate()); map.put(LOTRMod.woodPlate, new LOTRModelHeadPlate()); map.put(LOTRMod.ceramicPlate, new LOTRModelHeadPlate()); diff --git a/src/main/resources/assets/lotr/armor/nex_fire_chestplate.png b/src/main/resources/assets/lotr/armor/nex_fire_chestplate.png new file mode 100644 index 0000000..1aa014a Binary files /dev/null and b/src/main/resources/assets/lotr/armor/nex_fire_chestplate.png differ diff --git a/src/main/resources/assets/lotr/armor/nex_ice_chestplate.png b/src/main/resources/assets/lotr/armor/nex_ice_chestplate.png new file mode 100644 index 0000000..d745900 Binary files /dev/null and b/src/main/resources/assets/lotr/armor/nex_ice_chestplate.png differ diff --git a/src/main/resources/assets/lotr/armor/nex_toxin_chestplate.png b/src/main/resources/assets/lotr/armor/nex_toxin_chestplate.png new file mode 100644 index 0000000..454d004 Binary files /dev/null and b/src/main/resources/assets/lotr/armor/nex_toxin_chestplate.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/woodpanel_bottom.png b/src/main/resources/assets/lotr/textures/blocks/woodpanel_bottom.png new file mode 100644 index 0000000..97cf823 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/woodpanel_bottom.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/woodpanel_side_0.png b/src/main/resources/assets/lotr/textures/blocks/woodpanel_side_0.png new file mode 100644 index 0000000..c65950b Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/woodpanel_side_0.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/woodpanel_side_180.png b/src/main/resources/assets/lotr/textures/blocks/woodpanel_side_180.png new file mode 100644 index 0000000..4044ec4 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/woodpanel_side_180.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/woodpanel_side_270.png b/src/main/resources/assets/lotr/textures/blocks/woodpanel_side_270.png new file mode 100644 index 0000000..9c27e6e Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/woodpanel_side_270.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/woodpanel_side_90.png b/src/main/resources/assets/lotr/textures/blocks/woodpanel_side_90.png new file mode 100644 index 0000000..7241f3e Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/woodpanel_side_90.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/woodpanel_top.png b/src/main/resources/assets/lotr/textures/blocks/woodpanel_top.png new file mode 100644 index 0000000..97cf823 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/woodpanel_top.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_ancient.png b/src/main/resources/assets/lotr/textures/items/war_dart_ancient.png index ace2df4..37d7ba3 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_ancient.png and b/src/main/resources/assets/lotr/textures/items/war_dart_ancient.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_black_uruk.png b/src/main/resources/assets/lotr/textures/items/war_dart_black_uruk.png index 1bbe9f1..5acb6c6 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_black_uruk.png and b/src/main/resources/assets/lotr/textures/items/war_dart_black_uruk.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_blue_dwarven.png b/src/main/resources/assets/lotr/textures/items/war_dart_blue_dwarven.png index 31ec468..f2147b8 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_blue_dwarven.png and b/src/main/resources/assets/lotr/textures/items/war_dart_blue_dwarven.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_bronze.png b/src/main/resources/assets/lotr/textures/items/war_dart_bronze.png index 9bcaa1a..12ac248 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_bronze.png and b/src/main/resources/assets/lotr/textures/items/war_dart_bronze.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_copper.png b/src/main/resources/assets/lotr/textures/items/war_dart_copper.png index be81a2a..56abf01 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_copper.png and b/src/main/resources/assets/lotr/textures/items/war_dart_copper.png differ diff --git a/src/main/resources/assets/lotr/armor/nex_fire_1.png b/src/main/resources/assets/lotr/textures/items/war_dart_dwarf.png similarity index 50% rename from src/main/resources/assets/lotr/armor/nex_fire_1.png rename to src/main/resources/assets/lotr/textures/items/war_dart_dwarf.png index d07300c..12f2319 100644 Binary files a/src/main/resources/assets/lotr/armor/nex_fire_1.png and b/src/main/resources/assets/lotr/textures/items/war_dart_dwarf.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_elven.png b/src/main/resources/assets/lotr/textures/items/war_dart_elven.png index c9e7012..2880d85 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_elven.png and b/src/main/resources/assets/lotr/textures/items/war_dart_elven.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_gilded_iron.png b/src/main/resources/assets/lotr/textures/items/war_dart_gilded_iron.png index 6b3e491..fa74aa8 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_gilded_iron.png and b/src/main/resources/assets/lotr/textures/items/war_dart_gilded_iron.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_headless.png b/src/main/resources/assets/lotr/textures/items/war_dart_headless.png index a4b4022..751e75d 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_headless.png and b/src/main/resources/assets/lotr/textures/items/war_dart_headless.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_heads_0.png b/src/main/resources/assets/lotr/textures/items/war_dart_heads_0.png index 3cb0e00..8e9d59e 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_heads_0.png and b/src/main/resources/assets/lotr/textures/items/war_dart_heads_0.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_heads_1.png b/src/main/resources/assets/lotr/textures/items/war_dart_heads_1.png index 08e3713..703e164 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_heads_1.png and b/src/main/resources/assets/lotr/textures/items/war_dart_heads_1.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_heads_1_alt.png b/src/main/resources/assets/lotr/textures/items/war_dart_heads_1_alt.png index aba15a1..0ebaca0 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_heads_1_alt.png and b/src/main/resources/assets/lotr/textures/items/war_dart_heads_1_alt.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_heads_2.png b/src/main/resources/assets/lotr/textures/items/war_dart_heads_2.png index 418bae5..ca8804a 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_heads_2.png and b/src/main/resources/assets/lotr/textures/items/war_dart_heads_2.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_heads_3.png b/src/main/resources/assets/lotr/textures/items/war_dart_heads_3.png index 0a0b7f9..b9705f8 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_heads_3.png and b/src/main/resources/assets/lotr/textures/items/war_dart_heads_3.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_heads_4.png b/src/main/resources/assets/lotr/textures/items/war_dart_heads_4.png index 6e26dca..b114491 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_heads_4.png and b/src/main/resources/assets/lotr/textures/items/war_dart_heads_4.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_heads_5.png b/src/main/resources/assets/lotr/textures/items/war_dart_heads_5.png index 50a1bb1..c5deb81 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_heads_5.png and b/src/main/resources/assets/lotr/textures/items/war_dart_heads_5.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_iron.png b/src/main/resources/assets/lotr/textures/items/war_dart_iron.png index 1a1752c..4d7a481 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_iron.png and b/src/main/resources/assets/lotr/textures/items/war_dart_iron.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_mithril.png b/src/main/resources/assets/lotr/textures/items/war_dart_mithril.png index 953f928..d30d551 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_mithril.png and b/src/main/resources/assets/lotr/textures/items/war_dart_mithril.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_morgul.png b/src/main/resources/assets/lotr/textures/items/war_dart_morgul.png new file mode 100644 index 0000000..2469990 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/war_dart_morgul.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_orc.png b/src/main/resources/assets/lotr/textures/items/war_dart_orc.png index 14996f6..8ed962f 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_orc.png and b/src/main/resources/assets/lotr/textures/items/war_dart_orc.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_dart_uruk.png b/src/main/resources/assets/lotr/textures/items/war_dart_uruk.png index 675b96a..8148798 100644 Binary files a/src/main/resources/assets/lotr/textures/items/war_dart_uruk.png and b/src/main/resources/assets/lotr/textures/items/war_dart_uruk.png differ diff --git a/src/main/resources/assets/lotr/textures/items/war_red_dwarven.png b/src/main/resources/assets/lotr/textures/items/war_red_dwarven.png new file mode 100644 index 0000000..7ee04b7 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/war_red_dwarven.png differ