From 97dbf61236cdd36fe2205d87480a3971110ff5b2 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Mon, 9 Oct 2017 12:31:57 +0100
Subject: [PATCH] Remove some no-longer-needed item classes

---
 src/pocketmine/block/FlowerPot.php   |  2 +-
 src/pocketmine/block/IronDoor.php    |  2 +-
 src/pocketmine/block/Skull.php       |  2 +-
 src/pocketmine/item/BrewingStand.php | 33 ------------------------
 src/pocketmine/item/FlowerPot.php    | 34 -------------------------
 src/pocketmine/item/IronDoor.php     | 38 ----------------------------
 src/pocketmine/item/ItemFactory.php  | 16 ++++++------
 src/pocketmine/item/ItemFrame.php    | 34 -------------------------
 src/pocketmine/item/NetherWart.php   | 34 -------------------------
 src/pocketmine/item/Skull.php        | 34 -------------------------
 src/pocketmine/item/Sugarcane.php    | 34 -------------------------
 src/pocketmine/item/WoodenDoor.php   | 38 ----------------------------
 12 files changed, 11 insertions(+), 290 deletions(-)
 delete mode 100644 src/pocketmine/item/BrewingStand.php
 delete mode 100644 src/pocketmine/item/FlowerPot.php
 delete mode 100644 src/pocketmine/item/IronDoor.php
 delete mode 100644 src/pocketmine/item/ItemFrame.php
 delete mode 100644 src/pocketmine/item/NetherWart.php
 delete mode 100644 src/pocketmine/item/Skull.php
 delete mode 100644 src/pocketmine/item/Sugarcane.php
 delete mode 100644 src/pocketmine/item/WoodenDoor.php

diff --git a/src/pocketmine/block/FlowerPot.php b/src/pocketmine/block/FlowerPot.php
index 9f98ba708..267fc2413 100644
--- a/src/pocketmine/block/FlowerPot.php
+++ b/src/pocketmine/block/FlowerPot.php
@@ -48,7 +48,7 @@ class FlowerPot extends Flowable{
 	}
 
 	public function getName() : string{
-		return "Flower Pot Block";
+		return "Flower Pot";
 	}
 
 	protected function recalculateBoundingBox(){
diff --git a/src/pocketmine/block/IronDoor.php b/src/pocketmine/block/IronDoor.php
index 1c2d6322a..a3b11694a 100644
--- a/src/pocketmine/block/IronDoor.php
+++ b/src/pocketmine/block/IronDoor.php
@@ -37,7 +37,7 @@ class IronDoor extends Door{
 	}
 
 	public function getName() : string{
-		return "Iron Door Block";
+		return "Iron Door";
 	}
 
 	public function getToolType() : int{
diff --git a/src/pocketmine/block/Skull.php b/src/pocketmine/block/Skull.php
index 2a75e3c45..03fc7efef 100644
--- a/src/pocketmine/block/Skull.php
+++ b/src/pocketmine/block/Skull.php
@@ -49,7 +49,7 @@ class Skull extends Flowable{
 	}
 
 	public function getName() : string{
-		return "Mob Head Block";
+		return "Mob Head";
 	}
 
 	protected function recalculateBoundingBox(){
diff --git a/src/pocketmine/item/BrewingStand.php b/src/pocketmine/item/BrewingStand.php
deleted file mode 100644
index 9597d4ba0..000000000
--- a/src/pocketmine/item/BrewingStand.php
+++ /dev/null
@@ -1,33 +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;
-
-use pocketmine\block\Block;
-
-class BrewingStand extends Item{
-	public function __construct(int $meta = 0){
-		$this->block = Block::get(Block::BREWING_STAND_BLOCK);
-		parent::__construct(self::BREWING_STAND, $meta, "Brewing Stand");
-	}
-}
diff --git a/src/pocketmine/item/FlowerPot.php b/src/pocketmine/item/FlowerPot.php
deleted file mode 100644
index b0ab35fd4..000000000
--- a/src/pocketmine/item/FlowerPot.php
+++ /dev/null
@@ -1,34 +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;
-
-use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
-
-class FlowerPot extends Item{
-	public function __construct(int $meta = 0){
-		$this->block = BlockFactory::get(Block::FLOWER_POT_BLOCK);
-		parent::__construct(self::FLOWER_POT, $meta, "Flower Pot");
-	}
-}
\ No newline at end of file
diff --git a/src/pocketmine/item/IronDoor.php b/src/pocketmine/item/IronDoor.php
deleted file mode 100644
index 518f14c20..000000000
--- a/src/pocketmine/item/IronDoor.php
+++ /dev/null
@@ -1,38 +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;
-
-use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
-
-class IronDoor extends Item{
-	public function __construct(int $meta = 0){
-		$this->block = BlockFactory::get(Block::IRON_DOOR_BLOCK);
-		parent::__construct(self::IRON_DOOR, $meta, "Iron Door");
-	}
-
-	public function getMaxStackSize() : int{
-		return 1;
-	}
-}
\ No newline at end of file
diff --git a/src/pocketmine/item/ItemFactory.php b/src/pocketmine/item/ItemFactory.php
index fc67cf2b2..fbc4d5d7a 100644
--- a/src/pocketmine/item/ItemFactory.php
+++ b/src/pocketmine/item/ItemFactory.php
@@ -107,12 +107,12 @@ class ItemFactory{
 			self::registerItem(new Painting());
 			self::registerItem(new GoldenApple());
 			self::registerItem(new Sign());
-			self::registerItem(new WoodenDoor());
+			self::registerItem(new ItemBlock(Block::OAK_DOOR_BLOCK, 0, Item::OAK_DOOR));
 			self::registerItem(new Bucket());
 
 			self::registerItem(new Minecart());
 			//TODO: SADDLE
-			self::registerItem(new IronDoor());
+			self::registerItem(new ItemBlock(Block::IRON_DOOR_BLOCK, 0, Item::IRON_DOOR));
 			self::registerItem(new Redstone());
 			self::registerItem(new Snowball());
 			self::registerItem(new Boat());
@@ -120,7 +120,7 @@ class ItemFactory{
 
 			self::registerItem(new Item(Item::BRICK, 0, "Brick"));
 			self::registerItem(new Item(Item::CLAY_BALL, 0, "Clay"));
-			self::registerItem(new Sugarcane());
+			self::registerItem(new ItemBlock(Block::SUGARCANE_BLOCK, 0, Item::SUGARCANE));
 			self::registerItem(new Item(Item::PAPER, 0, "Paper"));
 			self::registerItem(new Book());
 			self::registerItem(new Item(Item::SLIME_BALL, 0, "Slimeball"));
@@ -154,14 +154,14 @@ class ItemFactory{
 			self::registerItem(new BlazeRod());
 			self::registerItem(new Item(Item::GHAST_TEAR, 0, "Ghast Tear"));
 			self::registerItem(new Item(Item::GOLD_NUGGET, 0, "Gold Nugget"));
-			self::registerItem(new NetherWart());
+			self::registerItem(new ItemBlock(Block::NETHER_WART_PLANT, 0, Item::NETHER_WART));
 			self::registerItem(new Potion());
 			self::registerItem(new GlassBottle());
 			self::registerItem(new SpiderEye());
 			self::registerItem(new Item(Item::FERMENTED_SPIDER_EYE, 0, "Fermented Spider Eye"));
 			self::registerItem(new Item(Item::BLAZE_POWDER, 0, "Blaze Powder"));
 			self::registerItem(new Item(Item::MAGMA_CREAM, 0, "Magma Cream"));
-			self::registerItem(new BrewingStand());
+			self::registerItem(new ItemBlock(Block::BREWING_STAND_BLOCK, 0, Item::BREWING_STAND));
 			//TODO: CAULDRON
 			//TODO: ENDER_EYE
 			self::registerItem(new Item(Item::GLISTERING_MELON, 0, "Glistering Melon"));
@@ -171,15 +171,15 @@ class ItemFactory{
 			self::registerItem(new WritableBook());
 			self::registerItem(new WrittenBook());
 			self::registerItem(new Item(Item::EMERALD, 0, "Emerald"));
-			self::registerItem(new ItemFrame());
-			self::registerItem(new FlowerPot());
+			self::registerItem(new ItemBlock(Block::ITEM_FRAME_BLOCK, 0, Item::ITEM_FRAME));
+			self::registerItem(new ItemBlock(Block::FLOWER_POT_BLOCK, 0, Item::FLOWER_POT));
 			self::registerItem(new Carrot());
 			self::registerItem(new Potato());
 			self::registerItem(new BakedPotato());
 			//TODO: POISONOUS_POTATO
 			//TODO: EMPTYMAP
 			self::registerItem(new GoldenCarrot());
-			self::registerItem(new Skull());
+			self::registerItem(new ItemBlock(Block::SKULL_BLOCK, 0, Item::SKULL));
 			//TODO: CARROTONASTICK
 			self::registerItem(new Item(Item::NETHER_STAR, 0, "Nether Star"));
 			self::registerItem(new PumpkinPie());
diff --git a/src/pocketmine/item/ItemFrame.php b/src/pocketmine/item/ItemFrame.php
deleted file mode 100644
index 9ee88ace0..000000000
--- a/src/pocketmine/item/ItemFrame.php
+++ /dev/null
@@ -1,34 +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;
-
-use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
-
-class ItemFrame extends Item{
-	public function __construct(int $meta = 0){
-		$this->block = BlockFactory::get(Block::ITEM_FRAME_BLOCK);
-		parent::__construct(self::ITEM_FRAME, $meta, "Item Frame");
-	}
-}
\ No newline at end of file
diff --git a/src/pocketmine/item/NetherWart.php b/src/pocketmine/item/NetherWart.php
deleted file mode 100644
index b02cda3ba..000000000
--- a/src/pocketmine/item/NetherWart.php
+++ /dev/null
@@ -1,34 +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;
-
-use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
-
-class NetherWart extends Item{
-	public function __construct(int $meta = 0){
-		$this->block = BlockFactory::get(Block::NETHER_WART_PLANT);
-		parent::__construct(self::NETHER_WART, $meta, "Nether Wart");
-	}
-}
diff --git a/src/pocketmine/item/Skull.php b/src/pocketmine/item/Skull.php
deleted file mode 100644
index 403418797..000000000
--- a/src/pocketmine/item/Skull.php
+++ /dev/null
@@ -1,34 +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;
-
-use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
-
-class Skull extends Item{
-	public function __construct(int $meta = 0){
-		$this->block = BlockFactory::get(Block::SKULL_BLOCK);
-		parent::__construct(self::SKULL, $meta, "Mob Head");
-	}
-}
\ No newline at end of file
diff --git a/src/pocketmine/item/Sugarcane.php b/src/pocketmine/item/Sugarcane.php
deleted file mode 100644
index d499c9cfa..000000000
--- a/src/pocketmine/item/Sugarcane.php
+++ /dev/null
@@ -1,34 +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;
-
-use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
-
-class Sugarcane extends Item{
-	public function __construct(int $meta = 0){
-		$this->block = BlockFactory::get(Block::SUGARCANE_BLOCK);
-		parent::__construct(self::SUGARCANE, $meta, "Sugar Cane");
-	}
-}
\ No newline at end of file
diff --git a/src/pocketmine/item/WoodenDoor.php b/src/pocketmine/item/WoodenDoor.php
deleted file mode 100644
index 4402967ab..000000000
--- a/src/pocketmine/item/WoodenDoor.php
+++ /dev/null
@@ -1,38 +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;
-
-use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
-
-class WoodenDoor extends Item{
-	public function __construct(int $meta = 0){
-		$this->block = BlockFactory::get(Block::WOODEN_DOOR_BLOCK);
-		parent::__construct(self::WOODEN_DOOR, $meta, "Wooden Door");
-	}
-
-	public function getMaxStackSize() : int{
-		return 1;
-	}
-}
\ No newline at end of file