Merge pull request #26 from GTNewHorizons/reMerge

Re merge

1 files changed, 16 insertions, 0 deletions

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
index f681554ea7..6ae55532e4 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
@@ -12,6 +12,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
+import net.minecraft.world.World;
 import net.minecraftforge.event.world.BlockEvent;
 
 import java.util.List;
@@ -96,6 +97,21 @@ public class GT_Tool_Axe
         }
         return rAmount;
     }
+    
+    public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ)
+    {
+      if (aBlock.isWood(aPlayer.worldObj, aX, aY, aZ) && OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))){
+        float rAmount = 1.0F;float tIncrement = 1.0F;
+        if ((GregTech_API.sTimber) && !aPlayer.isSneaking()){
+          int tY = aY + 1;
+          for (int tH = aPlayer.worldObj.getHeight(); (tY < tH) && (aPlayer.worldObj.getBlock(aX, tY, aZ) == aBlock); tY++){
+            tIncrement += 0.1F;rAmount += tIncrement;
+          }
+        }
+        return 2.0F * aDefault / rAmount;
+      }
+      return (aBlock.getMaterial() == Material.leaves) || (aBlock.getMaterial() == Material.vine) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.gourd) ? aDefault / 4.0F : aDefault;
+    }
 
     public ItemStack getBrokenItem(ItemStack aStack) {
         return null;