From 2a8be34d86cf35ab6e77d4bdad84b3c26d53d432 Mon Sep 17 00:00:00 2001
From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Date: Wed, 10 Apr 2019 20:44:55 +0200
Subject: Refined last commit +re-added unused, Deprecated 
constructors
 +re-added unused vars +treat empty string as null for
 GT_Tool_*.isMinableBlock +allowed to mine any block that doesnt require a
 tool with GT tools at Hand mining speed

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
---
 src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gregtech/api/items')

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 9c3b4a8ae5..db0db134ff 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
@@ -462,9 +462,18 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
 
     @Override
     public float getDigSpeed(ItemStack aStack, Block aBlock, int aMetaData) {
-        if (!isItemStackUsable(aStack)) return 0.0F;
+
+        if (!isItemStackUsable(aStack))
+            return 0.0F;
+
         IToolStats tStats = getToolStats(aStack);
-        if (tStats == null || Math.max(0, getHarvestLevel(aStack, "")) < aBlock.getHarvestLevel(aMetaData)) return 0.0F;
+
+        if (tStats == null || Math.max(0, getHarvestLevel(aStack, "")) < aBlock.getHarvestLevel(aMetaData))
+            return 0.0F;
+
+        if (aBlock.getHarvestLevel(aMetaData) == 0 && !tStats.isMinableBlock(aBlock, (byte) aMetaData))
+            return Math.min(Math.max(Float.MIN_NORMAL, ((tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed) /2)),1.0F);
+
         return tStats.isMinableBlock(aBlock, (byte) aMetaData) ? Math.max(Float.MIN_NORMAL, tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed) : 0.0F;
     }
 
-- 
cgit