diff --git a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java index 5e14d89..3ad96ea 100644 --- a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java +++ b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java @@ -127,6 +127,7 @@ public class CinderLoE { public static LOTRMaterial MATERIAL_USURPER; public static LOTRMaterial MATERIAL_WARLORD; public static LOTRMaterial MATERIAL_ESGAROTH; + public static LOTRMaterial MATERIAL_DORWINIONELITE; public static LOTRMaterial MATERIAL_JADE; public static LOTRMaterial MATERIAL_GILDEDGALVORN; public static LOTRMaterial MATERIAL_ARTIFACT; @@ -256,6 +257,10 @@ public class CinderLoE { public static Item bodyEsgaroth; public static Item legsEsgaroth; public static Item bootsEsgaroth; + public static Item helmetDorwinionElite; + public static Item bodyDorwinionElite; + public static Item legsDorwinionElite; + public static Item bootsDorwinionElite; // public static Item bowserpent; //public static Item swordUsurper; @@ -748,10 +753,10 @@ public class CinderLoE { linkLOTRWeapon(welfRelic, "welfRelic"); //Great swords idk where to put them - greatswordAngmar = (new LoEGreatSword(LOTRMaterial.ANGMAR)).setUnlocalizedName("lotr:greatswordAngmar").setTextureName("lotr:greatswordAngmar"); - greatswordLindon = new LoEGreatSword(LOTRMaterial.HIGH_ELVEN).setIsElvenBlade().setUnlocalizedName("lotr:greatswordLindon").setTextureName("lotr:greatswordLindon"); - greatswordDale = (new LoEGreatSword(LOTRMaterial.DALE)).setUnlocalizedName("lotr:greatswordDale").setTextureName("lotr:greatswordDale"); - greatswordNumenor = (new LoEGreatSword(LOTRMaterial.BLACK_NUMENOREAN)).setUnlocalizedName("lotr:greatswordNumenor").setTextureName("lotr:greatswordNumenor"); + greatswordAngmar = (new LoEGreatSword(LOTRMaterial.ANGMAR)).addWeaponDamage(1.0f).setUnlocalizedName("lotr:greatswordAngmar").setTextureName("lotr:greatswordAngmar"); + greatswordLindon = new LoEGreatSword(LOTRMaterial.HIGH_ELVEN).addWeaponDamage(1.0f).setIsElvenBlade().setUnlocalizedName("lotr:greatswordLindon").setTextureName("lotr:greatswordLindon"); + greatswordDale = (new LoEGreatSword(LOTRMaterial.DALE)).addWeaponDamage(1.0f).setUnlocalizedName("lotr:greatswordDale").setTextureName("lotr:greatswordDale"); + greatswordNumenor = (new LoEGreatSword(LOTRMaterial.BLACK_NUMENOREAN)).addWeaponDamage(1.0f).setUnlocalizedName("lotr:greatswordNumenor").setTextureName("lotr:greatswordNumenor"); ItemRegistration.register(greatswordAngmar,"greatswordAngmar",6707); ItemRegistration.register(greatswordLindon,"greatswordLindon",6708); @@ -1044,6 +1049,7 @@ public class CinderLoE { } else { System.err.println("Failed to find WARLORD material for armor initialization."); } + MATERIAL_ESGAROTH = getLOTRMaterialByName("ESGAROTH"); if (MATERIAL_ESGAROTH != null) { helmetEsgaroth = (new LoEArmor(MATERIAL_ESGAROTH, 0, "helmet", Items.iron_ingot)).setUnlocalizedName("lotr:helmetEsgaroth").setTextureName("lotr:helmetEsgaroth").setCreativeTab(null); @@ -1061,6 +1067,23 @@ public class CinderLoE { System.err.println("Failed to find ESGAROTH material for armor initialization."); } + MATERIAL_DORWINIONELITE = getLOTRMaterialByName("DORWINIONELITE"); + if (MATERIAL_DORWINIONELITE != null) { + helmetDorwinionElite = (new LoEArmor(MATERIAL_DORWINIONELITE, 0, "helmet", LOTRMod.elfSteel)).setUnlocalizedName("lotr:helmetDorwinionElite").setTextureName("lotr:helmetDorwinionElite").setCreativeTab(null); + bodyDorwinionElite = (new LoEArmor(MATERIAL_DORWINIONELITE, 1, LOTRMod.elfSteel)).setUnlocalizedName("lotr:bodyDorwinionElite").setTextureName("lotr:bodyDorwinionElite").setCreativeTab(null); + legsDorwinionElite = (new LoEArmor(MATERIAL_DORWINIONELITE, 2, LOTRMod.elfSteel)).setUnlocalizedName("lotr:legsDorwinionElite").setTextureName("lotr:legsDorwinionElite").setCreativeTab(null); + bootsDorwinionElite = (new LoEArmor(MATERIAL_DORWINIONELITE, 3, LOTRMod.elfSteel)).setUnlocalizedName("lotr:bootsDorwinionElite").setTextureName("lotr:bootsDorwinionElite").setCreativeTab(null); + + + ItemRegistration.register(helmetDorwinionElite, "helmetDorwinionElite", 6821); + ItemRegistration.register(bodyDorwinionElite, "bodyDorwinionElite", 6822); + ItemRegistration.register(legsDorwinionElite, "legsDorwinionElite", 6823); + ItemRegistration.register(bootsDorwinionElite, "bootsDorwinionElite", 6824); + + } else { + System.err.println("Failed to find DORWINIONELITE material for armor initialization."); + } + //Rhudaur MATERIAL_RHUDAUR = getLOTRMaterialByName("RHUDAUR"); diff --git a/src/main/java/com/zivilon/cinder_loe/Materials.java b/src/main/java/com/zivilon/cinder_loe/Materials.java index 90cfe93..9c0fcd6 100644 --- a/src/main/java/com/zivilon/cinder_loe/Materials.java +++ b/src/main/java/com/zivilon/cinder_loe/Materials.java @@ -24,6 +24,7 @@ public class Materials { modifyMaterial("SERPENT", 700, 2.0F, 0.6F, 2, 6.0F, 10, LOTRMod.bronze); modifyMaterial("USURPER",700, 2.0F, 0.6F, 2, 6.0F, 10, Items.iron_ingot); modifyMaterial("WARLORD", 700, 2.0F, 0.6F, 2, 6.0F, 10, LOTRMod.bronze); + modifyMaterial("DORWINIONELITE", 700, 2.0F, 0.6F, 2, 6.0F, 10, LOTRMod.elfSteel); modifyMaterial("ESGAROTH",700, 2.0F, 0.6F, 2, 6.0F, 10, Items.iron_ingot); modifyMaterial("JADE",1000, 5.0F, 0.8F, 0, 9.0F, 10, LOTRMod.emerald); modifyMaterial("GILDEDGALVORN",700, 3.0F, 0.6F, 2, 7.0F, 15, LOTRMod.galvorn); diff --git a/src/main/java/com/zivilon/cinder_loe/client/model/ModelBodyJade.java b/src/main/java/com/zivilon/cinder_loe/client/model/ModelBodyJade.java index b03eb42..509fdb7 100644 --- a/src/main/java/com/zivilon/cinder_loe/client/model/ModelBodyJade.java +++ b/src/main/java/com/zivilon/cinder_loe/client/model/ModelBodyJade.java @@ -25,6 +25,7 @@ public class ModelBodyJade extends LOTRModelBiped { this.bipedBody.cubeList.clear(); this.bipedRightArm.cubeList.clear(); this.bipedLeftArm.cubeList.clear(); + this.neck1 = new ModelRenderer(this, 13, 0); this.neck1.setRotationPoint(0.0F, 0.0F, 0.0F); this.neck1.addBox(-3.7F, -2.1F, -3.4F, 3, 3, 1, 0.0F); diff --git a/src/main/java/com/zivilon/cinder_loe/client/model/ModelDorwinionChestplate.java b/src/main/java/com/zivilon/cinder_loe/client/model/ModelDorwinionChestplate.java new file mode 100644 index 0000000..597169f --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/client/model/ModelDorwinionChestplate.java @@ -0,0 +1,112 @@ +package com.zivilon.cinder_loe.client.model;// Made with Blockbench 4.12.4 +// Exported for Minecraft version 1.7 - 1.12 +// Paste this class into your mod and generate all required imports + + +import lotr.client.model.LOTRModelBiped; +import net.minecraft.client.model.ModelBox; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +//====================================================== +//Deprecated +//====================================================== + + +public class ModelDorwinionChestplate extends LOTRModelBiped { +// private final ModelRenderer bipedRightArm_r1; +// private final ModelRenderer BLOODGUARDPAULDRONRIGHTTOPPER_r1; +// private final ModelRenderer BLOODGUARDPAULDRONRIGHT_r1; +// private final ModelRenderer BLOODGUARDPAULDRONLEFT_r1; +// private final ModelRenderer BLOODGUARDPAULDRONLEFTTOPPER_r1; + + public ModelDorwinionChestplate(float f) { + super(f); + textureWidth = 64; + textureHeight = 64; + this.bipedBody.cubeList.clear(); + this.bipedRightArm.cubeList.clear(); + this.bipedLeftArm.cubeList.clear(); + + bipedBody = new ModelRenderer(this); + bipedBody.setRotationPoint(0.0F, 0.0F, 0.0F); + bipedBody.cubeList.add(new ModelBox(bipedBody, 0, 16, -4.0F, 0.0F, -2.0F, 8, 12, 4, 0.5F)); + bipedBody.cubeList.add(new ModelBox(bipedBody, 22, 4, -5.0F, -1.05F, 2.8F, 10, 8, 0, 0.0F)); + bipedBody.cubeList.add(new ModelBox(bipedBody, 32, 4, -5.0F, -1.05F, -2.8F, 10, 8, 0, 0.0F)); + + //bipedLeftArm = new ModelRenderer(this, 40, 16); + bipedLeftArm = new ModelRenderer(this, 24, 16); + this.bipedLeftArm.mirror = true; + this.bipedLeftArm.setRotationPoint(-5.0F, 2.0F, 0.0F); + //bipedLeftArm.cubeList.add(new ModelBox(bipedLeftArm, 24, 16, -9.0F, -24.0F, -2.0F, 4, 12, 4, 0.5F)); + this.bipedLeftArm.addBox(-9.0F, -24.0F, -2.0F, 4, 12, 4, 0.5F); + this.setRotationAngle(bipedLeftArm, 0.0F, 0.0F, 0.026354471705114374F); + + this.bipedRightArm = new ModelRenderer(this, 40, 16); + this.bipedRightArm.setRotationPoint(5.0F, 2.0F, 0.0F); + +// bipedRightArm = new ModelRenderer(this, 40, 16); +// bipedRightArm.setRotationPoint(5.0F, 2.0F, 0.0F); +// bipedRightArm.mirror = true; + +// bipedLeftArm = new ModelRenderer(this,40, 16); +// bipedLeftArm.setRotationPoint(0.0F, 24.0F, 0.0F); +// bipedLeftArm.cubeList.add(new ModelBox(bipedLeftArm, 24, 16, -9.0F, -24.0F, -2.0F, 4, 12, 4, 0.5F)); + +// +// bipedRightArm_r1 = new ModelRenderer(this); +// bipedRightArm_r1.setRotationPoint(-2.0F, 22.0F, 0.0F); +// +// setRotationAngle(bipedRightArm_r1, 0.0F, 3.1416F, 0.0F); +// bipedRightArm_r1.cubeList.add(new ModelBox(bipedRightArm_r1, 24, 16, -6.0F, -24.0F, -2.0F, 4, 12, 4, 0.5F)); +// +// BLOODGUARDPAULDRONRIGHTTOPPER_r1 = new ModelRenderer(this); +// BLOODGUARDPAULDRONRIGHTTOPPER_r1.setRotationPoint(2.0F, -1.0F, 3.0F); +// +// setRotationAngle(BLOODGUARDPAULDRONRIGHTTOPPER_r1, 0.0F, 3.1416F, 0.0873F); +// BLOODGUARDPAULDRONRIGHTTOPPER_r1.cubeList.add(new ModelBox(BLOODGUARDPAULDRONRIGHTTOPPER_r1, 48, 8, 1.6F, -3.9F, -1.0F, 0, 4, 8, 0.0F)); +// +// BLOODGUARDPAULDRONRIGHT_r1 = new ModelRenderer(this); +// BLOODGUARDPAULDRONRIGHT_r1.setRotationPoint(0.0F, 3.0F, 3.0F); +// +// setRotationAngle(BLOODGUARDPAULDRONRIGHT_r1, 0.0F, 3.1416F, 0.0873F); +// BLOODGUARDPAULDRONRIGHT_r1.cubeList.add(new ModelBox(BLOODGUARDPAULDRONRIGHT_r1, 40, 20, -5.0F, -6.0F, 0.0F, 6, 6, 6, 0.0F)); +// +// BLOODGUARDPAULDRONLEFT_r1 = new ModelRenderer(this); +// BLOODGUARDPAULDRONLEFT_r1.setRotationPoint(-5.0F, -19.0F, -3.0F); +// +// setRotationAngle(BLOODGUARDPAULDRONLEFT_r1, 0.0F, 0.0F, -0.0873F); +// BLOODGUARDPAULDRONLEFT_r1.cubeList.add(new ModelBox(BLOODGUARDPAULDRONLEFT_r1, 40, 20, -5.0F, -6.0F, 0.0F, 6, 6, 6, 0.0F)); +// +// BLOODGUARDPAULDRONLEFTTOPPER_r1 = new ModelRenderer(this); +// BLOODGUARDPAULDRONLEFTTOPPER_r1.setRotationPoint(-6.0F, -23.0F, -3.0F); +// +// setRotationAngle(BLOODGUARDPAULDRONLEFTTOPPER_r1, 0.0F, 0.0F, -0.0873F); +// BLOODGUARDPAULDRONLEFTTOPPER_r1.cubeList.add(new ModelBox(BLOODGUARDPAULDRONLEFTTOPPER_r1, 48, 8, 0.6F, -3.9F, -1.0F, 0, 4, 8, 0.0F)); +// +// +// bipedRightArm.addChild(BLOODGUARDPAULDRONRIGHTTOPPER_r1); +// bipedRightArm.addChild(bipedRightArm_r1); +// bipedLeftArm.addChild(BLOODGUARDPAULDRONLEFTTOPPER_r1); +// bipedLeftArm.addChild(BLOODGUARDPAULDRONLEFT_r1); +// bipedRightArm.addChild(BLOODGUARDPAULDRONRIGHT_r1); + + 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) { + bipedBody.render(f5); + bipedRightArm.render(f5); + bipedLeftArm.render(f5); + } + + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} \ No newline at end of file diff --git a/src/main/java/com/zivilon/cinder_loe/client/model/ModelDorwinionHelmet.java b/src/main/java/com/zivilon/cinder_loe/client/model/ModelDorwinionHelmet.java new file mode 100644 index 0000000..f3dec5a --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/client/model/ModelDorwinionHelmet.java @@ -0,0 +1,68 @@ +package com.zivilon.cinder_loe.client.model;// Made with Blockbench 4.12.4 +// Exported for Minecraft version 1.7 - 1.12 +// Paste this class into your mod and generate all required imports + + +import lotr.client.model.LOTRModelBiped; +import net.minecraft.client.model.ModelBox; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelDorwinionHelmet extends LOTRModelBiped { + private final ModelRenderer PlumeItself_r1; + private final ModelRenderer PlumeFrontBit_r1; + private final ModelRenderer PlumeTop_r1; + + public ModelDorwinionHelmet(float f) { + super(f); + textureWidth = 64; + textureHeight = 64; + + PlumeItself_r1 = new ModelRenderer(this); + PlumeItself_r1.setRotationPoint(0.0F, -6.0F, -3.0F); + setRotationAngle(PlumeItself_r1, -0.2182F, 0.0F, 0.0F); + PlumeItself_r1.cubeList.add(new ModelBox(PlumeItself_r1, 0, 16, -0.5F, -11.0F, -3.0F, 1, 10, 12, 0.0F)); + + PlumeFrontBit_r1 = new ModelRenderer(this); + PlumeFrontBit_r1.setRotationPoint(0.0F, -10.0F, -5.0F); + setRotationAngle(PlumeFrontBit_r1, -0.2182F, 0.0F, 0.0F); + PlumeFrontBit_r1.cubeList.add(new ModelBox(PlumeFrontBit_r1, 32, 6, -1.0F, -1.8F, -0.75F, 2, 1, 1, 0.0F)); + + PlumeTop_r1 = new ModelRenderer(this); + PlumeTop_r1.setRotationPoint(-1.0F, -12.658F, 0.4397F); + setRotationAngle(PlumeTop_r1, -0.2182F, 0.0F, 0.0F); + PlumeTop_r1.cubeList.add(new ModelBox(PlumeTop_r1, 26, 16, 0.0F, 1.0F, -5.5F, 2, 1, 11, 0.0F)); + + this.bipedHead.cubeList.clear(); + + bipedHead = new ModelRenderer(this); + bipedHead.setRotationPoint(0.0F, 0.0F, 0.0F); + bipedHead.cubeList.add(new ModelBox(bipedHead, 0, 0, -4.0F, -8.0F, -4.0F, 8, 8, 8, 1.0F)); + bipedHead.cubeList.add(new ModelBox(bipedHead, 32, 0, -5.0F, -4.0F, -4.9F, 10, 7, 0, 0.0F)); + bipedHead.cubeList.add(new ModelBox(bipedHead, 26, 28, -1.0F, -10.0F, -4.5F, 2, 1, 9, 0.0F)); + bipedHead.cubeList.add(new ModelBox(bipedHead, 32, 8, -0.5F, -12.0F, -2.0F, 1, 2, 1, 0.0F)); + + bipedHead.addChild(PlumeItself_r1); + bipedHead.addChild(PlumeFrontBit_r1); + bipedHead.addChild(PlumeTop_r1); + + this.bipedHeadwear.cubeList.clear(); + this.bipedBody.cubeList.clear(); + this.bipedRightArm.cubeList.clear(); + this.bipedLeftArm.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) { + bipedHead.render(f5); + } + + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} \ No newline at end of file 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 13cc2ec..59dc1d7 100644 --- a/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java +++ b/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java @@ -67,6 +67,7 @@ public class LOTRMaterialTransformer implements IClassTransformer { addMaterial("USURPER", classNode); addMaterial("WARLORD",classNode); addMaterial("ESGAROTH",classNode); + addMaterial("DORWINIONELITE",classNode); addMaterial("JADE",classNode); addMaterial("GILDEDGALVORN",classNode); addMaterial("ARTIFACT",classNode); diff --git a/src/main/java/com/zivilon/cinder_loe/items/LoEGreatSword.java b/src/main/java/com/zivilon/cinder_loe/items/LoEGreatSword.java index 2bfd31a..b534944 100644 --- a/src/main/java/com/zivilon/cinder_loe/items/LoEGreatSword.java +++ b/src/main/java/com/zivilon/cinder_loe/items/LoEGreatSword.java @@ -37,7 +37,7 @@ public class LoEGreatSword extends LOTRItemSword { } static { - LOTRWeaponStats.registerMeleeSpeed(LoEGreatSword.class, 0.9f); - LOTRWeaponStats.registerMeleeReach(LoEGreatSword.class, 1.1f); + LOTRWeaponStats.registerMeleeSpeed(LoEGreatSword.class, 0.83f); + LOTRWeaponStats.registerMeleeReach(LoEGreatSword.class, 1.15f); } } 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 d22106e..7fbe925 100644 --- a/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRArmorModels.java +++ b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRArmorModels.java @@ -108,6 +108,7 @@ public class MixinLOTRArmorModels { map.put(LOTRMod.plate, new LOTRModelHeadPlate()); map.put(LOTRMod.woodPlate, new LOTRModelHeadPlate()); map.put(LOTRMod.ceramicPlate, new LOTRModelHeadPlate()); + map.put(CinderLoE.helmetDorwinionElite, new ModelDorwinionHelmet(1.0f)); for (ModelBiped armorModel : map.values()) copyModelRotations(armorModel, key); this.specialArmorModels.put(key, map); diff --git a/src/main/resources/assets/lotr/armor/dorwinionelite_1.png b/src/main/resources/assets/lotr/armor/dorwinionelite_1.png new file mode 100644 index 0000000..4d3756d Binary files /dev/null and b/src/main/resources/assets/lotr/armor/dorwinionelite_1.png differ diff --git a/src/main/resources/assets/lotr/armor/dorwinionelite_2.png b/src/main/resources/assets/lotr/armor/dorwinionelite_2.png new file mode 100644 index 0000000..9fbc95c Binary files /dev/null and b/src/main/resources/assets/lotr/armor/dorwinionelite_2.png differ diff --git a/src/main/resources/assets/lotr/armor/dorwinionelite_chestplate.png b/src/main/resources/assets/lotr/armor/dorwinionelite_chestplate.png new file mode 100644 index 0000000..241e8d1 Binary files /dev/null and b/src/main/resources/assets/lotr/armor/dorwinionelite_chestplate.png differ diff --git a/src/main/resources/assets/lotr/armor/dorwinionelite_helmet.png b/src/main/resources/assets/lotr/armor/dorwinionelite_helmet.png new file mode 100644 index 0000000..bbaa811 Binary files /dev/null and b/src/main/resources/assets/lotr/armor/dorwinionelite_helmet.png differ diff --git a/src/main/resources/assets/lotr/textures/items/bodyDorwinionElite.png b/src/main/resources/assets/lotr/textures/items/bodyDorwinionElite.png new file mode 100644 index 0000000..57905cb Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/bodyDorwinionElite.png differ diff --git a/src/main/resources/assets/lotr/textures/items/bootsDorwinionElite.png b/src/main/resources/assets/lotr/textures/items/bootsDorwinionElite.png new file mode 100644 index 0000000..cd31255 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/bootsDorwinionElite.png differ diff --git a/src/main/resources/assets/lotr/textures/items/helmetDorwinionElite.png b/src/main/resources/assets/lotr/textures/items/helmetDorwinionElite.png new file mode 100644 index 0000000..faea425 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/helmetDorwinionElite.png differ diff --git a/src/main/resources/assets/lotr/textures/items/legsDorwinionElite.png b/src/main/resources/assets/lotr/textures/items/legsDorwinionElite.png new file mode 100644 index 0000000..36a4e52 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/legsDorwinionElite.png differ