From 1f9d73a28a8d10c9fe8e30691bea37a8a0803225 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 22 Nov 2014 09:46:08 -0500 Subject: [PATCH] #1257 Add per-level absorption ratios on dark steel items --- ReleaseNotes.txt | 4 ++++ .../java/crazypants/enderio/config/Config.java | 8 +++++--- .../enderio/item/darksteel/EnergyUpgrade.java | 18 +++++++++++++++--- .../item/darksteel/ItemDarkSteelArmor.java | 2 +- .../item/darksteel/ItemDarkSteelAxe.java | 14 +++++++------- .../item/darksteel/ItemDarkSteelPickaxe.java | 14 +++++++------- .../item/darksteel/ItemDarkSteelSword.java | 8 ++++---- 7 files changed, 43 insertions(+), 25 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index aaa6843a..07be8d4a 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -5,7 +5,11 @@ Changes - #1261 Add max level configs for XP obelisk, killer joe, and soul binder - #900 Add different texture for quite clear glass block - #1254 Add method for tools to control hiding of facades + - For this, a new API has been added, containing ITool - #779 Add solar upgrade for DS helm +- Facades that are not opaque will no longer stop conduit rendering +- Translucent facades are now possible +- #1257 Add per-level absorption rations on dark steel items Bugs - Fix outer corners on connected texture blocks not being metadata sensitive when they should be diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 6f9bbe30..59dbbb26 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -136,7 +136,7 @@ public final class Config { public static int enderIoRange = 8; public static boolean enderIoMeAccessEnabled = true; - public static double darkSteelPowerDamgeAbsorptionRatio = 0.75; + public static double[] darkSteelPowerDamgeAbsorptionRatios = {0.5, 0.6, 0.75, 0.95}; public static int darkSteelPowerStorageBase = 100000; public static int darkSteelPowerStorageLevelOne = 150000; public static int darkSteelPowerStorageLevelTwo = 250000; @@ -620,8 +620,10 @@ public final class Config { + "better quality rendering but can result in frame stutters when switching to/from a wrench.") .getBoolean(updateLightingWhenHidingFacades); - darkSteelPowerDamgeAbsorptionRatio= config.get(sectionDarkSteel.name, "darkSteelPowerDamgeAbsorptionRatio", darkSteelPowerDamgeAbsorptionRatio, - "Amount of durabilty damage absorbed when items are powered. 1=100% so items take no durablity damage when powered.").getDouble(darkSteelPowerDamgeAbsorptionRatio); + darkSteelPowerDamgeAbsorptionRatios = config + .get(sectionDarkSteel.name, "darkSteelPowerDamgeAbsorptionRatios", darkSteelPowerDamgeAbsorptionRatios, + "A list of the amount of durabilty damage absorbed when items are powered. In order of upgrade level. 1=100% so items take no durablity damage when powered.") + .getDoubleList(); darkSteelPowerStorageBase = config.get(sectionDarkSteel.name, "darkSteelPowerStorageBase", darkSteelPowerStorageBase, "Base amount of power stored by dark steel items.").getInt(darkSteelPowerStorageBase); darkSteelPowerStorageLevelOne = config.get(sectionDarkSteel.name, "darkSteelPowerStorageLevelOne", darkSteelPowerStorageLevelOne, diff --git a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java index 345a8c7a..15a9fd8c 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java @@ -199,7 +199,7 @@ public class EnergyUpgrade extends AbstractUpgrade { super.addDetailedEntries(itemstack, entityplayer, list, flag); int endIndex = list.size(); int cap = capacity; - String percDamage = (int)Math.round(Config.darkSteelPowerDamgeAbsorptionRatio * 100) + ""; + String percDamage = (int)Math.round(getAbsorptionRatio(itemstack) * 100) + ""; String capString = PowerDisplayUtil.formatPower(cap) + " " + PowerDisplayUtil.abrevation(); for(int i=startIndex;i 0) { + if(eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { eu.extractEnergy(damage * powerPerDamagePoint, false); } else { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index 2fa93e5a..be523e6c 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -194,21 +194,21 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I return ItemDarkSteelPickaxe.doRightClickItemPlace(player, world, x, y, z, side, par8, par9, par10); } - private void applyDamage(EntityLivingBase entity, ItemStack item, int damage, boolean isMultiharvest) { + private void applyDamage(EntityLivingBase entity, ItemStack stack, int damage, boolean isMultiharvest) { - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(item); - if(eu != null && eu.isAbsorbDamageWithPower() && eu.getEnergy() > 0) { + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); + if(eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { int powerUse = isMultiharvest ? Config.darkSteelAxePowerUsePerDamagePointMultiHarvest : Config.darkSteelAxePowerUsePerDamagePoint; eu.extractEnergy(damage * powerUse, false); } else { - damage = item.getItemDamage() + damage; + damage = stack.getItemDamage() + damage; if(damage >= getMaxDamage()) { - item.stackSize = 0; + stack.stackSize = 0; } - item.setItemDamage(damage); + stack.setItemDamage(damage); } if(eu != null) { - eu.writeToItem(item); + eu.writeToItem(stack); } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 401fe040..feae970e 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -159,21 +159,21 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine return true; } - private void applyDamage(EntityLivingBase entity, ItemStack item, int damage) { + private void applyDamage(EntityLivingBase entity, ItemStack stack, int damage) { - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(item); - if(eu != null && eu.isAbsorbDamageWithPower() && eu.getEnergy() > 0) { + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); + if(eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { eu.extractEnergy(damage * Config.darkSteelPickPowerUsePerDamagePoint, false); } else { - damage = item.getItemDamage() + damage; + damage = stack.getItemDamage() + damage; if(damage >= getMaxDamage()) { - item.stackSize = 0; + stack.stackSize = 0; } - item.setItemDamage(damage); + stack.setItemDamage(damage); } if(eu != null) { - eu.writeToItem(item); + eu.writeToItem(stack); } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java index 94ee311e..d6a100fd 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java @@ -209,7 +209,7 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase entity, EntityLivingBase playerEntity) { + public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase playerEntity) { if(playerEntity instanceof EntityPlayer) { @@ -217,12 +217,12 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte ItemStack sword = player.getCurrentEquippedItem(); //Durability damage - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(par1ItemStack); - if(eu != null && eu.isAbsorbDamageWithPower() && eu.getEnergy() > 0) { + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); + if(eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { eu.extractEnergy(powerPerDamagePoint, false); } else { - super.hitEntity(par1ItemStack, entity, playerEntity); + super.hitEntity(stack, entity, playerEntity); } //sword hit