diff --git a/src/pocketmine/item/BlazePowder.php b/src/pocketmine/item/BlazePowder.php
deleted file mode 100644
index cddf38a41d..0000000000
--- a/src/pocketmine/item/BlazePowder.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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\item;
-
-class BlazePowder extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::BLAZE_POWDER, $meta, $count, "Blaze Powder");
-	}
-}
diff --git a/src/pocketmine/item/Boat.php b/src/pocketmine/item/Boat.php
index b2bab71f7c..d25a960e70 100644
--- a/src/pocketmine/item/Boat.php
+++ b/src/pocketmine/item/Boat.php
@@ -31,4 +31,6 @@ class Boat extends Item{
 	public function getFuelTime() : int{
 		return 1200; //400 in PC
 	}
+
+	//TODO
 }
diff --git a/src/pocketmine/item/Bone.php b/src/pocketmine/item/Bone.php
deleted file mode 100644
index 50661713dc..0000000000
--- a/src/pocketmine/item/Bone.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-class Bone extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::BONE, $meta, $count, "Bone");
-	}
-
-}
-
diff --git a/src/pocketmine/item/Bowl.php b/src/pocketmine/item/Bowl.php
index b7dc13b5a5..5d15930389 100644
--- a/src/pocketmine/item/Bowl.php
+++ b/src/pocketmine/item/Bowl.php
@@ -29,4 +29,5 @@ class Bowl extends Item{
 		parent::__construct(self::BOWL, $meta, $count, "Bowl");
 	}
 
+	//TODO: check fuel
 }
\ No newline at end of file
diff --git a/src/pocketmine/item/BrewingStand.php b/src/pocketmine/item/BrewingStand.php
index 25894a7cd2..7b1da0b8a7 100644
--- a/src/pocketmine/item/BrewingStand.php
+++ b/src/pocketmine/item/BrewingStand.php
@@ -23,8 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
+use pocketmine\block\Block;
+
 class BrewingStand extends Item{
 	public function __construct($meta = 0, $count = 1){
+		$this->block = Block::get(Block::BREWING_STAND_BLOCK);
 		parent::__construct(self::BREWING_STAND, $meta, $count, "Brewing Stand");
 	}
 }
diff --git a/src/pocketmine/item/Brick.php b/src/pocketmine/item/Brick.php
deleted file mode 100644
index f9979708ee..0000000000
--- a/src/pocketmine/item/Brick.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-
-class Brick extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::BRICK, $meta, $count, "Brick");
-	}
-
-}
\ No newline at end of file
diff --git a/src/pocketmine/item/Clay.php b/src/pocketmine/item/Clay.php
deleted file mode 100644
index d8367885d2..0000000000
--- a/src/pocketmine/item/Clay.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-class Clay extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::CLAY, $meta, $count, "Clay");
-	}
-
-}
-
diff --git a/src/pocketmine/item/Diamond.php b/src/pocketmine/item/Diamond.php
deleted file mode 100644
index bef773f7c7..0000000000
--- a/src/pocketmine/item/Diamond.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-
-class Diamond extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::DIAMOND, $meta, $count, "Diamond");
-	}
-
-}
\ No newline at end of file
diff --git a/src/pocketmine/item/Dye.php b/src/pocketmine/item/Dye.php
index 1bcb77f8a7..895016cd9a 100644
--- a/src/pocketmine/item/Dye.php
+++ b/src/pocketmine/item/Dye.php
@@ -28,5 +28,6 @@ class Dye extends Item{
 		parent::__construct(self::DYE, $meta, $count, "Dye");
 	}
 
+	//TODO: names
 }
 
diff --git a/src/pocketmine/item/Egg.php b/src/pocketmine/item/Egg.php
index 0b1235e0a2..697112cafc 100644
--- a/src/pocketmine/item/Egg.php
+++ b/src/pocketmine/item/Egg.php
@@ -28,5 +28,7 @@ class Egg extends Item{
 		parent::__construct(self::EGG, $meta, $count, "Egg");
 	}
 
+	//TODO
+
 }
 
diff --git a/src/pocketmine/item/Emerald.php b/src/pocketmine/item/Emerald.php
deleted file mode 100644
index 50a4cd47f2..0000000000
--- a/src/pocketmine/item/Emerald.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-class Emerald extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::EMERALD, $meta, $count, "Emerald");
-	}
-
-}
-
diff --git a/src/pocketmine/item/Feather.php b/src/pocketmine/item/Feather.php
deleted file mode 100644
index 5d3c0c1f23..0000000000
--- a/src/pocketmine/item/Feather.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-
-class Feather extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::FEATHER, $meta, $count, "Feather");
-	}
-
-}
\ No newline at end of file
diff --git a/src/pocketmine/item/FermentedSpiderEye.php b/src/pocketmine/item/FermentedSpiderEye.php
deleted file mode 100644
index 0a1c67627e..0000000000
--- a/src/pocketmine/item/FermentedSpiderEye.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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\item;
-
-class FermentedSpiderEye extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::FERMENTED_SPIDER_EYE, $meta, $count, "Fermented Spider Eye");
-	}
-}
diff --git a/src/pocketmine/item/FishingRod.php b/src/pocketmine/item/FishingRod.php
index 1d99c5c036..8e1fb19d24 100644
--- a/src/pocketmine/item/FishingRod.php
+++ b/src/pocketmine/item/FishingRod.php
@@ -27,4 +27,6 @@ class FishingRod extends Item{
 	public function __construct($meta = 0, $count = 1){
 		parent::__construct(self::FISHING_ROD, $meta, $count, "Fishing Rod");
 	}
+
+	//TODO
 }
\ No newline at end of file
diff --git a/src/pocketmine/item/Flint.php b/src/pocketmine/item/Flint.php
deleted file mode 100644
index a9a5a86a10..0000000000
--- a/src/pocketmine/item/Flint.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-class Flint extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::FLINT, $meta, $count, "Flint");
-	}
-
-}
-
diff --git a/src/pocketmine/item/GlisteringMelon.php b/src/pocketmine/item/GlisteringMelon.php
deleted file mode 100644
index 1ef5836b10..0000000000
--- a/src/pocketmine/item/GlisteringMelon.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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\item;
-
-class GlisteringMelon extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::GLISTERING_MELON, $meta, $count, "Glistering Melon");
-	}
-}
diff --git a/src/pocketmine/item/GlowstoneDust.php b/src/pocketmine/item/GlowstoneDust.php
deleted file mode 100644
index 4bbc5bf3a8..0000000000
--- a/src/pocketmine/item/GlowstoneDust.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-class GlowstoneDust extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::GLOWSTONE_DUST, $meta, $count, "Glowstone Dust");
-	}
-
-}
-
diff --git a/src/pocketmine/item/GoldIngot.php b/src/pocketmine/item/GoldIngot.php
deleted file mode 100644
index 6ccac18119..0000000000
--- a/src/pocketmine/item/GoldIngot.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-
-class GoldIngot extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::GOLD_INGOT, $meta, $count, "Gold Ingot");
-	}
-
-}
\ No newline at end of file
diff --git a/src/pocketmine/item/GoldNugget.php b/src/pocketmine/item/GoldNugget.php
deleted file mode 100644
index 9441a18c8a..0000000000
--- a/src/pocketmine/item/GoldNugget.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-class GoldNugget extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::GOLD_NUGGET, $meta, $count, "Gold Nugget");
-	}
-
-}
-
diff --git a/src/pocketmine/item/Gunpowder.php b/src/pocketmine/item/Gunpowder.php
deleted file mode 100644
index 3d05e8ea44..0000000000
--- a/src/pocketmine/item/Gunpowder.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-class Gunpowder extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::GUNPOWDER, $meta, $count, "Gunpowder");
-	}
-
-}
-
diff --git a/src/pocketmine/item/IronIngot.php b/src/pocketmine/item/IronIngot.php
deleted file mode 100644
index 653afea9a0..0000000000
--- a/src/pocketmine/item/IronIngot.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-
-class IronIngot extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::IRON_INGOT, $meta, $count, "Iron Ingot");
-	}
-
-}
\ No newline at end of file
diff --git a/src/pocketmine/item/ItemFactory.php b/src/pocketmine/item/ItemFactory.php
index 382d27cab9..50e30b089e 100644
--- a/src/pocketmine/item/ItemFactory.php
+++ b/src/pocketmine/item/ItemFactory.php
@@ -46,9 +46,9 @@ class ItemFactory{
 			self::registerItem(new Bow());
 			self::registerItem(new Arrow());
 			self::registerItem(new Coal());
-			self::registerItem(new Diamond());
-			self::registerItem(new IronIngot());
-			self::registerItem(new GoldIngot());
+			self::registerItem(new Item(Item::DIAMOND, 0, 1, "Diamond"));
+			self::registerItem(new Item(Item::IRON_INGOT, 0, 1, "Iron Ingot"));
+			self::registerItem(new Item(Item::GOLD_INGOT, 0, 1, "Gold Ingot"));
 			self::registerItem(new IronSword());
 			self::registerItem(new WoodenSword());
 			self::registerItem(new WoodenShovel());
@@ -70,15 +70,15 @@ class ItemFactory{
 			self::registerItem(new GoldPickaxe());
 			self::registerItem(new GoldAxe());
 			self::registerItem(new StringItem());
-			self::registerItem(new Feather());
-			self::registerItem(new Gunpowder());
+			self::registerItem(new Item(Item::FEATHER, 0, 1, "Feather"));
+			self::registerItem(new Item(Item::GUNPOWDER, 0, 1, "Gunpowder"));
 			self::registerItem(new WoodenHoe());
 			self::registerItem(new StoneHoe());
 			self::registerItem(new IronHoe());
 			self::registerItem(new DiamondHoe());
 			self::registerItem(new GoldHoe());
 			self::registerItem(new WheatSeeds());
-			self::registerItem(new Wheat());
+			self::registerItem(new Item(Item::WHEAT, 0, 1, "Wheat"));
 			self::registerItem(new Bread());
 			self::registerItem(new LeatherCap());
 			self::registerItem(new LeatherTunic());
@@ -100,7 +100,7 @@ class ItemFactory{
 			self::registerItem(new GoldChestplate());
 			self::registerItem(new GoldLeggings());
 			self::registerItem(new GoldBoots());
-			self::registerItem(new Flint());
+			self::registerItem(new Item(Item::FLINT, 0, 1, "Flint"));
 			self::registerItem(new RawPorkchop());
 			self::registerItem(new CookedPorkchop());
 			self::registerItem(new Painting());
@@ -115,25 +115,25 @@ class ItemFactory{
 			self::registerItem(new Redstone());
 			self::registerItem(new Snowball());
 			self::registerItem(new Boat());
-			self::registerItem(new Leather());
+			self::registerItem(new Item(Item::LEATHER, 0, 1, "Leather"));
 
-			self::registerItem(new Brick());
-			self::registerItem(new Clay());
+			self::registerItem(new Item(Item::BRICK, 0, 1, "Brick"));
+			self::registerItem(new Item(Item::CLAY_BALL, 0, 1, "Clay"));
 			self::registerItem(new Sugarcane());
-			self::registerItem(new Paper());
+			self::registerItem(new Item(Item::PAPER, 0, 1, "Paper"));
 			self::registerItem(new Book());
-			self::registerItem(new Slimeball());
+			self::registerItem(new Item(Item::SLIME_BALL, 0, 1, "Slimeball"));
 
 			self::registerItem(new Egg());
 			self::registerItem(new Compass());
 			self::registerItem(new FishingRod());
 			self::registerItem(new Clock());
-			self::registerItem(new GlowstoneDust());
+			self::registerItem(new Item(Item::GLOWSTONE_DUST, 0, 1, "Glowstone Dust"));
 			self::registerItem(new Fish());
 			self::registerItem(new CookedFish());
 			self::registerItem(new Dye());
-			self::registerItem(new Bone());
-			self::registerItem(new Sugar());
+			self::registerItem(new Item(Item::BONE, 0, 1, "Bone"));
+			self::registerItem(new Item(Item::SUGAR, 0, 1, "Sugar"));
 			self::registerItem(new Cake());
 			self::registerItem(new Bed());
 
@@ -148,20 +148,20 @@ class ItemFactory{
 			self::registerItem(new RawChicken());
 			self::registerItem(new CookedChicken());
 
-			self::registerItem(new GoldNugget());
+			self::registerItem(new Item(Item::GOLD_NUGGET, 0, 1, "Gold Nugget"));
 			self::registerItem(new NetherWart());
 			self::registerItem(new Potion());
 			self::registerItem(new GlassBottle());
 			self::registerItem(new SpiderEye());
-			self::registerItem(new FermentedSpiderEye());
-			self::registerItem(new BlazePowder());
-			self::registerItem(new MagmaCream());
+			self::registerItem(new Item(Item::FERMENTED_SPIDER_EYE, 0, 1, "Fermented Spider Eye"));
+			self::registerItem(new Item(Item::BLAZE_POWDER, 0, 1, "Blaze Powder"));
+			self::registerItem(new Item(Item::MAGMA_CREAM, 0, 1, "Magma Cream"));
 			self::registerItem(new BrewingStand());
 
-			self::registerItem(new GlisteringMelon());
+			self::registerItem(new Item(Item::GLISTERING_MELON, 0, 1, "Glistering Melon"));
 			self::registerItem(new SpawnEgg());
 
-			self::registerItem(new Emerald());
+			self::registerItem(new Item(Item::EMERALD, 0, 1, "Emerald"));
 			self::registerItem(new ItemFrame());
 			self::registerItem(new FlowerPot());
 			self::registerItem(new Carrot());
@@ -171,17 +171,17 @@ class ItemFactory{
 			self::registerItem(new GoldenCarrot());
 			self::registerItem(new Skull());
 
-			self::registerItem(new NetherStar());
+			self::registerItem(new Item(Item::NETHER_STAR, 0, 1, "Nether Star"));
 			self::registerItem(new PumpkinPie());
 
-			self::registerItem(new NetherBrick());
-			self::registerItem(new NetherQuartz());
+			self::registerItem(new Item(Item::NETHER_BRICK, 0, 1, "Nether Brick"));
+			self::registerItem(new Item(Item::NETHER_QUARTZ, 0, 1, "Nether Quartz"));
 
-			self::registerItem(new PrismarineShard());
+			self::registerItem(new Item(Item::PRISMARINE_SHARD, 0, 1, "Prismarine Shard"));
 
 			self::registerItem(new CookedRabbit());
 
-			self::registerItem(new PrismarineCrystals());
+			self::registerItem(new Item(Item::PRISMARINE_CRYSTALS, 0, 1, "Prismarine Crystals"));
 
 			self::registerItem(new Beetroot());
 			self::registerItem(new BeetrootSeeds());
diff --git a/src/pocketmine/item/Leather.php b/src/pocketmine/item/Leather.php
deleted file mode 100644
index 412966daa9..0000000000
--- a/src/pocketmine/item/Leather.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-class Leather extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::LEATHER, $meta, $count, "Leather");
-	}
-
-}
-
diff --git a/src/pocketmine/item/MagmaCream.php b/src/pocketmine/item/MagmaCream.php
deleted file mode 100644
index 9c8cdd7122..0000000000
--- a/src/pocketmine/item/MagmaCream.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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\item;
-
-class MagmaCream extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::MAGMA_CREAM, $meta, $count, "Magma Cream");
-	}
-}
diff --git a/src/pocketmine/item/Minecart.php b/src/pocketmine/item/Minecart.php
index ce06e9c721..90a5875fe8 100644
--- a/src/pocketmine/item/Minecart.php
+++ b/src/pocketmine/item/Minecart.php
@@ -28,5 +28,6 @@ class Minecart extends Item{
 		parent::__construct(self::MINECART, $meta, $count, "Minecart");
 	}
 
+	//TODO
 }
 
diff --git a/src/pocketmine/item/NetherBrick.php b/src/pocketmine/item/NetherBrick.php
deleted file mode 100644
index bffa9330c9..0000000000
--- a/src/pocketmine/item/NetherBrick.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-class NetherBrick extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::NETHER_BRICK, $meta, $count, "Nether Brick");
-	}
-
-}
-
diff --git a/src/pocketmine/item/NetherQuartz.php b/src/pocketmine/item/NetherQuartz.php
deleted file mode 100644
index c59f6d967d..0000000000
--- a/src/pocketmine/item/NetherQuartz.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\item;
-
-class NetherQuartz extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::NETHER_QUARTZ, $meta, $count, "Nether Quartz");
-	}
-
-}
\ No newline at end of file
diff --git a/src/pocketmine/item/NetherStar.php b/src/pocketmine/item/NetherStar.php
deleted file mode 100644
index 249d947558..0000000000
--- a/src/pocketmine/item/NetherStar.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\item;
-
-
-class NetherStar extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::NETHER_STAR, $meta, $count, "Nether Star");
-	}
-}
\ No newline at end of file
diff --git a/src/pocketmine/item/Paper.php b/src/pocketmine/item/Paper.php
deleted file mode 100644
index 99f185ecae..0000000000
--- a/src/pocketmine/item/Paper.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-class Paper extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::PAPER, $meta, $count, "Paper");
-	}
-
-}
-
diff --git a/src/pocketmine/item/PrismarineCrystals.php b/src/pocketmine/item/PrismarineCrystals.php
deleted file mode 100644
index 0d50309f35..0000000000
--- a/src/pocketmine/item/PrismarineCrystals.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\item;
-
-
-class PrismarineCrystals extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::PRISMARINE_CRYSTALS, $meta, $count, "Prismarine Crystals");
-	}
-}
\ No newline at end of file
diff --git a/src/pocketmine/item/PrismarineShard.php b/src/pocketmine/item/PrismarineShard.php
deleted file mode 100644
index f66a89afd0..0000000000
--- a/src/pocketmine/item/PrismarineShard.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\item;
-
-
-class PrismarineShard extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::PRISMARINE_SHARD, $meta, $count, "Prismarine Shard");
-	}
-}
\ No newline at end of file
diff --git a/src/pocketmine/item/Redstone.php b/src/pocketmine/item/Redstone.php
index 57ffdd899e..ece0ca3b17 100644
--- a/src/pocketmine/item/Redstone.php
+++ b/src/pocketmine/item/Redstone.php
@@ -23,8 +23,12 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
+use pocketmine\block\Block;
+use pocketmine\block\BlockFactory;
+
 class Redstone extends Item{
 	public function __construct($meta = 0, $count = 1){
+		$this->block = BlockFactory::get(Block::REDSTONE_WIRE);
 		parent::__construct(self::REDSTONE, $meta, $count, "Redstone");
 	}
 
diff --git a/src/pocketmine/item/Slimeball.php b/src/pocketmine/item/Slimeball.php
deleted file mode 100644
index 21b07a7992..0000000000
--- a/src/pocketmine/item/Slimeball.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-class Slimeball extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::SLIMEBALL, $meta, $count, "Slimeball");
-	}
-
-}
-
diff --git a/src/pocketmine/item/StringItem.php b/src/pocketmine/item/StringItem.php
index 9b68d4c834..8e2a688a70 100644
--- a/src/pocketmine/item/StringItem.php
+++ b/src/pocketmine/item/StringItem.php
@@ -23,8 +23,12 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
+use pocketmine\block\Block;
+use pocketmine\block\BlockFactory;
+
 class StringItem extends Item{
 	public function __construct($meta = 0, $count = 1){
+		$this->block = BlockFactory::get(Block::TRIPWIRE);
 		parent::__construct(self::STRING, $meta, $count, "String");
 	}
 
diff --git a/src/pocketmine/item/Sugar.php b/src/pocketmine/item/Sugar.php
deleted file mode 100644
index 65ff2cc142..0000000000
--- a/src/pocketmine/item/Sugar.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-class Sugar extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::SUGAR, $meta, $count, "Sugar");
-	}
-
-}
-
diff --git a/src/pocketmine/item/Tool.php b/src/pocketmine/item/Tool.php
index 8172a5daae..6ba6ab55af 100644
--- a/src/pocketmine/item/Tool.php
+++ b/src/pocketmine/item/Tool.php
@@ -105,7 +105,7 @@ abstract class Tool extends Item{
 				if(($type = $this->isSword()) === false){
 					if(($type = $this->isShovel()) === false){
 						if(($type = $this->isHoe()) === false){
-							$type = $this->id;
+							return false;
 						}
 					}
 				}
diff --git a/src/pocketmine/item/Wheat.php b/src/pocketmine/item/Wheat.php
deleted file mode 100644
index ec12acefe7..0000000000
--- a/src/pocketmine/item/Wheat.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\item;
-
-class Wheat extends Item{
-	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::WHEAT, $meta, $count, "Wheat");
-	}
-
-}
-