shinare
/
CinderLoE
2
0
Fork 0
Code

Compare commits

base: shinare:be285425e0c9628c545d74dfdc904160a3550efc
Branches Tags
shinare:main
shinare:frozen
..
compare: shinare:2b252c05e767150d3ec53b1b284a46070c4a4712
Branches Tags
shinare:main
shinare:frozen

4 Commits
be285425e0 ... 2b252c05e7

Author SHA1 Message Date
Cleric_red 2b252c05e7 Prepping for Cinder 1.2.5 1 year ago
Cleric_red ba39944137 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	src/main/java/com/zivilon/cinder_loe/CinderLoE.java
 1 year ago
Cleric_red bad721e87b Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	src/main/java/com/zivilon/cinder_loe/CinderLoE.java
#	src/main/resources/assets/lotr/textures/items/nimveil_blade.png
#	src/main/resources/assets/lotr/textures/items/war_dart_ancient.png
#	src/main/resources/assets/lotr/textures/items/war_dart_heads_1.png
#	src/main/resources/assets/lotr/textures/items/war_dart_mithril.png
 1 year ago
Cleric_red d3b3fb2722 Prepping for Cinder 1.2.5 1 year ago
23 changed files with 349 additions and 38 deletions
Show Stats

102
src/main/java/com/zivilon/cinder_loe/CinderLoE.java
Unescape Escape View File

@ -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");

17
src/main/java/com/zivilon/cinder_loe/blocks/woodpanel.java
Unescape Escape View File

@ -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");
}
}

93
src/main/java/com/zivilon/cinder_loe/client/model/ModelNexFireChestplate.java
Unescape Escape View File

@ -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;
}
}

84
src/main/java/com/zivilon/cinder_loe/client/model/ModelNexIceChestplate.java
Unescape Escape View File

@ -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;
}
}

88
src/main/java/com/zivilon/cinder_loe/client/model/ModelNexToxinChestplate.java
Unescape Escape View File

@ -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;
}
}

3
src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRArmorModels.java
Unescape Escape View File

@ -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());

BIN
src/main/resources/assets/lotr/armor/nex_fire_1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.4 KiB

BIN
src/main/resources/assets/lotr/armor/nex_fire_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
src/main/resources/assets/lotr/armor/nex_fire_chestplate.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
src/main/resources/assets/lotr/armor/nex_ice_chestplate.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
src/main/resources/assets/lotr/armor/nex_toxin_chestplate.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
src/main/resources/assets/lotr/textures/blocks/woodpanel_bottom.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
src/main/resources/assets/lotr/textures/blocks/woodpanel_side_0.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
src/main/resources/assets/lotr/textures/blocks/woodpanel_side_180.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
src/main/resources/assets/lotr/textures/blocks/woodpanel_side_270.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
src/main/resources/assets/lotr/textures/blocks/woodpanel_side_90.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
src/main/resources/assets/lotr/textures/blocks/woodpanel_top.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
src/main/resources/assets/lotr/textures/items/large/macewarlord.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
src/main/resources/assets/lotr/textures/items/war_dart_ancient.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
src/main/resources/assets/lotr/textures/items/nimveil_blade.png → src/main/resources/assets/lotr/textures/items/war_dart_dwarf.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
src/main/resources/assets/lotr/textures/items/war_dart_heads_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
src/main/resources/assets/lotr/textures/items/war_dart_mithril.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
src/main/resources/assets/lotr/textures/items/war_red_dwarven.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

Write Preview
Loading…
Cancel
Save