From c644379b28f04135654a870b355ecd53906ee0bd Mon Sep 17 00:00:00 2001 From: Shinare Date: Fri, 30 Aug 2024 01:20:29 +0300 Subject: [PATCH] Utilities + Commented out Frozen Dungeon content --- .../com/zivilon/cinder_loe/CinderLoE.java | 32 ++++++++++-------- .../com/zivilon/cinder_loe/entity/Nex.java | 26 ++++++++------ .../zivilon/cinder_loe/entity/NexFire.java | 4 +-- .../com/zivilon/cinder_loe/entity/NexIce.java | 4 +-- .../cinder_loe/entity/NexMiniboss.java | 14 ++++---- .../zivilon/cinder_loe/entity/NexShadow.java | 4 +-- .../zivilon/cinder_loe/entity/NexToxin.java | 4 +-- .../entity/projectile/EntityWarDart.java | 4 +-- .../com/zivilon/cinder_loe/items/WarDart.java | 32 +++++++++--------- .../cinder_loe/items/WarDartHeads.java | 2 +- .../mixins/MixinEntityLivingBase.java | 8 +++-- .../cinder_loe/recipe/ForgingRecipes.java | 9 ++--- .../recipe/ToxicCoreArrowsRecipe.java | 8 ++--- .../java/com/zivilon/cinder_loe/recipes.java | 17 +++++----- .../cinder_loe/util/DurableItemCrafter.java | 7 ++-- .../util/LOTREnchantmentExclusions.java | 2 +- .../zivilon/cinder_loe/util/VT_additions.java | 4 +-- .../lotr/textures/blocks/forging_station.png | Bin 3118 -> 0 bytes 18 files changed, 95 insertions(+), 86 deletions(-) delete mode 100644 src/main/resources/assets/lotr/textures/blocks/forging_station.png diff --git a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java index c88e46b..437769b 100644 --- a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java +++ b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java @@ -143,8 +143,10 @@ public class CinderLoE { public static Block bronzeChain; public static Block plaster; public static Block voidblock; - public static Block shadowTile; public static Block entityBarrier; + + // Frozen Dungeon Blocks + public static Block shadowTile; public static Block iceCage; public static Block enchantedIce; public static Block forgingStation; @@ -363,8 +365,8 @@ public class CinderLoE { recipes.registerRecipes(); // Register recipes at com.zivilon.cinder_loe.recipes.java setupTradeEntries(); LOTRWeaponStats.registerMeleeReach(Whip.class, 1.5F); - LOTRWeaponStats.registerMeleeReach(Celeiniss.class, 1.8F); - LOTRWeaponStats.registerMeleeSpeed(Celeiniss.class, 1.0F); +/* LOTRWeaponStats.registerMeleeReach(Celeiniss.class, 1.8F); + LOTRWeaponStats.registerMeleeSpeed(Celeiniss.class, 1.0F);*/ LoECreativeTabs.setupIcons(); } @@ -377,8 +379,8 @@ public class CinderLoE { public void registerEntities() { // Last ID added: 51 ///GameRegistry.registerTileEntity(TileEntityMistBlock.class, "TileEntityMistBlock"); - GameRegistry.registerTileEntity(TileEntityShadowTile.class, "TileEntityShadowTile"); - GameRegistry.registerTileEntity(TileEntityForgingStation.class, "TileEntityForgingStation"); +/* GameRegistry.registerTileEntity(TileEntityShadowTile.class, "TileEntityShadowTile"); + GameRegistry.registerTileEntity(TileEntityForgingStation.class, "TileEntityForgingStation");*/ ///.registerBlock(TileEntityRustedSword, "TileEntityRustedSword"); 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); // 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(NexIce.class, "NexIce", (entityID + 47), 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(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() { @@ -524,14 +526,14 @@ public class CinderLoE { GameRegistry.registerBlock(entityBarrier, "entity_barrier"); // Frozen Dungeon - shadowTile = (new ShadowTile()); +/* shadowTile = (new ShadowTile()); GameRegistry.registerBlock(shadowTile, "shadow_tile"); iceCage = (new IceCage()); GameRegistry.registerBlock(iceCage, "ice_cage"); enchantedIce = (new EnchantedIce()); GameRegistry.registerBlock(enchantedIce, "enchanted_ice"); forgingStation = (new ForgingStation()); - GameRegistry.registerBlock(forgingStation, "forging_station"); + GameRegistry.registerBlock(forgingStation, "forging_station");*/ // Building Blocks 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); 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"); 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"); @@ -717,7 +719,7 @@ public class CinderLoE { ItemRegistration.register(toxicCore,"toxicCore",7229); ItemRegistration.register(iceThawer, "iceThawer",7230); ItemRegistration.register(demonbloodVial, "demonbloodVial",7231); - ItemRegistration.register(mugDemonicHealthPotion, "mugDemonicHealthPotion",7232); + ItemRegistration.register(mugDemonicHealthPotion, "mugDemonicHealthPotion",7232);*/ ItemRegistration.registerItem(frostblade, "frostblade", 4); ItemRegistration.registerItem(daggervoid, "daggerVoid", 65); @@ -1007,7 +1009,7 @@ public class CinderLoE { public void setup() { // RenderingRegistry.registerEntityRenderingHandler(HaradLevy.class, new LOTRRenderNearHaradrim()); // RenderingRegistry.registerEntityRenderingHandler(DwarfLevy.class, new LOTRRenderDwarf()); - RenderingRegistry.registerBlockHandler(new RenderIceCage()); +// RenderingRegistry.registerBlockHandler(new RenderIceCage()); RenderingRegistry.registerEntityRenderingHandler(EntityWarDart.class, new RenderWarDart()); RenderingRegistry.registerEntityRenderingHandler(NimveilLightningBolt.class, new RenderNimveilBolt()); @@ -1024,7 +1026,6 @@ public class CinderLoE { RenderingRegistry.registerEntityRenderingHandler(Renegade.class, new RenderRenegade()); RenderingRegistry.registerEntityRenderingHandler(RenegadeCaptain.class, new RenderRenegade()); RenderingRegistry.registerEntityRenderingHandler(Wraith.class, new RenderWraith()); - RenderingRegistry.registerEntityRenderingHandler(Nex.class, new RenderNex()); RenderingRegistry.registerEntityRenderingHandler(RedDwarfWarrior.class, new LOTRRenderDwarf()); RenderingRegistry.registerEntityRenderingHandler(RedDwarfArbalest.class, new LOTRRenderDwarf()); @@ -1062,13 +1063,14 @@ public class CinderLoE { RenderingRegistry.registerEntityRenderingHandler(LOTREntitySauron.class, new LOTRRenderSauron()); 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(NexFire.class, new RenderNexMiniboss()); RenderingRegistry.registerEntityRenderingHandler(NexToxin.class, new RenderNexMiniboss()); RenderingRegistry.registerEntityRenderingHandler(NexCloud.class, new RenderNexCloud()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMistBlock.class, (TileEntitySpecialRenderer)new LOTRRenderUtumnoPortal()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityForgingStation.class, (TileEntitySpecialRenderer)new TileEntityForgingStationRenderer()); + RenderingRegistry.registerEntityRenderingHandler(Nex.class, new RenderNex());*/ + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMistBlock.class, (TileEntitySpecialRenderer)new LOTRRenderUtumnoPortal()); } } diff --git a/src/main/java/com/zivilon/cinder_loe/entity/Nex.java b/src/main/java/com/zivilon/cinder_loe/entity/Nex.java index dd69289..f8464cb 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/Nex.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/Nex.java @@ -67,10 +67,14 @@ public class Nex extends LOTREntityNPC { ((EntityLiving) this).tasks.addTask(2, (EntityAIBase) new EntityAIWander(this, 1.0D)); ((EntityLiving) this).tasks.addTask(3, (EntityAIBase) new EntityAILookIdle((EntityLiving) this)); addTargetTasks(true); - store_nex_instance(); - clear_shadow_tiles(); +/* store_nex_instance(); + clear_shadow_tiles();*/ } - + protected void entityInit() { + super.entityInit(); + this.dataWatcher.addObject(31, Integer.valueOf(0)); + } +/* public void clear_shadow_tiles() { if (!this.worldObj.isRemote) { 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() { super.applyEntityAttributes(); @@ -357,10 +357,10 @@ public class Nex extends LOTREntityNPC { @Override public void heal(float amount) {} - +*/ @Override public void attackEntityWithRangedAttack(EntityLivingBase target, float distanceFactor) {} - +/* @Override public ItemStack getPickedResult(MovingObjectPosition target) { return null; @@ -383,7 +383,11 @@ public class Nex extends LOTREntityNPC { if (nex == null) { 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() { Nex nex = get_nex_instance(); @@ -409,5 +413,5 @@ public class Nex extends LOTREntityNPC { return false; } return false; - } + }*/ } diff --git a/src/main/java/com/zivilon/cinder_loe/entity/NexFire.java b/src/main/java/com/zivilon/cinder_loe/entity/NexFire.java index b748259..cbcab09 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/NexFire.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/NexFire.java @@ -18,7 +18,7 @@ public class NexFire extends NexMiniboss { } @Override - public void setupEquipment() { + public void setupEquipment() {/* ItemStack weapon = new ItemStack(LOTRMod.hammerUtumno, 0); ItemStack boots = new ItemStack(CinderLoE.bootsNexFire, 0); ItemStack legs = new ItemStack(CinderLoE.legsNexFire, 0); @@ -40,7 +40,7 @@ public class NexFire extends NexMiniboss { setCurrentItemOrArmor(1, boots); setCurrentItemOrArmor(2, legs); setCurrentItemOrArmor(3, body); - setCurrentItemOrArmor(4, helmet); + setCurrentItemOrArmor(4, helmet);*/ } @Override diff --git a/src/main/java/com/zivilon/cinder_loe/entity/NexIce.java b/src/main/java/com/zivilon/cinder_loe/entity/NexIce.java index da3a7c1..c723dfd 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/NexIce.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/NexIce.java @@ -19,7 +19,7 @@ public class NexIce extends NexMiniboss { } @Override - public void setupEquipment() { + public void setupEquipment() {/* ItemStack weapon = new ItemStack(LOTRMod.spearUtumno, 0); ItemStack boots = new ItemStack(CinderLoE.bootsNexIce, 0); ItemStack legs = new ItemStack(CinderLoE.legsNexIce, 0); @@ -41,7 +41,7 @@ public class NexIce extends NexMiniboss { setCurrentItemOrArmor(1, boots); setCurrentItemOrArmor(2, legs); setCurrentItemOrArmor(3, body); - setCurrentItemOrArmor(4, helmet); + setCurrentItemOrArmor(4, helmet);*/ } @Override diff --git a/src/main/java/com/zivilon/cinder_loe/entity/NexMiniboss.java b/src/main/java/com/zivilon/cinder_loe/entity/NexMiniboss.java index 4a1868d..f130c4e 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/NexMiniboss.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/NexMiniboss.java @@ -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(8, (EntityAIBase) new EntityAIWatchClosest((EntityLiving) this, Nex.class, 8.0F, 0.02F)); addTargetTasks(true); - setupEquipment(); +// setupEquipment(); } @Override @@ -95,15 +95,15 @@ public abstract class NexMiniboss extends LOTREntityMan { @Override public void onDeath(DamageSource source) { - List entityList = this.worldObj.getEntitiesWithinAABB(Nex.class, this.boundingBox.expand(100, 10, 100)); +/* List entityList = this.worldObj.getEntitiesWithinAABB(Nex.class, this.boundingBox.expand(100, 10, 100)); for (Nex nex : entityList) { nex.next_phase(); return; - } + }*/ } 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 y = MathHelper.floor_double(this.posY); @@ -117,7 +117,7 @@ public abstract class NexMiniboss extends LOTREntityMan { if (blockAtHead == CinderLoE.iceCage) { this.worldObj.setBlock(x, y, z, Blocks.air); } - bound = false; + bound = false;*/ } @Override @@ -127,7 +127,7 @@ public abstract class NexMiniboss extends LOTREntityMan { } 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 z = MathHelper.floor_double(this.posZ); @@ -143,7 +143,7 @@ public abstract class NexMiniboss extends LOTREntityMan { onUnboundUpdate(); Utilities.setInvulnerable((Entity)this, false); // System.out.println("Nex Miniboss vulnerable: " + this.isEntityInvulnerable()); - } + }*/ } public abstract void onBoundUpdate(int x, int y, int z); diff --git a/src/main/java/com/zivilon/cinder_loe/entity/NexShadow.java b/src/main/java/com/zivilon/cinder_loe/entity/NexShadow.java index 6c2c430..ae4f7fe 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/NexShadow.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/NexShadow.java @@ -24,7 +24,7 @@ public class NexShadow extends NexMiniboss { } @Override - public void setupEquipment() { + public void setupEquipment() {/* ItemStack weapon = new ItemStack(LOTRMod.swordUtumno, 0); ItemStack boots = new ItemStack(CinderLoE.bootsNexShadow, 0); ItemStack legs = new ItemStack(CinderLoE.legsNexShadow, 0); @@ -44,7 +44,7 @@ public class NexShadow extends NexMiniboss { setCurrentItemOrArmor(1, boots); setCurrentItemOrArmor(2, legs); setCurrentItemOrArmor(3, body); - setCurrentItemOrArmor(4, helmet); + setCurrentItemOrArmor(4, helmet);*/ } @Override diff --git a/src/main/java/com/zivilon/cinder_loe/entity/NexToxin.java b/src/main/java/com/zivilon/cinder_loe/entity/NexToxin.java index 0964ec8..acc66cf 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/NexToxin.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/NexToxin.java @@ -27,7 +27,7 @@ public class NexToxin extends NexMiniboss { @Override 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 legs = new ItemStack(CinderLoE.legsNexToxin, 0); ItemStack body = new ItemStack(CinderLoE.bodyNexToxin, 0); @@ -46,7 +46,7 @@ public class NexToxin extends NexMiniboss { setCurrentItemOrArmor(1, boots); setCurrentItemOrArmor(2, legs); setCurrentItemOrArmor(3, body); - setCurrentItemOrArmor(4, helmet); + setCurrentItemOrArmor(4, helmet);*/ } @Override diff --git a/src/main/java/com/zivilon/cinder_loe/entity/projectile/EntityWarDart.java b/src/main/java/com/zivilon/cinder_loe/entity/projectile/EntityWarDart.java index bddd76b..e736e01 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/projectile/EntityWarDart.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/projectile/EntityWarDart.java @@ -35,7 +35,7 @@ public class EntityWarDart extends LOTREntityProjectileBase { public int knockbackStrength = 0; public ItemStack item; - public int damage; + public double damage; public int dart_type; public EntityWarDart(World world) { @@ -119,7 +119,7 @@ public class EntityWarDart extends LOTREntityProjectileBase { @Override public float getBaseImpactDamage(Entity entity, ItemStack itemStack) { - return this.damage; + return (float)this.damage; } @Override diff --git a/src/main/java/com/zivilon/cinder_loe/items/WarDart.java b/src/main/java/com/zivilon/cinder_loe/items/WarDart.java index 0595ef3..02e0e13 100644 --- a/src/main/java/com/zivilon/cinder_loe/items/WarDart.java +++ b/src/main/java/com/zivilon/cinder_loe/items/WarDart.java @@ -125,23 +125,23 @@ public class WarDart extends Item { return damage; } - public static int getDamageFromMeta(int meta) { + public static double getDamageFromMeta(int meta) { switch(meta) { - case 1: return 3; // Copper - case 2: return 3; // Bronze - case 3: return 4; // Iron - case 4: return 5; // Orc - case 5: return 6; // Dwarven - case 6: return 6; // Uruk - case 7: return 6; // Blue Dwarven - case 8: return 6; // Black Uruk - case 9: return 6; // Elven - case 10: return 5; // Gilded Iron - case 11: return 6; // Red Dwarven - case 12: return 10; // Mithril - case 13: return 12; // Ancient - case 14: return 6; // Morgul - default: return 0; + case 1: return 5.5D; // Copper + case 2: return 5.5D; // Bronze + case 3: return 6.0D; // Iron + case 4: return 6.5D; // Orc + case 5: return 7.0D; // Dwarven + case 6: return 7.0D; // Uruk + case 7: return 7.0D; // Blue Dwarven + case 8: return 7.0D; // Black Uruk + case 9: return 7.0D; // Elven + case 10: return 6.5D; // Gilded Iron + case 11: return 7.0D; // Red Dwarven + case 12: return 9.0D; // Mithril + case 13: return 12.0D; // Ancient + case 14: return 6.5D; // Morgul + default: return 0.0D; } } diff --git a/src/main/java/com/zivilon/cinder_loe/items/WarDartHeads.java b/src/main/java/com/zivilon/cinder_loe/items/WarDartHeads.java index fac06ae..e5f5abd 100644 --- a/src/main/java/com/zivilon/cinder_loe/items/WarDartHeads.java +++ b/src/main/java/com/zivilon/cinder_loe/items/WarDartHeads.java @@ -12,7 +12,7 @@ import net.minecraft.util.IIcon; import java.util.List; public class WarDartHeads extends Item { - private IIcon[] icons; + public IIcon[] icons; public WarDartHeads() { super(); diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/MixinEntityLivingBase.java b/src/main/java/com/zivilon/cinder_loe/mixins/MixinEntityLivingBase.java index 2bec3e5..e42071a 100644 --- a/src/main/java/com/zivilon/cinder_loe/mixins/MixinEntityLivingBase.java +++ b/src/main/java/com/zivilon/cinder_loe/mixins/MixinEntityLivingBase.java @@ -78,7 +78,6 @@ public abstract class MixinEntityLivingBase extends Entity { */ @Overwrite 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 (this.isEntityInvulnerable()) { return false; @@ -89,7 +88,10 @@ public abstract class MixinEntityLivingBase extends Entity { if (this.getHealth() <= 0.0F) { 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; boolean fire_phase = Nex.is_nex_fire_phase_nearby((EntityLivingBase)(Object)this); 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) { 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; diff --git a/src/main/java/com/zivilon/cinder_loe/recipe/ForgingRecipes.java b/src/main/java/com/zivilon/cinder_loe/recipe/ForgingRecipes.java index bcac2bd..eff099a 100644 --- a/src/main/java/com/zivilon/cinder_loe/recipe/ForgingRecipes.java +++ b/src/main/java/com/zivilon/cinder_loe/recipe/ForgingRecipes.java @@ -19,7 +19,7 @@ public class ForgingRecipes { } public static void register_recipes() { - register_recipe(new ForgingRecipe( +/* register_recipe(new ForgingRecipe( new ItemStack(CinderLoE.nimveilPart, 1, 2), new ItemStack(CinderLoE.nimveilPart, 1, 1), new ItemStack(CinderLoE.nimveilPart, 1, 0), @@ -67,16 +67,17 @@ public class ForgingRecipes { new ItemStack(CinderLoE.weaponPart, 1, 2), deceiver_blade(), false - )); + ));*/ } public static ItemStack deceiver_blade() { - ItemStack blade = new ItemStack(CinderLoE.deceiverBlade, 1); +/* ItemStack blade = new ItemStack(CinderLoE.deceiverBlade, 1); Utilities.setAppliedRandomEnchants(blade); Utilities.setLOTREnchant(blade, LOTREnchantment.strong4); Utilities.setLOTREnchant(blade, LOTREnchantment.meleeSpeed1); Utilities.setLOTREnchant(blade, LOTREnchantment.meleeReach1); - return blade; + return blade;*/ + return null; } public static List getAllRecipes() { diff --git a/src/main/java/com/zivilon/cinder_loe/recipe/ToxicCoreArrowsRecipe.java b/src/main/java/com/zivilon/cinder_loe/recipe/ToxicCoreArrowsRecipe.java index 12c51ae..5791a1f 100644 --- a/src/main/java/com/zivilon/cinder_loe/recipe/ToxicCoreArrowsRecipe.java +++ b/src/main/java/com/zivilon/cinder_loe/recipe/ToxicCoreArrowsRecipe.java @@ -17,7 +17,7 @@ public class ToxicCoreArrowsRecipe implements IRecipe { @Override public boolean matches(InventoryCrafting inv, World worldIn) { - ItemStack toxicCore = null; +/* ItemStack toxicCore = null; int arrowCount = 0; for (int i = 0; i < inv.getSizeInventory(); i++) { @@ -40,13 +40,13 @@ public class ToxicCoreArrowsRecipe implements IRecipe { if (toxicCore != null && arrowCount > 0) { return toxicCore.getItemDamage() + arrowCount <= toxicCore.getMaxDamage(); } - +*/ return false; } @Override public ItemStack getCraftingResult(InventoryCrafting inv) { - ItemStack toxicCore = null; +/* ItemStack toxicCore = null; int arrowCount = 0; for (int i = 0; i < inv.getSizeInventory(); i++) { @@ -65,7 +65,7 @@ public class ToxicCoreArrowsRecipe implements IRecipe { ItemStack resultStack = new ItemStack(result.getItem(), arrowCount); return resultStack; } - +*/ return null; } diff --git a/src/main/java/com/zivilon/cinder_loe/recipes.java b/src/main/java/com/zivilon/cinder_loe/recipes.java index 54f07d3..0f6946d 100644 --- a/src/main/java/com/zivilon/cinder_loe/recipes.java +++ b/src/main/java/com/zivilon/cinder_loe/recipes.java @@ -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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 2), new ItemStack(CinderLoE.warDart, 1, 0), new ItemStack(CinderLoE.warDartHeads, 1, 2))); diff --git a/src/main/java/com/zivilon/cinder_loe/util/DurableItemCrafter.java b/src/main/java/com/zivilon/cinder_loe/util/DurableItemCrafter.java index 6392934..013b213 100644 --- a/src/main/java/com/zivilon/cinder_loe/util/DurableItemCrafter.java +++ b/src/main/java/com/zivilon/cinder_loe/util/DurableItemCrafter.java @@ -9,13 +9,12 @@ import com.zivilon.cinder_loe.CinderLoE; public class DurableItemCrafter { public static List customItems = new ArrayList<>(); - static { - customItems.add(LOTRMod.rollingPin); - } public static List exceptionItems = new ArrayList<>(); + static { + customItems.add(LOTRMod.rollingPin); customItems.add(LOTRMod.chisel); - customItems.add(CinderLoE.toxicCore); +// customItems.add(CinderLoE.toxicCore); exceptionItems.add(LOTRMod.ithildin); } diff --git a/src/main/java/com/zivilon/cinder_loe/util/LOTREnchantmentExclusions.java b/src/main/java/com/zivilon/cinder_loe/util/LOTREnchantmentExclusions.java index dcf9277..3f4d119 100644 --- a/src/main/java/com/zivilon/cinder_loe/util/LOTREnchantmentExclusions.java +++ b/src/main/java/com/zivilon/cinder_loe/util/LOTREnchantmentExclusions.java @@ -10,6 +10,6 @@ import com.zivilon.cinder_loe.CinderLoE; public class LOTREnchantmentExclusions { public static List exclusions = new ArrayList<>(); static { - exclusions.add(CinderLoE.celeiniss); +// exclusions.add(CinderLoE.celeiniss); } } diff --git a/src/main/java/com/zivilon/cinder_loe/util/VT_additions.java b/src/main/java/com/zivilon/cinder_loe/util/VT_additions.java index 5929228..9988877 100644 --- a/src/main/java/com/zivilon/cinder_loe/util/VT_additions.java +++ b/src/main/java/com/zivilon/cinder_loe/util/VT_additions.java @@ -4,8 +4,8 @@ import com.zivilon.cinder_loe.entity.Nex; public class VT_additions { public static String applyCustomPlaceholders(String scriptLine) { - scriptLine = scriptLine.replace("", String.valueOf(Nex.get_nex_phase())); - scriptLine = scriptLine.replace("", String.valueOf(Nex.get_nex_health())); +/* scriptLine = scriptLine.replace("", String.valueOf(Nex.get_nex_phase())); + scriptLine = scriptLine.replace("", String.valueOf(Nex.get_nex_health()));*/ return scriptLine; } } diff --git a/src/main/resources/assets/lotr/textures/blocks/forging_station.png b/src/main/resources/assets/lotr/textures/blocks/forging_station.png deleted file mode 100644 index 837e3d1421897aca058f56b7a9cd283895f661cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3118 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