shinare
/
CinderLoE
2
0
Fork 0
Code

Utilities + Commented out Frozen Dungeon content

Browse Source
frozen
Shinare 1 year ago
parent 6a8ca57d92
commit c644379b28
18 changed files with 95 additions and 86 deletions
Show Stats Download Patch File Download Diff File

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

@ -143,8 +143,10 @@ public class CinderLoE {
public static Block bronzeChain; public static Block bronzeChain;
public static Block plaster; public static Block plaster;
public static Block voidblock; public static Block voidblock;
public static Block shadowTile;
public static Block entityBarrier; public static Block entityBarrier;
// Frozen Dungeon Blocks
public static Block shadowTile;
public static Block iceCage; public static Block iceCage;
public static Block enchantedIce; public static Block enchantedIce;
public static Block forgingStation; public static Block forgingStation;
@ -363,8 +365,8 @@ public class CinderLoE {
recipes.registerRecipes(); // Register recipes at com.zivilon.cinder_loe.recipes.java recipes.registerRecipes(); // Register recipes at com.zivilon.cinder_loe.recipes.java
setupTradeEntries(); setupTradeEntries();
LOTRWeaponStats.registerMeleeReach(Whip.class, 1.5F); LOTRWeaponStats.registerMeleeReach(Whip.class, 1.5F);
LOTRWeaponStats.registerMeleeReach(Celeiniss.class, 1.8F); /* LOTRWeaponStats.registerMeleeReach(Celeiniss.class, 1.8F);
LOTRWeaponStats.registerMeleeSpeed(Celeiniss.class, 1.0F); LOTRWeaponStats.registerMeleeSpeed(Celeiniss.class, 1.0F);*/
LoECreativeTabs.setupIcons(); LoECreativeTabs.setupIcons();
} }
@ -377,8 +379,8 @@ public class CinderLoE {
public void registerEntities() { // Last ID added: 51 public void registerEntities() { // Last ID added: 51
///GameRegistry.registerTileEntity(TileEntityMistBlock.class, "TileEntityMistBlock"); ///GameRegistry.registerTileEntity(TileEntityMistBlock.class, "TileEntityMistBlock");
GameRegistry.registerTileEntity(TileEntityShadowTile.class, "TileEntityShadowTile"); /* GameRegistry.registerTileEntity(TileEntityShadowTile.class, "TileEntityShadowTile");
GameRegistry.registerTileEntity(TileEntityForgingStation.class, "TileEntityForgingStation"); GameRegistry.registerTileEntity(TileEntityForgingStation.class, "TileEntityForgingStation");*/
///.registerBlock(TileEntityRustedSword, "TileEntityRustedSword"); ///.registerBlock(TileEntityRustedSword, "TileEntityRustedSword");
int entityID = 7320; // Always increment entityID by 1 over the last entity to ensure unique IDs int entityID = 7320; // Always increment entityID by 1 over the last entity to ensure unique IDs
@ -446,13 +448,13 @@ public class CinderLoE {
EntityRegistry.registerModEntity(UtumnoSlaveTrader.class, "UtumnoSlaveTrader", (entityID + 30), this, 64, 1, true); EntityRegistry.registerModEntity(UtumnoSlaveTrader.class, "UtumnoSlaveTrader", (entityID + 30), this, 64, 1, true);
// Frozen Dungeon // Frozen Dungeon
EntityRegistry.registerModEntity(Nex.class, "Nex", (entityID + 45), this, 64, 1, true); /* EntityRegistry.registerModEntity(Nex.class, "Nex", (entityID + 45), this, 64, 1, true);
EntityRegistry.registerModEntity(NexShadow.class, "NexShadow", (entityID + 46), this, 64, 1, true); EntityRegistry.registerModEntity(NexShadow.class, "NexShadow", (entityID + 46), this, 64, 1, true);
EntityRegistry.registerModEntity(NexIce.class, "NexIce", (entityID + 47), this, 64, 1, true); EntityRegistry.registerModEntity(NexIce.class, "NexIce", (entityID + 47), this, 64, 1, true);
EntityRegistry.registerModEntity(NexFire.class, "NexFire", (entityID + 48), this, 64, 1, true); EntityRegistry.registerModEntity(NexFire.class, "NexFire", (entityID + 48), this, 64, 1, true);
EntityRegistry.registerModEntity(NexToxin.class, "NexToxin", (entityID + 49), this, 64, 1, true); EntityRegistry.registerModEntity(NexToxin.class, "NexToxin", (entityID + 49), this, 64, 1, true);
EntityRegistry.registerModEntity(NexCloud.class, "NexCloud", (entityID + 50), this, 64, 1, true); EntityRegistry.registerModEntity(NexCloud.class, "NexCloud", (entityID + 50), this, 64, 1, true);
EntityRegistry.registerModEntity(NimveilLightningBolt.class, "NimveilLightningBolt", (entityID + 51), this, 64, 1, true); EntityRegistry.registerModEntity(NimveilLightningBolt.class, "NimveilLightningBolt", (entityID + 51), this, 64, 1, true);*/
} }
public void registerBlocks() { public void registerBlocks() {
@ -524,14 +526,14 @@ public class CinderLoE {
GameRegistry.registerBlock(entityBarrier, "entity_barrier"); GameRegistry.registerBlock(entityBarrier, "entity_barrier");
// Frozen Dungeon // Frozen Dungeon
shadowTile = (new ShadowTile()); /* shadowTile = (new ShadowTile());
GameRegistry.registerBlock(shadowTile, "shadow_tile"); GameRegistry.registerBlock(shadowTile, "shadow_tile");
iceCage = (new IceCage()); iceCage = (new IceCage());
GameRegistry.registerBlock(iceCage, "ice_cage"); GameRegistry.registerBlock(iceCage, "ice_cage");
enchantedIce = (new EnchantedIce()); enchantedIce = (new EnchantedIce());
GameRegistry.registerBlock(enchantedIce, "enchanted_ice"); GameRegistry.registerBlock(enchantedIce, "enchanted_ice");
forgingStation = (new ForgingStation()); forgingStation = (new ForgingStation());
GameRegistry.registerBlock(forgingStation, "forging_station"); GameRegistry.registerBlock(forgingStation, "forging_station");*/
// Building Blocks // Building Blocks
cutDrystone = (new cutDrystone()); cutDrystone = (new cutDrystone());
@ -655,7 +657,7 @@ public class CinderLoE {
legsJade = (new LOTRItemArmor(MATERIAL_JADE, 2,"leggings")).setUnlocalizedName("lotr:legsJade").setTextureName("lotr:legsJade").setCreativeTab(null); legsJade = (new LOTRItemArmor(MATERIAL_JADE, 2,"leggings")).setUnlocalizedName("lotr:legsJade").setTextureName("lotr:legsJade").setCreativeTab(null);
bootsJade = (new LOTRItemArmor(MATERIAL_JADE, 3)).setUnlocalizedName("lotr:bootsJade").setTextureName("lotr:bootsJade").setCreativeTab(null); bootsJade = (new LOTRItemArmor(MATERIAL_JADE, 3)).setUnlocalizedName("lotr:bootsJade").setTextureName("lotr:bootsJade").setCreativeTab(null);
helmetNexIce = (new LoEArmor(MATERIAL_NEX_ICE, 0, enchantedIce)).setUnlocalizedName("lotr:helmetNexIce").setTextureName("lotr:helmetNexIce"); /* helmetNexIce = (new LoEArmor(MATERIAL_NEX_ICE, 0, enchantedIce)).setUnlocalizedName("lotr:helmetNexIce").setTextureName("lotr:helmetNexIce");
bodyNexIce = (new LoEArmor(MATERIAL_NEX_ICE, 1, enchantedIce)).setUnlocalizedName("lotr:bodyNexIce").setTextureName("lotr:bodyNexIce"); bodyNexIce = (new LoEArmor(MATERIAL_NEX_ICE, 1, enchantedIce)).setUnlocalizedName("lotr:bodyNexIce").setTextureName("lotr:bodyNexIce");
legsNexIce = (new LoEArmor(MATERIAL_NEX_ICE, 2, enchantedIce)).setUnlocalizedName("lotr:legsNexIce").setTextureName("lotr:legsNexIce"); legsNexIce = (new LoEArmor(MATERIAL_NEX_ICE, 2, enchantedIce)).setUnlocalizedName("lotr:legsNexIce").setTextureName("lotr:legsNexIce");
bootsNexIce = (new LoEArmor(MATERIAL_NEX_ICE, 3, enchantedIce)).setUnlocalizedName("lotr:bootsNexIce").setTextureName("lotr:bootsNexIce"); bootsNexIce = (new LoEArmor(MATERIAL_NEX_ICE, 3, enchantedIce)).setUnlocalizedName("lotr:bootsNexIce").setTextureName("lotr:bootsNexIce");
@ -717,7 +719,7 @@ public class CinderLoE {
ItemRegistration.register(toxicCore,"toxicCore",7229); ItemRegistration.register(toxicCore,"toxicCore",7229);
ItemRegistration.register(iceThawer, "iceThawer",7230); ItemRegistration.register(iceThawer, "iceThawer",7230);
ItemRegistration.register(demonbloodVial, "demonbloodVial",7231); ItemRegistration.register(demonbloodVial, "demonbloodVial",7231);
ItemRegistration.register(mugDemonicHealthPotion, "mugDemonicHealthPotion",7232); ItemRegistration.register(mugDemonicHealthPotion, "mugDemonicHealthPotion",7232);*/
ItemRegistration.registerItem(frostblade, "frostblade", 4); ItemRegistration.registerItem(frostblade, "frostblade", 4);
ItemRegistration.registerItem(daggervoid, "daggerVoid", 65); ItemRegistration.registerItem(daggervoid, "daggerVoid", 65);
@ -1007,7 +1009,7 @@ public class CinderLoE {
public void setup() { public void setup() {
// RenderingRegistry.registerEntityRenderingHandler(HaradLevy.class, new LOTRRenderNearHaradrim()); // RenderingRegistry.registerEntityRenderingHandler(HaradLevy.class, new LOTRRenderNearHaradrim());
// RenderingRegistry.registerEntityRenderingHandler(DwarfLevy.class, new LOTRRenderDwarf()); // RenderingRegistry.registerEntityRenderingHandler(DwarfLevy.class, new LOTRRenderDwarf());
RenderingRegistry.registerBlockHandler(new RenderIceCage()); // RenderingRegistry.registerBlockHandler(new RenderIceCage());
RenderingRegistry.registerEntityRenderingHandler(EntityWarDart.class, new RenderWarDart()); RenderingRegistry.registerEntityRenderingHandler(EntityWarDart.class, new RenderWarDart());
RenderingRegistry.registerEntityRenderingHandler(NimveilLightningBolt.class, new RenderNimveilBolt()); RenderingRegistry.registerEntityRenderingHandler(NimveilLightningBolt.class, new RenderNimveilBolt());
@ -1024,7 +1026,6 @@ public class CinderLoE {
RenderingRegistry.registerEntityRenderingHandler(Renegade.class, new RenderRenegade()); RenderingRegistry.registerEntityRenderingHandler(Renegade.class, new RenderRenegade());
RenderingRegistry.registerEntityRenderingHandler(RenegadeCaptain.class, new RenderRenegade()); RenderingRegistry.registerEntityRenderingHandler(RenegadeCaptain.class, new RenderRenegade());
RenderingRegistry.registerEntityRenderingHandler(Wraith.class, new RenderWraith()); RenderingRegistry.registerEntityRenderingHandler(Wraith.class, new RenderWraith());
RenderingRegistry.registerEntityRenderingHandler(Nex.class, new RenderNex());
RenderingRegistry.registerEntityRenderingHandler(RedDwarfWarrior.class, new LOTRRenderDwarf()); RenderingRegistry.registerEntityRenderingHandler(RedDwarfWarrior.class, new LOTRRenderDwarf());
RenderingRegistry.registerEntityRenderingHandler(RedDwarfArbalest.class, new LOTRRenderDwarf()); RenderingRegistry.registerEntityRenderingHandler(RedDwarfArbalest.class, new LOTRRenderDwarf());
@ -1062,13 +1063,14 @@ public class CinderLoE {
RenderingRegistry.registerEntityRenderingHandler(LOTREntitySauron.class, new LOTRRenderSauron()); RenderingRegistry.registerEntityRenderingHandler(LOTREntitySauron.class, new LOTRRenderSauron());
RenderingRegistry.registerEntityRenderingHandler(UtumnoSlaveTrader.class, new RenderUtumnoSlave()); RenderingRegistry.registerEntityRenderingHandler(UtumnoSlaveTrader.class, new RenderUtumnoSlave());
RenderingRegistry.registerEntityRenderingHandler(NexShadow.class, new RenderNexMiniboss()); /* RenderingRegistry.registerEntityRenderingHandler(NexShadow.class, new RenderNexMiniboss());
RenderingRegistry.registerEntityRenderingHandler(NexIce.class, new RenderNexMiniboss()); RenderingRegistry.registerEntityRenderingHandler(NexIce.class, new RenderNexMiniboss());
RenderingRegistry.registerEntityRenderingHandler(NexFire.class, new RenderNexMiniboss()); RenderingRegistry.registerEntityRenderingHandler(NexFire.class, new RenderNexMiniboss());
RenderingRegistry.registerEntityRenderingHandler(NexToxin.class, new RenderNexMiniboss()); RenderingRegistry.registerEntityRenderingHandler(NexToxin.class, new RenderNexMiniboss());
RenderingRegistry.registerEntityRenderingHandler(NexCloud.class, new RenderNexCloud()); RenderingRegistry.registerEntityRenderingHandler(NexCloud.class, new RenderNexCloud());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMistBlock.class, (TileEntitySpecialRenderer)new LOTRRenderUtumnoPortal());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityForgingStation.class, (TileEntitySpecialRenderer)new TileEntityForgingStationRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityForgingStation.class, (TileEntitySpecialRenderer)new TileEntityForgingStationRenderer());
RenderingRegistry.registerEntityRenderingHandler(Nex.class, new RenderNex());*/
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMistBlock.class, (TileEntitySpecialRenderer)new LOTRRenderUtumnoPortal());
} }
} }

26
src/main/java/com/zivilon/cinder_loe/entity/Nex.java
Unescape Escape View File

@ -67,10 +67,14 @@ public class Nex extends LOTREntityNPC {
((EntityLiving) this).tasks.addTask(2, (EntityAIBase) new EntityAIWander(this, 1.0D)); ((EntityLiving) this).tasks.addTask(2, (EntityAIBase) new EntityAIWander(this, 1.0D));
((EntityLiving) this).tasks.addTask(3, (EntityAIBase) new EntityAILookIdle((EntityLiving) this)); ((EntityLiving) this).tasks.addTask(3, (EntityAIBase) new EntityAILookIdle((EntityLiving) this));
addTargetTasks(true); addTargetTasks(true);
store_nex_instance(); /* store_nex_instance();
clear_shadow_tiles(); clear_shadow_tiles();*/
} }
protected void entityInit() {
super.entityInit();
this.dataWatcher.addObject(31, Integer.valueOf(0));
}
/*
public void clear_shadow_tiles() { public void clear_shadow_tiles() {
if (!this.worldObj.isRemote) { if (!this.worldObj.isRemote) {
int xz_range = 100; int xz_range = 100;
@ -90,10 +94,6 @@ public class Nex extends LOTREntityNPC {
} }
} }
protected void entityInit() {
super.entityInit();
this.dataWatcher.addObject(31, Integer.valueOf(0));
}
protected void applyEntityAttributes() { protected void applyEntityAttributes() {
super.applyEntityAttributes(); super.applyEntityAttributes();
@ -357,10 +357,10 @@ public class Nex extends LOTREntityNPC {
@Override @Override
public void heal(float amount) {} public void heal(float amount) {}
*/
@Override @Override
public void attackEntityWithRangedAttack(EntityLivingBase target, float distanceFactor) {} public void attackEntityWithRangedAttack(EntityLivingBase target, float distanceFactor) {}
/*
@Override @Override
public ItemStack getPickedResult(MovingObjectPosition target) { public ItemStack getPickedResult(MovingObjectPosition target) {
return null; return null;
@ -383,7 +383,11 @@ public class Nex extends LOTREntityNPC {
if (nex == null) { if (nex == null) {
return -404; return -404;
} }
return nex.phase; return nex.phase; protected void entityInit() {
super.entityInit();
this.dataWatcher.addObject(31, Integer.valueOf(0));
}
} }
public static int get_nex_health() { public static int get_nex_health() {
Nex nex = get_nex_instance(); Nex nex = get_nex_instance();
@ -409,5 +413,5 @@ public class Nex extends LOTREntityNPC {
return false; return false;
} }
return false; return false;
} }*/
} }

4
src/main/java/com/zivilon/cinder_loe/entity/NexFire.java
Unescape Escape View File

@ -18,7 +18,7 @@ public class NexFire extends NexMiniboss {
} }
@Override @Override
public void setupEquipment() { public void setupEquipment() {/*
ItemStack weapon = new ItemStack(LOTRMod.hammerUtumno, 0); ItemStack weapon = new ItemStack(LOTRMod.hammerUtumno, 0);
ItemStack boots = new ItemStack(CinderLoE.bootsNexFire, 0); ItemStack boots = new ItemStack(CinderLoE.bootsNexFire, 0);
ItemStack legs = new ItemStack(CinderLoE.legsNexFire, 0); ItemStack legs = new ItemStack(CinderLoE.legsNexFire, 0);
@ -40,7 +40,7 @@ public class NexFire extends NexMiniboss {
setCurrentItemOrArmor(1, boots); setCurrentItemOrArmor(1, boots);
setCurrentItemOrArmor(2, legs); setCurrentItemOrArmor(2, legs);
setCurrentItemOrArmor(3, body); setCurrentItemOrArmor(3, body);
setCurrentItemOrArmor(4, helmet); setCurrentItemOrArmor(4, helmet);*/
} }
@Override @Override

4
src/main/java/com/zivilon/cinder_loe/entity/NexIce.java
Unescape Escape View File

@ -19,7 +19,7 @@ public class NexIce extends NexMiniboss {
} }
@Override @Override
public void setupEquipment() { public void setupEquipment() {/*
ItemStack weapon = new ItemStack(LOTRMod.spearUtumno, 0); ItemStack weapon = new ItemStack(LOTRMod.spearUtumno, 0);
ItemStack boots = new ItemStack(CinderLoE.bootsNexIce, 0); ItemStack boots = new ItemStack(CinderLoE.bootsNexIce, 0);
ItemStack legs = new ItemStack(CinderLoE.legsNexIce, 0); ItemStack legs = new ItemStack(CinderLoE.legsNexIce, 0);
@ -41,7 +41,7 @@ public class NexIce extends NexMiniboss {
setCurrentItemOrArmor(1, boots); setCurrentItemOrArmor(1, boots);
setCurrentItemOrArmor(2, legs); setCurrentItemOrArmor(2, legs);
setCurrentItemOrArmor(3, body); setCurrentItemOrArmor(3, body);
setCurrentItemOrArmor(4, helmet); setCurrentItemOrArmor(4, helmet);*/
} }
@Override @Override

14
src/main/java/com/zivilon/cinder_loe/entity/NexMiniboss.java
Unescape Escape View File

@ -35,7 +35,7 @@ public abstract class NexMiniboss extends LOTREntityMan {
((EntityLiving) this).tasks.addTask(2, (EntityAIBase) new LoEPreciseAttackOnCollide(this, 1.3D, 1.0D, 40, false)); ((EntityLiving) this).tasks.addTask(2, (EntityAIBase) new LoEPreciseAttackOnCollide(this, 1.3D, 1.0D, 40, false));
((EntityLiving) this).tasks.addTask(8, (EntityAIBase) new EntityAIWatchClosest((EntityLiving) this, Nex.class, 8.0F, 0.02F)); ((EntityLiving) this).tasks.addTask(8, (EntityAIBase) new EntityAIWatchClosest((EntityLiving) this, Nex.class, 8.0F, 0.02F));
addTargetTasks(true); addTargetTasks(true);
setupEquipment(); // setupEquipment();
} }
@Override @Override
@ -95,15 +95,15 @@ public abstract class NexMiniboss extends LOTREntityMan {
@Override @Override
public void onDeath(DamageSource source) { public void onDeath(DamageSource source) {
List<Nex> entityList = this.worldObj.getEntitiesWithinAABB(Nex.class, this.boundingBox.expand(100, 10, 100)); /* List<Nex> entityList = this.worldObj.getEntitiesWithinAABB(Nex.class, this.boundingBox.expand(100, 10, 100));
for (Nex nex : entityList) { for (Nex nex : entityList) {
nex.next_phase(); nex.next_phase();
return; return;
} }*/
} }
public void unbind() { public void unbind() {
System.out.println("Unbinding " + this.getClass().getSimpleName()); /* System.out.println("Unbinding " + this.getClass().getSimpleName());
int x = MathHelper.floor_double(this.posX); int x = MathHelper.floor_double(this.posX);
int y = MathHelper.floor_double(this.posY); int y = MathHelper.floor_double(this.posY);
@ -117,7 +117,7 @@ public abstract class NexMiniboss extends LOTREntityMan {
if (blockAtHead == CinderLoE.iceCage) { if (blockAtHead == CinderLoE.iceCage) {
this.worldObj.setBlock(x, y, z, Blocks.air); this.worldObj.setBlock(x, y, z, Blocks.air);
} }
bound = false; bound = false;*/
} }
@Override @Override
@ -127,7 +127,7 @@ public abstract class NexMiniboss extends LOTREntityMan {
} }
public void checkInsideIceCage() { public void checkInsideIceCage() {
int x = MathHelper.floor_double(this.posX); /* int x = MathHelper.floor_double(this.posX);
int y = MathHelper.floor_double(this.posY); int y = MathHelper.floor_double(this.posY);
int z = MathHelper.floor_double(this.posZ); int z = MathHelper.floor_double(this.posZ);
@ -143,7 +143,7 @@ public abstract class NexMiniboss extends LOTREntityMan {
onUnboundUpdate(); onUnboundUpdate();
Utilities.setInvulnerable((Entity)this, false); Utilities.setInvulnerable((Entity)this, false);
// System.out.println("Nex Miniboss vulnerable: " + this.isEntityInvulnerable()); // System.out.println("Nex Miniboss vulnerable: " + this.isEntityInvulnerable());
} }*/
} }
public abstract void onBoundUpdate(int x, int y, int z); public abstract void onBoundUpdate(int x, int y, int z);

4
src/main/java/com/zivilon/cinder_loe/entity/NexShadow.java
Unescape Escape View File

@ -24,7 +24,7 @@ public class NexShadow extends NexMiniboss {
} }
@Override @Override
public void setupEquipment() { public void setupEquipment() {/*
ItemStack weapon = new ItemStack(LOTRMod.swordUtumno, 0); ItemStack weapon = new ItemStack(LOTRMod.swordUtumno, 0);
ItemStack boots = new ItemStack(CinderLoE.bootsNexShadow, 0); ItemStack boots = new ItemStack(CinderLoE.bootsNexShadow, 0);
ItemStack legs = new ItemStack(CinderLoE.legsNexShadow, 0); ItemStack legs = new ItemStack(CinderLoE.legsNexShadow, 0);
@ -44,7 +44,7 @@ public class NexShadow extends NexMiniboss {
setCurrentItemOrArmor(1, boots); setCurrentItemOrArmor(1, boots);
setCurrentItemOrArmor(2, legs); setCurrentItemOrArmor(2, legs);
setCurrentItemOrArmor(3, body); setCurrentItemOrArmor(3, body);
setCurrentItemOrArmor(4, helmet); setCurrentItemOrArmor(4, helmet);*/
} }
@Override @Override

4
src/main/java/com/zivilon/cinder_loe/entity/NexToxin.java
Unescape Escape View File

@ -27,7 +27,7 @@ public class NexToxin extends NexMiniboss {
@Override @Override
public void setupEquipment() { public void setupEquipment() {
ItemStack weapon = new ItemStack(LOTRMod.daggerUtumnoPoisoned, 0); /* ItemStack weapon = new ItemStack(LOTRMod.daggerUtumnoPoisoned, 0);
ItemStack boots = new ItemStack(CinderLoE.bootsNexToxin, 0); ItemStack boots = new ItemStack(CinderLoE.bootsNexToxin, 0);
ItemStack legs = new ItemStack(CinderLoE.legsNexToxin, 0); ItemStack legs = new ItemStack(CinderLoE.legsNexToxin, 0);
ItemStack body = new ItemStack(CinderLoE.bodyNexToxin, 0); ItemStack body = new ItemStack(CinderLoE.bodyNexToxin, 0);
@ -46,7 +46,7 @@ public class NexToxin extends NexMiniboss {
setCurrentItemOrArmor(1, boots); setCurrentItemOrArmor(1, boots);
setCurrentItemOrArmor(2, legs); setCurrentItemOrArmor(2, legs);
setCurrentItemOrArmor(3, body); setCurrentItemOrArmor(3, body);
setCurrentItemOrArmor(4, helmet); setCurrentItemOrArmor(4, helmet);*/
} }
@Override @Override

4
src/main/java/com/zivilon/cinder_loe/entity/projectile/EntityWarDart.java
Unescape Escape View File

@ -35,7 +35,7 @@ public class EntityWarDart extends LOTREntityProjectileBase {
public int knockbackStrength = 0; public int knockbackStrength = 0;
public ItemStack item; public ItemStack item;
public int damage; public double damage;
public int dart_type; public int dart_type;
public EntityWarDart(World world) { public EntityWarDart(World world) {
@ -119,7 +119,7 @@ public class EntityWarDart extends LOTREntityProjectileBase {
@Override @Override
public float getBaseImpactDamage(Entity entity, ItemStack itemStack) { public float getBaseImpactDamage(Entity entity, ItemStack itemStack) {
return this.damage; return (float)this.damage;
} }
@Override @Override

32
src/main/java/com/zivilon/cinder_loe/items/WarDart.java
Unescape Escape View File

@ -125,23 +125,23 @@ public class WarDart extends Item {
return damage; return damage;
} }
public static int getDamageFromMeta(int meta) { public static double getDamageFromMeta(int meta) {
switch(meta) { switch(meta) {
case 1: return 3; // Copper case 1: return 5.5D; // Copper
case 2: return 3; // Bronze case 2: return 5.5D; // Bronze
case 3: return 4; // Iron case 3: return 6.0D; // Iron
case 4: return 5; // Orc case 4: return 6.5D; // Orc
case 5: return 6; // Dwarven case 5: return 7.0D; // Dwarven
case 6: return 6; // Uruk case 6: return 7.0D; // Uruk
case 7: return 6; // Blue Dwarven case 7: return 7.0D; // Blue Dwarven
case 8: return 6; // Black Uruk case 8: return 7.0D; // Black Uruk
case 9: return 6; // Elven case 9: return 7.0D; // Elven
case 10: return 5; // Gilded Iron case 10: return 6.5D; // Gilded Iron
case 11: return 6; // Red Dwarven case 11: return 7.0D; // Red Dwarven
case 12: return 10; // Mithril case 12: return 9.0D; // Mithril
case 13: return 12; // Ancient case 13: return 12.0D; // Ancient
case 14: return 6; // Morgul case 14: return 6.5D; // Morgul
default: return 0; default: return 0.0D;
} }
} }

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

@ -12,7 +12,7 @@ import net.minecraft.util.IIcon;
import java.util.List; import java.util.List;
public class WarDartHeads extends Item { public class WarDartHeads extends Item {
private IIcon[] icons; public IIcon[] icons;
public WarDartHeads() { public WarDartHeads() {
super(); super();

8
src/main/java/com/zivilon/cinder_loe/mixins/MixinEntityLivingBase.java
Unescape Escape View File

@ -78,7 +78,6 @@ public abstract class MixinEntityLivingBase extends Entity {
*/ */
@Overwrite @Overwrite
public boolean attackEntityFrom(DamageSource p_70097_1_, float p_70097_2_) { public boolean attackEntityFrom(DamageSource p_70097_1_, float p_70097_2_) {
System.out.println(this.getCommandSenderName() + " received " + p_70097_2_ + " damage");
if (ForgeHooks.onLivingAttack((EntityLivingBase)(Object)this, p_70097_1_, p_70097_2_)) return false; if (ForgeHooks.onLivingAttack((EntityLivingBase)(Object)this, p_70097_1_, p_70097_2_)) return false;
if (this.isEntityInvulnerable()) { if (this.isEntityInvulnerable()) {
return false; return false;
@ -89,7 +88,10 @@ public abstract class MixinEntityLivingBase extends Entity {
if (this.getHealth() <= 0.0F) { if (this.getHealth() <= 0.0F) {
return false; return false;
} else if (p_70097_1_.isFireDamage()) { } else if (p_70097_1_.isFireDamage() && this.isPotionActive(Potion.fireResistance)) {
return false;
}
/* } else if (p_70097_1_.isFireDamage()) {
if ((EntityLivingBase)(Object)this instanceof Nex || (EntityLivingBase)(Object)this instanceof NexMiniboss) return false; if ((EntityLivingBase)(Object)this instanceof Nex || (EntityLivingBase)(Object)this instanceof NexMiniboss) return false;
boolean fire_phase = Nex.is_nex_fire_phase_nearby((EntityLivingBase)(Object)this); boolean fire_phase = Nex.is_nex_fire_phase_nearby((EntityLivingBase)(Object)this);
if (this.isPotionActive(Potion.fireResistance)) { if (this.isPotionActive(Potion.fireResistance)) {
@ -105,7 +107,7 @@ public abstract class MixinEntityLivingBase extends Entity {
} }
} }
} }
} }*/
if ((p_70097_1_ == DamageSource.anvil || p_70097_1_ == DamageSource.fallingBlock) && this.getEquipmentInSlot(4) != null) { if ((p_70097_1_ == DamageSource.anvil || p_70097_1_ == DamageSource.fallingBlock) && this.getEquipmentInSlot(4) != null) {
this.getEquipmentInSlot(4).damageItem((int)(p_70097_2_ * 4.0F + this.rand.nextFloat() * p_70097_2_ * 2.0F), (EntityLivingBase)(Object)this); this.getEquipmentInSlot(4).damageItem((int)(p_70097_2_ * 4.0F + this.rand.nextFloat() * p_70097_2_ * 2.0F), (EntityLivingBase)(Object)this);
p_70097_2_ *= 0.75F; p_70097_2_ *= 0.75F;

9
src/main/java/com/zivilon/cinder_loe/recipe/ForgingRecipes.java
Unescape Escape View File

@ -19,7 +19,7 @@ public class ForgingRecipes {
} }
public static void register_recipes() { public static void register_recipes() {
register_recipe(new ForgingRecipe( /* register_recipe(new ForgingRecipe(
new ItemStack(CinderLoE.nimveilPart, 1, 2), new ItemStack(CinderLoE.nimveilPart, 1, 2),
new ItemStack(CinderLoE.nimveilPart, 1, 1), new ItemStack(CinderLoE.nimveilPart, 1, 1),
new ItemStack(CinderLoE.nimveilPart, 1, 0), new ItemStack(CinderLoE.nimveilPart, 1, 0),
@ -67,16 +67,17 @@ public class ForgingRecipes {
new ItemStack(CinderLoE.weaponPart, 1, 2), new ItemStack(CinderLoE.weaponPart, 1, 2),
deceiver_blade(), deceiver_blade(),
false false
)); ));*/
} }
public static ItemStack deceiver_blade() { public static ItemStack deceiver_blade() {
ItemStack blade = new ItemStack(CinderLoE.deceiverBlade, 1); /* ItemStack blade = new ItemStack(CinderLoE.deceiverBlade, 1);
Utilities.setAppliedRandomEnchants(blade); Utilities.setAppliedRandomEnchants(blade);
Utilities.setLOTREnchant(blade, LOTREnchantment.strong4); Utilities.setLOTREnchant(blade, LOTREnchantment.strong4);
Utilities.setLOTREnchant(blade, LOTREnchantment.meleeSpeed1); Utilities.setLOTREnchant(blade, LOTREnchantment.meleeSpeed1);
Utilities.setLOTREnchant(blade, LOTREnchantment.meleeReach1); Utilities.setLOTREnchant(blade, LOTREnchantment.meleeReach1);
return blade; return blade;*/
return null;
} }
public static List<ForgingRecipe> getAllRecipes() { public static List<ForgingRecipe> getAllRecipes() {

8
src/main/java/com/zivilon/cinder_loe/recipe/ToxicCoreArrowsRecipe.java
Unescape Escape View File

@ -17,7 +17,7 @@ public class ToxicCoreArrowsRecipe implements IRecipe {
@Override @Override
public boolean matches(InventoryCrafting inv, World worldIn) { public boolean matches(InventoryCrafting inv, World worldIn) {
ItemStack toxicCore = null; /* ItemStack toxicCore = null;
int arrowCount = 0; int arrowCount = 0;
for (int i = 0; i < inv.getSizeInventory(); i++) { for (int i = 0; i < inv.getSizeInventory(); i++) {
@ -40,13 +40,13 @@ public class ToxicCoreArrowsRecipe implements IRecipe {
if (toxicCore != null && arrowCount > 0) { if (toxicCore != null && arrowCount > 0) {
return toxicCore.getItemDamage() + arrowCount <= toxicCore.getMaxDamage(); return toxicCore.getItemDamage() + arrowCount <= toxicCore.getMaxDamage();
} }
*/
return false; return false;
} }
@Override @Override
public ItemStack getCraftingResult(InventoryCrafting inv) { public ItemStack getCraftingResult(InventoryCrafting inv) {
ItemStack toxicCore = null; /* ItemStack toxicCore = null;
int arrowCount = 0; int arrowCount = 0;
for (int i = 0; i < inv.getSizeInventory(); i++) { for (int i = 0; i < inv.getSizeInventory(); i++) {
@ -65,7 +65,7 @@ public class ToxicCoreArrowsRecipe implements IRecipe {
ItemStack resultStack = new ItemStack(result.getItem(), arrowCount); ItemStack resultStack = new ItemStack(result.getItem(), arrowCount);
return resultStack; return resultStack;
} }
*/
return null; return null;
} }

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

@ -84,15 +84,16 @@ public class recipes {
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 1), LOTRMod.copper, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE))); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 1), LOTRMod.copper, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE)));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 2), LOTRMod.bronze, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE))); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 2), LOTRMod.bronze, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE)));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 3), Items.iron_ingot, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE))); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 3), Items.iron_ingot, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE)));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 4), LOTRMod.orcSteel, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE))); // GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 4), LOTRMod.orcSteel, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE)));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 5), LOTRMod.dwarfSteel, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE))); // GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 5), LOTRMod.dwarfSteel, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE)));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 6), LOTRMod.urukSteel, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE))); // GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 6), LOTRMod.urukSteel, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE)));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 7), LOTRMod.blueDwarfSteel, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE))); // GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 7), LOTRMod.blueDwarfSteel, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE)));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 8), LOTRMod.blackUrukSteel, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE))); // GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 8), LOTRMod.blackUrukSteel, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE)));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 9), LOTRMod.elfSteel, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE))); // GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 9), LOTRMod.elfSteel, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE)));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 10), LOTRMod.gildedIron, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE))); // GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 10), LOTRMod.gildedIron, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE)));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 11), CinderLoE.redDwarfSteel, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE))); // GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 11), CinderLoE.redDwarfSteel, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE)));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 12), LOTRMod.mithril, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE))); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 12), LOTRMod.mithril, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE)));
// GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDartHeads, 2, 14), LOTRMod.morgulSteel, new ItemStack(LOTRMod.chisel, 1, OreDictionary.WILDCARD_VALUE)));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDart, 1, 1), new ItemStack(CinderLoE.warDart, 1, 0), new ItemStack(CinderLoE.warDartHeads, 1, 1))); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDart, 1, 1), new ItemStack(CinderLoE.warDart, 1, 0), new ItemStack(CinderLoE.warDartHeads, 1, 1)));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDart, 1, 2), new ItemStack(CinderLoE.warDart, 1, 0), new ItemStack(CinderLoE.warDartHeads, 1, 2))); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.warDart, 1, 2), new ItemStack(CinderLoE.warDart, 1, 0), new ItemStack(CinderLoE.warDartHeads, 1, 2)));

7
src/main/java/com/zivilon/cinder_loe/util/DurableItemCrafter.java
Unescape Escape View File

@ -9,13 +9,12 @@ import com.zivilon.cinder_loe.CinderLoE;
public class DurableItemCrafter { public class DurableItemCrafter {
public static List<Item> customItems = new ArrayList<>(); public static List<Item> customItems = new ArrayList<>();
static {
customItems.add(LOTRMod.rollingPin);
}
public static List<Item> exceptionItems = new ArrayList<>(); public static List<Item> exceptionItems = new ArrayList<>();
static { static {
customItems.add(LOTRMod.rollingPin);
customItems.add(LOTRMod.chisel); customItems.add(LOTRMod.chisel);
customItems.add(CinderLoE.toxicCore); // customItems.add(CinderLoE.toxicCore);
exceptionItems.add(LOTRMod.ithildin); exceptionItems.add(LOTRMod.ithildin);
} }

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

@ -10,6 +10,6 @@ import com.zivilon.cinder_loe.CinderLoE;
public class LOTREnchantmentExclusions { public class LOTREnchantmentExclusions {
public static List<Item> exclusions = new ArrayList<>(); public static List<Item> exclusions = new ArrayList<>();
static { static {
exclusions.add(CinderLoE.celeiniss); // exclusions.add(CinderLoE.celeiniss);
} }
} }

4
src/main/java/com/zivilon/cinder_loe/util/VT_additions.java
Unescape Escape View File

@ -4,8 +4,8 @@ import com.zivilon.cinder_loe.entity.Nex;
public class VT_additions { public class VT_additions {
public static String applyCustomPlaceholders(String scriptLine) { public static String applyCustomPlaceholders(String scriptLine) {
scriptLine = scriptLine.replace("<nexphase>", String.valueOf(Nex.get_nex_phase())); /* scriptLine = scriptLine.replace("<nexphase>", String.valueOf(Nex.get_nex_phase()));
scriptLine = scriptLine.replace("<nexhealth>", String.valueOf(Nex.get_nex_health())); scriptLine = scriptLine.replace("<nexhealth>", String.valueOf(Nex.get_nex_health()));*/
return scriptLine; return scriptLine;
} }
} }

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.0 KiB

Write Preview
Loading…
Cancel
Save