From b7d30223a0f29cccdd84279136437a2a9200b7ad Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 5 Nov 2016 14:43:14 +0100 Subject: [PATCH] Equalize armor absorption values with IC2 --- .../boots/ItemElectricBootsTraveller.java | 4 ++-- .../armor/boots/ItemNanoBootsTraveller.java | 5 +++++ .../boots/ItemQuantumBootsTraveller.java | 5 +++++ .../armor/goggles/ItemElectricGoggles.java | 4 ++-- .../item/armor/goggles/ItemNanoGoggles.java | 5 +++++ .../armor/goggles/ItemQuantumGoggles.java | 5 +++++ .../goggles/ItemSolarHelmetRevealing.java | 5 +++++ .../emt/item/armor/wings/ItemNanoWing.java | 4 ++-- .../emt/item/armor/wings/ItemQuantumWing.java | 20 ++----------------- 9 files changed, 33 insertions(+), 24 deletions(-) diff --git a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java index 4d2661b..5a98e98 100644 --- a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java @@ -97,11 +97,11 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt } public double getDamageAbsorptionRatio() { - return 1.1000000000000001D; + return 0.5D; } private double getBaseAbsorptionRatio() { - return 0.14999999999999999D; + return 0.15D; } @Override diff --git a/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java index 2710777..8d19f8f 100644 --- a/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java @@ -20,6 +20,11 @@ public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller { energyPerDamage = 5000; } + @Override + public double getDamageAbsorptionRatio() { + return 0.9D; + } + @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { diff --git a/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java index ffaf745..1229345 100644 --- a/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java @@ -20,6 +20,11 @@ public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller { energyPerDamage = 20000; } + @Override + public double getDamageAbsorptionRatio() { + return 1D; + } + @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { diff --git a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java index 6e2e9cd..31aa842 100644 --- a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java @@ -148,7 +148,7 @@ public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVi } public double getDamageAbsorptionRatio() { - return 1.1000000000000001D; + return 0.5D; } public int getEnergyPerDamage() { @@ -156,7 +156,7 @@ public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVi } private double getBaseAbsorptionRatio() { - return 0.14999999999999999D; + return 0.15D; } /* IC2 API METHODS */ diff --git a/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java index 483af59..e7df483 100644 --- a/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java @@ -40,6 +40,11 @@ public class ItemNanoGoggles extends ItemElectricGoggles { return EMT.TEXTURE_PATH + ":textures/models/thaumicnanohelmet.png"; } + @Override + public double getDamageAbsorptionRatio() { + return 0.9D; + } + @Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { if (EMTConfigHandler.nightVisionOff == false) { diff --git a/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java index d157df9..3e7bf38 100644 --- a/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java @@ -52,6 +52,11 @@ public class ItemQuantumGoggles extends ItemNanoGoggles { return EMT.TEXTURE_PATH + ":textures/models/thaumicquantumhelmet.png"; } + @Override + public double getDamageAbsorptionRatio() { + return 1D; + } + @Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { int refill = player.getAir(); diff --git a/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java index 617fe3a..a66205b 100644 --- a/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java +++ b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java @@ -66,6 +66,11 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles { return EMT.TEXTURE_PATH + ":textures/models/solarrevealinghelmet.png"; } + @Override + public double getDamageAbsorptionRatio() { + return 1D; + } + @SuppressWarnings("unchecked") @Override public void onArmorTick(World worldObj, EntityPlayer player, ItemStack itemStack) { diff --git a/src/main/java/emt/item/armor/wings/ItemNanoWing.java b/src/main/java/emt/item/armor/wings/ItemNanoWing.java index b56e582..75cf892 100644 --- a/src/main/java/emt/item/armor/wings/ItemNanoWing.java +++ b/src/main/java/emt/item/armor/wings/ItemNanoWing.java @@ -136,11 +136,11 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri } public double getDamageAbsorptionRatio() { - return 1.5999999999999991D; + return 0.9D; } private double getBaseAbsorptionRatio() { - return 0.17999999999999999D; + return 0.25D; } /* IC2 API METHODS */ diff --git a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java index dcc404d..c7e51cd 100644 --- a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java +++ b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java @@ -55,28 +55,12 @@ public class ItemQuantumWing extends ItemNanoWing { return maxCharge; } - @Override - public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { - ElectricItem.manager.discharge(stack, damage * getEnergyPerDamage(), 0x7fffffff, true, false, false); - } public double getDamageAbsorptionRatio() { - return 2.099990000000001D; + return 1D; } private double getBaseAbsorptionRatio() { - return 0.20999999999999999D; - } - @Override - public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { - if (source.isUnblockable()) { - return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 3); - } else { - double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio(); - int energyPerDamage = getEnergyPerDamage(); - double damageLimit = energyPerDamage <= 0 ? 0 : (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage; - return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(3, absorptionRatio, (int) damageLimit); - } - + return 0.25D; } }