From 9a5ffbe56c85e19ed6b7e8e7c0ccfe1fb649dcb0 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Wed, 2 Apr 2014 04:26:53 +0200
Subject: [PATCH] Added Tool for Items, new items

---
 src/pocketmine/item/Bow.php            |  30 ++++
 src/pocketmine/item/DiamondAxe.php     |  30 ++++
 src/pocketmine/item/DiamondHoe.php     |  30 ++++
 src/pocketmine/item/DiamondPickaxe.php |  30 ++++
 src/pocketmine/item/DiamondShovel.php  |  30 ++++
 src/pocketmine/item/DiamondSword.php   |  30 ++++
 src/pocketmine/item/FlintSteel.php     |   3 +-
 src/pocketmine/item/GoldAxe.php        |  30 ++++
 src/pocketmine/item/GoldHoe.php        |  30 ++++
 src/pocketmine/item/GoldPickaxe.php    |  30 ++++
 src/pocketmine/item/GoldShovel.php     |  30 ++++
 src/pocketmine/item/GoldSword.php      |  30 ++++
 src/pocketmine/item/IronAxe.php        |   2 +-
 src/pocketmine/item/IronHoe.php        |   2 +-
 src/pocketmine/item/IronPickaxe.php    |   2 +-
 src/pocketmine/item/IronShovel.php     |   2 +-
 src/pocketmine/item/Item.php           | 198 ++++++++-----------------
 src/pocketmine/item/Shears.php         |  29 ++++
 src/pocketmine/item/StoneAxe.php       |  30 ++++
 src/pocketmine/item/StoneHoe.php       |  30 ++++
 src/pocketmine/item/StonePickaxe.php   |  30 ++++
 src/pocketmine/item/StoneShovel.php    |  30 ++++
 src/pocketmine/item/StoneSword.php     |  30 ++++
 src/pocketmine/item/Tool.php           | 177 ++++++++++++++++++++++
 src/pocketmine/item/WoodenAxe.php      |   2 +-
 src/pocketmine/item/WoodenHoe.php      |  30 ++++
 src/pocketmine/item/WoodenPickaxe.php  |   2 +-
 src/pocketmine/item/WoodenShovel.php   |   2 +-
 src/pocketmine/item/WoodenSword.php    |   2 +-
 29 files changed, 788 insertions(+), 145 deletions(-)
 create mode 100644 src/pocketmine/item/Bow.php
 create mode 100644 src/pocketmine/item/DiamondAxe.php
 create mode 100644 src/pocketmine/item/DiamondHoe.php
 create mode 100644 src/pocketmine/item/DiamondPickaxe.php
 create mode 100644 src/pocketmine/item/DiamondShovel.php
 create mode 100644 src/pocketmine/item/DiamondSword.php
 create mode 100644 src/pocketmine/item/GoldAxe.php
 create mode 100644 src/pocketmine/item/GoldHoe.php
 create mode 100644 src/pocketmine/item/GoldPickaxe.php
 create mode 100644 src/pocketmine/item/GoldShovel.php
 create mode 100644 src/pocketmine/item/GoldSword.php
 create mode 100644 src/pocketmine/item/Shears.php
 create mode 100644 src/pocketmine/item/StoneAxe.php
 create mode 100644 src/pocketmine/item/StoneHoe.php
 create mode 100644 src/pocketmine/item/StonePickaxe.php
 create mode 100644 src/pocketmine/item/StoneShovel.php
 create mode 100644 src/pocketmine/item/StoneSword.php
 create mode 100644 src/pocketmine/item/Tool.php
 create mode 100644 src/pocketmine/item/WoodenHoe.php

diff --git a/src/pocketmine/item/Bow.php b/src/pocketmine/item/Bow.php
new file mode 100644
index 000000000..60cfbf8de
--- /dev/null
+++ b/src/pocketmine/item/Bow.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class Bow extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::BOW, 0, $count, "Bow");
+	}
+
+}
\ No newline at end of file
diff --git a/src/pocketmine/item/DiamondAxe.php b/src/pocketmine/item/DiamondAxe.php
new file mode 100644
index 000000000..9ec10af27
--- /dev/null
+++ b/src/pocketmine/item/DiamondAxe.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class DiamondAxe extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::DIAMOND_AXE, 0, $count, "Diamond Axe");
+	}
+
+}
\ No newline at end of file
diff --git a/src/pocketmine/item/DiamondHoe.php b/src/pocketmine/item/DiamondHoe.php
new file mode 100644
index 000000000..c9ed1fac8
--- /dev/null
+++ b/src/pocketmine/item/DiamondHoe.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class DiamondHoe extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::DIAMOND_HOE, 0, $count, "Diamond Hoe");
+	}
+
+}
\ No newline at end of file
diff --git a/src/pocketmine/item/DiamondPickaxe.php b/src/pocketmine/item/DiamondPickaxe.php
new file mode 100644
index 000000000..9ae507ee0
--- /dev/null
+++ b/src/pocketmine/item/DiamondPickaxe.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class DiamondPickaxe extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::DIAMOND_PICKAXE, 0, $count, "Diamond Pickaxe");
+	}
+
+}
diff --git a/src/pocketmine/item/DiamondShovel.php b/src/pocketmine/item/DiamondShovel.php
new file mode 100644
index 000000000..52eebbee6
--- /dev/null
+++ b/src/pocketmine/item/DiamondShovel.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class DiamondShovel extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::DIAMOND_SHOVEL, 0, $count, "Diamond Shovel");
+	}
+
+}
diff --git a/src/pocketmine/item/DiamondSword.php b/src/pocketmine/item/DiamondSword.php
new file mode 100644
index 000000000..22de5b8a2
--- /dev/null
+++ b/src/pocketmine/item/DiamondSword.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class DiamondSword extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::DIAMOND_SWORD, 0, $count, "Diamond Sword");
+	}
+
+}
diff --git a/src/pocketmine/item/FlintSteel.php b/src/pocketmine/item/FlintSteel.php
index cb52f4b0c..346629302 100644
--- a/src/pocketmine/item/FlintSteel.php
+++ b/src/pocketmine/item/FlintSteel.php
@@ -27,11 +27,10 @@ use pocketmine\block\Solid;
 use pocketmine\level\Level;
 use pocketmine\Player;
 
-class FlintSteel extends Item{
+class FlintSteel extends Tool{
 	public function __construct($meta = 0, $count = 1){
 		parent::__construct(self::FLINT_STEEL, $meta, $count, "Flint and Steel");
 		$this->isActivable = true;
-		$this->maxStackSize = 1;
 	}
 
 	public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
diff --git a/src/pocketmine/item/GoldAxe.php b/src/pocketmine/item/GoldAxe.php
new file mode 100644
index 000000000..35998e2df
--- /dev/null
+++ b/src/pocketmine/item/GoldAxe.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class GoldAxe extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::GOLD_AXE, 0, $count, "Gold Axe");
+	}
+
+}
\ No newline at end of file
diff --git a/src/pocketmine/item/GoldHoe.php b/src/pocketmine/item/GoldHoe.php
new file mode 100644
index 000000000..402df9435
--- /dev/null
+++ b/src/pocketmine/item/GoldHoe.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class GoldHoe extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::GOLD_HOE, 0, $count, "Gold Hoe");
+	}
+
+}
\ No newline at end of file
diff --git a/src/pocketmine/item/GoldPickaxe.php b/src/pocketmine/item/GoldPickaxe.php
new file mode 100644
index 000000000..8b66bc9bf
--- /dev/null
+++ b/src/pocketmine/item/GoldPickaxe.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class GoldPickaxe extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::GOLD_PICKAXE, 0, $count, "Gold Pickaxe");
+	}
+
+}
diff --git a/src/pocketmine/item/GoldShovel.php b/src/pocketmine/item/GoldShovel.php
new file mode 100644
index 000000000..b5e6cb5e7
--- /dev/null
+++ b/src/pocketmine/item/GoldShovel.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class GoldShovel extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::GOLD_SHOVEL, 0, $count, "Gold Shovel");
+	}
+
+}
diff --git a/src/pocketmine/item/GoldSword.php b/src/pocketmine/item/GoldSword.php
new file mode 100644
index 000000000..a04ea1de3
--- /dev/null
+++ b/src/pocketmine/item/GoldSword.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class GoldSword extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::GOLD_SWORD, 0, $count, "Gold Sword");
+	}
+
+}
diff --git a/src/pocketmine/item/IronAxe.php b/src/pocketmine/item/IronAxe.php
index 5b3583cad..602f28682 100644
--- a/src/pocketmine/item/IronAxe.php
+++ b/src/pocketmine/item/IronAxe.php
@@ -22,7 +22,7 @@
 namespace pocketmine\item;
 
 
-class IronAxe extends Item{
+class IronAxe extends Tool{
 	public function __construct($meta = 0, $count = 1){
 		parent::__construct(self::IRON_AXE, 0, $count, "Iron Axe");
 	}
diff --git a/src/pocketmine/item/IronHoe.php b/src/pocketmine/item/IronHoe.php
index 533d88915..aab74eefb 100644
--- a/src/pocketmine/item/IronHoe.php
+++ b/src/pocketmine/item/IronHoe.php
@@ -22,7 +22,7 @@
 namespace pocketmine\item;
 
 
-class IronHoe extends Item{
+class IronHoe extends Tool{
 	public function __construct($meta = 0, $count = 1){
 		parent::__construct(self::IRON_HOE, 0, $count, "Iron Hoe");
 	}
diff --git a/src/pocketmine/item/IronPickaxe.php b/src/pocketmine/item/IronPickaxe.php
index bee25b1c1..0988c12d8 100644
--- a/src/pocketmine/item/IronPickaxe.php
+++ b/src/pocketmine/item/IronPickaxe.php
@@ -22,7 +22,7 @@
 namespace pocketmine\item;
 
 
-class IronPickaxe extends Item{
+class IronPickaxe extends Tool{
 	public function __construct($meta = 0, $count = 1){
 		parent::__construct(self::IRON_PICKAXE, 0, $count, "Iron Pickaxe");
 	}
diff --git a/src/pocketmine/item/IronShovel.php b/src/pocketmine/item/IronShovel.php
index b860435c2..be9883a04 100644
--- a/src/pocketmine/item/IronShovel.php
+++ b/src/pocketmine/item/IronShovel.php
@@ -22,7 +22,7 @@
 namespace pocketmine\item;
 
 
-class IronShovel extends Item{
+class IronShovel extends Tool{
 	public function __construct($meta = 0, $count = 1){
 		parent::__construct(self::IRON_SHOVEL, 0, $count, "Iron Shovel");
 	}
diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php
index 23ea870d4..66943cb2e 100644
--- a/src/pocketmine/item/Item.php
+++ b/src/pocketmine/item/Item.php
@@ -210,23 +210,23 @@ class Item{
 
 	//Normal Item IDs
 
-	const IRON_SHOVEL = 256; //Implemented
-	const IRON_PICKAXE = 257; //Implemented
-	const IRON_AXE = 258; //Implemented
-	const FLINT_STEEL = 259;
-	const FLINT_AND_STEEL = 259;
-	const APPLE = 260; //Implemented
+	const IRON_SHOVEL = 256;//
+	const IRON_PICKAXE = 257;//
+	const IRON_AXE = 258;//
+	const FLINT_STEEL = 259;//
+	const FLINT_AND_STEEL = 259;//
+	const APPLE = 260;//
 	const BOW = 261;
 	const ARROW = 262;
-	const COAL = 263; //Implemented
-	const DIAMOND = 264; //Implemented
-	const IRON_INGOT = 265; //Implemented
-	const GOLD_INGOT = 266; //Implemented
+	const COAL = 263;//
+	const DIAMOND = 264;//
+	const IRON_INGOT = 265;//
+	const GOLD_INGOT = 266;//
 	const IRON_SWORD = 267;
-	const WOODEN_SWORD = 268; //Implemented
-	const WOODEN_SHOVEL = 269; //Implemented
-	const WOODEN_PICKAXE = 270; //Implemented
-	const WOODEN_AXE = 271; //Implemented
+	const WOODEN_SWORD = 268;//
+	const WOODEN_SHOVEL = 269;//
+	const WOODEN_PICKAXE = 270;//
+	const WOODEN_AXE = 271;//
 	const STONE_SWORD = 272;
 	const STONE_SHOVEL = 273;
 	const STONE_PICKAXE = 274;
@@ -235,9 +235,9 @@ class Item{
 	const DIAMOND_SHOVEL = 277;
 	const DIAMOND_PICKAXE = 278;
 	const DIAMOND_AXE = 279;
-	const STICK = 280; //Implemented
+	const STICK = 280;//
 	const STICKS = 280;
-	const BOWL = 281; //Implemented
+	const BOWL = 281;//
 	const MUSHROOM_STEW = 282;
 	const GOLD_SWORD = 283;
 	const GOLD_SHOVEL = 284;
@@ -248,11 +248,11 @@ class Item{
 	const GOLDEN_PICKAXE = 285;
 	const GOLDEN_AXE = 286;
 	const STRING = 287;
-	const FEATHER = 288; //Implemented
+	const FEATHER = 288;//
 	const GUNPOWDER = 289;
 	const WOODEN_HOE = 290;
 	const STONE_HOE = 291;
-	const IRON_HOE = 292; //Implemented
+	const IRON_HOE = 292;//
 	const DIAMOND_HOE = 293;
 	const GOLD_HOE = 294;
 	const GOLDEN_HOE = 294;
@@ -358,6 +358,7 @@ class Item{
 	const BEETROOT_SOUP = 459;
 
 
+	/** @var Item[] */
 	public static $list = array();
 	protected $block;
 	protected $id;
@@ -401,11 +402,29 @@ class Item{
 				self::IRON_PICKAXE => new IronPickaxe(),
 				self::IRON_AXE => new IronAxe(),
 				self::IRON_HOE => new IronHoe(),
+				self::DIAMOND_SWORD => new DiamondSword(),
+				self::DIAMOND_SHOVEL => new DiamondShovel(),
+				self::DIAMOND_PICKAXE => new DiamondPickaxe(),
+				self::DIAMOND_AXE => new DiamondAxe(),
+				self::DIAMOND_HOE => new DiamondHoe(),
+				self::GOLD_SWORD => new GoldSword(),
+				self::GOLD_SHOVEL => new GoldShovel(),
+				self::GOLD_PICKAXE => new GoldPickaxe(),
+				self::GOLD_AXE => new GoldAxe(),
+				self::GOLD_HOE => new GoldHoe(),
+				self::STONE_SWORD => new StoneSword(),
+				self::STONE_SHOVEL => new StoneShovel(),
+				self::STONE_PICKAXE => new StonePickaxe(),
+				self::STONE_AXE => new StoneAxe(),
+				self::STONE_HOE => new StoneHoe(),
 				self::WOODEN_SWORD => new WoodenSword(),
 				self::WOODEN_SHOVEL => new WoodenShovel(),
 				self::WOODEN_PICKAXE => new WoodenPickaxe(),
 				self::WOODEN_AXE => new WoodenAxe(),
+				self::WOODEN_HOE => new WoodenHoe(),
 				self::FLINT_STEEL => new FlintSteel(),
+				self::SHEARS => new Shears(),
+				self::BOW => new Bow(),
 			);
 			foreach(Block::$list as $id => $class){
 				self::$list[$id] = new ItemBlock($class);
@@ -538,142 +557,51 @@ class Item{
 
 	}
 
-	public function useOn($object, $force = false){
-		if($this->isTool() or $force === true){
-			if(($object instanceof Entity) and !$this->isSword()){
-				$this->meta += 2;
-			}else{
-				$this->meta++;
-			}
-
-			return true;
-		}elseif($this->isHoe()){
-			if(($object instanceof Block) and ($object->getID() === self::GRASS or $object->getID() === self::DIRT)){
-				$this->meta++;
-			}
-		}
-
+	/**
+	 * @param Entity|Block $object
+	 *
+	 * @return bool
+	 */
+	public function useOn($object){
 		return false;
 	}
 
-	final public function isTool(){
-		return ($this->id === self::FLINT_STEEL or $this->id === self::SHEARS or $this->isPickaxe() !== false or $this->isAxe() !== false or $this->isShovel() !== false or $this->isSword() !== false);
+	/**
+	 * @return bool
+	 */
+	public function isTool(){
+		return false;
 	}
 
-	final public function getMaxDurability(){
-		if(!$this->isTool() and $this->isHoe() === false and $this->id !== self::BOW){
-			return false;
-		}
-
-		$levels = array(
-			2 => 33,
-			1 => 60,
-			3 => 132,
-			4 => 251,
-			5 => 1562,
-			self::FLINT_STEEL => 65,
-			self::SHEARS => 239,
-			self::BOW => 385,
-		);
-
-		if(($type = $this->isPickaxe()) === false){
-			if(($type = $this->isAxe()) === false){
-				if(($type = $this->isSword()) === false){
-					if(($type = $this->isShovel()) === false){
-						if(($type = $this->isHoe()) === false){
-							$type = $this->id;
-						}
-					}
-				}
-			}
-		}
-
-		return $levels[$type];
+	/**
+	 * @return int|bool
+	 */
+	public function getMaxDurability(){
+		return false;
 	}
 
-	final public function isPickaxe(){ //Returns false or level of the pickaxe
-		switch($this->id){
-			case self::IRON_PICKAXE:
-				return 4;
-			case self::WOODEN_PICKAXE:
-				return 1;
-			case self::STONE_PICKAXE:
-				return 3;
-			case self::DIAMOND_PICKAXE:
-				return 5;
-			case self::GOLD_PICKAXE:
-				return 2;
-			default:
-				return false;
-		}
+	public function isPickaxe(){
+		return false;
 	}
 
-	final public function isAxe(){
-		switch($this->id){
-			case self::IRON_AXE:
-				return 4;
-			case self::WOODEN_AXE:
-				return 1;
-			case self::STONE_AXE:
-				return 3;
-			case self::DIAMOND_AXE:
-				return 5;
-			case self::GOLD_AXE:
-				return 2;
-			default:
-				return false;
-		}
+	public function isAxe(){
+		return false;
 	}
 
-	final public function isSword(){
-		switch($this->id){
-			case self::IRON_SWORD:
-				return 4;
-			case self::WOODEN_SWORD:
-				return 1;
-			case self::STONE_SWORD:
-				return 3;
-			case self::DIAMOND_SWORD:
-				return 5;
-			case self::GOLD_SWORD:
-				return 2;
-			default:
-				return false;
-		}
+	public function isSword(){
+		return false;
 	}
 
-	final public function isShovel(){
-		switch($this->id){
-			case self::IRON_SHOVEL:
-				return 4;
-			case self::WOODEN_SHOVEL:
-				return 1;
-			case self::STONE_SHOVEL:
-				return 3;
-			case self::DIAMOND_SHOVEL:
-				return 5;
-			case self::GOLD_SHOVEL:
-				return 2;
-			default:
-				return false;
-		}
+	public function isShovel(){
+		return false;
 	}
 
 	public function isHoe(){
-		switch($this->id){
-			case self::IRON_HOE:
-			case self::WOODEN_HOE:
-			case self::STONE_HOE:
-			case self::DIAMOND_HOE:
-			case self::GOLD_HOE:
-				return true;
-			default:
-				return false;
-		}
+		return false;
 	}
 
 	public function isShears(){
-		return ($this->id === self::SHEARS);
+		return false;
 	}
 
 	final public function __toString(){
diff --git a/src/pocketmine/item/Shears.php b/src/pocketmine/item/Shears.php
new file mode 100644
index 000000000..963086ba0
--- /dev/null
+++ b/src/pocketmine/item/Shears.php
@@ -0,0 +1,29 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class Shears extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::SHEARS, $meta, $count, "Shears");
+	}
+}
\ No newline at end of file
diff --git a/src/pocketmine/item/StoneAxe.php b/src/pocketmine/item/StoneAxe.php
new file mode 100644
index 000000000..71ae4ddba
--- /dev/null
+++ b/src/pocketmine/item/StoneAxe.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class StoneAxe extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::STONE_AXE, 0, $count, "Stone Axe");
+	}
+
+}
\ No newline at end of file
diff --git a/src/pocketmine/item/StoneHoe.php b/src/pocketmine/item/StoneHoe.php
new file mode 100644
index 000000000..099f9f4db
--- /dev/null
+++ b/src/pocketmine/item/StoneHoe.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class StoneHoe extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::STONE_HOE, 0, $count, "Stone Hoe");
+	}
+
+}
\ No newline at end of file
diff --git a/src/pocketmine/item/StonePickaxe.php b/src/pocketmine/item/StonePickaxe.php
new file mode 100644
index 000000000..a4ec9dbea
--- /dev/null
+++ b/src/pocketmine/item/StonePickaxe.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class StonePickaxe extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::STONE_PICKAXE, 0, $count, "Stone Pickaxe");
+	}
+
+}
diff --git a/src/pocketmine/item/StoneShovel.php b/src/pocketmine/item/StoneShovel.php
new file mode 100644
index 000000000..bdc2e8ad2
--- /dev/null
+++ b/src/pocketmine/item/StoneShovel.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class StoneShovel extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::STONE_SHOVEL, 0, $count, "Stone Shovel");
+	}
+
+}
diff --git a/src/pocketmine/item/StoneSword.php b/src/pocketmine/item/StoneSword.php
new file mode 100644
index 000000000..78cd77df0
--- /dev/null
+++ b/src/pocketmine/item/StoneSword.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class StoneSword extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::STONE_SWORD, 0, $count, "Stone Sword");
+	}
+
+}
diff --git a/src/pocketmine/item/Tool.php b/src/pocketmine/item/Tool.php
new file mode 100644
index 000000000..caac5c6bf
--- /dev/null
+++ b/src/pocketmine/item/Tool.php
@@ -0,0 +1,177 @@
+<?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/
+ *
+ *
+*/
+
+
+namespace pocketmine\item;
+
+use pocketmine\entity\Entity;
+
+abstract class Tool extends Item{
+
+	public function __construct($id, $meta = 0, $count = 1, $name = "Unknown"){
+		parent::__construct($id, $meta, $count, $name);
+		$this->maxStackSize = 1;
+	}
+
+	/**
+	 * TODO: Move this to each item
+	 *
+	 * @param Entity|Block $object
+	 *
+	 * @return bool
+	 */
+	public function useOn($object){
+		if($this->isHoe()){
+			if(($object instanceof Block) and ($object->getID() === self::GRASS or $object->getID() === self::DIRT)){
+				$this->meta++;
+			}
+		}elseif(($object instanceof Entity) and !$this->isSword()){
+			$this->meta += 2;
+		}else{
+			$this->meta++;
+		}
+
+		return true;
+	}
+
+	/**
+	 * TODO: Move this to each item
+	 *
+	 * @return int|bool
+	 */
+	public function getMaxDurability(){
+
+		$levels = array(
+			2 => 33,
+			1 => 60,
+			3 => 132,
+			4 => 251,
+			5 => 1562,
+			self::FLINT_STEEL => 65,
+			self::SHEARS => 239,
+			self::BOW => 385,
+		);
+
+		if(($type = $this->isPickaxe()) === false){
+			if(($type = $this->isAxe()) === false){
+				if(($type = $this->isSword()) === false){
+					if(($type = $this->isShovel()) === false){
+						if(($type = $this->isHoe()) === false){
+							$type = $this->id;
+						}
+					}
+				}
+			}
+		}
+
+		return $levels[$type];
+	}
+
+	public function isPickaxe(){
+		switch($this->id){
+			case self::IRON_PICKAXE:
+				return 4;
+			case self::WOODEN_PICKAXE:
+				return 1;
+			case self::STONE_PICKAXE:
+				return 3;
+			case self::DIAMOND_PICKAXE:
+				return 5;
+			case self::GOLD_PICKAXE:
+				return 2;
+			default:
+				return false;
+		}
+	}
+
+	final public function isAxe(){
+		switch($this->id){
+			case self::IRON_AXE:
+				return 4;
+			case self::WOODEN_AXE:
+				return 1;
+			case self::STONE_AXE:
+				return 3;
+			case self::DIAMOND_AXE:
+				return 5;
+			case self::GOLD_AXE:
+				return 2;
+			default:
+				return false;
+		}
+	}
+
+	final public function isSword(){
+		switch($this->id){
+			case self::IRON_SWORD:
+				return 4;
+			case self::WOODEN_SWORD:
+				return 1;
+			case self::STONE_SWORD:
+				return 3;
+			case self::DIAMOND_SWORD:
+				return 5;
+			case self::GOLD_SWORD:
+				return 2;
+			default:
+				return false;
+		}
+	}
+
+	final public function isShovel(){
+		switch($this->id){
+			case self::IRON_SHOVEL:
+				return 4;
+			case self::WOODEN_SHOVEL:
+				return 1;
+			case self::STONE_SHOVEL:
+				return 3;
+			case self::DIAMOND_SHOVEL:
+				return 5;
+			case self::GOLD_SHOVEL:
+				return 2;
+			default:
+				return false;
+		}
+	}
+
+	public function isHoe(){
+		switch($this->id){
+			case self::IRON_HOE:
+			case self::WOODEN_HOE:
+			case self::STONE_HOE:
+			case self::DIAMOND_HOE:
+			case self::GOLD_HOE:
+				return true;
+			default:
+				return false;
+		}
+	}
+
+	public function isShears(){
+		return ($this->id === self::SHEARS);
+	}
+
+	public function isTool(){
+		return false;
+		return ($this->id === self::FLINT_STEEL or $this->id === self::SHEARS or $this->id === self::BOW or $this->isPickaxe() !== false or $this->isAxe() !== false or $this->isShovel() !== false or $this->isSword() !== false);
+	}
+}
\ No newline at end of file
diff --git a/src/pocketmine/item/WoodenAxe.php b/src/pocketmine/item/WoodenAxe.php
index 59b7d3d7c..dabcecd83 100644
--- a/src/pocketmine/item/WoodenAxe.php
+++ b/src/pocketmine/item/WoodenAxe.php
@@ -22,7 +22,7 @@
 namespace pocketmine\item;
 
 
-class WoodenAxe extends Item{
+class WoodenAxe extends Tool{
 	public function __construct($meta = 0, $count = 1){
 		parent::__construct(self::WOODEN_AXE, 0, $count, "Wooden Axe");
 	}
diff --git a/src/pocketmine/item/WoodenHoe.php b/src/pocketmine/item/WoodenHoe.php
new file mode 100644
index 000000000..d1540f0dd
--- /dev/null
+++ b/src/pocketmine/item/WoodenHoe.php
@@ -0,0 +1,30 @@
+<?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/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class WoodenHoe extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::WOODEN_HOE, 0, $count, "Wooden Hoe");
+	}
+
+}
\ No newline at end of file
diff --git a/src/pocketmine/item/WoodenPickaxe.php b/src/pocketmine/item/WoodenPickaxe.php
index 599d255c1..4e316b76e 100644
--- a/src/pocketmine/item/WoodenPickaxe.php
+++ b/src/pocketmine/item/WoodenPickaxe.php
@@ -22,7 +22,7 @@
 namespace pocketmine\item;
 
 
-class WoodenPickaxe extends Item{
+class WoodenPickaxe extends Tool{
 	public function __construct($meta = 0, $count = 1){
 		parent::__construct(self::WOODEN_PICKAXE, 0, $count, "Wooden Pickaxe");
 	}
diff --git a/src/pocketmine/item/WoodenShovel.php b/src/pocketmine/item/WoodenShovel.php
index 4acfca747..6c9613990 100644
--- a/src/pocketmine/item/WoodenShovel.php
+++ b/src/pocketmine/item/WoodenShovel.php
@@ -22,7 +22,7 @@
 namespace pocketmine\item;
 
 
-class WoodenShovel extends Item{
+class WoodenShovel extends Tool{
 	public function __construct($meta = 0, $count = 1){
 		parent::__construct(self::WOODEN_SHOVEL, 0, $count, "Wooden Shovel");
 	}
diff --git a/src/pocketmine/item/WoodenSword.php b/src/pocketmine/item/WoodenSword.php
index 43633d700..910492b6c 100644
--- a/src/pocketmine/item/WoodenSword.php
+++ b/src/pocketmine/item/WoodenSword.php
@@ -22,7 +22,7 @@
 namespace pocketmine\item;
 
 
-class WoodenSword extends Item{
+class WoodenSword extends Tool{
 	public function __construct($meta = 0, $count = 1){
 		parent::__construct(self::WOODEN_SWORD, 0, $count, "Wooden Sword");
 	}