From e6de8921c06b6785897a9081b83adddb3ea44e72 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Wed, 14 Jun 2017 01:30:36 +0200 Subject: [PATCH] fix for timber changes --- .../java/gregtech/api/items/GT_MetaGenerated_Tool.java | 6 ++---- src/main/java/gregtech/common/tools/GT_Tool.java | 8 +------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java index 80b5fc21..0b12df13 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java @@ -220,10 +220,8 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements @Mod.EventHandler public float onBlockBreakSpeedEvent(float aDefault, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, PlayerEvent.BreakSpeed aEvent) { - IToolStats tStats = getToolStats(aStack); - float tTest = tStats == null ? aDefault : tStats.getMiningSpeed(aBlock, aMetaData, aDefault, aPlayer, aPlayer.worldObj, aX, aY, aZ); - System.out.println("test: "+tTest+" default: "+aDefault); - return tTest; + IToolStats tStats = getToolStats(aStack); + return tStats == null ? aDefault : tStats.getMiningSpeed(aBlock, aMetaData, aDefault, aPlayer, aPlayer.worldObj, aX, aY, aZ); } @Override diff --git a/src/main/java/gregtech/common/tools/GT_Tool.java b/src/main/java/gregtech/common/tools/GT_Tool.java index 299d59ed..5f54f7bd 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool.java +++ b/src/main/java/gregtech/common/tools/GT_Tool.java @@ -146,15 +146,9 @@ public abstract class GT_Tool public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) { return aOriginalDamage; } - - public float getMiningSpeed(Block aBlock, byte aMetaData) - { - return isMinableBlock(aBlock, aMetaData) ? 1.0F : 0.0F; - } - @Override public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World worldObj, int aX, int aY, int aZ) { - return getMiningSpeed(aBlock, aMetaData); + return aDefault; } }