From 6f4cec6465fb3cc87db2dddab0f1156995683687 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Mon, 18 Feb 2019 20:01:50 +0000
Subject: [PATCH] add some blocks introduced in 1.9

---
 src/pocketmine/block/BlockFactory.php | 4 ++++
 src/pocketmine/block/Flower.php       | 2 ++
 src/pocketmine/block/Quartz.php       | 1 +
 src/pocketmine/block/Sandstone.php    | 3 ++-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pocketmine/block/BlockFactory.php b/src/pocketmine/block/BlockFactory.php
index 5040a5244f..e9a2f3c474 100644
--- a/src/pocketmine/block/BlockFactory.php
+++ b/src/pocketmine/block/BlockFactory.php
@@ -142,6 +142,8 @@ class BlockFactory{
 		self::registerBlock(new Flower(Block::RED_FLOWER, Flower::TYPE_POPPY, "Poppy"));
 		self::registerBlock(new Flower(Block::RED_FLOWER, Flower::TYPE_RED_TULIP, "Red Tulip"));
 		self::registerBlock(new Flower(Block::RED_FLOWER, Flower::TYPE_WHITE_TULIP, "White Tulip"));
+		self::registerBlock(new Flower(Block::RED_FLOWER, Flower::TYPE_CORNFLOWER, "Cornflower"));
+		self::registerBlock(new Flower(Block::RED_FLOWER, Flower::TYPE_LILY_OF_THE_VALLEY, "Lily of the Valley"));
 		self::registerBlock(new FlowerPot());
 		self::registerBlock(new Furnace());
 		self::registerBlock((new Furnace())->setLit()); //flattening hack
@@ -229,6 +231,7 @@ class BlockFactory{
 		self::registerBlock(new class(Block::QUARTZ_BLOCK, Quartz::PILLAR, "Quartz Pillar") extends Quartz{
 			use PillarRotationTrait;
 		});
+		self::registerBlock(new Quartz(Block::QUARTZ_BLOCK, Quartz::SMOOTH, "Smooth Quartz Block")); //TODO: this has axis rotation in 1.9, unsure if a bug (https://bugs.mojang.com/browse/MCPE-39074)
 		self::registerBlock(new QuartzStairs());
 		self::registerBlock(new Rail());
 		self::registerBlock(new RedMushroom());
@@ -327,6 +330,7 @@ class BlockFactory{
 		static $sandstoneTypes = [
 			Sandstone::NORMAL => "",
 			Sandstone::CHISELED => "Chiseled ",
+			Sandstone::CUT => "Cut ",
 			Sandstone::SMOOTH => "Smooth "
 		];
 		foreach($sandstoneTypes as $variant => $prefix){
diff --git a/src/pocketmine/block/Flower.php b/src/pocketmine/block/Flower.php
index 4ae18ae68a..8ab6d0b936 100644
--- a/src/pocketmine/block/Flower.php
+++ b/src/pocketmine/block/Flower.php
@@ -38,6 +38,8 @@ class Flower extends Flowable{
 	public const TYPE_WHITE_TULIP = 6;
 	public const TYPE_PINK_TULIP = 7;
 	public const TYPE_OXEYE_DAISY = 8;
+	public const TYPE_CORNFLOWER = 9;
+	public const TYPE_LILY_OF_THE_VALLEY = 10;
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$down = $this->getSide(Facing::DOWN);
diff --git a/src/pocketmine/block/Quartz.php b/src/pocketmine/block/Quartz.php
index 926a20a357..e650043832 100644
--- a/src/pocketmine/block/Quartz.php
+++ b/src/pocketmine/block/Quartz.php
@@ -30,6 +30,7 @@ class Quartz extends Solid{
 	public const NORMAL = 0;
 	public const CHISELED = 1;
 	public const PILLAR = 2;
+	public const SMOOTH = 3;
 
 	public function getHardness() : float{
 		return 0.8;
diff --git a/src/pocketmine/block/Sandstone.php b/src/pocketmine/block/Sandstone.php
index 17571564a8..5bcf9b018d 100644
--- a/src/pocketmine/block/Sandstone.php
+++ b/src/pocketmine/block/Sandstone.php
@@ -29,7 +29,8 @@ class Sandstone extends Solid{
 
 	public const NORMAL = 0;
 	public const CHISELED = 1;
-	public const SMOOTH = 2;
+	public const CUT = 2;
+	public const SMOOTH = 3;
 
 	public function getHardness() : float{
 		return 0.8;