From 681aff00093c2c424797eefd50bd742d53cdeb99 Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Tue, 3 Mar 2015 20:14:27 +0100 Subject: [PATCH] Fix: Allow Unbreaking to work on dark steel items * Dark Axe: Damage is routed the vanilla way (which does enchantment damage reduction) and then intercepted at the "apply" stage. Multi-harvesting is handled as direct energy use, as multi-harvesting only works with power. * Dark Pick: Damage is routed the vanilla way (which does enchantment damage reduction) and then intercepted at the "apply" stage. Obsidian is handled as additional direct energy use. * Dark Armour: Damage is no longer set directly but routed through the stack (which does enchantment damage reduction). This makes armor check enchantments *after* power use. --- .../item/darksteel/ItemDarkSteelArmor.java | 6 +-- .../item/darksteel/ItemDarkSteelAxe.java | 46 ++++++++----------- .../item/darksteel/ItemDarkSteelPickaxe.java | 44 +++++++++--------- 3 files changed, 42 insertions(+), 54 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index bf009d4c..125ec1ad 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -224,11 +224,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte eu.extractEnergy(damage * powerPerDamagePoint, false); } else { - damage = stack.getItemDamage() + damage; - if(damage >= getMaxDamage()) { - stack.stackSize = 0; - } - stack.setItemDamage(damage); + stack.damageItem(damage, entity); } if(eu != null) { eu.writeToItem(stack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index 3ea18744..8b2a9226 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -8,7 +8,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -141,7 +140,7 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I worldObj.spawnEntityInWorld(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, new ItemStack(Items.apple))); } } else if(block == refBlock) { //other wise leaves - applyDamage(player, player.getCurrentEquippedItem(), 1, true); + extractEnergy(player.getCurrentEquippedItem(), Config.darkSteelAxePowerUsePerDamagePointMultiHarvest, false); usedPower = true; } } @@ -159,20 +158,6 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I } } - @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - applyDamage(par3EntityLivingBase, par1ItemStack, 2, false); - return true; - } - - @Override - public boolean onBlockDestroyed(ItemStack item, World world, Block block, int x, int y, int z, EntityLivingBase entLiving) { - if(block.getBlockHardness(world, x, y, z) != 0.0D) { - applyDamage(entLiving, item, 1, false); - } - return true; - } - @Override public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { if (world.isRemote) { @@ -181,21 +166,28 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I return false; } - private void applyDamage(EntityLivingBase entity, ItemStack stack, int damage, boolean isMultiharvest) { + @Override + public void setDamage(ItemStack stack, int newDamage) { + int oldDamage = getDamage(stack); + if (newDamage <= oldDamage) { + super.setDamage(stack, newDamage); + } else { + int damage = newDamage - oldDamage; + + if (!absorbDamageWithEnergy(stack, damage * Config.darkSteelAxePowerUsePerDamagePoint)) { + super.setDamage(stack, newDamage); + } + } + } + private boolean absorbDamageWithEnergy(ItemStack stack, int amount) { 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 = stack.getItemDamage() + damage; - if(damage >= getMaxDamage()) { - stack.stackSize = 0; - } - stack.setItemDamage(damage); - } - if(eu != null) { + eu.extractEnergy(amount, false); eu.writeToItem(stack); + return true; + } else { + return false; } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index fb5e89a3..0ec8830c 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -96,21 +96,14 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine return false; } - @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - applyDamage(par3EntityLivingBase, par1ItemStack, 2); - return true; - } - @Override public boolean onBlockDestroyed(ItemStack item, World world, Block block, int x, int y, int z, EntityLivingBase entLiving) { if(block.getBlockHardness(world, x, y, z) != 0.0D) { if(useObsidianEffeciency(item, block)) { extractEnergy(item, Config.darkSteelPickPowerUseObsidian, false); } - applyDamage(entLiving, item, 1); } - return true; + return super.onBlockDestroyed(item, world, block, x, y, z, entLiving); } @Override @@ -151,25 +144,32 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine return false; } - private void applyDamage(EntityLivingBase entity, ItemStack stack, int damage) { - - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); - if(eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { - eu.extractEnergy(damage * Config.darkSteelPickPowerUsePerDamagePoint, false); - + @Override + public void setDamage(ItemStack stack, int newDamage) { + int oldDamage = getDamage(stack); + if (newDamage <= oldDamage) { + super.setDamage(stack, newDamage); } else { - damage = stack.getItemDamage() + damage; - if(damage >= getMaxDamage()) { - stack.stackSize = 0; + int damage = newDamage - oldDamage; + + if (!absorbDamageWithEnergy(stack, damage * Config.darkSteelPickPowerUsePerDamagePoint)) { + super.setDamage(stack, newDamage); } - stack.setItemDamage(damage); } - if(eu != null) { - eu.writeToItem(stack); - } - } + private boolean absorbDamageWithEnergy(ItemStack stack, int amount) { + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); + if(eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { + eu.extractEnergy(amount, false); + eu.writeToItem(stack); + return true; + } else { + return false; + } + } + + @Override public boolean canHarvestBlock(Block block, ItemStack item) { if(hasSpoonUpgrade(item) && getEnergyStored(item) > 0) {