removed localBlock and localMeta in HarvestTool.java because block an…

…d localBlock is always the same.

moved the block harvesting in own method
fixes some blocks not droping or not breaking at all.
fixes exp drop with silktouch

src/main/java/tconstruct/library/tools/DualHarvestTool.java

@@ -52,12 +52,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl
         {
             if (!player.capabilities.isCreativeMode)
             {
-                // Workaround for dropping experience
-                int fortune = EnchantmentHelper.getFortuneModifier(player);
-                int exp = block.getExpDrop(world, meta, fortune);
-                block.dropXpOnBlockBreak(world, x, y, z, exp);
-
-                onBlockDestroyed(stack, world, block, x, y, z, player);
+                mineBlock(world, x, y, z, meta, player, block);
             }
             WorldHelper.setBlockToAir(world, x, y, z);
             if (!world.isRemote)

src/main/java/tconstruct/library/tools/HarvestTool.java

@@ -39,16 +39,12 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl
         int hlvl = -1;
         if (!(tags.getBoolean("Broken")))
         {
-            Block localBlock = world.getBlock(x, y, z);
-            int localMeta = world.getBlockMetadata(x, y, z);
             if (block.getHarvestTool(meta) != null && block.getHarvestTool(meta).equals(this.getHarvestType()))
                 hlvl = block.getHarvestLevel(meta);
             int toolLevel = tags.getInteger("HarvestLevel");
             float blockHardness = block.getBlockHardness(world, x, y, z);
-            float localHardness = localBlock == null ? Float.MAX_VALUE : localBlock.getBlockHardness(world, x, y, z);
 
-            //Choose blocks that aren't too much harder than the first block. Stone: 2.0, Ores: 3.0
-            if (hlvl <= toolLevel && localHardness - 1.5 <= blockHardness)
+            if (hlvl <= toolLevel)
             {
                 boolean cancelHarvest = false;
                 for (ActiveToolMod mod : TConstructRegistry.activeModifiers)
@@ -59,21 +55,22 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl
 
                 if (!cancelHarvest)
                 {
-                    if (localBlock != null && !(localHardness < 0))
+                    if (block != null)
                     {
 
                         boolean isEffective = false;
 
                         for (int iter = 0; iter < getEffectiveMaterials().length; iter++)
                         {
-                            if (getEffectiveMaterials()[iter] == localBlock.getMaterial() || localBlock == Blocks.monster_egg)
+                            if (getEffectiveMaterials()[iter] == block.getMaterial() || block == Blocks.monster_egg)
                             {
                                 isEffective = true;
                                 break;
                             }
                         }
 
-                        if (localBlock.getMaterial().isToolNotRequired())
+                        // Microblocks are registered as rock but no HarvestTool is set
+                        if (block.getMaterial().isToolNotRequired() || block.getHarvestTool(meta) == null)
                         {
                             isEffective = true;
                         }
@@ -82,20 +79,9 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl
                         {
                             if (isEffective)
                             {
-                                if (localBlock.removedByPlayer(world, player, x, y, z))
-                                {
-                                    localBlock.onBlockDestroyedByPlayer(world, x, y, z, localMeta);
-                                }
-
-                                // Workaround for dropping experience
-                                int fortune = EnchantmentHelper.getFortuneModifier(player);
-                                int exp = localBlock.getExpDrop(world, localMeta, fortune);
-                                localBlock.dropXpOnBlockBreak(world, x, y, z, exp);
-
-                                localBlock.harvestBlock(world, player, x, y, z, localMeta);
-                                localBlock.onBlockHarvested(world, x, y, z, localMeta, player);
+                                mineBlock(world, x, y, z, meta, player, block);
                                 if (blockHardness > 0f)
-                                    onBlockDestroyed(stack, world, localBlock, x, y, z, player);
+                                    onBlockDestroyed(stack, world, block, x, y, z, player);
                                 world.func_147479_m(x, y, z);
                             }
                             else
@@ -309,4 +295,30 @@ public int getHarvestLevel (ItemStack stack, String toolClass)
         int harvestLvl = tags.getInteger("HarvestLevel");
         return harvestLvl;
     }
+
+    // The Scythe is not a HarvestTool and can't call this method, if you change something here you might change it there too.
+    public void mineBlock(World world, int x, int y, int z, int meta, EntityPlayer player, Block block)
+    {
+        if (!world.isRemote)
+        {
+            // Workaround for dropping experience
+            boolean silktouch = EnchantmentHelper.getSilkTouchModifier(player);
+            int fortune = EnchantmentHelper.getFortuneModifier(player);
+            int exp = block.getExpDrop(world, meta, fortune);
+
+            block.onBlockHarvested(world, x, y, z, meta, player);
+            if (block.removedByPlayer(world, player, x, y, z, true))
+            {
+                block.onBlockDestroyedByPlayer(world, x, y, z, meta);
+                block.harvestBlock(world, player, x, y, z, meta);
+                // Workaround for dropping experience
+                if (!silktouch)
+                    block.dropXpOnBlockBreak(world, x, y, z, exp);
+            }
+        }
+        else
+        {
+            block.onBlockDestroyedByPlayer(world, x, y, z, meta);
+        }
+    }
 }