Anti-cheat fixes, settings and API (#287)

* Added options to disable movement checks and anti-instabreak and API methods to control this
* Fixed anti-flight false positives
* Fix flight toggle kick cannot be disabled
* Added PlayerIllegalMoveEvent

.editorconfig

@@ -0,0 +1,6 @@
+# http://editorconfig.org/
+root = yes
+
+[*]
+indent_size = 4
+indent_style = tab

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,23 @@
+### Issue description
+<!--- use our forum https://forums.pmmp.io for questions -->
+Write a short description about the issue
+
+### Steps to reproduce the issue
+<!--- help us find the problem by adding steps to reproduce the issue -->
+1. ...
+2. ...
+
+### OS and versions
+<!--- use the 'version' command in PocketMine-MP
+NOTE: LATEST is not a valid version. 
+PocketMine version should include Jenkins build number and/or git commit hash.
+ALSO NOTE: NO support whatsoever will be provided for forks or spoons of PocketMine. Issues relating to non-official distributions will be closed as spam. Please send such issues to whoever is responsible for the fork or spoon you are using.
+-->
+* PocketMine-MP:
+* PHP:
+* Server OS:
+* Game version: PE/Win10 (delete as appropriate)
+
+### Crashdump, backtrace or other files
+<!--- please use gist or anything else and add links here -->
+* ...

.gitignore

@@ -2,14 +2,16 @@ players/*
 worlds/*
 plugins/*
 bin/*
+timings/*
 *.log
 *.txt
 *.phar
 server.properties
-pocketmine.yml
+/pocketmine.yml
+memoryDump_*/*
 
 # Common IDEs
-.idea/*
+.idea/
 nbproject/*
 
 # Windows image file caches

.gitmodules

@@ -1,11 +1,16 @@
-[submodule "src/pocketmine/gui"]
-	path = src/pocketmine/gui
-	url = https://github.com/PocketMine/PocketMine-MP-GUI.git
-	branch = master
 [submodule "src/raklib"]
 	path = src/raklib
-	url = https://github.com/PocketMine/RakLib.git
+	url = https://github.com/pmmp/RakLib.git
 	branch = master
 [submodule "src/spl"]
 	path = src/spl
-	url = https://github.com/PocketMine/PocketMine-SPL.git
+	url = https://github.com/pmmp/PocketMine-SPL.git
+[submodule "src/pocketmine/lang/locale"]
+	path = src/pocketmine/lang/locale
+	url = https://github.com/pmmp/PocketMine-Language.git
+[submodule "tests/preprocessor"]
+	path = tests/preprocessor
+	url = https://github.com/pmmp/preprocessor.git
+[submodule "tests/plugins/PocketMine-DevTools"]
+	path = tests/plugins/PocketMine-DevTools
+	url = https://github.com/pmmp/PocketMine-DevTools.git

.mailmap

@@ -1,5 +0,0 @@
-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,21 +1,15 @@
 language: php
 
 php:
- - 5.6
-
-branches:
- - master
+ - 7.0
 
 before_script:
- - mkdir plugins
- - wget -O plugins/DevTools.phar https://github.com/PocketMine/DevTools/releases/download/v1.9.0/DevTools_v1.9.0.phar
- - pecl install channel://pecl.php.net/pthreads-2.0.10
- - pecl install channel://pecl.php.net/weakref-0.2.4
- - echo | pecl install channel://pecl.php.net/yaml-1.1.1
+ - pecl install channel://pecl.php.net/pthreads-3.1.6
+ - pecl install channel://pecl.php.net/weakref-0.3.2
+ - echo | pecl install channel://pecl.php.net/yaml-2.0.0
 
 script:
- - php tests/TravisTest.php
- 
+ - ./tests/travis.sh
+
 notifications:
  email: false
- #webhooks: http://n.tkte.ch/h/214/wsNvmG43-ncxUVRrFPwSM-r0

CONTRIBUTING.md

@@ -2,63 +2,107 @@
 
 # PocketMine-MP Contribution Guidelines
 
-You must follow these guidelines if you wish to contribute to the PocketMine-MP code base, or participate in issue tracking.
-
-## I have a question
-* For questions, please refer to the _#pocketmine_ or _#mcpedevs_ IRC channel on Freenode. There is a [WebIRC](http://webchat.freenode.net?channels=pocketmine,mcpedevs&uio=d4) if you want.
-* You can ask directly to _[@PocketMine](https://twitter.com/PocketMine)_ in Twitter, but don't expect an immediate reply.
-* You may use our [Forum](http://forums.pocketmine.net) to ask questions.
-* We do not accept questions or support requests in our issue tracker.
 
 ## Creating an Issue
- - First, use the [Issue Search](https://github.com/PocketMine/PocketMine-MP/search?ref=cmdform&type=Issues) to check if anyone has reported it.
- - If your issue is related to a plugin, you must contact their original author instead of reporting it here.
- - If your issue is related to a PocketMine official plugin, or our Android application, you must create an issue on that specific repository.
- - **Support requests are not bugs.** Issues such as "How do I do this" are not bugs and are closed as soon as a collaborator spots it. They are referred to our Forum to seek assistance.
- - **No generic titles** such as "Question", "Help", "Crash Report" etc. If an issue has a generic title they will either be closed on the spot, or a collaborator will edit it to describe the actual symptom.
- - Information must be provided in the issue body, not in the title. No tags are allowed in the title, and do not change the title if the issue has been solved.
- - Similarly, no generic issue reports. It is the issue submitter's responsibility to provide us an issue that is **trackable, debuggable, reproducible, reported professionally and is an actual bug**. If you do not provide us with a summary or instructions on how to reproduce the issue, it is a support request until the actual bug has been found and therefore the issue is closed.
+- If you are reporting a bug:
+ - **make sure that you are using the latest supported version** before opening an issue.
+ - **test it on a clean test server, WITHOUT PLUGINS**, to see if the issue still occurs. If not then it may be a plugin issue. Please also indicate the result of such tests.
+
+- [Search the issue tracker](https://github.com/pmmp/PocketMine-MP/issues?utf8=%E2%9C%93&q=is%3Aissue) to check if anyone has already reported it, to avoid needlessly creating duplicate issues. Make sure you also check closed issues, as an issue you think is valid may already have been resolved.
+
+- If your issue is related to a plugin, **do not report here, contact the plugin's original author** instead.
+
+- **Support requests are not bugs.** Issues such as "How do I do this" are not bugs and will be closed. If you need help, please see [here](README.md#discussion) and do not misuse our issue tracker.
+
+- **No generic titles** such as "Question", "Help", "Crash Report" etc. A good issue report provides a quick summary in the title. If you just got a crash report but you don't understand it, please look for a line starting with `Message`. It summarizes the bug.
+
+- Information must be provided in the issue body, not in the title. No tags like `[BUG]` are allowed in the title, including `[SOLVED]` for solved issues.
+
+- Similarly, no generic issue reports. For bugs, it is the issue author's responsibility to provide us an issue that is **trackable, debuggable, reproducible, reported professionally and is an actual bug**. If you do not provide us with a summary or instructions on how to reproduce the issue, it will be treated as spam and will therefore be closed. 
+<br>In simple words, if your issue does not appear to be a bug or a feature request, or if the issue cannot be properly confirmed to be valid, the issue will be closed until further information is provided.
+
+- To express appreciation, objection, confusion or other supported reactions on pull requests, issues or comments on them, use GitHub [reactions](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments) rather than posting an individual comment with an emoji only. This helps keeping the issue/pull request conversation clean and readable.
+
+- If your issue is related to the PocketMine-MP website, forums, etc., please [talk to a human directly](README.md#discussion).
+
+
 
 ## Contributing Code
-* Use the [Pull Request](https://github.com/PocketMine/PocketMine-MP/pull/new) system, your request will be checked and discussed.
-* __Create a single branch for that pull request__
-* Code using the syntax as in PocketMine-MP. See below for an example.
-* The code must be clear and written in English, comments included.
-* Use descriptive commit titles
-* __No merge commits are allowed, or multiple features per pull request__
+- To contribute code to the repository, [fork it on GitHub](https://github.com/pmmp/PocketMine-MP/fork), create a branch on your fork, and make your changes on your fork. You can then make a [pull request](https://github.com/pmmp/PocketMine-MP/pull/new) to the project to compare your branch to ours and propose your changes to our repository. We use the Pull Request system to allow members of the team to review changes before they are merged.
+
+- By proposing a pull request to the project, you agree to your code being distributed within PocketMine-MP under the [LGPL license](LICENSE).
+
+- At PocketMine, **we enforce a very high standard for contributions**. This is because PocketMine-MP and its related projects are used very widely in production. While this might seem like we are being mean at times, **our priority is what is best for PocketMine-MP itself**. We try to ensure that our project's codebase is as clean as possible and ensure that only top-quality material makes it through to PocketMine-MP itself. **If a contribution does not live up to our standards, changes may be requested or the pull request may be closed.**
+
+- **Your pull request will be checked and discussed in due time.** Since the team is scattered all around the world, your PR may not receive any attention for some time.
+
+- **Avoid using GitHub Web Editor**. The web editor lacks most useful GIT features and **should only be used for very minor changes**. It is immediately clear if the web editor has been used, and if so the PR is more likely to be rejected. If you want to make serious contributions, **please learn how to use [GIT version control](https://git-scm.com/)**.
+
+- **Do not copy-paste code**. There are potential license issues implicit with copy-pasting, and copy-paste usually indicates a lack of understanding of the actual code. Copy-pasted code is obvious a mile off and **any PR like this is likely to be closed**. If you want to use somebody else's code from a Git repository, **use [GIT's cherry-pick feature](https://git-scm.com/docs/git-cherry-pick)** to cherry-pick the commit. **Cherry-picking is the politer way to copy somebody's changes** and retains all the original accreditation, so there is no need for copy-pasted commits with descriptions like `Some code, thanks @exampleperson`.
+
+- In addition to the above, **make sure you can explain your changes**. If you can't provide a good explanation of changes, your PR may be rejected.
+
+- **Create a new branch for each pull request.** Do not create a pull request with commits that exist in another pull request.
+
+- **Code should use the same style as in PocketMine-MP.** See [below](#code-syntax) for an example.
+
+- **The code must be clear** and written in English, comments included.
+
+- **Use descriptive commit titles.** You can see an example [here](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+
+- **Try to stick to one change per commit.** This ensures that if you create a PR with several changes, we can decide which ones we wish to include and which ones not to include.
+
+- **It is inadvisable to create pull requests with large commits** unless this has been discussed with the team beforehand. Large pull requests are difficult to review, and such pull requests may end up being closed. The only exception is when all features in the pull request are related to each other, and share the same core changes.
+
+- **You may be asked to rebase your pull request** if the branch becomes outdated and/or if possibly conflicting changes are made to the target branch. To see how to do this, read [this page](https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request).
+
 
 **Thanks for contributing to PocketMine-MP!**
 
+
+
 ### Code Syntax
 
 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.
-* 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.
+
+- 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 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.
+- All code SHOULD have parameter and type declarations where possible.
+- Strict types SHOULD be enabled on new files where it is sensible to do so.
 
 ```php
-<?php 
+<?php
+
+declare(strict_types = 1);
 
 namespace pocketmine\example;
 
 class ExampleClass{
+
 	const EXAMPLE_CLASS_CONSTANT = 1;
+
 	public $examplePublicVariable = "defaultValue";
 	private $examplePrivateVariable;
-	
-	public function __construct($firstArgument, &$secondArgument = null){
-		if($firstArgument === "exampleValue"){ //Remember to use === instead == when possible
+
+	/**
+	 * Creates an instance of ExampleClass
+	 *
+	 * @param string      $firstArgument  the first argument
+	 * @param string|null $secondArgument default null
+	 */
+	public function __construct(string $firstArgument, &$secondArgument = null){
+		if($firstArgument === "exampleValue"){ //Remember to use === instead of == when possible
 			//do things
 		}elseif($firstArgument === "otherValue"){
 			$secondArgument = function(){
-				return [
+				$this->examplePrivateVariable = [
 					0 => "value1",
 					1 => "value2",
 					2 => "value3",
@@ -66,13 +110,18 @@ class ExampleClass{
 					4 => "value5",
 					5 => "value6",
 				];
-			}
+			};
 		}
 	}
 
+	public function doStuff(string $stuff) : string{
+		return $stuff;
+	}
+
 }
 ```
 
+<!-- TODO: RFC and voting on the forums instead -->
 ### RFC and Voting
 * These are big Pull Requests or contributions that change important behavior.
 * RFCs will be tagged with the *PR: RFC* label
@@ -82,59 +131,4 @@ class ExampleClass{
 * 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
-To provide a concise bug tracking environment, prevent the issue tracker from over flowing and to keep support requests out of the bug tracker, PocketMine-MP uses a label scheme a bit different from the default GitHub Issues labels.
-
-PocketMine-MP uses GitHub Issues Labels. There are a total of 12 labels.
-
-Note: For future reference, labels must not be longer than 15 letters.
-
-#### Categories
-Category labels are prefixed by `C:`. Multiple category labels may be applied to a single issue(but try to keep this to a minimum and do not overuse category labels).
- - C: Core - This label is applied when the bug results in a fatal crash, or is related to neither Gameplay nor Plugin API.
- - C: Gameplay - This label is applied when the bug effects the gameplay.
- - C: API - This label is applied when the bug effects the Plugin API.
-
-#### Pull Requests
-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.
- - Reproduced - This label is applied when the bug has been reproduced, or multiple people are reporting the same issue and symptoms in which case it is automatically assumed that the bug has been reproduced in different environments.
- - Debugged - This label is applied when the cause of the bug has been found.
- - Priority - This label is applied when the bug is easy to fix, or if the scale of the bug is global.
- - Won't Fix - This label is applied if the bug has been decided not be fixed for some reason. e.g. when the bug benefits gameplay. *This label may only be applied to a closed issue.*
-
-#### Miscellaneous
-Miscellaneous labels are labels that show status not related to debugging that bug. The To-Do label and the Mojang label may not be applied to a single issue at the same time.
- - To-Do - This label is applied when the issue is not a bug, but a feature request or a list of features to be implemented that count towards a milestone.
- - Mojang - This label is applied when the issue is suspected of being caused by the Minecraft: Pocket Edition client, but has not been confirmed.
- - Invalid - This label is applied when the issue is reporting a false bug that works as intended, a support request, etc. *This label may only be applied to a closed issue.*
-
-### Closing Issues
-To keep the bug tracker clear of non-related issues and to prevent it from overflowing, **issues must be closed as soon as possible** (This may sound unethical, but it is MUCH better than having the BUG TRACKER filled with SUPPORT REQUESTS and "I NEED HELP").
-
-If an issue does not conform to the "Creating an Issue" guidelines above, the issue should be closed.
-
-### Milestones
-PocketMine-MP uses GitHub Milestones to set a goal for a new release. A milestone is set on the following occasions.
-
- - A new Beta release
- - A new Stable release
-
-A milestone must use the following format:
-```
-Alpha_<version_number> [release_title][release_version]
-```
-For example:
-```
-Alpha_1.4 beta2
-```
+* RFCs with complex voting options will specify the vote percentage or other details.

README.md

@@ -1,5 +1,44 @@
-# ![PocketMine-MP](http://cdn.pocketmine.net/img/PocketMine-MP-h.png)
+# [![PocketMine-MP](http://cdn.pocketmine.net/img/PocketMine-MP-h.png)](https://pmmp.io)
 
+__A highly customisable, open source server software for Minecraft: Pocket Edition written in PHP__
+
+[![Build Status](https://travis-ci.org/pmmp/PocketMine-MP.svg?branch=master)](https://travis-ci.org/pmmp/PocketMine-MP)
+
+### Setup, help & support, FAQs
+Head over to the [documentation site](http://pmmp.readthedocs.org/).
+If you don't find what you're looking for there, [talk to a human](#discussion). Please do not use our issue tracker for support requests.
+
+### Discussion
+- [Forums](https://forums.pmmp.io/)
+- [#pmmp + #pocketmine channel IRC](http://webchat.freenode.net/?channels=pmmp,pocketmine)
+
+### Plugins
+There are a very wide range of already-written plugins available which you can use to customise your server. Check out the [old plugin repository](http://plugins.pocketmine.net/), [Poggit](https://poggit.pmmp.io) or just search GitHub.
+
+### For developers
+ * [Latest API documentation](https://jenkins.pmmp.io/job/PocketMine-MP%20Docs/doxygen/) - Doxygen documentation generated from development
+ * [DevTools](https://github.com/pmmp/PocketMine-DevTools/) - A development tools plugin for creating plugins.
+
+### Can I contribute?
+Yes you can! Contributions are welcomed provided that they comply with our [Contributing Guidelines](CONTRIBUTING.md). Please ensure you read the relevant sections of the guidelines carefully before making a Pull Request or opening an Issue.
+
+### Where can I get the latest .phar?
+Head over to our [official Jenkins server](https://jenkins.pmmp.io/)
+
+## Third-party Libraries/Protocols Used
+* __[PHP Sockets](http://php.net/manual/en/book.sockets.php)__
+* __[PHP mbstring](http://php.net/manual/en/book.mbstring.php)__
+* __[PHP SQLite3](http://php.net/manual/en/book.sqlite3.php)__
+* __[PHP BCMath](http://php.net/manual/en/book.bc.php)__
+* __[PHP pthreads](http://pthreads.org/)__ by _[krakjoe](https://github.com/krakjoe)_: Threading for PHP - Share Nothing, Do Everything.
+* __[PHP YAML](https://code.google.com/p/php-yaml/)__ by _Bryan Davis_: The Yaml PHP Extension provides a wrapper to the LibYAML library.
+* __[LibYAML](http://pyyaml.org/wiki/LibYAML)__ by _Kirill Simonov_: A YAML 1.1 parser and emitter written in C.
+* __[cURL](http://curl.haxx.se/)__: cURL is a command line tool for transferring data with URL syntax
+* __[Zlib](http://www.zlib.net/)__: A Massively Spiffy Yet Delicately Unobtrusive Compression Library
+* __[Source RCON Protocol](https://developer.valvesoftware.com/wiki/Source_RCON_Protocol)__
+* __[UT3 Query Protocol](http://wiki.unrealadmin.org/UT3_query_protocol)__
+
+## Licensing information
 
 	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,42 +53,4 @@
 	You should have received a copy of the GNU Lesser General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-__PocketMine-MP is a free, open-source software that creates Minecraft: Pocket Edition servers and allows extending its functionalities__
-
-### [Homepage](http://www.pocketmine.net/)
-
-### [Forums](http://forums.pocketmine.net/)
-
-### [Documentation](http://pocketmine-mp.readthedocs.org/)
-
-### [Plugin Repository](http://plugins.pocketmine.net/)
-
-<!--## [FAQ: Frequently Asked Questions](https://github.com/PocketMine/PocketMine-MP/wiki/Frequently-Asked-Questions)-->
-
-### [Official Jenkins server](http://jenkins.pocketmine.net/)
-
-### API Documentation
- * [Official Doxygen-generated documentation](http://docs.pocketmine.net/)
- * [Latest Doxygen generated from development](http://jenkins.pocketmine.net/job/PocketMine-MP-doc/doxygen/)
-
-### [Twitter @PocketMine](https://twitter.com/PocketMine)
-
-### IRC Chat #pocketmine (or #mcpedevs) @ irc.freenode.net
-[#pocketmine + #mcpedevs channel WebIRC](http://webchat.freenode.net/?channels=pocketmine,mcpedevs)
-
-### Want to contribute?
-* Check the [Contributing Guidelines](CONTRIBUTING.md)
-
-
-## Third-party Libraries/Protocols Used
-* __[PHP Sockets](http://php.net/manual/en/book.sockets.php)__
-* __[PHP SQLite3](http://php.net/manual/en/book.sqlite3.php)__
-* __[PHP BCMath](http://php.net/manual/en/book.bc.php)__
-* __[PHP pthreads](http://pthreads.org/)__ by _[krakjoe](https://github.com/krakjoe)_: Threading for PHP - Share Nothing, Do Everything.
-* __[PHP YAML](https://code.google.com/p/php-yaml/)__ by _Bryan Davis_: The Yaml PHP Extension provides a wrapper to the LibYAML library.
-* __[LibYAML](http://pyyaml.org/wiki/LibYAML)__ by _Kirill Simonov_: A YAML 1.1 parser and emitter written in C.
-* __[cURL](http://curl.haxx.se/)__: cURL is a command line tool for transferring data with URL syntax
-* __[Zlib](http://www.zlib.net/)__: A Massively Spiffy Yet Delicately Unobtrusive Compression Library
-* __[Source RCON Protocol](https://developer.valvesoftware.com/wiki/Source_RCON_Protocol)__
-* __[UT3 Query Protocol](http://wiki.unrealadmin.org/UT3_query_protocol)__
+pmmp/PocketMine are not affiliated with Mojang. All brands and trademarks belong to their respective owners. PocketMine-MP is not a Mojang-approved software, nor is it associated with Mojang.

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

@@ -0,0 +1,35 @@
+<?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;
+
+abstract class Collectable extends \Threaded implements \Collectable{
+
+	private $isGarbage = false;
+
+	public function isGarbage() : bool{
+		return $this->isGarbage;
+	}
+
+	public function setGarbage(){
+		$this->isGarbage = true;
+	}
+}

src/pocketmine/CompatibleClassLoader.php

@@ -23,10 +23,4 @@ namespace pocketmine;
 
 class CompatibleClassLoader extends \BaseClassLoader{
 
-	/**
-	 * @deprecated
-	 */
-	public function add($namespace, $paths){
-		$this->addPath(array_shift($paths));
-	}
 }

src/pocketmine/CrashDump.php

@@ -14,7 +14,7 @@
  * (at your option) any later version.
  *
  * @author PocketMine Team
-
+ * @link http://www.pocketmine.net/
  *
  *
 */
@@ -41,8 +41,14 @@ class CrashDump{
 	public function __construct(Server $server){
 		$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");
+		if(!is_dir($this->server->getDataPath()) . "crashdumps"){
+			mkdir($this->server->getDataPath() . "crashdumps");
+		}
+		$this->path = $this->server->getDataPath() . "crashdumps/" . date("D_M_j-H.i.s-T_Y", $this->time) . ".log";
+		$this->fp = @fopen($this->path, "wb");
+		if(!is_resource($this->fp)){
+			throw new \RuntimeException("Could not create Crash Dump");
+		}
 		$this->data["time"] = $this->time;
 		$this->addLine($this->server->getName() . " Crash Dump " . date("D M j H:i:s T Y", $this->time));
 		$this->addLine();
@@ -137,7 +143,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",
@@ -157,7 +163,7 @@ class CrashDump{
 			];
 			$error["fullFile"] = $error["file"];
 			$error["file"] = cleanPath($error["file"]);
-			$error["type"] = isset($errorConversion[$error["type"]]) ? $errorConversion[$error["type"]] : $error["type"];
+			$error["type"] = $errorConversion[$error["type"]] ?? $error["type"];
 			if(($pos = strpos($error["message"], "\n")) !== false){
 				$error["message"] = substr($error["message"], 0, $pos);
 			}

src/pocketmine/MemoryManager.php

@@ -0,0 +1,333 @@
+<?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;
+
+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;
+
+	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(sprintf("[Memory Manager] %sLow memory triggered, limit %gMB, using %gMB",
+			$global ? "Global " : "", round(($limit / 1024) / 1024, 2), round(($memory / 1024) / 1024, 2)));
+		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(sprintf("[Memory Manager] Freed %gMB, $cycles cycles", round(($ev->getMemoryFreed() / 1024) / 1024, 2)));
+	}
+
+	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;
+	}
+
+	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/OfflinePlayer.php

@@ -21,12 +21,12 @@
 
 namespace pocketmine;
 
-
+use pocketmine\metadata\Metadatable;
 use pocketmine\metadata\MetadataValue;
-use pocketmine\nbt\tag\Compound;
+use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\plugin\Plugin;
 
-class OfflinePlayer implements IPlayer{
+class OfflinePlayer implements IPlayer, Metadatable{
 
 	private $name;
 	private $server;
@@ -103,15 +103,15 @@ class OfflinePlayer implements IPlayer{
 	}
 
 	public function getFirstPlayed(){
-		return $this->namedtag instanceof Compound ? $this->namedtag["firstPlayed"] : null;
+		return $this->namedtag instanceof CompoundTag ? $this->namedtag["firstPlayed"] : null;
 	}
 
 	public function getLastPlayed(){
-		return $this->namedtag instanceof Compound ? $this->namedtag["lastPlayed"] : null;
+		return $this->namedtag instanceof CompoundTag ? $this->namedtag["lastPlayed"] : null;
 	}
 
 	public function hasPlayedBefore(){
-		return $this->namedtag instanceof Compound;
+		return $this->namedtag instanceof CompoundTag;
 	}
 
 	public function setMetadata($metadataKey, MetadataValue $metadataValue){

src/pocketmine/PocketMine.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,7 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
@@ -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,18 @@ namespace {
 }
 
 namespace pocketmine {
-	use LogLevel;
+	use pocketmine\network\protocol\Info as ProtocolInfo;
 	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 API_VERSION = "1.4.1";
-	const CODENAME = "絶好(Zekkou)ケーキ(Cake)";
-	const MINECRAFT_VERSION = "v0.9.5 alpha";
+	const VERSION = "1.6.2dev";
+	const API_VERSION = "3.0.0-ALPHA3";
+	const CODENAME = "Unleashed";
 
 	/*
 	 * Startup code. Do not look at it, it may harm you.
@@ -85,9 +86,15 @@ namespace pocketmine {
 	 */
 
 	if(\Phar::running(true) !== ""){
-		@define("pocketmine\\PATH", \Phar::running(true) . "/");
+		@define('pocketmine\PATH', \Phar::running(true) . "/");
 	}else{
-		@define("pocketmine\\PATH", \getcwd() . DIRECTORY_SEPARATOR);
+		@define('pocketmine\PATH', \getcwd() . DIRECTORY_SEPARATOR);
+	}
+
+	if(version_compare("7.0", PHP_VERSION) > 0){
+		echo "[CRITICAL] You must use PHP >= 7.0" . PHP_EOL;
+		echo "[CRITICAL] Please use the installer provided on the homepage." . PHP_EOL;
+		exit(1);
 	}
 
 	if(!extension_loaded("pthreads")){
@@ -97,6 +104,11 @@ namespace pocketmine {
 	}
 
 	if(!class_exists("ClassLoader", false)){
+		if(!is_file(\pocketmine\PATH . "src/spl/ClassLoader.php")){
+			echo "[CRITICAL] Unable to find the PocketMine-SPL library." . PHP_EOL;
+			echo "[CRITICAL] Please use provided builds or clone the repository recursively." . PHP_EOL;
+			exit(1);
+		}
 		require_once(\pocketmine\PATH . "src/spl/ClassLoader.php");
 		require_once(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
 		require_once(\pocketmine\PATH . "src/pocketmine/CompatibleClassLoader.php");
@@ -105,9 +117,16 @@ namespace pocketmine {
 	$autoloader = new CompatibleClassLoader();
 	$autoloader->addPath(\pocketmine\PATH . "src");
 	$autoloader->addPath(\pocketmine\PATH . "src" . DIRECTORY_SEPARATOR . "spl");
-	$autoloader->addPath(\pocketmine\PATH . "src" . DIRECTORY_SEPARATOR . "raklib");
 	$autoloader->register(true);
 
+	try{
+		if(!class_exists(RakLib::class)){
+			throw new \Exception;
+		}
+	}catch(\Exception $e){
+		echo "[CRITICAL] Unable to find the RakLib library." . PHP_EOL;
+		exit(1);
+	}
 
 	set_time_limit(0); //Who set it to 30 seconds?!?!
 
@@ -118,32 +137,49 @@ namespace pocketmine {
 	ini_set("display_startup_errors", 1);
 	ini_set("default_charset", "utf-8");
 
-	ini_set("memory_limit", "256M"); //Default
-	define("pocketmine\\START_TIME", microtime(true));
+	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\\PLUGIN_PATH", isset($opts["plugins"]) ? realpath($opts["plugins"]) . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
+	define('pocketmine\DATA', isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : \getcwd() . 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"])));
+	/**
+	 * @deprecated This constant has moved to {@link \pocketmine\network\protocol\Info} and will be removed from here in the future.
+	 */
+	const MINECRAFT_VERSION = ProtocolInfo::MINECRAFT_VERSION;
+	/**
+	 * @deprecated This constant has moved to {@link \pocketmine\network\protocol\Info} and will be removed from here in the future.
+	 */
+	const MINECRAFT_VERSION_NETWORK = ProtocolInfo::MINECRAFT_VERSION_NETWORK;
+
+
+	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 stupid program wants to read timezone data from the ini.
+			//This here is just for redundancy just in case some program wants to read timezone data from the ini.
 			ini_set("date.timezone", $timezone);
 		}else{
 			//If system timezone detection fails or timezone is an invalid value.
 			if($response = Utils::getURL("http://ip-api.com/json")
 				and $ip_geolocation_data = json_decode($response, true)
-				and $ip_geolocation_data['status'] != 'fail'
-				and date_default_timezone_set($ip_geolocation_data['timezone']))
-			{
+				and $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{
@@ -154,30 +190,46 @@ namespace pocketmine {
 		}
 	}else{
 		/*
-		 * This is here so that stupid idiots don't come to us complaining and fill up the issue tracker when they put an incorrect timezone abbreviation in php.ini apparently.
+		 * This is here so that people don't come to us complaining and fill up the issue tracker when they put
+		 * an incorrect timezone abbreviation in php.ini apparently.
 		 */
-		$default_timezone = date_default_timezone_get();
-		if(strpos($default_timezone, "/") === false){
-			$default_timezone = timezone_name_from_abbr($default_timezone);
+		$timezone = ini_get("date.timezone");
+		if(strpos($timezone, "/") === false){
+			$default_timezone = timezone_name_from_abbr($timezone);
 			ini_set("date.timezone", $default_timezone);
 			date_default_timezone_set($default_timezone);
+		}else{
+			date_default_timezone_set($timezone);
 		}
 	}
 
 	function detect_system_timezone(){
 		switch(Utils::getOS()){
 			case 'win':
-				$regex = '/(?:Time Zone:\s*\()(UTC)(\+*\-*\d*\d*\:*\d*\d*)(?:\))/';
+				$regex = '/(UTC)(\+*\-*\d*\d*\:*\d*\d*)/';
 
-				exec("systeminfo", $output);
+				/*
+				 * wmic timezone get Caption
+				 * Get the timezone offset
+				 *
+				 * Sample Output var_dump
+				 * array(3) {
+				 *	  [0] =>
+				 *	  string(7) "Caption"
+				 *	  [1] =>
+				 *	  string(20) "(UTC+09:30) Adelaide"
+				 *	  [2] =>
+				 *	  string(0) ""
+				 *	}
+				 */
+				exec("wmic timezone get Caption", $output);
 
 				$string = trim(implode("\n", $output));
 
-				//Detect the Time Zone string in systeminfo
+				//Detect the Time Zone string
 				preg_match($regex, $string, $matches);
 
-				if(!isset($matches[2]))
-				{
+				if(!isset($matches[2])){
 					return false;
 				}
 
@@ -235,6 +287,7 @@ namespace pocketmine {
 
 	/**
 	 * @param string $offset In the format of +09:00, +02:00, -04:00 etc.
+	 *
 	 * @return string
 	 */
 	function parse_offset($offset){
@@ -290,10 +343,32 @@ namespace pocketmine {
 			case "mac":
 			case "linux":
 			default:
-				exec("kill -9 " . ((int) $pid) . " > /dev/null 2>&1");
+				if(function_exists("posix_kill")){
+					posix_kill($pid, SIGKILL);
+				}else{
+					exec("kill -9 " . ((int) $pid) . " > /dev/null 2>&1");
+				}
 		}
 	}
 
+	/**
+	 * @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")){
@@ -315,10 +390,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;
@@ -328,62 +403,8 @@ 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){
-		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;
 
-	if(version_compare("5.6.0", PHP_VERSION) > 0){
-		$logger->critical("You must use PHP >= 5.6");
-		++$errors;
-	}
-
 	if(php_sapi_name() !== "cli"){
 		$logger->critical("You must run PocketMine-MP using the CLI.");
 		++$errors;
@@ -398,15 +419,11 @@ namespace pocketmine {
 	if(substr_count($pthreads_version, ".") < 2){
 		$pthreads_version = "0.$pthreads_version";
 	}
-	if(version_compare($pthreads_version, "2.0.8") < 0){
-		$logger->critical("pthreads >= 2.0.8 is required, while you have $pthreads_version.");
+	if(version_compare($pthreads_version, "3.1.5") < 0){
+		$logger->critical("pthreads >= 3.1.5 is required, while you have $pthreads_version.");
 		++$errors;
 	}
 
-	if(!extension_loaded("uopz")){
-		//$logger->notice("Couldn't find the uopz extension. Some functions may be limited");
-	}
-
 	if(extension_loaded("pocketmine")){
 		if(version_compare(phpversion("pocketmine"), "0.0.1") < 0){
 			$logger->critical("You have the native PocketMine extension, but your version is lower than 0.0.1.");
@@ -417,9 +434,13 @@ namespace pocketmine {
 		}
 	}
 
-	if(!extension_loaded("Weakref") and !extension_loaded("weakref")){
-		$logger->critical("Unable to find the Weakref extension.");
-		++$errors;
+	if(extension_loaded("xdebug")){
+		$logger->warning("
+
+
+	You are running PocketMine with xdebug enabled. This has a major impact on performance.
+
+		");
 	}
 
 	if(!extension_loaded("curl")){
@@ -427,13 +448,13 @@ namespace pocketmine {
 		++$errors;
 	}
 
-	if(!extension_loaded("sqlite3")){
-		$logger->critical("Unable to find the SQLite3 extension.");
+	if(!extension_loaded("yaml")){
+		$logger->critical("Unable to find the YAML extension.");
 		++$errors;
 	}
 
-	if(!extension_loaded("yaml")){
-		$logger->critical("Unable to find the YAML extension.");
+	if(!extension_loaded("sqlite3")){
+		$logger->critical("Unable to find the SQLite3 extension.");
 		++$errors;
 	}
 
@@ -450,53 +471,56 @@ namespace pocketmine {
 	}
 
 	if(file_exists(\pocketmine\PATH . ".git/refs/heads/master")){ //Found Git information!
-		define("pocketmine\\GIT_COMMIT", strtolower(trim(file_get_contents(\pocketmine\PATH . ".git/refs/heads/master"))));
+		define('pocketmine\GIT_COMMIT', strtolower(trim(file_get_contents(\pocketmine\PATH . ".git/refs/heads/master"))));
 	}else{ //Unknown :(
-		define("pocketmine\\GIT_COMMIT", str_repeat("00", 20));
+		define('pocketmine\GIT_COMMIT', str_repeat("00", 20));
 	}
 
 	@define("ENDIANNESS", (pack("d", 1) === "\77\360\0\0\0\0\0\0" ? Binary::BIG_ENDIAN : Binary::LITTLE_ENDIAN));
 	@define("INT32_MASK", is_int(0xffffffff) ? 0xffffffff : -1);
-	@ini_set("opcache.mmap_base", bin2hex(Utils::getRandomBytes(8, false))); //Fix OPCache address errors
+	@ini_set("opcache.mmap_base", bin2hex(random_bytes(8))); //Fix OPCache address errors
 
 	if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){
 		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.");
 	}
 
 	ThreadManager::init();
-	$server = new Server($autoloader, $logger, \pocketmine\PATH, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
+	new Server($autoloader, $logger, \pocketmine\PATH, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
 
 	$logger->info("Stopping other threads");
 
-	foreach(ThreadManager::getInstance()->getAll() as $id => $thread){
-		if($thread->isRunning()){
-			$logger->debug("Stopping " . (new \ReflectionClass($thread))->getShortName() . " thread");
-			if($thread instanceof Thread){
-				$thread->kill();
+	$killer = new ServerKiller(8);
+	$killer->start();
 
-				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();
+	$erroredThreads = 0;
+
+	foreach(ThreadManager::getInstance()->getAll() as $id => $thread){
+		$logger->debug("Stopping " . $thread->getThreadName() . " thread");
+		try{
+			$thread->quit();
+			$logger->debug($thread->getThreadName() . " thread stopped successfully.");
+		}catch(\ThreadException $e){
+			++$erroredThreads;
+			$logger->debug("Could not stop " . $thread->getThreadName() . " thread: " . $e->getMessage());
 		}
 	}
 
 	$logger->shutdown();
 	$logger->join();
 
-	exit(0);
+	echo Terminal::$FORMAT_RESET . PHP_EOL;
+
+	if($erroredThreads > 0){
+		if(\pocketmine\DEBUG > 1){
+			echo "Some threads could not be stopped, performing a force-kill" . PHP_EOL . PHP_EOL;
+		}
+		kill(getmypid());
+	}else{
+		exit(0);
+	}
 
 }

src/pocketmine/Thread.php

@@ -26,9 +26,63 @@ namespace pocketmine;
  */
 abstract class Thread extends \Thread{
 
-	public final function start($options = PTHREADS_INHERIT_ALL){
+	/** @var \ClassLoader */
+	protected $classLoader;
+	protected $isKilled = false;
+
+	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(int $options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
-		return parent::start($options);
+		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(){
+		$this->isKilled = true;
+
+		$this->notify();
+
+		if(!$this->isJoined()){
+			if(!$this->isTerminated()){
+				$this->join();
+			}
+		}
+
+		ThreadManager::getInstance()->remove($this);
+	}
+
+	public function getThreadName(){
+		return (new \ReflectionClass($this))->getShortName();
+	}
+}

src/pocketmine/ThreadManager.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine;
 
-class ThreadManager extends \Threaded{
+class ThreadManager extends \Volatile{
 
 	/** @var ThreadManager */
 	private static $instance = null;

src/pocketmine/Worker.php

@@ -26,9 +26,68 @@ namespace pocketmine;
  */
 abstract class Worker extends \Worker{
 
-	public final function start($options = PTHREADS_INHERIT_ALL){
+	/** @var \ClassLoader */
+	protected $classLoader;
+
+	protected $isKilled = false;
+
+	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(int $options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
-		return parent::start($options);
+		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(){
+		$this->isKilled = true;
+
+		$this->notify();
+
+		if($this->isRunning()){
+			$this->shutdown();
+			$this->notify();
+			$this->unstack();
+		}elseif(!$this->isJoined()){
+			if(!$this->isTerminated()){
+				$this->join();
+			}
+		}
+
+		ThreadManager::getInstance()->remove($this);
+	}
+
+	public function getThreadName(){
+		return (new \ReflectionClass($this))->getShortName();
+	}
+}

src/pocketmine/block/AcaciaWoodStairs.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,22 +15,17 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+class AcaciaWoodStairs extends WoodStairs{
 
-class AcaciaWoodStairs extends Stair{
-	public function __construct($meta = 0){
-		parent::__construct(self::ACACIA_WOOD_STAIRS, $meta, "Acacia Wood Stairs");
-	}
+	protected $id = self::ACACIA_WOOD_STAIRS;
 
-	public function getDrops(Item $item){
-		return [
-			[$this->id, 0, 1],
-		];
+	public function getName(){
+		return "Acacia Wood Stairs";
 	}
 }

src/pocketmine/block/ActivatorRail.php

@@ -0,0 +1,35 @@
+<?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 ActivatorRail extends Solid{
+
+	protected $id = self::ACTIVATOR_RAIL;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Activator Rail";
+	}
+}

src/pocketmine/block/Air.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,37 +15,65 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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/Anvil.php

@@ -0,0 +1,93 @@
+<?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\inventory\AnvilInventory;
+use pocketmine\item\Item;
+use pocketmine\item\Tool;
+use pocketmine\Player;
+
+class Anvil extends Fallable{
+
+	const TYPE_NORMAL = 0;
+	const TYPE_SLIGHTLY_DAMAGED = 4;
+	const TYPE_VERY_DAMAGED = 8;
+
+	protected $id = self::ANVIL;
+
+	public function isSolid(){
+		return false;
+	}
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function canBeActivated(){
+		return true;
+	}
+
+	public function getHardness(){
+		return 5;
+	}
+
+	public function getResistance(){
+		return 6000;
+	}
+
+	public function getName(){
+		static $names = [
+			self::TYPE_NORMAL => "Anvil",
+			self::TYPE_SLIGHTLY_DAMAGED => "Slightly Damaged Anvil",
+			self::TYPE_VERY_DAMAGED => "Very Damaged Anvil"
+		];
+		return $names[$this->meta & 0x0c] ?? "Anvil";
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function onActivate(Item $item, Player $player = null){
+		if($player instanceof Player){
+			$player->addWindow(new AnvilInventory($this));
+		}
+
+		return true;
+	}
+
+	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
+		$direction = ($player !== null ? $player->getDirection() : 0) & 0x03;
+		$this->meta = ($this->meta & 0x0c) | $direction;
+		$this->getLevel()->setBlock($block, $this, true, true);
+	}
+
+	public function getDrops(Item $item){
+		if($item->isPickaxe() >= Tool::TIER_WOODEN){
+			return [
+				[$this->id, $this->meta & 0x0c, 1],
+			];
+		}else{
+			return [];
+		}
+	}
+}

src/pocketmine/block/Bed.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,7 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
@@ -24,18 +24,30 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
-use pocketmine\network\protocol\ChatPacket;
 use pocketmine\Player;
+use pocketmine\utils\TextFormat;
 
 class Bed extends Transparent{
-	public function __construct($type = 0){
-		parent::__construct(self::BED_BLOCK, $type, "Bed Block");
-		$this->isActivable = true;
-		$this->isFullBlock = false;
-		$this->hardness = 1;
+
+	protected $id = self::BED_BLOCK;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getBoundingBox(){
+	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,
@@ -53,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;
-			$pk->message = "You can only sleep at night";
-			$player->dataPacket($pk);
-
+			$player->sendMessage(TextFormat::GRAY . "You can only sleep at night");
 			return true;
 		}
 
@@ -67,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;
-					$pk->message = "This bed is incomplete";
-					$player->dataPacket($pk);
+					$player->sendMessage(TextFormat::GRAY . "This bed is incomplete");
 				}
 
 				return true;
@@ -87,9 +94,7 @@ class Bed extends Transparent{
 		}
 
 		if($player instanceof Player and $player->sleepOn($b) === false){
-			$pk = new ChatPacket;
-			$pk->message = "This bed is occupied";
-			$player->dataPacket($pk);
+			$player->sendMessage(TextFormat::GRAY . "This bed is occupied");
 		}
 
 		return true;
@@ -97,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,
@@ -107,7 +112,7 @@ class Bed extends Transparent{
 			$d = $player instanceof Player ? $player->getDirection() : 0;
 			$next = $this->getSide($faces[(($d + 3) % 4)]);
 			$downNext = $this->getSide(0);
-			if($next->isReplaceable === true and $downNext->isTransparent === false){
+			if($next->canBeReplaced() === true and $downNext->isTransparent() === false){
 				$meta = (($d + 3) % 4) & 0x03;
 				$this->getLevel()->setBlock($block, Block::get($this->id, $meta), true, true);
 				$this->getLevel()->setBlock($next, Block::get($this->id, $meta | 0x08), true, true);
@@ -126,23 +131,23 @@ class Bed extends Transparent{
 		$blockWest = $this->getSide(4);
 
 		if(($this->meta & 0x08) === 0x08){ //This is the Top part of bed
-			if($blockNorth->getID() === $this->id and $blockNorth->meta !== 0x08){ //Checks if the block ID and meta are right
+			if($blockNorth->getId() === $this->id and $blockNorth->meta !== 0x08){ //Checks if the block ID and meta are right
 				$this->getLevel()->setBlock($blockNorth, new Air(), true, true);
-			}elseif($blockSouth->getID() === $this->id and $blockSouth->meta !== 0x08){
+			}elseif($blockSouth->getId() === $this->id and $blockSouth->meta !== 0x08){
 				$this->getLevel()->setBlock($blockSouth, new Air(), true, true);
-			}elseif($blockEast->getID() === $this->id and $blockEast->meta !== 0x08){
+			}elseif($blockEast->getId() === $this->id and $blockEast->meta !== 0x08){
 				$this->getLevel()->setBlock($blockEast, new Air(), true, true);
-			}elseif($blockWest->getID() === $this->id and $blockWest->meta !== 0x08){
+			}elseif($blockWest->getId() === $this->id and $blockWest->meta !== 0x08){
 				$this->getLevel()->setBlock($blockWest, new Air(), true, true);
 			}
 		}else{ //Bottom Part of Bed
-			if($blockNorth->getID() === $this->id and ($blockNorth->meta & 0x08) === 0x08){
+			if($blockNorth->getId() === $this->id and ($blockNorth->meta & 0x08) === 0x08){
 				$this->getLevel()->setBlock($blockNorth, new Air(), true, true);
-			}elseif($blockSouth->getID() === $this->id and ($blockSouth->meta & 0x08) === 0x08){
+			}elseif($blockSouth->getId() === $this->id and ($blockSouth->meta & 0x08) === 0x08){
 				$this->getLevel()->setBlock($blockSouth, new Air(), true, true);
-			}elseif($blockEast->getID() === $this->id and ($blockEast->meta & 0x08) === 0x08){
+			}elseif($blockEast->getId() === $this->id and ($blockEast->meta & 0x08) === 0x08){
 				$this->getLevel()->setBlock($blockEast, new Air(), true, true);
-			}elseif($blockWest->getID() === $this->id and ($blockWest->meta & 0x08) === 0x08){
+			}elseif($blockWest->getId() === $this->id and ($blockWest->meta & 0x08) === 0x08){
 				$this->getLevel()->setBlock($blockWest, new Air(), true, true);
 			}
 		}

src/pocketmine/block/Bedrock.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,7 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
@@ -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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,75 +15,24 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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->isActivable = true;
-		$this->hardness = 0;
+		$this->meta = $meta;
 	}
 
-	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, 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 += mt_rand(2, 5);
-			if($this->meta > 7){
-				$this->meta = 7;
-			}
-			$this->getLevel()->setBlock($this, $this, true, 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);
-
-				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);
-
-					return Level::BLOCK_UPDATE_RANDOM;
-				}
-			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
-			}
-		}
-
-		return false;
+	public function getName(){
+		return "Beetroot Block";
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/BirchWoodStairs.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,22 +15,17 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+class BirchWoodStairs extends WoodStairs{
 
-class BirchWoodStairs extends Stair{
-	public function __construct($meta = 0){
-		parent::__construct(self::BIRCH_WOOD_STAIRS, $meta, "Birch Wood Stairs");
-	}
+	protected $id = self::BIRCH_WOOD_STAIRS;
 
-	public function getDrops(Item $item){
-		return [
-			[$this->id, 0, 1],
-		];
+	public function getName(){
+		return "Birch Wood Stairs";
 	}
 }

src/pocketmine/block/BlockIds.php

@@ -0,0 +1,232 @@
+<?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;
+
+interface BlockIds{
+
+	const AIR = 0;
+	const STONE = 1;
+	const GRASS = 2;
+	const DIRT = 3;
+	const COBBLESTONE = 4, COBBLE = 4;
+	const PLANK = 5, PLANKS = 5, WOODEN_PLANK = 5, WOODEN_PLANKS = 5;
+	const SAPLING = 6, SAPLINGS = 6;
+	const BEDROCK = 7;
+	const WATER = 8;
+	const STILL_WATER = 9;
+	const LAVA = 10;
+	const STILL_LAVA = 11;
+	const SAND = 12;
+	const GRAVEL = 13;
+	const GOLD_ORE = 14;
+	const IRON_ORE = 15;
+	const COAL_ORE = 16;
+	const LOG = 17, WOOD = 17, TRUNK = 17;
+	const LEAVES = 18;
+	const SPONGE = 19;
+	const GLASS = 20;
+	const LAPIS_ORE = 21;
+	const LAPIS_BLOCK = 22;
+	const DISPENSER = 23;
+	const SANDSTONE = 24;
+	const NOTE_BLOCK = 25, NOTEBLOCK = 25;
+	const BED_BLOCK = 26;
+	const POWERED_RAIL = 27;
+	const DETECTOR_RAIL = 28;
+	const STICKY_PISTON = 29;
+	const COBWEB = 30;
+	const TALL_GRASS = 31;
+	const BUSH = 32, DEAD_BUSH = 32;
+	const PISTON = 33;
+	const PISTON_HEAD = 34;
+	const WOOL = 35;
+
+	const DANDELION = 37;
+	const POPPY = 38, ROSE = 38, RED_FLOWER = 38;
+	const BROWN_MUSHROOM = 39;
+	const RED_MUSHROOM = 40;
+	const GOLD_BLOCK = 41;
+	const IRON_BLOCK = 42;
+	const DOUBLE_SLAB = 43, DOUBLE_SLABS = 43;
+	const SLAB = 44, SLABS = 44, STONE_SLAB = 44;
+	const BRICKS = 45, BRICKS_BLOCK = 45;
+	const TNT = 46;
+	const BOOKSHELF = 47;
+	const MOSS_STONE = 48, MOSSY_STONE = 48;
+	const OBSIDIAN = 49;
+	const TORCH = 50;
+	const FIRE = 51;
+	const MONSTER_SPAWNER = 52;
+	const WOOD_STAIRS = 53, WOODEN_STAIRS = 53, OAK_WOOD_STAIRS = 53, OAK_WOODEN_STAIRS = 53;
+	const CHEST = 54;
+	const REDSTONE_WIRE = 55;
+	const DIAMOND_ORE = 56;
+	const DIAMOND_BLOCK = 57;
+	const CRAFTING_TABLE = 58, WORKBENCH = 58;
+	const WHEAT_BLOCK = 59;
+	const FARMLAND = 60;
+	const FURNACE = 61;
+	const BURNING_FURNACE = 62, LIT_FURNACE = 62;
+	const SIGN_POST = 63;
+	const DOOR_BLOCK = 64, WOODEN_DOOR_BLOCK = 64, WOOD_DOOR_BLOCK = 64;
+	const LADDER = 65;
+	const RAIL = 66;
+	const COBBLESTONE_STAIRS = 67, COBBLE_STAIRS = 67;
+	const WALL_SIGN = 68;
+	const LEVER = 69;
+	const STONE_PRESSURE_PLATE = 70;
+	const IRON_DOOR_BLOCK = 71;
+	const WOODEN_PRESSURE_PLATE = 72;
+	const REDSTONE_ORE = 73;
+	const GLOWING_REDSTONE_ORE = 74, LIT_REDSTONE_ORE = 74;
+	const UNLIT_REDSTONE_TORCH = 75;
+	const REDSTONE_TORCH = 76, LIT_REDSTONE_TORCH = 76;
+	const STONE_BUTTON = 77;
+	const SNOW = 78, SNOW_LAYER = 78;
+	const ICE = 79;
+	const SNOW_BLOCK = 80;
+	const CACTUS = 81;
+	const CLAY_BLOCK = 82;
+	const REEDS = 83, SUGARCANE_BLOCK = 83;
+
+	const FENCE = 85;
+	const PUMPKIN = 86;
+	const NETHERRACK = 87;
+	const SOUL_SAND = 88;
+	const GLOWSTONE = 89, GLOWSTONE_BLOCK = 89;
+	const PORTAL_BLOCK = 90, PORTAL = 90;
+	const JACK_O_LANTERN = 91, LIT_PUMPKIN = 91;
+	const CAKE_BLOCK = 92;
+	const REPEATER_BLOCK = 93, UNPOWERED_REPEATER_BLOCK = 93;
+	const POWERED_REPEATER_BLOCK = 94;
+	const INVISIBLE_BEDROCK = 95;
+	const TRAPDOOR = 96, WOODEN_TRAPDOOR = 96;
+	const MONSTER_EGG_BLOCK = 97;
+	const STONE_BRICKS = 98, STONE_BRICK = 98;
+	const BROWN_MUSHROOM_BLOCK = 99;
+	const RED_MUSHROOM_BLOCK = 100;
+	const IRON_BARS = 101, IRON_BAR = 101;
+	const GLASS_PANE = 102, GLASS_PANEL = 102;
+	const MELON_BLOCK = 103;
+	const PUMPKIN_STEM = 104;
+	const MELON_STEM = 105;
+	const VINES = 106, VINE = 106;
+	const FENCE_GATE = 107, OAK_FENCE_GATE = 107;
+	const BRICK_STAIRS = 108;
+	const STONE_BRICK_STAIRS = 109;
+	const MYCELIUM = 110;
+	const LILY_PAD = 111, WATER_LILY = 111;
+	const NETHER_BRICKS = 112, NETHER_BRICK_BLOCK = 112;
+	const NETHER_BRICK_FENCE = 113;
+	const NETHER_BRICK_STAIRS = 114, NETHER_BRICKS_STAIRS = 114;
+	const NETHER_WART_BLOCK = 115;
+	const ENCHANTING_TABLE = 116, ENCHANT_TABLE = 116, ENCHANTMENT_TABLE = 116;
+	const BREWING_STAND_BLOCK = 117;
+	const CAULDRON_BLOCK = 118;
+
+	const END_PORTAL_FRAME = 120, END_PORTAL = 120;
+	const END_STONE = 121;
+
+	const REDSTONE_LAMP = 123, INACTIVE_REDSTONE_LAMP = 123;
+	const LIT_REDSTONE_LAMP = 124, ACTIVE_REDSTONE_LAMP = 124;
+	const DROPPER = 125;
+	const ACTIVATOR_RAIL = 126;
+	const COCOA_BLOCK = 127, COCOA_PODS = 127;
+	const SANDSTONE_STAIRS = 128;
+	const EMERALD_ORE = 129;
+
+	const TRIPWIRE_HOOK = 131;
+	const TRIPWIRE = 132;
+	const EMERALD_BLOCK = 133;
+	const SPRUCE_WOOD_STAIRS = 134, SPRUCE_WOODEN_STAIRS = 134;
+	const BIRCH_WOOD_STAIRS = 135, BIRCH_WOODEN_STAIRS = 135;
+	const JUNGLE_WOOD_STAIRS = 136, JUNGLE_WOODEN_STAIRS = 136;
+
+	const BEACON = 138;
+	const COBBLESTONE_WALL = 139, COBBLE_WALL = 139, STONE_WALL = 139;
+	const FLOWER_POT_BLOCK = 140;
+	const CARROT_BLOCK = 141;
+	const POTATO_BLOCK = 142;
+	const WOODEN_BUTTON = 143;
+	const MOB_HEAD_BLOCK = 144, SKULL_BLOCK = 144;
+	const ANVIL = 145;
+	const TRAPPED_CHEST = 146;
+	const WEIGHTED_PRESSURE_PLATE_LIGHT = 147, LIGHT_WEIGHTED_PRESSURE_PLATE = 147, GOLD_PRESSURE_PLATE = 147;
+	const WEIGHTED_PRESSURE_PLATE_HEAVY = 148, HEAVY_WEIGHTED_PRESSURE_PLATE = 148, IRON_PRESSURE_PLATE = 148;
+	const COMPARATOR_BLOCK = 149, UNPOWERED_COMPARATOR_BLOCK = 149;
+	const POWERED_COMPARATOR_BLOCK = 150;
+	const DAYLIGHT_SENSOR = 151;
+	const REDSTONE_BLOCK = 152;
+	const NETHER_QUARTZ_ORE = 153;
+	const HOPPER_BLOCK = 154;
+	const QUARTZ_BLOCK = 155;
+	const QUARTZ_STAIRS = 156;
+	const DOUBLE_WOOD_SLAB = 157, DOUBLE_WOODEN_SLAB = 157, DOUBLE_WOOD_SLABS = 157, DOUBLE_WOODEN_SLABS = 157;
+	const WOOD_SLAB = 158, WOODEN_SLAB = 158, WOOD_SLABS = 158, WOODEN_SLABS = 158;
+	const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159;
+
+	const LEAVES2 = 161;
+	const WOOD2 = 162, TRUNK2 = 162, LOG2 = 162;
+	const ACACIA_WOOD_STAIRS = 163, ACACIA_WOODEN_STAIRS = 163;
+	const DARK_OAK_WOOD_STAIRS = 164, DARK_OAK_WOODEN_STAIRS = 164;
+	const SLIME_BLOCK = 165;
+
+	const IRON_TRAPDOOR = 167;
+	const PRISMARINE = 168;
+	const SEA_LANTERN = 169;
+	const HAY_BALE = 170;
+	const CARPET = 171;
+	const HARDENED_CLAY = 172;
+	const COAL_BLOCK = 173;
+	const PACKED_ICE = 174;
+	const DOUBLE_PLANT = 175;
+
+	const INVERTED_DAYLIGHT_SENSOR = 178, DAYLIGHT_SENSOR_INVERTED = 178;
+	const RED_SANDSTONE = 179;
+	const RED_SANDSTONE_STAIRS = 180;
+	const DOUBLE_RED_SANDSTONE_SLAB = 181;
+	const RED_SANDSTONE_SLAB = 182;
+	const SPRUCE_FENCE_GATE = 183, FENCE_GATE_SPRUCE = 183;
+	const BIRCH_FENCE_GATE = 184, FENCE_GATE_BIRCH = 184;
+	const JUNGLE_FENCE_GATE = 185, FENCE_GATE_JUNGLE = 185;
+	const DARK_OAK_FENCE_GATE = 186, FENCE_GATE_DARK_OAK = 186;
+	const ACACIA_FENCE_GATE = 187, FENCE_GATE_ACACIA = 187;
+
+	const SPRUCE_DOOR_BLOCK = 193;
+	const BIRCH_DOOR_BLOCK = 194;
+	const JUNGLE_DOOR_BLOCK = 195;
+	const ACACIA_DOOR_BLOCK = 196;
+	const DARK_OAK_DOOR_BLOCK = 197;
+	const GRASS_PATH = 198;
+	const ITEM_FRAME_BLOCK = 199;
+
+	const PODZOL = 243;
+	const BEETROOT_BLOCK = 244;
+	const STONECUTTER = 245;
+	const GLOWING_OBSIDIAN = 246;
+	const NETHER_REACTOR = 247;
+	const UPDATE_BLOCK = 248;
+	const ATEUPD_BLOCK = 249;
+	const BLOCK_MOVED_BY_PISTON = 250;
+	const OBSERVER = 251;
+	const INFO_RESERVED6 = 255;
+}

src/pocketmine/block/Bookshelf.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,17 +15,32 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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/BrewingStand.php

@@ -0,0 +1,45 @@
+<?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\Tool;
+
+class BrewingStand extends Transparent{
+
+	protected $id = self::BREWING_STAND_BLOCK;
+
+	public function __construct(){
+
+	}
+
+	public function getName(){
+		return "Brewing Stand";
+	}
+
+	public function getHardness(){
+		return 0.5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+}

src/pocketmine/block/BrickStairs.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,16 +15,36 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,39 +15,41 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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){
-		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 getHardness(){
+		return 2;
+	}
+
+	public function getResistance(){
+		return 30;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getName(){
+		return "Bricks";
 	}
 
 	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 1){
+		if($item->isPickaxe() >= Tool::TIER_WOODEN){
 			return [
 				[Item::BRICKS_BLOCK, 0, 1],
 			];

src/pocketmine/block/BrownMushroom.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,7 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
@@ -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");
-		$this->hardness = 0;
+
+	protected $id = self::BROWN_MUSHROOM;
+
+	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
-				$this->getLevel()->dropItem($this, Item::get($this->id));
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
+			if($this->getSide(0)->isTransparent() === true){
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}
@@ -46,7 +55,7 @@ class BrownMushroom extends Flowable{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
-		if($down->isTransparent === false){
+		if($down->isTransparent() === false){
 			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;

src/pocketmine/block/BurningFurnace.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,27 +15,49 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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;
-use pocketmine\nbt\tag\Int;
-use pocketmine\nbt\tag\String;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\ListTag;
+use pocketmine\nbt\tag\StringTag;
 use pocketmine\Player;
-use pocketmine\tile\Furnace;
+use pocketmine\tile\Furnace as TileFurnace;
 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->isActivable = true;
-		$this->hardness = 17.5;
+		$this->meta = $meta;
+	}
+
+	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){
@@ -47,15 +69,26 @@ class BurningFurnace extends Solid{
 		];
 		$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0];
 		$this->getLevel()->setBlock($block, $this, true, true);
-		$nbt = new Compound(false, [
-			new Enum("Items", []),
-			new String("id", Tile::FURNACE),
-			new Int("x", $this->x),
-			new Int("y", $this->y),
-			new Int("z", $this->z)
+		$nbt = new CompoundTag("", [
+			new ListTag("Items", []),
+			new StringTag("id", Tile::FURNACE),
+			new IntTag("x", $this->x),
+			new IntTag("y", $this->y),
+			new IntTag("z", $this->z)
 		]);
 		$nbt->Items->setTagType(NBT::TAG_Compound);
-		new Furnace($this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+
+		if($item->hasCustomName()){
+			$nbt->CustomName = new StringTag("CustomName", $item->getCustomName());
+		}
+
+		if($item->hasCustomBlockData()){
+			foreach($item->getCustomBlockData() as $key => $v){
+				$nbt->{$key} = $v;
+			}
+		}
+
+		Tile::createTile("Furnace", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
 
 		return true;
 	}
@@ -68,24 +101,22 @@ class BurningFurnace extends Solid{
 
 	public function onActivate(Item $item, Player $player = null){
 		if($player instanceof Player){
-			$t = $this->getLevel()->getTile($this);
-			$furnace = false;
-			if($t instanceof Furnace){
-				$furnace = $t;
-			}else{
-				$nbt = new Compound(false, [
-					new Enum("Items", []),
-					new String("id", Tile::FURNACE),
-					new Int("x", $this->x),
-					new Int("y", $this->y),
-					new Int("z", $this->z)
+			if(!(($furnace = $this->getLevel()->getTile($this)) instanceof TileFurnace)){
+				$nbt = new CompoundTag("", [
+					new ListTag("Items", []),
+					new StringTag("id", Tile::FURNACE),
+					new IntTag("x", $this->x),
+					new IntTag("y", $this->y),
+					new IntTag("z", $this->z)
 				]);
 				$nbt->Items->setTagType(NBT::TAG_Compound);
-				$furnace = new Furnace($this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+				$furnace = Tile::createTile("Furnace", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
 			}
 
-			if(($player->getGamemode() & 0x01) === 0x01){
-				return true;
+			if(isset($furnace->namedtag->Lock) and $furnace->namedtag->Lock instanceof StringTag){
+				if($furnace->namedtag->Lock->getValue() !== $item->getCustomName()){
+					return true;
+				}
 			}
 
 			$player->addWindow($furnace->getInventory());
@@ -94,26 +125,9 @@ 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){
+		if($item->isPickaxe() >= Tool::TIER_WOODEN){
 			$drops[] = [Item::FURNACE, 0, 1];
 		}
 

src/pocketmine/block/Cactus.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,74 +15,83 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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\AxisAlignedBB;
-use pocketmine\math\Vector3 as Vector3;
+use pocketmine\math\Vector3;
 use pocketmine\Player;
-use pocketmine\entity\Entity;
-use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\Server;
 
 class Cactus extends Transparent{
+
+	protected $id = self::CACTUS;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::CACTUS, $meta, "Cactus");
-		$this->isFullBlock = false;
-		$this->hardness = 2;
+		$this->meta = $meta;
 	}
 
-	public function getBoundingBox(){
+	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,
+			$this->y + 0.0625,
 			$this->z + 0.0625,
 			$this->x + 0.9375,
-			$this->y + 1,
+			$this->y + 0.9375,
 			$this->z + 0.9375
 		);
 	}
 
 	public function onEntityCollide(Entity $entity){
-		$ev = new EntityDamageEvent($entity, EntityDamageEvent::CAUSE_CONTACT, 1);
-		Server::getInstance()->getPluginManager()->callEvent($ev);
-		if(!$ev->isCancelled()){
-			$entity->attack($ev->getFinalDamage(), $ev);
-		}
+		$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
-				$this->getLevel()->setBlock($this, new Air(), false);
-				$this->getLevel()->dropItem($this, Item::get($this->id));
-
-				return;
+			if($down->getId() !== self::SAND and $down->getId() !== self::CACTUS){
+				$this->getLevel()->useBreakOn($this);
 			}else{
 				for($side = 2; $side <= 5; ++$side){
 					$b = $this->getSide($side);
-					if(!$b->isFlowable){
-						$this->getLevel()->setBlock($this, new Air(), false);
-						$this->getLevel()->dropItem($this, Item::get($this->id));
-
-						return;
+					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){
-							$this->getLevel()->setBlock($b, new Cactus(), true);
-							break;
+						if($b->getId() === self::AIR){
+							Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($b, new Cactus()));
+							if(!$ev->isCancelled()){
+								$this->getLevel()->setBlock($b, $ev->getNewState(), true);
+							}
 						}
 					}
 					$this->meta = 0;
@@ -91,8 +100,6 @@ class Cactus extends Transparent{
 					++$this->meta;
 					$this->getLevel()->setBlock($this, $this);
 				}
-
-				return;
 			}
 		}
 
@@ -101,12 +108,12 @@ class Cactus extends Transparent{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
-		if($down->getID() === self::SAND or $down->getID() === self::CACTUS){
+		if($down->getId() === self::SAND or $down->getId() === self::CACTUS){
 			$block0 = $this->getSide(2);
 			$block1 = $this->getSide(3);
 			$block2 = $this->getSide(4);
 			$block3 = $this->getSide(5);
-			if($block0->isTransparent === true and $block1->isTransparent === true and $block2->isTransparent === true and $block3->isTransparent === true){
+			if($block0->isTransparent() === true and $block1->isTransparent() === true and $block2->isTransparent() === true and $block3->isTransparent() === true){
 				$this->getLevel()->setBlock($this, $this, true);
 
 				return true;

src/pocketmine/block/Cake.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,27 +15,42 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Effect;
+use pocketmine\event\entity\EntityEatBlockEvent;
+use pocketmine\item\FoodSource;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
-class Cake extends Transparent{
+class Cake extends Transparent implements FoodSource{
+
+	protected $id = self::CAKE_BLOCK;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::CAKE_BLOCK, 0, "Cake Block");
-		$this->isFullBlock = false;
-		$this->isActivable = true;
-		$this->meta = $meta & 0x07;
-		$this->hardness = 2.5;
+		$this->meta = $meta;
 	}
 
-	public function getBoundingBox(){
+	public function canBeActivated(){
+		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(
@@ -50,7 +65,7 @@ class Cake extends Transparent{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
-		if($down->getID() !== self::AIR){
+		if($down->getId() !== self::AIR){
 			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
@@ -61,7 +76,7 @@ class Cake extends Transparent{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->getID() === self::AIR){ //Replace with common break method
+			if($this->getSide(0)->getId() === self::AIR){ //Replace with common break method
 				$this->getLevel()->setBlock($this, new Air(), true);
 
 				return Level::BLOCK_UPDATE_NORMAL;
@@ -76,19 +91,39 @@ class Cake extends Transparent{
 	}
 
 	public function onActivate(Item $item, Player $player = null){
-		if($player instanceof Player and $player->getHealth() < 20){
-			++$this->meta;
-			$player->heal(3, "cake");
-			if($this->meta >= 0x06){
-				$this->getLevel()->setBlock($this, new Air(), true);
-			}else{
-				$this->getLevel()->setBlock($this, $this, true);
-			}
+		if($player instanceof Player and $player->getHealth() < $player->getMaxHealth()){
+			$ev = new EntityEatBlockEvent($player, $this);
 
-			return true;
+			if(!$ev->isCancelled()){
+				$this->getLevel()->setBlock($this, $ev->getResidue());
+				return true;
+			}
 		}
 
 		return false;
 	}
 
-}
+	public function getFoodRestore() : int{
+		return 2;
+	}
+
+	public function getSaturationRestore() : float{
+		return 0.4;
+	}
+
+	public function getResidue(){
+		$clone = clone $this;
+		$clone->meta++;
+		if($clone->meta >= 0x06){
+			$clone = new Air();
+		}
+		return $clone;
+	}
+
+	/**
+	 * @return Effect[]
+	 */
+	public function getAdditionalEffects() : array{
+		return [];
+	}
+}

src/pocketmine/block/Carpet.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,7 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
@@ -27,9 +27,23 @@ 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");
-		$names = [
+		$this->meta = $meta;
+	}
+
+	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",
@@ -47,13 +61,11 @@ class Carpet extends Flowable{
 			14 => "Red Carpet",
 			15 => "Black Carpet",
 		];
-		$this->name = $names[$this->meta];
-		$this->hardness = 0;
-		$this->isFullBlock = false;
-		$this->isSolid = true;
+		return $names[$this->meta & 0x0f];
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		return new AxisAlignedBB(
 			$this->x,
 			$this->y,
@@ -66,7 +78,7 @@ class Carpet extends Flowable{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
-		if($down->getID() !== self::AIR){
+		if($down->getId() !== self::AIR){
 			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
@@ -77,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
-				$this->getLevel()->dropItem($this, Item::get($this->id, $this->meta, 1));
-				$this->getLevel()->setBlock($this, new Air(), true);
+			if($this->getSide(0)->getId() === self::AIR){
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/Carrot.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,77 +15,24 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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->isActivable = true;
-		$this->hardness = 0;
+		$this->meta = $meta;
 	}
 
-	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, 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 += mt_rand(2, 5);
-			if($this->meta > 7){
-				$this->meta = 7;
-			}
-			$this->getLevel()->setBlock($this, $this, 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);
-
-					return Level::BLOCK_UPDATE_RANDOM;
-				}
-			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
-			}
-		}
-
-		return false;
+	public function getName(){
+		return "Carrot Block";
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Chest.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,40 +15,55 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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;
-use pocketmine\nbt\tag\Int;
-use pocketmine\nbt\tag\String;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\ListTag;
+use pocketmine\nbt\tag\StringTag;
 use pocketmine\Player;
 use pocketmine\tile\Chest as TileChest;
 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->isActivable = true;
-		$this->hardness = 15;
+		$this->meta = $meta;
 	}
 
-	public function getBoundingBox(){
+	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.875,
+			$this->y + 0.9475,
 			$this->z + 0.9375
 		);
 	}
@@ -61,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){
@@ -71,7 +86,7 @@ class Chest extends Transparent{
 				continue;
 			}
 			$c = $this->getSide($side);
-			if($c instanceof Chest and $c->getDamage() === $this->meta){
+			if($c->getId() === $this->id and $c->getDamage() === $this->meta){
 				$tile = $this->getLevel()->getTile($c);
 				if($tile instanceof TileChest and !$tile->isPaired()){
 					$chest = $tile;
@@ -81,17 +96,28 @@ class Chest extends Transparent{
 		}
 
 		$this->getLevel()->setBlock($block, $this, true, true);
-		$nbt = new Compound(false, [
-			new Enum("Items", []),
-			new String("id", Tile::CHEST),
-			new Int("x", $this->x),
-			new Int("y", $this->y),
-			new Int("z", $this->z)
+		$nbt = new CompoundTag("", [
+			new ListTag("Items", []),
+			new StringTag("id", Tile::CHEST),
+			new IntTag("x", $this->x),
+			new IntTag("y", $this->y),
+			new IntTag("z", $this->z)
 		]);
 		$nbt->Items->setTagType(NBT::TAG_Compound);
-		$tile = new TileChest($this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
 
-		if($chest instanceof TileChest){
+		if($item->hasCustomName()){
+			$nbt->CustomName = new StringTag("CustomName", $item->getCustomName());
+		}
+
+		if($item->hasCustomBlockData()){
+			foreach($item->getCustomBlockData() as $key => $v){
+				$nbt->{$key} = $v;
+			}
+		}
+
+		$tile = Tile::createTile("Chest", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+
+		if($chest instanceof TileChest and $tile instanceof TileChest){
 			$chest->pairWith($tile);
 			$tile->pairWith($chest);
 		}
@@ -112,7 +138,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;
 			}
 
@@ -121,21 +147,23 @@ class Chest extends Transparent{
 			if($t instanceof TileChest){
 				$chest = $t;
 			}else{
-				$nbt = new Compound(false, [
-					new Enum("Items", []),
-					new String("id", Tile::CHEST),
-					new Int("x", $this->x),
-					new Int("y", $this->y),
-					new Int("z", $this->z)
+				$nbt = new CompoundTag("", [
+					new ListTag("Items", []),
+					new StringTag("id", Tile::CHEST),
+					new IntTag("x", $this->x),
+					new IntTag("y", $this->y),
+					new IntTag("z", $this->z)
 				]);
 				$nbt->Items->setTagType(NBT::TAG_Compound);
-				$chest = new TileChest($this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+				$chest = Tile::createTile("Chest", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
 			}
 
-
-			if(($player->gamemode & 0x01) === 0x01){
-				return true;
+			if(isset($chest->namedtag->Lock) and $chest->namedtag->Lock instanceof StringTag){
+				if($chest->namedtag->Lock->getValue() !== $item->getCustomName()){
+					return true;
+				}
 			}
+
 			$player->addWindow($chest->getInventory());
 		}
 

src/pocketmine/block/Clay.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,18 +15,33 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,39 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.95;
-			case 4:
-				return 1.25;
-			case 3:
-				return 1.9;
-			case 2:
-				return 0.65;
-			case 1:
-				return 3.75;
-			default:
-				return 25;
-		}
+	public function getHardness(){
+		return 5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getName(){
+		return "Coal Block";
 	}
 
 	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 1){
+		if($item->isPickaxe() >= Tool::TIER_WOODEN){
 			return [
 				[Item::COAL_BLOCK, 0, 1],
 			];

src/pocketmine/block/CoalOre.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,39 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			case 3:
-				return 1.15;
-			case 2:
-				return 0.4;
-			case 1:
-				return 2.25;
-			default:
-				return 15;
-		}
+	public function getHardness(){
+		return 3;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getName(){
+		return "Coal Ore";
 	}
 
 	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 1){
+		if($item->isPickaxe() >= Tool::TIER_WOODEN){
 			return [
 				[Item::COAL, 0, 1],
 			];

src/pocketmine/block/Cobblestone.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,39 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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){
-		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 getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getName(){
+		return "Cobblestone";
+	}
+
+	public function getHardness(){
+		return 2;
 	}
 
 	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 1){
+		if($item->isPickaxe() >= Tool::TIER_WOODEN){
 			return [
 				[Item::COBBLESTONE, 0, 1],
 			];

src/pocketmine/block/CobblestoneStairs.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,16 +15,32 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,28 +15,46 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
 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->fallDistance = 0;
+		$entity->resetFallDistance();
 	}
 
 	public function getDrops(Item $item){
+		//TODO: correct drops
 		return [];
 	}
 }

src/pocketmine/block/CocoaBlock.php

@@ -0,0 +1,35 @@
+<?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 CocoaBlock extends Solid{
+
+	protected $id = self::COCOA_BLOCK;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Cocoa Block";
+	}
+}

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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,7 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
@@ -26,19 +26,21 @@ use pocketmine\level\Level;
 use pocketmine\Player;
 
 class Dandelion extends Flowable{
+
+	protected $id = self::DANDELION;
+
 	public function __construct(){
-		parent::__construct(self::DANDELION, 0, "Dandelion");
-		$this->hardness = 0;
+
 	}
 
-	public function getBoundingBox(){
-		return null;
+	public function getName(){
+		return "Dandelion";
 	}
 
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
-		if($down->getID() === 2 or $down->getID() === 3 or $down->getID() === 60){
+		if($down->getId() === 2 or $down->getId() === 3 or $down->getId() === 60){
 			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
@@ -49,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
-				//TODO
-				//Server::getInstance()->api->entity->drop($this, Item::get($this->id));
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
+			if($this->getSide(0)->isTransparent() === true){
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/DarkOakWoodStairs.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,22 +15,17 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+class DarkOakWoodStairs extends WoodStairs{
 
-class DarkOakWoodStairs extends Stair{
-	public function __construct($meta = 0){
-		parent::__construct(self::DARK_OAK_WOOD_STAIRS, $meta, "Dark Oak Wood Stairs");
-	}
+	protected $id = self::DARK_OAK_WOOD_STAIRS;
 
-	public function getDrops(Item $item){
-		return [
-			[$this->id, 0, 1],
-		];
+	public function getName(){
+		return "Dark Oak Wood Stairs";
 	}
 }

src/pocketmine/block/DaylightSensor.php

@@ -0,0 +1,35 @@
+<?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 DaylightSensor extends Solid{
+
+	protected $id = self::DAYLIGHT_SENSOR;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Daylight Sensor";
+	}
+}

src/pocketmine/block/DeadBush.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,7 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
@@ -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");
-		//$this->isReplaceable = true;
-		$this->hardness = 0;
+
+	protected $id = self::DEAD_BUSH;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getBoundingBox(){
-		return null;
+	public function getName(){
+		return "Dead Bush";
 	}
 
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
+			if($this->getSide(0)->isTransparent() === true){
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/DetectorRail.php

@@ -0,0 +1,35 @@
+<?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 DetectorRail extends Solid{
+
+	protected $id = self::DETECTOR_RAIL;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Detector Rail";
+	}
+}

src/pocketmine/block/Diamond.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,33 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.95;
-			case 4:
-				return 1.25;
-			default:
-				return 25;
-		}
+	public function getHardness(){
+		return 5;
+	}
+
+	public function getName(){
+		return "Diamond Block";
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 4){
+		if($item->isPickaxe() >= Tool::TIER_IRON){
 			return [
 				[Item::DIAMOND_BLOCK, 0, 1],
 			];

src/pocketmine/block/DiamondOre.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,33 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			default:
-				return 15;
-		}
+	public function getHardness(){
+		return 3;
+	}
+
+	public function getName(){
+		return "Diamond Ore";
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 4){
+		if($item->isPickaxe() >= Tool::TIER_IRON){
 			return [
 				[Item::DIAMOND, 0, 1],
 			];

src/pocketmine/block/Dirt.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,27 +15,40 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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);

src/pocketmine/block/Door.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,7 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
@@ -23,36 +23,41 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+use pocketmine\level\sound\DoorSound;
 use pocketmine\math\AxisAlignedBB;
-use pocketmine\network\protocol\LevelEventPacket;
+use pocketmine\math\Vector3;
 use pocketmine\Player;
-use pocketmine\Server;
 
 
 abstract class Door extends Transparent{
-	public function __construct($id, $meta = 0, $name = "Unknown"){
-		parent::__construct($id, $meta, $name);
-		$this->isSolid = false;
+
+	public function canBeActivated(){
+		return true;
+	}
+
+	public function isSolid(){
+		return false;
 	}
 
 	private function getFullDamage(){
 		$damage = $this->getDamage();
-		$flag = ($damage & 0x08) > 0;
+		$isUp = ($damage & 0x08) > 0;
 
-		if($flag){
-			$first = $this->getSide(0)->getDamage();
-			$second = $damage;
+		if($isUp){
+			$down = $this->getSide(Vector3::SIDE_DOWN)->getDamage();
+			$up = $damage;
 		}else{
-			$first = $damage;
-			$second = $this->getSide(1)->getDamage();
+			$down = $damage;
+			$up = $this->getSide(Vector3::SIDE_UP)->getDamage();
 		}
 
-		$flag1 = ($second & 0x01) > 0;
+		$isRight = ($up & 0x01) > 0;
 
-		return $first & 0x07 | ($flag ? 8 : 0) | ($flag1 ? 0x10 : 0);
+		return $down & 0x07 | ($isUp ? 8 : 0) | ($isRight ? 0x10 : 0);
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		$f = 0.1875;
 		$damage = $this->getFullDamage();
 
@@ -66,13 +71,13 @@ abstract class Door extends Transparent{
 		);
 
 		$j = $damage & 0x03;
-		$flag = (($damage & 0x04) > 0);
-		$flag1 = (($damage & 0x10) > 0);
+		$isOpen = (($damage & 0x04) > 0);
+		$isRight = (($damage & 0x10) > 0);
 
 		if($j === 0){
-			if($flag){
-				if(!$flag1){
-					$bb = new AxisAlignedBB(
+			if($isOpen){
+				if(!$isRight){
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z,
@@ -81,7 +86,7 @@ abstract class Door extends Transparent{
 						$this->z + $f
 					);
 				}else{
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z + 1 - $f,
@@ -91,7 +96,7 @@ abstract class Door extends Transparent{
 					);
 				}
 			}else{
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x,
 					$this->y,
 					$this->z,
@@ -101,9 +106,9 @@ abstract class Door extends Transparent{
 				);
 			}
 		}elseif($j === 1){
-			if($flag){
-				if(!$flag1){
-					$bb = new AxisAlignedBB(
+			if($isOpen){
+				if(!$isRight){
+					$bb->setBounds(
 						$this->x + 1 - $f,
 						$this->y,
 						$this->z,
@@ -112,7 +117,7 @@ abstract class Door extends Transparent{
 						$this->z + 1
 					);
 				}else{
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z,
@@ -122,7 +127,7 @@ abstract class Door extends Transparent{
 					);
 				}
 			}else{
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x,
 					$this->y,
 					$this->z,
@@ -132,9 +137,9 @@ abstract class Door extends Transparent{
 				);
 			}
 		}elseif($j === 2){
-			if($flag){
-				if(!$flag1){
-					$bb = new AxisAlignedBB(
+			if($isOpen){
+				if(!$isRight){
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z + 1 - $f,
@@ -143,7 +148,7 @@ abstract class Door extends Transparent{
 						$this->z + 1
 					);
 				}else{
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z,
@@ -153,7 +158,7 @@ abstract class Door extends Transparent{
 					);
 				}
 			}else{
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x + 1 - $f,
 					$this->y,
 					$this->z,
@@ -163,9 +168,9 @@ abstract class Door extends Transparent{
 				);
 			}
 		}elseif($j === 3){
-			if($flag){
-				if(!$flag1){
-					$bb = new AxisAlignedBB(
+			if($isOpen){
+				if(!$isRight){
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z,
@@ -174,7 +179,7 @@ abstract class Door extends Transparent{
 						$this->z + 1
 					);
 				}else{
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x + 1 - $f,
 						$this->y,
 						$this->z,
@@ -184,7 +189,7 @@ abstract class Door extends Transparent{
 					);
 				}
 			}else{
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x,
 					$this->y,
 					$this->z + 1 - $f,
@@ -200,7 +205,7 @@ abstract class Door 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(), false);
 				if($this->getSide(1) instanceof Door){
 					$this->getLevel()->setBlock($this->getSide(1), new Air(), false);
@@ -217,7 +222,7 @@ abstract class Door extends Transparent{
 		if($face === 1){
 			$blockUp = $this->getSide(1);
 			$blockDown = $this->getSide(0);
-			if($blockUp->isReplaceable === false or $blockDown->isTransparent === true){
+			if($blockUp->canBeReplaced() === false or $blockDown->isTransparent() === true){
 				return false;
 			}
 			$direction = $player instanceof Player ? $player->getDirection() : 0;
@@ -230,13 +235,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->meta = $player->getDirection() & 0x03;
+			$this->setDamage($player->getDirection() & 0x03);
 			$this->getLevel()->setBlock($block, $this, true, true); //Bottom
-			$this->getLevel()->setBlock($blockUp, $b = Block::get($this->id, $metaUp), true); //Top
+			$this->getLevel()->setBlock($blockUp, $b = Block::get($this->getId(), $metaUp), true); //Top
 			return true;
 		}
 
@@ -244,14 +249,14 @@ 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);
 			}
 		}else{
 			$up = $this->getSide(1);
-			if($up->getID() === $this->id){
+			if($up->getId() === $this->getId()){
 				$this->getLevel()->setBlock($up, new Air(), true);
 			}
 		}
@@ -261,23 +266,17 @@ abstract class Door extends Transparent{
 	}
 
 	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);
-				$players = $this->getLevel()->getUsingChunk($this->x >> 4, $this->z >> 4);
+				$this->getLevel()->setBlock($down, Block::get($this->getId(), $meta), true);
+				$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;
 			}
 
@@ -285,17 +284,11 @@ abstract class Door extends Transparent{
 		}else{
 			$this->meta ^= 0x04;
 			$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;
-			$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;

src/pocketmine/block/DoublePlant.php

@@ -0,0 +1,70 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+use pocketmine\level\Level;
+
+class DoublePlant extends Flowable{
+
+	protected $id = self::DOUBLE_PLANT;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function canBeReplaced(){
+		return true;
+	}
+
+	public function getName(){
+		static $names = [
+			0 => "Sunflower",
+			1 => "Lilac",
+			2 => "Double Tallgrass",
+			3 => "Large Fern",
+			4 => "Rose Bush",
+			5 => "Peony"
+		];
+		return $names[$this->meta & 0x07];
+	}
+
+
+	public function onUpdate($type){
+		if($type === Level::BLOCK_UPDATE_NORMAL){
+			if($this->getSide(0)->isTransparent() === true){ //Replace with common break method
+				$this->getLevel()->setBlock($this, new Air(), true, true);
+
+				return Level::BLOCK_UPDATE_NORMAL;
+			}
+		}
+
+		return false;
+	}
+
+	public function getDrops(Item $item){
+		//TODO
+
+		return [];
+	}
+
+}

src/pocketmine/block/DoubleSlab.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,18 +15,33 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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");
-		$names = [
+		$this->meta = $meta;
+	}
+
+	public function getHardness(){
+		return 2;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getName(){
+		static $names = [
 			0 => "Stone",
 			1 => "Sandstone",
 			2 => "Wooden",
@@ -34,31 +49,13 @@ class DoubleSlab extends Solid{
 			4 => "Brick",
 			5 => "Stone Brick",
 			6 => "Quartz",
-			7 => "",
+			7 => "Nether Brick",
 		];
-		$this->name = "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;
-		}
+		return "DoubleTag " . $names[$this->meta & 0x07] . " Slab";
 	}
 
 	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 1){
+		if($item->isPickaxe() >= Tool::TIER_WOODEN){
 			return [
 				[Item::SLAB, $this->meta & 0x07, 2],
 			];

src/pocketmine/block/DoubleWoodSlab.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,44 +15,43 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 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");
-		$names = [
+		$this->meta = $meta;
+	}
+
+	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";
-		$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;
-		}
+		return "DoubleTag " . $names[$this->meta & 0x07] . " Wooden Slab";
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Emerald.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,33 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.95;
-			case 4:
-				return 1.25;
-			default:
-				return 25;
-		}
+	public function getHardness(){
+		return 5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getName(){
+		return "Emerald Block";
 	}
 
 	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 4){
+		if($item->isPickaxe() >= Tool::TIER_IRON){
 			return [
 				[Item::EMERALD_BLOCK, 0, 1],
 			];

src/pocketmine/block/EmeraldOre.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,33 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			default:
-				return 15;
-		}
+	public function getName(){
+		return "Emerald Ore";
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getHardness(){
+		return 3;
 	}
 
 	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 4){
+		if($item->isPickaxe() >= Tool::TIER_IRON){
 			return [
 				[Item::EMERALD, 0, 1],
 			];

src/pocketmine/block/EnchantingTable.php

@@ -0,0 +1,104 @@
+<?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\inventory\EnchantInventory;
+use pocketmine\item\Item;
+use pocketmine\item\Tool;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\StringTag;
+use pocketmine\Player;
+use pocketmine\tile\Tile;
+
+class EnchantingTable extends Transparent{
+
+	protected $id = self::ENCHANTING_TABLE;
+
+	public function __construct(){
+
+	}
+
+	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
+		$this->getLevel()->setBlock($block, $this, true, true);
+		$nbt = new CompoundTag("", [
+			new StringTag("id", Tile::ENCHANT_TABLE),
+			new IntTag("x", $this->x),
+			new IntTag("y", $this->y),
+			new IntTag("z", $this->z)
+		]);
+
+		if($item->hasCustomName()){
+			$nbt->CustomName = new StringTag("CustomName", $item->getCustomName());
+		}
+
+		if($item->hasCustomBlockData()){
+			foreach($item->getCustomBlockData() as $key => $v){
+				$nbt->{$key} = $v;
+			}
+		}
+
+		Tile::createTile(Tile::ENCHANT_TABLE, $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+
+		return true;
+	}
+
+	public function canBeActivated(){
+		return true;
+	}
+
+	public function getHardness(){
+		return 5;
+	}
+
+	public function getResistance(){
+		return 6000;
+	}
+
+	public function getName(){
+		return "Enchanting Table";
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function onActivate(Item $item, Player $player = null){
+		if($player instanceof Player){
+			//TODO lock
+
+			$player->addWindow(new EnchantInventory($this));
+		}
+
+		return true;
+	}
+
+	public function getDrops(Item $item){
+		if($item->isPickaxe() >= Tool::TIER_WOODEN){
+			return [
+				[$this->id, 0, 1],
+			];
+		}else{
+			return [];
+		}
+	}
+}

src/pocketmine/block/EndPortalFrame.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,21 +15,45 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
+use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 
-class EndPortal extends Solid{
+class EndPortalFrame extends Solid{
+
+	protected $id = self::END_PORTAL_FRAME;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::END_PORTAL, $meta, "End Portal");
-		$this->hardness = 18000000;
+		$this->meta = $meta;
 	}
 
-	public function getBoundingBox(){
+	public function getLightLevel(){
+		return 1;
+	}
+
+	public function getName(){
+		return "EndTag 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,

src/pocketmine/block/EndStone.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,34 +15,31 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			case 3:
-				return 1.15;
-			case 2:
-				return 0.4;
-			case 1:
-				return 2.25;
-			default:
-				return 15;
-		}
+	public function getName(){
+		return "EndTag Stone";
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getHardness(){
+		return 3;
 	}
 }

src/pocketmine/block/Fallable.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,59 +15,49 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
-use pocketmine\Player;
+use pocketmine\entity\Entity;
 use pocketmine\level\Level;
-use pocketmine\entity\FallingBlock;
-use pocketmine\nbt\tag\Compound;
-use pocketmine\nbt\tag\Enum;
-use pocketmine\nbt\tag\Double;
-use pocketmine\nbt\tag\Float;
-use pocketmine\nbt\tag\Byte;
+use pocketmine\math\Vector3;
+use pocketmine\nbt\tag\ByteTag;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\DoubleTag;
+use pocketmine\nbt\tag\FloatTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\ListTag;
 
 abstract class Fallable extends Solid{
 
-	public $hasPhysics = true;
-
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$ret = $this->getLevel()->setBlock($this, $this, true, true);
-
-		return $ret;
-	}
-
 	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)){
-				$fall = new FallingBlock($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 + 0.5),
-						new Double("", $this->z + 0.5)
+		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 CompoundTag("", [
+					"Pos" => new ListTag("Pos", [
+						new DoubleTag("", $this->x + 0.5),
+						new DoubleTag("", $this->y),
+						new DoubleTag("", $this->z + 0.5)
 					]),
-					//TODO: add random motion with physics
-					"Motion" => new Enum("Motion", [
-						new Double("", 0),
-						new Double("", 0),
-						new Double("", 0)
+					"Motion" => new ListTag("Motion", [
+						new DoubleTag("", 0),
+						new DoubleTag("", 0),
+						new DoubleTag("", 0)
 					]),
-					"Rotation" => new Enum("Rotation", [
-						new Float("", 0),
-						new Float("", 0)
+					"Rotation" => new ListTag("Rotation", [
+						new FloatTag("", 0),
+						new FloatTag("", 0)
 					]),
-					"Tile" => new Byte("Tile", $this->getID())
+					"TileID" => new IntTag("TileID", $this->getId()),
+					"Data" => new ByteTag("Data", $this->getDamage()),
 				]));
 
 				$fall->spawnToAll();
 			}
-
-			return false;
 		}
 	}
 }

src/pocketmine/block/Farmland.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,22 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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->hardness = 3;
+		$this->meta = $meta;
 	}
 
-	public function getBoundingBox(){
+	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,

src/pocketmine/block/Fence.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,46 +15,77 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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");
-		$this->isFullBlock = false;
-		$this->hardness = 15;
+	const FENCE_OAK = 0;
+	const FENCE_SPRUCE = 1;
+	const FENCE_BIRCH = 2;
+	const FENCE_JUNGLE = 3;
+	const FENCE_ACACIA = 4;
+	const FENCE_DARKOAK = 5;
+
+	protected $id = self::FENCE;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getBoundingBox(){
-		$flag = $this->canConnect($this->getSide(2));
-		$flag1 = $this->canConnect($this->getSide(3));
-		$flag2 = $this->canConnect($this->getSide(4));
-		$flag3 = $this->canConnect($this->getSide(5));
+	public function getHardness(){
+		return 2;
+	}
 
-		$f =  $flag2 ? 0 : 0.375;
-		$f1 = $flag3 ? 1 : 0.625;
-		$f2 = $flag ? 0 : 0.375;
-		$f3 = $flag1 ? 1 : 0.625;
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
+
+	public function getName(){
+		static $names = [
+			self::FENCE_OAK => "Oak Fence",
+			self::FENCE_SPRUCE => "Spruce Fence",
+			self::FENCE_BIRCH => "Birch Fence",
+			self::FENCE_JUNGLE => "Jungle Fence",
+			self::FENCE_ACACIA => "Acacia Fence",
+			self::FENCE_DARKOAK => "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 + $f,
+			$this->x + $w,
 			$this->y,
-			$this->z + $f2,
-			$this->x + $f1,
-			$this->y + 1, //TODO: check this, add extra bounding box
-			$this->z + $f3
+			$this->z + $n,
+			$this->x + $e,
+			$this->y + 1.5,
+			$this->z + $s
 		);
 	}
 
 	public function canConnect(Block $block){
-		return ($block->getID() !== self::FENCE and $block->getID() !== self::FENCE_GATE) ? $block->isSolid : true;
+		return ($block instanceof Fence or $block instanceof FenceGate) ? true : $block->isSolid() and !$block->isTransparent();
 	}
 
-}
+}

src/pocketmine/block/FenceGate.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,42 +15,57 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
+use pocketmine\level\sound\DoorSound;
 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->isActivable = true;
-		if(($this->meta & 0x04) === 0x04){
-			$this->isFullBlock = true;
-		}else{
-			$this->isFullBlock = false;
-		}
-		$this->hardness = 15;
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Oak Fence Gate";
+	}
+
+	public function getHardness(){
+		return 2;
+	}
+
+	public function canBeActivated(){
+		return true;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
 	}
 
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		if(($this->getDamage() & 0x04) > 0){
 			return null;
 		}
 
 		$i = ($this->getDamage() & 0x03);
-		if($i === 2 and $i === 0){
+		if($i === 2 or $i === 0){
 			return new AxisAlignedBB(
 				$this->x,
 				$this->y,
 				$this->z + 0.375,
 				$this->x + 1,
-				$this->y + 1,
+				$this->y + 1.5,
 				$this->z + 0.625
 			);
 		}else{
@@ -59,7 +74,7 @@ class FenceGate extends Transparent{
 				$this->y,
 				$this->z,
 				$this->x + 0.625,
-				$this->y + 1,
+				$this->y + 1.5,
 				$this->z + 1
 			);
 		}
@@ -85,20 +100,11 @@ class FenceGate extends Transparent{
 	}
 
 	public function onActivate(Item $item, Player $player = null){
-		$faces = [
-			0 => 3,
-			1 => 0,
-			2 => 1,
-			3 => 2,
-		];
-		$this->meta = ($faces[$player instanceof Player ? $player->getDirection() : 0] & 0x03) | ((~$this->meta) & 0x04);
-		if(($this->meta & 0x04) === 0x04){
-			$this->isFullBlock = true;
-		}else{
-			$this->isFullBlock = false;
-		}
-		$this->getLevel()->setBlock($this, $this, true);
+		$this->meta ^= 0x04; //Flip open/close state
+		//TODO: Face player when opened
 
+		$this->getLevel()->setBlock($this, $this, true);
+		$this->level->addSound(new DoorSound($this));
 		return true;
 	}
-}
+}

src/pocketmine/block/FenceGateAcacia.php

@@ -19,13 +19,14 @@
  *
 */
 
-namespace pocketmine\utils;
+namespace pocketmine\block;
 
 
-/**
- * All classes or interfaces (including plugins) that want to be able to be patched in runtime
- * need to implement this interface
- */
-interface Patchable{
+class FenceGateAcacia extends FenceGate{
 
+	protected $id = self::FENCE_GATE_ACACIA;
+
+	public function getName(){
+		return "Acacia Fence Gate";
+	}
 }

src/pocketmine/block/FenceGateBirch.php

@@ -0,0 +1,32 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+namespace pocketmine\block;
+
+
+class FenceGateBirch extends FenceGate{
+
+	protected $id = self::FENCE_GATE_BIRCH;
+
+	public function getName(){
+		return "Birch Fence Gate";
+	}
+}

src/pocketmine/block/FenceGateDarkOak.php

@@ -0,0 +1,32 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+namespace pocketmine\block;
+
+
+class FenceGateDarkOak extends FenceGate{
+
+	protected $id = self::FENCE_GATE_DARK_OAK;
+
+	public function getName(){
+		return "Dark Oak Fence Gate";
+	}
+}

src/pocketmine/block/FenceGateJungle.php

@@ -0,0 +1,32 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+namespace pocketmine\block;
+
+
+class FenceGateJungle extends FenceGate{
+
+	protected $id = self::FENCE_GATE_JUNGLE;
+
+	public function getName(){
+		return "Jungle Fence Gate";
+	}
+}

src/pocketmine/block/FenceGateSpruce.php

@@ -0,0 +1,32 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+namespace pocketmine\block;
+
+
+class FenceGateSpruce extends FenceGate{
+
+	protected $id = self::FENCE_GATE_SPRUCE;
+
+	public function getName(){
+		return "Spruce Fence Gate";
+	}
+}

src/pocketmine/block/Fire.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,37 +15,63 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\entity\Arrow;
+use pocketmine\entity\Effect;
 use pocketmine\entity\Entity;
-use pocketmine\level\Level;
+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->isReplaceable = true;
-		$this->breakable = false;
-		$this->isFullBlock = true;
-		$this->hardness = 0;
+		$this->meta = $meta;
 	}
 
-	public function getBoundingBox(){
-		return null;
+	public function hasEntityCollision(){
+		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){
-		$entity->setOnFire(8);
-		$ev = new EntityDamageEvent($entity, EntityDamageEvent::CAUSE_FIRE, 1);
+		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);
+		if($entity instanceof Arrow){
+			$ev->setCancelled();
+		}
 		Server::getInstance()->getPluginManager()->callEvent($ev);
 		if(!$ev->isCancelled()){
-			$entity->attack($ev->getFinalDamage(), $ev);
+			$entity->setOnFire($ev->getDuration());
 		}
 	}
 
@@ -57,7 +83,7 @@ class Fire extends Flowable{
 		if($type === Level::BLOCK_UPDATE_NORMAL){
 			for($s = 0; $s <= 5; ++$s){
 				$side = $this->getSide($s);
-				if($side->getID() !== self::AIR and !($side instanceof Liquid)){
+				if($side->getId() !== self::AIR and !($side instanceof Liquid)){
 					return false;
 				}
 			}
@@ -65,10 +91,17 @@ class Fire extends Flowable{
 
 			return Level::BLOCK_UPDATE_NORMAL;
 		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if($this->getSide(0)->getID() !== self::NETHERRACK){
-				$this->getLevel()->setBlock($this, new Air(), true);
+			if($this->getSide(0)->getId() !== self::NETHERRACK){
+				if(mt_rand(0, 2) === 0){
+					if($this->meta === 0x0F){
+						$this->level->setBlock($this, new Air());
+					}else{
+						$this->meta++;
+						$this->level->setBlock($this, $this);
+					}
 
-				return Level::BLOCK_UPDATE_NORMAL;
+					return Level::BLOCK_UPDATE_NORMAL;
+				}
 			}
 		}
 

src/pocketmine/block/Flowable.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,17 +15,31 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
-
 abstract class Flowable extends Transparent{
 
-	public $isFlowable = true;
-	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;
+	}
+
+	protected function recalculateBoundingBox(){
+		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/FlowerPot.php

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

src/pocketmine/block/Furnace.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,7 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
@@ -23,10 +23,10 @@ namespace pocketmine\block;
 
 
 class Furnace extends BurningFurnace{
-	public function __construct($meta = 0){
-		parent::__construct($meta);
-		$this->id = self::FURNACE;
-		$this->name = "Furnace";
-		$this->isActivable = true;
+
+	protected $id = self::FURNACE;
+
+	public function getName(){
+		return "Furnace";
 	}
 }

src/pocketmine/block/Glass.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,7 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
@@ -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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,16 +15,31 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
+use pocketmine\item\Item;
 
 class GlassPane extends Thin{
+
+	protected $id = self::GLASS_PANE;
+
 	public function __construct(){
-		parent::__construct(self::GLASS_PANE, 0, "Glass Pane");
+
 	}
 
+	public function getName(){
+		return "Glass Pane";
+	}
+
+	public function getHardness(){
+		return 0.3;
+	}
+
+	public function getDrops(Item $item){
+		return [];
+	}
 }

src/pocketmine/block/GlowingObsidian.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,16 +15,27 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
 
-class GlowingObsidian extends Solid{
+class GlowingObsidian extends Transparent{
+
+	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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,7 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
@@ -24,42 +24,25 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 
-class GlowingRedstoneOre extends Solid{
-	public function __construct(){
-		parent::__construct(self::GLOWING_REDSTONE_ORE, 0, "Glowing Redstone Ore");
-		$this->hardness = 15;
+class GlowingRedstoneOre extends RedstoneOre{
+
+	protected $id = self::GLOWING_REDSTONE_ORE;
+
+	public function getName(){
+		return "Glowing Redstone Ore";
+	}
+
+	public function getLightLevel(){
+		return 9;
 	}
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_SCHEDULED or $type === Level::BLOCK_UPDATE_RANDOM){
-			$this->getLevel()->setBlock($this, Block::get(Item::REDSTONE_ORE, $this->meta), false, false, true);
+			$this->getLevel()->setBlock($this, Block::get(Item::REDSTONE_ORE, $this->meta), false, false);
 
 			return Level::BLOCK_UPDATE_WEAK;
 		}
 
 		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 [
-				[Item::REDSTONE_DUST, 0, mt_rand(4, 5)],
-			];
-		}else{
-			return [];
-		}
-	}
-
 }

src/pocketmine/block/Glowstone.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,18 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,33 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			default:
-				return 15;
-		}
+	public function getName(){
+		return "Gold Block";
+	}
+
+	public function getHardness(){
+		return 3;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 4){
+		if($item->isPickaxe() >= Tool::TIER_IRON){
 			return [
 				[Item::GOLD_BLOCK, 0, 1],
 			];

src/pocketmine/block/GoldOre.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,33 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			default:
-				return 15;
-		}
+	public function getName(){
+		return "Gold Ore";
+	}
+
+	public function getHardness(){
+		return 3;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 4){
+		if($item->isPickaxe() >= Tool::TIER_IRON){
 			return [
 				[Item::GOLD_ORE, 0, 1],
 			];

src/pocketmine/block/Grass.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,31 +15,46 @@
  *
  * @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\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],
@@ -48,22 +63,28 @@ class Grass extends Solid{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_RANDOM){
-			//TODO: light levels
-			$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);
-			if($block === 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());
+			$block = $this->getLevel()->getBlock(new Vector3($this->x, $this->y, $this->z));
+			if($block->getSide(1)->getLightLevel() < 4){
+				Server::getInstance()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($block, $this, new Dirt()));
+			}elseif($block->getSide(1)->getLightLevel() >= 9){
+				for($l = 0; $l < 4; ++$l){
+					$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()->getBlock(new Vector3($x, $y, $z));
+					if($block->getId() === Block::DIRT && $block->getDamage() === 0x0F && $block->getSide(1)->getLightLevel() >= 4 && $block->z <= 2){
+						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--;
 			TallGrassObject::growGrass($this->getLevel(), $this, new Random(mt_rand()), 8, 2);
 
@@ -72,9 +93,14 @@ class Grass extends Solid{
 			$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;
 		}
 
 		return false;
 	}
-}
+}

src/pocketmine/block/GrassPath.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,35 +15,50 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\Player;
+use pocketmine\item\Tool;
+use pocketmine\math\AxisAlignedBB;
 
-class Generic extends Block{
+class GrassPath extends Transparent{
+
+	protected $id = self::GRASS_PATH;
+
+	public function __construct(){
 
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		return $this->getLevel()->setBlock($this, $this, true, true);
 	}
 
-	public function isBreakable(Item $item){
-		return $this->breakable;
+	public function getName(){
+		return "Grass Path";
 	}
 
-	public function onBreak(Item $item){
-		return $this->getLevel()->setBlock($this, new Air(), true, true);
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
 	}
 
-	public function onUpdate($type){
-		return false;
+	protected function recalculateBoundingBox(){
+		return new AxisAlignedBB(
+			$this->x,
+			$this->y,
+			$this->z,
+			$this->x + 1,
+			$this->y + 0.9375,
+			$this->z + 1
+		);
 	}
 
-	public function onActivate(Item $item, Player $player = null){
-		return $this->isActivable;
+	public function getHardness(){
+		return 0.6;
+	}
+
+	public function getDrops(Item $item){
+		return [
+			[Item::DIRT, 0, 1],
+		];
 	}
 }

src/pocketmine/block/Gravel.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,18 +15,33 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,35 +15,31 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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){
-		switch($item->isPickaxe()){
-			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 getName(){
+		return "Hardened Clay";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getHardness(){
+		return 1.25;
+	}
 }

src/pocketmine/block/HayBale.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,7 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
@@ -25,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->hardness = 10;
+		$this->meta = $meta;
+	}
+
+	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){

src/pocketmine/block/Ice.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,18 +15,33 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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){
@@ -35,23 +50,6 @@ class Ice extends Transparent{
 		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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,35 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.95;
-			case 4:
-				return 1.25;
-			case 3:
-				return 1.9;
-			default:
-				return 25;
-		}
+	public function getName(){
+		return "Iron Block";
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getHardness(){
+		return 5;
 	}
 
 	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 3){
+		if($item->isPickaxe() >= Tool::TIER_STONE){
 			return [
 				[Item::IRON_BLOCK, 0, 1],
 			];

src/pocketmine/block/IronBars.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,16 +15,44 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
+use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class IronBars extends Thin{
+
+	protected $id = self::IRON_BARS;
+
 	public function __construct(){
-		parent::__construct(self::IRON_BARS, 0, "Iron Bars");
+
 	}
 
-}
+	public function getName(){
+		return "Iron Bars";
+	}
+
+	public function getHardness(){
+		return 5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getDrops(Item $item){
+		if($item->isPickaxe() >= Tool::TIER_WOODEN){
+			return [
+				[Item::IRON_BARS, 0, 1],
+			];
+		}else{
+			return [];
+		}
+	}
+
+}
+

src/pocketmine/block/IronDoor.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,40 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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->isActivable = true;
-		$this->hardness = 25;
+		$this->meta = $meta;
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.95;
-			case 4:
-				return 1.25;
-			case 3:
-				return 1.9;
-			case 2:
-				return 0.65;
-			case 1:
-				return 3.75;
-			default:
-				return 25;
-		}
+	public function getName(){
+		return "Iron Door Block";
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getHardness(){
+		return 5;
 	}
 
 	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 1){
+		if($item->isPickaxe() >= Tool::TIER_WOODEN){
 			return [
 				[Item::IRON_DOOR, 0, 1],
 			];

src/pocketmine/block/IronOre.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,35 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 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){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			case 3:
-				return 1.15;
-			default:
-				return 15;
-		}
+	public function getName(){
+		return "Iron Ore";
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getHardness(){
+		return 3;
 	}
 
 	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 3){
+		if($item->isPickaxe() >= Tool::TIER_STONE){
 			return [
 				[Item::IRON_ORE, 0, 1],
 			];

src/pocketmine/block/IronTrapdoor.php

@@ -0,0 +1,41 @@
+<?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\Tool;
+
+class IronTrapdoor extends Trapdoor{
+
+	protected $id = self::IRON_TRAPDOOR;
+
+	public function getName(){
+		return "Iron Trapdoor";
+	}
+
+	public function getHardness(){
+		return 5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+}

src/pocketmine/block/ItemFrame.php

@@ -0,0 +1,146 @@
+<?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\nbt\tag\{
+	ByteTag, CompoundTag, FloatTag, IntTag, StringTag
+};
+use pocketmine\Player;
+use pocketmine\tile\ItemFrame as TileItemFrame;
+use pocketmine\tile\Tile;
+
+class ItemFrame extends Flowable{
+	protected $id = Block::ITEM_FRAME_BLOCK;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		return "Item Frame";
+	}
+
+	public function canBeActivated(){
+		return true;
+	}
+
+	public function onActivate(Item $item, Player $player = null){
+		if(!(($tile = $this->level->getTile($this)) instanceof TileItemFrame)){
+			$nbt = new CompoundTag("", [
+				new StringTag("id", Tile::ITEM_FRAME),
+				new IntTag("x", $this->x),
+				new IntTag("y", $this->y),
+				new IntTag("z", $this->z),
+				new FloatTag("ItemDropChance", 1.0),
+				new ByteTag("ItemRotation", 0)
+			]);
+			$tile = Tile::createTile(Tile::ITEM_FRAME, $this->level->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+		}
+
+		if($tile->hasItem()){
+			$tile->setItemRotation(($tile->getItemRotation() + 1) % 8);
+		}else{
+			if($item->getCount() > 0){
+				$frameItem = clone $item;
+				$frameItem->setCount(1);
+				$item->setCount($item->getCount() - 1);
+				$tile->setItem($frameItem);
+				if($player instanceof Player and $player->isSurvival()){
+					$player->getInventory()->setItemInHand($item->getCount() <= 0 ? Item::get(Item::AIR) : $item);
+				}
+			}
+		}
+
+		return true;
+	}
+
+	public function onBreak(Item $item){
+		if(($tile = $this->level->getTile($this)) instanceof TileItemFrame){
+			//TODO: add events
+			if(lcg_value() <= $tile->getItemDropChance() and $tile->getItem()->getId() !== Item::AIR){
+				$this->level->dropItem($tile->getBlock(), $tile->getItem());
+			}
+		}
+		return parent::onBreak($item);
+	}
+
+	public function onUpdate($type){
+		if($type === Level::BLOCK_UPDATE_NORMAL){
+			$sides = [
+				0 => 4,
+				1 => 5,
+				2 => 2,
+				3 => 3
+			];
+			if(!$this->getSide($sides[$this->meta])->isSolid()){
+				$this->level->useBreakOn($this);
+				return Level::BLOCK_UPDATE_NORMAL;
+			}
+		}
+		return false;
+	}
+
+	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
+		if($face === 0 or $face === 1){
+			return false;
+		}
+
+		$faces = [
+			2 => 3,
+			3 => 2,
+			4 => 1,
+			5 => 0
+		];
+
+		$this->meta = $faces[$face];
+		$this->level->setBlock($block, $this, true, true);
+
+		$nbt = new CompoundTag("", [
+			new StringTag("id", Tile::ITEM_FRAME),
+			new IntTag("x", $block->x),
+			new IntTag("y", $block->y),
+			new IntTag("z", $block->z),
+			new FloatTag("ItemDropChance", 1.0),
+			new ByteTag("ItemRotation", 0)
+		]);
+
+		if($item->hasCustomBlockData()){
+			foreach($item->getCustomBlockData() as $key => $v){
+				$nbt->{$key} = $v;
+			}
+		}
+
+		Tile::createTile(Tile::ITEM_FRAME, $this->level->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+
+		return true;
+
+	}
+
+	public function getDrops(Item $item){
+		return [
+			[Item::ITEM_FRAME, 0, 1]
+		];
+	}
+
+}

src/pocketmine/block/JungleWoodStairs.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,22 +15,17 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+class JungleWoodStairs extends WoodStairs{
 
-class JungleWoodStairs extends Stair{
-	public function __construct($meta = 0){
-		parent::__construct(self::JUNGLE_WOOD_STAIRS, $meta, "Jungle Wood Stairs");
-	}
+	protected $id = self::JUNGLE_WOOD_STAIRS;
 
-	public function getDrops(Item $item){
-		return [
-			[$this->id, 0, 1],
-		];
+	public function getName(){
+		return "Jungle Wood Stairs";
 	}
 }