Generate methods for surrogate enums, nip stupidity in the bud

this also allows changing the internal implementation later without breaking plugins.

src/pocketmine/block/Bed.php

@@ -55,7 +55,7 @@ class Bed extends Transparent{
 	protected $color;
 
 	public function __construct(){
-		$this->color = DyeColor::$RED;
+		$this->color = DyeColor::RED();
 	}
 
 	protected function writeStateToMeta() : int{

src/pocketmine/block/CocoaBlock.php

@@ -86,7 +86,7 @@ class CocoaBlock extends Transparent{
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
-		if(Facing::axis($face) !== Facing::AXIS_Y and $blockClicked instanceof Wood and $blockClicked->getTreeType() === TreeType::$JUNGLE){
+		if(Facing::axis($face) !== Facing::AXIS_Y and $blockClicked instanceof Wood and $blockClicked->getTreeType() === TreeType::JUNGLE()){
 			$this->facing = $face;
 			return parent::place($item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 		}
@@ -109,7 +109,7 @@ class CocoaBlock extends Transparent{
 
 	public function onNearbyBlockChange() : void{
 		$side = $this->getSide(Facing::opposite($this->facing));
-		if(!($side instanceof Wood) or $side->getTreeType() !== TreeType::$JUNGLE){
+		if(!($side instanceof Wood) or $side->getTreeType() !== TreeType::JUNGLE()){
 			$this->level->useBreakOn($this);
 		}
 	}

src/pocketmine/block/Leaves.php

@@ -134,7 +134,7 @@ class Leaves extends Transparent{
 		if(mt_rand(1, 20) === 1){ //Saplings
 			$drops[] = ItemFactory::get(Item::SAPLING, $this->treeType->getMagicNumber());
 		}
-		if(($this->treeType === TreeType::$OAK or $this->treeType === TreeType::$DARK_OAK) and mt_rand(1, 200) === 1){ //Apples
+		if(($this->treeType === TreeType::OAK() or $this->treeType === TreeType::DARK_OAK()) and mt_rand(1, 200) === 1){ //Apples
 			$drops[] = ItemFactory::get(Item::APPLE);
 		}
 

src/pocketmine/block/utils/DyeColor.php

@@ -26,37 +26,103 @@ namespace pocketmine\block\utils;
 final class DyeColor{
 
 	/** @var DyeColor */
-	public static $WHITE;
+	private static $WHITE;
 	/** @var DyeColor */
-	public static $ORANGE;
+	private static $ORANGE;
 	/** @var DyeColor */
-	public static $MAGENTA;
+	private static $MAGENTA;
 	/** @var DyeColor */
-	public static $LIGHT_BLUE;
+	private static $LIGHT_BLUE;
 	/** @var DyeColor */
-	public static $YELLOW;
+	private static $YELLOW;
 	/** @var DyeColor */
-	public static $LIME;
+	private static $LIME;
 	/** @var DyeColor */
-	public static $PINK;
+	private static $PINK;
 	/** @var DyeColor */
-	public static $GRAY;
+	private static $GRAY;
 	/** @var DyeColor */
-	public static $LIGHT_GRAY;
+	private static $LIGHT_GRAY;
 	/** @var DyeColor */
-	public static $CYAN;
+	private static $CYAN;
 	/** @var DyeColor */
-	public static $PURPLE;
+	private static $PURPLE;
 	/** @var DyeColor */
-	public static $BLUE;
+	private static $BLUE;
 	/** @var DyeColor */
-	public static $BROWN;
+	private static $BROWN;
 	/** @var DyeColor */
-	public static $GREEN;
+	private static $GREEN;
 	/** @var DyeColor */
-	public static $RED;
+	private static $RED;
 	/** @var DyeColor */
-	public static $BLACK;
+	private static $BLACK;
+
+	/* auto-generated code */
+
+	public static function WHITE() : DyeColor{
+		return self::$WHITE;
+	}
+
+	public static function ORANGE() : DyeColor{
+		return self::$ORANGE;
+	}
+
+	public static function MAGENTA() : DyeColor{
+		return self::$MAGENTA;
+	}
+
+	public static function LIGHT_BLUE() : DyeColor{
+		return self::$LIGHT_BLUE;
+	}
+
+	public static function YELLOW() : DyeColor{
+		return self::$YELLOW;
+	}
+
+	public static function LIME() : DyeColor{
+		return self::$LIME;
+	}
+
+	public static function PINK() : DyeColor{
+		return self::$PINK;
+	}
+
+	public static function GRAY() : DyeColor{
+		return self::$GRAY;
+	}
+
+	public static function LIGHT_GRAY() : DyeColor{
+		return self::$LIGHT_GRAY;
+	}
+
+	public static function CYAN() : DyeColor{
+		return self::$CYAN;
+	}
+
+	public static function PURPLE() : DyeColor{
+		return self::$PURPLE;
+	}
+
+	public static function BLUE() : DyeColor{
+		return self::$BLUE;
+	}
+
+	public static function BROWN() : DyeColor{
+		return self::$BROWN;
+	}
+
+	public static function GREEN() : DyeColor{
+		return self::$GREEN;
+	}
+
+	public static function RED() : DyeColor{
+		return self::$RED;
+	}
+
+	public static function BLACK() : DyeColor{
+		return self::$BLACK;
+	}
 
 	/** @var DyeColor[] */
 	private static $numericIdMap = [];

src/pocketmine/block/utils/TreeType.php

@@ -26,17 +26,43 @@ namespace pocketmine\block\utils;
 final class TreeType{
 
 	/** @var TreeType */
-	public static $OAK;
+	private static $OAK;
 	/** @var TreeType */
-	public static $SPRUCE;
+	private static $SPRUCE;
 	/** @var TreeType */
-	public static $BIRCH;
+	private static $BIRCH;
 	/** @var TreeType */
-	public static $JUNGLE;
+	private static $JUNGLE;
 	/** @var TreeType */
-	public static $ACACIA;
+	private static $ACACIA;
 	/** @var TreeType */
-	public static $DARK_OAK;
+	private static $DARK_OAK;
+
+	/* auto-generated code */
+
+	public static function OAK() : TreeType{
+		return self::$OAK;
+	}
+
+	public static function SPRUCE() : TreeType{
+		return self::$SPRUCE;
+	}
+
+	public static function BIRCH() : TreeType{
+		return self::$BIRCH;
+	}
+
+	public static function JUNGLE() : TreeType{
+		return self::$JUNGLE;
+	}
+
+	public static function ACACIA() : TreeType{
+		return self::$ACACIA;
+	}
+
+	public static function DARK_OAK() : TreeType{
+		return self::$DARK_OAK;
+	}
 
 	/** @var TreeType[] */
 	private static $numericIdMap = [];