shinare
/
CinderLoE
2
0
Fork 0
Code

Added Sunlit Warden and Orthanc Guard armor sets

Browse Source
main
Shinare 4 months ago
parent 9541283dae
commit 70a2444c9a
29 changed files with 265 additions and 38 deletions
Show Stats Download Patch File Download Diff File

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

@ -129,6 +129,8 @@ public class CinderLoE {
public static LOTRMaterial MATERIAL_JADE;
public static LOTRMaterial MATERIAL_GILDEDGALVORN;
public static LOTRMaterial MATERIAL_ARTIFACT;
public static LOTRMaterial MATERIAL_SUNLIT_WARDEN;
public static LOTRMaterial MATERIAL_ORTHANC_GUARD;
// Blocks
// public static Block barricade;
public static Block cinderBlock;
@ -226,7 +228,6 @@ public class CinderLoE {
public static Item forgingKit;
public static Item fieldRepairKit;
public static Item cinderFurItem;
public static Item effigyOfWrath;
// Common tools/weapons
public static Item whip;
@ -260,6 +261,10 @@ public class CinderLoE {
public static Item bodyDorwinionElite;
public static Item legsDorwinionElite;
public static Item bootsDorwinionElite;
public static Item helmetOrthancGuard;
public static Item bodyOrthancGuard;
public static Item legsOrthancGuard;
public static Item bootsOrthancGuard;
// public static Item bowserpent;
//public static Item swordUsurper;
@ -336,6 +341,15 @@ public class CinderLoE {
public static Item sarumanWhiteStaff;
public static Item mouthofsauronSword;
// Dungeons
public static Item effigyOfWrath;
public static Item greatswordLight;
public static Item helmetSunlitWarden;
public static Item bodySunlitWarden;
public static Item legsSunlitWarden;
public static Item bootsSunlitWarden;
// Relics
public static Item welfRelic;
public static Item ulukai;
@ -354,19 +368,19 @@ public class CinderLoE {
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
CinderLoE_Config.init(event);
Materials.registerMaterials();
registerBlocks();
registerItems();
ItemRegistration.registerItems();
PacketRegistration.register();
registerEntities();
modEventHandler = new CinderEventHandler();
LoEPotions.registerPotions();
CarriageRoadRegistry.init();
}
@Mod.EventHandler
public void init(FMLInitializationEvent event) {
Materials.registerMaterials();
registerBlocks();
registerItems();
ItemRegistration.registerItems();
registerEntities();
modEventHandler = new CinderEventHandler();
CommonProxy proxy = event.getSide() == Side.CLIENT ? new ClientProxy() : new ServerProxy();
proxy.setup();
if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
@ -684,7 +698,10 @@ public class CinderLoE {
* ID 6900-6999
* Food and crops
*
* ID 7000-7199
* ID 7000-7099
* Dungeon items
*
* ID 7100-7199
* Unassigned
*
* ID 7200-7299
@ -693,7 +710,7 @@ public class CinderLoE {
// ==Admin Tools==
unitLevelTool = (new unitLevelTool()).setUnlocalizedName("lotr:unitLevelTool").setTextureName("stick");
ItemRegistration.register(unitLevelTool, "unitLevelTool", 7000);
ItemRegistration.register(unitLevelTool, "unitLevelTool", 7000); // WHY 7000????
// ==Food Items==
@ -758,10 +775,10 @@ public class CinderLoE {
linkLOTRWeapon(welfRelic, "welfRelic");
//Great swords idk where to put them
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");
greatswordAngmar = (new LoEGreatSword(LOTRMaterial.ANGMAR, LOTRMod.orcSteel)).addWeaponDamage(1.0f).setUnlocalizedName("lotr:greatswordAngmar").setTextureName("lotr:greatswordAngmar");
greatswordLindon = new LoEGreatSword(LOTRMaterial.HIGH_ELVEN, LOTRMod.elfSteel).addWeaponDamage(1.0f).setIsElvenBlade().setUnlocalizedName("lotr:greatswordLindon").setTextureName("lotr:greatswordLindon");
greatswordDale = (new LoEGreatSword(LOTRMaterial.DALE, Items.iron_ingot)).addWeaponDamage(1.0f).setUnlocalizedName("lotr:greatswordDale").setTextureName("lotr:greatswordDale");
greatswordNumenor = (new LoEGreatSword(LOTRMaterial.BLACK_NUMENOREAN, Items.iron_ingot)).addWeaponDamage(1.0f).setUnlocalizedName("lotr:greatswordNumenor").setTextureName("lotr:greatswordNumenor");
ItemRegistration.register(greatswordAngmar,"greatswordAngmar",6707);
ItemRegistration.register(greatswordLindon,"greatswordLindon",6708);
@ -798,12 +815,10 @@ public class CinderLoE {
forgingKit = (new ForgingKit());
fieldRepairKit = new FieldRepairKit().setUnlocalizedName("lotr:field_repair_kit").setTextureName("lotr:field_repair_kit");
effigyOfWrath = new LOTRItemEnchantment(LOTREnchantment.getEnchantmentByName("wrath")).setUnlocalizedName("lotr:effigy_of_wrath").setTextureName("lotr:effigy_of_wrath");
ItemRegistration.register(frostblade, "frostblade", 6200);
ItemRegistration.register(forgingKit,"forgingKit",6001);
ItemRegistration.register(fieldRepairKit,"fieldRepairKit",6002);
ItemRegistration.register(effigyOfWrath,"effigyOfWrath",6005);
ItemRegistration.register(whip, "whip", 6110);
ItemRegistration.register(daggervoid, "daggerVoid", 6201);
ItemRegistration.register(spearsolidgold, "spearsolidgold", 6202);
@ -996,10 +1011,10 @@ public class CinderLoE {
MATERIAL_SERPENT = getLOTRMaterialByName("SERPENT");
if (MATERIAL_SERPENT != null) {
helmetserpent = (new LoEArmor(MATERIAL_SERPENT, 0, LOTRMod.bronze)).setUnlocalizedName("lotr:helmetserpent").setTextureName("lotr:helmetserpent").setCreativeTab(null);
bodyserpent = (new LoEArmor(MATERIAL_SERPENT, 1, "chestplate", LOTRMod.bronze)).setUnlocalizedName("lotr:bodyserpent").setTextureName("lotr:bodyserpent").setCreativeTab(null);
legsserpent = (new LoEArmor(MATERIAL_SERPENT, 2, LOTRMod.bronze)).setUnlocalizedName("lotr:legsserpent").setTextureName("lotr:legsserpent").setCreativeTab(null);
bootsserpent = (new LoEArmor(MATERIAL_SERPENT, 3, LOTRMod.bronze)).setUnlocalizedName("lotr:bootsserpent").setTextureName("lotr:bootsserpent").setCreativeTab(null);
helmetserpent = (new LoEArmor(MATERIAL_SERPENT, 0, LOTRMod.bronze)).setUnlocalizedName("lotr:helmetserpent").setTextureName("lotr:helmetserpent");
bodyserpent = (new LoEArmor(MATERIAL_SERPENT, 1, "chestplate", LOTRMod.bronze)).setUnlocalizedName("lotr:bodyserpent").setTextureName("lotr:bodyserpent");
legsserpent = (new LoEArmor(MATERIAL_SERPENT, 2, LOTRMod.bronze)).setUnlocalizedName("lotr:legsserpent").setTextureName("lotr:legsserpent");
bootsserpent = (new LoEArmor(MATERIAL_SERPENT, 3, LOTRMod.bronze)).setUnlocalizedName("lotr:bootsserpent").setTextureName("lotr:bootsserpent");
ItemRegistration.register(helmetserpent, "helmetserpent", 6800);
ItemRegistration.register(bodyserpent, "bodyserpent", 6801);
@ -1010,10 +1025,10 @@ public class CinderLoE {
}
MATERIAL_USURPER = getLOTRMaterialByName("USURPER");
if (MATERIAL_USURPER != null) {
helmetUsurper = (new LoEArmor(MATERIAL_USURPER, 0, "helmet", Items.iron_ingot)).setUnlocalizedName("lotr:helmetUsurper").setTextureName("lotr:helmetUsurper").setCreativeTab(null);
bodyUsurper = (new LoEArmor(MATERIAL_USURPER, 1, Items.iron_ingot)).setUnlocalizedName("lotr:bodyUsurper").setTextureName("lotr:bodyUsurper").setCreativeTab(null);
legsUsurper = (new LoEArmor(MATERIAL_USURPER, 2, Items.iron_ingot)).setUnlocalizedName("lotr:legsUsurper").setTextureName("lotr:legsUsurper").setCreativeTab(null);
bootsUsurper = (new LoEArmor(MATERIAL_USURPER, 3, Items.iron_ingot)).setUnlocalizedName("lotr:bootsUsurper").setTextureName("lotr:bootsUsurper").setCreativeTab(null);
helmetUsurper = (new LoEArmor(MATERIAL_USURPER, 0, "helmet", Items.iron_ingot)).setUnlocalizedName("lotr:helmetUsurper").setTextureName("lotr:helmetUsurper");
bodyUsurper = (new LoEArmor(MATERIAL_USURPER, 1, Items.iron_ingot)).setUnlocalizedName("lotr:bodyUsurper").setTextureName("lotr:bodyUsurper");
legsUsurper = (new LoEArmor(MATERIAL_USURPER, 2, Items.iron_ingot)).setUnlocalizedName("lotr:legsUsurper").setTextureName("lotr:legsUsurper");
bootsUsurper = (new LoEArmor(MATERIAL_USURPER, 3, Items.iron_ingot)).setUnlocalizedName("lotr:bootsUsurper").setTextureName("lotr:bootsUsurper");
ItemRegistration.register(helmetUsurper, "helmetUsurper", 6804);
@ -1044,10 +1059,10 @@ public class CinderLoE {
MATERIAL_GILDEDGALVORN = getLOTRMaterialByName("GILDEDGALVORN");
if (MATERIAL_GILDEDGALVORN != null) {
helmetGildedGalvorn = (new LoEArmor(MATERIAL_GILDEDGALVORN, 0, "helmet", LOTRMod.galvorn)).setUnlocalizedName("lotr:helmetGildedGalvorn").setTextureName("lotr:helmetGildedGalvorn").setCreativeTab(null);
bodyGildedGalvorn = (new LoEArmor(MATERIAL_GILDEDGALVORN, 1, LOTRMod.galvorn)).setUnlocalizedName("lotr:bodyGildedGalvorn").setTextureName("lotr:bodyGildedGalvorn").setCreativeTab(null);
legsGildedGalvorn = (new LoEArmor(MATERIAL_GILDEDGALVORN, 2, LOTRMod.galvorn)).setUnlocalizedName("lotr:legsGildedGalvorn").setTextureName("lotr:legsGildedGalvorn").setCreativeTab(null);
bootsGildedGalvorn = (new LoEArmor(MATERIAL_GILDEDGALVORN, 3, LOTRMod.galvorn)).setUnlocalizedName("lotr:bootsGildedGalvorn").setTextureName("lotr:bootsGildedGalvorn").setCreativeTab(null);
helmetGildedGalvorn = (new LoEArmor(MATERIAL_GILDEDGALVORN, 0, "helmet", LOTRMod.galvorn)).setUnlocalizedName("lotr:helmetGildedGalvorn").setTextureName("lotr:helmetGildedGalvorn");
bodyGildedGalvorn = (new LoEArmor(MATERIAL_GILDEDGALVORN, 1, LOTRMod.galvorn)).setUnlocalizedName("lotr:bodyGildedGalvorn").setTextureName("lotr:bodyGildedGalvorn");
legsGildedGalvorn = (new LoEArmor(MATERIAL_GILDEDGALVORN, 2, LOTRMod.galvorn)).setUnlocalizedName("lotr:legsGildedGalvorn").setTextureName("lotr:legsGildedGalvorn");
bootsGildedGalvorn = (new LoEArmor(MATERIAL_GILDEDGALVORN, 3, LOTRMod.galvorn)).setUnlocalizedName("lotr:bootsGildedGalvorn").setTextureName("lotr:bootsGildedGalvorn");
ItemRegistration.register(helmetGildedGalvorn, "helmetGildedGalvorn", 6813);
ItemRegistration.register(bodyGildedGalvorn, "bodyGildedGalvorn", 6814);
@ -1059,10 +1074,10 @@ public class CinderLoE {
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);
bodyEsgaroth = (new LoEArmor(MATERIAL_ESGAROTH, 1, Items.iron_ingot)).setUnlocalizedName("lotr:bodyEsgaroth").setTextureName("lotr:bodyEsgaroth").setCreativeTab(null);
legsEsgaroth = (new LoEArmor(MATERIAL_ESGAROTH, 2, Items.iron_ingot)).setUnlocalizedName("lotr:legsEsgaroth").setTextureName("lotr:legsEsgaroth").setCreativeTab(null);
bootsEsgaroth = (new LoEArmor(MATERIAL_ESGAROTH, 3, Items.iron_ingot)).setUnlocalizedName("lotr:bootsEsgaroth").setTextureName("lotr:bootsEsgaroth").setCreativeTab(null);
helmetEsgaroth = (new LoEArmor(MATERIAL_ESGAROTH, 0, "helmet", Items.iron_ingot)).setUnlocalizedName("lotr:helmetEsgaroth").setTextureName("lotr:helmetEsgaroth");
bodyEsgaroth = (new LoEArmor(MATERIAL_ESGAROTH, 1, Items.iron_ingot)).setUnlocalizedName("lotr:bodyEsgaroth").setTextureName("lotr:bodyEsgaroth");
legsEsgaroth = (new LoEArmor(MATERIAL_ESGAROTH, 2, Items.iron_ingot)).setUnlocalizedName("lotr:legsEsgaroth").setTextureName("lotr:legsEsgaroth");
bootsEsgaroth = (new LoEArmor(MATERIAL_ESGAROTH, 3, Items.iron_ingot)).setUnlocalizedName("lotr:bootsEsgaroth").setTextureName("lotr:bootsEsgaroth");
ItemRegistration.register(helmetEsgaroth, "helmetEsgaroth", 6817);
@ -1125,6 +1140,47 @@ public class CinderLoE {
System.err.println("Failed to find ARNOR material for armor initialization.");
}
linkLOTRWeapon(maceArnor, "maceArnor");
// Sunlit Warden
MATERIAL_ORTHANC_GUARD = getLOTRMaterialByName("ORTHANC_GUARD");
if (MATERIAL_ORTHANC_GUARD != null) {
helmetOrthancGuard = (new LoEArmor(MATERIAL_ORTHANC_GUARD, 0, "helmet", LOTRMod.urukSteel)).setUnlocalizedName("lotr:helmetOrthancGuard").setTextureName("lotr:helmetOrthancGuard");
bodyOrthancGuard = (new LoEArmor(MATERIAL_ORTHANC_GUARD, 1, LOTRMod.urukSteel)).setUnlocalizedName("lotr:bodyOrthancGuard").setTextureName("lotr:bodyOrthancGuard");
legsOrthancGuard = (new LoEArmor(MATERIAL_ORTHANC_GUARD, 2, LOTRMod.urukSteel)).setUnlocalizedName("lotr:legsOrthancGuard").setTextureName("lotr:legsOrthancGuard");
bootsOrthancGuard = (new LoEArmor(MATERIAL_ORTHANC_GUARD, 3, LOTRMod.urukSteel)).setUnlocalizedName("lotr:bootsOrthancGuard").setTextureName("lotr:bootsOrthancGuard");
ItemRegistration.register(helmetOrthancGuard, "helmetOrthancGuard", 6465);
ItemRegistration.register(bodyOrthancGuard, "bodyOrthancGuard", 6466);
ItemRegistration.register(legsOrthancGuard, "legsOrthancGuard", 6467);
ItemRegistration.register(bootsOrthancGuard, "bootsOrthancGuard", 6468);
} else {
System.err.println("Failed to find ORTHANC_GUARD material for armor initialization.");
}
/**
* Dungeon equipment
*/
// Sunlit Warden
MATERIAL_SUNLIT_WARDEN = getLOTRMaterialByName("SUNLIT_WARDEN");
if (MATERIAL_SUNLIT_WARDEN != null) {
helmetSunlitWarden = (new LoEArmor(MATERIAL_SUNLIT_WARDEN, 0, "helmet", LOTRMod.elfSteel)).setUnlocalizedName("lotr:helmetSunlitWarden").setTextureName("lotr:helmetSunlitWarden");
bodySunlitWarden = (new LoEArmor(MATERIAL_SUNLIT_WARDEN, 1, LOTRMod.elfSteel)).setUnlocalizedName("lotr:bodySunlitWarden").setTextureName("lotr:bodySunlitWarden");
legsSunlitWarden = (new LoEArmor(MATERIAL_SUNLIT_WARDEN, 2, LOTRMod.elfSteel)).setUnlocalizedName("lotr:legsSunlitWarden").setTextureName("lotr:legsSunlitWarden");
bootsSunlitWarden = (new LoEArmor(MATERIAL_SUNLIT_WARDEN, 3, LOTRMod.elfSteel)).setUnlocalizedName("lotr:bootsSunlitWarden").setTextureName("lotr:bootsSunlitWarden");
greatswordLight = (new LoEGreatSword(MATERIAL_SUNLIT_WARDEN, (Item)LOTRMod.mithril)).addWeaponDamage(1.0f).setIsElvenBlade().setUnlocalizedName("lotr:greatswordLight").setTextureName("lotr:greatswordLight");
effigyOfWrath = new LOTRItemEnchantment(LOTREnchantment.getEnchantmentByName("wrath")).setUnlocalizedName("lotr:effigy_of_wrath").setTextureName("lotr:effigy_of_wrath").setCreativeTab(LoECreativeTabs.tabMiscLoE);;
ItemRegistration.register(helmetSunlitWarden, "helmetSunlitWarden", 7001);
ItemRegistration.register(bodySunlitWarden, "bodySunlitWarden", 7002);
ItemRegistration.register(legsSunlitWarden, "legsSunlitWarden", 7003);
ItemRegistration.register(bootsSunlitWarden, "bootsSunlitWarden", 7004);
ItemRegistration.register(greatswordLight, "greatswordLight", 7005);
ItemRegistration.register(effigyOfWrath,"effigyOfWrath",7006);
} else {
System.err.println("Failed to find SUNLIT_WARDEN material for armor initialization.");
}
linkLOTRWeapon(greatswordLight, "greatswordLight");
}
public static ModContainer getModContainer() {

2
src/main/java/com/zivilon/cinder_loe/Materials.java
Unescape Escape View File

@ -29,6 +29,8 @@ public class Materials {
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);
modifyMaterial("ARTIFACT",2000, 0.0F, 0.8F, 2, 7.0F, 15, LOTRMod.galvorn);
modifyMaterial("SUNLIT_WARDEN",1500, 5.0F, 0.7F, 2, 7.0F, 15, LOTRMod.mithril);
modifyMaterial("ORTHANC_GUARD",700, 2.0F, 0.7F, 2, 6.0F, 10, LOTRMod.urukSteel);
}
public static void modifyMaterial(String fieldName, int uses, float weapon_damage, float protection, int harvest_level, float speed, int enchantability, Item crafting_item) {

67
src/main/java/com/zivilon/cinder_loe/client/model/ModelHelmetSunlitWarden.java
Unescape Escape View File

@ -0,0 +1,67 @@
package com.zivilon.cinder_loe.client.model;
import lotr.client.model.LOTRModelBiped;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
// Made with Blockbench 4.12.5
// Exported for Minecraft version 1.7 - 1.12
// Paste this class into your mod and generate all required imports
public class ModelHelmetSunlitWarden extends LOTRModelBiped {
public ModelRenderer bb_main;
public ModelRenderer Crest_r1;
public ModelRenderer PlumeHolder_r1;
public ModelRenderer PlumeTopper_r1;
public ModelHelmetSunlitWarden(float f) {
super(f);
textureWidth = 64;
textureHeight = 64;
bb_main = new ModelRenderer(this);
bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
bb_main.cubeList.add(new ModelBox(bb_main, 32, 15, -4.0F, -32.0F, -4.0F, 8, 8, 8, 1.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 18, 43, -6.0F, -30.3F, -6.0F, 12, 1, 4, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 44, 0, -1.0F, -33.1F, -5.1F, 2, 4, 8, 0.0F));
Crest_r1 = new ModelRenderer(this);
Crest_r1.setRotationPoint(-1.0F, -30.0F, -7.0F);
bb_main.addChild(Crest_r1);
setRotationAngle(Crest_r1, -0.3491F, 0.0F, 0.0F);
Crest_r1.cubeList.add(new ModelBox(Crest_r1, 0, 24, 1.0F, -15.5F, -1.25F, 0, 16, 24, 0.0F));
PlumeHolder_r1 = new ModelRenderer(this);
PlumeHolder_r1.setRotationPoint(0.0F, -33.5F, 1.0F);
bb_main.addChild(PlumeHolder_r1);
setRotationAngle(PlumeHolder_r1, -0.2182F, 0.0F, 0.0F);
PlumeHolder_r1.cubeList.add(new ModelBox(PlumeHolder_r1, 0, 32, -1.0F, -1.0F, -1.0F, 2, 2, 4, 0.0F));
PlumeTopper_r1 = new ModelRenderer(this);
PlumeTopper_r1.setRotationPoint(-3.0F, -35.5F, -0.5F);
bb_main.addChild(PlumeTopper_r1);
setRotationAngle(PlumeTopper_r1, -0.3491F, 0.0F, 0.0F);
PlumeTopper_r1.cubeList.add(new ModelBox(PlumeTopper_r1, 40, 31, 1.5F, -1.0F, -1.5F, 3, 2, 9, 0.0F));
this.bipedHeadwear.cubeList.clear();
this.bipedBody.cubeList.clear();
this.bipedRightArm.cubeList.clear();
this.bipedLeftArm.cubeList.clear();
this.bipedRightLeg.cubeList.clear();
this.bipedLeftLeg.cubeList.clear();
this.bipedHead.addChild(this.bb_main);
}
@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;
}
}

70
src/main/java/com/zivilon/cinder_loe/client/model/OrthancGuardHelmet.java
Unescape Escape View File

@ -0,0 +1,70 @@
package com.zivilon.cinder_loe.client.model;
import lotr.client.model.LOTRModelBiped;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class OrthancGuardHelmet extends LOTRModelBiped {
private final ModelRenderer bb_main;
private final ModelRenderer Topper;
private final ModelRenderer Plume;
private final ModelRenderer HelmetAddons;
private final ModelRenderer RightGuard_r1;
public OrthancGuardHelmet(float f) {
super (f);
textureWidth = 64;
textureHeight = 64;
bb_main = new ModelRenderer(this);
bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -4.0F, -32.0F, -4.0F, 8, 8, 8, 1.0F));
Topper = new ModelRenderer(this);
Topper.setRotationPoint(0.0F, 0.0F, 0.0F);
bb_main.addChild(Topper);
Topper.cubeList.add(new ModelBox(Topper, 0, 58, -1.5F, -36.25F, -1.5F, 3, 2, 3, 0.1F));
Topper.cubeList.add(new ModelBox(Topper, 0, 48, -3.5F, -34.0F, -3.5F, 7, 2, 7, 0.5F));
Plume = new ModelRenderer(this);
Plume.setRotationPoint(0.0F, 0.0F, 0.0F);
bb_main.addChild(Plume);
Plume.cubeList.add(new ModelBox(Plume, 31, 33, -8.0F, -40.9F, 0.25F, 16, 9, 0, 0.25F));
Plume.cubeList.add(new ModelBox(Plume, 31, 52, -8.0F, -40.9F, -0.5F, 16, 9, 0, 0.25F));
HelmetAddons = new ModelRenderer(this);
HelmetAddons.setRotationPoint(0.0F, 0.0F, 0.0F);
bb_main.addChild(HelmetAddons);
HelmetAddons.cubeList.add(new ModelBox(HelmetAddons, -7, 32, -6.5F, -25.5F, 1.0F, 13, 0, 8, 0.0F));
HelmetAddons.cubeList.add(new ModelBox(HelmetAddons, 36, 26, -5.0F, -28.8F, 4.3F, 10, 3, 1, 0.4F));
HelmetAddons.cubeList.add(new ModelBox(HelmetAddons, 7, 17, 4.0F, -31.0F, -4.7F, 1, 5, 10, 0.4F));
RightGuard_r1 = new ModelRenderer(this);
RightGuard_r1.setRotationPoint(-4.0F, -28.46F, 0.8F);
HelmetAddons.addChild(RightGuard_r1);
setRotationAngle(RightGuard_r1, 0.0F, 1.5708F, 0.0F);
RightGuard_r1.cubeList.add(new ModelBox(RightGuard_r1, 42, 9, -4.5F, -2.5F, -0.99F, 10, 5, 1, 0.4F));
this.bipedHead.addChild(bb_main);
this.bipedHead.cubeList.clear();
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) {
this.bipedHead.render(f5);
}
public void setRotationAngle(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/coremod/LOTRMaterialTransformer.java
Unescape Escape View File

@ -72,7 +72,8 @@ public class LOTRMaterialTransformer implements IClassTransformer {
addMaterial("JADE",classNode);
addMaterial("GILDEDGALVORN",classNode);
addMaterial("ARTIFACT",classNode);
addMaterial("SUNLIT_WARDEN",classNode);
addMaterial("ORTHANC_GUARD",classNode);
// Protection Conversion

3
src/main/java/com/zivilon/cinder_loe/coremod/LOTRWeaponLinker.java
Unescape Escape View File

@ -26,7 +26,8 @@ public class LOTRWeaponLinker implements IClassTransformer {
"swordBree", "greatswordAngmar", "greatswordLindon", "greatswordDale", "greatswordNumenor",
"maceArnor",
"daggerAsh","bowAsh","hammerAsh","pikeAsh","battleaxeAsh","swordAsh","spearAsh", "staffAsh", "cleaver",
"bowLurtz");
"bowLurtz",
"greatswordLight");
}
return basicClass;
}

8
src/main/java/com/zivilon/cinder_loe/items/LoEGreatSword.java
Unescape Escape View File

@ -8,6 +8,7 @@ import lotr.common.item.LOTRWeaponStats;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.EnumAction;
public class LoEGreatSword extends LOTRItemSword {
public Item repair_item;
@ -31,11 +32,16 @@ public class LoEGreatSword extends LOTRItemSword {
@Override
public boolean getIsRepairable(ItemStack item, ItemStack repair_material) {
if (repair_material.getItem() == repair_item)
if (repair_material.getItem() == repair_item) {
return true;
}
return false;
}
public EnumAction getItemUseAction(ItemStack itemstack) {
return EnumAction.none;
}
static {
LOTRWeaponStats.registerMeleeSpeed(LoEGreatSword.class, 0.83f);
LOTRWeaponStats.registerMeleeReach(LoEGreatSword.class, 1.15f);

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

@ -110,6 +110,8 @@ public class MixinLOTRArmorModels {
map.put(LOTRMod.ceramicPlate, new LOTRModelHeadPlate());
map.put(CinderLoE.helmetDorwinionElite, new ModelDorwinionHelmet(1.0f));
map.put(CinderLoE.bodyDorwinionElite, new ModelBodyDorwinionElite(1.0f));
map.put(CinderLoE.helmetSunlitWarden, new ModelHelmetSunlitWarden(1.0f));
map.put(CinderLoE.helmetOrthancGuard, new OrthancGuardHelmet(1.0f));
for (ModelBiped armorModel : map.values())
copyModelRotations(armorModel, key);
this.specialArmorModels.put(key, map);

7
src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRContainerAnvil.java
Unescape Escape View File

@ -130,6 +130,8 @@ public abstract class MixinLOTRContainerAnvil {
return (materialItem.getItem() == LOTRMod.bronze);
if (material == CinderLoE.MATERIAL_ESGAROTH.toToolMaterial())
return (materialItem.getItem() == Items.iron_ingot);
if (material == CinderLoE.MATERIAL_SUNLIT_WARDEN.toToolMaterial())
return (materialItem.getItem() == LOTRMod.mithril);
if (item instanceof ItemArmor armor) {
ItemArmor.ArmorMaterial armorMaterial = armor.getArmorMaterial();
if (armorMaterial == LOTRMaterial.BONE.toArmorMaterial())
@ -158,7 +160,10 @@ public abstract class MixinLOTRContainerAnvil {
return (materialItem.getItem() == LOTRMod.galvorn);
if (armorMaterial == CinderLoE.MATERIAL_ESGAROTH.toArmorMaterial())
return (materialItem.getItem() == Items.iron_ingot);
if (armorMaterial == CinderLoE.MATERIAL_SUNLIT_WARDEN.toArmorMaterial())
return (materialItem.getItem() == LOTRMod.elfSteel);
if (armorMaterial == CinderLoE.MATERIAL_DORWINIONELITE.toArmorMaterial())
return (materialItem.getItem() == LOTRMod.elfSteel);
}
return false;

23
src/main/resources/assets/cinder_loe/lang/en_US.lang
Unescape Escape View File

@ -58,7 +58,6 @@ item.cinder_fur_item_3.name=Obsidian Warg Fur
item.cinder_fur_item_4.name=Black Bear Fur
item.cinder_fur_item_5.name=Brown Bear Fur
item.cinder_fur_item_6.name=Lioness Fur
item.lotr:effigy_of_wrath.name=Effigy of Wrath
item.lotr:helmetJade.name=Jade Helmet
item.lotr:bodyJade.name=Jade Chestplate
@ -182,6 +181,18 @@ item.lotr:bodyDorwinionElite.name=Bladorthin Champion Chestplate
item.lotr:legsDorwinionElite.name=Bladorthin Champion Leggings
item.lotr:bootsDorwinionElite.name=Bladorthin Champion Boots
item.lotr:helmetOrthancGuard.name=Orthanc Guard Helmet
item.lotr:bodyOrthancGuard.name=Orthanc Guard Chestplate
item.lotr:legsOrthancGuard.name=Orthanc Guard Leggings
item.lotr:bootsOrthancGuard.name=Orthanc Guard Boots
item.lotr:helmetSunlitWarden.name=Sunlit Warden Helmet
item.lotr:bodySunlitWarden.name=Sunlit Warden Chestplate
item.lotr:legsSunlitWarden.name=Sunlit Warden Leggings
item.lotr:bootsSunlitWarden.name=Sunlit Warden Boots
item.lotr:greatswordLight.name=Greatsword of Light
item.lotr:effigy_of_wrath.name=Effigy of Wrath
item.lotr:ingotAsh.name=Ashen Ingot
item.lotr:swordAsh.name=Ash-Forged Sword
item.lotr:staffAsh.name=Ash-Forged Bardiche
@ -460,7 +471,6 @@ item.curing_salts.name=Curing Salts
item.underroot.name=Underroot
item.miners_lichen.name=Miner’s Lichen
potion.overdose=Overdose
#Achievements
@ -480,7 +490,14 @@ lotr.achievement.spiceDwarfBrew.desc=Drink a brew infused with Stonegrit.
lotr.achievement.Overdose.title=I don't feel so good...
lotr.achievement.Overdose.desc=Overdose on concentrated brews.
#Creative tabs
cinder_loe.creativetab.tabCombatLoE=LoE Combat
cinder_loe.creativetab.tabMiscLoE=LoE Miscellaneous
cinder_loe.creativetab.tabBlockLoE=LoE Blocks
cinder_loe.creativetab.tabSpawnLoE=LoE Spawning
cinder_loe.creativetab.tabFoodLoE=LoE Food
cinder_loe.creativetab.tabDecoLoE=LoE Decoration
cinder_loe.creativetab.tabCharacterLoE=LoE Character
#Biomes
lotr.biome.mistyForest.name=Misty Forest

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 987 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 708 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 411 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 356 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 345 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 338 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 248 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 504 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 379 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 301 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 727 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 695 B

0
src/main/resources/assets/lotr/textures/items/large/spearUnnamed.png → src/main/resources/assets/lotr/textures/items/large2/spearUnnamed.png
Unescape Escape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

0
src/main/resources/assets/lotr/textures/items/large/spearUnnamed.png.mcmeta → src/main/resources/assets/lotr/textures/items/large2/spearUnnamed.png.mcmeta
Unescape Escape View File

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 322 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 269 B

Write Preview
Loading…
Cancel
Save