Updated RakLib protocol

Fix wrong size increasing code.

.gitignore

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

.gitmodules

@@ -9,3 +9,9 @@
 [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
+[submodule "src/pocketmine/lang/locale"]
+	path = src/pocketmine/lang/locale
+	url = https://github.com/PocketMine/PocketMine-Language.git

.mailmap

@@ -0,0 +1,5 @@
+Shoghi Cervantes <shoghicp@gmail.com>
+Shoghi Cervantes <shoghicp@gmail.com> Shoghi Cervantes <shoghicp@pocketmine.net>
+Brandon V <brandon15811@gmail.com>
+Michael Yoo <sekjun9878@gmail.com> Michael Yoo <michael@yoo.id.au>
+Michael Yoo <sekjun9878@gmail.com> Michael Yoo <sekjun9878@sekjun9878.info>

.travis.yml

@@ -1,23 +1,21 @@
 language: php
 
 php:
- - 5.4
- - 5.5
  - 5.6
 
 branches:
-  except:
+ - master
-    - Core-Rewrite
-    - master
-    - 0.9.0
 
 before_script:
- - pecl install channel://pecl.php.net/pthreads-2.0.4
+ - 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.6
  - echo | pecl install channel://pecl.php.net/yaml-1.1.1
 
 script:
- - php src/tests/ServerSuiteTest.php --no-wizard
+ - php tests/TravisTest.php
  
 notifications:
  email: false
- webhooks: http://n.tkte.ch/h/214/wsNvmG43-ncxUVRrFPwSM-r0
+ #webhooks: http://n.tkte.ch/h/214/wsNvmG43-ncxUVRrFPwSM-r0

CONTRIBUTING.md

@@ -34,14 +34,13 @@ You must follow these guidelines if you wish to contribute to the PocketMine-MP
 It is mainly [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-1-basic-coding-standard.md) with a few exceptions.
 * Opening braces MUST go on the same line, and MUST NOT have spaces before.
 * `else if` MUST be written as `elseif`. _(It is in PSR-2, but using a SHOULD)_
-* Control structure keywords or opening braces MUST NOT have one space after them.
+* Control structure keywords or opening braces MUST NOT have one space before or after them.
 * Code MUST use tabs for indenting.
 * Long arrays MAY be split across multiple lines, where each subsequent line is indented once. 
 * Files MUST use only the `<?php` tag.
 * Files MUST NOT have an ending `?>` tag.
 * Code MUST use namespaces.
 * Strings SHOULD use the double quote `"` except when the single quote is required.
-* Argument lists MAY NOT be split across multiple lines, except long arrays.
 
 ```php
 <?php 
@@ -72,6 +71,19 @@ class ExampleClass{
 
 }
 ```
+
+### RFC and Voting
+* These are big Pull Requests or contributions that change important behavior.
+* RFCs will be tagged with the *PR: RFC* label
+* A vote will be held once the RFC is ready. All users can vote commenting on the Pull Request
+* Comments MUST use "Yes" or "No" on the FIRST sentence to signify the vote, except when they don't want it to be counted.
+* If your comment is a voting comment, specify the reason of your vote or it won't be counted.
+* After voting has been closed, no further votes will be counted.
+* An RFC will be rejected if less than 50% + 1 (simple majority) has voted Yes.
+* If the RFC is approved, Team Members have the final word on its implementation or rejection.
+* RFCs with complex voting options will specify the vote percentage or other details.
+
+
 ## Bug Tracking for Collaborators
 
 ### Labels
@@ -91,6 +103,7 @@ Category labels are prefixed by `C:`. Multiple category labels may be applied to
 Pull Requests are prefixed by `PR:`. Only one label may be applied for a Pull Request.
  - PR: Bug Fix - This label is applied when the Pull Request fixes a bug. 
  - PR: Contribution - This label is applied when the Pull Request contributes code to PocketMine-MP such as a new feature or an improvement.
+ - PR: RFC - Request for Comments
 
 #### Status
 Status labels show the status of the issue. Multiple status labels may be applied.

src/pocketmine/Achievement.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
@@ -14,13 +14,14 @@
  * (at your option) any later version.
  *
  * @author PocketMine Team
-
+ * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine;
 
+use pocketmine\event\TranslationContainer;
 use pocketmine\utils\TextFormat;
 
 /**
@@ -106,10 +107,11 @@ abstract class Achievement{
 
 	public static function broadcast(Player $player, $achievementId){
 		if(isset(Achievement::$list[$achievementId])){
+			$translation = new TranslationContainer("chat.type.achievement", [$player->getDisplayName(), TextFormat::GREEN . Achievement::$list[$achievementId]["name"]]);
 			if(Server::getInstance()->getConfigString("announce-player-achievements", true) === true){
-				Server::getInstance()->broadcastMessage($player->getDisplayName() . " has just earned the achievement " . TextFormat::GREEN . Achievement::$list[$achievementId]["name"]);
+				Server::getInstance()->broadcastMessage($translation);
 			}else{
-				$player->sendMessage("You have just earned the achievement " . TextFormat::GREEN . Achievement::$list[$achievementId]["name"]);
+				$player->sendMessage($translation);
 			}
 
 			return true;

src/pocketmine/CrashDump.php

@@ -14,7 +14,7 @@
  * (at your option) any later version.
  *
  * @author PocketMine Team
-
+ * @link http://www.pocketmine.net/
  *
  *
 */
@@ -22,6 +22,7 @@
 namespace pocketmine;
 
 use pocketmine\network\protocol\Info;
+use pocketmine\plugin\PluginBase;
 use pocketmine\plugin\PluginLoadOrder;
 use pocketmine\utils\Utils;
 use pocketmine\utils\VersionString;
@@ -41,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();
@@ -136,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",
@@ -179,7 +183,7 @@ class CrashDump{
 			$this->addLine("THIS CRASH WAS CAUSED BY A PLUGIN");
 			$this->data["plugin"] = true;
 
-			$reflection = new \ReflectionClass("pocketmine\\plugin\\PluginBase");
+			$reflection = new \ReflectionClass(PluginBase::class);
 			$file = $reflection->getProperty("file");
 			$file->setAccessible(true);
 			foreach($this->server->getPluginManager()->getPlugins() as $plugin){
@@ -228,7 +232,7 @@ class CrashDump{
 		$this->data["general"]["zend"] = zend_version();
 		$this->data["general"]["php_os"] = PHP_OS;
 		$this->data["general"]["os"] = Utils::getOS();
-		$this->addLine("PocketMine-MP version: " . $version->get(false) . " #" . $version->getNumber() . " [Protocol " . Info::CURRENT_PROTOCOL . "; API " . API_VERSION . "]");
+		$this->addLine("PocketMine-MP version: " . $version->get(false) . " #" . $version->getBuild() . " [Protocol " . Info::CURRENT_PROTOCOL . "; API " . API_VERSION . "]");
 		$this->addLine("Git commit: " . GIT_COMMIT);
 		$this->addLine("uname -a: " . php_uname("a"));
 		$this->addLine("PHP Version: " . phpversion());

src/pocketmine/MemoryManager.php

@@ -0,0 +1,422 @@
+<?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;
+
+use pocketmine\event\server\LowMemoryEvent;
+use pocketmine\event\Timings;
+use pocketmine\scheduler\GarbageCollectionTask;
+use pocketmine\utils\Utils;
+use pocketmine\utils\UUID;
+
+class MemoryManager{
+
+	/** @var Server */
+	private $server;
+
+	private $memoryLimit;
+	private $globalMemoryLimit;
+	private $checkRate;
+	private $checkTicker = 0;
+	private $lowMemory = false;
+
+	private $continuousTrigger = true;
+	private $continuousTriggerRate;
+	private $continuousTriggerCount = 0;
+	private $continuousTriggerTicker = 0;
+
+	private $garbageCollectionPeriod;
+	private $garbageCollectionTicker = 0;
+	private $garbageCollectionTrigger;
+	private $garbageCollectionAsync;
+
+	private $chunkLimit;
+	private $chunkCollect;
+	private $chunkTrigger;
+
+	private $chunkCache;
+	private $cacheTrigger;
+
+	/** @var \WeakRef[] */
+	private $leakWatch = [];
+
+	private $leakInfo = [];
+
+	private $leakSeed = 0;
+
+	public function __construct(Server $server){
+		$this->server = $server;
+
+		$this->init();
+	}
+
+	private function init(){
+		$this->memoryLimit = ((int) $this->server->getProperty("memory.main-limit", 0)) * 1024 * 1024;
+
+		$defaultMemory = 1024;
+
+		if(preg_match("/([0-9]+)([KMGkmg])/", $this->server->getConfigString("memory-limit", ""), $matches) > 0){
+			$m = (int) $matches[1];
+			if($m <= 0){
+				$defaultMemory = 0;
+			}else{
+				switch(strtoupper($matches[2])){
+					case "K":
+						$defaultMemory = $m / 1024;
+						break;
+					case "M":
+						$defaultMemory = $m;
+						break;
+					case "G":
+						$defaultMemory = $m * 1024;
+						break;
+					default:
+						$defaultMemory = $m;
+						break;
+				}
+			}
+		}
+
+		$hardLimit = ((int) $this->server->getProperty("memory.main-hard-limit", $defaultMemory));
+
+		if($hardLimit <= 0){
+			ini_set("memory_limit", -1);
+		}else{
+			ini_set("memory_limit", $hardLimit . "M");
+		}
+
+		$this->globalMemoryLimit = ((int) $this->server->getProperty("memory.global-limit", 0)) * 1024 * 1024;
+		$this->checkRate = (int) $this->server->getProperty("memory.check-rate", 20);
+		$this->continuousTrigger = (bool) $this->server->getProperty("memory.continuous-trigger", true);
+		$this->continuousTriggerRate = (int) $this->server->getProperty("memory.continuous-trigger-rate", 30);
+
+		$this->garbageCollectionPeriod = (int) $this->server->getProperty("memory.garbage-collection.period", 36000);
+		$this->garbageCollectionTrigger = (bool) $this->server->getProperty("memory.garbage-collection.low-memory-trigger", true);
+		$this->garbageCollectionAsync = (bool) $this->server->getProperty("memory.garbage-collection.collect-async-worker", true);
+
+		$this->chunkLimit = (int) $this->server->getProperty("memory.max-chunks.trigger-limit", 96);
+		$this->chunkCollect = (bool) $this->server->getProperty("memory.max-chunks.trigger-chunk-collect", true);
+		$this->chunkTrigger = (bool) $this->server->getProperty("memory.max-chunks.low-memory-trigger", true);
+
+		$this->chunkCache = (bool) $this->server->getProperty("memory.world-caches.disable-chunk-cache", true);
+		$this->cacheTrigger = (bool) $this->server->getProperty("memory.world-caches.low-memory-trigger", true);
+
+		gc_enable();
+	}
+
+	public function isLowMemory(){
+		return $this->lowMemory;
+	}
+
+	public function canUseChunkCache(){
+		return !($this->lowMemory and $this->chunkTrigger);
+	}
+
+	public function getViewDistance($distance){
+		return $this->lowMemory ? min($this->chunkLimit, $distance) : $distance;
+	}
+
+	public function trigger($memory, $limit, $global = false, $triggerCount = 0){
+		$this->server->getLogger()->debug("[Memory Manager] ".($global ? "Global " : "") ."Low memory triggered, limit ". round(($limit / 1024) / 1024, 2)."MB, using ". round(($memory / 1024) / 1024, 2)."MB");
+
+		if($this->cacheTrigger){
+			foreach($this->server->getLevels() as $level){
+				$level->clearCache(true);
+			}
+		}
+
+		if($this->chunkTrigger and $this->chunkCollect){
+			foreach($this->server->getLevels() as $level){
+				$level->doChunkGarbageCollection();
+			}
+		}
+
+		$ev = new LowMemoryEvent($memory, $limit, $global, $triggerCount);
+		$this->server->getPluginManager()->callEvent($ev);
+
+		$cycles = 0;
+		if($this->garbageCollectionTrigger){
+			$cycles = $this->triggerGarbageCollector();
+		}
+
+		$this->server->getLogger()->debug("[Memory Manager] Freed " . round(($ev->getMemoryFreed() / 1024) / 1024, 2)."MB, $cycles cycles");
+	}
+
+	public function check(){
+		Timings::$memoryManagerTimer->startTiming();
+
+		if(($this->memoryLimit > 0 or $this->globalMemoryLimit > 0) and ++$this->checkTicker >= $this->checkRate){
+			$this->checkTicker = 0;
+			$memory = Utils::getMemoryUsage(true);
+			$trigger = false;
+			if($this->memoryLimit > 0 and $memory[0] > $this->memoryLimit){
+				$trigger = 0;
+			}elseif($this->globalMemoryLimit > 0 and $memory[1] > $this->globalMemoryLimit){
+				$trigger = 1;
+			}
+
+			if($trigger !== false){
+				if($this->lowMemory and $this->continuousTrigger){
+					if(++$this->continuousTriggerTicker >= $this->continuousTriggerRate){
+						$this->continuousTriggerTicker = 0;
+						$this->trigger($memory[$trigger], $this->memoryLimit, $trigger > 0, ++$this->continuousTriggerCount);
+					}
+				}else{
+					$this->lowMemory = true;
+					$this->continuousTriggerCount = 0;
+					$this->trigger($memory[$trigger], $this->memoryLimit, $trigger > 0);
+				}
+			}else{
+				$this->lowMemory = false;
+			}
+		}
+
+		if($this->garbageCollectionPeriod > 0 and ++$this->garbageCollectionTicker >= $this->garbageCollectionPeriod){
+			$this->garbageCollectionTicker = 0;
+			$this->triggerGarbageCollector();
+		}
+
+		Timings::$memoryManagerTimer->stopTiming();
+	}
+
+	public function triggerGarbageCollector(){
+		Timings::$garbageCollectorTimer->startTiming();
+
+		if($this->garbageCollectionAsync){
+			$size = $this->server->getScheduler()->getAsyncTaskPoolSize();
+			for($i = 0; $i < $size; ++$i){
+				$this->server->getScheduler()->scheduleAsyncTaskToWorker(new GarbageCollectionTask(), $i);
+			}
+		}
+
+		$cycles = gc_collect_cycles();
+
+		Timings::$garbageCollectorTimer->stopTiming();
+
+		return $cycles;
+	}
+
+	/**
+	 * @param object $object
+	 *
+	 * @return string Object identifier for future checks
+	 */
+	public function addObjectWatcher($object){
+		if(!is_object($object)){
+			throw new \InvalidArgumentException("Not an object!");
+		}
+
+
+		$identifier = spl_object_hash($object) . ":" . get_class($object);
+
+		if(isset($this->leakInfo[$identifier])){
+			return $this->leakInfo["id"];
+		}
+
+		$this->leakInfo[$identifier] = [
+			"id" => $id = md5($identifier . ":" . $this->leakSeed++),
+			"class" => get_class($object),
+			"hash" => $identifier
+		];
+		$this->leakInfo[$id] = $this->leakInfo[$identifier];
+
+		$this->leakWatch[$id] = new \WeakRef($object);
+
+		return $id;
+	}
+
+	public function isObjectAlive($id){
+		if(isset($this->leakWatch[$id])){
+			return $this->leakWatch[$id]->valid();
+		}
+
+		return false;
+	}
+
+	public function removeObjectWatch($id){
+		if(!isset($this->leakWatch[$id])){
+			return;
+		}
+		unset($this->leakInfo[$this->leakInfo[$id]["hash"]]);
+		unset($this->leakInfo[$id]);
+		unset($this->leakWatch[$id]);
+	}
+
+	public function doObjectCleanup(){
+		foreach($this->leakWatch as $id => $w){
+			if(!$w->valid()){
+				$this->removeObjectWatch($id);
+			}
+		}
+	}
+
+	public function getObjectInformation($id, $includeObject = false){
+		if(!isset($this->leakWatch[$id])){
+			return null;
+		}
+
+		$valid = false;
+		$references = 0;
+		$object = null;
+
+		if($this->leakWatch[$id]->acquire()){
+			$object = $this->leakWatch[$id]->get();
+			$this->leakWatch[$id]->release();
+
+			$valid = true;
+			$references = getReferenceCount($object, false);
+		}
+
+		return [
+			"id" => $id,
+			"class" => $this->leakInfo[$id]["class"],
+			"hash" => $this->leakInfo[$id]["hash"],
+			"valid" => $valid,
+			"references" => $references,
+			"object" => $includeObject ? $object : null
+		];
+	}
+
+	public function dumpServerMemory($outputFolder, $maxNesting, $maxStringSize){
+		gc_disable();
+
+		if(!file_exists($outputFolder)){
+			mkdir($outputFolder, 0777, true);
+		}
+
+		$this->server->getLogger()->notice("[Dump] After the memory dump is done, the server might crash");
+
+		$obData = fopen($outputFolder . "/objects.js", "wb+");
+
+		$staticProperties = [];
+
+		$data = [];
+
+		$objects = [];
+
+		$refCounts = [];
+
+		$this->continueDump($this->server, $data, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
+
+		do{
+			$continue = false;
+			foreach($objects as $hash => $object){
+				if(!is_object($object)){
+					continue;
+				}
+				$continue = true;
+
+				$className = get_class($object);
+
+				$objects[$hash] = true;
+
+				$reflection = new \ReflectionObject($object);
+
+				$info = [
+					"information" => "$hash@$className",
+					"properties" => []
+				];
+
+				if($reflection->getParentClass()){
+					$info["parent"] = $reflection->getParentClass()->getName();
+				}
+
+				if(count($reflection->getInterfaceNames()) > 0){
+					$info["implements"] = implode(", ", $reflection->getInterfaceNames());
+				}
+
+				foreach($reflection->getProperties() as $property){
+					if($property->isStatic()){
+						continue;
+					}
+
+					if(!$property->isPublic()){
+						$property->setAccessible(true);
+					}
+					$this->continueDump($property->getValue($object), $info["properties"][$property->getName()], $objects, $refCounts, 0, $maxNesting, $maxStringSize);
+				}
+
+				fwrite($obData, "$hash@$className: ". json_encode($info, JSON_UNESCAPED_SLASHES) . "\n");
+
+				if(!isset($objects["staticProperties"][$className])){
+					$staticProperties[$className] = [];
+					foreach($reflection->getProperties() as $property){
+						if(!$property->isStatic() or $property->getDeclaringClass()->getName() !== $className){
+							continue;
+						}
+
+						if(!$property->isPublic()){
+							$property->setAccessible(true);
+						}
+						$this->continueDump($property->getValue($object), $staticProperties[$className][$property->getName()], $objects, $refCounts, 0, $maxNesting, $maxStringSize);
+					}
+				}
+			}
+
+			echo "[Dump] Wrote " . count($objects) . " objects\n";
+		}while($continue);
+
+		file_put_contents($outputFolder . "/staticProperties.js", json_encode($staticProperties, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+		file_put_contents($outputFolder . "/serverEntry.js", json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+		file_put_contents($outputFolder . "/referenceCounts.js", json_encode($refCounts, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+
+		echo "[Dump] Finished!\n";
+
+		gc_enable();
+
+		$this->server->forceShutdown();
+	}
+
+	private function continueDump($from, &$data, &$objects, &$refCounts, $recursion, $maxNesting, $maxStringSize){
+		if($maxNesting <= 0){
+			$data = "(error) NESTING LIMIT REACHED";
+			return;
+		}
+
+		--$maxNesting;
+
+		if(is_object($from)){
+			if(!isset($objects[$hash = spl_object_hash($from)])){
+				$objects[$hash] = $from;
+				$refCounts[$hash] = 0;
+			}
+
+			++$refCounts[$hash];
+
+			$data = "(object) $hash@" . get_class($from);
+		}elseif(is_array($from)){
+			if($recursion >= 5){
+				$data = "(error) ARRAY RECURSION LIMIT REACHED";
+				return;
+			}
+			$data = [];
+			foreach($from as $key => $value){
+				$this->continueDump($value, $data[$key], $objects, $refCounts, $recursion + 1, $maxNesting, $maxStringSize);
+			}
+		}elseif(is_string($from)){
+			$data = "(string) len(".strlen($from).") " . substr(Utils::printable($from), 0, $maxStringSize);
+		}elseif(is_resource($from)){
+			$data = "(resource) " . print_r($from, true);
+		}else{
+			$data = $from;
+		}
+	}
+}

src/pocketmine/PocketMine.php

@@ -34,7 +34,7 @@ namespace {
 					}
 					echo str_repeat("  ", $cnt) . "}" . PHP_EOL;
 					break;
-				case is_integer($var):
+				case is_int($var):
 					echo str_repeat("  ", $cnt) . "int(" . $var . ")" . PHP_EOL;
 					break;
 				case is_float($var):
@@ -65,17 +65,25 @@ namespace {
 }
 
 namespace pocketmine {
-	use LogLevel;
 	use pocketmine\utils\Binary;
 	use pocketmine\utils\MainLogger;
+	use pocketmine\utils\ServerKiller;
+	use pocketmine\utils\Terminal;
 	use pocketmine\utils\Utils;
 	use pocketmine\wizard\Installer;
-	use raklib\RakLib;
 
-	const VERSION = "Alpha_1.4dev";
+	const VERSION = "1.5dev";
-	const API_VERSION = "1.3.1";
+	const API_VERSION = "1.12.0";
-	const CODENAME = "絶好(Zekkou)ケーキ(Cake)";
+	const CODENAME = "活発(Kappatsu)フグ(Fugu)";
-	const MINECRAFT_VERSION = "v0.9.5 alpha";
+	const MINECRAFT_VERSION = "v0.11.0 alpha";
+	const MINECRAFT_VERSION_NETWORK = "0.11.0";
+
+	/*
+	 * Startup code. Do not look at it, it may harm you.
+	 * Most of them are hacks to fix date-related bugs, or basic functions used after this
+	 * This is the only non-class based file on this project.
+	 * Enjoy it as much as I did writing it. I don't want to do it again.
+	 */
 
 	if(\Phar::running(true) !== ""){
 		@define("pocketmine\\PATH", \Phar::running(true) . "/");
@@ -90,6 +98,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");
@@ -99,45 +108,10 @@ namespace pocketmine {
 	$autoloader->addPath(\pocketmine\PATH . "src");
 	$autoloader->addPath(\pocketmine\PATH . "src" . DIRECTORY_SEPARATOR . "spl");
 	$autoloader->register(true);
-	if(!class_exists("raklib\\RakLib", false)){
-		require(\pocketmine\PATH . "src/raklib/raklib/RakLib.php");
-	}
-	RakLib::bootstrap($autoloader);
 
-	//Startup code. Do not look at it, it can harm you. Most of them are hacks to fix date-related bugs, or basic functions used after this
 
 	set_time_limit(0); //Who set it to 30 seconds?!?!
 
-	if(ini_get("date.timezone") == ""){ //No Timezone set
-		date_default_timezone_set("GMT");
-		if(strpos(" " . strtoupper(php_uname("s")), " WIN") !== false){
-			$time = time();
-			$time -= $time % 60;
-			//TODO: Parse different time & date formats by region. ¬¬ world
-			//Example: USA
-			@exec("time.exe /T", $hour);
-			$i = array_map("intval", explode(":", trim($hour[0])));
-			@exec("date.exe /T", $date);
-			$j = array_map("intval", explode(substr($date[0], 2, 1), trim($date[0])));
-			$offset = @round((mktime($i[0], $i[1], 0, $j[1], $j[0], $j[2]) - $time) / 60) * 60;
-		}else{
-			@exec("date +%s", $t);
-			$offset = @round((intval(trim($t[0])) - time()) / 60) * 60;
-		}
-
-		$daylight = (int) date("I");
-		$d = timezone_name_from_abbr("", $offset, $daylight);
-		@ini_set("date.timezone", $d);
-		date_default_timezone_set($d);
-	}else{
-		$d = @date_default_timezone_get();
-		if(strpos($d, "/") === false){
-			$d = timezone_name_from_abbr($d);
-			@ini_set("date.timezone", $d);
-			date_default_timezone_set($d);
-		}
-	}
-
 	gc_enable();
 	error_reporting(-1);
 	ini_set("allow_url_fopen", 1);
@@ -145,18 +119,182 @@ 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"]);
+	$opts = getopt("", ["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", ((strpos(strtoupper(php_uname("s")), "WIN") === false or isset($opts["enable-ansi"])) and !isset($opts["disable-ansi"])));
+	Terminal::init();
 
+	define("pocketmine\\ANSI", Terminal::hasFormattingCodes());
+
+	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);
 
+	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 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'])
+			){
+				//Again, for redundancy.
+				ini_set("date.timezone", $ip_geolocation_data['timezone']);
+			}else{
+				ini_set("date.timezone", "UTC");
+				date_default_timezone_set("UTC");
+				$logger->warning("Timezone could not be automatically determined. An incorrect timezone will result in incorrect timestamps on console logs. It has been set to \"UTC\" by default. You can change it on the php.ini file.");
+			}
+		}
+	}else{
+		/*
+		 * 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){
+			$default_timezone = timezone_name_from_abbr($default_timezone);
+			ini_set("date.timezone", $default_timezone);
+			date_default_timezone_set($default_timezone);
+		}
+	}
+
+	function detect_system_timezone(){
+		switch(Utils::getOS()){
+			case 'win':
+				$regex = '/(UTC)(\+*\-*\d*\d*\:*\d*\d*)/';
+
+				/*
+				 * 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
+				preg_match($regex, $string, $matches);
+
+				if(!isset($matches[2])){
+					return false;
+				}
+
+				$offset = $matches[2];
+
+				if($offset == ""){
+					return "UTC";
+				}
+
+				return parse_offset($offset);
+				break;
+			case 'linux':
+				// Ubuntu / Debian.
+				if(file_exists('/etc/timezone')){
+					$data = file_get_contents('/etc/timezone');
+					if($data){
+						return trim($data);
+					}
+				}
+
+				// RHEL / CentOS
+				if(file_exists('/etc/sysconfig/clock')){
+					$data = parse_ini_file('/etc/sysconfig/clock');
+					if(!empty($data['ZONE'])){
+						return trim($data['ZONE']);
+					}
+				}
+
+				//Portable method for incompatible linux distributions.
+
+				$offset = trim(exec('date +%:z'));
+
+				if($offset == "+00:00"){
+					return "UTC";
+				}
+
+				return parse_offset($offset);
+				break;
+			case 'mac':
+				if(is_link('/etc/localtime')){
+					$filename = readlink('/etc/localtime');
+					if(strpos($filename, '/usr/share/zoneinfo/') === 0){
+						$timezone = substr($filename, 20);
+						return trim($timezone);
+					}
+				}
+
+				return false;
+				break;
+			default:
+				return false;
+				break;
+		}
+	}
+
+	/**
+	 * @param string $offset In the format of +09:00, +02:00, -04:00 etc.
+	 *
+	 * @return string
+	 */
+	function parse_offset($offset){
+		//Make signed offsets unsigned for date_parse
+		if(strpos($offset, '-') !== false){
+			$negative_offset = true;
+			$offset = str_replace('-', '', $offset);
+		}else{
+			if(strpos($offset, '+') !== false){
+				$negative_offset = false;
+				$offset = str_replace('+', '', $offset);
+			}else{
+				return false;
+			}
+		}
+
+		$parsed = date_parse($offset);
+		$offset = $parsed['hour'] * 3600 + $parsed['minute'] * 60 + $parsed['second'];
+
+		//After date_parse is done, put the sign back
+		if($negative_offset == true){
+			$offset = -abs($offset);
+		}
+
+		//And then, look the offset up.
+		//timezone_name_from_abbr is not used because it returns false on some(most) offsets because it's mapping function is weird.
+		//That's been a bug in PHP since 2008!
+		foreach(timezone_abbreviations_list() as $zones){
+			foreach($zones as $timezone){
+				if($timezone['offset'] == $offset){
+					return $timezone['timezone_id'];
+				}
+			}
+		}
+
+		return false;
+	}
+
 	if(isset($opts["enable-profiler"])){
 		if(function_exists("profiler_enable")){
 			\profiler_enable();
@@ -178,6 +316,24 @@ namespace pocketmine {
 		}
 	}
 
+	/**
+	 * @param object $value
+	 * @param bool   $includeCurrent
+	 *
+	 * @return int
+	 */
+	function getReferenceCount($value, $includeCurrent = true){
+		ob_start();
+		debug_zval_dump($value);
+		$ret = explode("\n", ob_get_contents());
+		ob_end_clean();
+
+		if(count($ret) >= 1 and preg_match('/^.* refcount\\(([0-9]+)\\)\\{$/', trim($ret[0]), $m) > 0){
+			return ((int) $m[1]) - ($includeCurrent ? 3 : 4); //$value + zval call + extra call
+		}
+		return -1;
+	}
+
 	function getTrace($start = 1, $trace = null){
 		if($trace === null){
 			if(function_exists("xdebug_get_function_stack")){
@@ -199,10 +355,10 @@ 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()" : Utils::printable(@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) . ")";
+			$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"] . "(" . Utils::printable(substr($params, 0, -2)) . ")";
 		}
 
 		return $messages;
@@ -212,54 +368,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, $trace = null){
+	set_error_handler([\ExceptionHandler::class, "handler"], -1);
-		global $lastError;
-		if(error_reporting() === 0){ //@ error-control
-			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_WARNING or $errno === E_USER_ERROR or $errno === E_USER_WARNING) ? LogLevel::ERROR : 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;
 
@@ -282,8 +391,8 @@ namespace pocketmine {
 	if(substr_count($pthreads_version, ".") < 2){
 		$pthreads_version = "0.$pthreads_version";
 	}
-	if(version_compare($pthreads_version, "2.0.4") < 0){
+	if(version_compare($pthreads_version, "2.0.9") < 0){
-		$logger->critical("pthreads >= 2.0.4 is required, while you have $pthreads_version.");
+		$logger->critical("pthreads >= 2.0.9 is required, while you have $pthreads_version.");
 		++$errors;
 	}
 
@@ -347,7 +456,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.");
 	}
 
@@ -357,30 +466,19 @@ namespace pocketmine {
 	$logger->info("Stopping other threads");
 
 	foreach(ThreadManager::getInstance()->getAll() as $id => $thread){
-		if($thread->isRunning()){
+		$logger->debug("Stopping " . (new \ReflectionClass($thread))->getShortName() . " thread");
-			$logger->debug("Stopping " . (new \ReflectionClass($thread))->getShortName() . " thread");
+		$thread->quit();
-			if($thread instanceof Thread){
-				$thread->kill();
-
-				if($thread->isRunning() or !$thread->join()){
-					$thread->detach();
-				}
-			}elseif($thread instanceof Worker){
-				$thread->kill();
-				sleep(1);
-				if($thread->isRunning() or !$thread->join()){
-					$thread->detach();
-				}
-			}
-		}elseif(!$thread->isJoined()){
-			$logger->debug("Joining " . (new \ReflectionClass($thread))->getShortName() . " thread");
-			$thread->join();
-		}
 	}
 
+	$killer = new ServerKiller(8);
+	$killer->start();
+	$killer->detach();
+
 	$logger->shutdown();
 	$logger->join();
 
+	echo Terminal::$FORMAT_RESET . "\n";
+
 	exit(0);
 
 }

src/pocketmine/Thread.php

@@ -26,9 +26,66 @@ namespace pocketmine;
  */
 abstract class Thread extends \Thread{
 
-	public final function start($options = PTHREADS_INHERIT_ALL){
+	/** @var \ClassLoader */
+	protected $classLoader;
+
+	public function getClassLoader(){
+		return $this->classLoader;
+	}
+
+	public function setClassLoader(\ClassLoader $loader = null){
+		if($loader === null){
+			$loader = Server::getInstance()->getLoader();
+		}
+		$this->classLoader = $loader;
+	}
+
+	public function registerClassLoader(){
+		if(!interface_exists("ClassLoader", false)){
+			require(\pocketmine\PATH . "src/spl/ClassLoader.php");
+			require(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
+			require(\pocketmine\PATH . "src/pocketmine/CompatibleClassLoader.php");
+		}
+		if($this->classLoader !== null){
+			$this->classLoader->register(true);
+		}
+	}
+
+	public function start($options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
-		return parent::start($options & ~PTHREADS_INHERIT_CLASSES);
+		if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated()){
+			if($this->getClassLoader() === null){
+				$this->setClassLoader();
+			}
+			return parent::start($options);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Stops the thread using the best way possible. Try to stop it yourself before calling this.
+	 */
+	public function quit(){
+		if($this->isRunning()){
+			$this->kill();
+			$this->detach();
+		}elseif(!$this->isJoined()){
+			if(!$this->isTerminated()){
+				$this->join();
+			}else{
+				$this->kill();
+				$this->detach();
+			}
+		}else{
+			$this->detach();
+		}
+
+		ThreadManager::getInstance()->remove($this);
+	}
+
+	public function getThreadName(){
+		return (new \ReflectionClass($this))->getShortName();
 	}
 }

src/pocketmine/Worker.php

@@ -26,9 +26,67 @@ namespace pocketmine;
  */
 abstract class Worker extends \Worker{
 
-	public final function start($options = PTHREADS_INHERIT_ALL){
+	/** @var \ClassLoader */
+	protected $classLoader;
+
+	public function getClassLoader(){
+		return $this->classLoader;
+	}
+
+	public function setClassLoader(\ClassLoader $loader = null){
+		if($loader === null){
+			$loader = Server::getInstance()->getLoader();
+		}
+		$this->classLoader = $loader;
+	}
+
+	public function registerClassLoader(){
+		if(!interface_exists("ClassLoader", false)){
+			require(\pocketmine\PATH . "src/spl/ClassLoader.php");
+			require(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
+			require(\pocketmine\PATH . "src/pocketmine/CompatibleClassLoader.php");
+		}
+		if($this->classLoader !== null){
+			$this->classLoader->register(true);
+		}
+	}
+
+	public function start($options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
-		return parent::start($options & ~PTHREADS_INHERIT_CLASSES);
+		if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated()){
+			if($this->getClassLoader() === null){
+				$this->setClassLoader();
+			}
+			return parent::start($options);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Stops the thread using the best way possible. Try to stop it yourself before calling this.
+	 */
+	public function quit(){
+		if($this->isRunning()){
+			$this->unstack();
+			$this->kill();
+			$this->detach();
+		}elseif(!$this->isJoined()){
+			if(!$this->isTerminated()){
+				$this->join();
+			}else{
+				$this->kill();
+				$this->detach();
+			}
+		}else{
+			$this->detach();
+		}
+
+		ThreadManager::getInstance()->remove($this);
+	}
+
+	public function getThreadName(){
+		return (new \ReflectionClass($this))->getShortName();
 	}
 }

src/pocketmine/block/AcaciaWoodStairs.php

@@ -22,10 +22,18 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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){
@@ -33,4 +41,16 @@ class AcaciaWoodStairs extends Stair{
 			[$this->id, 0, 1],
 		];
 	}
+
+	public function getHardness(){
+		return 2;
+	}
+
+	public function getResistance(){
+		return 15;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
 }

src/pocketmine/block/Air.php

@@ -21,31 +21,59 @@
 
 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 canPassThrough(){
+		return true;
+	}
+
+	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;
 	}
 
+	public function getHardness(){
+		return -1;
+	}
+
+	public function getResistance(){
+		return 0;
+	}
+
 }

src/pocketmine/block/Bed.php

@@ -23,15 +23,39 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\level\Level;
-use pocketmine\network\protocol\ChatPacket;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
+use pocketmine\utils\TextFormat;
 
 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 canBeActivated(){
+		return true;
+	}
+
+	public function getHardness(){
+		return 0.2;
+	}
+
+	public function getName(){
+		return "Bed Block";
+	}
+
+	protected function recalculateBoundingBox(){
+		return new AxisAlignedBB(
+			$this->x,
+			$this->y,
+			$this->z,
+			$this->x + 1,
+			$this->y + 0.5625,
+			$this->z + 1
+		);
 	}
 
 	public function onActivate(Item $item, Player $player = null){
@@ -41,10 +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;
+			$player->sendMessage(TextFormat::GRAY . "You can only sleep at night");
-			$pk->message = "You can only sleep at night";
-			$player->dataPacket($pk);
-
 			return true;
 		}
 
@@ -55,19 +76,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;
+					$player->sendMessage(TextFormat::GRAY . "This bed is incomplete");
-					$pk->message = "This bed is incomplete";
-					$player->dataPacket($pk);
 				}
 
 				return true;
@@ -75,9 +94,7 @@ class Bed extends Transparent{
 		}
 
 		if($player instanceof Player and $player->sleepOn($b) === false){
-			$pk = new ChatPacket;
+			$player->sendMessage(TextFormat::GRAY . "This bed is occupied");
-			$pk->message = "This bed is occupied";
-			$player->dataPacket($pk);
 		}
 
 		return true;
@@ -85,7 +102,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,
@@ -95,10 +112,10 @@ 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, false, true);
+				$this->getLevel()->setBlock($block, Block::get($this->id, $meta), true, true);
-				$this->getLevel()->setBlock($next, Block::get($this->id, $meta | 0x08), true, false, true);
+				$this->getLevel()->setBlock($next, Block::get($this->id, $meta | 0x08), true, true);
 
 				return true;
 			}
@@ -114,27 +131,27 @@ 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, false, true);
+				$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, false, true);
+				$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, false, true);
+				$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, false, true);
+				$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, false, true);
+				$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, false, true);
+				$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, false, true);
+				$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, false, true);
+				$this->getLevel()->setBlock($blockWest, new Air(), true, true);
 			}
 		}
-		$this->getLevel()->setBlock($this, new Air(), true, false, true);
+		$this->getLevel()->setBlock($this, new Air(), true, true);
 
 		return true;
 	}

src/pocketmine/block/Bedrock.php

@@ -24,10 +24,23 @@ 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 -1;
+	}
+
+	public function getResistance(){
+		return 18000000;
 	}
 
 	public function isBreakable(Item $item){

src/pocketmine/block/Beetroot.php

@@ -22,65 +22,17 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\Player;
 
-class Beetroot extends Flowable{
+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;
-		$this->isActivable = true;
-		$this->hardness = 0;
 	}
 
-	public function getBoundingBox(){
+	public function getName(){
-		return null;
+		return "Beetroot Block";
-	}
-
-	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){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
-
-			return true;
-		}
-
-		return false;
-	}
-
-	public function onActivate(Item $item, Player $player = null){
-		if($item->getID() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
-			$this->meta = 0x07;
-			$this->getLevel()->setBlock($this, $this, true, false, true);
-			$item->count--;
-
-			return true;
-		}
-
-		return false;
-	}
-
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //TODO: Replace with common break method
-				$this->getLevel()->dropItem($this, Item::get(Item::BEETROOT_SEEDS, 0, 1));
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if(mt_rand(0, 2) == 1){
-				if($this->meta < 0x07){
-					++$this->meta;
-					$this->getLevel()->setBlock($this, $this, true, false, true);
-
-					return Level::BLOCK_UPDATE_RANDOM;
-				}
-			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
-			}
-		}
-
-		return false;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/BirchWoodStairs.php

@@ -22,10 +22,18 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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){
@@ -33,4 +41,16 @@ class BirchWoodStairs extends Stair{
 			[$this->id, 0, 1],
 		];
 	}
+
+	public function getHardness(){
+		return 2;
+	}
+
+	public function getResistance(){
+		return 15;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
 }

src/pocketmine/block/Bookshelf.php

@@ -22,10 +22,26 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 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 1.5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
 	}
 
 }

src/pocketmine/block/BrickStairs.php

@@ -22,9 +22,30 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 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 getHardness(){
+		return 2;
+	}
+
+	public function getResistance(){
+		return 30;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getName(){
+		return "Brick Stairs";
 	}
 
 }

src/pocketmine/block/Bricks.php

@@ -22,28 +22,30 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Bricks extends Solid{
+
+	protected $id = self::BRICKS_BLOCK;
+
 	public function __construct(){
-		parent::__construct(self::BRICKS_BLOCK, 0, "Bricks");
+
-		$this->hardness = 30;
 	}
 
-	public function getBreakTime(Item $item){
+	public function getHardness(){
-		switch($item->isPickaxe()){
+		return 2;
-			case 5:
+	}
-				return 0.4;
+
-			case 4:
+	public function getResistance(){
-				return 0.5;
+		return 30;
-			case 3:
+	}
-				return 0.75;
+
-			case 2:
+	public function getToolType(){
-				return 0.25;
+		return Tool::TYPE_PICKAXE;
-			case 1:
+	}
-				return 1.5;
+
-			default:
+	public function getName(){
-				return 10;
+		return "Bricks";
-		}
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/BrownMushroom.php

@@ -26,16 +26,25 @@ 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){ //Replace with common break method
+			if($this->getSide(0)->isTransparent() === true){
-				$this->getLevel()->dropItem($this, Item::get($this->id));
+				$this->getLevel()->useBreakOn($this);
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}
@@ -46,8 +55,8 @@ 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, false, true);
+			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
 		}

src/pocketmine/block/BurningFurnace.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Enum;
@@ -32,10 +33,31 @@ 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 3.5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getLightLevel(){
+		return 13;
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
@@ -46,8 +68,8 @@ class BurningFurnace extends Solid{
 			3 => 3,
 		];
 		$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0];
-		$this->getLevel()->setBlock($block, $this, true, false, true);
+		$this->getLevel()->setBlock($block, $this, true, true);
-		$nbt = new Compound(false, [
+		$nbt = new Compound("", [
 			new Enum("Items", []),
 			new String("id", Tile::FURNACE),
 			new Int("x", $this->x),
@@ -55,13 +77,13 @@ class BurningFurnace extends Solid{
 			new Int("z", $this->z)
 		]);
 		$nbt->Items->setTagType(NBT::TAG_Compound);
-		new Furnace($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), $nbt);
+		Tile::createTile("Furnace", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
 
 		return true;
 	}
 
 	public function onBreak(Item $item){
-		$this->getLevel()->setBlock($this, new Air(), true, true, true);
+		$this->getLevel()->setBlock($this, new Air(), true, true);
 
 		return true;
 	}
@@ -73,7 +95,7 @@ class BurningFurnace extends Solid{
 			if($t instanceof Furnace){
 				$furnace = $t;
 			}else{
-				$nbt = new Compound(false, [
+				$nbt = new Compound("", [
 					new Enum("Items", []),
 					new String("id", Tile::FURNACE),
 					new Int("x", $this->x),
@@ -81,10 +103,10 @@ class BurningFurnace extends Solid{
 					new Int("z", $this->z)
 				]);
 				$nbt->Items->setTagType(NBT::TAG_Compound);
-				$furnace = new Furnace($this->getLevel()->getChunkAt($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){
+			if($player->isCreative()){
 				return true;
 			}
 
@@ -94,37 +116,11 @@ class BurningFurnace extends Solid{
 		return true;
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.7;
-			case 4:
-				return 0.9;
-			case 3:
-				return 1.35;
-			case 2:
-				return 0.45;
-			case 1:
-				return 2.65;
-			default:
-				return 17.5;
-		}
-	}
-
 	public function getDrops(Item $item){
 		$drops = [];
 		if($item->isPickaxe() >= 1){
 			$drops[] = [Item::FURNACE, 0, 1];
 		}
-		$t = $this->getLevel()->getTile($this);
-		if($t instanceof Furnace){
-			for($s = 0; $s < $t->getInventory()->getSize(); ++$s){
-				$slot = $t->getInventory()->getItem($s);
-				if($slot->getID() > Item::AIR and $slot->getCount() > 0){
-					$drops[] = [$slot->getID(), $slot->getDamage(), $slot->getCount()];
-				}
-			}
-		}
 
 		return $drops;
 	}

src/pocketmine/block/Cactus.php

@@ -21,45 +21,85 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Entity;
+use pocketmine\event\block\BlockGrowEvent;
+use pocketmine\event\entity\EntityDamageByBlockEvent;
+use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
-use pocketmine\math\Vector3 as Vector3;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
 use pocketmine\Player;
+use pocketmine\Server;
 
 class Cactus extends Transparent{
+
+	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 getHardness(){
+		return 0.4;
+	}
+
+	public function hasEntityCollision(){
+		return true;
+	}
+
+	public function getName(){
+		return "Cactus";
+	}
+
+	protected function recalculateBoundingBox(){
+
+		return new AxisAlignedBB(
+			$this->x + 0.0625,
+			$this->y + 0.0625,
+			$this->z + 0.0625,
+			$this->x + 0.9375,
+			$this->y + 0.9375,
+			$this->z + 0.9375
+		);
+	}
+
+	public function onEntityCollide(Entity $entity){
+		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_CONTACT, 1);
+		$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){ //Replace with common break method
+			if($down->getId() !== self::SAND and $down->getId() !== self::CACTUS){
-				$this->getLevel()->setBlock($this, new Air(), false);
+				$this->getLevel()->useBreakOn($this);
-				$this->getLevel()->dropItem($this, Item::get($this->id));
+			}else{
-
+				for($side = 2; $side <= 5; ++$side){
-				return Level::BLOCK_UPDATE_NORMAL;
+					$b = $this->getSide($side);
+					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){
-							$this->getLevel()->setBlock($b, new Cactus(), true, false, true);
+							Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($b, new Cactus()));
-							break;
+							if(!$ev->isCancelled()){
+								$this->getLevel()->setBlock($b, $ev->getNewState(), true);
+							}
 						}
 					}
 					$this->meta = 0;
-					$this->getLevel()->setBlock($this, $this, false);
+					$this->getLevel()->setBlock($this, $this);
 				}else{
 					++$this->meta;
-					$this->getLevel()->setBlock($this, $this, false);
+					$this->getLevel()->setBlock($this, $this);
 				}
-
-				return Level::BLOCK_UPDATE_RANDOM;
 			}
 		}
 
@@ -68,13 +108,13 @@ 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, false, true);
+				$this->getLevel()->setBlock($this, $this, true);
 
 				return true;
 			}

src/pocketmine/block/Cake.php

@@ -21,23 +21,51 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\entity\EntityRegainHealthEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+use pocketmine\math\AxisAlignedBB;
 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;
+	public function canBeActivated(){
-		$this->hardness = 2.5;
+		return true;
+	}
+
+	public function getHardness(){
+		return 0.5;
+	}
+
+	public function getName(){
+		return "Cake Block";
+	}
+
+	protected function recalculateBoundingBox(){
+
+		$f = (1 + $this->getDamage() * 2) / 16;
+
+		return new AxisAlignedBB(
+			$this->x + $f,
+			$this->y,
+			$this->z + 0.0625,
+			$this->x + 1 - 0.0625,
+			$this->y + 0.5,
+			$this->z + 1 - 0.0625
+		);
 	}
 
 	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, false, true);
+			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
 		}
@@ -47,8 +75,8 @@ 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, false, true);
+				$this->getLevel()->setBlock($this, new Air(), true);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}
@@ -62,13 +90,16 @@ class Cake extends Transparent{
 	}
 
 	public function onActivate(Item $item, Player $player = null){
-		if($player instanceof Player and $player->getHealth() < 20){
+		if($player instanceof Player and $player->getHealth() < $player->getMaxHealth()){
 			++$this->meta;
-			$player->heal(3, "cake");
+
+			$ev = new EntityRegainHealthEvent($player, 3, EntityRegainHealthEvent::CAUSE_EATING);
+			$player->heal($ev->getAmount(), $ev);
+
 			if($this->meta >= 0x06){
-				$this->getLevel()->setBlock($this, new Air(), true, false, true);
+				$this->getLevel()->setBlock($this, new Air(), true);
 			}else{
-				$this->getLevel()->setBlock($this, $this, true, false, true);
+				$this->getLevel()->setBlock($this, $this, true);
 			}
 
 			return true;

src/pocketmine/block/Carpet.php

@@ -23,12 +23,27 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+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 getHardness(){
+		return 0.1;
+	}
+
+	public function isSolid(){
+		return true;
+	}
+
+	public function getName(){
+		static $names = [
 			0 => "White Carpet",
 			1 => "Orange Carpet",
 			2 => "Magenta Carpet",
@@ -46,16 +61,25 @@ 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;
+	protected function recalculateBoundingBox(){
+
+		return new AxisAlignedBB(
+			$this->x,
+			$this->y,
+			$this->z,
+			$this->x + 1,
+			$this->y + 0.0625,
+			$this->z + 1
+		);
 	}
 
 	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, false, true);
+			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
 		}
@@ -65,9 +89,8 @@ class Carpet extends Flowable{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->getID() === self::AIR){ //TODO: Replace with common break method
+			if($this->getSide(0)->getId() === self::AIR){
-				$this->getLevel()->dropItem($this, Item::get($this->id, $this->meta, 1));
+				$this->getLevel()->useBreakOn($this);
-				$this->getLevel()->setBlock($this, new Air(), true, false, true);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/Carrot.php

@@ -22,67 +22,17 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\Player;
 
-class Carrot extends Flowable{
+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;
-		$this->isActivable = true;
-		$this->hardness = 0;
 	}
 
-	public function getBoundingBox(){
+	public function getName(){
-		return null;
+		return "Carrot Block";
-	}
-
-
-	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){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
-
-			return true;
-		}
-
-		return false;
-	}
-
-	public function onActivate(Item $item, Player $player = null){
-		if($item->getID() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
-			$this->meta = 0x07;
-			$this->getLevel()->setBlock($this, $this, true, false, true);
-			$item->count--;
-
-			return true;
-		}
-
-		return false;
-	}
-
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
-				//TODO
-				//Server::getInstance()->api->entity->drop($this, Item::get(CARROT, 0, 1));
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if(mt_rand(0, 2) == 1){
-				if($this->meta < 0x07){
-					++$this->meta;
-					$this->getLevel()->setBlock($this, $this, true, false, true);
-
-					return Level::BLOCK_UPDATE_RANDOM;
-				}
-			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
-			}
-		}
-
-		return false;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Chest.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Enum;
@@ -33,12 +35,37 @@ 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 canBeActivated(){
+		return true;
+	}
+
+	public function getHardness(){
+		return 2.5;
+	}
+
+	public function getName(){
+		return "Chest";
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
+	protected function recalculateBoundingBox(){
+		return new AxisAlignedBB(
+			$this->x + 0.0625,
+			$this->y,
+			$this->z + 0.0625,
+			$this->x + 0.9375,
+			$this->y + 0.9475,
+			$this->z + 0.9375
+		);
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
@@ -49,7 +76,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){
@@ -68,8 +95,8 @@ class Chest extends Transparent{
 			}
 		}
 
-		$this->getLevel()->setBlock($block, $this, true, false, true);
+		$this->getLevel()->setBlock($block, $this, true, true);
-		$nbt = new Compound(false, [
+		$nbt = new Compound("", [
 			new Enum("Items", []),
 			new String("id", Tile::CHEST),
 			new Int("x", $this->x),
@@ -77,9 +104,9 @@ class Chest extends Transparent{
 			new Int("z", $this->z)
 		]);
 		$nbt->Items->setTagType(NBT::TAG_Compound);
-		$tile = new TileChest($this->getLevel()->getChunkAt($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);
 		}
@@ -92,7 +119,7 @@ class Chest extends Transparent{
 		if($t instanceof TileChest){
 			$t->unpair();
 		}
-		$this->getLevel()->setBlock($this, new Air(), true, true, true);
+		$this->getLevel()->setBlock($this, new Air(), true, true);
 
 		return true;
 	}
@@ -100,7 +127,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;
 			}
 
@@ -109,7 +136,7 @@ class Chest extends Transparent{
 			if($t instanceof TileChest){
 				$chest = $t;
 			}else{
-				$nbt = new Compound(false, [
+				$nbt = new Compound("", [
 					new Enum("Items", []),
 					new String("id", Tile::CHEST),
 					new Int("x", $this->x),
@@ -117,11 +144,11 @@ class Chest extends Transparent{
 					new Int("z", $this->z)
 				]);
 				$nbt->Items->setTagType(NBT::TAG_Compound);
-				$chest = new TileChest($this->getLevel()->getChunkAt($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());
@@ -131,19 +158,8 @@ class Chest extends Transparent{
 	}
 
 	public function getDrops(Item $item){
-		$drops = [
+		return [
 			[$this->id, 0, 1],
 		];
-		$t = $this->getLevel()->getTile($this);
-		if($t instanceof TileChest){
-			for($s = 0; $s < $t->getRealInventory()->getSize(); ++$s){
-				$slot = $t->getRealInventory()->getItem($s);
-				if($slot->getID() > Item::AIR and $slot->getCount() > 0){
-					$drops[] = [$slot->getID(), $slot->getDamage(), $slot->getCount()];
-				}
-			}
-		}
-
-		return $drops;
 	}
 }

src/pocketmine/block/Clay.php

@@ -22,11 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 0.6;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
+	public function getName(){
+		return "Clay Block";
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Coal.php

@@ -22,28 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getHardness(){
-		switch($item->isPickaxe()){
+		return 5;
-			case 5:
+	}
-				return 0.95;
+
-			case 4:
+	public function getToolType(){
-				return 1.25;
+		return Tool::TYPE_PICKAXE;
-			case 3:
+	}
-				return 1.9;
+
-			case 2:
+	public function getName(){
-				return 0.65;
+		return "Coal Block";
-			case 1:
-				return 3.75;
-			default:
-				return 25;
-		}
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/CoalOre.php

@@ -22,28 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getHardness(){
-		switch($item->isPickaxe()){
+		return 3;
-			case 5:
+	}
-				return 0.6;
+
-			case 4:
+	public function getToolType(){
-				return 0.75;
+		return Tool::TYPE_PICKAXE;
-			case 3:
+	}
-				return 1.15;
+
-			case 2:
+	public function getName(){
-				return 0.4;
+		return "Coal Ore";
-			case 1:
-				return 2.25;
-			default:
-				return 15;
-		}
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Cobblestone.php

@@ -22,28 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Cobblestone extends Solid{
+
+	protected $id = self::COBBLESTONE;
+
 	public function __construct(){
-		parent::__construct(self::COBBLESTONE, 0, "Cobblestone");
+
-		$this->hardness = 30;
 	}
 
-	public function getBreakTime(Item $item){
+	public function getToolType(){
-		switch($item->isPickaxe()){
+		return Tool::TYPE_PICKAXE;
-			case 5:
+	}
-				return 0.4;
+
-			case 4:
+	public function getName(){
-				return 0.5;
+		return "Cobblestone";
-			case 3:
+	}
-				return 0.75;
+
-			case 2:
+	public function getHardness(){
-				return 0.25;
+		return 2;
-			case 1:
-				return 1.5;
-			default:
-				return 10;
-		}
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/CobblestoneStairs.php

@@ -22,9 +22,26 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 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 getHardness(){
+		return 2;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getName(){
+		return "Cobblestone Stairs";
 	}
 
 }

src/pocketmine/block/Cobweb.php

@@ -21,17 +21,40 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Entity;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Cobweb extends Flowable{
+
+	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 4;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SWORD;
+	}
+
+	public function onEntityCollide(Entity $entity){
+		$entity->resetFallDistance();
 	}
 
 	public function getDrops(Item $item){
+		//TODO: correct drops
 		return [];
 	}
 }

src/pocketmine/block/Crops.php

@@ -0,0 +1,96 @@
+<?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\event\block\BlockGrowEvent;
+use pocketmine\item\Item;
+use pocketmine\level\Level;
+use pocketmine\Player;
+use pocketmine\Server;
+
+abstract class Crops extends Flowable{
+
+	public function canBeActivated(){
+		return true;
+	}
+
+	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){
+			$this->getLevel()->setBlock($block, $this, true, true);
+
+			return true;
+		}
+
+		return false;
+	}
+
+
+	public function onActivate(Item $item, Player $player = null){
+		if($item->getId() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
+			$block = clone $this;
+			$block->meta += mt_rand(2, 5);
+			if($block->meta > 7){
+				$block->meta = 7;
+			}
+
+			Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+
+			if(!$ev->isCancelled()){
+				$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
+			}
+
+			$item->count--;
+
+			return true;
+		}
+
+		return false;
+	}
+
+	public function onUpdate($type){
+		if($type === Level::BLOCK_UPDATE_NORMAL){
+			if($this->getSide(0)->isTransparent() === true){
+				$this->getLevel()->useBreakOn($this);
+				return Level::BLOCK_UPDATE_NORMAL;
+			}
+		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
+			if(mt_rand(0, 2) == 1){
+				if($this->meta < 0x07){
+					$block = clone $this;
+					++$block->meta;
+					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+
+					if(!$ev->isCancelled()){
+						$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
+					}else{
+						return Level::BLOCK_UPDATE_RANDOM;
+					}
+				}
+			}else{
+				return Level::BLOCK_UPDATE_RANDOM;
+			}
+		}
+
+		return false;
+	}
+}

src/pocketmine/block/Dandelion.php

@@ -26,20 +26,22 @@ 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, false, true);
+			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
 		}
@@ -49,10 +51,8 @@ class Dandelion extends Flowable{
 
 	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){
-				//TODO
+				$this->getLevel()->useBreakOn($this);
-				//Server::getInstance()->api->entity->drop($this, Item::get($this->id));
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/DarkOakWoodStairs.php

@@ -22,10 +22,22 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getToolType(){
+		return Tool::TYPE_AXE;
 	}
 
 	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

@@ -22,22 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getHardness(){
-		switch($item->isPickaxe()){
+		return 5;
-			case 5:
+	}
-				return 0.95;
+
-			case 4:
+	public function getName(){
-				return 1.25;
+		return "Diamond Block";
-			default:
+	}
-				return 25;
+
-		}
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/DiamondOre.php

@@ -22,22 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getHardness(){
-		switch($item->isPickaxe()){
+		return 3;
-			case 5:
+	}
-				return 0.6;
+
-			case 4:
+	public function getName(){
-				return 0.75;
+		return "Diamond Ore";
-			default:
+	}
-				return 15;
+
-		}
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Dirt.php

@@ -22,24 +22,37 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 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 0.5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
+	public function getName(){
+		return "Dirt";
+	}
+
 	public function onActivate(Item $item, Player $player = null){
 		if($item->isHoe()){
 			$item->useOn($this);
-			$this->getLevel()->setBlock($this, Block::get(Item::FARMLAND, 0), true, false, true);
+			$this->getLevel()->setBlock($this, Block::get(Item::FARMLAND, 0), true);
 
 			return true;
 		}

src/pocketmine/block/Door.php

@@ -23,20 +23,191 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+use pocketmine\level\sound\DoorSound;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
 use pocketmine\network\protocol\LevelEventPacket;
 use pocketmine\Player;
 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(){
+		$damage = $this->getDamage();
+		$isUp = ($damage & 0x08) > 0;
+
+		if($isUp){
+			$down = $this->getSide(Vector3::SIDE_DOWN)->getDamage();
+			$up = $damage;
+		}else{
+			$down = $damage;
+			$up = $this->getSide(Vector3::SIDE_UP)->getDamage();
+		}
+
+		$isRight = ($up & 0x01) > 0;
+
+		return $down & 0x07 | ($isUp ? 8 : 0) | ($isRight ? 0x10 : 0);
+	}
+
+	protected function recalculateBoundingBox(){
+
+		$f = 0.1875;
+		$damage = $this->getFullDamage();
+
+		$bb = new AxisAlignedBB(
+			$this->x,
+			$this->y,
+			$this->z,
+			$this->x + 1,
+			$this->y + 2,
+			$this->z + 1
+		);
+
+		$j = $damage & 0x03;
+		$isOpen = (($damage & 0x04) > 0);
+		$isRight = (($damage & 0x10) > 0);
+
+		if($j === 0){
+			if($isOpen){
+				if(!$isRight){
+					$bb->setBounds(
+						$this->x,
+						$this->y,
+						$this->z,
+						$this->x + 1,
+						$this->y + 1,
+						$this->z + $f
+					);
+				}else{
+					$bb->setBounds(
+						$this->x,
+						$this->y,
+						$this->z + 1 - $f,
+						$this->x + 1,
+						$this->y + 1,
+						$this->z + 1
+					);
+				}
+			}else{
+				$bb->setBounds(
+					$this->x,
+					$this->y,
+					$this->z,
+					$this->x + $f,
+					$this->y + 1,
+					$this->z + 1
+				);
+			}
+		}elseif($j === 1){
+			if($isOpen){
+				if(!$isRight){
+					$bb->setBounds(
+						$this->x + 1 - $f,
+						$this->y,
+						$this->z,
+						$this->x + 1,
+						$this->y + 1,
+						$this->z + 1
+					);
+				}else{
+					$bb->setBounds(
+						$this->x,
+						$this->y,
+						$this->z,
+						$this->x + $f,
+						$this->y + 1,
+						$this->z + 1
+					);
+				}
+			}else{
+				$bb->setBounds(
+					$this->x,
+					$this->y,
+					$this->z,
+					$this->x + 1,
+					$this->y + 1,
+					$this->z + $f
+				);
+			}
+		}elseif($j === 2){
+			if($isOpen){
+				if(!$isRight){
+					$bb->setBounds(
+						$this->x,
+						$this->y,
+						$this->z + 1 - $f,
+						$this->x + 1,
+						$this->y + 1,
+						$this->z + 1
+					);
+				}else{
+					$bb->setBounds(
+						$this->x,
+						$this->y,
+						$this->z,
+						$this->x + 1,
+						$this->y + 1,
+						$this->z + $f
+					);
+				}
+			}else{
+				$bb->setBounds(
+					$this->x + 1 - $f,
+					$this->y,
+					$this->z,
+					$this->x + 1,
+					$this->y + 1,
+					$this->z + 1
+				);
+			}
+		}elseif($j === 3){
+			if($isOpen){
+				if(!$isRight){
+					$bb->setBounds(
+						$this->x,
+						$this->y,
+						$this->z,
+						$this->x + $f,
+						$this->y + 1,
+						$this->z + 1
+					);
+				}else{
+					$bb->setBounds(
+						$this->x + 1 - $f,
+						$this->y,
+						$this->z,
+						$this->x + 1,
+						$this->y + 1,
+						$this->z + 1
+					);
+				}
+			}else{
+				$bb->setBounds(
+					$this->x,
+					$this->y,
+					$this->z + 1 - $f,
+					$this->x + 1,
+					$this->y + 1,
+					$this->z + 1
+				);
+			}
+		}
+
+		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);
@@ -53,7 +224,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;
@@ -66,13 +237,13 @@ 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->getId() or ($next2->isTransparent() === false and $next->isTransparent() === true)){ //Door hinge
 				$metaUp |= 0x01;
 			}
-			$this->getLevel()->setBlock($blockUp, Block::get($this->id, $metaUp), true, false, true); //Top
 
-			$this->meta = $player->getDirection() & 0x03;
+			$this->setDamage($player->getDirection() & 0x03);
-			$this->getLevel()->setBlock($block, $this, true, false, true); //Bottom
+			$this->getLevel()->setBlock($block, $this, true, true); //Bottom
+			$this->getLevel()->setBlock($blockUp, $b = Block::get($this->getId(), $metaUp), true); //Top
 			return true;
 		}
 
@@ -80,58 +251,46 @@ abstract class Door extends Transparent{
 	}
 
 	public function onBreak(Item $item){
-		if(($this->meta & 0x08) === 0x08){
+		if(($this->getDamage() & 0x08) === 0x08){
 			$down = $this->getSide(0);
-			if($down->getID() === $this->id){
+			if($down->getId() === $this->getId()){
-				$this->getLevel()->setBlock($down, new Air(), true, false, true);
+				$this->getLevel()->setBlock($down, new Air(), true);
 			}
 		}else{
 			$up = $this->getSide(1);
-			if($up->getID() === $this->id){
+			if($up->getId() === $this->getId()){
-				$this->getLevel()->setBlock($up, new Air(), true, false, true);
+				$this->getLevel()->setBlock($up, new Air(), true);
 			}
 		}
-		$this->getLevel()->setBlock($this, new Air(), true, false, true);
+		$this->getLevel()->setBlock($this, new Air(), true);
 
 		return true;
 	}
 
 	public function onActivate(Item $item, Player $player = null){
-		if(($this->meta & 0x08) === 0x08){ //Top
+		if(($this->getDamage() & 0x08) === 0x08){ //Top
 			$down = $this->getSide(0);
-			if($down->getID() === $this->id){
+			if($down->getId() === $this->getId()){
 				$meta = $down->getDamage() ^ 0x04;
-				$this->getLevel()->setBlock($down, Block::get($this->id, $meta), true, false, true);
+				$this->getLevel()->setBlock($down, Block::get($this->getId(), $meta), true);
-				$players = $this->getLevel()->getUsingChunk($this->x >> 4, $this->z >> 4);
+				$players = $this->getLevel()->getChunkPlayers($this->x >> 4, $this->z >> 4);
 				if($player instanceof Player){
-					unset($players[$player->getID()]);
+					unset($players[$player->getLoaderId()]);
 				}
-				$pk = new LevelEventPacket;
-				$pk->x = $this->x;
-				$pk->y = $this->y;
-				$pk->z = $this->z;
-				$pk->evid = 1003;
-				$pk->data = 0;
-				Server::broadcastPacket($players, $pk);
 
+				$this->level->addSound(new DoorSound($this));
 				return true;
 			}
 
 			return false;
 		}else{
 			$this->meta ^= 0x04;
-			$this->getLevel()->setBlock($this, $this, true, false, true);
+			$this->getLevel()->setBlock($this, $this, true);
-			$players = $this->getLevel()->getUsingChunk($this->x >> 4, $this->z >> 4);
+			$players = $this->getLevel()->getChunkPlayers($this->x >> 4, $this->z >> 4);
 			if($player instanceof Player){
-				unset($players[$player->getID()]);
+				unset($players[$player->getLoaderId()]);
 			}
-			$pk = new LevelEventPacket;
+			$this->level->addSound(new DoorSound($this));
-			$pk->x = $this->x;
-			$pk->y = $this->y;
-			$pk->z = $this->z;
-			$pk->evid = 1003;
-			$pk->data = 0;
-			Server::broadcastPacket($players, $pk);
 		}
 
 		return true;

src/pocketmine/block/DoublePlant.php

@@ -23,34 +23,35 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\level\Level;
-use pocketmine\Player;
 
-class CyanFlower extends Flowable{
+class DoublePlant extends Flowable{
-	public function __construct(){
+
-		parent::__construct(self::POPPY, 0, "Cyan Flower");
+	protected $id = self::DOUBLE_PLANT;
-		$this->hardness = 0;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getBoundingBox(){
+	public function canBeReplaced(){
-		return null;
+		return true;
 	}
 
-
+	public function getName(){
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
+		static $names = [
-		$down = $this->getSide(0);
+			0 => "Sunflower",
-		if($down->getID() === 2 or $down->getID() === 3 or $down->getID() === 60){
+			1 => "Lilac",
-			$this->getLevel()->setBlock($block, $this, true, false, true);
+			2 => "Double Tallgrass",
-
+			3 => "Large Fern",
-			return true;
+			4 => "Rose Bush",
-		}
+			5 => "Peony"
-
+		];
-		return false;
+		return $names[$this->meta & 0x07];
 	}
 
+
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //TODO: Replace with common break method
+			if($this->getSide(0)->isTransparent() === true){ //Replace with common break method
-				$this->getLevel()->dropItem($this, Item::get($this->id, 0, 1));
 				$this->getLevel()->setBlock($this, new Air(), false, false, true);
 
 				return Level::BLOCK_UPDATE_NORMAL;
@@ -59,4 +60,11 @@ class CyanFlower extends Flowable{
 
 		return false;
 	}
+
+	public function getDrops(Item $item){
+		//TODO
+
+		return [];
+	}
+
 }

src/pocketmine/block/DoubleSlab.php

@@ -22,11 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 2;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getName(){
+		static $names = [
 			0 => "Stone",
 			1 => "Sandstone",
 			2 => "Wooden",
@@ -34,26 +49,9 @@ class DoubleSlab extends Solid{
 			4 => "Brick",
 			5 => "Stone Brick",
 			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){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.4;
-			case 4:
-				return 0.5;
-			case 3:
-				return 0.75;
-			case 2:
-				return 0.25;
-			case 1:
-				return 1.5;
-			default:
-				return 10;
-		}
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/DoubleWoodSlab.php

@@ -24,35 +24,33 @@ 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 2;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
+	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){
-		switch($item->isAxe()){
-			case 5:
-				return 0.4;
-			case 4:
-				return 0.5;
-			case 3:
-				return 0.75;
-			case 2:
-				return 0.25;
-			case 1:
-				return 1.5;
-			default:
-				return 3;
-		}
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Emerald.php

@@ -22,22 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getHardness(){
-		switch($item->isPickaxe()){
+		return 5;
-			case 5:
+	}
-				return 0.95;
+
-			case 4:
+	public function getToolType(){
-				return 1.25;
+		return Tool::TYPE_PICKAXE;
-			default:
+	}
-				return 25;
+
-		}
+	public function getName(){
+		return "Emerald Block";
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/EmeraldOre.php

@@ -22,22 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getName(){
-		switch($item->isPickaxe()){
+		return "Emerald Ore";
-			case 5:
+	}
-				return 0.6;
+
-			case 4:
+	public function getToolType(){
-				return 0.75;
+		return Tool::TYPE_PICKAXE;
-			default:
+	}
-				return 15;
+
-		}
+	public function getHardness(){
+		return 3;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/EndPortalFrame.php

@@ -0,0 +1,66 @@
+<?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\math\AxisAlignedBB;
+
+class EndPortalFrame extends Solid{
+
+	protected $id = self::END_PORTAL_FRAME;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getLightLevel(){
+		return 1;
+	}
+
+	public function getName(){
+		return "End Portal Frame";
+	}
+
+	public function getHardness(){
+		return -1;
+	}
+
+	public function getResistance(){
+		return 18000000;
+	}
+
+	public function isBreakable(Item $item){
+		return false;
+	}
+
+	protected function recalculateBoundingBox(){
+
+		return new AxisAlignedBB(
+			$this->x,
+			$this->y,
+			$this->z,
+			$this->x + 1,
+			$this->y + (($this->getDamage() & 0x04) > 0 ? 1 : 0.8125),
+			$this->z + 1
+		);
+	}
+}

src/pocketmine/block/EndStone.php

@@ -22,27 +22,25 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getName(){
-		switch($item->isPickaxe()){
+		return "End Stone";
-			case 5:
+	}
-				return 0.6;
+
-			case 4:
+	public function getToolType(){
-				return 0.75;
+		return Tool::TYPE_PICKAXE;
-			case 3:
+	}
-				return 1.15;
+
-			case 2:
+	public function getHardness(){
-				return 0.4;
+		return 3;
-			case 1:
-				return 2.25;
-			default:
-				return 15;
-		}
 	}
 }

src/pocketmine/block/Fallable.php

@@ -21,16 +21,51 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Entity;
 use pocketmine\item\Item;
+use pocketmine\level\Level;
+use pocketmine\math\Vector3;
+use pocketmine\nbt\tag\Byte;
+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;
 
-class Fallable extends Solid{
+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, false, true);
+		$ret = $this->getLevel()->setBlock($this, $this, true, true);
 
 		return $ret;
 	}
+
+	public function onUpdate($type){
+		if($type === Level::BLOCK_UPDATE_NORMAL){
+			$down = $this->getSide(Vector3::SIDE_DOWN);
+			if($down->getId() === self::AIR or ($down instanceof Liquid)){
+				$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),
+						new Double("", $this->z + 0.5)
+					]),
+					"Motion" => new Enum("Motion", [
+						new Double("", 0),
+						new Double("", 0),
+						new Double("", 0)
+					]),
+					"Rotation" => new Enum("Rotation", [
+						new Float("", 0),
+						new Float("", 0)
+					]),
+					"TileID" => new Int("TileID", $this->getId()),
+					"Data" => new Byte("Data", $this->getDamage()),
+				]));
+
+				$fall->spawnToAll();
+			}
+		}
+	}
 }

src/pocketmine/block/Farmland.php

@@ -22,11 +22,38 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
+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 getName(){
+		return "Farmland";
+	}
+
+	public function getHardness(){
+		return 0.6;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
+	protected function recalculateBoundingBox(){
+		return new AxisAlignedBB(
+			$this->x,
+			$this->y,
+			$this->z,
+			$this->x + 1,
+			$this->y + 0.9375,
+			$this->z + 1
+		);
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Fence.php

@@ -21,12 +21,65 @@
 
 namespace pocketmine\block;
 
+use pocketmine\item\Tool;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
 
 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 getHardness(){
+		return 2;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+
+	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(){
+
+		$north = $this->canConnect($this->getSide(Vector3::SIDE_NORTH));
+		$south = $this->canConnect($this->getSide(Vector3::SIDE_SOUTH));
+		$west = $this->canConnect($this->getSide(Vector3::SIDE_WEST));
+		$east = $this->canConnect($this->getSide(Vector3::SIDE_EAST));
+
+		$n = $north ? 0 : 0.375;
+		$s = $south ? 1 : 0.625;
+		$w = $west ? 0 : 0.375;
+		$e = $east ? 1 : 0.625;
+
+		return new AxisAlignedBB(
+			$this->x + $w,
+			$this->y,
+			$this->z + $n,
+			$this->x + $e,
+			$this->y + 1.5,
+			$this->z + $s
+		);
+	}
+
+	public function canConnect(Block $block){
+		return ($block instanceof Fence or $block instanceof FenceGate) ? true : $block->isSolid() and !$block->isTransparent();
+	}
+
+}

src/pocketmine/block/FenceGate.php

@@ -22,18 +22,61 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
+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;
+	}
+
+	public function getHardness(){
+		return 2;
+	}
+
+	public function canBeActivated(){
+		return true;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
+
+	protected function recalculateBoundingBox(){
+
+		if(($this->getDamage() & 0x04) > 0){
+			return null;
+		}
+
+		$i = ($this->getDamage() & 0x03);
+		if($i === 2 and $i === 0){
+			return new AxisAlignedBB(
+				$this->x,
+				$this->y,
+				$this->z + 0.375,
+				$this->x + 1,
+				$this->y + 1.5,
+				$this->z + 0.625
+			);
+		}else{
+			return new AxisAlignedBB(
+				$this->x + 0.375,
+				$this->y,
+				$this->z,
+				$this->x + 0.625,
+				$this->y + 1.5,
+				$this->z + 1
+			);
 		}
-		$this->hardness = 15;
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
@@ -44,7 +87,7 @@ class FenceGate extends Transparent{
 			3 => 2,
 		];
 		$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0] & 0x03;
-		$this->getLevel()->setBlock($block, $this, true, false, true);
+		$this->getLevel()->setBlock($block, $this, true, true);
 
 		return true;
 	}
@@ -63,12 +106,7 @@ 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->getLevel()->setBlock($this, $this, true);
-			$this->isFullBlock = true;
-		}else{
-			$this->isFullBlock = false;
-		}
-		$this->getLevel()->setBlock($this, $this, true, false, true);
 
 		return true;
 	}

src/pocketmine/block/FenceGateAcacia.php

@@ -21,9 +21,12 @@
 
 namespace pocketmine\block;
 
-class EndPortal extends Solid{
+
-	public function __construct($meta = 0){
+class FenceGateAcacia extends FenceGate{
-		parent::__construct(self::END_PORTAL, $meta, "End Portal");
+
-		$this->hardness = 18000000;
+	protected $id = self::FENCE_GATE_ACACIA;
+
+	public function getName(){
+		return "Acacia Fence Gate";
 	}
 }

src/pocketmine/block/FenceGateBirch.php

@@ -19,23 +19,14 @@
  *
 */
 
-
+namespace pocketmine\block;
-namespace pocketmine\network\protocol;
 
 
-class UnknownPacket extends DataPacket{
+class FenceGateBirch extends FenceGate{
-	public $packetID = -1;
 
-	public function pid(){
+	protected $id = self::FENCE_GATE_BIRCH;
-		return $this->packetID;
+
+	public function getName(){
+		return "Birch Fence Gate";
 	}
-
-	public function decode(){
-
-	}
-
-	public function encode(){
-
-	}
-
 }

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

@@ -21,22 +21,55 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Effect;
+use pocketmine\entity\Entity;
+use pocketmine\event\entity\EntityCombustByBlockEvent;
+use pocketmine\event\entity\EntityDamageByBlockEvent;
+use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+use pocketmine\Server;
 
 class Fire extends Flowable{
+
+	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){
+		if(!$entity->hasEffect(Effect::FIRE_RESISTANCE)){
+			$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1);
+			$entity->attack($ev->getFinalDamage(), $ev);
+		}
+
+		$ev = new EntityCombustByBlockEvent($this, $entity, 8);
+		Server::getInstance()->getPluginManager()->callEvent($ev);
+		if(!$ev->isCancelled()){
+			$entity->setOnFire($ev->getDuration());
+		}
+	}
 
 	public function getDrops(Item $item){
 		return [];
@@ -46,16 +79,16 @@ 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;
 				}
 			}
-			$this->getLevel()->setBlock($this, new Air(), true, false, true);
+			$this->getLevel()->setBlock($this, new Air(), true);
 
 			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, false, true);
+				$this->getLevel()->setBlock($this, new Air(), true);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/Flowable.php

@@ -22,10 +22,27 @@
 namespace pocketmine\block;
 
 
-class Flowable extends Transparent{
+use pocketmine\item\Item;
 
-	public $isFlowable = true;
+abstract class Flowable extends Transparent{
-	public $isFullBlock = false;
-	public $isSolid = false;
 
+	public function canBeFlowedInto(){
+		return true;
+	}
+
+	public function getHardness(){
+		return 0;
+	}
+
+	public function getResistance(){
+		return 0;
+	}
+
+	public function isSolid(){
+		return false;
+	}
+
+	public function getBoundingBox(){
+		return null;
+	}
 }

src/pocketmine/block/Flower.php

@@ -0,0 +1,91 @@
+<?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;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
+
+class Flower extends Flowable{
+	const TYPE_POPPY = 0;
+	const TYPE_BLUE_ORCHID = 1;
+	const TYPE_ALLIUM = 2;
+	const TYPE_AZURE_BLUET = 3;
+	const TYPE_RED_TULIP = 4;
+	const TYPE_ORANGE_TULIP = 5;
+	const TYPE_WHITE_TULIP = 6;
+	const TYPE_PINK_TULIP = 7;
+	const TYPE_OXEYE_DAISY = 8;
+
+	protected $id = self::RED_FLOWER;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		static $names = [
+			self::TYPE_POPPY => "Poppy",
+			self::TYPE_BLUE_ORCHID => "Blue Orchid",
+			self::TYPE_ALLIUM => "Allium",
+			self::TYPE_AZURE_BLUET => "Azure Bluet",
+			self::TYPE_RED_TULIP => "Red Tulip",
+			self::TYPE_ORANGE_TULIP => "Orange Tulip",
+			self::TYPE_WHITE_TULIP => "White Tulip",
+			self::TYPE_PINK_TULIP => "Pink Tulip",
+			self::TYPE_OXEYE_DAISY => "Oxeye Daisy",
+			9 => "Unknown",
+			10 => "Unknown",
+			11 => "Unknown",
+			12 => "Unknown",
+			13 => "Unknown",
+			14 => "Unknown",
+			15 => "Unknown"
+		];
+		return $names[$this->meta];
+	}
+
+
+	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
+		$down = $this->getSide(0);
+		if($down->getId() === Block::GRASS or $down->getId() === Block::DIRT or $down->getId() === Block::FARMLAND){
+			$this->getLevel()->setBlock($block, $this, true);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	public function onUpdate($type){
+		if($type === Level::BLOCK_UPDATE_NORMAL){
+			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+				$this->getLevel()->useBreakOn($this);
+
+				return Level::BLOCK_UPDATE_NORMAL;
+			}
+		}
+
+		return false;
+	}
+}

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/Generic.php

@@ -1,68 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- * 
- *
-*/
-
-namespace pocketmine\block;
-
-use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\Player;
-
-class Generic extends Block{
-
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		return $this->getLevel()->setBlock($this, $this, true, false, true);
-	}
-
-	public function isBreakable(Item $item){
-		return $this->breakable;
-	}
-
-	public function onBreak(Item $item){
-		return $this->getLevel()->setBlock($this, new Air(), true, false, true);
-	}
-
-	public function onUpdate($type){
-		if($this->hasPhysics === true and $type === Level::BLOCK_UPDATE_NORMAL){
-			$down = $this->getSide(0);
-			if($down->getID() === self::AIR or ($down instanceof Liquid)){
-				$data = [
-					"x" => $this->x + 0.5,
-					"y" => $this->y + 0.5,
-					"z" => $this->z + 0.5,
-					"Tile" => $this->id,
-				];
-				/*$this->getLevel()->setBlock($this, new Air(), false, false, true);
-				//TODO
-				//$e = $server->api->entity->add($this->getLevel(), ENTITY_FALLING, FALLING_SAND, $data);
-				//$e->spawnToAll();
-				$server->api->block->blockUpdateAround(clone $this, Level::BLOCK_UPDATE_NORMAL, 1);*/
-			}
-
-			return false;
-		}
-
-		return false;
-	}
-
-	public function onActivate(Item $item, Player $player = null){
-		return $this->isActivable;
-	}
-}

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 0.3;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/GlassPane.php

@@ -22,11 +22,25 @@
 namespace pocketmine\block;
 
 
-class GlassPane extends Transparent{
+use pocketmine\item\Item;
+
+class GlassPane extends Thin{
+
+	protected $id = self::GLASS_PANE;
+
 	public function __construct(){
-		parent::__construct(self::GLASS_PANE, 0, "Glass Pane");
+
-		$this->isFullBlock = false;
-		$this->isSolid = false;
 	}
 
+	public function getName(){
+		return "Glass Pane";
+	}
+
+	public function getHardness(){
+		return 0.3;
+	}
+
+	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

@@ -22,12 +22,31 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 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 getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getLightLevel(){
+		return 9;
 	}
 
 	public function onUpdate($type){
@@ -40,18 +59,6 @@ class GlowingRedstoneOre extends Solid{
 		return false;
 	}
 
-
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			default:
-				return 15;
-		}
-	}
-
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
 			return [

src/pocketmine/block/Glowstone.php

@@ -22,11 +22,30 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 0.3;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getLightLevel(){
+		return 15;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Gold.php

@@ -22,22 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getName(){
-		switch($item->isPickaxe()){
+		return "Gold Block";
-			case 5:
+	}
-				return 0.6;
+
-			case 4:
+	public function getHardness(){
-				return 0.75;
+		return 3;
-			default:
+	}
-				return 15;
+
-		}
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/GoldOre.php

@@ -22,22 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getName(){
-		switch($item->isPickaxe()){
+		return "Gold Ore";
-			case 5:
+	}
-				return 0.6;
+
-			case 4:
+	public function getHardness(){
-				return 0.75;
+		return 3;
-			default:
+	}
-				return 15;
+
-		}
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Grass.php

@@ -21,25 +21,40 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
-use pocketmine\level\generator\object\TallGrass;
+use pocketmine\item\Tool;
+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 0.6;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[Item::DIRT, 0, 1],
@@ -52,26 +67,33 @@ 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){
-					$this->getLevel()->setBlock($block, new Grass());
+					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($block, $this, new Grass()));
+					if(!$ev->isCancelled()){
+						$this->getLevel()->setBlock($block, $ev->getNewState());
+					}
 				}
 			}
 		}
 	}
 
 	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--;
-			TallGrass::growGrass($this->getLevel(), $this, new Random(mt_rand()), 8, 2);
+			TallGrassObject::growGrass($this->getLevel(), $this, new Random(mt_rand()), 8, 2);
 
 			return true;
 		}elseif($item->isHoe()){
 			$item->useOn($this);
 			$this->getLevel()->setBlock($this, new Farmland());
 
+			return true;
+		}elseif($item->isShovel() and $this->getSide(1)->getId() === Block::AIR){
+			$item->useOn($this);
+			$this->getLevel()->setBlock($this, new GrassPath());
+
 			return true;
 		}
 

src/pocketmine/block/GrassPath.php

@@ -0,0 +1,71 @@
+<?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\event\block\BlockSpreadEvent;
+use pocketmine\item\Item;
+use pocketmine\item\Tool;
+use pocketmine\level\generator\object\TallGrass as TallGrassObject;
+use pocketmine\level\Level;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
+use pocketmine\Server;
+use pocketmine\utils\Random;
+
+class GrassPath extends Transparent{
+
+	protected $id = self::GRASS_PATH;
+
+	public function __construct(){
+
+	}
+
+	public function getName(){
+		return "Grass Path";
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
+	protected function recalculateBoundingBox(){
+		return new AxisAlignedBB(
+			$this->x,
+			$this->y,
+			$this->z,
+			$this->x + 1,
+			$this->y + 0.9375,
+			$this->z + 1
+		);
+	}
+
+	public function getHardness(){
+		return 0.6;
+	}
+
+	public function getDrops(Item $item){
+		return [
+			[Item::DIRT, 0, 1],
+		];
+	}
+}

src/pocketmine/block/Gravel.php

@@ -22,11 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 0.6;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/HardenedClay.php

@@ -22,28 +22,25 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getName(){
-		switch($item->isPickaxe()){
+		return "Hardened Clay";
-			case 5:
-				return 0.25;
-			case 4:
-				return 0.35;
-			case 3:
-				return 0.5;
-			case 2:
-				return 0.2;
-			case 1:
-				return 0.95;
-			default:
-				return 6.25;
-		}
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getHardness(){
+		return 1.25;
+	}
 }

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 0.5;
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
@@ -41,7 +51,7 @@ class HayBale extends Solid{
 		];
 
 		$this->meta = ($this->meta & 0x03) | $faces[$face];
-		$this->getLevel()->setBlock($block, $this, true, false, true);
+		$this->getLevel()->setBlock($block, $this, true, true);
 
 		return true;
 	}

src/pocketmine/block/Ice.php

@@ -22,36 +22,34 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 0.5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function onBreak(Item $item){
-		$this->getLevel()->setBlock($this, new Water(), true, false, true);
+		$this->getLevel()->setBlock($this, new Water(), true);
 
 		return true;
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.1;
-			case 4:
-				return 0.15;
-			case 3:
-				return 0.2;
-			case 2:
-				return 0.1;
-			case 1:
-				return 0.4;
-			default:
-				return 0.75;
-		}
-	}
-
 	public function getDrops(Item $item){
 		return [];
 	}

src/pocketmine/block/Iron.php

@@ -22,24 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getName(){
-		switch($item->isPickaxe()){
+		return "Iron Block";
-			case 5:
+	}
-				return 0.95;
+
-			case 4:
+	public function getToolType(){
-				return 1.25;
+		return Tool::TYPE_PICKAXE;
-			case 3:
+	}
-				return 1.9;
+
-			default:
+	public function getHardness(){
-				return 25;
+		return 5;
-		}
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/IronBars.php

@@ -21,12 +21,38 @@
 
 namespace pocketmine\block;
 
+use pocketmine\item\Item;
+use pocketmine\item\Tool;
+
+class IronBars extends Thin{
+
+	protected $id = self::IRON_BARS;
 
-class IronBars extends Transparent{
 	public function __construct(){
-		parent::__construct(self::IRON_BARS, 0, "Iron Bars");
+
-		$this->isFullBlock = false;
-		$this->isSolid = false;
 	}
 
-}
+	public function getName(){
+		return "Iron Bars";
+	}
+
+	public function getHardness(){
+		return 5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getDrops(Item $item){
+		if($item->isPickaxe() >= 1){
+			return [
+				[Item::IRON_BARS, 0, 1],
+			];
+		}else{
+			return [];
+		}
+	}
+
+}
+

src/pocketmine/block/IronDoor.php

@@ -22,29 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getName(){
-		switch($item->isPickaxe()){
+		return "Iron Door Block";
-			case 5:
+	}
-				return 0.95;
+
-			case 4:
+	public function getToolType(){
-				return 1.25;
+		return Tool::TYPE_PICKAXE;
-			case 3:
+	}
-				return 1.9;
+
-			case 2:
+	public function getHardness(){
-				return 0.65;
+		return 5;
-			case 1:
-				return 3.75;
-			default:
-				return 25;
-		}
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/IronOre.php

@@ -22,24 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getName(){
-		switch($item->isPickaxe()){
+		return "Iron Ore";
-			case 5:
+	}
-				return 0.6;
+
-			case 4:
+	public function getToolType(){
-				return 0.75;
+		return Tool::TYPE_PICKAXE;
-			case 3:
+	}
-				return 1.15;
+
-			default:
+	public function getHardness(){
-				return 15;
+		return 3;
-		}
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/JungleWoodStairs.php

@@ -22,10 +22,22 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getToolType(){
+		return Tool::TYPE_AXE;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Ladder.php

@@ -21,25 +21,90 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Entity;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
 class Ladder extends Transparent{
+
+	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 getBoundingBox(){
+	public function getName(){
+		return "Ladder";
+	}
+
+	public function hasEntityCollision(){
+		return true;
+	}
+
+	public function isSolid(){
+		return false;
+	}
+
+	public function getHardness(){
+		return 0.4;
+	}
+
+	public function onEntityCollide(Entity $entity){
+		$entity->resetFallDistance();
+		$entity->onGround = true;
+	}
+
+	protected function recalculateBoundingBox(){
+
+		$f = 0.125;
+
+		if($this->meta === 2){
+			return new AxisAlignedBB(
+				$this->x,
+				$this->y,
+				$this->z + 1 - $f,
+				$this->x + 1,
+				$this->y + 1,
+				$this->z + 1
+			);
+		}elseif($this->meta === 3){
+			return new AxisAlignedBB(
+				$this->x,
+				$this->y,
+				$this->z,
+				$this->x + 1,
+				$this->y + 1,
+				$this->z + $f
+			);
+		}elseif($this->meta === 4){
+			return new AxisAlignedBB(
+				$this->x + 1 - $f,
+				$this->y,
+				$this->z,
+				$this->x + 1,
+				$this->y + 1,
+				$this->z + 1
+			);
+		}elseif($this->meta === 5){
+			return new AxisAlignedBB(
+				$this->x,
+				$this->y,
+				$this->z,
+				$this->x + $f,
+				$this->y + 1,
+				$this->z + 1
+			);
+		}
+
 		return null;
 	}
 
 
 	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,
@@ -48,7 +113,7 @@ class Ladder extends Transparent{
 			];
 			if(isset($faces[$face])){
 				$this->meta = $faces[$face];
-				$this->getLevel()->setBlock($block, $this, true, false, true);
+				$this->getLevel()->setBlock($block, $this, true, true);
 
 				return true;
 			}
@@ -59,7 +124,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;
@@ -69,6 +134,10 @@ class Ladder extends Transparent{
 		return false;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[$this->id, 0, 1],

src/pocketmine/block/Lapis.php

@@ -22,24 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getName(){
-		switch($item->isPickaxe()){
+		return "Lapis Lazuli Block";
-			case 5:
+	}
-				return 0.6;
+
-			case 4:
+	public function getToolType(){
-				return 0.75;
+		return Tool::TYPE_PICKAXE;
-			case 3:
+	}
-				return 1.15;
+
-			default:
+	public function getHardness(){
-				return 15;
+		return 3;
-		}
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/LapisOre.php

@@ -22,25 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getHardness(){
+		return 3;
+	}
 
-		switch($item->isPickaxe()){
+	public function getToolType(){
-			case 5:
+		return Tool::TYPE_PICKAXE;
-				return 0.6;
+	}
-			case 4:
+
-				return 0.75;
+	public function getName(){
-			case 3:
+		return "Lapis Lazuli Ore";
-				return 1.15;
-			default:
-				return 15;
-		}
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Lava.php

@@ -21,139 +21,52 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Effect;
+use pocketmine\entity\Entity;
+use pocketmine\event\entity\EntityCombustByBlockEvent;
+use pocketmine\event\entity\EntityDamageByBlockEvent;
+use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\level\Position;
 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 getBoundingBox(){
+	public function getLightLevel(){
-		return null;
+		return 15;
 	}
 
+	public function getName(){
+		return "Lava";
+	}
+
+	public function onEntityCollide(Entity $entity){
+		$entity->fallDistance *= 0.5;
+		if(!$entity->hasEffect(Effect::FIRE_RESISTANCE)){
+			$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_LAVA, 4);
+			$entity->attack($ev->getFinalDamage(), $ev);
+		}
+
+		$ev = new EntityCombustByBlockEvent($this, $entity, 15);
+		Server::getInstance()->getPluginManager()->callEvent($ev);
+		if(!$ev->isCancelled()){
+			$entity->setOnFire($ev->getDuration());
+		}
+
+		$entity->resetFallDistance();
+	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$ret = $this->getLevel()->setBlock($this, $this, true, false, true);
+		$ret = $this->getLevel()->setBlock($this, $this, true, false);
-		$this->getLevel()->scheduleUpdate(clone $this, 40);
+		$this->getLevel()->scheduleUpdate($this, $this->tickRate());
 
 		return $ret;
 	}
 
-	public function getSourceCount(){
-		$count = 0;
-		for($side = 2; $side <= 5; ++$side){
-			if($this->getSide($side) instanceof Lava){
-				$b = $this->getSide($side);
-				$level = $b->meta & 0x07;
-				if($level == 0x00){
-					$count++;
-				}
-			}
-		}
-
-		return $count;
-	}
-
-	public function checkWater(){
-		for($side = 1; $side <= 5; ++$side){
-			$b = $this->getSide($side);
-			if($b instanceof Water){
-				$level = $this->meta & 0x07;
-				if($level == 0x00){
-					$this->getLevel()->setBlock($this, new Obsidian(), false, false, true);
-				}else{
-					$this->getLevel()->setBlock($this, new Cobblestone(), false, false, true);
-				}
-			}
-		}
-	}
-
-	public function getFrom(){
-		for($side = 0; $side <= 5; ++$side){
-			$b = $this->getSide($side);
-			if($b instanceof Lava){
-				$tlevel = $b->meta & 0x07;
-				$level = $this->meta & 0x07;
-				if(($tlevel + 2) == $level || ($side == 0x01 && $level == 0x01) || ($tlevel == 6 && $level == 7)){
-					return $b;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	public function onUpdate($type){
-		return false;
-		$newId = $this->id;
-		$level = $this->meta & 0x07;
-		if($type !== Level::BLOCK_UPDATE_NORMAL){
-			return false;
-		}
-
-		if($this->checkWater()){
-			return;
-		}
-
-		$falling = $this->meta >> 3;
-		$down = $this->getSide(0);
-
-		$from = $this->getFrom();
-		if($from !== null || $level == 0x00){
-			if($level !== 0x07){
-				if($down instanceof Air || $down instanceof Lava){
-					$this->getLevel()->setBlock($down, new Lava(0x01), false, false, true);
-					Server::getInstance()->api->block->scheduleBlockUpdate(new Position($down, 0, 0, $this->level), 40, Level::BLOCK_UPDATE_NORMAL);
-				}else{
-					for($side = 2; $side <= 5; ++$side){
-						$b = $this->getSide($side);
-						if($b instanceof Lava){
-
-						}elseif($b->isFlowable === true){
-							$this->getLevel()->setBlock($b, new Lava(min($level + 2, 7)), false, false, true);
-							Server::getInstance()->api->block->scheduleBlockUpdate(Position::fromObject($b, $this->level), 40, Level::BLOCK_UPDATE_NORMAL);
-						}
-					}
-				}
-			}
-		}else{
-			//Extend Remove for Left Lavas
-			for($side = 2; $side <= 5; ++$side){
-				$sb = $this->getSide($side);
-				if($sb instanceof Lava){
-					$tlevel = $sb->meta & 0x07;
-					if($tlevel != 0x00){
-						for($s = 0; $s <= 5; $s++){
-							$ssb = $sb->getSide($s);
-							Server::getInstance()->api->block->scheduleBlockUpdate(Position::fromObject($ssb, $this->level), 40, Level::BLOCK_UPDATE_NORMAL);
-						}
-						$this->getLevel()->setBlock($sb, new Air(), false, false, true);
-					}
-				}
-				$b = $this->getSide(0)->getSide($side);
-				if($b instanceof Lava){
-					$tlevel = $b->meta & 0x07;
-					if($tlevel != 0x00){
-						for($s = 0; $s <= 5; $s++){
-							$ssb = $sb->getSide($s);
-							Server::getInstance()->api->block->scheduleBlockUpdate(Position::fromObject($ssb, $this->level), 40, Level::BLOCK_UPDATE_NORMAL);
-						}
-						$this->getLevel()->setBlock($b, new Air(), false, false, true);
-					}
-				}
-				//Server::getInstance()->api->block->scheduleBlockUpdate(Position::fromObject($b, $this->level), 10, Level::BLOCK_UPDATE_NORMAL);
-			}
-
-			$this->getLevel()->setBlock($this, new Air(), false, false, true);
-		}
-
-		return false;
-	}
-
 }

src/pocketmine/block/Leaves.php

@@ -21,9 +21,12 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\block\LeavesDecayEvent;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\Player;
+use pocketmine\Server;
 
 class Leaves extends Transparent{
 	const OAK = 0;
@@ -33,16 +36,28 @@ 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 0.2;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHEARS;
+	}
+
+	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){
@@ -51,11 +66,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;
 			}
@@ -121,16 +136,13 @@ class Leaves extends Transparent{
 				$this->meta &= 0x03;
 				$visited = [];
 				$check = 0;
-				if($this->findLog($this, $visited, 0, $check) === true){
+
-					$this->getLevel()->setBlock($this, $this, false, false, true);
+				Server::getInstance()->getPluginManager()->callEvent($ev = new LeavesDecayEvent($this));
+
+				if($ev->isCancelled() or $this->findLog($this, $visited, 0, $check) === true){
+					$this->getLevel()->setBlock($this, $this, false, false);
 				}else{
-					$this->getLevel()->setBlock($this, new Air(), false, false, true);
+					$this->getLevel()->useBreakOn($this);
-					if(mt_rand(1, 20) === 1){ //Saplings
-						$this->getLevel()->dropItem($this, Item::get($this->id, $this->meta & 0x03, 1));
-					}
-					if(($this->meta & 0x03) === self::OAK and mt_rand(1, 200) === 1){ //Apples
-						$this->getLevel()->dropItem($this, Item::get(Item::APPLE, 0, 1));
-					}
 
 					return Level::BLOCK_UPDATE_NORMAL;
 				}
@@ -142,7 +154,7 @@ class Leaves extends Transparent{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$this->meta |= 0x04;
-		$this->getLevel()->setBlock($this, $this, true, false, true);
+		$this->getLevel()->setBlock($this, $this, true);
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Leaves2.php

@@ -21,20 +21,26 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\block\LeavesDecayEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\Player;
+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){
@@ -43,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;
 			}
@@ -113,13 +119,13 @@ class Leaves2 extends Leaves{
 				$this->meta &= 0x03;
 				$visited = [];
 				$check = 0;
-				if($this->findLog($this, $visited, 0, $check) === true){
+
-					$this->getLevel()->setBlock($this, $this, false, false, true);
+				Server::getInstance()->getPluginManager()->callEvent($ev = new LeavesDecayEvent($this));
+
+				if($ev->isCancelled() or $this->findLog($this, $visited, 0, $check) === true){
+					$this->getLevel()->setBlock($this, $this, false, false);
 				}else{
-					$this->getLevel()->setBlock($this, new Air(), false, false, true);
+					$this->getLevel()->useBreakOn($this);
-					if(mt_rand(1, 20) === 1){ //Saplings
-						$this->getLevel()->dropItem($this, Item::get($this->id, $this->meta & 0x03, 1));
-					}
 
 					return Level::BLOCK_UPDATE_NORMAL;
 				}
@@ -131,7 +137,7 @@ class Leaves2 extends Leaves{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$this->meta |= 0x04;
-		$this->getLevel()->setBlock($this, $this, true, false, true);
+		$this->getLevel()->setBlock($this, $this, true);
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Liquid.php

@@ -22,10 +22,436 @@
 namespace pocketmine\block;
 
 
-class Liquid extends Transparent{
+use pocketmine\entity\Entity;
-	public $isLiquid = true;
+use pocketmine\item\Item;
-	public $breakable = false;
+use pocketmine\level\Level;
-	public $isReplaceable = true;
+use pocketmine\math\Vector3;
-	public $isSolid = false;
+
-	public $isFullBlock = true;
+abstract class Liquid extends Transparent{
+
+	/** @var Vector3 */
+	private $temporalVector = null;
+
+	public function hasEntityCollision(){
+		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];
+	public $flowCost = [0, 0, 0, 0];
+
+	public function getFluidHeightPercent(){
+		$d = $this->meta;
+		if($d >= 8){
+			$d = 0;
+		}
+
+		return ($d + 1) / 9;
+	}
+
+	protected function getFlowDecay(Vector3 $pos){
+		if(!($pos instanceof Block)){
+			$pos = $this->getLevel()->getBlock($pos);
+		}
+
+		if($pos->getId() !== $this->getId()){
+			return -1;
+		}else{
+			return $pos->getDamage();
+		}
+	}
+
+	protected function getEffectiveFlowDecay(Vector3 $pos){
+		if(!($pos instanceof Block)){
+			$pos = $this->getLevel()->getBlock($pos);
+		}
+
+		if($pos->getId() !== $this->getId()){
+			return -1;
+		}
+
+		$decay = $pos->getDamage();
+
+		if($decay >= 8){
+			$decay = 0;
+		}
+
+		return $decay;
+	}
+
+	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){
+
+			$x = $this->x;
+			$y = $this->y;
+			$z = $this->z;
+
+			if($j === 0){
+				--$x;
+			}elseif($j === 1){
+				++$x;
+			}elseif($j === 2){
+				--$z;
+			}elseif($j === 3){
+				++$z;
+			}
+			$sideBlock = $this->getLevel()->getBlock($this->temporalVector->setComponents($x, $y, $z));
+			$blockDecay = $this->getEffectiveFlowDecay($sideBlock);
+
+			if($blockDecay < 0){
+				if(!$sideBlock->canBeFlowedInto()){
+					continue;
+				}
+
+				$blockDecay = $this->getEffectiveFlowDecay($this->getLevel()->getBlock($this->temporalVector->setComponents($x, $y - 1, $z)));
+
+				if($blockDecay >= 0){
+					$realDecay = $blockDecay - ($decay - 8);
+					$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->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->temporalVector->setComponents($this->x, $this->y, $this->z - 1))->canBeFlowedInto()){
+				$falling = true;
+			}elseif(!$this->getLevel()->getBlock($this->temporalVector->setComponents($this->x, $this->y, $this->z + 1))->canBeFlowedInto()){
+				$falling = true;
+			}elseif(!$this->getLevel()->getBlock($this->temporalVector->setComponents($this->x - 1, $this->y, $this->z))->canBeFlowedInto()){
+				$falling = true;
+			}elseif(!$this->getLevel()->getBlock($this->temporalVector->setComponents($this->x + 1, $this->y, $this->z))->canBeFlowedInto()){
+				$falling = true;
+			}elseif(!$this->getLevel()->getBlock($this->temporalVector->setComponents($this->x, $this->y + 1, $this->z - 1))->canBeFlowedInto()){
+				$falling = true;
+			}elseif(!$this->getLevel()->getBlock($this->temporalVector->setComponents($this->x, $this->y + 1, $this->z + 1))->canBeFlowedInto()){
+				$falling = true;
+			}elseif(!$this->getLevel()->getBlock($this->temporalVector->setComponents($this->x - 1, $this->y + 1, $this->z))->canBeFlowedInto()){
+				$falling = true;
+			}elseif(!$this->getLevel()->getBlock($this->temporalVector->setComponents($this->x + 1, $this->y + 1, $this->z))->canBeFlowedInto()){
+				$falling = true;
+			}
+
+			if($falling){
+				$vector = $vector->normalize()->add(0, -6, 0);
+			}
+		}
+
+		return $vector->normalize();
+	}
+
+	public function addVelocityToEntity(Entity $entity, Vector3 $vector){
+		$flow = $this->getFlowVector();
+		$vector->x += $flow->x;
+		$vector->y += $flow->y;
+		$vector->z += $flow->z;
+	}
+
+	public function tickRate(){
+		if($this instanceof Water){
+			return 5;
+		}elseif($this instanceof Lava){
+			return 30;
+		}
+
+		return 0;
+	}
+
+	public function onUpdate($type){
+		if($type === Level::BLOCK_UPDATE_NORMAL){
+			$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;
+
+			$flag = true;
+
+			if($decay > 0){
+				$smallestFlowDecay = -100;
+				$this->adjacentSources = 0;
+				$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlock($this->temporalVector->setComponents($this->x, $this->y, $this->z - 1)), $smallestFlowDecay);
+				$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlock($this->temporalVector->setComponents($this->x, $this->y, $this->z + 1)), $smallestFlowDecay);
+				$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlock($this->temporalVector->setComponents($this->x - 1, $this->y, $this->z)), $smallestFlowDecay);
+				$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlock($this->temporalVector->setComponents($this->x + 1, $this->y, $this->z)), $smallestFlowDecay);
+
+				$k = $smallestFlowDecay + $multiplier;
+
+				if($k >= 8 or $smallestFlowDecay < 0){
+					$k = -1;
+				}
+
+				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{
+						$k = $topFlowDecay | 0x08;
+					}
+				}
+
+				if($this->adjacentSources >= 2 and $this instanceof Water){
+					$bottomBlock = $this->level->getBlock($this->level->getBlock($this->temporalVector->setComponents($this->x, $this->y - 1, $this->z)));
+					if($bottomBlock->isSolid()){
+						$k = 0;
+					}elseif($bottomBlock instanceof Water and $bottomBlock->getDamage() === 0){
+						$k = 0;
+					}
+				}
+
+				if($this instanceof Lava and $decay < 8 and $k < 8 and $k > 1 and mt_rand(0, 4) !== 0){
+					$k = $decay;
+					$flag = false;
+				}
+
+				if($k !== $decay){
+					$decay = $k;
+					if($decay < 0){
+						$this->getLevel()->setBlock($this, new Air(), true);
+					}else{
+						$this->getLevel()->setBlock($this, Block::get($this->id, $decay), true);
+						$this->getLevel()->scheduleUpdate($this, $this->tickRate());
+					}
+				}elseif($flag){
+					//$this->getLevel()->scheduleUpdate($this, $this->tickRate());
+					//$this->updateFlow();
+				}
+			}else{
+				//$this->updateFlow();
+			}
+
+			$bottomBlock = $this->level->getBlock($this->temporalVector->setComponents($this->x, $this->y - 1, $this->z));
+
+			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;
+				}
+
+				if($decay >= 8){
+					$this->getLevel()->setBlock($bottomBlock, Block::get($this->id, $decay), true);
+					$this->getLevel()->scheduleUpdate($bottomBlock, $this->tickRate());
+				}else{
+					$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->canBeFlowedInto())){
+				$flags = $this->getOptimalFlowDirections();
+
+				$l = $decay + $multiplier;
+
+				if($decay >= 8){
+					$l = 1;
+				}
+
+				if($l >= 8){
+					$this->checkForHarden();
+					return;
+				}
+
+				if($flags[0]){
+					$this->flowIntoBlock($this->level->getBlock($this->temporalVector->setComponents($this->x - 1, $this->y, $this->z)), $l);
+				}
+
+				if($flags[1]){
+					$this->flowIntoBlock($this->level->getBlock($this->temporalVector->setComponents($this->x + 1, $this->y, $this->z)), $l);
+				}
+
+				if($flags[2]){
+					$this->flowIntoBlock($this->level->getBlock($this->temporalVector->setComponents($this->x, $this->y, $this->z - 1)), $l);
+				}
+
+				if($flags[3]){
+					$this->flowIntoBlock($this->level->getBlock($this->temporalVector->setComponents($this->x, $this->y, $this->z + 1)), $l);
+				}
+			}
+
+			$this->checkForHarden();
+
+		}
+	}
+
+	private function flowIntoBlock(Block $block, $newFlowDecay){
+		if($block->canBeFlowedInto()){
+			if($block->getId() > 0){
+				$this->getLevel()->useBreakOn($block);
+			}
+
+			$this->getLevel()->setBlock($block, Block::get($this->getId(), $newFlowDecay), true);
+			$this->getLevel()->scheduleUpdate($block, $this->tickRate());
+		}
+	}
+
+	private function calculateFlowCost(Block $block, $accumulatedCost, $previousDirection){
+		$cost = 1000;
+
+		for($j = 0; $j < 4; ++$j){
+			if(
+				($j === 0 and $previousDirection === 1) or
+				($j === 1 and $previousDirection === 0) or
+				($j === 2 and $previousDirection === 3) or
+				($j === 3 and $previousDirection === 2)
+			){
+				$x = $block->x;
+				$y = $block->y;
+				$z = $block->z;
+
+				if($j === 0){
+					--$x;
+				}elseif($j === 1){
+					++$x;
+				}elseif($j === 2){
+					--$z;
+				}elseif($j === 3){
+					++$z;
+				}
+				$blockSide = $this->getLevel()->getBlock($this->temporalVector->setComponents($x, $y, $z));
+
+				if(!$blockSide->canBeFlowedInto() and !($blockSide instanceof Liquid)){
+					continue;
+				}elseif($blockSide instanceof Liquid and $blockSide->getDamage() === 0){
+					continue;
+				}elseif($this->getLevel()->getBlock($this->temporalVector->setComponents($x, $y - 1, $z))->canBeFlowedInto()){
+					return $accumulatedCost;
+				}
+
+				if($accumulatedCost >= 4){
+					continue;
+				}
+
+				$realCost = $this->calculateFlowCost($blockSide, $accumulatedCost + 1, $j);
+
+				if($realCost < $cost){
+					$cost = $realCost;
+				}
+			}
+		}
+
+		return $cost;
+	}
+
+	public function getHardness(){
+		return 100;
+	}
+
+	private function getOptimalFlowDirections(){
+		if($this->temporalVector === null){
+			$this->temporalVector = new Vector3(0, 0, 0);
+		}
+
+		for($j = 0; $j < 4; ++$j){
+			$this->flowCost[$j] = 1000;
+
+			$x = $this->x;
+			$y = $this->y;
+			$z = $this->z;
+
+			if($j === 0){
+				--$x;
+			}elseif($j === 1){
+				++$x;
+			}elseif($j === 2){
+				--$z;
+			}elseif($j === 3){
+				++$z;
+			}
+			$block = $this->getLevel()->getBlock($this->temporalVector->setComponents($x, $y, $z));
+
+			if(!$block->canBeFlowedInto() and !($block instanceof Liquid)){
+				continue;
+			}elseif($block instanceof Liquid and $block->getDamage() === 0){
+				continue;
+			}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);
+			}
+		}
+
+		$minCost = $this->flowCost[0];
+
+		for($i = 1; $i < 4; ++$i){
+			if($this->flowCost[$i] < $minCost){
+				$minCost = $this->flowCost[$i];
+			}
+		}
+
+		for($i = 0; $i < 4; ++$i){
+			$this->isOptimalFlowDirection[$i] = ($this->flowCost[$i] === $minCost);
+		}
+
+		return $this->isOptimalFlowDirection;
+	}
+
+	private function getSmallestFlowDecay(Vector3 $pos, $decay){
+		$blockDecay = $this->getFlowDecay($pos);
+
+		if($blockDecay < 0){
+			return $decay;
+		}elseif($blockDecay === 0){
+			++$this->adjacentSources;
+		}elseif($blockDecay >= 8){
+			$blockDecay = 0;
+		}
+
+		return ($decay >= 0 && $blockDecay >= $decay) ? $decay : $blockDecay;
+	}
+
+	private function checkForHarden(){
+		if($this instanceof Lava){
+			$colliding = false;
+			for($side = 0; $side <= 5 and !$colliding; ++$side){
+				$colliding = $this->getSide($side) instanceof Water;
+			}
+
+			if($colliding){
+				if($this->getDamage() === 0){
+					$this->getLevel()->setBlock($this, Block::get(Item::OBSIDIAN), true);
+				}elseif($this->getDamage() <= 4){
+					$this->getLevel()->setBlock($this, Block::get(Item::COBBLESTONE), true);
+				}
+			}
+		}
+	}
+
+	public function getBoundingBox(){
+		return null;
+	}
+
+	public function getDrops(Item $item){
+		return [];
+	}
 }

src/pocketmine/block/LitPumpkin.php

@@ -22,19 +22,38 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 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 1;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
+	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){
 		if($player instanceof Player){
-			$this->meta = (int) $player->getDirection();
+			$this->meta = ((int) $player->getDirection() + 5) % 4;
 		}
-		$this->getLevel()->setBlock($block, $this, true, false, true);
+		$this->getLevel()->setBlock($block, $this, true, true);
 
 		return true;
 	}

src/pocketmine/block/Melon.php

@@ -22,11 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 1;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/MelonStem.php

@@ -21,59 +21,54 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
-use pocketmine\Player;
+use pocketmine\Server;
+
+class MelonStem extends Crops{
+
+	protected $id = self::MELON_STEM;
+
+	public function getName(){
+		return "Melon Stem";
+	}
 
-class MelonStem extends Flowable{
 	public function __construct($meta = 0){
-		parent::__construct(self::MELON_STEM, $meta, "Melon Stem");
+		$this->meta = $meta;
-		$this->isActivable = true;
-		$this->hardness = 0;
-	}
-
-	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){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
-
-			return true;
-		}
-
-		return false;
 	}
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //TODO: Replace with common break method
+			if($this->getSide(0)->isTransparent() === true){
-				$this->getLevel()->dropItem($this, Item::get(Item::MELON_SEEDS, 0, mt_rand(0, 2)));
+				$this->getLevel()->useBreakOn($this);
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
-
 				return Level::BLOCK_UPDATE_NORMAL;
 			}
 		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
 			if(mt_rand(0, 2) == 1){
 				if($this->meta < 0x07){
-					++$this->meta;
+					$block = clone $this;
-					$this->getLevel()->setBlock($this, $this, true, false, true);
+					++$block->meta;
+					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+					if(!$ev->isCancelled()){
+						$this->getLevel()->setBlock($this, $ev->getNewState(), true);
+					}
 
 					return Level::BLOCK_UPDATE_RANDOM;
 				}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)){
-						$this->getLevel()->setBlock($side, new Melon(), true, false, true);
+						Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($side, new Melon()));
+						if(!$ev->isCancelled()){
+							$this->getLevel()->setBlock($side, $ev->getNewState(), true);
+						}
 					}
 				}
 			}
@@ -84,20 +79,6 @@ class MelonStem extends Flowable{
 		return false;
 	}
 
-	public function onActivate(Item $item, Player $player = null){
-		if($item->getID() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
-			$this->meta = 0x07;
-			$this->getLevel()->setBlock($this, $this, true, false, true);
-			if(($player->gamemode & 0x01) === 0){
-				$item->count--;
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
 	public function getDrops(Item $item){
 		return [
 			[Item::MELON_SEEDS, 0, mt_rand(0, 2)],

src/pocketmine/block/MonsterSpawner.php

@@ -22,31 +22,29 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 5;
-            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 getToolType(){
-        return [];
+		return Tool::TYPE_PICKAXE;
-    }
+	}
+
+	public function getName(){
+		return "Monster Spawner";
+	}
+
+	public function getDrops(Item $item){
+		return [];
+	}
 }

src/pocketmine/block/MossStone.php

@@ -22,29 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getName(){
+		return "Moss Stone";
+	}
 
-		switch($item->isPickaxe()){
+	public function getHardness(){
-			case 5:
+		return 2;
-				return 0.4;
+	}
-			case 4:
+
-				return 0.5;
+	public function getToolType(){
-			case 3:
+		return Tool::TYPE_PICKAXE;
-				return 0.75;
-			case 2:
-				return 0.25;
-			case 1:
-				return 1.5;
-			default:
-				return 10;
-		}
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Mycelium.php

@@ -21,14 +21,31 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 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 getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
+	public function getHardness(){
+		return 0.6;
 	}
 
 	public function getDrops(Item $item){
@@ -43,11 +60,13 @@ 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){
-					$this->getLevel()->setBlock($block, new Mycelium());
+					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($block, $this, new Mycelium()));
+					if(!$ev->isCancelled()){
+						$this->getLevel()->setBlock($block, $ev->getNewState());
+					}
 				}
 			}
 		}

src/pocketmine/block/NetherBrick.php

@@ -22,29 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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 getBreakTime(Item $item){
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
 
-		switch($item->isPickaxe()){
+	public function getName(){
-			case 5:
+		return "Nether Bricks";
-				return 0.4;
+	}
-			case 4:
+
-				return 0.5;
+	public function getHardness(){
-			case 3:
+		return 2;
-				return 0.75;
-			case 2:
-				return 0.25;
-			case 1:
-				return 1.5;
-			default:
-				return 10;
-		}
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/NetherBrickStairs.php

@@ -22,9 +22,26 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class NetherBrickStairs extends Stair{
+
+	protected $id = self::NETHER_BRICKS_STAIRS;
+
+	public function getName(){
+		return "Nether Bricks Stairs";
+	}
+
+	public function getHardness(){
+		return 2;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	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

@@ -22,29 +22,26 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Netherrack extends Solid{
+
+	protected $id = self::NETHERRACK;
+
 	public function __construct(){
-		parent::__construct(self::NETHERRACK, 0, "Netherrack");
+
-		$this->hardness = 2;
 	}
 
-	public function getBreakTime(Item $item){
+	public function getName(){
+		return "Netherrack";
+	}
 
-		switch($item->isPickaxe()){
+	public function getHardness(){
-			case 5:
+		return 2;
-				return 0.1;
+	}
-			case 4:
+
-				return 0.1;
+	public function getToolType(){
-			case 3:
+		return Tool::TYPE_PICKAXE;
-				return 0.15;
-			case 2:
-				return 0.05;
-			case 1:
-				return 0.3;
-			default:
-				return 2;
-		}
 	}
 
 	public function getDrops(Item $item){