From 55d06845653165525a9659eb125738be4db4b21e Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Fri, 24 Nov 2017 11:19:19 +0000
Subject: [PATCH] Move block-breaking tool-type constants to a BlockToolType
 interface

---
 src/pocketmine/block/Anvil.php             |  3 +-
 src/pocketmine/block/Block.php             | 11 +++----
 src/pocketmine/block/BlockToolType.php     | 38 ++++++++++++++++++++++
 src/pocketmine/block/BoneBlock.php         |  3 +-
 src/pocketmine/block/Bookshelf.php         |  3 +-
 src/pocketmine/block/BrewingStand.php      |  4 +--
 src/pocketmine/block/BrickStairs.php       |  4 +--
 src/pocketmine/block/Bricks.php            |  3 +-
 src/pocketmine/block/BurningFurnace.php    |  3 +-
 src/pocketmine/block/Chest.php             |  3 +-
 src/pocketmine/block/Clay.php              |  3 +-
 src/pocketmine/block/Coal.php              |  3 +-
 src/pocketmine/block/CoalOre.php           |  3 +-
 src/pocketmine/block/Cobblestone.php       |  3 +-
 src/pocketmine/block/CobblestoneStairs.php |  4 +--
 src/pocketmine/block/CobblestoneWall.php   |  3 +-
 src/pocketmine/block/Cobweb.php            |  3 +-
 src/pocketmine/block/Concrete.php          |  3 +-
 src/pocketmine/block/ConcretePowder.php    |  3 +-
 src/pocketmine/block/CraftingTable.php     |  3 +-
 src/pocketmine/block/DeadBush.php          |  3 +-
 src/pocketmine/block/Diamond.php           |  3 +-
 src/pocketmine/block/DiamondOre.php        |  3 +-
 src/pocketmine/block/Dirt.php              |  3 +-
 src/pocketmine/block/DoubleStoneSlab.php   |  3 +-
 src/pocketmine/block/DoubleWoodenSlab.php  |  4 +--
 src/pocketmine/block/Emerald.php           |  3 +-
 src/pocketmine/block/EmeraldOre.php        |  3 +-
 src/pocketmine/block/EnchantingTable.php   |  3 +-
 src/pocketmine/block/EndStone.php          |  4 +--
 src/pocketmine/block/EndStoneBricks.php    |  3 +-
 src/pocketmine/block/EnderChest.php        |  3 +-
 src/pocketmine/block/Farmland.php          |  3 +-
 src/pocketmine/block/FenceGate.php         |  3 +-
 src/pocketmine/block/GlazedTerracotta.php  |  3 +-
 src/pocketmine/block/Glowstone.php         |  3 +-
 src/pocketmine/block/Gold.php              |  3 +-
 src/pocketmine/block/GoldOre.php           |  3 +-
 src/pocketmine/block/Grass.php             |  3 +-
 src/pocketmine/block/GrassPath.php         |  3 +-
 src/pocketmine/block/Gravel.php            |  3 +-
 src/pocketmine/block/HardenedClay.php      |  4 +--
 src/pocketmine/block/Ice.php               |  3 +-
 src/pocketmine/block/Iron.php              |  3 +-
 src/pocketmine/block/IronBars.php          |  3 +-
 src/pocketmine/block/IronDoor.php          |  3 +-
 src/pocketmine/block/IronOre.php           |  3 +-
 src/pocketmine/block/IronTrapdoor.php      |  4 +--
 src/pocketmine/block/Ladder.php            |  3 +-
 src/pocketmine/block/Lapis.php             |  3 +-
 src/pocketmine/block/LapisOre.php          |  3 +-
 src/pocketmine/block/Leaves.php            |  3 +-
 src/pocketmine/block/Magma.php             |  3 +-
 src/pocketmine/block/Melon.php             |  3 +-
 src/pocketmine/block/MonsterSpawner.php    |  3 +-
 src/pocketmine/block/Mycelium.php          |  3 +-
 src/pocketmine/block/NetherBrick.php       |  3 +-
 src/pocketmine/block/NetherBrickFence.php  |  3 +-
 src/pocketmine/block/NetherBrickStairs.php |  4 +--
 src/pocketmine/block/NetherQuartzOre.php   |  3 +-
 src/pocketmine/block/NetherReactor.php     |  3 +-
 src/pocketmine/block/Netherrack.php        |  3 +-
 src/pocketmine/block/Obsidian.php          |  3 +-
 src/pocketmine/block/PackedIce.php         |  4 +--
 src/pocketmine/block/Planks.php            |  4 +--
 src/pocketmine/block/Podzol.php            |  4 +--
 src/pocketmine/block/Prismarine.php        |  3 +-
 src/pocketmine/block/Pumpkin.php           |  3 +-
 src/pocketmine/block/PurpurStairs.php      |  4 +--
 src/pocketmine/block/Quartz.php            |  3 +-
 src/pocketmine/block/QuartzStairs.php      |  4 +--
 src/pocketmine/block/RedMushroomBlock.php  |  3 +-
 src/pocketmine/block/Redstone.php          |  3 +-
 src/pocketmine/block/RedstoneOre.php       |  3 +-
 src/pocketmine/block/Sand.php              |  4 +--
 src/pocketmine/block/Sandstone.php         |  3 +-
 src/pocketmine/block/SandstoneStairs.php   |  4 +--
 src/pocketmine/block/SignPost.php          |  3 +-
 src/pocketmine/block/Snow.php              |  4 +--
 src/pocketmine/block/SnowLayer.php         |  3 +-
 src/pocketmine/block/SoulSand.php          |  3 +-
 src/pocketmine/block/StainedClay.php       |  3 +-
 src/pocketmine/block/Stair.php             |  1 -
 src/pocketmine/block/StandingBanner.php    |  7 ++--
 src/pocketmine/block/Stone.php             |  3 +-
 src/pocketmine/block/StoneBrickStairs.php  |  4 +--
 src/pocketmine/block/StoneBricks.php       |  3 +-
 src/pocketmine/block/StoneButton.php       |  4 +--
 src/pocketmine/block/StoneSlab.php         |  3 +-
 src/pocketmine/block/Stonecutter.php       |  3 +-
 src/pocketmine/block/Trapdoor.php          |  3 +-
 src/pocketmine/block/Vine.php              |  3 +-
 src/pocketmine/block/Wood.php              |  3 +-
 src/pocketmine/block/WoodenButton.php      |  4 +--
 src/pocketmine/block/WoodenDoor.php        |  4 +--
 src/pocketmine/block/WoodenFence.php       |  4 +--
 src/pocketmine/block/WoodenSlab.php        |  4 +--
 src/pocketmine/block/WoodenStairs.php      |  3 +-
 src/pocketmine/block/Wool.php              |  3 +-
 src/pocketmine/item/Tool.php               | 18 ++++------
 100 files changed, 147 insertions(+), 235 deletions(-)
 create mode 100644 src/pocketmine/block/BlockToolType.php

diff --git a/src/pocketmine/block/Anvil.php b/src/pocketmine/block/Anvil.php
index cb3c9b3673..2fd5b634e6 100644
--- a/src/pocketmine/block/Anvil.php
+++ b/src/pocketmine/block/Anvil.php
@@ -27,7 +27,6 @@ use pocketmine\inventory\AnvilInventory;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -66,7 +65,7 @@ class Anvil extends Fallable{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function recalculateBoundingBox() : ?AxisAlignedBB{
diff --git a/src/pocketmine/block/Block.php b/src/pocketmine/block/Block.php
index e136c1a4c5..6f71692463 100644
--- a/src/pocketmine/block/Block.php
+++ b/src/pocketmine/block/Block.php
@@ -30,7 +30,6 @@ use pocketmine\entity\Entity;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\level\MovingObjectPosition;
 use pocketmine\level\Position;
@@ -223,12 +222,12 @@ class Block extends Position implements BlockIds, Metadatable{
 	public function getBreakTime(Item $item) : float{
 		$base = $this->getHardness() * 1.5;
 		if($this->canBeBrokenWith($item)){
-			if($this->getToolType() === Tool::TYPE_SHEARS and $item->isShears()){
+			if($this->getToolType() === BlockToolType::TYPE_SHEARS and $item->isShears()){
 				$base /= 15;
 			}elseif(
-				($this->getToolType() === Tool::TYPE_PICKAXE and ($tier = $item->isPickaxe()) !== false) or
-				($this->getToolType() === Tool::TYPE_AXE and ($tier = $item->isAxe()) !== false) or
-				($this->getToolType() === Tool::TYPE_SHOVEL and ($tier = $item->isShovel()) !== false)
+				($this->getToolType() === BlockToolType::TYPE_PICKAXE and ($tier = $item->isPickaxe()) !== false) or
+				($this->getToolType() === BlockToolType::TYPE_AXE and ($tier = $item->isAxe()) !== false) or
+				($this->getToolType() === BlockToolType::TYPE_SHOVEL and ($tier = $item->isShovel()) !== false)
 			){
 				switch($tier){
 					case TieredTool::TIER_WOODEN:
@@ -320,7 +319,7 @@ class Block extends Position implements BlockIds, Metadatable{
 	 * @return int
 	 */
 	public function getToolType() : int{
-		return Tool::TYPE_NONE;
+		return BlockToolType::TYPE_NONE;
 	}
 
 	/**
diff --git a/src/pocketmine/block/BlockToolType.php b/src/pocketmine/block/BlockToolType.php
new file mode 100644
index 0000000000..bc7a4ec775
--- /dev/null
+++ b/src/pocketmine/block/BlockToolType.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+/**
+ * Types of tools that can be used to break blocks
+ */
+interface BlockToolType{
+
+	public const TYPE_NONE = 0;
+	public const TYPE_SWORD = 1;
+	public const TYPE_SHOVEL = 2;
+	public const TYPE_PICKAXE = 3;
+	public const TYPE_AXE = 4;
+	public const TYPE_SHEARS = 5;
+
+}
\ No newline at end of file
diff --git a/src/pocketmine/block/BoneBlock.php b/src/pocketmine/block/BoneBlock.php
index a9cc91060f..6852bddb32 100644
--- a/src/pocketmine/block/BoneBlock.php
+++ b/src/pocketmine/block/BoneBlock.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\block\utils\PillarRotationHelper;
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -47,7 +46,7 @@ class BoneBlock extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
diff --git a/src/pocketmine/block/Bookshelf.php b/src/pocketmine/block/Bookshelf.php
index 62b6e0baf4..f46ce3bc23 100644
--- a/src/pocketmine/block/Bookshelf.php
+++ b/src/pocketmine/block/Bookshelf.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 
 class Bookshelf extends Solid{
 
@@ -44,7 +43,7 @@ class Bookshelf extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/BrewingStand.php b/src/pocketmine/block/BrewingStand.php
index b0bc1f6a90..2789d08dac 100644
--- a/src/pocketmine/block/BrewingStand.php
+++ b/src/pocketmine/block/BrewingStand.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class BrewingStand extends Transparent{
 
 	protected $id = self::BREWING_STAND_BLOCK;
@@ -42,7 +40,7 @@ class BrewingStand extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getVariantBitmask() : int{
diff --git a/src/pocketmine/block/BrickStairs.php b/src/pocketmine/block/BrickStairs.php
index 4cec98259e..1734057285 100644
--- a/src/pocketmine/block/BrickStairs.php
+++ b/src/pocketmine/block/BrickStairs.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class BrickStairs extends Stair{
 
 	protected $id = self::BRICK_STAIRS;
@@ -42,7 +40,7 @@ class BrickStairs extends Stair{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/Bricks.php b/src/pocketmine/block/Bricks.php
index 7182fe0259..38ce53abdc 100644
--- a/src/pocketmine/block/Bricks.php
+++ b/src/pocketmine/block/Bricks.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Bricks extends Solid{
 
@@ -44,7 +43,7 @@ class Bricks extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/BurningFurnace.php b/src/pocketmine/block/BurningFurnace.php
index a339352623..bdea392d17 100644
--- a/src/pocketmine/block/BurningFurnace.php
+++ b/src/pocketmine/block/BurningFurnace.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\StringTag;
 use pocketmine\Player;
@@ -49,7 +48,7 @@ class BurningFurnace extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getLightLevel() : int{
diff --git a/src/pocketmine/block/Chest.php b/src/pocketmine/block/Chest.php
index b318bf25a1..868fd102e3 100644
--- a/src/pocketmine/block/Chest.php
+++ b/src/pocketmine/block/Chest.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\StringTag;
@@ -49,7 +48,7 @@ class Chest extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	protected function recalculateBoundingBox() : ?AxisAlignedBB{
diff --git a/src/pocketmine/block/Clay.php b/src/pocketmine/block/Clay.php
index 44556cb0ae..716d3810ff 100644
--- a/src/pocketmine/block/Clay.php
+++ b/src/pocketmine/block/Clay.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 
 class Clay extends Solid{
 
@@ -40,7 +39,7 @@ class Clay extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/Coal.php b/src/pocketmine/block/Coal.php
index 8fe8be38d5..4776cde8cd 100644
--- a/src/pocketmine/block/Coal.php
+++ b/src/pocketmine/block/Coal.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Coal extends Solid{
 
@@ -40,7 +39,7 @@ class Coal extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/CoalOre.php b/src/pocketmine/block/CoalOre.php
index 773307caa1..e992445003 100644
--- a/src/pocketmine/block/CoalOre.php
+++ b/src/pocketmine/block/CoalOre.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class CoalOre extends Solid{
 
@@ -41,7 +40,7 @@ class CoalOre extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/Cobblestone.php b/src/pocketmine/block/Cobblestone.php
index aa914cb983..bcf330807d 100644
--- a/src/pocketmine/block/Cobblestone.php
+++ b/src/pocketmine/block/Cobblestone.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Cobblestone extends Solid{
 
@@ -36,7 +35,7 @@ class Cobblestone extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/CobblestoneStairs.php b/src/pocketmine/block/CobblestoneStairs.php
index 2e6b429ef1..bd58d6a15d 100644
--- a/src/pocketmine/block/CobblestoneStairs.php
+++ b/src/pocketmine/block/CobblestoneStairs.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class CobblestoneStairs extends Stair{
 
 	protected $id = self::COBBLESTONE_STAIRS;
@@ -38,7 +36,7 @@ class CobblestoneStairs extends Stair{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/CobblestoneWall.php b/src/pocketmine/block/CobblestoneWall.php
index a56909460b..2ab02c3f45 100644
--- a/src/pocketmine/block/CobblestoneWall.php
+++ b/src/pocketmine/block/CobblestoneWall.php
@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 
@@ -38,7 +37,7 @@ class CobblestoneWall extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getHardness() : float{
diff --git a/src/pocketmine/block/Cobweb.php b/src/pocketmine/block/Cobweb.php
index a419515709..095976e749 100644
--- a/src/pocketmine/block/Cobweb.php
+++ b/src/pocketmine/block/Cobweb.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 
 class Cobweb extends Flowable{
 
@@ -48,7 +47,7 @@ class Cobweb extends Flowable{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SWORD;
+		return BlockToolType::TYPE_SWORD;
 	}
 
 	public function onEntityCollide(Entity $entity) : void{
diff --git a/src/pocketmine/block/Concrete.php b/src/pocketmine/block/Concrete.php
index 9c796cf229..6c0095dd71 100644
--- a/src/pocketmine/block/Concrete.php
+++ b/src/pocketmine/block/Concrete.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\block\utils\ColorBlockMetaHelper;
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Concrete extends Solid{
 
@@ -45,7 +44,7 @@ class Concrete extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/ConcretePowder.php b/src/pocketmine/block/ConcretePowder.php
index b07f83cac4..4e8dc01871 100644
--- a/src/pocketmine/block/ConcretePowder.php
+++ b/src/pocketmine/block/ConcretePowder.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\ColorBlockMetaHelper;
-use pocketmine\item\Tool;
 use pocketmine\level\Level;
 
 class ConcretePowder extends Fallable{
@@ -44,7 +43,7 @@ class ConcretePowder extends Fallable{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	public function onUpdate(int $type){
diff --git a/src/pocketmine/block/CraftingTable.php b/src/pocketmine/block/CraftingTable.php
index c476746b8d..a91ba5d1ca 100644
--- a/src/pocketmine/block/CraftingTable.php
+++ b/src/pocketmine/block/CraftingTable.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\inventory\BigCraftingGrid;
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 use pocketmine\Player;
 
 class CraftingTable extends Solid{
@@ -45,7 +44,7 @@ class CraftingTable extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	public function onActivate(Item $item, Player $player = null) : bool{
diff --git a/src/pocketmine/block/DeadBush.php b/src/pocketmine/block/DeadBush.php
index 5267df76e9..d60b2945a6 100644
--- a/src/pocketmine/block/DeadBush.php
+++ b/src/pocketmine/block/DeadBush.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 
@@ -54,7 +53,7 @@ class DeadBush extends Flowable{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHEARS;
+		return BlockToolType::TYPE_SHEARS;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/Diamond.php b/src/pocketmine/block/Diamond.php
index a98a36007b..d3f602dbca 100644
--- a/src/pocketmine/block/Diamond.php
+++ b/src/pocketmine/block/Diamond.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Diamond extends Solid{
 
@@ -44,7 +43,7 @@ class Diamond extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/DiamondOre.php b/src/pocketmine/block/DiamondOre.php
index 567751f946..c96cb59a6e 100644
--- a/src/pocketmine/block/DiamondOre.php
+++ b/src/pocketmine/block/DiamondOre.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class DiamondOre extends Solid{
 
@@ -45,7 +44,7 @@ class DiamondOre extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/Dirt.php b/src/pocketmine/block/Dirt.php
index e97d62e1a4..4b92c11631 100644
--- a/src/pocketmine/block/Dirt.php
+++ b/src/pocketmine/block/Dirt.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 use pocketmine\Player;
 
 class Dirt extends Solid{
@@ -40,7 +39,7 @@ class Dirt extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/DoubleStoneSlab.php b/src/pocketmine/block/DoubleStoneSlab.php
index 52bcef8f51..8c7ef5857c 100644
--- a/src/pocketmine/block/DoubleStoneSlab.php
+++ b/src/pocketmine/block/DoubleStoneSlab.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class DoubleStoneSlab extends DoubleSlab{
 
@@ -40,7 +39,7 @@ class DoubleStoneSlab extends DoubleSlab{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/DoubleWoodenSlab.php b/src/pocketmine/block/DoubleWoodenSlab.php
index 087a651c44..1eea2fa209 100644
--- a/src/pocketmine/block/DoubleWoodenSlab.php
+++ b/src/pocketmine/block/DoubleWoodenSlab.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class DoubleWoodenSlab extends DoubleSlab{
 
 	protected $id = self::DOUBLE_WOODEN_SLAB;
@@ -38,6 +36,6 @@ class DoubleWoodenSlab extends DoubleSlab{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 }
\ No newline at end of file
diff --git a/src/pocketmine/block/Emerald.php b/src/pocketmine/block/Emerald.php
index f944b57f34..f13886d1c8 100644
--- a/src/pocketmine/block/Emerald.php
+++ b/src/pocketmine/block/Emerald.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Emerald extends Solid{
 
@@ -40,7 +39,7 @@ class Emerald extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/EmeraldOre.php b/src/pocketmine/block/EmeraldOre.php
index 19e13102ec..51de4fa990 100644
--- a/src/pocketmine/block/EmeraldOre.php
+++ b/src/pocketmine/block/EmeraldOre.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class EmeraldOre extends Solid{
 
@@ -41,7 +40,7 @@ class EmeraldOre extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getHardness() : float{
diff --git a/src/pocketmine/block/EnchantingTable.php b/src/pocketmine/block/EnchantingTable.php
index a2bb7a8016..8d6952832d 100644
--- a/src/pocketmine/block/EnchantingTable.php
+++ b/src/pocketmine/block/EnchantingTable.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\inventory\EnchantInventory;
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\tile\EnchantTable as TileEnchantTable;
@@ -61,7 +60,7 @@ class EnchantingTable extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function onActivate(Item $item, Player $player = null) : bool{
diff --git a/src/pocketmine/block/EndStone.php b/src/pocketmine/block/EndStone.php
index 3b4910dccc..f4dd36830c 100644
--- a/src/pocketmine/block/EndStone.php
+++ b/src/pocketmine/block/EndStone.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class EndStone extends Solid{
 
 	protected $id = self::END_STONE;
@@ -38,7 +36,7 @@ class EndStone extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getHardness() : float{
diff --git a/src/pocketmine/block/EndStoneBricks.php b/src/pocketmine/block/EndStoneBricks.php
index b08d45a3fe..a7c95a503f 100644
--- a/src/pocketmine/block/EndStoneBricks.php
+++ b/src/pocketmine/block/EndStoneBricks.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class EndStoneBricks extends Solid{
 
@@ -44,7 +43,7 @@ class EndStoneBricks extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/EnderChest.php b/src/pocketmine/block/EnderChest.php
index 06285ea29e..8dc7cfbf39 100644
--- a/src/pocketmine/block/EnderChest.php
+++ b/src/pocketmine/block/EnderChest.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\tile\EnderChest as TileEnderChest;
@@ -53,7 +52,7 @@ class EnderChest extends Chest{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
diff --git a/src/pocketmine/block/Farmland.php b/src/pocketmine/block/Farmland.php
index eca14457ad..99af796fea 100644
--- a/src/pocketmine/block/Farmland.php
+++ b/src/pocketmine/block/Farmland.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -47,7 +46,7 @@ class Farmland extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	public function ticksRandomly() : bool{
diff --git a/src/pocketmine/block/FenceGate.php b/src/pocketmine/block/FenceGate.php
index e401faa214..a0e9da31e9 100644
--- a/src/pocketmine/block/FenceGate.php
+++ b/src/pocketmine/block/FenceGate.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 use pocketmine\level\sound\DoorSound;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -37,7 +36,7 @@ class FenceGate extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 
diff --git a/src/pocketmine/block/GlazedTerracotta.php b/src/pocketmine/block/GlazedTerracotta.php
index 71d31c191d..6faef4d3c9 100644
--- a/src/pocketmine/block/GlazedTerracotta.php
+++ b/src/pocketmine/block/GlazedTerracotta.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -37,7 +36,7 @@ class GlazedTerracotta extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
diff --git a/src/pocketmine/block/Glowstone.php b/src/pocketmine/block/Glowstone.php
index 5ac7ab34f3..35fa634ac6 100644
--- a/src/pocketmine/block/Glowstone.php
+++ b/src/pocketmine/block/Glowstone.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 
 class Glowstone extends Transparent{
 
@@ -44,7 +43,7 @@ class Glowstone extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getLightLevel() : int{
diff --git a/src/pocketmine/block/Gold.php b/src/pocketmine/block/Gold.php
index 26c2fb9856..10625d00bc 100644
--- a/src/pocketmine/block/Gold.php
+++ b/src/pocketmine/block/Gold.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Gold extends Solid{
 
@@ -44,7 +43,7 @@ class Gold extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/GoldOre.php b/src/pocketmine/block/GoldOre.php
index eae18b7e3b..5e47730ae7 100644
--- a/src/pocketmine/block/GoldOre.php
+++ b/src/pocketmine/block/GoldOre.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class GoldOre extends Solid{
 
@@ -44,7 +43,7 @@ class GoldOre extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/Grass.php b/src/pocketmine/block/Grass.php
index 9a2a4b6557..0a052a8aac 100644
--- a/src/pocketmine/block/Grass.php
+++ b/src/pocketmine/block/Grass.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 use pocketmine\level\generator\object\TallGrass as TallGrassObject;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
@@ -50,7 +49,7 @@ class Grass extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/GrassPath.php b/src/pocketmine/block/GrassPath.php
index de06407988..090c857d81 100644
--- a/src/pocketmine/block/GrassPath.php
+++ b/src/pocketmine/block/GrassPath.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -43,7 +42,7 @@ class GrassPath extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	protected function recalculateBoundingBox() : ?AxisAlignedBB{
diff --git a/src/pocketmine/block/Gravel.php b/src/pocketmine/block/Gravel.php
index 12ce9272bc..fd81a7cff7 100644
--- a/src/pocketmine/block/Gravel.php
+++ b/src/pocketmine/block/Gravel.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 
 class Gravel extends Fallable{
 
@@ -44,7 +43,7 @@ class Gravel extends Fallable{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/HardenedClay.php b/src/pocketmine/block/HardenedClay.php
index 1e7a1b0bb1..edfd85f307 100644
--- a/src/pocketmine/block/HardenedClay.php
+++ b/src/pocketmine/block/HardenedClay.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class HardenedClay extends Solid{
 
 	protected $id = self::HARDENED_CLAY;
@@ -38,7 +36,7 @@ class HardenedClay extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getHardness() : float{
diff --git a/src/pocketmine/block/Ice.php b/src/pocketmine/block/Ice.php
index 3006153cda..ea7f8d02b0 100644
--- a/src/pocketmine/block/Ice.php
+++ b/src/pocketmine/block/Ice.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\Player;
 
@@ -53,7 +52,7 @@ class Ice extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function onBreak(Item $item, Player $player = null) : bool{
diff --git a/src/pocketmine/block/Iron.php b/src/pocketmine/block/Iron.php
index 66bccf4d0a..d50af3c802 100644
--- a/src/pocketmine/block/Iron.php
+++ b/src/pocketmine/block/Iron.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Iron extends Solid{
 
@@ -40,7 +39,7 @@ class Iron extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getHardness() : float{
diff --git a/src/pocketmine/block/IronBars.php b/src/pocketmine/block/IronBars.php
index dca40a97d9..0ff17c8d43 100644
--- a/src/pocketmine/block/IronBars.php
+++ b/src/pocketmine/block/IronBars.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class IronBars extends Thin{
 
@@ -44,7 +43,7 @@ class IronBars extends Thin{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getVariantBitmask() : int{
diff --git a/src/pocketmine/block/IronDoor.php b/src/pocketmine/block/IronDoor.php
index 2af54e6a6f..195544264b 100644
--- a/src/pocketmine/block/IronDoor.php
+++ b/src/pocketmine/block/IronDoor.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class IronDoor extends Door{
 
@@ -42,7 +41,7 @@ class IronDoor extends Door{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getHardness() : float{
diff --git a/src/pocketmine/block/IronOre.php b/src/pocketmine/block/IronOre.php
index 54cf2672c3..76ad80f38b 100644
--- a/src/pocketmine/block/IronOre.php
+++ b/src/pocketmine/block/IronOre.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class IronOre extends Solid{
 
@@ -40,7 +39,7 @@ class IronOre extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getHardness() : float{
diff --git a/src/pocketmine/block/IronTrapdoor.php b/src/pocketmine/block/IronTrapdoor.php
index 3fd776ea40..197141a7d7 100644
--- a/src/pocketmine/block/IronTrapdoor.php
+++ b/src/pocketmine/block/IronTrapdoor.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class IronTrapdoor extends Trapdoor{
 
 	protected $id = self::IRON_TRAPDOOR;
@@ -38,6 +36,6 @@ class IronTrapdoor extends Trapdoor{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 }
diff --git a/src/pocketmine/block/Ladder.php b/src/pocketmine/block/Ladder.php
index 7917adf6fa..384e845edd 100644
--- a/src/pocketmine/block/Ladder.php
+++ b/src/pocketmine/block/Ladder.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -122,7 +121,7 @@ class Ladder extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	public function getVariantBitmask() : int{
diff --git a/src/pocketmine/block/Lapis.php b/src/pocketmine/block/Lapis.php
index afb13718b0..780e3d2217 100644
--- a/src/pocketmine/block/Lapis.php
+++ b/src/pocketmine/block/Lapis.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Lapis extends Solid{
 
@@ -40,7 +39,7 @@ class Lapis extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getHardness() : float{
diff --git a/src/pocketmine/block/LapisOre.php b/src/pocketmine/block/LapisOre.php
index 8e1d4124b2..35ed16e86d 100644
--- a/src/pocketmine/block/LapisOre.php
+++ b/src/pocketmine/block/LapisOre.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class LapisOre extends Solid{
 
@@ -41,7 +40,7 @@ class LapisOre extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/Leaves.php b/src/pocketmine/block/Leaves.php
index f5e5267f17..b70631367f 100644
--- a/src/pocketmine/block/Leaves.php
+++ b/src/pocketmine/block/Leaves.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\event\block\LeavesDecayEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -51,7 +50,7 @@ class Leaves extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHEARS;
+		return BlockToolType::TYPE_SHEARS;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/Magma.php b/src/pocketmine/block/Magma.php
index 44d522bce4..a8ba28bbb5 100644
--- a/src/pocketmine/block/Magma.php
+++ b/src/pocketmine/block/Magma.php
@@ -28,7 +28,6 @@ use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Magma extends Solid{
 
@@ -47,7 +46,7 @@ class Magma extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getLightLevel() : int{
diff --git a/src/pocketmine/block/Melon.php b/src/pocketmine/block/Melon.php
index 6e2725f110..8f36d32909 100644
--- a/src/pocketmine/block/Melon.php
+++ b/src/pocketmine/block/Melon.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 
 class Melon extends Transparent{
 
@@ -44,7 +43,7 @@ class Melon extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/MonsterSpawner.php b/src/pocketmine/block/MonsterSpawner.php
index 22ba86456a..f1e06d77b8 100644
--- a/src/pocketmine/block/MonsterSpawner.php
+++ b/src/pocketmine/block/MonsterSpawner.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 
 class MonsterSpawner extends Transparent{
 
@@ -39,7 +38,7 @@ class MonsterSpawner extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/Mycelium.php b/src/pocketmine/block/Mycelium.php
index be6026fa17..f024f98695 100644
--- a/src/pocketmine/block/Mycelium.php
+++ b/src/pocketmine/block/Mycelium.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Server;
@@ -44,7 +43,7 @@ class Mycelium extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	public function getHardness() : float{
diff --git a/src/pocketmine/block/NetherBrick.php b/src/pocketmine/block/NetherBrick.php
index d32907a6ff..957b29f361 100644
--- a/src/pocketmine/block/NetherBrick.php
+++ b/src/pocketmine/block/NetherBrick.php
@@ -25,12 +25,11 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class NetherBrick extends Solid{
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getHardness() : float{
diff --git a/src/pocketmine/block/NetherBrickFence.php b/src/pocketmine/block/NetherBrickFence.php
index ce1926e09c..cb9435c7bd 100644
--- a/src/pocketmine/block/NetherBrickFence.php
+++ b/src/pocketmine/block/NetherBrickFence.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class NetherBrickFence extends Fence{
 
@@ -36,7 +35,7 @@ class NetherBrickFence extends Fence{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/NetherBrickStairs.php b/src/pocketmine/block/NetherBrickStairs.php
index 67f380cc70..14083b3938 100644
--- a/src/pocketmine/block/NetherBrickStairs.php
+++ b/src/pocketmine/block/NetherBrickStairs.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class NetherBrickStairs extends Stair{
 
 	protected $id = self::NETHER_BRICK_STAIRS;
@@ -42,7 +40,7 @@ class NetherBrickStairs extends Stair{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 }
\ No newline at end of file
diff --git a/src/pocketmine/block/NetherQuartzOre.php b/src/pocketmine/block/NetherQuartzOre.php
index cbda5f05d1..7bc7a555f0 100644
--- a/src/pocketmine/block/NetherQuartzOre.php
+++ b/src/pocketmine/block/NetherQuartzOre.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class NetherQuartzOre extends Solid{
 
@@ -45,7 +44,7 @@ class NetherQuartzOre extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/NetherReactor.php b/src/pocketmine/block/NetherReactor.php
index 353ab70367..b5c82b0a7d 100644
--- a/src/pocketmine/block/NetherReactor.php
+++ b/src/pocketmine/block/NetherReactor.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class NetherReactor extends Solid{
 	protected $id = Block::NETHER_REACTOR;
@@ -45,7 +44,7 @@ class NetherReactor extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getHardness() : float{
diff --git a/src/pocketmine/block/Netherrack.php b/src/pocketmine/block/Netherrack.php
index 02fd8b700e..eed176e57d 100644
--- a/src/pocketmine/block/Netherrack.php
+++ b/src/pocketmine/block/Netherrack.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Netherrack extends Solid{
 
@@ -44,7 +43,7 @@ class Netherrack extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/Obsidian.php b/src/pocketmine/block/Obsidian.php
index cd697d4ec4..918542682a 100644
--- a/src/pocketmine/block/Obsidian.php
+++ b/src/pocketmine/block/Obsidian.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Obsidian extends Solid{
 
@@ -40,7 +39,7 @@ class Obsidian extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getHardness() : float{
diff --git a/src/pocketmine/block/PackedIce.php b/src/pocketmine/block/PackedIce.php
index 38b68f5d06..378868ef96 100644
--- a/src/pocketmine/block/PackedIce.php
+++ b/src/pocketmine/block/PackedIce.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class PackedIce extends Solid{
 
 	protected $id = self::PACKED_ICE;
@@ -46,7 +44,7 @@ class PackedIce extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 }
\ No newline at end of file
diff --git a/src/pocketmine/block/Planks.php b/src/pocketmine/block/Planks.php
index 8fa7a46d88..77d6a773d5 100644
--- a/src/pocketmine/block/Planks.php
+++ b/src/pocketmine/block/Planks.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class Planks extends Solid{
 	public const OAK = 0;
 	public const SPRUCE = 1;
@@ -44,7 +42,7 @@ class Planks extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/Podzol.php b/src/pocketmine/block/Podzol.php
index 77b937203d..b30c5cc8e8 100644
--- a/src/pocketmine/block/Podzol.php
+++ b/src/pocketmine/block/Podzol.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class Podzol extends Solid{
 
 	protected $id = self::PODZOL;
@@ -34,7 +32,7 @@ class Podzol extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/Prismarine.php b/src/pocketmine/block/Prismarine.php
index 7120477a19..e8119fc67e 100644
--- a/src/pocketmine/block/Prismarine.php
+++ b/src/pocketmine/block/Prismarine.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Prismarine extends Solid{
 
@@ -53,7 +52,7 @@ class Prismarine extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getVariantBitmask() : int{
diff --git a/src/pocketmine/block/Pumpkin.php b/src/pocketmine/block/Pumpkin.php
index b9d77b3eee..a32896878d 100644
--- a/src/pocketmine/block/Pumpkin.php
+++ b/src/pocketmine/block/Pumpkin.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -41,7 +40,7 @@ class Pumpkin extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/PurpurStairs.php b/src/pocketmine/block/PurpurStairs.php
index 3298051da0..0be5fa1829 100644
--- a/src/pocketmine/block/PurpurStairs.php
+++ b/src/pocketmine/block/PurpurStairs.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class PurpurStairs extends Stair{
 
 	protected $id = self::PURPUR_STAIRS;
@@ -38,7 +36,7 @@ class PurpurStairs extends Stair{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getHardness() : float{
diff --git a/src/pocketmine/block/Quartz.php b/src/pocketmine/block/Quartz.php
index 67d35f6fdd..3badbb9131 100644
--- a/src/pocketmine/block/Quartz.php
+++ b/src/pocketmine/block/Quartz.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\block\utils\PillarRotationHelper;
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -63,7 +62,7 @@ class Quartz extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getVariantBitmask() : int{
diff --git a/src/pocketmine/block/QuartzStairs.php b/src/pocketmine/block/QuartzStairs.php
index b5905f6474..3e1f6662e0 100644
--- a/src/pocketmine/block/QuartzStairs.php
+++ b/src/pocketmine/block/QuartzStairs.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class QuartzStairs extends Stair{
 
 	protected $id = self::QUARTZ_STAIRS;
@@ -38,7 +36,7 @@ class QuartzStairs extends Stair{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/RedMushroomBlock.php b/src/pocketmine/block/RedMushroomBlock.php
index 9d2e416e77..80c77c6f09 100644
--- a/src/pocketmine/block/RedMushroomBlock.php
+++ b/src/pocketmine/block/RedMushroomBlock.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 
 class RedMushroomBlock extends Solid{
 
@@ -43,7 +42,7 @@ class RedMushroomBlock extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/Redstone.php b/src/pocketmine/block/Redstone.php
index 36ef9c2cf1..3517bf6ebf 100644
--- a/src/pocketmine/block/Redstone.php
+++ b/src/pocketmine/block/Redstone.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Redstone extends Solid{
 
@@ -40,7 +39,7 @@ class Redstone extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/RedstoneOre.php b/src/pocketmine/block/RedstoneOre.php
index 6b398c4dfe..19e26b4228 100644
--- a/src/pocketmine/block/RedstoneOre.php
+++ b/src/pocketmine/block/RedstoneOre.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -62,7 +61,7 @@ class RedstoneOre extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/Sand.php b/src/pocketmine/block/Sand.php
index 196b303ae3..a3b94bc8b8 100644
--- a/src/pocketmine/block/Sand.php
+++ b/src/pocketmine/block/Sand.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class Sand extends Fallable{
 
 	protected $id = self::SAND;
@@ -38,7 +36,7 @@ class Sand extends Fallable{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/Sandstone.php b/src/pocketmine/block/Sandstone.php
index 72b4ce4938..9eccd0c278 100644
--- a/src/pocketmine/block/Sandstone.php
+++ b/src/pocketmine/block/Sandstone.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Sandstone extends Solid{
 
@@ -53,7 +52,7 @@ class Sandstone extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getVariantBitmask() : int{
diff --git a/src/pocketmine/block/SandstoneStairs.php b/src/pocketmine/block/SandstoneStairs.php
index 8204253f07..6772ba6ca2 100644
--- a/src/pocketmine/block/SandstoneStairs.php
+++ b/src/pocketmine/block/SandstoneStairs.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class SandstoneStairs extends Stair{
 
 	protected $id = self::SANDSTONE_STAIRS;
@@ -38,7 +36,7 @@ class SandstoneStairs extends Stair{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/SignPost.php b/src/pocketmine/block/SignPost.php
index 63225b8793..8a3700bd4a 100644
--- a/src/pocketmine/block/SignPost.php
+++ b/src/pocketmine/block/SignPost.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -91,7 +90,7 @@ class SignPost extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	public function getVariantBitmask() : int{
diff --git a/src/pocketmine/block/Snow.php b/src/pocketmine/block/Snow.php
index d9c0ceabfe..78102fd5a7 100644
--- a/src/pocketmine/block/Snow.php
+++ b/src/pocketmine/block/Snow.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class Snow extends Solid{
 
 	protected $id = self::SNOW_BLOCK;
@@ -38,7 +36,7 @@ class Snow extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/SnowLayer.php b/src/pocketmine/block/SnowLayer.php
index b618b88757..e778e28ac0 100644
--- a/src/pocketmine/block/SnowLayer.php
+++ b/src/pocketmine/block/SnowLayer.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -51,7 +50,7 @@ class SnowLayer extends Flowable{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	public function ticksRandomly() : bool{
diff --git a/src/pocketmine/block/SoulSand.php b/src/pocketmine/block/SoulSand.php
index c3e9bd6fb2..e7bc0e88da 100644
--- a/src/pocketmine/block/SoulSand.php
+++ b/src/pocketmine/block/SoulSand.php
@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 
 class SoulSand extends Solid{
@@ -43,7 +42,7 @@ class SoulSand extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	protected function recalculateBoundingBox() : ?AxisAlignedBB{
diff --git a/src/pocketmine/block/StainedClay.php b/src/pocketmine/block/StainedClay.php
index c44e1ccc27..5b10ff879d 100644
--- a/src/pocketmine/block/StainedClay.php
+++ b/src/pocketmine/block/StainedClay.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\ColorBlockMetaHelper;
-use pocketmine\item\Tool;
 
 class StainedClay extends Solid{
 
@@ -39,7 +38,7 @@ class StainedClay extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/Stair.php b/src/pocketmine/block/Stair.php
index 8e359fc61b..443f1c283a 100644
--- a/src/pocketmine/block/Stair.php
+++ b/src/pocketmine/block/Stair.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
diff --git a/src/pocketmine/block/StandingBanner.php b/src/pocketmine/block/StandingBanner.php
index ee25c8be3d..d00e43094e 100644
--- a/src/pocketmine/block/StandingBanner.php
+++ b/src/pocketmine/block/StandingBanner.php
@@ -23,11 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\ItemFactory;
-use pocketmine\math\AxisAlignedBB;
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
+use pocketmine\item\ItemFactory;
 use pocketmine\level\Level;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\tile\Banner as TileBanner;
@@ -89,7 +88,7 @@ class StandingBanner extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	public function getVariantBitmask() : int{
diff --git a/src/pocketmine/block/Stone.php b/src/pocketmine/block/Stone.php
index 32ec2ab939..2d8baf1f43 100644
--- a/src/pocketmine/block/Stone.php
+++ b/src/pocketmine/block/Stone.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Stone extends Solid{
 	public const NORMAL = 0;
@@ -48,7 +47,7 @@ class Stone extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/StoneBrickStairs.php b/src/pocketmine/block/StoneBrickStairs.php
index cb7397065e..befb05cfd0 100644
--- a/src/pocketmine/block/StoneBrickStairs.php
+++ b/src/pocketmine/block/StoneBrickStairs.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class StoneBrickStairs extends Stair{
 
 	protected $id = self::STONE_BRICK_STAIRS;
@@ -34,7 +32,7 @@ class StoneBrickStairs extends Stair{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getHardness() : float{
diff --git a/src/pocketmine/block/StoneBricks.php b/src/pocketmine/block/StoneBricks.php
index 3134126ad4..a193f96b7b 100644
--- a/src/pocketmine/block/StoneBricks.php
+++ b/src/pocketmine/block/StoneBricks.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class StoneBricks extends Solid{
 	public const NORMAL = 0;
@@ -44,7 +43,7 @@ class StoneBricks extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/StoneButton.php b/src/pocketmine/block/StoneButton.php
index 7749f446bf..a677e0f305 100644
--- a/src/pocketmine/block/StoneButton.php
+++ b/src/pocketmine/block/StoneButton.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class StoneButton extends Button{
 
 	protected $id = self::STONE_BUTTON;
@@ -38,6 +36,6 @@ class StoneButton extends Button{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 }
diff --git a/src/pocketmine/block/StoneSlab.php b/src/pocketmine/block/StoneSlab.php
index 44517c237f..47eb795a60 100644
--- a/src/pocketmine/block/StoneSlab.php
+++ b/src/pocketmine/block/StoneSlab.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class StoneSlab extends Slab{
 	public const STONE = 0;
@@ -62,7 +61,7 @@ class StoneSlab extends Slab{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/Stonecutter.php b/src/pocketmine/block/Stonecutter.php
index 328eb75727..a7fdb0976e 100644
--- a/src/pocketmine/block/Stonecutter.php
+++ b/src/pocketmine/block/Stonecutter.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Stonecutter extends Solid{
 
@@ -40,7 +39,7 @@ class Stonecutter extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/Trapdoor.php b/src/pocketmine/block/Trapdoor.php
index 560ab038a3..25c747cbdc 100644
--- a/src/pocketmine/block/Trapdoor.php
+++ b/src/pocketmine/block/Trapdoor.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 use pocketmine\level\sound\DoorSound;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -153,7 +152,7 @@ class Trapdoor extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	public function getFuelTime() : int{
diff --git a/src/pocketmine/block/Vine.php b/src/pocketmine/block/Vine.php
index 59ecd06ce7..bc6c0516b5 100644
--- a/src/pocketmine/block/Vine.php
+++ b/src/pocketmine/block/Vine.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -209,6 +208,6 @@ class Vine extends Flowable{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 }
\ No newline at end of file
diff --git a/src/pocketmine/block/Wood.php b/src/pocketmine/block/Wood.php
index 750e0999f9..ee285badcc 100644
--- a/src/pocketmine/block/Wood.php
+++ b/src/pocketmine/block/Wood.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\block\utils\PillarRotationHelper;
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -65,7 +64,7 @@ class Wood extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	public function getFuelTime() : int{
diff --git a/src/pocketmine/block/WoodenButton.php b/src/pocketmine/block/WoodenButton.php
index 79f56d950c..a62225cc2e 100644
--- a/src/pocketmine/block/WoodenButton.php
+++ b/src/pocketmine/block/WoodenButton.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class WoodenButton extends Button{
 
 	protected $id = self::WOODEN_BUTTON;
@@ -38,6 +36,6 @@ class WoodenButton extends Button{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 }
diff --git a/src/pocketmine/block/WoodenDoor.php b/src/pocketmine/block/WoodenDoor.php
index 401e443dbe..3e55b6e5d7 100644
--- a/src/pocketmine/block/WoodenDoor.php
+++ b/src/pocketmine/block/WoodenDoor.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class WoodenDoor extends Door{
 
 	public function getHardness() : float{
@@ -32,6 +30,6 @@ class WoodenDoor extends Door{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 }
\ No newline at end of file
diff --git a/src/pocketmine/block/WoodenFence.php b/src/pocketmine/block/WoodenFence.php
index 7429f441d0..09e0efd38a 100644
--- a/src/pocketmine/block/WoodenFence.php
+++ b/src/pocketmine/block/WoodenFence.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class WoodenFence extends Fence{
 	public const FENCE_OAK = 0;
 	public const FENCE_SPRUCE = 1;
@@ -40,7 +38,7 @@ class WoodenFence extends Fence{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/block/WoodenSlab.php b/src/pocketmine/block/WoodenSlab.php
index b5f680c666..b9e2d3adc3 100644
--- a/src/pocketmine/block/WoodenSlab.php
+++ b/src/pocketmine/block/WoodenSlab.php
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class WoodenSlab extends Slab{
 
 	protected $id = self::WOODEN_SLAB;
@@ -50,7 +48,7 @@ class WoodenSlab extends Slab{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	public function getFuelTime() : int{
diff --git a/src/pocketmine/block/WoodenStairs.php b/src/pocketmine/block/WoodenStairs.php
index c813924e32..f6f54f3ccb 100644
--- a/src/pocketmine/block/WoodenStairs.php
+++ b/src/pocketmine/block/WoodenStairs.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 
 class WoodenStairs extends Stair{
 
@@ -38,7 +37,7 @@ class WoodenStairs extends Stair{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/pocketmine/block/Wool.php b/src/pocketmine/block/Wool.php
index 4a41732c73..0ea6738041 100644
--- a/src/pocketmine/block/Wool.php
+++ b/src/pocketmine/block/Wool.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\ColorBlockMetaHelper;
-use pocketmine\item\Tool;
 
 class Wool extends Solid{
 
@@ -39,7 +38,7 @@ class Wool extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHEARS;
+		return BlockToolType::TYPE_SHEARS;
 	}
 
 	public function getName() : string{
diff --git a/src/pocketmine/item/Tool.php b/src/pocketmine/item/Tool.php
index 7c96e15280..73848d800b 100644
--- a/src/pocketmine/item/Tool.php
+++ b/src/pocketmine/item/Tool.php
@@ -24,17 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 use pocketmine\block\Block;
+use pocketmine\block\BlockToolType;
 use pocketmine\entity\Entity;
 
 abstract class Tool extends Durable{
 
-	public const TYPE_NONE = 0;
-	public const TYPE_SWORD = 1;
-	public const TYPE_SHOVEL = 2;
-	public const TYPE_PICKAXE = 3;
-	public const TYPE_AXE = 4;
-	public const TYPE_SHEARS = 5;
-
 	public function getMaxStackSize() : int{
 		return 1;
 	}
@@ -53,11 +47,11 @@ abstract class Tool extends Durable{
 
 		if($object instanceof Block){
 			if(
-				$object->getToolType() === Tool::TYPE_PICKAXE and $this->isPickaxe() or
-				$object->getToolType() === Tool::TYPE_SHOVEL and $this->isShovel() or
-				$object->getToolType() === Tool::TYPE_AXE and $this->isAxe() or
-				$object->getToolType() === Tool::TYPE_SWORD and $this->isSword() or
-				$object->getToolType() === Tool::TYPE_SHEARS and $this->isShears()
+				$object->getToolType() === BlockToolType::TYPE_PICKAXE and $this->isPickaxe() or
+				$object->getToolType() === BlockToolType::TYPE_SHOVEL and $this->isShovel() or
+				$object->getToolType() === BlockToolType::TYPE_AXE and $this->isAxe() or
+				$object->getToolType() === BlockToolType::TYPE_SWORD and $this->isSword() or
+				$object->getToolType() === BlockToolType::TYPE_SHEARS and $this->isShears()
 			){
 				$this->applyDamage(1);
 			}elseif(!$this->isShears() and $object->getBreakTime($this) > 0){