Added Flower Pots

src/pocketmine/Server.php

@@ -104,6 +104,7 @@ use pocketmine\scheduler\SendUsageTask;
 use pocketmine\scheduler\ServerScheduler;
 use pocketmine\tile\Chest;
 use pocketmine\tile\EnchantTable;
+use pocketmine\tile\FlowerPot;
 use pocketmine\tile\Furnace;
 use pocketmine\tile\Sign;
 use pocketmine\tile\Skull;
@@ -2503,10 +2504,11 @@ class Server{
 
 	private function registerTiles(){
 		Tile::registerTile(Chest::class);
+		Tile::registerTile(EnchantTable::class);
+		Tile::registerTile(FlowerPot::class);
 		Tile::registerTile(Furnace::class);
 		Tile::registerTile(Sign::class);
 		Tile::registerTile(Skull::class);
-		Tile::registerTile(EnchantTable::class);
 	}
 
 }

src/pocketmine/block/BlockIds.php

@@ -55,8 +55,7 @@ interface BlockIds{
 	const STICKY_PISTON = 29;
 	const COBWEB = 30;
 	const TALL_GRASS = 31;
-	const BUSH = 32;
-	const DEAD_BUSH = 32;
+	const BUSH = 32; const DEAD_BUSH = 32;
 	const PISTON = 33;
 	const PISTON_HEAD = 34;
 	const WOOL = 35;

src/pocketmine/block/FlowerPot.php

@@ -22,8 +22,21 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\level\Level;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\ShortTag;
+use pocketmine\nbt\tag\StringTag;
+use pocketmine\tile\FlowerPot as TileFlowerPot;
+use pocketmine\tile\Tile;
+use pocketmine\Player;
 
-class FlowerPot extends Transparent{
+class FlowerPot extends Flowable{
+
+	const STATE_EMPTY = 0;
+	const STATE_FULL = 1;
 
 	protected $id = self::FLOWER_POT_BLOCK;
 
@@ -35,4 +48,90 @@ class FlowerPot extends Transparent{
 		return "Flower Pot Block";
 	}
 
+	public function canBeActivated(): bool{
+		return true;
+	}
+
+	public function getBoundingBox(){
+		return new AxisAlignedBB(
+			$this->x + (5/16),
+			$this->y,
+			$this->z + (5/16),
+			$this->x + (11/16),
+			$this->y + (6/16),
+			$this->z + (11/16)
+		);
+	}
+
+	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			return false;
+		}
+
+		$this->getLevel()->setBlock($block, $this, true, true);
+
+		$nbt = new CompoundTag("", [
+			new StringTag("id", Tile::FLOWER_POT),
+			new IntTag("x", $block->x),
+			new IntTag("y", $block->y),
+			new IntTag("z", $block->z),
+			new ShortTag("item", 0),
+			new IntTag("mData", 0),
+		]);
+
+		if($item->hasCustomBlockData()){
+			foreach($item->getCustomBlockData() as $key => $v){
+				$nbt->{$key} = $v;
+			}
+		}
+
+		Tile::createTile(Tile::FLOWER_POT, $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+		return true;
+	}
+
+	public function onUpdate($type){
+		if($type === Level::BLOCK_UPDATE_NORMAL){
+			if($this->getSide(0)->isTransparent() === true){
+				$this->getLevel()->useBreakOn($this);
+
+				return Level::BLOCK_UPDATE_NORMAL;
+			}
+		}
+
+		return false;
+	}
+
+	public function onActivate(Item $item, Player $player = null){
+		$pot = $this->getLevel()->getTile($this);
+		if(!($pot instanceof TileFlowerPot)){
+			return false;
+		}
+		if(!$pot->canAddItem($item)){
+			return false;
+		}
+
+		$this->setDamage(self::STATE_FULL); //specific damage value is unnecessary, it just needs to be non-zero to show an item.
+		$this->getLevel()->setBlock($this, $this, true, false);
+		$pot->setItem($item);
+		
+		if($player instanceof Player){
+			if($player->isSurvival()){
+				$item->setCount($item->getCount() - 1);
+				$player->getInventory()->setItemInHand($item->getCount() > 0 ? $item : Item::get(Item::AIR));
+			}
+		}
+		return true;
+	}
+
+	public function getDrops(Item $item){
+		$items = [[Item::FLOWER_POT, 0, 1]];
+		$tile = $this->getLevel()->getTile($this);
+		if($tile instanceof TileFlowerPot){
+			if(($item = $tile->getItem())->getId() !== Item::AIR){
+				$items[] = [$item->getId(), $item->getDamage(), 1];
+			}
+		}
+		return $items;
+	}
+
 }

src/pocketmine/tile/FlowerPot.php

@@ -0,0 +1,98 @@
+<?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\tile;
+
+use pocketmine\item\Item;
+use pocketmine\level\format\FullChunk;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\ShortTag;
+use pocketmine\nbt\tag\StringTag;
+
+class FlowerPot extends Spawnable{
+
+	public function __construct(FullChunk $chunk, CompoundTag $nbt){
+		if(!isset($nbt->Item)){
+			$nbt->item = new ShortTag("item", 0);
+		}
+		if(!isset($nbt->Data)){
+			$nbt->mData = new IntTag("mData", 0);
+		}
+		parent::__construct($chunk, $nbt);
+	}
+	
+	public function canAddItem(Item $item): bool{
+		if(!$this->isEmpty()){
+			return false;
+		}
+		switch($item->getId()){
+			case Item::TALL_GRASS:
+				if($item->getDamage() === 1){
+					return false;
+				}
+			case Item::SAPLING:
+			case Item::DEAD_BUSH:
+			case Item::DANDELION:
+			case Item::RED_FLOWER:
+			case Item::BROWN_MUSHROOM:
+			case Item::RED_MUSHROOM:
+			case Item::CACTUS:
+				return true;
+			default:
+				return false;
+		}
+	}
+	
+	public function getItem(): Item{
+		return Item::get((int) ($this->namedtag["item"] ?? 0), (int) ($this->namedtag["mData"] ?? 0), 1);
+	}
+	
+	public function setItem(Item $item){
+		$this->namedtag["item"] = $item->getId();
+		$this->namedtag["mData"] = $item->getDamage();
+		$this->spawnToAll();
+
+		if($this->chunk){
+			$this->chunk->setChanged();
+			$this->level->clearChunkCache($this->chunk->getX(), $this->chunk->getZ());
+		}
+	}
+	
+	public function removeItem(){
+		$this->setItem(Item::get(Item::AIR));
+	}
+	
+	public function isEmpty(): bool{
+		return $this->getItem()->getId() === Item::AIR;
+	}
+	
+	public function getSpawnCompound(): CompoundTag{
+		return new CompoundTag("", [
+			new StringTag("id", Tile::FLOWER_POT),
+			new IntTag("x", (int) $this->x),
+			new IntTag("y", (int) $this->y),
+			new IntTag("z", (int) $this->z),
+			new ShortTag("item", (int) $this->namedtag["item"]),
+			new IntTag("mData", (int) $this->namedtag["mData"])
+		]);
+	}
+}