From db8b914ca6556d94bdd67417c223c9c7b3983eaf Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 17 Jun 2014 19:19:44 +0800 Subject: [PATCH] Added code to the DarkSteelAxe to handle both the bugged and fixed versions of forge. --- .../enderio/item/darksteel/ItemDarkSteelAxe.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index 500dde0f..addf5e10 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -112,7 +112,7 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I @SubscribeEvent public void onBreakEvent(BlockEvent.BreakEvent evt) { - if(evt.getPlayer().isSneaking() && isEquipped(evt.getPlayer()) && isLog(evt.block)) { + if(evt.getPlayer().isSneaking() && isEquipped(evt.getPlayer()) && isLog(evt.block, evt.blockMetadata)) { int powerStored = getStoredPower(evt.getPlayer()); int maxBlocks = 50; @@ -179,7 +179,7 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I @SubscribeEvent public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) { - if(evt.entityPlayer.isSneaking() && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelAxePowerUsePerDamagePointMultiHarvest) && isLog(evt.block)) { + if(evt.entityPlayer.isSneaking() && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelAxePowerUsePerDamagePointMultiHarvest) && isLog(evt.block, evt.metadata)) { evt.newSpeed = evt.originalSpeed / Config.darkSteelAxeSpeedPenaltyMultiHarvest; } } @@ -239,13 +239,14 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I return super.getDigSpeed(stack, block, meta); } - private boolean isLog(Block block) { + private boolean isLog(Block block, int meta) { if(logOreId == -1) { logOreId = OreDictionary.getOreID("logWood"); } - int test = OreDictionary.getOreID(new ItemStack(Blocks.log, 1, Short.MAX_VALUE)); + int targetOreId = OreDictionary.getOreID(new ItemStack(block, 1, meta)); //NB: Specifying the wildcard as meta is a work around for forge issue #1103 - return OreDictionary.getOreID(new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE)) == logOreId; + int workAroundId = OreDictionary.getOreID(new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE)); + return targetOreId == logOreId || workAroundId == logOreId; } protected void init() {