PocketMine 1.4.1

Implemented proportional armor modifier, applied armor in other damage types and consume armor when player is damaged

.gitignore

@@ -2,6 +2,7 @@ players/*
 worlds/*
 plugins/*
 bin/*
+timings/*
 *.log
 *.txt
 *.phar

.gitmodules

@@ -9,3 +9,6 @@
 [submodule "src/spl"]
 	path = src/spl
 	url = https://github.com/PocketMine/PocketMine-SPL.git
+[submodule "tests/TesterPlugin"]
+	path = tests/TesterPlugin
+	url = https://github.com/PocketMine/TesterPlugin.git

.travis.yml

@@ -10,7 +10,7 @@ before_script:
  - mkdir plugins
  - wget -O plugins/DevTools.phar https://github.com/PocketMine/DevTools/releases/download/v1.9.0/DevTools_v1.9.0.phar
  - pecl install channel://pecl.php.net/pthreads-2.0.10
- - pecl install channel://pecl.php.net/weakref-0.2.4
+ - pecl install channel://pecl.php.net/weakref-0.2.6
  - echo | pecl install channel://pecl.php.net/yaml-1.1.1
 
 script:
@@ -18,4 +18,4 @@ script:
  
 notifications:
  email: false
- #webhooks: http://n.tkte.ch/h/214/wsNvmG43-ncxUVRrFPwSM-r0
+ #webhooks: http://n.tkte.ch/h/214/wsNvmG43-ncxUVRrFPwSM-r0

src/pocketmine/CrashDump.php

@@ -42,7 +42,10 @@ class CrashDump{
 		$this->time = time();
 		$this->server = $server;
 		$this->path = $this->server->getDataPath() . "CrashDump_" . date("D_M_j-H.i.s-T_Y", $this->time) . ".log";
-		$this->fp = fopen($this->path, "wb");
+		$this->fp = @fopen($this->path, "wb");
+		if(!is_resource($this->fp)){
+			throw new \RuntimeException("Could not create Crash Dump");
+		}
 		$this->data["time"] = $this->time;
 		$this->addLine($this->server->getName() . " Crash Dump " . date("D M j H:i:s T Y", $this->time));
 		$this->addLine();
@@ -137,7 +140,7 @@ class CrashDump{
 			$error = $lastExceptionError;
 		}else{
 			$error = (array) error_get_last();
-			$error["trace"] = getTrace(4);
+			$error["trace"] = @getTrace(3);
 			$errorConversion = [
 				E_ERROR => "E_ERROR",
 				E_WARNING => "E_WARNING",

src/pocketmine/PocketMine.php

@@ -65,16 +65,15 @@ namespace {
 }
 
 namespace pocketmine {
-	use LogLevel;
 	use pocketmine\utils\Binary;
 	use pocketmine\utils\MainLogger;
 	use pocketmine\utils\Utils;
 	use pocketmine\wizard\Installer;
 
-	const VERSION = "Alpha_1.4dev";
+	const VERSION = "1.4.1";
-	const API_VERSION = "1.6.0";
+	const API_VERSION = "1.11.0";
 	const CODENAME = "絶好(Zekkou)ケーキ(Cake)";
-	const MINECRAFT_VERSION = "v0.9.5 alpha";
+	const MINECRAFT_VERSION = "v0.10.5 alpha";
 
 	/*
 	 * Startup code. Do not look at it, it may harm you.
@@ -96,6 +95,7 @@ namespace pocketmine {
 	}
 
 	if(!class_exists("ClassLoader", false)){
+		require_once(\pocketmine\PATH . "src/spl/ThreadedFactory.php");
 		require_once(\pocketmine\PATH . "src/spl/ClassLoader.php");
 		require_once(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
 		require_once(\pocketmine\PATH . "src/pocketmine/CompatibleClassLoader.php");
@@ -104,7 +104,6 @@ namespace pocketmine {
 	$autoloader = new CompatibleClassLoader();
 	$autoloader->addPath(\pocketmine\PATH . "src");
 	$autoloader->addPath(\pocketmine\PATH . "src" . DIRECTORY_SEPARATOR . "spl");
-	$autoloader->addPath(\pocketmine\PATH . "src" . DIRECTORY_SEPARATOR . "raklib");
 	$autoloader->register(true);
 
 
@@ -117,16 +116,21 @@ namespace pocketmine {
 	ini_set("display_startup_errors", 1);
 	ini_set("default_charset", "utf-8");
 
-	ini_set("memory_limit", "256M"); //Default
+	ini_set("memory_limit", -1);
 	define("pocketmine\\START_TIME", microtime(true));
 
 	$opts = getopt("", ["enable-ansi", "disable-ansi", "data:", "plugins:", "no-wizard", "enable-profiler"]);
 
-	define("pocketmine\\DATA", isset($opts["data"]) ? realpath($opts["data"]) . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR);
+	define("pocketmine\\DATA", isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR);
-	define("pocketmine\\PLUGIN_PATH", isset($opts["plugins"]) ? realpath($opts["plugins"]) . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
+	define("pocketmine\\PLUGIN_PATH", isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
 
 	define("pocketmine\\ANSI", (Utils::getOS() !== "win" or isset($opts["enable-ansi"])) and !isset($opts["disable-ansi"]));
 
+
+	if(!file_exists(\pocketmine\DATA)){
+		mkdir(\pocketmine\DATA, 0777, true);
+	}
+
 	//Logger has a dependency on timezone, so we'll set it to UTC until we can get the actual timezone.
 	date_default_timezone_set("UTC");
 	$logger = new MainLogger(\pocketmine\DATA . "server.log", \pocketmine\ANSI);
@@ -134,15 +138,15 @@ namespace pocketmine {
 	if(!ini_get("date.timezone")){
 		if(($timezone = detect_system_timezone()) and date_default_timezone_set($timezone)){
 			//Success! Timezone has already been set and validated in the if statement.
-			//This here is just for redundancy just in case some stupid program wants to read timezone data from the ini.
+			//This here is just for redundancy just in case some program wants to read timezone data from the ini.
 			ini_set("date.timezone", $timezone);
 		}else{
 			//If system timezone detection fails or timezone is an invalid value.
 			if($response = Utils::getURL("http://ip-api.com/json")
 				and $ip_geolocation_data = json_decode($response, true)
 				and $ip_geolocation_data['status'] != 'fail'
-				and date_default_timezone_set($ip_geolocation_data['timezone']))
+				and date_default_timezone_set($ip_geolocation_data['timezone'])
-			{
+			){
 				//Again, for redundancy.
 				ini_set("date.timezone", $ip_geolocation_data['timezone']);
 			}else{
@@ -153,7 +157,8 @@ namespace pocketmine {
 		}
 	}else{
 		/*
-		 * This is here so that stupid idiots don't come to us complaining and fill up the issue tracker when they put an incorrect timezone abbreviation in php.ini apparently.
+		 * This is here so that people don't come to us complaining and fill up the issue tracker when they put
+		 * an incorrect timezone abbreviation in php.ini apparently.
 		 */
 		$default_timezone = date_default_timezone_get();
 		if(strpos($default_timezone, "/") === false){
@@ -166,17 +171,30 @@ namespace pocketmine {
 	function detect_system_timezone(){
 		switch(Utils::getOS()){
 			case 'win':
-				$regex = '/(?:Time Zone:\s*\()(UTC)(\+*\-*\d*\d*\:*\d*\d*)(?:\))/';
+				$regex = '/(UTC)(\+*\-*\d*\d*\:*\d*\d*)/';
 
-				exec("systeminfo", $output);
+				/*
+				 * wmic timezone get Caption
+				 * Get the timezone offset
+				 *
+				 * Sample Output var_dump
+				 * array(3) {
+				 *	  [0] =>
+				 *	  string(7) "Caption"
+				 *	  [1] =>
+				 *	  string(20) "(UTC+09:30) Adelaide"
+				 *	  [2] =>
+				 *	  string(0) ""
+				 *	}
+				 */
+				exec("wmic timezone get Caption", $output);
 
 				$string = trim(implode("\n", $output));
 
-				//Detect the Time Zone string in systeminfo
+				//Detect the Time Zone string
 				preg_match($regex, $string, $matches);
 
-				if(!isset($matches[2]))
+				if(!isset($matches[2])){
-				{
 					return false;
 				}
 
@@ -234,6 +252,7 @@ namespace pocketmine {
 
 	/**
 	 * @param string $offset In the format of +09:00, +02:00, -04:00 etc.
+	 *
 	 * @return string
 	 */
 	function parse_offset($offset){
@@ -314,7 +333,7 @@ namespace pocketmine {
 					$args = $trace[$i]["params"];
 				}
 				foreach($args as $name => $value){
-					$params .= (is_object($value) ? get_class($value) . " " . (method_exists($value, "__toString") ? $value->__toString() : "object") : gettype($value) . " " . @strval($value)) . ", ";
+					$params .= (is_object($value) ? get_class($value) . " " . (method_exists($value, "__toString") ? $value->__toString() : "object") : gettype($value) . " " . (is_array($value) ? "Array()" : @strval($value))) . ", ";
 				}
 			}
 			$messages[] = "#$j " . (isset($trace[$i]["file"]) ? cleanPath($trace[$i]["file"]) : "") . "(" . (isset($trace[$i]["line"]) ? $trace[$i]["line"] : "") . "): " . (isset($trace[$i]["class"]) ? $trace[$i]["class"] . (($trace[$i]["type"] === "dynamic" or $trace[$i]["type"] === "->") ? "->" : "::") : "") . $trace[$i]["function"] . "(" . substr($params, 0, -2) . ")";
@@ -327,55 +346,7 @@ namespace pocketmine {
 		return rtrim(str_replace(["\\", ".php", "phar://", rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PATH), "/"), rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PLUGIN_PATH), "/")], ["/", "", "", "", ""], $path), "/");
 	}
 
-	function error_handler($errno, $errstr, $errfile, $errline, $context, $trace = null){
+	set_error_handler([\ExceptionHandler::class, "handler"], -1);
-		global $lastError;
-		if(error_reporting() === 0){ //@ error-con..trol
-			return false;
-		}
-		$errorConversion = [
-			E_ERROR => "E_ERROR",
-			E_WARNING => "E_WARNING",
-			E_PARSE => "E_PARSE",
-			E_NOTICE => "E_NOTICE",
-			E_CORE_ERROR => "E_CORE_ERROR",
-			E_CORE_WARNING => "E_CORE_WARNING",
-			E_COMPILE_ERROR => "E_COMPILE_ERROR",
-			E_COMPILE_WARNING => "E_COMPILE_WARNING",
-			E_USER_ERROR => "E_USER_ERROR",
-			E_USER_WARNING => "E_USER_WARNING",
-			E_USER_NOTICE => "E_USER_NOTICE",
-			E_STRICT => "E_STRICT",
-			E_RECOVERABLE_ERROR => "E_RECOVERABLE_ERROR",
-			E_DEPRECATED => "E_DEPRECATED",
-			E_USER_DEPRECATED => "E_USER_DEPRECATED",
-		];
-		$type = ($errno === E_ERROR or $errno === E_USER_ERROR) ? LogLevel::ERROR : (($errno === E_USER_WARNING or $errno === E_WARNING) ? LogLevel::WARNING : LogLevel::NOTICE);
-		$errno = isset($errorConversion[$errno]) ? $errorConversion[$errno] : $errno;
-		if(($pos = strpos($errstr, "\n")) !== false){
-			$errstr = substr($errstr, 0, $pos);
-		}
-		$logger = MainLogger::getLogger();
-		$oldFile = $errfile;
-		$errfile = cleanPath($errfile);
-		$logger->log($type, "An $errno error happened: \"$errstr\" in \"$errfile\" at line $errline");
-
-		foreach(($trace = getTrace($trace === null ? 3 : 0, $trace)) as $i => $line){
-			$logger->debug($line);
-		}
-
-		$lastError = [
-			"type" => $type,
-			"message" => $errstr,
-			"fullFile" => $oldFile,
-			"file" => $errfile,
-			"line" => $errline,
-			"trace" => $trace
-		];
-
-		return true;
-	}
-
-	set_error_handler("\\pocketmine\\error_handler", E_ALL);
 
 	$errors = 0;
 
@@ -398,8 +369,8 @@ namespace pocketmine {
 	if(substr_count($pthreads_version, ".") < 2){
 		$pthreads_version = "0.$pthreads_version";
 	}
-	if(version_compare($pthreads_version, "2.0.8") < 0){
+	if(version_compare($pthreads_version, "2.0.9") < 0){
-		$logger->critical("pthreads >= 2.0.8 is required, while you have $pthreads_version.");
+		$logger->critical("pthreads >= 2.0.9 is required, while you have $pthreads_version.");
 		++$errors;
 	}
 
@@ -463,7 +434,7 @@ namespace pocketmine {
 		new Installer();
 	}
 
-	if(substr(__FILE__, 0, 7) !== "phar://"){
+	if(\Phar::running(true) === ""){
 		$logger->warning("Non-packaged PocketMine-MP installation detected, do not use on production.");
 	}
 

src/pocketmine/Thread.php

@@ -26,9 +26,13 @@ namespace pocketmine;
  */
 abstract class Thread extends \Thread{
 
-	public final function start($options = PTHREADS_INHERIT_ALL){
+	public function start($options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
-		return parent::start($options);
+		if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated()){
+			return parent::start($options);
+		}
+
+		return false;
 	}
 }

src/pocketmine/Worker.php

@@ -26,9 +26,13 @@ namespace pocketmine;
  */
 abstract class Worker extends \Worker{
 
-	public final function start($options = PTHREADS_INHERIT_ALL){
+	public function start($options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
-		return parent::start($options);
+		if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated() and !$this->isShutdown()){
+			return parent::start($options);
+		}
+
+		return false;
 	}
 }

src/pocketmine/block/AcaciaWoodStairs.php

@@ -24,8 +24,15 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class AcaciaWoodStairs extends Stair{
+
+	protected $id = self::ACACIA_WOOD_STAIRS;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::ACACIA_WOOD_STAIRS, $meta, "Acacia Wood Stairs");
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Acacia Wood Stairs";
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Air.php

@@ -21,29 +21,45 @@
 
 namespace pocketmine\block;
 
+use pocketmine\item\Item;
+
 
 /**
  * Air block
  */
 class Air extends Transparent{
-	public $isActivable = false;
+
-	public $breakable = false;
-	public $isFlowable = true;
-	public $isTransparent = true;
-	public $isReplaceable = true;
-	public $isPlaceable = false;
-	public $hasPhysics = false;
-	public $isSolid = false;
-	public $isFullBlock = true;
 	protected $id = self::AIR;
 	protected $meta = 0;
-	protected $name = "Air";
-	protected $hardness = 0;
 
 	public function __construct(){
 
 	}
 
+	public function getName(){
+		return "Air";
+	}
+
+	public function isBreakable(Item $item){
+		return false;
+	}
+
+	public function canBeFlowedInto(){
+		return true;
+	}
+
+	public function canBeReplaced(){
+		return true;
+	}
+
+	public function canBePlaced(){
+		return false;
+	}
+
+	public function isSolid(){
+		return false;
+	}
+
 	public function getBoundingBox(){
 		return null;
 	}

src/pocketmine/block/Bed.php

@@ -28,19 +28,27 @@ use pocketmine\network\protocol\ChatPacket;
 use pocketmine\Player;
 
 class Bed extends Transparent{
-	public function __construct($type = 0){
+
-		parent::__construct(self::BED_BLOCK, $type, "Bed Block");
+	protected $id = self::BED_BLOCK;
-		$this->isActivable = true;
+
-		$this->isFullBlock = false;
+	public function __construct($meta = 0){
-		$this->hardness = 1;
+		$this->meta = $meta;
 	}
 
-	public function getBoundingBox(){
+	public function canBeActivated(){
-		if($this->boundingBox !== null){
+		return true;
-			return $this->boundingBox;
+	}
-		}
 
-		return $this->boundingBox = new AxisAlignedBB(
+	public function getHardness(){
+		return 1;
+	}
+
+	public function getName(){
+		return "Bed Block";
+	}
+
+	protected function recalculateBoundingBox(){
+		return new AxisAlignedBB(
 			$this->x,
 			$this->y,
 			$this->z,
@@ -57,7 +65,7 @@ class Bed extends Transparent{
 		$isNight = ($time >= Level::TIME_NIGHT and $time < Level::TIME_SUNRISE);
 
 		if($player instanceof Player and !$isNight){
-			$pk = new ChatPacket;
+			$pk = new ChatPacket();
 			$pk->message = "You can only sleep at night";
 			$player->dataPacket($pk);
 
@@ -71,17 +79,17 @@ class Bed extends Transparent{
 		if(($this->meta & 0x08) === 0x08){ //This is the Top part of bed
 			$b = $this;
 		}else{ //Bottom Part of Bed
-			if($blockNorth->getID() === $this->id and ($blockNorth->meta & 0x08) === 0x08){
+			if($blockNorth->getId() === $this->id and ($blockNorth->meta & 0x08) === 0x08){
 				$b = $blockNorth;
-			}elseif($blockSouth->getID() === $this->id and ($blockSouth->meta & 0x08) === 0x08){
+			}elseif($blockSouth->getId() === $this->id and ($blockSouth->meta & 0x08) === 0x08){
 				$b = $blockSouth;
-			}elseif($blockEast->getID() === $this->id and ($blockEast->meta & 0x08) === 0x08){
+			}elseif($blockEast->getId() === $this->id and ($blockEast->meta & 0x08) === 0x08){
 				$b = $blockEast;
-			}elseif($blockWest->getID() === $this->id and ($blockWest->meta & 0x08) === 0x08){
+			}elseif($blockWest->getId() === $this->id and ($blockWest->meta & 0x08) === 0x08){
 				$b = $blockWest;
 			}else{
 				if($player instanceof Player){
-					$pk = new ChatPacket;
+					$pk = new ChatPacket();
 					$pk->message = "This bed is incomplete";
 					$player->dataPacket($pk);
 				}
@@ -91,7 +99,7 @@ class Bed extends Transparent{
 		}
 
 		if($player instanceof Player and $player->sleepOn($b) === false){
-			$pk = new ChatPacket;
+			$pk = new ChatPacket();
 			$pk->message = "This bed is occupied";
 			$player->dataPacket($pk);
 		}
@@ -101,7 +109,7 @@ class Bed extends Transparent{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
-		if($down->isTransparent === false){
+		if($down->isTransparent() === false){
 			$faces = [
 				0 => 3,
 				1 => 4,
@@ -111,7 +119,7 @@ class Bed extends Transparent{
 			$d = $player instanceof Player ? $player->getDirection() : 0;
 			$next = $this->getSide($faces[(($d + 3) % 4)]);
 			$downNext = $this->getSide(0);
-			if($next->isReplaceable === true and $downNext->isTransparent === false){
+			if($next->canBeReplaced() === true and $downNext->isTransparent() === false){
 				$meta = (($d + 3) % 4) & 0x03;
 				$this->getLevel()->setBlock($block, Block::get($this->id, $meta), true, true);
 				$this->getLevel()->setBlock($next, Block::get($this->id, $meta | 0x08), true, true);
@@ -130,23 +138,23 @@ class Bed extends Transparent{
 		$blockWest = $this->getSide(4);
 
 		if(($this->meta & 0x08) === 0x08){ //This is the Top part of bed
-			if($blockNorth->getID() === $this->id and $blockNorth->meta !== 0x08){ //Checks if the block ID and meta are right
+			if($blockNorth->getId() === $this->id and $blockNorth->meta !== 0x08){ //Checks if the block ID and meta are right
 				$this->getLevel()->setBlock($blockNorth, new Air(), true, true);
-			}elseif($blockSouth->getID() === $this->id and $blockSouth->meta !== 0x08){
+			}elseif($blockSouth->getId() === $this->id and $blockSouth->meta !== 0x08){
 				$this->getLevel()->setBlock($blockSouth, new Air(), true, true);
-			}elseif($blockEast->getID() === $this->id and $blockEast->meta !== 0x08){
+			}elseif($blockEast->getId() === $this->id and $blockEast->meta !== 0x08){
 				$this->getLevel()->setBlock($blockEast, new Air(), true, true);
-			}elseif($blockWest->getID() === $this->id and $blockWest->meta !== 0x08){
+			}elseif($blockWest->getId() === $this->id and $blockWest->meta !== 0x08){
 				$this->getLevel()->setBlock($blockWest, new Air(), true, true);
 			}
 		}else{ //Bottom Part of Bed
-			if($blockNorth->getID() === $this->id and ($blockNorth->meta & 0x08) === 0x08){
+			if($blockNorth->getId() === $this->id and ($blockNorth->meta & 0x08) === 0x08){
 				$this->getLevel()->setBlock($blockNorth, new Air(), true, true);
-			}elseif($blockSouth->getID() === $this->id and ($blockSouth->meta & 0x08) === 0x08){
+			}elseif($blockSouth->getId() === $this->id and ($blockSouth->meta & 0x08) === 0x08){
 				$this->getLevel()->setBlock($blockSouth, new Air(), true, true);
-			}elseif($blockEast->getID() === $this->id and ($blockEast->meta & 0x08) === 0x08){
+			}elseif($blockEast->getId() === $this->id and ($blockEast->meta & 0x08) === 0x08){
 				$this->getLevel()->setBlock($blockEast, new Air(), true, true);
-			}elseif($blockWest->getID() === $this->id and ($blockWest->meta & 0x08) === 0x08){
+			}elseif($blockWest->getId() === $this->id and ($blockWest->meta & 0x08) === 0x08){
 				$this->getLevel()->setBlock($blockWest, new Air(), true, true);
 			}
 		}

src/pocketmine/block/Bedrock.php

@@ -24,10 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Bedrock extends Solid{
+
+	protected $id = self::BEDROCK;
+
 	public function __construct(){
-		parent::__construct(self::BEDROCK, 0, "Bedrock");
+
-		$this->breakable = false;
+	}
-		$this->hardness = 18000000;
+
+	public function getName(){
+		return "Bedrock";
+	}
+
+	public function getHardness(){
+		return 18000000;
 	}
 
 	public function isBreakable(Item $item){

src/pocketmine/block/Beetroot.php

@@ -24,8 +24,15 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Beetroot extends Crops{
+
+	protected $id = self::BEETROOT_BLOCK;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::BEETROOT_BLOCK, $meta, "Beetroot Block");
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Beetroot Block";
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/BirchWoodStairs.php

@@ -24,8 +24,15 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class BirchWoodStairs extends Stair{
+
+	protected $id = self::BIRCH_WOOD_STAIRS;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::BIRCH_WOOD_STAIRS, $meta, "Birch Wood Stairs");
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Birch Wood Stairs";
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Block.php

@@ -179,7 +179,7 @@ class Block extends Position implements Metadatable{
 
 	const NETHER_BRICKS_STAIRS = 114;
 
-	const END_PORTAL = 120;
+	const END_PORTAL_FRAME = 120;
 	const END_STONE = 121;
 
 	const SANDSTONE_STAIRS = 128;
@@ -228,6 +228,14 @@ class Block extends Position implements Metadatable{
 	const HARDENED_CLAY = 172;
 	const COAL_BLOCK = 173;
 
+	const DOUBLE_PLANT = 175;
+
+	const FENCE_GATE_SPRUCE = 183;
+	const FENCE_GATE_BIRCH = 184;
+	const FENCE_GATE_JUNGLE = 185;
+	const FENCE_GATE_DARK_OAK = 186;
+	const FENCE_GATE_ACACIA = 187;
+
 	const PODZOL = 243;
 	const BEETROOT_BLOCK = 244;
 	const STONECUTTER = 245;
@@ -354,7 +362,17 @@ class Block extends Position implements Metadatable{
 		[Item::WOODEN_DOOR, 0],
 		[Item::TRAPDOOR, 0],
 		[Item::FENCE, 0],
+		[Item::FENCE, 1],
+		[Item::FENCE, 2],
+		[Item::FENCE, 3],
+		[Item::FENCE, 4],
+		[Item::FENCE, 5],
 		[Item::FENCE_GATE, 0],
+		[Item::FENCE_GATE_BIRCH, 0],
+		[Item::FENCE_GATE_SPRUCE, 0],
+		[Item::FENCE_GATE_DARK_OAK, 0],
+		[Item::FENCE_GATE_JUNGLE, 0],
+		[Item::FENCE_GATE_ACACIA, 0],
 		[Item::IRON_BARS, 0],
 		[Item::BED, 0],
 		[Item::BOOKSHELF, 0],
@@ -505,170 +523,242 @@ class Block extends Position implements Metadatable{
 
 	];
 
-	/** @var Block[] */
+	/** @var \SplFixedArray */
-	public static $list = [];
+	public static $list = null;
+	/** @var \SplFixedArray */
+	public static $fullList = null;
+
+	/** @var \SplFixedArray */
+	public static $light = null;
+	/** @var \SplFixedArray */
+	public static $lightFilter = null;
+	/** @var \SplFixedArray */
+	public static $solid = null;
+	/** @var \SplFixedArray */
+	public static $hardness = null;
+	/** @var \SplFixedArray */
+	public static $transparent = null;
+
 	protected $id;
-	protected $meta;
+	protected $meta = 0;
-	protected $name = "Unknown";
+
-	protected $breakTime = 0.20;
+	/** @var AxisAlignedBB */
-	protected $hardness = 10;
 	protected $boundingBox = null;
-	public $hasEntityCollision = false;
+
-	public $isActivable = false;
+	/**
-	public $breakable = true;
+	 * Backwards-compatibility with old way to define block properties
-	public $isFlowable = false;
+	 *
-	public $isSolid = true;
+	 * @deprecated
-	public $isTransparent = false;
+	 *
-	public $isReplaceable = false;
+	 * @param string $key
-	public $isPlaceable = true;
+	 *
-	public $hasPhysics = false;
+	 * @return mixed
-	public $isLiquid = false;
+	 */
-	public $isFullBlock = true;
+	public function __get($key){
-	public $x = 0;
+		static $map = [
-	public $y = 0;
+			"hardness" => "getHardness",
-	public $z = 0;
+			"lightLevel" => "getLightLevel",
-	public $frictionFactor = 0.6;
+			"frictionFactor" => "getFrictionFactor",
+			"name" => "getName",
+			"isPlaceable" => "canBePlaced",
+			"isReplaceable" => "canBeReplaced",
+			"isTransparent" => "isTransparent",
+			"isSolid" => "isSolid",
+			"isFlowable" => "canBeFlowedInto",
+			"isActivable" => "canBeActivated",
+			"hasEntityCollision" => "hasEntityCollision"
+		];
+		return isset($map[$key]) ? $this->{$map[$key]}() : null;
+	}
 
 	public static function init(){
-		if(count(self::$list) === 0){
+		if(self::$list === null){
-			self::$list = [
+			self::$list = new \SplFixedArray(256);
-				self::AIR => Air::class,
+			self::$fullList = new \SplFixedArray(4096);
-				self::STONE => Stone::class,
+			self::$light = new \SplFixedArray(256);
-				self::GRASS => Grass::class,
+			self::$lightFilter = new \SplFixedArray(256);
-				self::DIRT => Dirt::class,
+			self::$solid = new \SplFixedArray(256);
-				self::COBBLESTONE => Cobblestone::class,
+			self::$hardness = new \SplFixedArray(256);
-				self::PLANKS => Planks::class,
+			self::$transparent = new \SplFixedArray(256);
-				self::SAPLING => Sapling::class,
+			self::$list[self::AIR] = Air::class;
-				self::BEDROCK => Bedrock::class,
+			self::$list[self::STONE] = Stone::class;
-				self::WATER => Water::class,
+			self::$list[self::GRASS] = Grass::class;
-				self::STILL_WATER => StillWater::class,
+			self::$list[self::DIRT] = Dirt::class;
-				self::LAVA => Lava::class,
+			self::$list[self::COBBLESTONE] = Cobblestone::class;
-				self::STILL_LAVA => StillLava::class,
+			self::$list[self::PLANKS] = Planks::class;
-				self::SAND => Sand::class,
+			self::$list[self::SAPLING] = Sapling::class;
-				self::GRAVEL => Gravel::class,
+			self::$list[self::BEDROCK] = Bedrock::class;
-				self::GOLD_ORE => GoldOre::class,
+			self::$list[self::WATER] = Water::class;
-				self::IRON_ORE => IronOre::class,
+			self::$list[self::STILL_WATER] = StillWater::class;
-				self::COAL_ORE => CoalOre::class,
+			self::$list[self::LAVA] = Lava::class;
-				self::WOOD => Wood::class,
+			self::$list[self::STILL_LAVA] = StillLava::class;
-				self::LEAVES => Leaves::class,
+			self::$list[self::SAND] = Sand::class;
-				self::SPONGE => Sponge::class,
+			self::$list[self::GRAVEL] = Gravel::class;
-				self::GLASS => Glass::class,
+			self::$list[self::GOLD_ORE] = GoldOre::class;
-				self::LAPIS_ORE => LapisOre::class,
+			self::$list[self::IRON_ORE] = IronOre::class;
-				self::LAPIS_BLOCK => Lapis::class,
+			self::$list[self::COAL_ORE] = CoalOre::class;
-				self::SANDSTONE => Sandstone::class,
+			self::$list[self::WOOD] = Wood::class;
-				self::BED_BLOCK => Bed::class,
+			self::$list[self::LEAVES] = Leaves::class;
-				self::COBWEB => Cobweb::class,
+			self::$list[self::SPONGE] = Sponge::class;
-				self::TALL_GRASS => TallGrass::class,
+			self::$list[self::GLASS] = Glass::class;
-				self::DEAD_BUSH => DeadBush::class,
+			self::$list[self::LAPIS_ORE] = LapisOre::class;
-				self::WOOL => Wool::class,
+			self::$list[self::LAPIS_BLOCK] = Lapis::class;
-				self::DANDELION => Dandelion::class,
+			self::$list[self::SANDSTONE] = Sandstone::class;
-				self::POPPY => CyanFlower::class,
+			self::$list[self::BED_BLOCK] = Bed::class;
-				self::BROWN_MUSHROOM => BrownMushroom::class,
+			self::$list[self::COBWEB] = Cobweb::class;
-				self::RED_MUSHROOM => RedMushroom::class,
+			self::$list[self::TALL_GRASS] = TallGrass::class;
-				self::GOLD_BLOCK => Gold::class,
+			self::$list[self::DEAD_BUSH] = DeadBush::class;
-				self::IRON_BLOCK => Iron::class,
+			self::$list[self::WOOL] = Wool::class;
-				self::DOUBLE_SLAB => DoubleSlab::class,
+			self::$list[self::DANDELION] = Dandelion::class;
-				self::SLAB => Slab::class,
+			self::$list[self::POPPY] = Poppy::class;
-				self::BRICKS_BLOCK => Bricks::class,
+			self::$list[self::BROWN_MUSHROOM] = BrownMushroom::class;
-				self::TNT => TNT::class,
+			self::$list[self::RED_MUSHROOM] = RedMushroom::class;
-				self::BOOKSHELF => Bookshelf::class,
+			self::$list[self::GOLD_BLOCK] = Gold::class;
-				self::MOSS_STONE => MossStone::class,
+			self::$list[self::IRON_BLOCK] = Iron::class;
-				self::OBSIDIAN => Obsidian::class,
+			self::$list[self::DOUBLE_SLAB] = DoubleSlab::class;
-				self::TORCH => Torch::class,
+			self::$list[self::SLAB] = Slab::class;
-				self::FIRE => Fire::class,
+			self::$list[self::BRICKS_BLOCK] = Bricks::class;
-				self::MONSTER_SPAWNER => MonsterSpawner::class,
+			self::$list[self::TNT] = TNT::class;
-				self::WOOD_STAIRS => WoodStairs::class,
+			self::$list[self::BOOKSHELF] = Bookshelf::class;
-				self::CHEST => Chest::class,
+			self::$list[self::MOSS_STONE] = MossStone::class;
+			self::$list[self::OBSIDIAN] = Obsidian::class;
+			self::$list[self::TORCH] = Torch::class;
+			self::$list[self::FIRE] = Fire::class;
+			self::$list[self::MONSTER_SPAWNER] = MonsterSpawner::class;
+			self::$list[self::WOOD_STAIRS] = WoodStairs::class;
+			self::$list[self::CHEST] = Chest::class;
 
-				self::DIAMOND_ORE => DiamondOre::class,
+			self::$list[self::DIAMOND_ORE] = DiamondOre::class;
-				self::DIAMOND_BLOCK => Diamond::class,
+			self::$list[self::DIAMOND_BLOCK] = Diamond::class;
-				self::WORKBENCH => Workbench::class,
+			self::$list[self::WORKBENCH] = Workbench::class;
-				self::WHEAT_BLOCK => Wheat::class,
+			self::$list[self::WHEAT_BLOCK] = Wheat::class;
-				self::FARMLAND => Farmland::class,
+			self::$list[self::FARMLAND] = Farmland::class;
-				self::FURNACE => Furnace::class,
+			self::$list[self::FURNACE] = Furnace::class;
-				self::BURNING_FURNACE => BurningFurnace::class,
+			self::$list[self::BURNING_FURNACE] = BurningFurnace::class;
-				self::SIGN_POST => SignPost::class,
+			self::$list[self::SIGN_POST] = SignPost::class;
-				self::WOOD_DOOR_BLOCK => WoodDoor::class,
+			self::$list[self::WOOD_DOOR_BLOCK] = WoodDoor::class;
-				self::LADDER => Ladder::class,
+			self::$list[self::LADDER] = Ladder::class;
 
-				self::COBBLESTONE_STAIRS => CobblestoneStairs::class,
+			self::$list[self::COBBLESTONE_STAIRS] = CobblestoneStairs::class;
-				self::WALL_SIGN => WallSign::class,
+			self::$list[self::WALL_SIGN] = WallSign::class;
 
-				self::IRON_DOOR_BLOCK => IronDoor::class,
+			self::$list[self::IRON_DOOR_BLOCK] = IronDoor::class;
-				self::REDSTONE_ORE => RedstoneOre::class,
+			self::$list[self::REDSTONE_ORE] = RedstoneOre::class;
-				self::GLOWING_REDSTONE_ORE => GlowingRedstoneOre::class,
+			self::$list[self::GLOWING_REDSTONE_ORE] = GlowingRedstoneOre::class;
 
-				self::SNOW_LAYER => SnowLayer::class,
+			self::$list[self::SNOW_LAYER] = SnowLayer::class;
-				self::ICE => Ice::class,
+			self::$list[self::ICE] = Ice::class;
-				self::SNOW_BLOCK => Snow::class,
+			self::$list[self::SNOW_BLOCK] = Snow::class;
-				self::CACTUS => Cactus::class,
+			self::$list[self::CACTUS] = Cactus::class;
-				self::CLAY_BLOCK => Clay::class,
+			self::$list[self::CLAY_BLOCK] = Clay::class;
-				self::SUGARCANE_BLOCK => Sugarcane::class,
+			self::$list[self::SUGARCANE_BLOCK] = Sugarcane::class;
 
-				self::FENCE => Fence::class,
+			self::$list[self::FENCE] = Fence::class;
-				self::PUMPKIN => Pumpkin::class,
+			self::$list[self::PUMPKIN] = Pumpkin::class;
-				self::NETHERRACK => Netherrack::class,
+			self::$list[self::NETHERRACK] = Netherrack::class;
-				self::SOUL_SAND => SoulSand::class,
+			self::$list[self::SOUL_SAND] = SoulSand::class;
-				self::GLOWSTONE_BLOCK => Glowstone::class,
+			self::$list[self::GLOWSTONE_BLOCK] = Glowstone::class;
 
-				self::LIT_PUMPKIN => LitPumpkin::class,
+			self::$list[self::LIT_PUMPKIN] = LitPumpkin::class;
-				self::CAKE_BLOCK => Cake::class,
+			self::$list[self::CAKE_BLOCK] = Cake::class;
 
-				self::TRAPDOOR => Trapdoor::class,
+			self::$list[self::TRAPDOOR] = Trapdoor::class;
 
-				self::STONE_BRICKS => StoneBricks::class,
+			self::$list[self::STONE_BRICKS] = StoneBricks::class;
 
-				self::IRON_BARS => IronBars::class,
+			self::$list[self::IRON_BARS] = IronBars::class;
-				self::GLASS_PANE => GlassPane::class,
+			self::$list[self::GLASS_PANE] = GlassPane::class;
-				self::MELON_BLOCK => Melon::class,
+			self::$list[self::MELON_BLOCK] = Melon::class;
-				self::PUMPKIN_STEM => PumpkinStem::class,
+			self::$list[self::PUMPKIN_STEM] = PumpkinStem::class;
-				self::MELON_STEM => MelonStem::class,
+			self::$list[self::MELON_STEM] = MelonStem::class;
-				self::VINE => Vine::class,
+			self::$list[self::VINE] = Vine::class;
-				self::FENCE_GATE => FenceGate::class,
+			self::$list[self::FENCE_GATE] = FenceGate::class;
-				self::BRICK_STAIRS => BrickStairs::class,
+			self::$list[self::BRICK_STAIRS] = BrickStairs::class;
-				self::STONE_BRICK_STAIRS => StoneBrickStairs::class,
+			self::$list[self::STONE_BRICK_STAIRS] = StoneBrickStairs::class;
 
-				self::MYCELIUM => Mycelium::class,
+			self::$list[self::MYCELIUM] = Mycelium::class;
-				self::NETHER_BRICKS => NetherBrick::class,
+			self::$list[self::NETHER_BRICKS] = NetherBrick::class;
 
-				self::NETHER_BRICKS_STAIRS => NetherBrickStairs::class,
+			self::$list[self::NETHER_BRICKS_STAIRS] = NetherBrickStairs::class;
 
-				self::END_PORTAL => EndPortal::class,
+			self::$list[self::END_PORTAL_FRAME] = EndPortalFrame::class;
-				self::END_STONE => EndStone::class,
+			self::$list[self::END_STONE] = EndStone::class;
-				self::SANDSTONE_STAIRS => SandstoneStairs::class,
+			self::$list[self::SANDSTONE_STAIRS] = SandstoneStairs::class;
-				self::EMERALD_ORE => EmeraldOre::class,
+			self::$list[self::EMERALD_ORE] = EmeraldOre::class;
 
-				self::EMERALD_BLOCK => Emerald::class,
+			self::$list[self::EMERALD_BLOCK] = Emerald::class;
-				self::SPRUCE_WOOD_STAIRS => SpruceWoodStairs::class,
+			self::$list[self::SPRUCE_WOOD_STAIRS] = SpruceWoodStairs::class;
-				self::BIRCH_WOOD_STAIRS => BirchWoodStairs::class,
+			self::$list[self::BIRCH_WOOD_STAIRS] = BirchWoodStairs::class;
-				self::JUNGLE_WOOD_STAIRS => JungleWoodStairs::class,
+			self::$list[self::JUNGLE_WOOD_STAIRS] = JungleWoodStairs::class;
-				self::STONE_WALL => StoneWall::class,
+			self::$list[self::STONE_WALL] = StoneWall::class;
 
-				self::CARROT_BLOCK => Carrot::class,
+			self::$list[self::CARROT_BLOCK] = Carrot::class;
-				self::POTATO_BLOCK => Potato::class,
+			self::$list[self::POTATO_BLOCK] = Potato::class;
 
-				self::QUARTZ_BLOCK => Quartz::class,
+			self::$list[self::QUARTZ_BLOCK] = Quartz::class;
-				self::QUARTZ_STAIRS => QuartzStairs::class,
+			self::$list[self::QUARTZ_STAIRS] = QuartzStairs::class;
-				self::DOUBLE_WOOD_SLAB => DoubleWoodSlab::class,
+			self::$list[self::DOUBLE_WOOD_SLAB] = DoubleWoodSlab::class;
-				self::WOOD_SLAB => WoodSlab::class,
+			self::$list[self::WOOD_SLAB] = WoodSlab::class;
-				self::STAINED_CLAY => StainedClay::class,
+			self::$list[self::STAINED_CLAY] = StainedClay::class;
 
-				self::LEAVES2 => Leaves2::class,
+			self::$list[self::LEAVES2] = Leaves2::class;
-				self::WOOD2 => Wood2::class,
+			self::$list[self::WOOD2] = Wood2::class;
-				self::ACACIA_WOOD_STAIRS => AcaciaWoodStairs::class,
+			self::$list[self::ACACIA_WOOD_STAIRS] = AcaciaWoodStairs::class;
-				self::DARK_OAK_WOOD_STAIRS => DarkOakWoodStairs::class,
+			self::$list[self::DARK_OAK_WOOD_STAIRS] = DarkOakWoodStairs::class;
 
-				self::HAY_BALE => HayBale::class,
+			self::$list[self::HAY_BALE] = HayBale::class;
-				self::CARPET => Carpet::class,
+			self::$list[self::CARPET] = Carpet::class;
-				self::HARDENED_CLAY => HardenedClay::class,
+			self::$list[self::HARDENED_CLAY] = HardenedClay::class;
-				self::COAL_BLOCK => Coal::class,
+			self::$list[self::COAL_BLOCK] = Coal::class;
 
-				self::PODZOL => Podzol::class,
+			self::$list[self::DOUBLE_PLANT] = DoublePlant::class;
-				self::BEETROOT_BLOCK => Beetroot::class,
+
-				self::STONECUTTER => Stonecutter::class,
+			self::$list[self::FENCE_GATE_SPRUCE] = FenceGateSpruce::class;
-				self::GLOWING_OBSIDIAN => GlowingObsidian::class,
+			self::$list[self::FENCE_GATE_BIRCH] = FenceGateBirch::class;
-				self::NETHER_REACTOR => NetherReactor::class,
+			self::$list[self::FENCE_GATE_JUNGLE] = FenceGateJungle::class;
-			];
+			self::$list[self::FENCE_GATE_DARK_OAK] = FenceGateDarkOak::class;
+			self::$list[self::FENCE_GATE_ACACIA] = FenceGateAcacia::class;
+
+			self::$list[self::PODZOL] = Podzol::class;
+			self::$list[self::BEETROOT_BLOCK] = Beetroot::class;
+			self::$list[self::STONECUTTER] = Stonecutter::class;
+			self::$list[self::GLOWING_OBSIDIAN] = GlowingObsidian::class;
+			self::$list[self::NETHER_REACTOR] = NetherReactor::class;
+
+			foreach(self::$list as $id => $class){
+				if($class !== null){
+					/** @var Block $block */
+					$block = new $class();
+
+					for($data = 0; $data < 16; ++$data){
+						self::$fullList[($id << 4) | $data] = new $class($data);
+					}
+
+					self::$solid[$id] = $block->isSolid();
+					self::$transparent[$id] = $block->isTransparent();
+					self::$hardness[$id] = $block->getHardness();
+					self::$light[$id] = $block->getLightLevel();
+
+					if($block->isSolid()){
+						if($block->isTransparent()){
+							if($block instanceof Liquid or $block instanceof Ice){
+								self::$lightFilter[$id] = 2;
+							}else{
+								self::$lightFilter[$id] = 1;
+							}
+						}else{
+							self::$lightFilter[$id] = 15;
+						}
+					}else{
+						self::$lightFilter[$id] = 1;
+					}
+				}else{
+					self::$lightFilter[$id] = 1;
+					for($data = 0; $data < 16; ++$data){
+						self::$fullList[($id << 4) | $data] = new Block($id, $data);
+					}
+				}
+			}
 		}
 	}
 
@@ -680,14 +770,18 @@ class Block extends Position implements Metadatable{
 	 * @return Block
 	 */
 	public static function get($id, $meta = 0, Position $pos = null){
-		if(isset(self::$list[$id])){
+		try{
 			$block = self::$list[$id];
-			$block = new $block($meta);
+			if($block !== null){
-		}else{
+				$block = new $block($meta);
+			}else{
+				$block = new Block($id, $meta);
+			}
+		}catch(\RuntimeException $e){
 			$block = new Block($id, $meta);
 		}
 
-		if($pos instanceof Position){
+		if($pos !== null){
 			$block->x = $pos->x;
 			$block->y = $pos->y;
 			$block->z = $pos->z;
@@ -698,14 +792,12 @@ class Block extends Position implements Metadatable{
 	}
 
 	/**
-	 * @param int    $id
+	 * @param int $id
-	 * @param int    $meta
+	 * @param int $meta
-	 * @param string $name
 	 */
-	public function __construct($id, $meta = 0, $name = "Unknown"){
+	public function __construct($id, $meta = 0){
 		$this->id = (int) $id;
 		$this->meta = (int) $meta;
-		$this->name = $name;
 	}
 
 	/**
@@ -734,7 +826,7 @@ class Block extends Position implements Metadatable{
 	 * @return bool
 	 */
 	public function isBreakable(Item $item){
-		return $this->breakable;
+		return true;
 	}
 
 	/**
@@ -768,27 +860,92 @@ class Block extends Position implements Metadatable{
 	 * @return bool
 	 */
 	public function onActivate(Item $item, Player $player = null){
-		return $this->isActivable;
+		return false;
 	}
 
 	/**
 	 * @return int
 	 */
-	final public function getHardness(){
+	public function getHardness(){
-		return $this->hardness;
+		return 10;
+	}
+
+	/**
+	 * @return float
+	 */
+	public function getFrictionFactor(){
+		return 0.6;
+	}
+
+	/**
+	 * @return int 0-15
+	 */
+	public function getLightLevel(){
+		return 0;
+	}
+
+	/**
+	 * AKA: Block->isPlaceable
+	 *
+	 * @return bool
+	 */
+	public function canBePlaced(){
+		return true;
+	}
+
+	/**
+	 * AKA: Block->canBeReplaced()
+	 *
+	 * @return bool
+	 */
+	public function canBeReplaced(){
+		return false;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isTransparent(){
+		return false;
+	}
+
+	public function isSolid(){
+		return true;
+	}
+
+	/**
+	 * AKA: Block->isFlowable
+	 *
+	 * @return bool
+	 */
+	public function canBeFlowedInto(){
+		return false;
+	}
+
+	/**
+	 * AKA: Block->isActivable
+	 *
+	 * @return bool
+	 */
+	public function canBeActivated(){
+		return false;
+	}
+
+	public function hasEntityCollision(){
+		return false;
 	}
 
 	/**
 	 * @return string
 	 */
-	final public function getName(){
+	public function getName(){
-		return $this->name;
+		return "Unknown";
 	}
 
 	/**
 	 * @return int
 	 */
-	final public function getID(){
+	final public function getId(){
 		return $this->id;
 	}
 
@@ -807,7 +964,7 @@ class Block extends Position implements Metadatable{
 	 * @param int $meta
 	 */
 	final public function setDamage($meta){
-		$this->meta = $meta & 0x0F;
+		$this->meta = $meta & 0x0f;
 	}
 
 	/**
@@ -848,7 +1005,7 @@ class Block extends Position implements Metadatable{
 	 * @return float
 	 */
 	public function getBreakTime(Item $item){
-		return $this->breakTime;
+		return 0.20;
 	}
 
 	/**
@@ -860,19 +1017,18 @@ class Block extends Position implements Metadatable{
 	 * @return Block
 	 */
 	public function getSide($side, $step = 1){
-		$v = parent::getSide($side, $step);
 		if($this->isValid()){
-			return $this->getLevel()->getBlock($v);
+			return $this->getLevel()->getBlock(Vector3::getSide($side, $step));
 		}
 
-		return Block::get(Item::AIR, 0, $v);
+		return Block::get(Item::AIR, 0, Position::fromObject(Vector3::getSide($side, $step)));
 	}
 
 	/**
 	 * @return string
 	 */
-	final public function __toString(){
+	public function __toString(){
-		return "Block " . $this->name . " (" . $this->id . ":" . $this->meta . ")";
+		return "Block[" . $this->getName() . "] (" . $this->id . ":" . $this->meta . ")";
 	}
 
 	/**
@@ -883,7 +1039,7 @@ class Block extends Position implements Metadatable{
 	 */
 	public function collidesWithBB(AxisAlignedBB $bb, &$list = []){
 		$bb2 = $this->getBoundingBox();
-		if($bb2 !== null and $bb2->intersectsWith($bb)){
+		if($bb2 !== null and $bb->intersectsWith($bb2)){
 			$list[] = $bb2;
 		}
 	}
@@ -899,11 +1055,17 @@ class Block extends Position implements Metadatable{
 	 * @return AxisAlignedBB
 	 */
 	public function getBoundingBox(){
-		if($this->boundingBox !== null){
+		if($this->boundingBox === null){
-			return $this->boundingBox;
+			$this->boundingBox = $this->recalculateBoundingBox();
 		}
+		return $this->boundingBox;
+	}
 
-		return $this->boundingBox = new AxisAlignedBB(
+	/**
+	 * @return AxisAlignedBB
+	 */
+	protected function recalculateBoundingBox(){
+		return new AxisAlignedBB(
 			$this->x,
 			$this->y,
 			$this->z,

src/pocketmine/block/Bookshelf.php

@@ -23,9 +23,19 @@ namespace pocketmine\block;
 
 
 class Bookshelf extends Solid{
+
+	protected $id = self::BOOKSHELF;
+
 	public function __construct(){
-		parent::__construct(self::BOOKSHELF, 0, "Bookshelf");
+
-		$this->hardness = 7.5;
+	}
+
+	public function getName(){
+		return "Bookshelf";
+	}
+
+	public function getHardness(){
+		return 7.5;
 	}
 
 }

src/pocketmine/block/BrickStairs.php

@@ -23,8 +23,15 @@ namespace pocketmine\block;
 
 
 class BrickStairs extends Stair{
+
+	protected $id = self::BRICK_STAIRS;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::BRICK_STAIRS, $meta, "Brick Stairs");
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Brick Stairs";
 	}
 
 }

src/pocketmine/block/Bricks.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Bricks extends Solid{
+
+	protected $id = self::BRICKS_BLOCK;
+
 	public function __construct(){
-		parent::__construct(self::BRICKS_BLOCK, 0, "Bricks");
+
-		$this->hardness = 30;
+	}
+
+	public function getHardness(){
+		return 30;
+	}
+
+	public function getName(){
+		return "Bricks";
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/BrownMushroom.php

@@ -26,14 +26,24 @@ use pocketmine\level\Level;
 use pocketmine\Player;
 
 class BrownMushroom extends Flowable{
-	public function __construct(){
+
-		parent::__construct(self::BROWN_MUSHROOM, 0, "Brown Mushroom");
+	protected $id = self::BROWN_MUSHROOM;
-		$this->hardness = 0;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Brown Mushroom";
+	}
+
+	public function getLightLevel(){
+		return 1;
 	}
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){
+			if($this->getSide(0)->isTransparent() === true){
 				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
@@ -45,7 +55,7 @@ class BrownMushroom extends Flowable{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
-		if($down->isTransparent === false){
+		if($down->isTransparent() === false){
 			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;

src/pocketmine/block/BurningFurnace.php

@@ -32,10 +32,27 @@ use pocketmine\tile\Furnace;
 use pocketmine\tile\Tile;
 
 class BurningFurnace extends Solid{
+
+	protected $id = self::BURNING_FURNACE;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::BURNING_FURNACE, $meta, "Burning Furnace");
+		$this->meta = $meta;
-		$this->isActivable = true;
+	}
-		$this->hardness = 17.5;
+
+	public function getName(){
+		return "Burning Furnace";
+	}
+
+	public function canBeActivated(){
+		return true;
+	}
+
+	public function getHardness(){
+		return 17.5;
+	}
+
+	public function getLightLevel(){
+		return 13;
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
@@ -55,7 +72,7 @@ class BurningFurnace extends Solid{
 			new Int("z", $this->z)
 		]);
 		$nbt->Items->setTagType(NBT::TAG_Compound);
-		new Furnace($this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+		Tile::createTile("Furnace", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
 
 		return true;
 	}
@@ -81,7 +98,7 @@ class BurningFurnace extends Solid{
 					new Int("z", $this->z)
 				]);
 				$nbt->Items->setTagType(NBT::TAG_Compound);
-				$furnace = new Furnace($this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+				$furnace = Tile::createTile("Furnace", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
 			}
 
 			if(($player->getGamemode() & 0x01) === 0x01){

src/pocketmine/block/Cactus.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
+ *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * 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
@@ -15,7 +15,7 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
@@ -25,29 +25,38 @@ use pocketmine\entity\Entity;
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\inventory\InventoryHolder;
+use pocketmine\inventory\PlayerInventory;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
-use pocketmine\math\Vector3 as Vector3;
+use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\Server;
 
 class Cactus extends Transparent{
 
-	public $hasEntityCollision = true;
+	protected $id = self::CACTUS;
 
 	public function __construct($meta = 0){
-		parent::__construct(self::CACTUS, $meta, "Cactus");
+		$this->meta = $meta;
-		$this->isFullBlock = false;
-		$this->hardness = 2;
 	}
 
-	public function getBoundingBox(){
+	public function getHardness(){
-		if($this->boundingBox !== null){
+		return 2;
-			return $this->boundingBox;
+	}
-		}
 
-		return $this->boundingBox = new AxisAlignedBB(
+	public function hasEntityCollision(){
+		return true;
+	}
+
+	public function getName(){
+		return "Cactus";
+	}
+
+	protected function recalculateBoundingBox(){
+
+		return new AxisAlignedBB(
 			$this->x + 0.0625,
 			$this->y,
 			$this->z + 0.0625,
@@ -58,32 +67,36 @@ class Cactus extends Transparent{
 	}
 
 	public function onEntityCollide(Entity $entity){
-		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_CONTACT, 1);
+		$damage = [EntityDamageEvent::MODIFIER_BASE => 1];
-		Server::getInstance()->getPluginManager()->callEvent($ev);
+		if($entity instanceof InventoryHolder){
-		if(!$ev->isCancelled()){
+			$inventory = $entity->getInventory();
-			$entity->attack($ev->getFinalDamage(), $ev);
+			if($inventory instanceof PlayerInventory){
+				$damage[EntityDamageEvent::MODIFIER_ARMOR] = $inventory->getArmorPoints();
+			}
 		}
+		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_CONTACT, $damage);
+		$entity->attack($ev->getFinalDamage(), $ev);
 	}
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
 			$down = $this->getSide(0);
-			if($down->getID() !== self::SAND and $down->getID() !== self::CACTUS){
+			if($down->getId() !== self::SAND and $down->getId() !== self::CACTUS){
 				$this->getLevel()->useBreakOn($this);
 			}else{
 				for($side = 2; $side <= 5; ++$side){
 					$b = $this->getSide($side);
-					if(!$b->isFlowable){
+					if(!$b->canBeFlowedInto()){
 						$this->getLevel()->useBreakOn($this);
 					}
 				}
 			}
 		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if($this->getSide(0)->getID() !== self::CACTUS){
+			if($this->getSide(0)->getId() !== self::CACTUS){
 				if($this->meta == 0x0F){
 					for($y = 1; $y < 3; ++$y){
 						$b = $this->getLevel()->getBlock(new Vector3($this->x, $this->y + $y, $this->z));
-						if($b->getID() === self::AIR){
+						if($b->getId() === self::AIR){
 							Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($b, new Cactus()));
 							if(!$ev->isCancelled()){
 								$this->getLevel()->setBlock($b, $ev->getNewState(), true);
@@ -104,12 +117,12 @@ class Cactus extends Transparent{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
-		if($down->getID() === self::SAND or $down->getID() === self::CACTUS){
+		if($down->getId() === self::SAND or $down->getId() === self::CACTUS){
 			$block0 = $this->getSide(2);
 			$block1 = $this->getSide(3);
 			$block2 = $this->getSide(4);
 			$block3 = $this->getSide(5);
-			if($block0->isTransparent === true and $block1->isTransparent === true and $block2->isTransparent === true and $block3->isTransparent === true){
+			if($block0->isTransparent() === true and $block1->isTransparent() === true and $block2->isTransparent() === true and $block3->isTransparent() === true){
 				$this->getLevel()->setBlock($this, $this, true);
 
 				return true;
@@ -124,4 +137,4 @@ class Cactus extends Transparent{
 			[$this->id, 0, 1],
 		];
 	}
-}
+}

src/pocketmine/block/Cake.php

@@ -29,22 +29,30 @@ use pocketmine\Player;
 use pocketmine\Server;
 
 class Cake extends Transparent{
+
+	protected $id = self::CAKE_BLOCK;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::CAKE_BLOCK, 0, "Cake Block");
+		$this->meta = $meta;
-		$this->isFullBlock = false;
-		$this->isActivable = true;
-		$this->meta = $meta & 0x07;
-		$this->hardness = 2.5;
 	}
 
-	public function getBoundingBox(){
+	public function canBeActivated(){
-		if($this->boundingBox !== null){
+		return true;
-			return $this->boundingBox;
+	}
-		}
+
+	public function getHardness(){
+		return 2.5;
+	}
+
+	public function getName(){
+		return "Cake Block";
+	}
+
+	protected function recalculateBoundingBox(){
 
 		$f = (1 + $this->getDamage() * 2) / 16;
 
-		return $this->boundingBox = new AxisAlignedBB(
+		return new AxisAlignedBB(
 			$this->x + $f,
 			$this->y,
 			$this->z + 0.0625,
@@ -56,7 +64,7 @@ class Cake extends Transparent{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
-		if($down->getID() !== self::AIR){
+		if($down->getId() !== self::AIR){
 			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
@@ -67,7 +75,7 @@ class Cake extends Transparent{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->getID() === self::AIR){ //Replace with common break method
+			if($this->getSide(0)->getId() === self::AIR){ //Replace with common break method
 				$this->getLevel()->setBlock($this, new Air(), true);
 
 				return Level::BLOCK_UPDATE_NORMAL;

src/pocketmine/block/Carpet.php

@@ -27,9 +27,19 @@ use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
 class Carpet extends Flowable{
+
+	protected $id = self::CARPET;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::CARPET, $meta, "Carpet");
+		$this->meta = $meta;
-		$names = [
+	}
+
+	public function isSolid(){
+		return true;
+	}
+
+	public function getName(){
+		static $names = [
 			0 => "White Carpet",
 			1 => "Orange Carpet",
 			2 => "Magenta Carpet",
@@ -47,18 +57,12 @@ class Carpet extends Flowable{
 			14 => "Red Carpet",
 			15 => "Black Carpet",
 		];
-		$this->name = $names[$this->meta];
+		return $names[$this->meta & 0x0f];
-		$this->hardness = 0;
-		$this->isFullBlock = false;
-		$this->isSolid = true;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
-		if($this->boundingBox !== null){
-			return $this->boundingBox;
-		}
 
-		return $this->boundingBox = new AxisAlignedBB(
+		return new AxisAlignedBB(
 			$this->x,
 			$this->y,
 			$this->z,
@@ -70,7 +74,7 @@ class Carpet extends Flowable{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
-		if($down->getID() !== self::AIR){
+		if($down->getId() !== self::AIR){
 			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
@@ -81,7 +85,7 @@ class Carpet extends Flowable{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->getID() === self::AIR){
+			if($this->getSide(0)->getId() === self::AIR){
 				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;

src/pocketmine/block/Carrot.php

@@ -24,8 +24,15 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Carrot extends Crops{
+
+	protected $id = self::CARROT_BLOCK;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::CARROT_BLOCK, $meta, "Carrot Block");
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Carrot Block";
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Chest.php

@@ -34,20 +34,26 @@ use pocketmine\tile\Tile;
 
 class Chest extends Transparent{
 
-	const SLOTS = 27;
+	protected $id = self::CHEST;
 
 	public function __construct($meta = 0){
-		parent::__construct(self::CHEST, $meta, "Chest");
+		$this->meta = $meta;
-		$this->isActivable = true;
-		$this->hardness = 15;
 	}
 
-	public function getBoundingBox(){
+	public function canBeActivated(){
-		if($this->boundingBox !== null){
+		return true;
-			return $this->boundingBox;
+	}
-		}
 
-		return $this->boundingBox = new AxisAlignedBB(
+	public function getHardness(){
+		return 15;
+	}
+
+	public function getName(){
+		return "Chest";
+	}
+
+	protected function recalculateBoundingBox(){
+		return new AxisAlignedBB(
 			$this->x + 0.0625,
 			$this->y,
 			$this->z + 0.0625,
@@ -65,7 +71,7 @@ class Chest extends Transparent{
 			3 => 3,
 		];
 
-		$chest = false;
+		$chest = null;
 		$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0];
 
 		for($side = 2; $side <= 5; ++$side){
@@ -93,9 +99,9 @@ class Chest extends Transparent{
 			new Int("z", $this->z)
 		]);
 		$nbt->Items->setTagType(NBT::TAG_Compound);
-		$tile = new TileChest($this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+		$tile = Tile::createTile("Chest", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
 
-		if($chest instanceof TileChest){
+		if($chest instanceof TileChest and $tile instanceof TileChest){
 			$chest->pairWith($tile);
 			$tile->pairWith($chest);
 		}
@@ -116,7 +122,7 @@ class Chest extends Transparent{
 	public function onActivate(Item $item, Player $player = null){
 		if($player instanceof Player){
 			$top = $this->getSide(1);
-			if($top->isTransparent !== true){
+			if($top->isTransparent() !== true){
 				return true;
 			}
 
@@ -133,11 +139,11 @@ class Chest extends Transparent{
 					new Int("z", $this->z)
 				]);
 				$nbt->Items->setTagType(NBT::TAG_Compound);
-				$chest = new TileChest($this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+				$chest = Tile::createTile("Chest", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
 			}
 
 
-			if(($player->gamemode & 0x01) === 0x01){
+			if($player->isCreative()){
 				return true;
 			}
 			$player->addWindow($chest->getInventory());

src/pocketmine/block/Clay.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Clay extends Solid{
+
+	protected $id = self::CLAY_BLOCK;
+
 	public function __construct(){
-		parent::__construct(self::CLAY_BLOCK, 0, "Clay Block");
+
-		$this->hardness = 3;
+	}
+
+	public function getHardness(){
+		return 3;
+	}
+
+	public function getName(){
+		return "Clay Block";
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Coal.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Coal extends Solid{
+
+	protected $id = self::COAL_BLOCK;
+
 	public function __construct(){
-		parent::__construct(self::COAL_BLOCK, 0, "Coal Block");
+
-		$this->hardness = 30;
+	}
+
+	public function getHardness(){
+		return 30;
+	}
+
+	public function getName(){
+		return "Coal Block";
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/CoalOre.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class CoalOre extends Solid{
+
+	protected $id = self::COAL_ORE;
+
 	public function __construct(){
-		parent::__construct(self::COAL_ORE, 0, "Coal Ore");
+
-		$this->hardness = 15;
+	}
+
+	public function getHardness(){
+		return 15;
+	}
+
+	public function getName(){
+		return "Coal Ore";
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/Cobblestone.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Cobblestone extends Solid{
+
+	protected $id = self::COBBLESTONE;
+
 	public function __construct(){
-		parent::__construct(self::COBBLESTONE, 0, "Cobblestone");
+
-		$this->hardness = 30;
+	}
+
+	public function getName(){
+		return "Cobblestone";
+	}
+
+	public function getHardness(){
+		return 30;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/CobblestoneStairs.php

@@ -23,8 +23,15 @@ namespace pocketmine\block;
 
 
 class CobblestoneStairs extends Stair{
+
+	protected $id = self::COBBLESTONE_STAIRS;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::COBBLESTONE_STAIRS, $meta, "Cobblestone Stairs");
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Cobblestone Stairs";
 	}
 
 }

src/pocketmine/block/Cobweb.php

@@ -26,20 +26,30 @@ use pocketmine\item\Item;
 
 class Cobweb extends Flowable{
 
-	public $hasEntityCollision = true;
+	protected $id = self::COBWEB;
 
 	public function __construct(){
-		parent::__construct(self::COBWEB, 0, "Cobweb");
+
-		$this->isSolid = true;
+	}
-		$this->isFullBlock = false;
+
-		$this->hardness = 25;
+	public function hasEntityCollision(){
+		return true;
+	}
+
+	public function getName(){
+		return "Cobweb";
+	}
+
+	public function getHardness(){
+		return 25;
 	}
 
 	public function onEntityCollide(Entity $entity){
-		$entity->fallDistance = 0;
+		$entity->resetFallDistance();
 	}
 
 	public function getDrops(Item $item){
+		//TODO: correct drops
 		return [];
 	}
 }

src/pocketmine/block/Crops.php

@@ -29,17 +29,13 @@ use pocketmine\Server;
 
 abstract class Crops extends Flowable{
 
-	public $isActivable = true;
+	public function canBeActivated(){
-	public $hardness = 0;
+		return true;
-
-
-	public function getBoundingBox(){
-		return null;
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
-		if($down->getID() === self::FARMLAND){
+		if($down->getId() === self::FARMLAND){
 			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
@@ -50,7 +46,7 @@ abstract class Crops extends Flowable{
 
 
 	public function onActivate(Item $item, Player $player = null){
-		if($item->getID() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
+		if($item->getId() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
 			$block = clone $this;
 			$block->meta += mt_rand(2, 5);
 			if($block->meta > 7){
@@ -73,7 +69,7 @@ abstract class Crops extends Flowable{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){
+			if($this->getSide(0)->isTransparent() === true){
 				$this->getLevel()->useBreakOn($this);
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/Dandelion.php

@@ -26,19 +26,21 @@ use pocketmine\level\Level;
 use pocketmine\Player;
 
 class Dandelion extends Flowable{
+
+	protected $id = self::DANDELION;
+
 	public function __construct(){
-		parent::__construct(self::DANDELION, 0, "Dandelion");
+
-		$this->hardness = 0;
 	}
 
-	public function getBoundingBox(){
+	public function getName(){
-		return null;
+		return "Dandelion";
 	}
 
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
-		if($down->getID() === 2 or $down->getID() === 3 or $down->getID() === 60){
+		if($down->getId() === 2 or $down->getId() === 3 or $down->getId() === 60){
 			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
@@ -49,7 +51,7 @@ class Dandelion extends Flowable{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){
+			if($this->getSide(0)->isTransparent() === true){
 				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;

src/pocketmine/block/DarkOakWoodStairs.php

@@ -24,8 +24,15 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class DarkOakWoodStairs extends Stair{
+
+	protected $id = self::DARK_OAK_WOOD_STAIRS;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::DARK_OAK_WOOD_STAIRS, $meta, "Dark Oak Wood Stairs");
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Dark Oak Wood Stairs";
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/DeadBush.php

@@ -24,21 +24,22 @@ namespace pocketmine\block;
 use pocketmine\level\Level;
 
 class DeadBush extends Flowable{
-	public function __construct(){
+
-		parent::__construct(self::DEAD_BUSH, 0, "Dead Bush");
+	protected $id = self::DEAD_BUSH;
-		//$this->isReplaceable = true;
+
-		$this->hardness = 0;
+	public function __construct($meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getBoundingBox(){
+	public function getName(){
-		return null;
+		return "Dead Bush";
 	}
 
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
+			if($this->getSide(0)->isTransparent() === true){
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/Diamond.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Diamond extends Solid{
+
+	protected $id = self::DIAMOND_BLOCK;
+
 	public function __construct(){
-		parent::__construct(self::DIAMOND_BLOCK, 0, "Diamond Block");
+
-		$this->hardness = 30;
+	}
+
+	public function getHardness(){
+		return 30;
+	}
+
+	public function getName(){
+		return "Diamond Block";
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/DiamondOre.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class DiamondOre extends Solid{
+
+	protected $id = self::DIAMOND_ORE;
+
 	public function __construct(){
-		parent::__construct(self::DIAMOND_ORE, 0, "Diamond Ore");
+
-		$this->hardness = 15;
+	}
+
+	public function getHardness(){
+		return 15;
+	}
+
+	public function getName(){
+		return "Diamond Ore";
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/Dirt.php

@@ -26,16 +26,24 @@ use pocketmine\Player;
 
 class Dirt extends Solid{
 
-	public $isActivable = true;
-	protected $hardness = 2.5;
 	protected $id = self::DIRT;
-	protected $meta = 0;
-	protected $name = "Dirt";
 
 	public function __construct(){
 
 	}
 
+	public function canBeActivated(){
+		return true;
+	}
+
+	public function getHardness(){
+		return 2.5;
+	}
+
+	public function getName(){
+		return "Dirt";
+	}
+
 	public function onActivate(Item $item, Player $player = null){
 		if($item->isHoe()){
 			$item->useOn($this);

src/pocketmine/block/Door.php

@@ -30,9 +30,13 @@ use pocketmine\Server;
 
 
 abstract class Door extends Transparent{
-	public function __construct($id, $meta = 0, $name = "Unknown"){
+
-		parent::__construct($id, $meta, $name);
+	public function canBeActivated(){
-		$this->isSolid = false;
+		return true;
+	}
+
+	public function isSolid(){
+		return false;
 	}
 
 	private function getFullDamage(){
@@ -52,10 +56,7 @@ abstract class Door extends Transparent{
 		return $first & 0x07 | ($flag ? 8 : 0) | ($flag1 ? 0x10 : 0);
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
-		if($this->boundingBox !== null){
-			return $this->boundingBox;
-		}
 
 		$f = 0.1875;
 		$damage = $this->getFullDamage();
@@ -76,7 +77,7 @@ abstract class Door extends Transparent{
 		if($j === 0){
 			if($flag){
 				if(!$flag1){
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z,
@@ -85,7 +86,7 @@ abstract class Door extends Transparent{
 						$this->z + $f
 					);
 				}else{
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z + 1 - $f,
@@ -95,7 +96,7 @@ abstract class Door extends Transparent{
 					);
 				}
 			}else{
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x,
 					$this->y,
 					$this->z,
@@ -107,7 +108,7 @@ abstract class Door extends Transparent{
 		}elseif($j === 1){
 			if($flag){
 				if(!$flag1){
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x + 1 - $f,
 						$this->y,
 						$this->z,
@@ -116,7 +117,7 @@ abstract class Door extends Transparent{
 						$this->z + 1
 					);
 				}else{
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z,
@@ -126,7 +127,7 @@ abstract class Door extends Transparent{
 					);
 				}
 			}else{
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x,
 					$this->y,
 					$this->z,
@@ -138,7 +139,7 @@ abstract class Door extends Transparent{
 		}elseif($j === 2){
 			if($flag){
 				if(!$flag1){
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z + 1 - $f,
@@ -147,7 +148,7 @@ abstract class Door extends Transparent{
 						$this->z + 1
 					);
 				}else{
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z,
@@ -157,7 +158,7 @@ abstract class Door extends Transparent{
 					);
 				}
 			}else{
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x + 1 - $f,
 					$this->y,
 					$this->z,
@@ -169,7 +170,7 @@ abstract class Door extends Transparent{
 		}elseif($j === 3){
 			if($flag){
 				if(!$flag1){
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z,
@@ -178,7 +179,7 @@ abstract class Door extends Transparent{
 						$this->z + 1
 					);
 				}else{
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x + 1 - $f,
 						$this->y,
 						$this->z,
@@ -188,7 +189,7 @@ abstract class Door extends Transparent{
 					);
 				}
 			}else{
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x,
 					$this->y,
 					$this->z + 1 - $f,
@@ -199,12 +200,12 @@ abstract class Door extends Transparent{
 			}
 		}
 
-		return $this->boundingBox = $bb;
+		return $bb;
 	}
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->getID() === self::AIR){ //Replace with common break method
+			if($this->getSide(0)->getId() === self::AIR){ //Replace with common break method
 				$this->getLevel()->setBlock($this, new Air(), false);
 				if($this->getSide(1) instanceof Door){
 					$this->getLevel()->setBlock($this->getSide(1), new Air(), false);
@@ -221,7 +222,7 @@ abstract class Door extends Transparent{
 		if($face === 1){
 			$blockUp = $this->getSide(1);
 			$blockDown = $this->getSide(0);
-			if($blockUp->isReplaceable === false or $blockDown->isTransparent === true){
+			if($blockUp->canBeReplaced() === false or $blockDown->isTransparent() === true){
 				return false;
 			}
 			$direction = $player instanceof Player ? $player->getDirection() : 0;
@@ -234,7 +235,7 @@ abstract class Door extends Transparent{
 			$next = $this->getSide($face[(($direction + 2) % 4)]);
 			$next2 = $this->getSide($face[$direction]);
 			$metaUp = 0x08;
-			if($next->getID() === $this->id or ($next2->isTransparent === false and $next->isTransparent === true)){ //Door hinge
+			if($next->getId() === $this->id or ($next2->isTransparent() === false and $next->isTransparent() === true)){ //Door hinge
 				$metaUp |= 0x01;
 			}
 
@@ -250,12 +251,12 @@ abstract class Door extends Transparent{
 	public function onBreak(Item $item){
 		if(($this->meta & 0x08) === 0x08){
 			$down = $this->getSide(0);
-			if($down->getID() === $this->id){
+			if($down->getId() === $this->id){
 				$this->getLevel()->setBlock($down, new Air(), true);
 			}
 		}else{
 			$up = $this->getSide(1);
-			if($up->getID() === $this->id){
+			if($up->getId() === $this->id){
 				$this->getLevel()->setBlock($up, new Air(), true);
 			}
 		}
@@ -267,14 +268,14 @@ abstract class Door extends Transparent{
 	public function onActivate(Item $item, Player $player = null){
 		if(($this->meta & 0x08) === 0x08){ //Top
 			$down = $this->getSide(0);
-			if($down->getID() === $this->id){
+			if($down->getId() === $this->id){
 				$meta = $down->getDamage() ^ 0x04;
 				$this->getLevel()->setBlock($down, Block::get($this->id, $meta), true);
 				$players = $this->getLevel()->getUsingChunk($this->x >> 4, $this->z >> 4);
 				if($player instanceof Player){
-					unset($players[$player->getID()]);
+					unset($players[$player->getId()]);
 				}
-				$pk = new LevelEventPacket;
+				$pk = new LevelEventPacket();
 				$pk->x = $this->x;
 				$pk->y = $this->y;
 				$pk->z = $this->z;
@@ -291,9 +292,9 @@ abstract class Door extends Transparent{
 			$this->getLevel()->setBlock($this, $this, true);
 			$players = $this->getLevel()->getUsingChunk($this->x >> 4, $this->z >> 4);
 			if($player instanceof Player){
-				unset($players[$player->getID()]);
+				unset($players[$player->getId()]);
 			}
-			$pk = new LevelEventPacket;
+			$pk = new LevelEventPacket();
 			$pk->x = $this->x;
 			$pk->y = $this->y;
 			$pk->z = $this->z;

src/pocketmine/block/DoublePlant.php

@@ -0,0 +1,70 @@
+<?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\block;
+
+use pocketmine\item\Item;
+use pocketmine\level\Level;
+
+class DoublePlant extends Flowable{
+
+	protected $id = self::DOUBLE_PLANT;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function canBeReplaced(){
+		return true;
+	}
+
+	public function getName(){
+		static $names = [
+			0 => "Sunflower",
+			1 => "Lilac",
+			2 => "Double Tallgrass",
+			3 => "Large Fern",
+			4 => "Rose Bush",
+			5 => "Peony"
+		];
+		return $names[$this->meta & 0x07];
+	}
+
+
+	public function onUpdate($type){
+		if($type === Level::BLOCK_UPDATE_NORMAL){
+			if($this->getSide(0)->isTransparent() === true){ //Replace with common break method
+				$this->getLevel()->setBlock($this, new Air(), false, false, true);
+
+				return Level::BLOCK_UPDATE_NORMAL;
+			}
+		}
+
+		return false;
+	}
+
+	public function getDrops(Item $item){
+		//TODO
+
+		return [];
+	}
+
+}

src/pocketmine/block/DoubleSlab.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class DoubleSlab extends Solid{
+
+	protected $id = self::DOUBLE_SLAB;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::DOUBLE_SLAB, $meta, "Double Slab");
+		$this->meta = $meta;
-		$names = [
+	}
+
+	public function getHardness(){
+		return 30;
+	}
+
+	public function getName(){
+		static $names = [
 			0 => "Stone",
 			1 => "Sandstone",
 			2 => "Wooden",
@@ -36,8 +46,7 @@ class DoubleSlab extends Solid{
 			6 => "Quartz",
 			7 => "",
 		];
-		$this->name = "Double " . $names[$this->meta & 0x07] . " Slab";
+		return "Double " . $names[$this->meta & 0x07] . " Slab";
-		$this->hardness = 30;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/DoubleWoodSlab.php

@@ -24,18 +24,29 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class DoubleWoodSlab extends Solid{
+
+	protected $id = self::DOUBLE_WOOD_SLAB;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::DOUBLE_WOOD_SLAB, $meta, "Double Wooden Slab");
+		$this->meta = $meta;
-		$names = [
+	}
+
+	public function getHardness(){
+		return 15;
+	}
+
+	public function getName(){
+		static $names = [
 			0 => "Oak",
 			1 => "Spruce",
 			2 => "Birch",
 			3 => "Jungle",
 			4 => "Acacia",
 			5 => "Dark Oak",
+			6 => "",
+			7 => ""
 		];
-		$this->name = "Double " . $names[$this->meta & 0x07] . " Wooden Slab";
+		return "Double " . $names[$this->meta & 0x07] . " Wooden Slab";
-		$this->hardness = 15;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/Emerald.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Emerald extends Solid{
+
+	protected $id = self::EMERALD_BLOCK;
+
 	public function __construct(){
-		parent::__construct(self::EMERALD_BLOCK, 0, "Emerald Block");
+
-		$this->hardness = 30;
+	}
+
+	public function getHardness(){
+		return 30;
+	}
+
+	public function getName(){
+		return "Emerald Block";
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/EmeraldOre.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class EmeraldOre extends Solid{
+
+	protected $id = self::EMERALD_ORE;
+
 	public function __construct(){
-		parent::__construct(self::EMERALD_ORE, 0, "Emerald Ore");
+
-		$this->hardness = 15;
+	}
+
+	public function getName(){
+		return "Emerald Ore";
+	}
+
+	public function getHardness(){
+		return 15;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/EndPortalFrame.php

@@ -21,20 +21,36 @@
 
 namespace pocketmine\block;
 
+use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 
-class EndPortal extends Solid{
+class EndPortalFrame extends Solid{
+
+	protected $id = self::END_PORTAL_FRAME;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::END_PORTAL, $meta, "End Portal");
+		$this->meta = $meta;
-		$this->hardness = 18000000;
 	}
 
-	public function getBoundingBox(){
+	public function getLightLevel(){
-		if($this->boundingBox !== null){
+		return 1;
-			return $this->boundingBox;
+	}
-		}
 
-		return $this->boundingBox = new AxisAlignedBB(
+	public function getName(){
+		return "End Portal Frame";
+	}
+
+	public function getHardness(){
+		return 18000000;
+	}
+
+	public function isBreakable(Item $item){
+		return false;
+	}
+
+	protected function recalculateBoundingBox(){
+
+		return new AxisAlignedBB(
 			$this->x,
 			$this->y,
 			$this->z,

src/pocketmine/block/EndStone.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class EndStone extends Solid{
+
+	protected $id = self::END_STONE;
+
 	public function __construct(){
-		parent::__construct(self::END_STONE, 0, "End Stone");	
+
-		$this->hardness = 45;
+	}
+
+	public function getName(){
+		return "End Stone";
+	}
+
+	public function getHardness(){
+		return 45;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/Fallable.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-use pocketmine\entity\FallingBlock;
+use pocketmine\entity\Entity;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\nbt\tag\Byte;
@@ -29,12 +29,11 @@ use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Double;
 use pocketmine\nbt\tag\Enum;
 use pocketmine\nbt\tag\Float;
+use pocketmine\nbt\tag\Int;
 use pocketmine\Player;
 
 abstract class Fallable extends Solid{
 
-	public $hasPhysics = true;
-
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$ret = $this->getLevel()->setBlock($this, $this, true, true);
 
@@ -42,10 +41,10 @@ abstract class Fallable extends Solid{
 	}
 
 	public function onUpdate($type){
-		if($this->hasPhysics === true and $type === Level::BLOCK_UPDATE_NORMAL){
+		if($type === Level::BLOCK_UPDATE_NORMAL){
 			$down = $this->getSide(0);
-			if($down->getID() === self::AIR or ($down instanceof Liquid)){
+			if($down->getId() === self::AIR or ($down instanceof Liquid)){
-				$fall = new FallingBlock($this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), new Compound("", [
+				$fall = Entity::createEntity("FallingSand", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), new Compound("", [
 					"Pos" => new Enum("Pos", [
 						new Double("", $this->x + 0.5),
 						new Double("", $this->y),
@@ -60,13 +59,12 @@ abstract class Fallable extends Solid{
 						new Float("", 0),
 						new Float("", 0)
 					]),
-					"Tile" => new Byte("Tile", $this->getID())
+					"TileID" => new Int("TileID", $this->getId()),
+					"Data" => new Byte("Data", $this->getDamage()),
 				]));
 
 				$fall->spawnToAll();
 			}
-
-			return false;
 		}
 	}
 }

src/pocketmine/block/Farmland.php

@@ -25,17 +25,23 @@ use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 
 class Farmland extends Solid{
+
+	protected $id = self::FARMLAND;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::FARMLAND, $meta, "Farmland");
+		$this->meta = $meta;
-		$this->hardness = 3;
 	}
 
-	public function getBoundingBox(){
+	public function getName(){
-		if($this->boundingBox !== null){
+		return "Farmland";
-			return $this->boundingBox;
+	}
-		}
 
-		return $this->boundingBox = new AxisAlignedBB(
+	public function getHardness(){
+		return 3;
+	}
+
+	protected function recalculateBoundingBox(){
+		return new AxisAlignedBB(
 			$this->x,
 			$this->y,
 			$this->z,

src/pocketmine/block/Fence.php

@@ -21,43 +21,59 @@
 
 namespace pocketmine\block;
 
-
 use pocketmine\math\AxisAlignedBB;
 
 class Fence extends Transparent{
-	public function __construct(){
+
-		parent::__construct(self::FENCE, 0, "Fence");
+	protected $id = self::FENCE;
-		$this->isFullBlock = false;
+
-		$this->hardness = 15;
+	public function __construct($meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getBoundingBox(){
+	public function getHardness(){
-		if($this->boundingBox !== null){
+		return 15;
-			return $this->boundingBox;
+	}
-		}
+
+
+	public function getName(){
+		static $names = [
+			0 => "Oak Fence",
+			1 => "Spruce Fence",
+			2 => "Birch Fence",
+			3 => "Jungle Fence",
+			4 => "Acacia Fence",
+			5 => "Dark Oak Fence",
+			"",
+			""
+		];
+		return $names[$this->meta & 0x07];
+	}
+
+	protected function recalculateBoundingBox(){
 
 		$flag = $this->canConnect($this->getSide(2));
 		$flag1 = $this->canConnect($this->getSide(3));
 		$flag2 = $this->canConnect($this->getSide(4));
 		$flag3 = $this->canConnect($this->getSide(5));
 
-		$f =  $flag2 ? 0 : 0.375;
+		$f = $flag2 ? 0 : 0.375;
 		$f1 = $flag3 ? 1 : 0.625;
 		$f2 = $flag ? 0 : 0.375;
 		$f3 = $flag1 ? 1 : 0.625;
 
-		return $this->boundingBox = new AxisAlignedBB(
+		return new AxisAlignedBB(
 			$this->x + $f,
 			$this->y,
 			$this->z + $f2,
 			$this->x + $f1,
-			$this->y + 1, //TODO: check this, add extra bounding box
+			$this->y + 1.5,
 			$this->z + $f3
 		);
 	}
 
 	public function canConnect(Block $block){
-		return ($block->getID() !== self::FENCE and $block->getID() !== self::FENCE_GATE) ? $block->isSolid : true;
+		return (!($block instanceof Fence) and !($block instanceof FenceGate)) ? $block->isSolid() : true;
 	}
 
-}
+}

src/pocketmine/block/FenceGate.php

@@ -26,22 +26,27 @@ use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
 class FenceGate extends Transparent{
+
+	protected $id = self::FENCE_GATE;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::FENCE_GATE, $meta, "Fence Gate");
+		$this->meta = $meta;
-		$this->isActivable = true;
+	}
-		if(($this->meta & 0x04) === 0x04){
+
-			$this->isFullBlock = true;
+	public function getName(){
-		}else{
+		return "Oak Fence Gate";
-			$this->isFullBlock = false;
+	}
-		}
+
-		$this->hardness = 15;
+	public function getHardness(){
+		return 15;
+	}
+
+	public function canBeActivated(){
+		return true;
 	}
 
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
-		if($this->boundingBox !== null){
-			return $this->boundingBox;
-		}
 
 		if(($this->getDamage() & 0x04) > 0){
 			return null;
@@ -49,21 +54,21 @@ class FenceGate extends Transparent{
 
 		$i = ($this->getDamage() & 0x03);
 		if($i === 2 and $i === 0){
-			return $this->boundingBox = new AxisAlignedBB(
+			return new AxisAlignedBB(
 				$this->x,
 				$this->y,
 				$this->z + 0.375,
 				$this->x + 1,
-				$this->y + 1,
+				$this->y + 1.5,
 				$this->z + 0.625
 			);
 		}else{
-			return $this->boundingBox = new AxisAlignedBB(
+			return new AxisAlignedBB(
 				$this->x + 0.375,
 				$this->y,
 				$this->z,
 				$this->x + 0.625,
-				$this->y + 1,
+				$this->y + 1.5,
 				$this->z + 1
 			);
 		}
@@ -96,11 +101,6 @@ class FenceGate extends Transparent{
 			3 => 2,
 		];
 		$this->meta = ($faces[$player instanceof Player ? $player->getDirection() : 0] & 0x03) | ((~$this->meta) & 0x04);
-		if(($this->meta & 0x04) === 0x04){
-			$this->isFullBlock = true;
-		}else{
-			$this->isFullBlock = false;
-		}
 		$this->getLevel()->setBlock($this, $this, true);
 
 		return true;

src/pocketmine/block/FenceGateAcacia.php

@@ -0,0 +1,32 @@
+<?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\block;
+
+
+class FenceGateAcacia extends FenceGate{
+
+	protected $id = self::FENCE_GATE_ACACIA;
+
+	public function getName(){
+		return "Acacia Fence Gate";
+	}
+}

src/pocketmine/block/FenceGateBirch.php

@@ -0,0 +1,32 @@
+<?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\block;
+
+
+class FenceGateBirch extends FenceGate{
+
+	protected $id = self::FENCE_GATE_BIRCH;
+
+	public function getName(){
+		return "Birch Fence Gate";
+	}
+}

src/pocketmine/block/FenceGateDarkOak.php

@@ -0,0 +1,32 @@
+<?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\block;
+
+
+class FenceGateDarkOak extends FenceGate{
+
+	protected $id = self::FENCE_GATE_DARK_OAK;
+
+	public function getName(){
+		return "Dark Oak Fence Gate";
+	}
+}

src/pocketmine/block/FenceGateJungle.php

@@ -0,0 +1,32 @@
+<?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\block;
+
+
+class FenceGateJungle extends FenceGate{
+
+	protected $id = self::FENCE_GATE_JUNGLE;
+
+	public function getName(){
+		return "Jungle Fence Gate";
+	}
+}

src/pocketmine/block/FenceGateSpruce.php

@@ -0,0 +1,32 @@
+<?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\block;
+
+
+class FenceGateSpruce extends FenceGate{
+
+	protected $id = self::FENCE_GATE_SPRUCE;
+
+	public function getName(){
+		return "Spruce Fence Gate";
+	}
+}

src/pocketmine/block/Fire.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
+ *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * 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
@@ -15,7 +15,7 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
@@ -25,32 +25,50 @@ use pocketmine\entity\Entity;
 use pocketmine\event\entity\EntityCombustByBlockEvent;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\inventory\InventoryHolder;
+use pocketmine\inventory\PlayerInventory;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\Server;
 
 class Fire extends Flowable{
 
-	public $hasEntityCollision = true;
+	protected $id = self::FIRE;
 
 	public function __construct($meta = 0){
-		parent::__construct(self::FIRE, $meta, "Fire");
+		$this->meta = $meta;
-		$this->isReplaceable = true;
-		$this->breakable = false;
-		$this->isFullBlock = true;
-		$this->hardness = 0;
 	}
 
-	public function getBoundingBox(){
+	public function hasEntityCollision(){
-		return null;
+		return true;
+	}
+
+	public function getName(){
+		return "Fire Block";
+	}
+
+	public function getLightLevel(){
+		return 15;
+	}
+
+	public function isBreakable(Item $item){
+		return false;
+	}
+
+	public function canBeReplaced(){
+		return true;
 	}
 
 	public function onEntityCollide(Entity $entity){
-		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1);
+		$damage = [EntityDamageEvent::MODIFIER_BASE => 1];
-		Server::getInstance()->getPluginManager()->callEvent($ev);
+		if($entity instanceof InventoryHolder){
-		if(!$ev->isCancelled()){
+			$inventory = $entity->getInventory();
-			$entity->attack($ev->getFinalDamage(), $ev);
+			if($inventory instanceof PlayerInventory){
+				$damage[EntityDamageEvent::MODIFIER_ARMOR] = $inventory->getArmorPoints();
+			}
 		}
+		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, $damage);
+		$entity->attack($ev->getFinalDamage(), $ev);
 
 		$ev = new EntityCombustByBlockEvent($this, $entity, 8);
 		Server::getInstance()->getPluginManager()->callEvent($ev);
@@ -67,7 +85,7 @@ class Fire extends Flowable{
 		if($type === Level::BLOCK_UPDATE_NORMAL){
 			for($s = 0; $s <= 5; ++$s){
 				$side = $this->getSide($s);
-				if($side->getID() !== self::AIR and !($side instanceof Liquid)){
+				if($side->getId() !== self::AIR and !($side instanceof Liquid)){
 					return false;
 				}
 			}
@@ -75,7 +93,7 @@ class Fire extends Flowable{
 
 			return Level::BLOCK_UPDATE_NORMAL;
 		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if($this->getSide(0)->getID() !== self::NETHERRACK){
+			if($this->getSide(0)->getId() !== self::NETHERRACK){
 				$this->getLevel()->setBlock($this, new Air(), true);
 
 				return Level::BLOCK_UPDATE_NORMAL;
@@ -85,4 +103,4 @@ class Fire extends Flowable{
 		return false;
 	}
 
-}
+}

src/pocketmine/block/Flowable.php

@@ -24,8 +24,19 @@ namespace pocketmine\block;
 
 abstract class Flowable extends Transparent{
 
-	public $isFlowable = true;
+	public function canBeFlowedInto(){
-	public $isFullBlock = false;
+		return true;
-	public $isSolid = false;
+	}
 
+	public function isSolid(){
+		return false;
+	}
+
+	public function getBoundingBox(){
+		return null;
+	}
+
+	public function getHardness(){
+		return 0;
+	}
 }

src/pocketmine/block/Furnace.php

@@ -23,10 +23,10 @@ namespace pocketmine\block;
 
 
 class Furnace extends BurningFurnace{
-	public function __construct($meta = 0){
+
-		parent::__construct($meta);
+	protected $id = self::FURNACE;
-		$this->id = self::FURNACE;
+
-		$this->name = "Furnace";
+	public function getName(){
-		$this->isActivable = true;
+		return "Furnace";
 	}
 }

src/pocketmine/block/Glass.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Glass extends Transparent{
+
+	protected $id = self::GLASS;
+
 	public function __construct(){
-		parent::__construct(self::GLASS, 0, "Glass");
+
-		$this->hardness = 1.5;
+	}
+
+	public function getName(){
+		return "Glass";
+	}
+
+	public function getHardness(){
+		return 1.5;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/GlassPane.php

@@ -22,9 +22,25 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Item;
+
 class GlassPane extends Thin{
+
+	protected $id = self::GLASS_PANE;
+
 	public function __construct(){
-		parent::__construct(self::GLASS_PANE, 0, "Glass Pane");
+
 	}
 
+	public function getName(){
+		return "Glass Pane";
+	}
+
+	public function getHardness(){
+		return 1.5;
+	}
+
+	public function getDrops(Item $item){
+		return [];
+	}
 }

src/pocketmine/block/GlowingObsidian.php

@@ -23,8 +23,19 @@ namespace pocketmine\block;
 
 
 class GlowingObsidian extends Solid{
+
+	protected $id = self::GLOWING_OBSIDIAN;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::GLOWING_OBSIDIAN, $meta, "Glowing Obsidian");
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Glowing Obsidian";
+	}
+
+	public function getLightLevel(){
+		return 12;
 	}
 
 }

src/pocketmine/block/GlowingRedstoneOre.php

@@ -25,9 +25,23 @@ use pocketmine\item\Item;
 use pocketmine\level\Level;
 
 class GlowingRedstoneOre extends Solid{
+
+	protected $id = self::GLOWING_REDSTONE_ORE;
+
 	public function __construct(){
-		parent::__construct(self::GLOWING_REDSTONE_ORE, 0, "Glowing Redstone Ore");
+
-		$this->hardness = 15;
+	}
+
+	public function getHardness(){
+		return 15;
+	}
+
+	public function getName(){
+		return "Glowing Redstone Ore";
+	}
+
+	public function getLightLevel(){
+		return 9;
 	}
 
 	public function onUpdate($type){

src/pocketmine/block/Glowstone.php

@@ -24,9 +24,23 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Glowstone extends Transparent{
+
+	protected $id = self::GLOWSTONE_BLOCK;
+
 	public function __construct(){
-		parent::__construct(self::GLOWSTONE_BLOCK, 0, "Glowstone");
+
-		$this->hardness = 1.5;
+	}
+
+	public function getName(){
+		return "Glowstone";
+	}
+
+	public function getHardness(){
+		return 1.5;
+	}
+
+	public function getLightLevel(){
+		return 15;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Gold.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Gold extends Solid{
+
+	protected $id = self::GOLD_BLOCK;
+
 	public function __construct(){
-		parent::__construct(self::GOLD_BLOCK, 0, "Gold Block");
+
-		$this->hardness = 30;
+	}
+
+	public function getName(){
+		return "Gold Block";
+	}
+
+	public function getHardness(){
+		return 30;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/GoldOre.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class GoldOre extends Solid{
+
+	protected $id = self::GOLD_ORE;
+
 	public function __construct(){
-		parent::__construct(self::GOLD_ORE, 0, "Gold Ore");
+
-		$this->hardness = 15;
+	}
+
+	public function getName(){
+		return "Gold Ore";
+	}
+
+	public function getHardness(){
+		return 15;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/Grass.php

@@ -25,23 +25,31 @@ use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
 use pocketmine\level\generator\object\TallGrass as TallGrassObject;
 use pocketmine\level\Level;
-use pocketmine\level\Position;
+use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\Server;
 use pocketmine\utils\Random;
 
 class Grass extends Solid{
 
-	public $isActivable = true;
-	protected $hardness = 3;
 	protected $id = self::GRASS;
-	protected $meta = 0;
-	protected $name = "Grass";
 
 	public function __construct(){
 
 	}
 
+	public function canBeActivated(){
+		return true;
+	}
+
+	public function getName(){
+		return "Grass";
+	}
+
+	public function getHardness(){
+		return 3;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[Item::DIRT, 0, 1],
@@ -54,9 +62,8 @@ class Grass extends Solid{
 			$x = mt_rand($this->x - 1, $this->x + 1);
 			$y = mt_rand($this->y - 2, $this->y + 2);
 			$z = mt_rand($this->z - 1, $this->z + 1);
-			$block = $this->getLevel()->getBlockIdAt($x, $y, $z);
+			$block = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
-			if($block === Block::DIRT){
+			if($block->getId() === Block::DIRT){
-				$block = Block::get($block, $this->getLevel()->getBlockDataAt($x, $y, $z), new Position($x, $y, $z, $this->getLevel()));
 				if($block->getSide(1) instanceof Transparent){
 					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($block, $this, new Grass()));
 					if(!$ev->isCancelled()){
@@ -68,7 +75,7 @@ class Grass extends Solid{
 	}
 
 	public function onActivate(Item $item, Player $player = null){
-		if($item->getID() === Item::DYE and $item->getDamage() === 0x0F){
+		if($item->getId() === Item::DYE and $item->getDamage() === 0x0F){
 			$item->count--;
 			TallGrassObject::growGrass($this->getLevel(), $this, new Random(mt_rand()), 8, 2);
 

src/pocketmine/block/Gravel.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Gravel extends Fallable{
+
+	protected $id = self::GRAVEL;
+
 	public function __construct(){
-		parent::__construct(self::GRAVEL, 0, "Gravel");
+
-		$this->hardness = 3;
+	}
+
+	public function getName(){
+		return "Gravel";
+	}
+
+	public function getHardness(){
+		return 3;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/HardenedClay.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class HardenedClay extends Solid{
+
+	protected $id = self::HARDENED_CLAY;
+
 	public function __construct(){
-		parent::__construct(self::HARDENED_CLAY, 0, "Hardened Clay");
+
-		$this->hardness = 30;
+	}
+
+	public function getName(){
+		return "Hardened Clay";
+	}
+
+	public function getHardness(){
+		return 30;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/HayBale.php

@@ -25,9 +25,19 @@ use pocketmine\item\Item;
 use pocketmine\Player;
 
 class HayBale extends Solid{
+
+	protected $id = self::HAY_BALE;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::HAY_BALE, $meta, "Hay Bale");
+		$this->meta = $meta;
-		$this->hardness = 10;
+	}
+
+	public function getName(){
+		return "Hay Bale";
+	}
+
+	public function getHardness(){
+		return 10;
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){

src/pocketmine/block/Ice.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Ice extends Transparent{
+
+	protected $id = self::ICE;
+
 	public function __construct(){
-		parent::__construct(self::ICE, 0, "Ice");
+
-		$this->hardness = 2.5;
+	}
+
+	public function getName(){
+		return "Ice";
+	}
+
+	public function getHardness(){
+		return 2.5;
 	}
 
 	public function onBreak(Item $item){

src/pocketmine/block/Iron.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Iron extends Solid{
+
+	protected $id = self::IRON_BLOCK;
+
 	public function __construct(){
-		parent::__construct(self::IRON_BLOCK, 0, "Iron Block");
+
-		$this->hardness = 30;
+	}
+
+	public function getName(){
+		return "Iron Block";
+	}
+
+	public function getHardness(){
+		return 30;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/IronBars.php

@@ -21,10 +21,49 @@
 
 namespace pocketmine\block;
 
+use pocketmine\item\Item;
 
 class IronBars extends Thin{
+
+	protected $id = self::IRON_BARS;
+
 	public function __construct(){
-		parent::__construct(self::IRON_BARS, 0, "Iron Bars");
+
 	}
 
-}
+	public function getName(){
+		return "Iron Bars";
+	}
+	public function getHardness(){
+		return 5;
+	}
+
+	public function getBreakTime(Item $item){
+		switch($item->isPickaxe()){
+			case 5:
+				return 0.95;
+			case 4:
+				return 1.25;
+			case 3:
+				return 1.9;
+			case 2:
+				return 0.65;
+			case 1:
+				return 3.75;
+			default:
+				return 5;
+		}
+	}
+
+	public function getDrops(Item $item){
+		if($item->isPickaxe() >= 1){
+			return [
+				[Item::IRON_BARS, 0, 1],
+			];
+		}else{
+			return [];
+		}
+	}
+
+}
+

src/pocketmine/block/IronDoor.php

@@ -24,10 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class IronDoor extends Door{
+
+	protected $id = self::IRON_DOOR_BLOCK;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::IRON_DOOR_BLOCK, $meta, "Iron Door Block");
+		$this->meta = $meta;
-		//$this->isActivable = true;
+	}
-		$this->hardness = 25;
+
+	public function getName(){
+		return "Iron Door Block";
+	}
+
+	public function getHardness(){
+		return 25;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/IronOre.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class IronOre extends Solid{
+
+	protected $id = self::IRON_ORE;
+
 	public function __construct(){
-		parent::__construct(self::IRON_ORE, 0, "Iron Ore");
+
-		$this->hardness = 15;
+	}
+
+	public function getName(){
+		return "Iron Ore";
+	}
+
+	public function getHardness(){
+		return 15;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/JungleWoodStairs.php

@@ -24,8 +24,15 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class JungleWoodStairs extends Stair{
+
+	protected $id = self::JUNGLE_WOOD_STAIRS;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::JUNGLE_WOOD_STAIRS, $meta, "Jungle Wood Stairs");
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Jungle Wood Stairs";
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Ladder.php

@@ -29,29 +29,39 @@ use pocketmine\Player;
 
 class Ladder extends Transparent{
 
-	public $hasEntityCollision = true;
+	protected $id = self::LADDER;
 
 	public function __construct($meta = 0){
-		parent::__construct(self::LADDER, $meta, "Ladder");
+		$this->meta = $meta;
-		$this->isSolid = false;
+	}
-		$this->isFullBlock = false;
+
-		$this->hardness = 2;
+	public function getName(){
+		return "Ladder";
+	}
+
+	public function hasEntityCollision(){
+		return true;
+	}
+
+	public function isSolid(){
+		return false;
+	}
+
+	public function getHardness(){
+		return 2;
 	}
 
 	public function onEntityCollide(Entity $entity){
-		$entity->fallDistance = 0;
+		$entity->resetFallDistance();
 		$entity->onGround = true;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
-		if($this->boundingBox !== null){
-			return $this->boundingBox;
-		}
 
 		$f = 0.125;
 
 		if($this->meta === 2){
-			return $this->boundingBox = new AxisAlignedBB(
+			return new AxisAlignedBB(
 				$this->x,
 				$this->y,
 				$this->z + 1 - $f,
@@ -60,7 +70,7 @@ class Ladder extends Transparent{
 				$this->z + 1
 			);
 		}elseif($this->meta === 3){
-			return $this->boundingBox = new AxisAlignedBB(
+			return new AxisAlignedBB(
 				$this->x,
 				$this->y,
 				$this->z,
@@ -69,7 +79,7 @@ class Ladder extends Transparent{
 				$this->z + $f
 			);
 		}elseif($this->meta === 4){
-			return $this->boundingBox = new AxisAlignedBB(
+			return new AxisAlignedBB(
 				$this->x + 1 - $f,
 				$this->y,
 				$this->z,
@@ -78,7 +88,7 @@ class Ladder extends Transparent{
 				$this->z + 1
 			);
 		}elseif($this->meta === 5){
-			return $this->boundingBox = new AxisAlignedBB(
+			return new AxisAlignedBB(
 				$this->x,
 				$this->y,
 				$this->z,
@@ -93,7 +103,7 @@ class Ladder extends Transparent{
 
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		if($target->isTransparent === false){
+		if($target->isTransparent() === false){
 			$faces = [
 				2 => 2,
 				3 => 3,
@@ -113,7 +123,7 @@ class Ladder extends Transparent{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			/*if($this->getSide(0)->getID() === self::AIR){ //Replace with common break method
+			/*if($this->getSide(0)->getId() === self::AIR){ //Replace with common break method
 				Server::getInstance()->api->entity->drop($this, Item::get(LADDER, 0, 1));
 				$this->getLevel()->setBlock($this, new Air(), true, true, true);
 				return Level::BLOCK_UPDATE_NORMAL;

src/pocketmine/block/Lapis.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Lapis extends Solid{
+
+	protected $id = self::LAPIS_BLOCK;
+
 	public function __construct(){
-		parent::__construct(self::LAPIS_BLOCK, 0, "Lapis Block");
+
-		$this->hardness = 15;
+	}
+
+	public function getName(){
+		return "Lapis Block";
+	}
+
+	public function getHardness(){
+		return 15;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/LapisOre.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class LapisOre extends Solid{
+
+	protected $id = self::LAPIS_ORE;
+
 	public function __construct(){
-		parent::__construct(self::LAPIS_ORE, 0, "Lapis Ore");
+
-		$this->hardness = 15;
+	}
+
+	public function getHardness(){
+		return 15;
+	}
+
+	public function getName(){
+		return "Lapis Ore";
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/Lava.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
+ *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * 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
@@ -15,7 +15,7 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
@@ -25,30 +25,53 @@ use pocketmine\entity\Entity;
 use pocketmine\event\entity\EntityCombustByBlockEvent;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\inventory\InventoryHolder;
+use pocketmine\inventory\PlayerInventory;
 use pocketmine\item\Item;
 use pocketmine\Player;
 use pocketmine\Server;
 
 class Lava extends Liquid{
 
+	protected $id = self::LAVA;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::LAVA, $meta, "Lava");
+		$this->meta = $meta;
-		$this->hardness = 0;
+	}
+
+	public function getLightLevel(){
+		return 15;
+	}
+
+	public function getName(){
+		return "Lava";
+	}
+
+	public function getHardness(){
+		return 0;
 	}
 
 	public function onEntityCollide(Entity $entity){
 		$entity->fallDistance *= 0.5;
-		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_LAVA, 4);
+		$damage = [EntityDamageEvent::MODIFIER_BASE => 1];
-		Server::getInstance()->getPluginManager()->callEvent($ev);
+		if($entity instanceof InventoryHolder){
-		if(!$ev->isCancelled()){
+			$inventory = $entity->getInventory();
-			$entity->attack($ev->getFinalDamage(), $ev);
+			if($inventory instanceof PlayerInventory){
+				$damage[EntityDamageEvent::MODIFIER_ARMOR] = $inventory->getArmorPoints();
+			}
 		}
+		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_LAVA, $damage);
+		$entity->attack($ev->getFinalDamage(), $ev);
 
 		$ev = new EntityCombustByBlockEvent($this, $entity, 15);
 		Server::getInstance()->getPluginManager()->callEvent($ev);
 		if(!$ev->isCancelled()){
 			$entity->setOnFire($ev->getDuration());
 		}
+
+		if($entity instanceof Player){
+			$entity->onGround = true;
+		}
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){

src/pocketmine/block/Leaves.php

@@ -35,16 +35,24 @@ class Leaves extends Transparent{
 	const ACACIA = 0;
 	const DARK_OAK = 1;
 
+	protected $id = self::LEAVES;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::LEAVES, $meta, "Leaves");
+		$this->meta = $meta;
-		$names = [
+	}
+
+	public function getHardness(){
+		return 1;
+	}
+
+	public function getName(){
+		static $names = [
 			self::OAK => "Oak Leaves",
 			self::SPRUCE => "Spruce Leaves",
 			self::BIRCH => "Birch Leaves",
 			self::JUNGLE => "Jungle Leaves",
 		];
-		$this->name = $names[$this->meta & 0x03];
+		return $names[$this->meta & 0x03];
-		$this->hardness = 1;
 	}
 
 	private function findLog(Block $pos, array $visited, $distance, &$check, $fromSide = null){
@@ -53,11 +61,11 @@ class Leaves extends Transparent{
 		if(isset($visited[$index])){
 			return false;
 		}
-		if($pos->getID() === self::WOOD){
+		if($pos->getId() === self::WOOD){
 			return true;
-		}elseif($pos->getID() === self::LEAVES and $distance < 3){
+		}elseif($pos->getId() === self::LEAVES and $distance < 3){
 			$visited[$index] = true;
-			$down = $pos->getSide(0)->getID();
+			$down = $pos->getSide(0)->getId();
 			if($down === Item::WOOD){
 				return true;
 			}

src/pocketmine/block/Leaves2.php

@@ -29,14 +29,18 @@ use pocketmine\Server;
 
 class Leaves2 extends Leaves{
 
+	protected $id = self::LEAVES2;
+
 	public function __construct($meta = 0){
-		Transparent::__construct(self::LEAVES, $meta, "Leaves");
+		$this->meta = $meta;
-		$names = [
+	}
+
+	public function getName(){
+		static $names = [
 			self::ACACIA => "Acacia Leaves",
 			self::DARK_OAK => "Dark Oak Leaves",
 		];
-		$this->name = $names[$this->meta & 0x03];
+		return $names[$this->meta & 0x01];
-		$this->hardness = 1;
 	}
 
 	private function findLog(Block $pos, array $visited, $distance, &$check, $fromSide = null){
@@ -45,11 +49,11 @@ class Leaves2 extends Leaves{
 		if(isset($visited[$index])){
 			return false;
 		}
-		if($pos->getID() === self::WOOD2){
+		if($pos->getId() === self::WOOD2){
 			return true;
-		}elseif($pos->getID() === self::LEAVES2 and $distance < 3){
+		}elseif($pos->getId() === self::LEAVES2 and $distance < 3){
 			$visited[$index] = true;
-			$down = $pos->getSide(0)->getID();
+			$down = $pos->getSide(0)->getId();
 			if($down === Item::WOOD2){
 				return true;
 			}

src/pocketmine/block/Liquid.php

@@ -28,13 +28,25 @@ use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 
 abstract class Liquid extends Transparent{
-	public $hasEntityCollision = true;
 
-	public $isLiquid = true;
+	/** @var Vector3 */
-	public $breakable = false;
+	private $temporalVector = null;
-	public $isReplaceable = true;
+
-	public $isSolid = false;
+	public function hasEntityCollision(){
-	public $isFullBlock = true;
+		return true;
+	}
+
+	public function isBreakable(Item $item){
+		return false;
+	}
+
+	public function canBeReplaced(){
+		return true;
+	}
+
+	public function isSolid(){
+		return false;
+	}
 
 	public $adjacentSources = 0;
 	public $isOptimalFlowDirection = [0, 0, 0, 0];
@@ -54,7 +66,7 @@ abstract class Liquid extends Transparent{
 			$pos = $this->getLevel()->getBlock($pos);
 		}
 
-		if($pos->getID() !== $this->getID()){
+		if($pos->getId() !== $this->getId()){
 			return -1;
 		}else{
 			return $pos->getDamage();
@@ -66,7 +78,7 @@ abstract class Liquid extends Transparent{
 			$pos = $this->getLevel()->getBlock($pos);
 		}
 
-		if($pos->getID() !== $this->getID()){
+		if($pos->getId() !== $this->getId()){
 			return -1;
 		}
 
@@ -82,6 +94,10 @@ abstract class Liquid extends Transparent{
 	public function getFlowVector(){
 		$vector = new Vector3(0, 0, 0);
 
+		if($this->temporalVector === null){
+			$this->temporalVector = new Vector3(0, 0, 0);
+		}
+
 		$decay = $this->getEffectiveFlowDecay($this);
 
 		for($j = 0; $j < 4; ++$j){
@@ -99,46 +115,50 @@ abstract class Liquid extends Transparent{
 			}elseif($j === 3){
 				++$z;
 			}
-			$sideBlock = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
+			$sideBlock = $this->getLevel()->getBlock($this->temporalVector->setComponents($x, $y, $z));
 			$blockDecay = $this->getEffectiveFlowDecay($sideBlock);
 
 			if($blockDecay < 0){
-				if(!$sideBlock->isFlowable){
+				if(!$sideBlock->canBeFlowedInto()){
 					continue;
 				}
 
-				$blockDecay = $this->getEffectiveFlowDecay($sideBlock->getSide(0));
+				$blockDecay = $this->getEffectiveFlowDecay($this->getLevel()->getBlock($this->temporalVector->setComponents($x, $y - 1, $z)));
 
 				if($blockDecay >= 0){
 					$realDecay = $blockDecay - ($decay - 8);
-					$vector = $vector->add(($sideBlock->x - $this->x) * $realDecay, ($sideBlock->y - $this->y) * $realDecay, ($sideBlock->z - $this->z) * $realDecay);
+					$vector->x += ($sideBlock->x - $this->x) * $realDecay;
+					$vector->y += ($sideBlock->y - $this->y) * $realDecay;
+					$vector->z += ($sideBlock->z - $this->z) * $realDecay;
 				}
 
 				continue;
 			}else{
 				$realDecay = $blockDecay - $decay;
-				$vector = $vector->add(($sideBlock->x - $this->x) * $realDecay, ($sideBlock->y - $this->y) * $realDecay, ($sideBlock->z - $this->z) * $realDecay);
+				$vector->x += ($sideBlock->x - $this->x) * $realDecay;
+				$vector->y += ($sideBlock->y - $this->y) * $realDecay;
+				$vector->z += ($sideBlock->z - $this->z) * $realDecay;
 			}
 		}
 
 		if($this->getDamage() >= 8){
 			$falling = false;
 
-			if(!$this->getLevel()->getBlock($this->add(0, 0, -1))->isFlowable){
+			if(!$this->getLevel()->getBlock($this->temporalVector->setComponents($this->x, $this->y, $this->z - 1))->canBeFlowedInto()){
 				$falling = true;
-			}elseif(!$this->getLevel()->getBlock($this->add(0, 0, 1))->isFlowable){
+			}elseif(!$this->getLevel()->getBlock($this->temporalVector->setComponents($this->x, $this->y, $this->z + 1))->canBeFlowedInto()){
 				$falling = true;
-			}elseif(!$this->getLevel()->getBlock($this->add(-1, 0, 0))->isFlowable){
+			}elseif(!$this->getLevel()->getBlock($this->temporalVector->setComponents($this->x - 1, $this->y, $this->z))->canBeFlowedInto()){
 				$falling = true;
-			}elseif(!$this->getLevel()->getBlock($this->add(1, 0, 0))->isFlowable){
+			}elseif(!$this->getLevel()->getBlock($this->temporalVector->setComponents($this->x + 1, $this->y, $this->z))->canBeFlowedInto()){
 				$falling = true;
-			}elseif(!$this->getLevel()->getBlock($this->add(0, 1, -1))->isFlowable){
+			}elseif(!$this->getLevel()->getBlock($this->temporalVector->setComponents($this->x, $this->y + 1, $this->z - 1))->canBeFlowedInto()){
 				$falling = true;
-			}elseif(!$this->getLevel()->getBlock($this->add(0, 1, 1))->isFlowable){
+			}elseif(!$this->getLevel()->getBlock($this->temporalVector->setComponents($this->x, $this->y + 1, $this->z + 1))->canBeFlowedInto()){
 				$falling = true;
-			}elseif(!$this->getLevel()->getBlock($this->add(-1, 1, 0))->isFlowable){
+			}elseif(!$this->getLevel()->getBlock($this->temporalVector->setComponents($this->x - 1, $this->y + 1, $this->z))->canBeFlowedInto()){
 				$falling = true;
-			}elseif(!$this->getLevel()->getBlock($this->add(1, 1, 0))->isFlowable){
+			}elseif(!$this->getLevel()->getBlock($this->temporalVector->setComponents($this->x + 1, $this->y + 1, $this->z))->canBeFlowedInto()){
 				$falling = true;
 			}
 
@@ -172,6 +192,10 @@ abstract class Liquid extends Transparent{
 			$this->checkForHarden();
 			$this->getLevel()->scheduleUpdate($this, $this->tickRate());
 		}elseif($type === Level::BLOCK_UPDATE_SCHEDULED){
+			if($this->temporalVector === null){
+				$this->temporalVector = new Vector3(0, 0, 0);
+			}
+
 			$decay = $this->getFlowDecay($this);
 			$multiplier = $this instanceof Lava ? 2 : 1;
 
@@ -180,10 +204,10 @@ abstract class Liquid extends Transparent{
 			if($decay > 0){
 				$smallestFlowDecay = -100;
 				$this->adjacentSources = 0;
-				$smallestFlowDecay = $this->getSmallestFlowDecay($this->getSide(4), $smallestFlowDecay);
+				$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlock($this->temporalVector->setComponents($this->x, $this->y, $this->z - 1)), $smallestFlowDecay);
-				$smallestFlowDecay = $this->getSmallestFlowDecay($this->getSide(5), $smallestFlowDecay);
+				$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlock($this->temporalVector->setComponents($this->x, $this->y, $this->z + 1)), $smallestFlowDecay);
-				$smallestFlowDecay = $this->getSmallestFlowDecay($this->getSide(2), $smallestFlowDecay);
+				$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlock($this->temporalVector->setComponents($this->x - 1, $this->y, $this->z)), $smallestFlowDecay);
-				$smallestFlowDecay = $this->getSmallestFlowDecay($this->getSide(3), $smallestFlowDecay);
+				$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlock($this->temporalVector->setComponents($this->x + 1, $this->y, $this->z)), $smallestFlowDecay);
 
 				$k = $smallestFlowDecay + $multiplier;
 
@@ -191,7 +215,7 @@ abstract class Liquid extends Transparent{
 					$k = -1;
 				}
 
-				if(($topFlowDecay = $this->getFlowDecay($this->getSide(1))) >= 0){
+				if(($topFlowDecay = $this->getFlowDecay($this->level->getBlock($this->level->getBlock($this->temporalVector->setComponents($this->x, $this->y + 1, $this->z))))) >= 0){
 					if($topFlowDecay >= 8){
 						$k = $topFlowDecay;
 					}else{
@@ -200,8 +224,8 @@ abstract class Liquid extends Transparent{
 				}
 
 				if($this->adjacentSources >= 2 and $this instanceof Water){
-					$bottomBlock = $this->getSide(0);
+					$bottomBlock = $this->level->getBlock($this->level->getBlock($this->temporalVector->setComponents($this->x, $this->y - 1, $this->z)));
-					if($bottomBlock->isSolid){
+					if($bottomBlock->isSolid()){
 						$k = 0;
 					}elseif($bottomBlock instanceof Water and $bottomBlock->getDamage() === 0){
 						$k = 0;
@@ -216,7 +240,7 @@ abstract class Liquid extends Transparent{
 				if($k !== $decay){
 					$decay = $k;
 					if($decay < 0){
-						$this->getLevel()->setBlock($this, Block::get(Item::AIR), true);
+						$this->getLevel()->setBlock($this, new Air(), true);
 					}else{
 						$this->getLevel()->setBlock($this, Block::get($this->id, $decay), true);
 						$this->getLevel()->scheduleUpdate($this, $this->tickRate());
@@ -229,9 +253,9 @@ abstract class Liquid extends Transparent{
 				//$this->updateFlow();
 			}
 
-			$bottomBlock = $this->getSide(0);
+			$bottomBlock = $this->level->getBlock($this->temporalVector->setComponents($this->x, $this->y - 1, $this->z));
 
-			if($bottomBlock->isFlowable or $bottomBlock instanceof Liquid){
+			if($bottomBlock->canBeFlowedInto() or $bottomBlock instanceof Liquid){
 				if($this instanceof Lava and $bottomBlock instanceof Water){
 					$this->getLevel()->setBlock($bottomBlock, Block::get(Item::STONE), true);
 					return;
@@ -244,7 +268,7 @@ abstract class Liquid extends Transparent{
 					$this->getLevel()->setBlock($bottomBlock, Block::get($this->id, $decay + 8), true);
 					$this->getLevel()->scheduleUpdate($bottomBlock, $this->tickRate());
 				}
-			}elseif($decay >= 0 and ($decay === 0 or !$bottomBlock->isFlowable)){
+			}elseif($decay >= 0 and ($decay === 0 or !$bottomBlock->canBeFlowedInto())){
 				$flags = $this->getOptimalFlowDirections();
 
 				$l = $decay + $multiplier;
@@ -259,19 +283,19 @@ abstract class Liquid extends Transparent{
 				}
 
 				if($flags[0]){
-					$this->flowIntoBlock($this->getSide(4), $l);
+					$this->flowIntoBlock($this->level->getBlock($this->temporalVector->setComponents($this->x - 1, $this->y, $this->z)), $l);
 				}
 
 				if($flags[1]){
-					$this->flowIntoBlock($this->getSide(5), $l);
+					$this->flowIntoBlock($this->level->getBlock($this->temporalVector->setComponents($this->x + 1, $this->y, $this->z)), $l);
 				}
 
 				if($flags[2]){
-					$this->flowIntoBlock($this->getSide(2), $l);
+					$this->flowIntoBlock($this->level->getBlock($this->temporalVector->setComponents($this->x, $this->y, $this->z - 1)), $l);
 				}
 
 				if($flags[3]){
-					$this->flowIntoBlock($this->getSide(3), $l);
+					$this->flowIntoBlock($this->level->getBlock($this->temporalVector->setComponents($this->x, $this->y, $this->z + 1)), $l);
 				}
 			}
 
@@ -281,8 +305,8 @@ abstract class Liquid extends Transparent{
 	}
 
 	private function flowIntoBlock(Block $block, $newFlowDecay){
-		if($block->isFlowable){
+		if($block->canBeFlowedInto()){
-			if($block->getID() > 0){
+			if($block->getId() > 0){
 				$this->getLevel()->useBreakOn($block);
 			}
 
@@ -314,13 +338,13 @@ abstract class Liquid extends Transparent{
 				}elseif($j === 3){
 					++$z;
 				}
-				$blockSide = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
+				$blockSide = $this->getLevel()->getBlock($this->temporalVector->setComponents($x, $y, $z));
 
-				if(!$blockSide->isFlowable and !($blockSide instanceof Liquid)){
+				if(!$blockSide->canBeFlowedInto() and !($blockSide instanceof Liquid)){
 					continue;
 				}elseif($blockSide instanceof Liquid and $blockSide->getDamage() === 0){
 					continue;
-				}elseif($blockSide->getSide(0)->isFlowable){
+				}elseif($this->getLevel()->getBlock($this->temporalVector->setComponents($x, $y - 1, $z))->canBeFlowedInto()){
 					return $accumulatedCost;
 				}
 
@@ -340,6 +364,10 @@ abstract class Liquid extends Transparent{
 	}
 
 	private function getOptimalFlowDirections(){
+		if($this->temporalVector === null){
+			$this->temporalVector = new Vector3(0, 0, 0);
+		}
+
 		for($j = 0; $j < 4; ++$j){
 			$this->flowCost[$j] = 1000;
 
@@ -356,13 +384,13 @@ abstract class Liquid extends Transparent{
 			}elseif($j === 3){
 				++$z;
 			}
-			$block = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
+			$block = $this->getLevel()->getBlock($this->temporalVector->setComponents($x, $y, $z));
 
-			if(!$block->isFlowable and !($block instanceof Liquid)){
+			if(!$block->canBeFlowedInto() and !($block instanceof Liquid)){
 				continue;
 			}elseif($block instanceof Liquid and $block->getDamage() === 0){
 				continue;
-			}elseif($block->getSide(0)->isFlowable){
+			}elseif($this->getLevel()->getBlock($this->temporalVector->setComponents($x, $y - 1, $z))->canBeFlowedInto()){
 				$this->flowCost[$j] = 0;
 			}else{
 				$this->flowCost[$j] = $this->calculateFlowCost($block, 1, $j);

src/pocketmine/block/LitPumpkin.php

@@ -25,9 +25,23 @@ use pocketmine\item\Item;
 use pocketmine\Player;
 
 class LitPumpkin extends Solid{
-	public function __construct(){
+
-		parent::__construct(self::LIT_PUMPKIN, "Jack o'Lantern");
+	protected $id = self::LIT_PUMPKIN;
-		$this->hardness = 5;
+
+	public function getLightLevel(){
+		return 15;
+	}
+
+	public function getHardness(){
+		return 5;
+	}
+
+	public function getName(){
+		return "Jack o'Lantern";
+	}
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){

src/pocketmine/block/Melon.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Melon extends Transparent{
+
+	protected $id = self::MELON_BLOCK;
+
 	public function __construct(){
-		parent::__construct(self::MELON_BLOCK, 0, "Melon Block");
+
-		$this->hardness = 5;
+	}
+
+	public function getName(){
+		return "Melon Block";
+	}
+
+	public function getHardness(){
+		return 5;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/MelonStem.php

@@ -27,13 +27,20 @@ use pocketmine\level\Level;
 use pocketmine\Server;
 
 class MelonStem extends Crops{
+
+	protected $id = self::MELON_STEM;
+
+	public function getName(){
+		return "Melon Stem";
+	}
+
 	public function __construct($meta = 0){
-		parent::__construct(self::MELON_STEM, $meta, "Melon Stem");
+		$this->meta = $meta;
 	}
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){
+			if($this->getSide(0)->isTransparent() === true){
 				$this->getLevel()->useBreakOn($this);
 				return Level::BLOCK_UPDATE_NORMAL;
 			}
@@ -51,13 +58,13 @@ class MelonStem extends Crops{
 				}else{
 					for($side = 2; $side <= 5; ++$side){
 						$b = $this->getSide($side);
-						if($b->getID() === self::MELON_BLOCK){
+						if($b->getId() === self::MELON_BLOCK){
 							return Level::BLOCK_UPDATE_RANDOM;
 						}
 					}
 					$side = $this->getSide(mt_rand(2, 5));
 					$d = $side->getSide(0);
-					if($side->getID() === self::AIR and ($d->getID() === self::FARMLAND or $d->getID() === self::GRASS or $d->getID() === self::DIRT)){
+					if($side->getId() === self::AIR and ($d->getId() === self::FARMLAND or $d->getId() === self::GRASS or $d->getId() === self::DIRT)){
 						Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($side, new Melon()));
 						if(!$ev->isCancelled()){
 							$this->getLevel()->setBlock($side, $ev->getNewState(), true);

src/pocketmine/block/MonsterSpawner.php

@@ -24,29 +24,39 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class MonsterSpawner extends Solid{
-	public function __construct(){
+
-		parent::__construct(self::MONSTER_SPAWNER, 0, "Monster Spawner");
+	protected $id = self::MONSTER_SPAWNER;
-		$this->hardness = 25;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
 	}
 
-    public function getBreakTime(Item $item){
+	public function getHardness(){
-        switch($item->isPickaxe()){
+		return 25;
-            case 5:
+	}
-                return 0.95;
-            case 4:
-                return 1.25;
-            case 3:
-                return 1.9;
-            case 2:
-                return 0.65;
-            case 1:
-                return 3.75;
-            default:
-                return 25;
-        }
-    }
 
-    public function getDrops(Item $item){
+	public function getName(){
-        return [];
+		return "Monster Spawner";
-    }
+	}
+
+	public function getBreakTime(Item $item){
+		switch($item->isPickaxe()){
+			case 5:
+				return 0.95;
+			case 4:
+				return 1.25;
+			case 3:
+				return 1.9;
+			case 2:
+				return 0.65;
+			case 1:
+				return 3.75;
+			default:
+				return 25;
+		}
+	}
+
+	public function getDrops(Item $item){
+		return [];
+	}
 }

src/pocketmine/block/MossStone.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class MossStone extends Solid{
+
+	protected $id = self::MOSS_STONE;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::MOSS_STONE, $meta, "Moss Stone");
+		$this->meta = $meta;
-		$this->hardness = 30;
+	}
+
+	public function getName(){
+		return "Moss Stone";
+	}
+
+	public function getHardness(){
+		return 30;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/Mycelium.php

@@ -24,13 +24,23 @@ namespace pocketmine\block;
 use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
-use pocketmine\level\Position;
+use pocketmine\math\Vector3;
 use pocketmine\Server;
 
 class Mycelium extends Solid{
+
+	protected $id = self::MYCELIUM;
+
 	public function __construct(){
-		parent::__construct(self::MYCELIUM, 0, "Mycelium");
+
-		$this->hardness = 2.5;
+	}
+
+	public function getName(){
+		return "Mycelium";
+	}
+
+	public function getHardness(){
+		return 2.5;
 	}
 
 	public function getDrops(Item $item){
@@ -45,9 +55,8 @@ class Mycelium extends Solid{
 			$x = mt_rand($this->x - 1, $this->x + 1);
 			$y = mt_rand($this->y - 2, $this->y + 2);
 			$z = mt_rand($this->z - 1, $this->z + 1);
-			$block = $this->getLevel()->getBlockIdAt($x, $y, $z);
+			$block = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
-			if($block === Block::DIRT){
+			if($block->getId() === Block::DIRT){
-				$block = Block::get($block, $this->getLevel()->getBlockDataAt($x, $y, $z), new Position($x, $y, $z, $this->getLevel()));
 				if($block->getSide(1) instanceof Transparent){
 					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($block, $this, new Mycelium()));
 					if(!$ev->isCancelled()){

src/pocketmine/block/NetherBrick.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class NetherBrick extends Solid{
+
+	protected $id = self::NETHER_BRICKS;
+
 	public function __construct(){
-		parent::__construct(self::NETHER_BRICKS, 0, "Nether Bricks");
+
-		$this->hardness = 30;
+	}
+
+	public function getName(){
+		return "Nether Bricks";
+	}
+
+	public function getHardness(){
+		return 30;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/NetherBrickStairs.php

@@ -23,8 +23,15 @@ namespace pocketmine\block;
 
 
 class NetherBrickStairs extends Stair{
+
+	protected $id = self::NETHER_BRICKS_STAIRS;
+
+	public function getName(){
+		return "Nether Bricks Stairs";
+	}
+
 	public function __construct($meta = 0){
-		parent::__construct(self::NETHER_BRICKS_STAIRS, $meta, "Nether Bricks Stairs");
+		$this->meta = $meta;
 	}
 
 }

src/pocketmine/block/NetherReactor.php

@@ -23,9 +23,19 @@ namespace pocketmine\block;
 
 
 class NetherReactor extends Solid{
+
+	protected $id = self::NETHER_REACTOR;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::NETHER_REACTOR, $meta, "Nether Reactor");
+		$this->meta = $meta;
-		$this->isActivable = true;
+	}
+
+	public function getName(){
+		return "Nether Reactor";
+	}
+
+	public function canBeActivated(){
+		return true;
 	}
 
 }

src/pocketmine/block/Netherrack.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Netherrack extends Solid{
+
+	protected $id = self::NETHERRACK;
+
 	public function __construct(){
-		parent::__construct(self::NETHERRACK, 0, "Netherrack");
+
-		$this->hardness = 2;
+	}
+
+	public function getName(){
+		return "Netherrack";
+	}
+
+	public function getHardness(){
+		return 2;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/Obsidian.php

@@ -24,9 +24,19 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Obsidian extends Solid{
+
+	protected $id = self::OBSIDIAN;
+
 	public function __construct(){
-		parent::__construct(self::OBSIDIAN, 0, "Obsidian");
+
-		$this->hardness = 6000;
+	}
+
+	public function getName(){
+		return "Obsidian";
+	}
+
+	public function getHardness(){
+		return 6000;
 	}
 
 	public function getBreakTime(Item $item){

src/pocketmine/block/Planks.php

@@ -30,18 +30,28 @@ class Planks extends Solid{
 	const ACACIA = 4;
 	const DARK_OAK = 5;
 
+	protected $id = self::WOODEN_PLANKS;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::PLANKS, $meta, "Wood Planks");
+		$this->meta = $meta;
-		$names = [
+	}
+
+	public function getHardness(){
+		return 15;
+	}
+
+	public function getName(){
+		static $names = [
 			self::OAK => "Oak Wood Planks",
 			self::SPRUCE => "Spruce Wood Planks",
 			self::BIRCH => "Birch Wood Planks",
 			self::JUNGLE => "Jungle Wood Planks",
 			self::ACACIA => "Acacia Wood Planks",
 			self::DARK_OAK => "Jungle Wood Planks",
+			"",
+			""
 		];
-		$this->name = $names[$this->meta & 0x07];
+		return $names[$this->meta & 0x07];
-		$this->hardness = 15;
 	}
 
 }

src/pocketmine/block/Podzol.php

@@ -22,8 +22,18 @@
 namespace pocketmine\block;
 
 class Podzol extends Solid{
+
+	protected $id = self::PODZOL;
+
 	public function __construct(){
-		parent::__construct(self::PODZOL, 0, "Podzol");	
+
-		$this->hardness = 2.5;
+	}
+
+	public function getName(){
+		return "Podzol";
+	}
+
+	public function getHardness(){
+		return 2.5;
 	}
 }

src/pocketmine/block/Poppy.php

@@ -25,20 +25,22 @@ use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\Player;
 
-class CyanFlower extends Flowable{
+class Poppy extends Flowable{
-	public function __construct(){
+
-		parent::__construct(self::POPPY, 0, "Cyan Flower");
+	protected $id = self::POPPY;
-		$this->hardness = 0;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getBoundingBox(){
+	public function getName(){
-		return null;
+		return "Poppy";
 	}
 
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
-		if($down->getID() === 2 or $down->getID() === 3 or $down->getID() === 60){
+		if($down->getId() === 2 or $down->getId() === 3 or $down->getId() === 60){
 			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
@@ -49,7 +51,7 @@ class CyanFlower extends Flowable{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){
+			if($this->getSide(0)->isTransparent() === true){
 				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;

src/pocketmine/block/Potato.php

@@ -24,8 +24,15 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Potato extends Crops{
+
+	protected $id = self::POTATO_BLOCK;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::POTATO_BLOCK, $meta, "Potato Block");
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Potato Block";
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Pumpkin.php

@@ -25,9 +25,19 @@ use pocketmine\item\Item;
 use pocketmine\Player;
 
 class Pumpkin extends Solid{
+
+	protected $id = self::PUMPKIN;
+
 	public function __construct(){
-		parent::__construct(self::PUMPKIN, "Pumpkin");
+
-		$this->hardness = 5;
+	}
+
+	public function getHardness(){
+		return 5;
+	}
+
+	public function getName(){
+		return "Pumpkin";
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){

src/pocketmine/block/PumpkinStem.php

@@ -27,13 +27,20 @@ use pocketmine\level\Level;
 use pocketmine\Server;
 
 class PumpkinStem extends Crops{
+
+	protected $id = self::PUMPKIN_STEM;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::PUMPKIN_STEM, $meta, "Pumpkin Stem");
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Pumpkin Stem";
 	}
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){
+			if($this->getSide(0)->isTransparent() === true){
 				$this->getLevel()->useBreakOn($this);
 				return Level::BLOCK_UPDATE_NORMAL;
 			}
@@ -51,13 +58,13 @@ class PumpkinStem extends Crops{
 				}else{
 					for($side = 2; $side <= 5; ++$side){
 						$b = $this->getSide($side);
-						if($b->getID() === self::PUMPKIN){
+						if($b->getId() === self::PUMPKIN){
 							return Level::BLOCK_UPDATE_RANDOM;
 						}
 					}
 					$side = $this->getSide(mt_rand(2, 5));
 					$d = $side->getSide(0);
-					if($side->getID() === self::AIR and ($d->getID() === self::FARMLAND or $d->getID() === self::GRASS or $d->getID() === self::DIRT)){
+					if($side->getId() === self::AIR and ($d->getId() === self::FARMLAND or $d->getId() === self::GRASS or $d->getId() === self::DIRT)){
 						Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($side, new Pumpkin()));
 						if(!$ev->isCancelled()){
 							$this->getLevel()->setBlock($side, $ev->getNewState(), true);