Release 3.0.12

this is an absurd bug that nobody would ever otherwise notice, but the problem is that the doOnFireTick() call isn't evaluated if hasUpdate is already true.

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 ### Issue description
 <!---
-THIS ISSUE TRACKER IS FOR BUG REPORTING, NOT FOR HELP & SUPPORT. If you need help, use the links below. 
+THIS ISSUE TRACKER IS FOR BUG REPORTING, NOT FOR HELP & SUPPORT. If you need help, use the links below.
 - http://pmmp.readthedocs.io/en/rtfd/ - Documentation
 - https://forums.pmmp.io - PMMP Forums
 
@@ -28,7 +28,7 @@ NO support whatsoever will be provided for third-party modified variants of Pock
 
 Note that 32-bit platforms are no longer supported by PocketMine-MP and issues concerning 32-bit platforms will be closed.
 -->
-* PocketMine-MP:
+* PocketMine-MP: <!-- LATEST IS NOT A VALID VERSION -->
 * PHP:
 * Server OS:
 * Game version: PE/Win10 (delete as appropriate)
@@ -43,6 +43,6 @@ If the issue is **not** reproducible without plugins:
 
 ### Crashdump, backtrace or other files
 - Do not paste crashdumps into an issue - please use our Crash Archive at https://crash.pmmp.io for submitting crash reports to not spam the issue tracker. Add links to your reports in the Crash Archive here.
-- Please use gist or anything else to add other files and add links here 
+- Please use gist or anything else to add other files and add links here
 
 * ...

.github/PULL_REQUEST_TEMPLATE.md

@@ -33,4 +33,8 @@ Requires translations:
 -->
 
 ## Tests
-<!-- Attach scripts or actions to test this pull request, as well as the result -->
+<!--
+Details should be provided of tests done. Simply saying "tested" or equivalent is not acceptable.
+
+Attach scripts or actions to test this pull request, as well as the result
+-->

.github/support.yml

@@ -0,0 +1,12 @@
+# Configuration for support-requests - https://github.com/dessant/support-requests
+
+# Label used to mark issues as support requests
+supportLabel: "Support request"
+# Comment to post on issues marked as support requests. Add a link
+# to a support page, or set to `false` to disable
+supportComment: >
+  This issue tracker is not a support forum. Please use the [forums](https://forums.pmmp.io) for support.
+# Whether to close issues marked as support requests
+close: true
+# Whether to lock issues marked as support requests
+lock: false

.gitignore

@@ -1,14 +1,16 @@
 players/*
 worlds/*
+plugin_data/*
 plugins/*
-bin/*
+bin*/*
 timings/*
+crashdumps/*
 *.log
 *.txt
 *.phar
 server.properties
 /pocketmine.yml
-memoryDump_*/*
+memory_dumps/*
 resource_packs/
 
 # Common IDEs

.gitmodules

@@ -7,6 +7,6 @@
 [submodule "tests/plugins/PocketMine-DevTools"]
 	path = tests/plugins/PocketMine-DevTools
 	url = https://github.com/pmmp/PocketMine-DevTools.git
-[submodule "tests/plugins/PocketMine-TesterPlugin"]
+[submodule "src/pocketmine/resources/vanilla"]
-	path = tests/plugins/PocketMine-TesterPlugin
+	path = src/pocketmine/resources/vanilla
-	url = https://github.com/pmmp/PocketMine-TesterPlugin.git
+	url = https://github.com/pmmp/BedrockData.git

.travis.yml

@@ -6,9 +6,9 @@ php:
 before_script:
 # - pecl install channel://pecl.php.net/pthreads-3.1.6
  - echo | pecl install channel://pecl.php.net/yaml-2.0.2
- - git clone https://github.com/krakjoe/pthreads.git
+ - git clone https://github.com/pmmp/pthreads.git
  - cd pthreads
- - git checkout 6c6b15138c923b69cfa46ee05fc2dd45da587287
+ - git checkout c8cfacda84f21032d6014b53e72bf345ac901dac
  - phpize
  - ./configure
  - make
@@ -18,7 +18,7 @@ before_script:
  - composer install
 
 script:
- - ./tests/travis.sh
+ - ./tests/travis.sh -t4
 
 notifications:
  email: false

CONTRIBUTING.md

@@ -5,58 +5,48 @@
 
 ## Creating an Issue
 - If you are reporting a bug:
- - **make sure that you are using the latest supported version** before opening an issue.
+  - **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.
+  - **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.
-- [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.
+- **Do not report plugin issues here.** If your issue is related to a plugin, contact the plugin's original author instead.
-
-- 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.
-
+- **Provide information in the issue body, not in the title.** No tags like `[BUG]` are allowed in the title, including `[SOLVED]` for solved issues.
-- 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.
+- **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**.
-
+<br>Valid issue reports must include instructions how to reproduce the issue or a crashdump/backtrace (unless the cause of the issue is obvious).
-- 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**.
+<br>**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><br>Valid issue reports must include instructions how to reproduce the issue or a crashdump/backtrace (unless the cause of the issue is obvious).
+<br>In simple words, if the issue cannot be properly confirmed to be valid or lacks required information, the issue will be closed until further information is provided.
-<br><br>**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><br>In simple words, if the issue cannot be properly confirmed to be valid or lacks required information, 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
+## Contributing
-- 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.
+To contribute 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).
+### Licensing
+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.**
+### Contribution standards
-
+- **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**.
-- **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.
+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 meet our standards, changes may be requested or the pull request may be closed.**
-- **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.
 
+### Pull requests
 - **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).
-
+- **Do not include multiple unrelated changes in one commit.** An atomic style for commits is preferred - this means that changes included in a commit should be part of a single distinct change set. See [this link](https://www.freshconsulting.com/atomic-commits/) for more information on atomic commits. See the [documentation on `git add`](https://git-scm.com/docs/git-add) for information on how to isolate local changes for committing.
-- **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.
+- **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.
-
+- **It is inadvisable to create large pull requests with lots of changes** 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.
-- **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).
+- **Details should be provided of tests done.** Simply saying "Tested" or equivalent is not acceptable.
+
+### Code contributions
+- **Avoid committing changes directly on GitHub. This includes use of the web editor, and also uploading files.** 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`.
+- **Make sure you can explain your changes**. If you can't provide a good explanation of changes, your PR may be rejected.
+- **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.
 
 
 **Thanks for contributing to PocketMine-MP!**
@@ -78,17 +68,18 @@ It is mainly [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accept
 - 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.
+- All constant declarations SHOULD be preceded by a visibility modifier.
 
 ```php
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace pocketmine\example;
 
 class ExampleClass{
 
-	const EXAMPLE_CLASS_CONSTANT = 1;
+	public const EXAMPLE_CLASS_CONSTANT = 1;
 
 	public $examplePublicVariable = "defaultValue";
 	private $examplePrivateVariable;
@@ -99,7 +90,7 @@ class ExampleClass{
 	 * @param string      $firstArgument  the first argument
 	 * @param string|null $secondArgument default null
 	 */
-	public function __construct(string $firstArgument, &$secondArgument = null){
+	public function __construct(string $firstArgument, ?string &$secondArgument = null){
 		if($firstArgument === "exampleValue"){ //Remember to use === instead of == when possible
 			//do things
 		}elseif($firstArgument === "otherValue"){
@@ -119,7 +110,6 @@ class ExampleClass{
 	public function doStuff(string $stuff) : string{
 		return $stuff;
 	}
-
 }
 ```
 
@@ -133,4 +123,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.
+* RFCs with complex voting options will specify the vote percentage or other details.

README.md

@@ -1,6 +1,6 @@
 # [![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__
+__A highly customisable, open source server software for Minecraft: Bedrock Edition written in PHP__
 
 [![Build Status](https://travis-ci.org/pmmp/PocketMine-MP.svg?branch=master)](https://travis-ci.org/pmmp/PocketMine-MP)
 
@@ -10,7 +10,6 @@ If you don't find what you're looking for there, [talk to a human](#discussion).
 
 ### 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 [Poggit](https://poggit.pmmp.io), or just search GitHub.
@@ -23,19 +22,10 @@ There are a very wide range of already-written plugins available which you can u
 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/)
+- Latest release builds can be found in our [GitHub releases](https://github.com/pmmp/PocketMine-MP/releases).
+- Latest bleeding-edge development builds (and other builds in the build job channels) can be found on our [Jenkins server](https://jenkins.pmmp.io/).
 
-## Third-party Libraries/Protocols Used
+**Note: Please avoid development builds unless there is no other alternative for what you need.** Development builds are subject to changes at any time without notice, and it is likely that your server or plugins might break without warning.
-* __[PHP Sockets](http://php.net/manual/en/book.sockets.php)__
-* __[PHP mbstring](http://php.net/manual/en/book.mbstring.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
 

composer.json

@@ -1,13 +1,16 @@
 {
-   "name": "pmmp/pocketmine-mp",
+   "name": "pocketmine/pocketmine-mp",
    "description": "A server software for Minecraft: Pocket Edition written in PHP",
    "type": "project",
    "homepage": "https://pmmp.io",
    "license": "LGPL-3.0",
    "require": {
-      "php": ">=7.2.0RC3",
+      "php": ">=7.2.0",
+      "php-64bit": "*",
       "ext-bcmath": "*",
       "ext-curl": "*",
+      "ext-ctype": "*",
+      "ext-date": "*",
       "ext-hash": "*",
       "ext-json": "*",
       "ext-mbstring": "*",
@@ -21,14 +24,23 @@
       "ext-yaml": ">=2.0.0",
       "ext-zip": "*",
       "ext-zlib": ">=1.2.11",
-      "pmmp/raklib": "dev-master#29ab14d5d8640a8ee359ce315b083a129e72db4a",
+      "pocketmine/raklib": "^0.12.0",
-      "pmmp/pocketmine-spl": "^0.1.0"
+      "pocketmine/spl": "^0.3.0",
+      "pocketmine/binaryutils": "^0.1.0",
+      "pocketmine/nbt": "^0.2.0",
+      "pocketmine/math": "^0.2.0",
+      "pocketmine/snooze": "^0.1.0"
    },
    "autoload": {
-      "psr-0": {
+      "psr-4": {
          "": ["src"]
       }
    },
+   "autoload-dev": {
+      "psr-4": {
+         "pocketmine\\": "tests/phpunit/"
+      }
+   },
    "repositories": [
       {
          "type": "vcs",
@@ -36,7 +48,23 @@
       },
       {
          "type": "vcs",
-         "url": "https://github.com/pmmp/PocketMine-SPL"
+         "url": "https://github.com/pmmp/SPL"
+      },
+      {
+         "type": "vcs",
+         "url": "https://github.com/pmmp/BinaryUtils"
+      },
+      {
+         "type": "vcs",
+         "url": "https://github.com/pmmp/NBT"
+      },
+      {
+         "type": "vcs",
+         "url": "https://github.com/pmmp/Math"
+      },
+      {
+         "type": "vcs",
+         "url": "https://github.com/pmmp/Snooze"
       }
    ]
 }

composer.lock

@@ -1,23 +1,206 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "169d2724a6847e704f3bb76030bebc87",
+    "content-hash": "2670b9e2a730ff758909be8b9e9d609a",
     "packages": [
         {
-            "name": "pmmp/pocketmine-spl",
+            "name": "pocketmine/binaryutils",
-            "version": "0.1.0",
+            "version": "0.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/pmmp/PocketMine-SPL.git",
+                "url": "https://github.com/pmmp/BinaryUtils.git",
-                "reference": "c56936e6aaad925bb60002b29b1c70f497af4679"
+                "reference": "54efeb978be0ff9335022729fe63c1e2077bf1be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/PocketMine-SPL/zipball/c56936e6aaad925bb60002b29b1c70f497af4679",
+                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/54efeb978be0ff9335022729fe63c1e2077bf1be",
-                "reference": "c56936e6aaad925bb60002b29b1c70f497af4679",
+                "reference": "54efeb978be0ff9335022729fe63c1e2077bf1be",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2",
+                "php-64bit": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "pocketmine\\utils\\": "src/"
+                }
+            },
+            "license": [
+                "LGPL-3.0"
+            ],
+            "description": "Classes and methods for conveniently handling binary data",
+            "support": {
+                "source": "https://github.com/pmmp/BinaryUtils/tree/master",
+                "issues": "https://github.com/pmmp/BinaryUtils/issues"
+            },
+            "time": "2018-08-26T18:11:05+00:00"
+        },
+        {
+            "name": "pocketmine/math",
+            "version": "0.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/Math.git",
+                "reference": "ee299f5c9c444ca526c9c691b920f321458cf0b6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/Math/zipball/ee299f5c9c444ca526c9c691b920f321458cf0b6",
+                "reference": "ee299f5c9c444ca526c9c691b920f321458cf0b6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0",
+                "php-64bit": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "pocketmine\\math\\": "src/"
+                }
+            },
+            "license": [
+                "LGPL-3.0"
+            ],
+            "description": "PHP library containing math related code used in PocketMine-MP",
+            "support": {
+                "source": "https://github.com/pmmp/Math/tree/0.2.1",
+                "issues": "https://github.com/pmmp/Math/issues"
+            },
+            "time": "2018-08-15T15:43:27+00:00"
+        },
+        {
+            "name": "pocketmine/nbt",
+            "version": "0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/NBT.git",
+                "reference": "da19487ff92f6f7a16b5ce8894132bb1d1e9ea0c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/NBT/zipball/da19487ff92f6f7a16b5ce8894132bb1d1e9ea0c",
+                "reference": "da19487ff92f6f7a16b5ce8894132bb1d1e9ea0c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0",
+                "php-64bit": "*",
+                "pocketmine/binaryutils": "^0.1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "pocketmine\\nbt\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "pocketmine\\nbt\\": "tests/phpunit/"
+                }
+            },
+            "license": [
+                "LGPL-3.0"
+            ],
+            "description": "PHP library for working with Named Binary Tags",
+            "support": {
+                "source": "https://github.com/pmmp/NBT/tree/0.2.0",
+                "issues": "https://github.com/pmmp/NBT/issues"
+            },
+            "time": "2018-06-13T09:56:00+00:00"
+        },
+        {
+            "name": "pocketmine/raklib",
+            "version": "0.12.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/RakLib.git",
+                "reference": "922da28efd828e2af6c19db1676ea9b6a267071c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/922da28efd828e2af6c19db1676ea9b6a267071c",
+                "reference": "922da28efd828e2af6c19db1676ea9b6a267071c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-bcmath": "*",
+                "ext-pthreads": ">=3.1.7dev",
+                "ext-sockets": "*",
+                "php": ">=7.2.0",
+                "php-64bit": "*",
+                "php-ipv6": "*",
+                "pocketmine/binaryutils": "^0.1.0",
+                "pocketmine/snooze": "^0.1.0",
+                "pocketmine/spl": "^0.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "raklib\\": "src/"
+                }
+            },
+            "license": [
+                "GPL-3.0"
+            ],
+            "description": "A RakNet server implementation written in PHP",
+            "support": {
+                "source": "https://github.com/pmmp/RakLib/tree/0.12.0",
+                "issues": "https://github.com/pmmp/RakLib/issues"
+            },
+            "time": "2018-06-13T10:06:14+00:00"
+        },
+        {
+            "name": "pocketmine/snooze",
+            "version": "0.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/Snooze.git",
+                "reference": "3cc9d0164230889acb08e22cc126133809e9d346"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/Snooze/zipball/3cc9d0164230889acb08e22cc126133809e9d346",
+                "reference": "3cc9d0164230889acb08e22cc126133809e9d346",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pthreads": ">=3.1.7dev",
+                "php-64bit": ">=7.2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "pocketmine\\snooze\\": "src/"
+                }
+            },
+            "license": [
+                "LGPL-3.0"
+            ],
+            "description": "Thread notification management library for code using the pthreads extension",
+            "support": {
+                "source": "https://github.com/pmmp/Snooze/tree/0.1.0",
+                "issues": "https://github.com/pmmp/Snooze/issues"
+            },
+            "time": "2018-06-13T09:36:11+00:00"
+        },
+        {
+            "name": "pocketmine/spl",
+            "version": "0.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/SPL.git",
+                "reference": "ca3912099543ddc4b4b14f40e258d84ca547dfa5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/SPL/zipball/ca3912099543ddc4b4b14f40e258d84ca547dfa5",
+                "reference": "ca3912099543ddc4b4b14f40e258d84ca547dfa5",
                 "shasum": ""
             },
             "type": "library",
@@ -34,62 +217,26 @@
             ],
             "description": "Standard library files required by PocketMine-MP and related projects",
             "support": {
-                "source": "https://github.com/pmmp/PocketMine-SPL/tree/master"
+                "source": "https://github.com/pmmp/SPL/tree/master"
             },
-            "time": "2017-12-10T12:18:30+00:00"
+            "time": "2018-06-09T17:30:36+00:00"
-        },
-        {
-            "name": "pmmp/raklib",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pmmp/RakLib.git",
-                "reference": "29ab14d5d8640a8ee359ce315b083a129e72db4a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/29ab14d5d8640a8ee359ce315b083a129e72db4a",
-                "reference": "29ab14d5d8640a8ee359ce315b083a129e72db4a",
-                "shasum": ""
-            },
-            "require": {
-                "ext-bcmath": "*",
-                "ext-pthreads": ">=3.1.7dev",
-                "ext-sockets": "*",
-                "php": ">=7.2.0RC3",
-                "pmmp/pocketmine-spl": "^0.1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "./"
-                ]
-            },
-            "license": [
-                "GPL-3.0"
-            ],
-            "description": "A RakNet server implementation written in PHP",
-            "support": {
-                "source": "https://github.com/pmmp/RakLib/tree/master",
-                "issues": "https://github.com/pmmp/RakLib/issues"
-            },
-            "time": "2017-12-10T12:24:38+00:00"
         }
     ],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "php": 5,
+        "ext-pthreads": 20
-        "ext-pthreads": 20,
-        "pmmp/raklib": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.2.0RC3",
+        "php": ">=7.2.0",
+        "php-64bit": "*",
         "ext-bcmath": "*",
         "ext-curl": "*",
+        "ext-ctype": "*",
+        "ext-date": "*",
         "ext-hash": "*",
         "ext-json": "*",
         "ext-mbstring": "*",

doxygen.conf

@@ -38,13 +38,13 @@ PROJECT_NAME           = PocketMine-MP
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "PM_VERSION - API PM_API"
+PROJECT_NUMBER         = "PM_VERSION"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = 
+PROJECT_BRIEF          =
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is included in
 # the documentation. The maximum height of the logo should not exceed 55 pixels
@@ -151,7 +151,7 @@ FULL_PATH_NAMES        = NO
 # specify the list of include paths that are normally passed to the compiler
 # using the -I flag.
 
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_INC_PATH    =
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
 # less readable) file names. This can be useful is your file systems doesn't
@@ -218,13 +218,13 @@ TAB_SIZE               = 4
 # "Side Effects:". You can put \n's in the value part of an alias to insert
 # newlines.
 
-ALIASES                = 
+ALIASES                =
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding "class=itcl::class"
 # will allow you to use the command class in the itcl::class meaning.
 
-TCL_SUBST              = 
+TCL_SUBST              =
 
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
@@ -268,7 +268,7 @@ OPTIMIZE_OUTPUT_VHDL   = NO
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
 # the files are not read by doxygen.
 
-EXTENSION_MAPPING      = 
+EXTENSION_MAPPING      =
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
@@ -600,7 +600,7 @@ GENERATE_DEPRECATEDLIST= YES
 # sections, marked by \if <section_label> ... \endif and \cond <section_label>
 # ... \endcond blocks.
 
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 
 # The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
 # initial value of a variable or macro / define can have for it to appear in the
@@ -642,7 +642,7 @@ SHOW_NAMESPACES        = YES
 # by doxygen. Whatever the program writes to standard output is used as the file
 # version. For an example see the documentation.
 
-FILE_VERSION_FILTER    = 
+FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
@@ -655,7 +655,7 @@ FILE_VERSION_FILTER    =
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
 # tag is left empty.
 
-LAYOUT_FILE            = 
+LAYOUT_FILE            =
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
@@ -666,7 +666,7 @@ LAYOUT_FILE            =
 # search path. Do not use file names with spaces, bibtex cannot handle them. See
 # also \cite for info how to create references.
 
-CITE_BIB_FILES         = 
+CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
 # Configuration options related to warning and progress messages
@@ -725,7 +725,7 @@ WARN_FORMAT            = "$file:$line: $text"
 # messages should be written. If left blank the output is written to standard
 # error (stderr).
 
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
@@ -774,7 +774,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = 
+EXCLUDE                =
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -804,13 +804,13 @@ EXCLUDE_PATTERNS       = */bin/* \
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories use the pattern */test/*
 
-EXCLUDE_SYMBOLS        = 
+EXCLUDE_SYMBOLS        =
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or directories
 # that contain example code fragments that are included (see the \include
 # command).
 
-EXAMPLE_PATH           = 
+EXAMPLE_PATH           =
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
@@ -830,7 +830,7 @@ EXAMPLE_RECURSIVE      = NO
 # that contain images that are to be included in the documentation (see the
 # \image command).
 
-IMAGE_PATH             = 
+IMAGE_PATH             =
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -847,7 +847,7 @@ IMAGE_PATH             =
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
 
-INPUT_FILTER           = 
+INPUT_FILTER           =
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
 # basis. Doxygen will compare the file name with each pattern and apply the
@@ -856,7 +856,7 @@ INPUT_FILTER           =
 # filters are used. If the FILTER_PATTERNS tag is empty or if none of the
 # patterns match the file name, INPUT_FILTER is applied.
 
-FILTER_PATTERNS        = 
+FILTER_PATTERNS        =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
 # INPUT_FILTER ) will also be used to filter the input files that are used for
@@ -871,7 +871,7 @@ FILTER_SOURCE_FILES    = NO
 # *.ext= (so without naming a filter).
 # This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
 
-FILTER_SOURCE_PATTERNS = 
+FILTER_SOURCE_PATTERNS =
 
 # If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
 # is part of the input, its contents will be placed on the main page
@@ -983,7 +983,7 @@ CLANG_ASSISTED_PARSING = NO
 # specified with INPUT and INCLUDE_PATH.
 # This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
 
-CLANG_OPTIONS          = 
+CLANG_OPTIONS          =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
@@ -1009,7 +1009,7 @@ COLS_IN_ALPHA_INDEX    = 5
 # while generating the index headers.
 # This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the HTML output
@@ -1053,7 +1053,7 @@ HTML_FILE_EXTENSION    = .html
 # of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_HEADER            = 
+HTML_HEADER            =
 
 # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
 # generated HTML page. If the tag is left blank doxygen will generate a standard
@@ -1063,7 +1063,7 @@ HTML_HEADER            =
 # that doxygen normally uses.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_FOOTER            = 
+HTML_FOOTER            =
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
 # sheet that is used by each HTML page. It can be used to fine-tune the look of
@@ -1075,7 +1075,7 @@ HTML_FOOTER            =
 # obsolete.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_STYLESHEET        = 
+HTML_STYLESHEET        =
 
 # The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
 # defined cascading style sheet that is included after the standard style sheets
@@ -1086,7 +1086,7 @@ HTML_STYLESHEET        =
 # see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = 
+HTML_EXTRA_STYLESHEET  =
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1096,7 +1096,7 @@ HTML_EXTRA_STYLESHEET  =
 # files will be copied as-is; there are no commands or markers available.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_FILES       = 
+HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the stylesheet and background images according to
@@ -1224,7 +1224,7 @@ GENERATE_HTMLHELP      = NO
 # written to the html output directory.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               = 
+CHM_FILE               =
 
 # The HHC_LOCATION tag can be used to specify the location (absolute path
 # including file name) of the HTML help compiler ( hhc.exe). If non-empty
@@ -1232,7 +1232,7 @@ CHM_FILE               =
 # The file has to be specified with full path.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-HHC_LOCATION           = 
+HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated (
 # YES) or that it should be included in the master .chm file ( NO).
@@ -1245,7 +1245,7 @@ GENERATE_CHI           = NO
 # and project file content.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_INDEX_ENCODING     = 
+CHM_INDEX_ENCODING     =
 
 # The BINARY_TOC flag controls whether a binary table of contents is generated (
 # YES) or a normal table of contents ( NO) in the .chm file.
@@ -1275,7 +1275,7 @@ GENERATE_QHP           = NO
 # the HTML output folder.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QCH_FILE               = 
+QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
@@ -1300,7 +1300,7 @@ QHP_VIRTUAL_FOLDER     = doc
 # filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_CUST_FILTER_NAME   = 
+QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
@@ -1308,21 +1308,21 @@ QHP_CUST_FILTER_NAME   =
 # filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_CUST_FILTER_ATTRS  = 
+QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's filter section matches. Qt Help Project / Filter Attributes (see:
 # http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_SECT_FILTER_ATTRS  = 
+QHP_SECT_FILTER_ATTRS  =
 
 # The QHG_LOCATION tag can be used to specify the location of Qt's
 # qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
 # generated .qhp file.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHG_LOCATION           = 
+QHG_LOCATION           =
 
 # If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
 # generated, together with the HTML files, they form an Eclipse help plugin. To
@@ -1455,7 +1455,7 @@ MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_EXTENSIONS     = 
+MATHJAX_EXTENSIONS     =
 
 # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
 # of code that will be used on startup of the MathJax code. See the MathJax site
@@ -1463,7 +1463,7 @@ MATHJAX_EXTENSIONS     =
 # example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_CODEFILE       = 
+MATHJAX_CODEFILE       =
 
 # When the SEARCHENGINE tag is enabled doxygen will generate a search box for
 # the HTML output. The underlying search engine uses javascript and DHTML and
@@ -1523,7 +1523,7 @@ EXTERNAL_SEARCH        = NO
 # Searching" for details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-SEARCHENGINE_URL       = 
+SEARCHENGINE_URL       =
 
 # When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
 # search data is written to a file for indexing by an external tool. With the
@@ -1539,7 +1539,7 @@ SEARCHDATA_FILE        = searchdata.xml
 # projects and redirect the results back to the right project.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-EXTERNAL_SEARCH_ID     = 
+EXTERNAL_SEARCH_ID     =
 
 # The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
 # projects other than the one defined by this configuration file, but that are
@@ -1549,7 +1549,7 @@ EXTERNAL_SEARCH_ID     =
 # EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-EXTRA_SEARCH_MAPPINGS  = 
+EXTRA_SEARCH_MAPPINGS  =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the LaTeX output
@@ -1610,7 +1610,7 @@ PAPER_TYPE             = a4
 # If left blank no extra packages will be included.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-EXTRA_PACKAGES         = 
+EXTRA_PACKAGES         =
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
 # generated LaTeX document. The header should contain everything until the first
@@ -1626,7 +1626,7 @@ EXTRA_PACKAGES         =
 # PROJECT_NAME), or the project number (see PROJECT_NUMBER).
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_HEADER           = 
+LATEX_HEADER           =
 
 # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
 # generated LaTeX document. The footer should contain everything after the last
@@ -1635,7 +1635,7 @@ LATEX_HEADER           =
 # Note: Only use a user-defined footer if you know what you are doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_FOOTER           = 
+LATEX_FOOTER           =
 
 # The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the LATEX_OUTPUT output
@@ -1643,7 +1643,7 @@ LATEX_FOOTER           =
 # markers available.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_EXTRA_FILES      = 
+LATEX_EXTRA_FILES      =
 
 # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
 # prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
@@ -1743,14 +1743,14 @@ RTF_HYPERLINKS         = NO
 # default style sheet that doxygen normally uses.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_STYLESHEET_FILE    = 
+RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an RTF document. Syntax is
 # similar to doxygen's config file. A template extensions file can be generated
 # using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_EXTENSIONS_FILE    = 
+RTF_EXTENSIONS_FILE    =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
@@ -1811,13 +1811,13 @@ XML_OUTPUT             = xml
 # validating XML parser to check the syntax of the XML files.
 # This tag requires that the tag GENERATE_XML is set to YES.
 
-XML_SCHEMA             = 
+XML_SCHEMA             =
 
 # The XML_DTD tag can be used to specify a XML DTD, which can be used by a
 # validating XML parser to check the syntax of the XML files.
 # This tag requires that the tag GENERATE_XML is set to YES.
 
-XML_DTD                = 
+XML_DTD                =
 
 # If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
 # listings (including syntax highlighting and cross-referencing information) to
@@ -1894,7 +1894,7 @@ PERLMOD_PRETTY         = YES
 # overwrite each other's variables.
 # This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
@@ -1935,7 +1935,7 @@ SEARCH_INCLUDES        = YES
 # preprocessor.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           = 
+INCLUDE_PATH           =
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
@@ -1943,7 +1943,7 @@ INCLUDE_PATH           =
 # used.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  =
 
 # The PREDEFINED tag can be used to specify one or more macro names that are
 # defined before the preprocessor is started (similar to the -D option of e.g.
@@ -1953,7 +1953,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = 
+PREDEFINED             =
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
@@ -1962,7 +1962,7 @@ PREDEFINED             =
 # definition found in the source code.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      =
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
 # remove all refrences to function-like macros that are alone on a line, have an
@@ -1991,13 +1991,13 @@ SKIP_FUNCTION_MACROS   = YES
 # the path). If a tag file is not located in the directory in which doxygen is
 # run, you must also specify the path to the tagfile here.
 
-TAGFILES               = 
+TAGFILES               =
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create a
 # tag file that is based on the input files it reads. See section "Linking to
 # external documentation" for more information about the usage of tag files.
 
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       =
 
 # If the ALLEXTERNALS tag is set to YES all external class will be listed in the
 # class index. If set to NO only the inherited external classes will be listed.
@@ -2045,14 +2045,14 @@ CLASS_DIAGRAMS         = NO
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
-MSCGEN_PATH            = 
+MSCGEN_PATH            =
 
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 # DIA_PATH tag allows you to specify the directory where the dia binary resides.
 # If left empty dia is assumed to be found in the default search path.
 
-DIA_PATH               = 
+DIA_PATH               =
 
 # If set to YES, the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
@@ -2101,7 +2101,7 @@ DOT_FONTSIZE           = 10
 # the path where dot can find it using this tag.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTPATH           = 
+DOT_FONTPATH           =
 
 # If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
 # each documented class showing the direct and indirect inheritance relations.
@@ -2239,26 +2239,26 @@ INTERACTIVE_SVG        = YES
 # found. If left blank, it is assumed the dot tool can be found in the path.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_PATH               = 
+DOT_PATH               =
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the \dotfile
 # command).
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOTFILE_DIRS           = 
+DOTFILE_DIRS           =
 
 # The MSCFILE_DIRS tag can be used to specify one or more directories that
 # contain msc files that are included in the documentation (see the \mscfile
 # command).
 
-MSCFILE_DIRS           = 
+MSCFILE_DIRS           =
 
 # The DIAFILE_DIRS tag can be used to specify one or more directories that
 # contain dia files that are included in the documentation (see the \diafile
 # command).
 
-DIAFILE_DIRS           = 
+DIAFILE_DIRS           =
 
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
 # that will be shown in the graph. If the number of nodes in a graph becomes
@@ -2319,4 +2319,3 @@ GENERATE_LEGEND        = YES
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES
-

src/pocketmine/Achievement.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine;
 
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\utils\TextFormat;
 
 /**
@@ -116,7 +116,7 @@ abstract class Achievement{
 	public static function broadcast(Player $player, string $achievementId) : bool{
 		if(isset(Achievement::$list[$achievementId])){
 			$translation = new TranslationContainer("chat.type.achievement", [$player->getDisplayName(), TextFormat::GREEN . Achievement::$list[$achievementId]["name"] . TextFormat::RESET]);
-			if(Server::getInstance()->getConfigBool("announce-player-achievements", true) === true){
+			if(Server::getInstance()->getConfigBool("announce-player-achievements", true)){
 				Server::getInstance()->broadcastMessage($translation);
 			}else{
 				$player->sendMessage($translation);
@@ -147,6 +147,4 @@ abstract class Achievement{
 
 		return false;
 	}
-
-
 }

src/pocketmine/CrashDump.php

@@ -64,6 +64,8 @@ class CrashDump{
 		$this->extraData();
 
 		$this->encodeData();
+
+		fclose($this->fp);
 	}
 
 	public function getPath() : string{
@@ -115,10 +117,10 @@ class CrashDump{
 	}
 
 	private function extraData(){
-		global $arguments;
+		global $argv;
 
 		if($this->server->getProperty("auto-report.send-settings", true) !== false){
-			$this->data["parameters"] = (array) $arguments;
+			$this->data["parameters"] = (array) $argv;
 			$this->data["server.properties"] = @file_get_contents($this->server->getDataPath() . "server.properties");
 			$this->data["server.properties"] = preg_replace("#^rcon\\.password=(.*)$#m", "rcon.password=******", $this->data["server.properties"]);
 			$this->data["pocketmine.yml"] = @file_get_contents($this->server->getDataPath() . "pocketmine.yml");
@@ -148,7 +150,7 @@ class CrashDump{
 			$error = $lastExceptionError;
 		}else{
 			$error = (array) error_get_last();
-			$error["trace"] = getTrace(4); //Skipping CrashDump->baseCrash, CrashDump->construct, Server->crashDump
+			$error["trace"] = Utils::getTrace(4); //Skipping CrashDump->baseCrash, CrashDump->construct, Server->crashDump
 			$errorConversion = [
 				E_ERROR => "E_ERROR",
 				E_WARNING => "E_WARNING",
@@ -167,7 +169,7 @@ class CrashDump{
 				E_USER_DEPRECATED => "E_USER_DEPRECATED"
 			];
 			$error["fullFile"] = $error["file"];
-			$error["file"] = cleanPath($error["file"]);
+			$error["file"] = Utils::cleanPath($error["file"]);
 			$error["type"] = $errorConversion[$error["type"]] ?? $error["type"];
 			if(($pos = strpos($error["message"], "\n")) !== false){
 				$error["message"] = substr($error["message"], 0, $pos);
@@ -186,7 +188,7 @@ class CrashDump{
 		$this->addLine("Line: " . $error["line"]);
 		$this->addLine("Type: " . $error["type"]);
 
-		if(strpos($error["file"], "src/pocketmine/") === false and strpos($error["file"], "src/raklib/") === false and file_exists($error["fullFile"])){
+		if(strpos($error["file"], "src/pocketmine/") === false and strpos($error["file"], "vendor/pocketmine/") === false and file_exists($error["fullFile"])){
 			$this->addLine();
 			$this->addLine("THIS CRASH WAS CAUSED BY A PLUGIN");
 			$this->data["plugin"] = true;
@@ -195,7 +197,7 @@ class CrashDump{
 			$file = $reflection->getProperty("file");
 			$file->setAccessible(true);
 			foreach($this->server->getPluginManager()->getPlugins() as $plugin){
-				$filePath = \pocketmine\cleanPath($file->getValue($plugin));
+				$filePath = Utils::cleanPath($file->getValue($plugin));
 				if(strpos($error["file"], $filePath) === 0){
 					$this->data["plugin"] = $plugin->getName();
 					$this->addLine("BAD PLUGIN: " . $plugin->getDescription()->getFullName());
@@ -227,13 +229,13 @@ class CrashDump{
 	}
 
 	private function generalData(){
-		$version = new VersionString();
+		$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
 		$this->data["general"] = [];
 		$this->data["general"]["name"] = $this->server->getName();
-		$this->data["general"]["version"] = $version->get(false);
+		$this->data["general"]["version"] = $version->getFullVersion(false);
 		$this->data["general"]["build"] = $version->getBuild();
 		$this->data["general"]["protocol"] = ProtocolInfo::CURRENT_PROTOCOL;
-		$this->data["general"]["api"] = \pocketmine\API_VERSION;
+		$this->data["general"]["api"] = \pocketmine\BASE_VERSION;
 		$this->data["general"]["git"] = \pocketmine\GIT_COMMIT;
 		$this->data["general"]["raklib"] = RakLib::VERSION;
 		$this->data["general"]["uname"] = php_uname("a");
@@ -241,7 +243,7 @@ class CrashDump{
 		$this->data["general"]["zend"] = zend_version();
 		$this->data["general"]["php_os"] = PHP_OS;
 		$this->data["general"]["os"] = Utils::getOS();
-		$this->addLine($this->server->getName() . " version: " . $version->get(false) . " #" . $version->getBuild() . " [Protocol " . ProtocolInfo::CURRENT_PROTOCOL . "; API " . API_VERSION . "]");
+		$this->addLine($this->server->getName() . " version: " . $version->getFullVersion(true) . " [Protocol " . ProtocolInfo::CURRENT_PROTOCOL . "]");
 		$this->addLine("Git commit: " . GIT_COMMIT);
 		$this->addLine("uname -a: " . php_uname("a"));
 		$this->addLine("PHP Version: " . phpversion());
@@ -256,5 +258,4 @@ class CrashDump{
 	public function add($str){
 		fwrite($this->fp, $str);
 	}
-
+}
-}

src/pocketmine/MemoryManager.php

@@ -24,10 +24,9 @@ declare(strict_types=1);
 namespace pocketmine;
 
 use pocketmine\event\server\LowMemoryEvent;
-use pocketmine\event\Timings;
 use pocketmine\scheduler\DumpWorkerMemoryTask;
 use pocketmine\scheduler\GarbageCollectionTask;
-use pocketmine\utils\MainLogger;
+use pocketmine\timings\Timings;
 use pocketmine\utils\Utils;
 
 class MemoryManager{
@@ -243,9 +242,9 @@ class MemoryManager{
 		Timings::$garbageCollectorTimer->startTiming();
 
 		if($this->garbageCollectionAsync){
-			$size = $this->server->getScheduler()->getAsyncTaskPoolSize();
+			$pool = $this->server->getAsyncPool();
-			for($i = 0; $i < $size; ++$i){
+			foreach($pool->getRunningWorkers() as $i){
-				$this->server->getScheduler()->scheduleAsyncTaskToWorker(new GarbageCollectionTask(), $i);
+				$pool->submitTaskToWorker(new GarbageCollectionTask(), $i);
 			}
 		}
 
@@ -264,13 +263,13 @@ class MemoryManager{
 	 * @param int    $maxStringSize
 	 */
 	public function dumpServerMemory(string $outputFolder, int $maxNesting, int $maxStringSize){
-		MainLogger::getLogger()->notice("[Dump] After the memory dump is done, the server might crash");
+		$this->server->getLogger()->notice("[Dump] After the memory dump is done, the server might crash");
-		self::dumpMemory($this->server, $this->server->getLoader(), $outputFolder, $maxNesting, $maxStringSize);
+		self::dumpMemory($this->server, $outputFolder, $maxNesting, $maxStringSize, $this->server->getLogger());
 
 		if($this->dumpWorkers){
-			$scheduler = $this->server->getScheduler();
+			$pool = $this->server->getAsyncPool();
-			for($i = 0, $size = $scheduler->getAsyncTaskPoolSize(); $i < $size; ++$i){
+			foreach($pool->getRunningWorkers() as $i){
-				$scheduler->scheduleAsyncTaskToWorker(new DumpWorkerMemoryTask($outputFolder, $maxNesting, $maxStringSize), $i);
+				$pool->submitTaskToWorker(new DumpWorkerMemoryTask($outputFolder, $maxNesting, $maxStringSize), $i);
 			}
 		}
 	}
@@ -278,13 +277,15 @@ class MemoryManager{
 	/**
 	 * Static memory dumper accessible from any thread.
 	 *
-	 * @param mixed        $startingObject
+	 * @param mixed   $startingObject
-	 * @param \ClassLoader $loader
+	 * @param string  $outputFolder
-	 * @param string       $outputFolder
+	 * @param int     $maxNesting
-	 * @param int          $maxNesting
+	 * @param int     $maxStringSize
-	 * @param int          $maxStringSize
+	 * @param \Logger $logger
+	 *
+	 * @throws \ReflectionException
 	 */
-	public static function dumpMemory($startingObject, \ClassLoader $loader, string $outputFolder, int $maxNesting, int $maxStringSize){
+	public static function dumpMemory($startingObject, string $outputFolder, int $maxNesting, int $maxStringSize, \Logger $logger){
 		$hardLimit = ini_get('memory_limit');
 		ini_set('memory_limit', '-1');
 		gc_disable();
@@ -306,7 +307,7 @@ class MemoryManager{
 		$staticProperties = [];
 		$staticCount = 0;
 
-		foreach($loader->getClasses() as $className){
+		foreach(get_declared_classes() as $className){
 			$reflection = new \ReflectionClass($className);
 			$staticProperties[$className] = [];
 			foreach($reflection->getProperties() as $property){
@@ -328,9 +329,9 @@ class MemoryManager{
 		}
 
 		file_put_contents($outputFolder . "/staticProperties.js", json_encode($staticProperties, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
-		MainLogger::getLogger()->info("[Dump] Wrote $staticCount static properties");
+		$logger->info("[Dump] Wrote $staticCount static properties");
 
-		if($GLOBALS !== null){ //This might be null if we're on a different thread
+		if(isset($GLOBALS)){ //This might be null if we're on a different thread
 			$globalVariables = [];
 			$globalCount = 0;
 
@@ -356,7 +357,7 @@ class MemoryManager{
 			}
 
 			file_put_contents($outputFolder . "/globalVariables.js", json_encode($globalVariables, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
-			MainLogger::getLogger()->info("[Dump] Wrote $globalCount global variables");
+			$logger->info("[Dump] Wrote $globalCount global variables");
 		}
 
 		self::continueDump($startingObject, $data, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
@@ -393,15 +394,22 @@ class MemoryManager{
 					$info["implements"] = implode(", ", $reflection->getInterfaceNames());
 				}
 
-				foreach($reflection->getProperties() as $property){
+				for($original = $reflection; $reflection !== false; $reflection = $reflection->getParentClass()){
-					if($property->isStatic()){
+					foreach($reflection->getProperties() as $property){
-						continue;
+						if($property->isStatic()){
-					}
+							continue;
+						}
 
-					if(!$property->isPublic()){
+						$name = $property->getName();
-						$property->setAccessible(true);
+						if($reflection !== $original and !$property->isPublic()){
+							$name = $reflection->getName() . ":" . $name;
+						}
+						if(!$property->isPublic()){
+							$property->setAccessible(true);
+						}
+
+						self::continueDump($property->getValue($object), $info["properties"][$name], $objects, $refCounts, 0, $maxNesting, $maxStringSize);
 					}
-					self::continueDump($property->getValue($object), $info["properties"][$property->getName()], $objects, $refCounts, 0, $maxNesting, $maxStringSize);
 				}
 
 				fwrite($obData, "$hash@$className: " . json_encode($info, JSON_UNESCAPED_SLASHES) . "\n");
@@ -410,7 +418,7 @@ class MemoryManager{
 
 		}while($continue);
 
-		MainLogger::getLogger()->info("[Dump] Wrote " . count($objects) . " objects");
+		$logger->info("[Dump] Wrote " . count($objects) . " objects");
 
 		fclose($obData);
 
@@ -420,7 +428,7 @@ class MemoryManager{
 		arsort($instanceCounts, SORT_NUMERIC);
 		file_put_contents($outputFolder . "/instanceCounts.js", json_encode($instanceCounts, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
 
-		MainLogger::getLogger()->info("[Dump] Finished!");
+		$logger->info("[Dump] Finished!");
 
 		ini_set('memory_limit', $hardLimit);
 		gc_enable();

src/pocketmine/OfflinePlayer.php

@@ -44,7 +44,7 @@ class OfflinePlayer implements IPlayer, Metadatable{
 	public function __construct(Server $server, string $name){
 		$this->server = $server;
 		$this->name = $name;
-		if(file_exists($this->server->getDataPath() . "players/" . strtolower($this->getName()) . ".dat")){
+		if(file_exists($this->server->getDataPath() . "players/" . strtolower($this->name) . ".dat")){
 			$this->namedtag = $this->server->getOfflinePlayerData($this->name);
 		}else{
 			$this->namedtag = null;
@@ -64,7 +64,7 @@ class OfflinePlayer implements IPlayer, Metadatable{
 	}
 
 	public function isOp() : bool{
-		return $this->server->isOp(strtolower($this->getName()));
+		return $this->server->isOp($this->name);
 	}
 
 	public function setOp(bool $value){
@@ -72,39 +72,39 @@ class OfflinePlayer implements IPlayer, Metadatable{
 			return;
 		}
 
-		if($value === true){
+		if($value){
-			$this->server->addOp(strtolower($this->getName()));
+			$this->server->addOp($this->name);
 		}else{
-			$this->server->removeOp(strtolower($this->getName()));
+			$this->server->removeOp($this->name);
 		}
 	}
 
 	public function isBanned() : bool{
-		return $this->server->getNameBans()->isBanned(strtolower($this->getName()));
+		return $this->server->getNameBans()->isBanned($this->name);
 	}
 
 	public function setBanned(bool $value){
-		if($value === true){
+		if($value){
-			$this->server->getNameBans()->addBan($this->getName(), null, null, null);
+			$this->server->getNameBans()->addBan($this->name, null, null, null);
 		}else{
-			$this->server->getNameBans()->remove($this->getName());
+			$this->server->getNameBans()->remove($this->name);
 		}
 	}
 
 	public function isWhitelisted() : bool{
-		return $this->server->isWhitelisted(strtolower($this->getName()));
+		return $this->server->isWhitelisted($this->name);
 	}
 
 	public function setWhitelisted(bool $value){
-		if($value === true){
+		if($value){
-			$this->server->addWhitelist(strtolower($this->getName()));
+			$this->server->addWhitelist($this->name);
 		}else{
-			$this->server->removeWhitelist(strtolower($this->getName()));
+			$this->server->removeWhitelist($this->name);
 		}
 	}
 
 	public function getPlayer(){
-		return $this->server->getPlayerExact($this->getName());
+		return $this->server->getPlayerExact($this->name);
 	}
 
 	public function getFirstPlayed(){
@@ -134,6 +134,4 @@ class OfflinePlayer implements IPlayer, Metadatable{
 	public function removeMetadata(string $metadataKey, Plugin $owningPlugin){
 		$this->server->getPlayerMetadata()->removeMetadata($this, $metadataKey, $owningPlugin);
 	}
-
-
 }

src/pocketmine/PocketMine.php

@@ -24,105 +24,115 @@ declare(strict_types=1);
 namespace {
 	const INT32_MIN = -0x80000000;
 	const INT32_MAX = 0x7fffffff;
-
-	function safe_var_dump(){
-		static $cnt = 0;
-		foreach(func_get_args() as $var){
-			switch(true){
-				case is_array($var):
-					echo str_repeat("  ", $cnt) . "array(" . count($var) . ") {" . PHP_EOL;
-					foreach($var as $key => $value){
-						echo str_repeat("  ", $cnt + 1) . "[" . (is_int($key) ? $key : '"' . $key . '"') . "]=>" . PHP_EOL;
-						++$cnt;
-						safe_var_dump($value);
-						--$cnt;
-					}
-					echo str_repeat("  ", $cnt) . "}" . PHP_EOL;
-					break;
-				case is_int($var):
-					echo str_repeat("  ", $cnt) . "int(" . $var . ")" . PHP_EOL;
-					break;
-				case is_float($var):
-					echo str_repeat("  ", $cnt) . "float(" . $var . ")" . PHP_EOL;
-					break;
-				case is_bool($var):
-					echo str_repeat("  ", $cnt) . "bool(" . ($var === true ? "true" : "false") . ")" . PHP_EOL;
-					break;
-				case is_string($var):
-					echo str_repeat("  ", $cnt) . "string(" . strlen($var) . ") \"$var\"" . PHP_EOL;
-					break;
-				case is_resource($var):
-					echo str_repeat("  ", $cnt) . "resource() of type (" . get_resource_type($var) . ")" . PHP_EOL;
-					break;
-				case is_object($var):
-					echo str_repeat("  ", $cnt) . "object(" . get_class($var) . ")" . PHP_EOL;
-					break;
-				case is_null($var):
-					echo str_repeat("  ", $cnt) . "NULL" . PHP_EOL;
-					break;
-			}
-		}
-	}
-
-	function dummy(){
-
-	}
 }
 
 namespace pocketmine {
 
-	use pocketmine\utils\Binary;
 	use pocketmine\utils\MainLogger;
 	use pocketmine\utils\ServerKiller;
 	use pocketmine\utils\Terminal;
+	use pocketmine\utils\Timezone;
 	use pocketmine\utils\Utils;
+	use pocketmine\utils\VersionString;
 	use pocketmine\wizard\SetupWizard;
-	use raklib\RakLib;
 
 	const NAME = "PocketMine-MP";
-	const VERSION = "1.7dev";
+	const BASE_VERSION = "3.0.12";
-	const API_VERSION = "3.0.0-ALPHA10";
+	const IS_DEVELOPMENT_BUILD = false;
-	const CODENAME = "[REDACTED]";
+	const BUILD_NUMBER = 0;
 
-	const MIN_PHP_VERSION = "7.2.0RC3";
+	const MIN_PHP_VERSION = "7.2.0";
+
+	function critical_error($message){
+		echo "[ERROR] $message" . PHP_EOL;
+	}
 
 	/*
 	 * Startup code. Do not look at it, it may harm you.
-	 * Most of them are hacks to fix date-related bugs, or basic functions used after this
 	 * This is the only non-class based file on this project.
 	 * Enjoy it as much as I did writing it. I don't want to do it again.
 	 */
 
 	if(version_compare(MIN_PHP_VERSION, PHP_VERSION) > 0){
-		echo "[CRITICAL] " . \pocketmine\NAME . " requires PHP >= " . MIN_PHP_VERSION . ", but you have PHP " . PHP_VERSION . "." . PHP_EOL;
+		critical_error(\pocketmine\NAME . " requires PHP >= " . MIN_PHP_VERSION . ", but you have PHP " . PHP_VERSION . ".");
-		echo "[CRITICAL] Please use the installer provided on the homepage, or update to a newer PHP version." . PHP_EOL;
+		critical_error("Please refer to the installation instructions at http://pmmp.rtfd.io/en/rtfd/installation.html.");
 		exit(1);
 	}
 
-	if(!extension_loaded("pthreads")){
+	if(PHP_INT_SIZE < 8){
-		echo "[CRITICAL] Unable to find the pthreads extension." . PHP_EOL;
+		critical_error("Running " . \pocketmine\NAME . " with 32-bit systems/PHP is no longer supported.");
-		echo "[CRITICAL] Please use the installer provided on the homepage." . PHP_EOL;
+		critical_error("Please upgrade to a 64-bit system, or use a 64-bit PHP binary if this is a 64-bit system.");
+		critical_error("Please refer to the installation instructions at http://pmmp.rtfd.io/en/rtfd/installation.html.");
+		exit(1);
+	}
+
+	/* Dependencies check */
+
+	$errors = 0;
+
+	if(php_sapi_name() !== "cli"){
+		critical_error("You must run " . \pocketmine\NAME . " using the CLI.");
+		++$errors;
+	}
+
+	$extensions = [
+		"bcmath" => "BC Math",
+		"curl" => "cURL",
+		"ctype" => "ctype",
+		"date" => "Date",
+		"hash" => "Hash",
+		"json" => "JSON",
+		"mbstring" => "Multibyte String",
+		"openssl" => "OpenSSL",
+		"pcre" => "PCRE",
+		"phar" => "Phar",
+		"pthreads" => "pthreads",
+		"reflection" => "Reflection",
+		"sockets" => "Sockets",
+		"spl" => "SPL",
+		"yaml" => "YAML",
+		"zip" => "Zip",
+		"zlib" => "Zlib"
+	];
+
+	foreach($extensions as $ext => $name){
+		if(!extension_loaded($ext)){
+			critical_error("Unable to find the $name ($ext) extension.");
+			++$errors;
+		}
+	}
+
+	if(extension_loaded("pthreads")){
+		$pthreads_version = phpversion("pthreads");
+		if(substr_count($pthreads_version, ".") < 2){
+			$pthreads_version = "0.$pthreads_version";
+		}
+		if(version_compare($pthreads_version, "3.1.7dev") < 0){
+			critical_error("pthreads >= 3.1.7dev is required, while you have $pthreads_version.");
+			++$errors;
+		}
+	}
+
+	if(extension_loaded("leveldb")){
+		$leveldb_version = phpversion("leveldb");
+		if(version_compare($leveldb_version, "0.2.1") < 0){
+			critical_error("php-leveldb >= 0.2.1 is required, while you have $leveldb_version");
+			++$errors;
+		}
+	}
+
+	if(extension_loaded("pocketmine")){
+		critical_error("The native PocketMine extension is no longer supported.");
+		++$errors;
+	}
+
+	if($errors > 0){
+		critical_error("Please recompile PHP with the needed configuration, or refer to the installation instructions at http://pmmp.rtfd.io/en/rtfd/installation.html.");
 		exit(1);
 	}
 
 	error_reporting(-1);
 
-	function error_handler($severity, $message, $file, $line){
-		if(error_reporting() & $severity){
-			throw new \ErrorException($message, 0, $severity, $file, $line);
-		}else{ //stfu operator
-			return true;
-		}
-	}
-
-	set_error_handler('\pocketmine\error_handler');
-
-	if(!extension_loaded("phar")){
-		echo "[CRITICAL] Unable to find the Phar extension." . PHP_EOL;
-		echo "[CRITICAL] Please use the installer provided on the homepage." . PHP_EOL;
-		exit(1);
-	}
-
 	if(\Phar::running(true) !== ""){
 		define('pocketmine\PATH', \Phar::running(true) . "/");
 	}else{
@@ -131,34 +141,20 @@ namespace pocketmine {
 
 	define('pocketmine\COMPOSER_AUTOLOADER_PATH', \pocketmine\PATH . 'vendor/autoload.php');
 
-	function composer_error_die($message){
-		echo "[CRITICAL] $message" . PHP_EOL;
-		echo "[CRITICAL] Please install/update Composer dependencies or use provided builds." . PHP_EOL;
-		exit(1);
-	}
-
 	if(is_file(\pocketmine\COMPOSER_AUTOLOADER_PATH)){
 		require_once(\pocketmine\COMPOSER_AUTOLOADER_PATH);
 	}else{
-		composer_error_die("Composer autoloader not found.");
+		critical_error("Composer autoloader not found.");
+		critical_error("Please install/update Composer dependencies or use provided builds.");
+		exit(1);
 	}
 
-	if(!class_exists(RakLib::class)){
+	set_error_handler([Utils::class, 'errorExceptionHandler']);
-		composer_error_die("Unable to find the RakLib library.");
-	}
-	if(version_compare(RakLib::VERSION, "0.9.0") < 0){ //TODO: remove this check (it's managed by Composer now)
-		composer_error_die("RakLib version 0.9.0 is required, while you have version " . RakLib::VERSION . ".");
-	}
-	if(!class_exists(\BaseClassLoader::class)){
-		composer_error_die("Unable to find the PocketMine-SPL library.");
-	}
 
 	/*
 	 * We now use the Composer autoloader, but this autoloader is still for loading plugins.
 	 */
 	$autoloader = new \BaseClassLoader();
-	$autoloader->addPath(\pocketmine\PATH . "src");
-	$autoloader->addPath(\pocketmine\PATH . "src" . DIRECTORY_SEPARATOR . "spl");
 	$autoloader->register(false);
 
 	set_time_limit(0); //Who set it to 30 seconds?!?!
@@ -173,370 +169,62 @@ namespace pocketmine {
 
 	define('pocketmine\RESOURCE_PATH', \pocketmine\PATH . 'src' . DIRECTORY_SEPARATOR . 'pocketmine' . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR);
 
-	$opts = getopt("", ["data:", "plugins:", "no-wizard", "enable-profiler"]);
+	$opts = getopt("", ["data:", "plugins:", "no-wizard"]);
 
-	define('pocketmine\DATA', isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR);
+	define('pocketmine\DATA', isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR);
-	define('pocketmine\PLUGIN_PATH', isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
+	define('pocketmine\PLUGIN_PATH', isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
-
-	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.
+	//Logger has a dependency on timezone
-	date_default_timezone_set("UTC");
+	$tzError = Timezone::init();
 
 	$logger = new MainLogger(\pocketmine\DATA . "server.log");
 	$logger->registerStatic();
 
-	do{
+	foreach($tzError as $e){
-		$timezone = ini_get("date.timezone");
+		$logger->warning($e);
-		if($timezone !== ""){
+	}
-			/*
+	unset($tzError);
-			 * 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.
+	if(extension_loaded("xdebug")){
-			 */
+		$logger->warning(PHP_EOL . PHP_EOL . PHP_EOL . "\tYou are running " . \pocketmine\NAME . " with xdebug enabled. This has a major impact on performance." . PHP_EOL . PHP_EOL);
-			if(strpos($timezone, "/") === false){
+	}
-				$default_timezone = timezone_name_from_abbr($timezone);
+
-				if($default_timezone !== false){
+	if(\Phar::running(true) === ""){
-					ini_set("date.timezone", $default_timezone);
+		$logger->warning("Non-packaged " . \pocketmine\NAME . " installation detected. Consider using a phar in production for better performance.");
-					date_default_timezone_set($default_timezone);
+	}
-					break;
+
-				}else{
+	$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
-					//Bad php.ini value, try another method to detect timezone
+	define('pocketmine\VERSION', $version->getFullVersion(true));
-					$logger->warning("Timezone \"$timezone\" could not be parsed as a valid timezone from php.ini, falling back to auto-detection");
+
-				}
+	$gitHash = str_repeat("00", 20);
-			}else{
+
-				date_default_timezone_set($timezone);
+	if(\Phar::running(true) === ""){
-				break;
+		if(Utils::execute("git rev-parse HEAD", $out) === 0 and $out !== false and strlen($out = trim($out)) === 40){
+			$gitHash = trim($out);
+			if(Utils::execute("git diff --quiet") === 1 or Utils::execute("git diff --cached --quiet") === 1){ //Locally-modified
+				$gitHash .= "-dirty";
 			}
 		}
-
+	}else{
-		if(($timezone = detect_system_timezone()) and date_default_timezone_set($timezone)){
+		$phar = new \Phar(\Phar::running(false));
-			//Success! Timezone has already been set and validated in the if statement.
+		$meta = $phar->getMetadata();
-			//This here is just for redundancy just in case some program wants to read timezone data from the ini.
+		if(isset($meta["git"])){
-			ini_set("date.timezone", $timezone);
+			$gitHash = $meta["git"];
-			break;
-		}
-
-		if($response = Utils::getURL("http://ip-api.com/json") //If system timezone detection fails or timezone is an invalid value.
-			and $ip_geolocation_data = json_decode($response, true)
-			and $ip_geolocation_data['status'] !== 'fail'
-			and date_default_timezone_set($ip_geolocation_data['timezone'])
-		){
-			//Again, for redundancy.
-			ini_set("date.timezone", $ip_geolocation_data['timezone']);
-			break;
-		}
-
-		ini_set("date.timezone", "UTC");
-		date_default_timezone_set("UTC");
-		$logger->warning("Timezone could not be automatically determined or was set to an invalid value. An incorrect timezone will result in incorrect timestamps on console logs. It has been set to \"UTC\" by default. You can change it on the php.ini file.");
-	}while(false);
-
-
-	function detect_system_timezone(){
-		switch(Utils::getOS()){
-			case 'win':
-				$regex = '/(UTC)(\+*\-*\d*\d*\:*\d*\d*)/';
-
-				/*
-				 * wmic timezone get Caption
-				 * Get the timezone offset
-				 *
-				 * Sample Output var_dump
-				 * array(3) {
-				 *	  [0] =>
-				 *	  string(7) "Caption"
-				 *	  [1] =>
-				 *	  string(20) "(UTC+09:30) Adelaide"
-				 *	  [2] =>
-				 *	  string(0) ""
-				 *	}
-				 */
-				exec("wmic timezone get Caption", $output);
-
-				$string = trim(implode("\n", $output));
-
-				//Detect the Time Zone string
-				preg_match($regex, $string, $matches);
-
-				if(!isset($matches[2])){
-					return false;
-				}
-
-				$offset = $matches[2];
-
-				if($offset == ""){
-					return "UTC";
-				}
-
-				return parse_offset($offset);
-			case 'linux':
-				// Ubuntu / Debian.
-				if(file_exists('/etc/timezone')){
-					$data = file_get_contents('/etc/timezone');
-					if($data){
-						return trim($data);
-					}
-				}
-
-				// RHEL / CentOS
-				if(file_exists('/etc/sysconfig/clock')){
-					$data = parse_ini_file('/etc/sysconfig/clock');
-					if(!empty($data['ZONE'])){
-						return trim($data['ZONE']);
-					}
-				}
-
-				//Portable method for incompatible linux distributions.
-
-				$offset = trim(exec('date +%:z'));
-
-				if($offset == "+00:00"){
-					return "UTC";
-				}
-
-				return parse_offset($offset);
-			case 'mac':
-				if(is_link('/etc/localtime')){
-					$filename = readlink('/etc/localtime');
-					if(strpos($filename, '/usr/share/zoneinfo/') === 0){
-						$timezone = substr($filename, 20);
-						return trim($timezone);
-					}
-				}
-
-				return false;
-			default:
-				return false;
 		}
 	}
 
-	/**
+	define('pocketmine\GIT_COMMIT', $gitHash);
-	 * @param string $offset In the format of +09:00, +02:00, -04:00 etc.
-	 *
-	 * @return string|bool
-	 */
-	function parse_offset($offset){
-		//Make signed offsets unsigned for date_parse
-		if(strpos($offset, '-') !== false){
-			$negative_offset = true;
-			$offset = str_replace('-', '', $offset);
-		}else{
-			if(strpos($offset, '+') !== false){
-				$negative_offset = false;
-				$offset = str_replace('+', '', $offset);
-			}else{
-				return false;
-			}
-		}
 
-		$parsed = date_parse($offset);
-		$offset = $parsed['hour'] * 3600 + $parsed['minute'] * 60 + $parsed['second'];
 
-		//After date_parse is done, put the sign back
+	@define("INT32_MASK", is_int(0xffffffff) ? 0xffffffff : -1);
-		if($negative_offset == true){
+	@ini_set("opcache.mmap_base", bin2hex(random_bytes(8))); //Fix OPCache address errors
-			$offset = -abs($offset);
-		}
-
-		//And then, look the offset up.
-		//timezone_name_from_abbr is not used because it returns false on some(most) offsets because it's mapping function is weird.
-		//That's been a bug in PHP since 2008!
-		foreach(timezone_abbreviations_list() as $zones){
-			foreach($zones as $timezone){
-				if($timezone['offset'] == $offset){
-					return $timezone['timezone_id'];
-				}
-			}
-		}
-
-		return false;
-	}
-
-	if(isset($opts["enable-profiler"])){
-		if(function_exists("profiler_enable")){
-			\profiler_enable();
-			$logger->notice("Execution is being profiled");
-		}else{
-			$logger->notice("No profiler found. Please install https://github.com/krakjoe/profiler");
-		}
-	}
-
-	function kill($pid){
-		switch(Utils::getOS()){
-			case "win":
-				exec("taskkill.exe /F /PID " . ((int) $pid) . " > NUL");
-				break;
-			case "mac":
-			case "linux":
-			default:
-				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;
-	}
-
-	/**
-	 * @param int        $start
-	 * @param array|null $trace
-	 *
-	 * @return array
-	 */
-	function getTrace($start = 0, $trace = null){
-		if($trace === null){
-			if(function_exists("xdebug_get_function_stack")){
-				$trace = array_reverse(xdebug_get_function_stack());
-			}else{
-				$e = new \Exception();
-				$trace = $e->getTrace();
-			}
-		}
-
-		$messages = [];
-		$j = 0;
-		for($i = (int) $start; isset($trace[$i]); ++$i, ++$j){
-			$params = "";
-			if(isset($trace[$i]["args"]) or isset($trace[$i]["params"])){
-				if(isset($trace[$i]["args"])){
-					$args = $trace[$i]["args"];
-				}else{
-					$args = $trace[$i]["params"];
-				}
-
-				$params = implode(", ", array_map(function($value){
-					return (is_object($value) ? get_class($value) . " object" : gettype($value) . " " . (is_array($value) ? "Array()" : Utils::printable(@strval($value))));
-				}, $args));
-			}
-			$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($params) . ")";
-		}
-
-		return $messages;
-	}
-
-	function cleanPath($path){
-		return str_replace(["\\", ".php", "phar://", str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PATH), str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PLUGIN_PATH)], ["/", "", "", "", ""], $path);
-	}
 
 	$exitCode = 0;
-
 	do{
-		$errors = 0;
-
-		if(PHP_INT_SIZE < 8){
-			$logger->critical("Running " . \pocketmine\NAME . " with 32-bit systems/PHP is no longer supported. Please upgrade to a 64-bit system or use a 64-bit PHP binary.");
-			$exitCode = 1;
-			break;
-		}
-
-		if(php_sapi_name() !== "cli"){
-			$logger->critical("You must run " . \pocketmine\NAME . " using the CLI.");
-			++$errors;
-		}
-
-		$pthreads_version = phpversion("pthreads");
-		if(substr_count($pthreads_version, ".") < 2){
-			$pthreads_version = "0.$pthreads_version";
-		}
-		if(version_compare($pthreads_version, "3.1.7-dev") < 0){
-			$logger->critical("pthreads >= 3.1.7-dev is required, while you have $pthreads_version.");
-			++$errors;
-		}
-
-		if(extension_loaded("leveldb")){
-			$leveldb_version = phpversion("leveldb");
-			if(version_compare($leveldb_version, "0.2.1") < 0){
-				$logger->critical("php-leveldb >= 0.2.1 is required, while you have $leveldb_version");
-				++$errors;
-			}
-		}
-
-		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.");
-				++$errors;
-			}elseif(version_compare(phpversion("pocketmine"), "0.0.4") > 0){
-				$logger->critical("You have the native PocketMine extension, but your version is higher than 0.0.4.");
-				++$errors;
-			}
-		}
-
-		if(extension_loaded("xdebug")){
-			$logger->warning(PHP_EOL . PHP_EOL . PHP_EOL . "\tYou are running " . \pocketmine\NAME . " with xdebug enabled. This has a major impact on performance." . PHP_EOL . PHP_EOL);
-		}
-
-		$extensions = [
-			"bcmath" => "BC Math",
-			"curl" => "cURL",
-			"json" => "JSON",
-			"mbstring" => "Multibyte String",
-			"yaml" => "YAML",
-			"sockets" => "Sockets",
-			"zip" => "Zip",
-			"zlib" => "Zlib"
-		];
-
-		foreach($extensions as $ext => $name){
-			if(!extension_loaded($ext)){
-				$logger->critical("Unable to find the $name ($ext) extension.");
-				++$errors;
-			}
-		}
-
-		if($errors > 0){
-			$logger->critical("Please use the installer provided on the homepage, or recompile PHP again.");
-			$exitCode = 1;
-			break;
-		}
-
-		$gitHash = str_repeat("00", 20);
-
-		if(\Phar::running(true) === ""){
-			if(Utils::execute("git rev-parse HEAD", $out) === 0){
-				$gitHash = trim($out);
-				if(Utils::execute("git diff --quiet") === 1 or Utils::execute("git diff --cached --quiet") === 1){ //Locally-modified
-					$gitHash .= "-dirty";
-				}
-			}
-		}else{
-			$phar = new \Phar(\Phar::running(false));
-			$meta = $phar->getMetadata();
-			if(isset($meta["git"])){
-				$gitHash = $meta["git"];
-			}
-		}
-
-		define('pocketmine\GIT_COMMIT', $gitHash);
-
-
-		@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(random_bytes(8))); //Fix OPCache address errors
-
-
 		if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){
 			$installer = new SetupWizard();
 			if(!$installer->run()){
@@ -545,25 +233,20 @@ namespace pocketmine {
 			}
 		}
 
-
-		if(\Phar::running(true) === ""){
-			$logger->warning("Non-packaged " . \pocketmine\NAME . " installation detected. Consider using a phar in production for better performance.");
-		}
-
 		ThreadManager::init();
 		new Server($autoloader, $logger, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
 
 		$logger->info("Stopping other threads");
 
 		$killer = new ServerKiller(8);
-		$killer->start();
+		$killer->start(PTHREADS_INHERIT_NONE);
 		usleep(10000); //Fixes ServerKiller not being able to start on single-core machines
 
 		if(ThreadManager::getInstance()->stopAll() > 0){
 			if(\pocketmine\DEBUG > 1){
 				echo "Some threads could not be stopped, performing a force-kill" . PHP_EOL . PHP_EOL;
 			}
-			kill(getmypid());
+			Utils::kill(getmypid());
 		}
 	}while(false);
 

src/pocketmine/Thread.php

@@ -30,6 +30,9 @@ abstract class Thread extends \Thread{
 
 	/** @var \ClassLoader */
 	protected $classLoader;
+	/** @var string|null */
+	protected $composerAutoloaderPath;
+
 	protected $isKilled = false;
 
 	public function getClassLoader(){
@@ -37,6 +40,8 @@ abstract class Thread extends \Thread{
 	}
 
 	public function setClassLoader(\ClassLoader $loader = null){
+		$this->composerAutoloaderPath = \pocketmine\COMPOSER_AUTOLOADER_PATH;
+
 		if($loader === null){
 			$loader = Server::getInstance()->getLoader();
 		}
@@ -51,10 +56,8 @@ abstract class Thread extends \Thread{
 	 * (unless you are using a custom autoloader).
 	 */
 	public function registerClassLoader(){
-		require(\pocketmine\PATH . "vendor/autoload.php");
+		if($this->composerAutoloaderPath !== null){
-		if(!interface_exists("ClassLoader", false)){
+			require $this->composerAutoloaderPath;
-			require(\pocketmine\PATH . "src/spl/ClassLoader.php");
-			require(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
 		}
 		if($this->classLoader !== null){
 			$this->classLoader->register(false);
@@ -64,14 +67,10 @@ abstract class Thread extends \Thread{
 	public function start(?int $options = \PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
-		if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated()){
+		if($this->getClassLoader() === null){
-			if($this->getClassLoader() === null){
+			$this->setClassLoader();
-				$this->setClassLoader();
-			}
-			return parent::start($options);
 		}
-
+		return parent::start($options);
-		return false;
 	}
 
 	/**
@@ -80,12 +79,9 @@ abstract class Thread extends \Thread{
 	public function quit(){
 		$this->isKilled = true;
 
-		$this->notify();
-
 		if(!$this->isJoined()){
-			if(!$this->isTerminated()){
+			$this->notify();
-				$this->join();
+			$this->join();
-			}
 		}
 
 		ThreadManager::getInstance()->remove($this);

src/pocketmine/ThreadManager.php

@@ -89,4 +89,4 @@ class ThreadManager extends \Volatile{
 
 		return $erroredThreads;
 	}
-}
+}

src/pocketmine/Worker.php

@@ -30,6 +30,8 @@ abstract class Worker extends \Worker{
 
 	/** @var \ClassLoader */
 	protected $classLoader;
+	/** @var string|null */
+	protected $composerAutoloaderPath;
 
 	protected $isKilled = false;
 
@@ -38,6 +40,8 @@ abstract class Worker extends \Worker{
 	}
 
 	public function setClassLoader(\ClassLoader $loader = null){
+		$this->composerAutoloaderPath = \pocketmine\COMPOSER_AUTOLOADER_PATH;
+
 		if($loader === null){
 			$loader = Server::getInstance()->getLoader();
 		}
@@ -52,10 +56,8 @@ abstract class Worker extends \Worker{
 	 * (unless you are using a custom autoloader).
 	 */
 	public function registerClassLoader(){
-		require(\pocketmine\PATH . "vendor/autoload.php");
+		if($this->composerAutoloaderPath !== null){
-		if(!interface_exists("ClassLoader", false)){
+			require $this->composerAutoloaderPath;
-			require(\pocketmine\PATH . "src/spl/ClassLoader.php");
-			require(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
 		}
 		if($this->classLoader !== null){
 			$this->classLoader->register(false);
@@ -65,14 +67,10 @@ abstract class Worker extends \Worker{
 	public function start(?int $options = \PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
-		if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated()){
+		if($this->getClassLoader() === null){
-			if($this->getClassLoader() === null){
+			$this->setClassLoader();
-				$this->setClassLoader();
-			}
-			return parent::start($options);
 		}
-
+		return parent::start($options);
-		return false;
 	}
 
 	/**
@@ -81,16 +79,10 @@ abstract class Worker extends \Worker{
 	public function quit(){
 		$this->isKilled = true;
 
-		$this->notify();
-
 		if($this->isRunning()){
-			$this->shutdown();
+			while($this->unstack() !== null);
 			$this->notify();
-			$this->unstack();
+			$this->shutdown();
-		}elseif(!$this->isJoined()){
-			if(!$this->isTerminated()){
-				$this->join();
-			}
 		}
 
 		ThreadManager::getInstance()->remove($this);

src/pocketmine/block/Air.php

@@ -81,5 +81,4 @@ class Air extends Transparent{
 	public function getBlastResistance() : float{
 		return 0;
 	}
-
+}
-}

src/pocketmine/block/Anvil.php

@@ -25,8 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\inventory\AnvilInventory;
 use pocketmine\item\Item;
-use pocketmine\item\ItemFactory;
+use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -55,17 +54,25 @@ class Anvil extends Fallable{
 		return 6000;
 	}
 
+	public function getVariantBitmask() : int{
+		return 0x0c;
+	}
+
 	public function getName() : string{
 		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";
+		return $names[$this->getVariant()] ?? "Anvil";
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function recalculateBoundingBox() : ?AxisAlignedBB{
@@ -102,17 +109,7 @@ class Anvil extends Fallable{
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$direction = ($player !== null ? $player->getDirection() : 0) & 0x03;
-		$this->meta = ($this->meta & 0x0c) | $direction;
+		$this->meta = $this->getVariant() | $direction;
 		return $this->getLevel()->setBlock($blockReplace, $this, true, true);
 	}
-
+}
-	public function getDrops(Item $item) : array{
-		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return [
-				ItemFactory::get($this->getItemId(), $this->getDamage() & 0x0c, 1)
-			];
-		}
-
-		return [];
-	}
-}

src/pocketmine/block/Bed.php

@@ -23,9 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\event\TranslationContainer;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -85,7 +85,7 @@ class Bed extends Transparent{
 
 		$this->getLevel()->setBlock($this, $this, false, false);
 
-		if(($other = $this->getOtherHalf()) !== null and !$other->isOccupied()){
+		if(($other = $this->getOtherHalf()) !== null and $other->isOccupied() !== $occupied){
 			$other->setOccupied($occupied);
 		}
 	}
@@ -176,7 +176,7 @@ class Bed extends Transparent{
 		if(!$down->isTransparent()){
 			$meta = (($player instanceof Player ? $player->getDirection() : 0) - 1) & 0x03;
 			$next = $this->getSide(self::getOtherHalfSide($meta));
-			if($next->canBeReplaced() === true and !$next->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			if($next->canBeReplaced() and !$next->getSide(Vector3::SIDE_DOWN)->isTransparent()){
 				$this->getLevel()->setBlock($blockReplace, BlockFactory::get($this->id, $meta), true, true);
 				$this->getLevel()->setBlock($next, BlockFactory::get($this->id, $meta | self::BITFLAG_HEAD), true, true);
 
@@ -190,25 +190,16 @@ class Bed extends Transparent{
 		return false;
 	}
 
-	public function onBreak(Item $item, Player $player = null) : bool{
+	public function getDropsForCompatibleTool(Item $item) : array{
-		$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true, true);
-		if(($other = $this->getOtherHalf()) !== null){
-			$this->getLevel()->useBreakOn($other, $item, null, $player !== null); //make sure tiles get removed
-		}
-
-		return true;
-	}
-
-	public function getDrops(Item $item) : array{
 		if($this->isHeadPart()){
 			$tile = $this->getLevel()->getTile($this);
 			if($tile instanceof TileBed){
 				return [
-					ItemFactory::get($this->getItemId(), $tile->getColor(), 1)
+					ItemFactory::get($this->getItemId(), $tile->getColor())
 				];
 			}else{
 				return [
-					ItemFactory::get($this->getItemId(), 14, 1) //Red
+					ItemFactory::get($this->getItemId(), 14) //Red
 				];
 			}
 		}
@@ -216,4 +207,15 @@ class Bed extends Transparent{
 		return [];
 	}
 
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
+
+	public function getAffectedBlocks() : array{
+		if(($other = $this->getOtherHalf()) !== null){
+			return [$this, $other];
+		}
+
+		return parent::getAffectedBlocks();
+	}
 }

src/pocketmine/block/Bedrock.php

@@ -48,5 +48,4 @@ class Bedrock extends Solid{
 	public function isBreakable(Item $item) : bool{
 		return false;
 	}
-
+}
-}

src/pocketmine/block/Beetroot.php

@@ -38,20 +38,20 @@ class Beetroot extends Crops{
 		return "Beetroot Block";
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		if($this->meta >= 0x07){
 			return [
-				ItemFactory::get(Item::BEETROOT, 0, 1),
+				ItemFactory::get(Item::BEETROOT),
 				ItemFactory::get(Item::BEETROOT_SEEDS, 0, mt_rand(0, 3))
 			];
 		}
 
 		return [
-			ItemFactory::get(Item::BEETROOT_SEEDS, 0, 1)
+			ItemFactory::get(Item::BEETROOT_SEEDS)
 		];
 	}
 
 	public function getPickedItem() : Item{
 		return ItemFactory::get(Item::BEETROOT_SEEDS);
 	}
-}
+}

src/pocketmine/block/Block.php

@@ -27,13 +27,12 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
+use pocketmine\item\enchantment\Enchantment;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
-use pocketmine\level\Level;
-use pocketmine\level\MovingObjectPosition;
 use pocketmine\level\Position;
 use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\RayTraceResult;
 use pocketmine\math\Vector3;
 use pocketmine\metadata\Metadatable;
 use pocketmine\metadata\MetadataValue;
@@ -195,8 +194,49 @@ class Block extends Position implements BlockIds, Metadatable{
 		return true;
 	}
 
-	public function canBeBrokenWith(Item $item) : bool{
+	/**
-		return $this->getHardness() !== -1;
+	 * @return int
+	 */
+	public function getToolType() : int{
+		return BlockToolType::TYPE_NONE;
+	}
+
+	/**
+	 * Returns the level of tool required to harvest this block (for normal blocks). When the tool type matches the
+	 * block's required tool type, the tool must have a harvest level greater than or equal to this value to be able to
+	 * successfully harvest the block.
+	 *
+	 * If the block requires a specific minimum tier of tiered tool, the minimum tier required should be returned.
+	 * Otherwise, 1 should be returned if a tool is required, 0 if not.
+	 *
+	 * @see Item::getBlockToolHarvestLevel()
+	 *
+	 * @return int
+	 */
+	public function getToolHarvestLevel() : int{
+		return 0;
+	}
+
+	/**
+	 * Returns whether the specified item is the proper tool to use for breaking this block. This checks tool type and
+	 * harvest level requirement.
+	 *
+	 * In most cases this is also used to determine whether block drops should be created or not, except in some
+	 * special cases such as vines.
+	 *
+	 * @param Item $tool
+	 *
+	 * @return bool
+	 */
+	public function isCompatibleWithTool(Item $tool) : bool{
+		if($this->getHardness() < 0){
+			return false;
+		}
+
+		$toolType = $this->getToolType();
+		$harvestLevel = $this->getToolHarvestLevel();
+		return $toolType === BlockToolType::TYPE_NONE or $harvestLevel === 0 or (
+			($toolType & $tool->getBlockToolType()) !== 0 and $tool->getBlockToolHarvestLevel() >= $harvestLevel);
 	}
 
 	/**
@@ -220,44 +260,29 @@ class Block extends Position implements BlockIds, Metadatable{
 	 * @return float
 	 */
 	public function getBreakTime(Item $item) : float{
-		$base = $this->getHardness() * 1.5;
+		$base = $this->getHardness();
-		if($this->canBeBrokenWith($item)){
+		if($this->isCompatibleWithTool($item)){
-			if($this->getToolType() === Tool::TYPE_SHEARS and $item->isShears()){
+			$base *= 1.5;
-				$base /= 15;
-			}elseif(
-				($this->getToolType() === Tool::TYPE_PICKAXE and ($tier = $item->isPickaxe()) !== false) or
-				($this->getToolType() === Tool::TYPE_AXE and ($tier = $item->isAxe()) !== false) or
-				($this->getToolType() === Tool::TYPE_SHOVEL and ($tier = $item->isShovel()) !== false)
-			){
-				switch($tier){
-					case Tool::TIER_WOODEN:
-						$base /= 2;
-						break;
-					case Tool::TIER_STONE:
-						$base /= 4;
-						break;
-					case Tool::TIER_IRON:
-						$base /= 6;
-						break;
-					case Tool::TIER_DIAMOND:
-						$base /= 8;
-						break;
-					case Tool::TIER_GOLD:
-						$base /= 12;
-						break;
-				}
-			}
 		}else{
-			$base *= 3.33;
+			$base *= 5;
 		}
 
-		if($item->isSword()){
+		$efficiency = $item->getMiningEfficiency($this);
-			$base /= 1.5;
+		if($efficiency <= 0){
+			throw new \RuntimeException("Item efficiency is invalid");
 		}
 
+		$base /= $efficiency;
+
 		return $base;
 	}
 
+	/**
+	 * Called when this block or a block immediately adjacent to it changes state.
+	 */
+	public function onNearbyBlockChange() : void{
+
+	}
 
 	/**
 	 * Returns whether random block updates will be done on this block.
@@ -269,14 +294,18 @@ class Block extends Position implements BlockIds, Metadatable{
 	}
 
 	/**
-	 * Fires a block update on the Block
+	 * Called when this block is randomly updated due to chunk ticking.
-	 *
+	 * WARNING: This will not be called if ticksRandomly() does not return true!
-	 * @param int $type
-	 *
-	 * @return bool|int
 	 */
-	public function onUpdate(int $type){
+	public function onRandomTick() : void{
-		return false;
+
+	}
+
+	/**
+	 * Called when this block is updated by the delayed blockupdate scheduler in the level.
+	 */
+	public function onScheduledUpdate() : void{
+
 	}
 
 	/**
@@ -299,14 +328,6 @@ class Block extends Position implements BlockIds, Metadatable{
 		return 10;
 	}
 
-	/**
-	 * @deprecated
-	 * @return float
-	 */
-	public function getResistance() : float{
-		return $this->getBlastResistance();
-	}
-
 	/**
 	 * Returns the block's resistance to explosions. Usually 5x hardness.
 	 * @return float
@@ -315,13 +336,6 @@ class Block extends Position implements BlockIds, Metadatable{
 		return $this->getHardness() * 5;
 	}
 
-	/**
-	 * @return int
-	 */
-	public function getToolType() : int{
-		return Tool::TYPE_NONE;
-	}
-
 	/**
 	 * @return float
 	 */
@@ -420,11 +434,77 @@ class Block extends Position implements BlockIds, Metadatable{
 	 * @return Item[]
 	 */
 	public function getDrops(Item $item) : array{
+		if($this->isCompatibleWithTool($item)){
+			if($this->isAffectedBySilkTouch() and $item->hasEnchantment(Enchantment::SILK_TOUCH)){
+				return $this->getSilkTouchDrops($item);
+			}
+
+			return $this->getDropsForCompatibleTool($item);
+		}
+
+		return [];
+	}
+
+	/**
+	 * Returns an array of Items to be dropped when the block is broken using the correct tool type.
+	 *
+	 * @param Item $item
+	 *
+	 * @return Item[]
+	 */
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			ItemFactory::get($this->getItemId(), $this->getVariant(), 1)
+			ItemFactory::get($this->getItemId(), $this->getVariant())
 		];
 	}
 
+	/**
+	 * Returns an array of Items to be dropped when the block is broken using a compatible Silk Touch-enchanted tool.
+	 *
+	 * @param Item $item
+	 *
+	 * @return Item[]
+	 */
+	public function getSilkTouchDrops(Item $item) : array{
+		return [
+			ItemFactory::get($this->getItemId(), $this->getVariant())
+		];
+	}
+
+	/**
+	 * Returns how much XP will be dropped by breaking this block with the given item.
+	 *
+	 * @param Item $item
+	 *
+	 * @return int
+	 */
+	public function getXpDropForTool(Item $item) : int{
+		if($item->hasEnchantment(Enchantment::SILK_TOUCH) or !$this->isCompatibleWithTool($item)){
+			return 0;
+		}
+
+		return $this->getXpDropAmount();
+	}
+
+	/**
+	 * Returns how much XP this block will drop when broken with an appropriate tool.
+	 *
+	 * @return int
+	 */
+	protected function getXpDropAmount() : int{
+		return 0;
+	}
+
+	/**
+	 * Returns whether Silk Touch enchanted tools will cause this block to drop as itself. Since most blocks drop
+	 * themselves anyway, this is implicitly true.
+	 *
+	 * @return bool
+	 */
+	public function isAffectedBySilkTouch() : bool{
+		return true;
+	}
+
 	/**
 	 * Returns the item that players will equip when middle-clicking on this block.
 	 * @return Item
@@ -441,6 +521,50 @@ class Block extends Position implements BlockIds, Metadatable{
 		return 0;
 	}
 
+	/**
+	 * Returns the chance that the block will catch fire from nearby fire sources. Higher values lead to faster catching
+	 * fire.
+	 *
+	 * @return int
+	 */
+	public function getFlameEncouragement() : int{
+		return 0;
+	}
+
+	/**
+	 * Returns the base flammability of this block. Higher values lead to the block burning away more quickly.
+	 *
+	 * @return int
+	 */
+	public function getFlammability() : int{
+		return 0;
+	}
+
+	/**
+	 * Returns whether fire lit on this block will burn indefinitely.
+	 *
+	 * @return bool
+	 */
+	public function burnsForever() : bool{
+		return false;
+	}
+
+	/**
+	 * Returns whether this block can catch fire.
+	 *
+	 * @return bool
+	 */
+	public function isFlammable() : bool{
+		return $this->getFlammability() > 0;
+	}
+
+	/**
+	 * Called when this block is burned away by being on fire.
+	 */
+	public function onIncinerate() : void{
+
+	}
+
 	/**
 	 * Returns the Block on the side $side, works like Vector3::getSide()
 	 *
@@ -449,7 +573,7 @@ class Block extends Position implements BlockIds, Metadatable{
 	 *
 	 * @return Block
 	 */
-	public function getSide($side, $step = 1){
+	public function getSide(int $side, int $step = 1){
 		if($this->isValid()){
 			return $this->getLevel()->getBlock(Vector3::getSide($side, $step));
 		}
@@ -486,6 +610,16 @@ class Block extends Position implements BlockIds, Metadatable{
 		);
 	}
 
+	/**
+	 * Returns a list of blocks that this block is part of. In most cases, only contains the block itself, but in cases
+	 * such as double plants, beds and doors, will contain both halves.
+	 *
+	 * @return Block[]
+	 */
+	public function getAffectedBlocks() : array{
+		return [$this];
+	}
+
 	/**
 	 * @return string
 	 */
@@ -501,9 +635,7 @@ class Block extends Position implements BlockIds, Metadatable{
 	 * @return bool
 	 */
 	public function collidesWithBB(AxisAlignedBB $bb) : bool{
-		$bbs = $this->getCollisionBoxes();
+		foreach($this->getCollisionBoxes() as $bb2){
-
-		foreach($bbs as $bb2){
 			if($bb->intersectsWith($bb2)){
 				return true;
 			}
@@ -578,15 +710,15 @@ class Block extends Position implements BlockIds, Metadatable{
 	 * @param Vector3 $pos1
 	 * @param Vector3 $pos2
 	 *
-	 * @return MovingObjectPosition|null
+	 * @return RayTraceResult|null
 	 */
-	public function calculateIntercept(Vector3 $pos1, Vector3 $pos2) : ?MovingObjectPosition{
+	public function calculateIntercept(Vector3 $pos1, Vector3 $pos2) : ?RayTraceResult{
 		$bbs = $this->getCollisionBoxes();
 		if(empty($bbs)){
 			return null;
 		}
 
-		/** @var MovingObjectPosition|null $currentHit */
+		/** @var RayTraceResult|null $currentHit */
 		$currentHit = null;
 		/** @var int|float $currentDistance */
 		$currentDistance = PHP_INT_MAX;
@@ -604,40 +736,34 @@ class Block extends Position implements BlockIds, Metadatable{
 			}
 		}
 
-		if($currentHit !== null){
-			$currentHit->blockX = $this->x;
-			$currentHit->blockY = $this->y;
-			$currentHit->blockZ = $this->z;
-		}
-
 		return $currentHit;
 	}
 
 	public function setMetadata(string $metadataKey, MetadataValue $newMetadataValue){
-		if($this->getLevel() instanceof Level){
+		if($this->isValid()){
-			$this->getLevel()->getBlockMetadata()->setMetadata($this, $metadataKey, $newMetadataValue);
+			$this->level->getBlockMetadata()->setMetadata($this, $metadataKey, $newMetadataValue);
 		}
 	}
 
 	public function getMetadata(string $metadataKey){
-		if($this->getLevel() instanceof Level){
+		if($this->isValid()){
-			return $this->getLevel()->getBlockMetadata()->getMetadata($this, $metadataKey);
+			return $this->level->getBlockMetadata()->getMetadata($this, $metadataKey);
 		}
 
 		return null;
 	}
 
 	public function hasMetadata(string $metadataKey) : bool{
-		if($this->getLevel() instanceof Level){
+		if($this->isValid()){
-			return $this->getLevel()->getBlockMetadata()->hasMetadata($this, $metadataKey);
+			return $this->level->getBlockMetadata()->hasMetadata($this, $metadataKey);
 		}
 
 		return false;
 	}
 
 	public function removeMetadata(string $metadataKey, Plugin $owningPlugin){
-		if($this->getLevel() instanceof Level){
+		if($this->isValid()){
-			$this->getLevel()->getBlockMetadata()->removeMetadata($this, $metadataKey, $owningPlugin);
+			$this->level->getBlockMetadata()->removeMetadata($this, $metadataKey, $owningPlugin);
 		}
 	}
 }

src/pocketmine/block/BlockFactory.php

@@ -30,8 +30,6 @@ use pocketmine\level\Position;
  * Manages block registration and instance creation
  */
 class BlockFactory{
-	/** @var \SplFixedArray<Block> */
-	private static $list = null;
 	/** @var \SplFixedArray<Block> */
 	private static $fullList = null;
 
@@ -50,280 +48,284 @@ class BlockFactory{
 	/** @var \SplFixedArray<float> */
 	public static $blastResistance = null;
 
+	/** @var int[] */
+	public static $staticRuntimeIdMap = [];
+
+	/** @var int[] */
+	public static $legacyIdMap = [];
+
+	/** @var int */
+	private static $lastRuntimeId = 0;
+
 	/**
 	 * Initializes the block factory. By default this is called only once on server start, however you may wish to use
 	 * this if you need to reset the block factory back to its original defaults for whatever reason.
-	 *
-	 * @param bool $force
 	 */
-	public static function init(bool $force = false) : void{
+	public static function init() : void{
-		if(self::$list === null or $force){
+		self::$fullList = new \SplFixedArray(4096);
-			self::$list = new \SplFixedArray(256);
-			self::$fullList = new \SplFixedArray(4096);
 
-			self::$light = new \SplFixedArray(256);
+		self::$light = new \SplFixedArray(256);
-			self::$lightFilter = new \SplFixedArray(256);
+		self::$lightFilter = new \SplFixedArray(256);
-			self::$solid = new \SplFixedArray(256);
+		self::$solid = new \SplFixedArray(256);
-			self::$hardness = new \SplFixedArray(256);
+		self::$hardness = new \SplFixedArray(256);
-			self::$transparent = new \SplFixedArray(256);
+		self::$transparent = new \SplFixedArray(256);
-			self::$diffusesSkyLight = new \SplFixedArray(256);
+		self::$diffusesSkyLight = new \SplFixedArray(256);
-			self::$blastResistance = new \SplFixedArray(256);
+		self::$blastResistance = new \SplFixedArray(256);
 
-			self::registerBlock(new Air());
+		self::registerBlock(new Air());
-			self::registerBlock(new Stone());
+		self::registerBlock(new Stone());
-			self::registerBlock(new Grass());
+		self::registerBlock(new Grass());
-			self::registerBlock(new Dirt());
+		self::registerBlock(new Dirt());
-			self::registerBlock(new Cobblestone());
+		self::registerBlock(new Cobblestone());
-			self::registerBlock(new Planks());
+		self::registerBlock(new Planks());
-			self::registerBlock(new Sapling());
+		self::registerBlock(new Sapling());
-			self::registerBlock(new Bedrock());
+		self::registerBlock(new Bedrock());
-			self::registerBlock(new Water());
+		self::registerBlock(new Water());
-			self::registerBlock(new StillWater());
+		self::registerBlock(new StillWater());
-			self::registerBlock(new Lava());
+		self::registerBlock(new Lava());
-			self::registerBlock(new StillLava());
+		self::registerBlock(new StillLava());
-			self::registerBlock(new Sand());
+		self::registerBlock(new Sand());
-			self::registerBlock(new Gravel());
+		self::registerBlock(new Gravel());
-			self::registerBlock(new GoldOre());
+		self::registerBlock(new GoldOre());
-			self::registerBlock(new IronOre());
+		self::registerBlock(new IronOre());
-			self::registerBlock(new CoalOre());
+		self::registerBlock(new CoalOre());
-			self::registerBlock(new Wood());
+		self::registerBlock(new Wood());
-			self::registerBlock(new Leaves());
+		self::registerBlock(new Leaves());
-			self::registerBlock(new Sponge());
+		self::registerBlock(new Sponge());
-			self::registerBlock(new Glass());
+		self::registerBlock(new Glass());
-			self::registerBlock(new LapisOre());
+		self::registerBlock(new LapisOre());
-			self::registerBlock(new Lapis());
+		self::registerBlock(new Lapis());
-			//TODO: DISPENSER
+		//TODO: DISPENSER
-			self::registerBlock(new Sandstone());
+		self::registerBlock(new Sandstone());
-			self::registerBlock(new NoteBlock());
+		self::registerBlock(new NoteBlock());
-			self::registerBlock(new Bed());
+		self::registerBlock(new Bed());
-			self::registerBlock(new PoweredRail());
+		self::registerBlock(new PoweredRail());
-			self::registerBlock(new DetectorRail());
+		self::registerBlock(new DetectorRail());
-			//TODO: STICKY_PISTON
+		//TODO: STICKY_PISTON
-			self::registerBlock(new Cobweb());
+		self::registerBlock(new Cobweb());
-			self::registerBlock(new TallGrass());
+		self::registerBlock(new TallGrass());
-			self::registerBlock(new DeadBush());
+		self::registerBlock(new DeadBush());
-			//TODO: PISTON
+		//TODO: PISTON
-			//TODO: PISTONARMCOLLISION
+		//TODO: PISTONARMCOLLISION
-			self::registerBlock(new Wool());
+		self::registerBlock(new Wool());
 
-			self::registerBlock(new Dandelion());
+		self::registerBlock(new Dandelion());
-			self::registerBlock(new Flower());
+		self::registerBlock(new Flower());
-			self::registerBlock(new BrownMushroom());
+		self::registerBlock(new BrownMushroom());
-			self::registerBlock(new RedMushroom());
+		self::registerBlock(new RedMushroom());
-			self::registerBlock(new Gold());
+		self::registerBlock(new Gold());
-			self::registerBlock(new Iron());
+		self::registerBlock(new Iron());
-			self::registerBlock(new DoubleStoneSlab());
+		self::registerBlock(new DoubleStoneSlab());
-			self::registerBlock(new StoneSlab());
+		self::registerBlock(new StoneSlab());
-			self::registerBlock(new Bricks());
+		self::registerBlock(new Bricks());
-			self::registerBlock(new TNT());
+		self::registerBlock(new TNT());
-			self::registerBlock(new Bookshelf());
+		self::registerBlock(new Bookshelf());
-			self::registerBlock(new MossyCobblestone());
+		self::registerBlock(new MossyCobblestone());
-			self::registerBlock(new Obsidian());
+		self::registerBlock(new Obsidian());
-			self::registerBlock(new Torch());
+		self::registerBlock(new Torch());
-			self::registerBlock(new Fire());
+		self::registerBlock(new Fire());
-			self::registerBlock(new MonsterSpawner());
+		self::registerBlock(new MonsterSpawner());
-			self::registerBlock(new WoodenStairs(Block::OAK_STAIRS, 0, "Oak Stairs"));
+		self::registerBlock(new WoodenStairs(Block::OAK_STAIRS, 0, "Oak Stairs"));
-			self::registerBlock(new Chest());
+		self::registerBlock(new Chest());
-			//TODO: REDSTONE_WIRE
+		//TODO: REDSTONE_WIRE
-			self::registerBlock(new DiamondOre());
+		self::registerBlock(new DiamondOre());
-			self::registerBlock(new Diamond());
+		self::registerBlock(new Diamond());
-			self::registerBlock(new CraftingTable());
+		self::registerBlock(new CraftingTable());
-			self::registerBlock(new Wheat());
+		self::registerBlock(new Wheat());
-			self::registerBlock(new Farmland());
+		self::registerBlock(new Farmland());
-			self::registerBlock(new Furnace());
+		self::registerBlock(new Furnace());
-			self::registerBlock(new BurningFurnace());
+		self::registerBlock(new BurningFurnace());
-			self::registerBlock(new SignPost());
+		self::registerBlock(new SignPost());
-			self::registerBlock(new WoodenDoor(Block::OAK_DOOR_BLOCK, 0, "Oak Door", Item::OAK_DOOR));
+		self::registerBlock(new WoodenDoor(Block::OAK_DOOR_BLOCK, 0, "Oak Door", Item::OAK_DOOR));
-			self::registerBlock(new Ladder());
+		self::registerBlock(new Ladder());
-			self::registerBlock(new Rail());
+		self::registerBlock(new Rail());
-			self::registerBlock(new CobblestoneStairs());
+		self::registerBlock(new CobblestoneStairs());
-			self::registerBlock(new WallSign());
+		self::registerBlock(new WallSign());
-			self::registerBlock(new Lever());
+		self::registerBlock(new Lever());
-			self::registerBlock(new StonePressurePlate());
+		self::registerBlock(new StonePressurePlate());
-			self::registerBlock(new IronDoor());
+		self::registerBlock(new IronDoor());
-			self::registerBlock(new WoodenPressurePlate());
+		self::registerBlock(new WoodenPressurePlate());
-			self::registerBlock(new RedstoneOre());
+		self::registerBlock(new RedstoneOre());
-			self::registerBlock(new GlowingRedstoneOre());
+		self::registerBlock(new GlowingRedstoneOre());
-			self::registerBlock(new RedstoneTorchUnlit());
+		self::registerBlock(new RedstoneTorchUnlit());
-			self::registerBlock(new RedstoneTorch());
+		self::registerBlock(new RedstoneTorch());
-			self::registerBlock(new StoneButton());
+		self::registerBlock(new StoneButton());
-			self::registerBlock(new SnowLayer());
+		self::registerBlock(new SnowLayer());
-			self::registerBlock(new Ice());
+		self::registerBlock(new Ice());
-			self::registerBlock(new Snow());
+		self::registerBlock(new Snow());
-			self::registerBlock(new Cactus());
+		self::registerBlock(new Cactus());
-			self::registerBlock(new Clay());
+		self::registerBlock(new Clay());
-			self::registerBlock(new Sugarcane());
+		self::registerBlock(new Sugarcane());
-			//TODO: JUKEBOX
+		//TODO: JUKEBOX
-			self::registerBlock(new WoodenFence());
+		self::registerBlock(new WoodenFence());
-			self::registerBlock(new Pumpkin());
+		self::registerBlock(new Pumpkin());
-			self::registerBlock(new Netherrack());
+		self::registerBlock(new Netherrack());
-			self::registerBlock(new SoulSand());
+		self::registerBlock(new SoulSand());
-			self::registerBlock(new Glowstone());
+		self::registerBlock(new Glowstone());
-			//TODO: PORTAL
+		//TODO: PORTAL
-			self::registerBlock(new LitPumpkin());
+		self::registerBlock(new LitPumpkin());
-			self::registerBlock(new Cake());
+		self::registerBlock(new Cake());
-			//TODO: REPEATER_BLOCK
+		//TODO: REPEATER_BLOCK
-			//TODO: POWERED_REPEATER
+		//TODO: POWERED_REPEATER
-			//TODO: INVISIBLEBEDROCK
+		//TODO: INVISIBLEBEDROCK
-			self::registerBlock(new Trapdoor());
+		self::registerBlock(new Trapdoor());
-			//TODO: MONSTER_EGG
+		//TODO: MONSTER_EGG
-			self::registerBlock(new StoneBricks());
+		self::registerBlock(new StoneBricks());
-			self::registerBlock(new BrownMushroomBlock());
+		self::registerBlock(new BrownMushroomBlock());
-			self::registerBlock(new RedMushroomBlock());
+		self::registerBlock(new RedMushroomBlock());
-			self::registerBlock(new IronBars());
+		self::registerBlock(new IronBars());
-			self::registerBlock(new GlassPane());
+		self::registerBlock(new GlassPane());
-			self::registerBlock(new Melon());
+		self::registerBlock(new Melon());
-			self::registerBlock(new PumpkinStem());
+		self::registerBlock(new PumpkinStem());
-			self::registerBlock(new MelonStem());
+		self::registerBlock(new MelonStem());
-			self::registerBlock(new Vine());
+		self::registerBlock(new Vine());
-			self::registerBlock(new FenceGate(Block::OAK_FENCE_GATE, 0, "Oak Fence Gate"));
+		self::registerBlock(new FenceGate(Block::OAK_FENCE_GATE, 0, "Oak Fence Gate"));
-			self::registerBlock(new BrickStairs());
+		self::registerBlock(new BrickStairs());
-			self::registerBlock(new StoneBrickStairs());
+		self::registerBlock(new StoneBrickStairs());
-			self::registerBlock(new Mycelium());
+		self::registerBlock(new Mycelium());
-			self::registerBlock(new WaterLily());
+		self::registerBlock(new WaterLily());
-			self::registerBlock(new NetherBrick(Block::NETHER_BRICK_BLOCK, 0, "Nether Bricks"));
+		self::registerBlock(new NetherBrick(Block::NETHER_BRICK_BLOCK, 0, "Nether Bricks"));
-			self::registerBlock(new NetherBrickFence());
+		self::registerBlock(new NetherBrickFence());
-			self::registerBlock(new NetherBrickStairs());
+		self::registerBlock(new NetherBrickStairs());
-			self::registerBlock(new NetherWartPlant());
+		self::registerBlock(new NetherWartPlant());
-			self::registerBlock(new EnchantingTable());
+		self::registerBlock(new EnchantingTable());
-			self::registerBlock(new BrewingStand());
+		self::registerBlock(new BrewingStand());
-			//TODO: CAULDRON_BLOCK
+		//TODO: CAULDRON_BLOCK
-			//TODO: END_PORTAL
+		//TODO: END_PORTAL
-			self::registerBlock(new EndPortalFrame());
+		self::registerBlock(new EndPortalFrame());
-			self::registerBlock(new EndStone());
+		self::registerBlock(new EndStone());
-			//TODO: DRAGON_EGG
+		//TODO: DRAGON_EGG
-			self::registerBlock(new RedstoneLamp());
+		self::registerBlock(new RedstoneLamp());
-			self::registerBlock(new LitRedstoneLamp());
+		self::registerBlock(new LitRedstoneLamp());
-			//TODO: DROPPER
+		//TODO: DROPPER
-			self::registerBlock(new ActivatorRail());
+		self::registerBlock(new ActivatorRail());
-			self::registerBlock(new CocoaBlock());
+		self::registerBlock(new CocoaBlock());
-			self::registerBlock(new SandstoneStairs());
+		self::registerBlock(new SandstoneStairs());
-			self::registerBlock(new EmeraldOre());
+		self::registerBlock(new EmeraldOre());
-			self::registerBlock(new EnderChest());
+		self::registerBlock(new EnderChest());
-			self::registerBlock(new TripwireHook());
+		self::registerBlock(new TripwireHook());
-			self::registerBlock(new Tripwire());
+		self::registerBlock(new Tripwire());
-			self::registerBlock(new Emerald());
+		self::registerBlock(new Emerald());
-			self::registerBlock(new WoodenStairs(Block::SPRUCE_STAIRS, 0, "Spruce Stairs"));
+		self::registerBlock(new WoodenStairs(Block::SPRUCE_STAIRS, 0, "Spruce Stairs"));
-			self::registerBlock(new WoodenStairs(Block::BIRCH_STAIRS, 0, "Birch Stairs"));
+		self::registerBlock(new WoodenStairs(Block::BIRCH_STAIRS, 0, "Birch Stairs"));
-			self::registerBlock(new WoodenStairs(Block::JUNGLE_STAIRS, 0, "Jungle Stairs"));
+		self::registerBlock(new WoodenStairs(Block::JUNGLE_STAIRS, 0, "Jungle Stairs"));
-			//TODO: COMMAND_BLOCK
+		//TODO: COMMAND_BLOCK
-			//TODO: BEACON
+		//TODO: BEACON
-			self::registerBlock(new CobblestoneWall());
+		self::registerBlock(new CobblestoneWall());
-			self::registerBlock(new FlowerPot());
+		self::registerBlock(new FlowerPot());
-			self::registerBlock(new Carrot());
+		self::registerBlock(new Carrot());
-			self::registerBlock(new Potato());
+		self::registerBlock(new Potato());
-			self::registerBlock(new WoodenButton());
+		self::registerBlock(new WoodenButton());
-			self::registerBlock(new Skull());
+		self::registerBlock(new Skull());
-			self::registerBlock(new Anvil());
+		self::registerBlock(new Anvil());
-			self::registerBlock(new TrappedChest());
+		self::registerBlock(new TrappedChest());
-			self::registerBlock(new WeightedPressurePlateLight());
+		self::registerBlock(new WeightedPressurePlateLight());
-			self::registerBlock(new WeightedPressurePlateHeavy());
+		self::registerBlock(new WeightedPressurePlateHeavy());
-			//TODO: COMPARATOR_BLOCK
+		//TODO: COMPARATOR_BLOCK
-			//TODO: POWERED_COMPARATOR
+		//TODO: POWERED_COMPARATOR
-			self::registerBlock(new DaylightSensor());
+		self::registerBlock(new DaylightSensor());
-			self::registerBlock(new Redstone());
+		self::registerBlock(new Redstone());
-			self::registerBlock(new NetherQuartzOre());
+		self::registerBlock(new NetherQuartzOre());
-			//TODO: HOPPER_BLOCK
+		//TODO: HOPPER_BLOCK
-			self::registerBlock(new Quartz());
+		self::registerBlock(new Quartz());
-			self::registerBlock(new QuartzStairs());
+		self::registerBlock(new QuartzStairs());
-			self::registerBlock(new DoubleWoodenSlab());
+		self::registerBlock(new DoubleWoodenSlab());
-			self::registerBlock(new WoodenSlab());
+		self::registerBlock(new WoodenSlab());
-			self::registerBlock(new StainedClay());
+		self::registerBlock(new StainedClay());
-			self::registerBlock(new StainedGlassPane());
+		self::registerBlock(new StainedGlassPane());
-			self::registerBlock(new Leaves2());
+		self::registerBlock(new Leaves2());
-			self::registerBlock(new Wood2());
+		self::registerBlock(new Wood2());
-			self::registerBlock(new WoodenStairs(Block::ACACIA_STAIRS, 0, "Acacia Stairs"));
+		self::registerBlock(new WoodenStairs(Block::ACACIA_STAIRS, 0, "Acacia Stairs"));
-			self::registerBlock(new WoodenStairs(Block::DARK_OAK_STAIRS, 0, "Dark Oak Stairs"));
+		self::registerBlock(new WoodenStairs(Block::DARK_OAK_STAIRS, 0, "Dark Oak Stairs"));
-			//TODO: SLIME
+		//TODO: SLIME
 
-			self::registerBlock(new IronTrapdoor());
+		self::registerBlock(new IronTrapdoor());
-			self::registerBlock(new Prismarine());
+		self::registerBlock(new Prismarine());
-			self::registerBlock(new SeaLantern());
+		self::registerBlock(new SeaLantern());
-			self::registerBlock(new HayBale());
+		self::registerBlock(new HayBale());
-			self::registerBlock(new Carpet());
+		self::registerBlock(new Carpet());
-			self::registerBlock(new HardenedClay());
+		self::registerBlock(new HardenedClay());
-			self::registerBlock(new Coal());
+		self::registerBlock(new Coal());
-			self::registerBlock(new PackedIce());
+		self::registerBlock(new PackedIce());
-			self::registerBlock(new DoublePlant());
+		self::registerBlock(new DoublePlant());
-			self::registerBlock(new StandingBanner());
+		self::registerBlock(new StandingBanner());
-			self::registerBlock(new WallBanner());
+		self::registerBlock(new WallBanner());
-			//TODO: DAYLIGHT_DETECTOR_INVERTED
+		//TODO: DAYLIGHT_DETECTOR_INVERTED
-			self::registerBlock(new RedSandstone());
+		self::registerBlock(new RedSandstone());
-			self::registerBlock(new RedSandstoneStairs());
+		self::registerBlock(new RedSandstoneStairs());
-			self::registerBlock(new DoubleStoneSlab2());
+		self::registerBlock(new DoubleStoneSlab2());
-			self::registerBlock(new StoneSlab2());
+		self::registerBlock(new StoneSlab2());
-			self::registerBlock(new FenceGate(Block::SPRUCE_FENCE_GATE, 0, "Spruce Fence Gate"));
+		self::registerBlock(new FenceGate(Block::SPRUCE_FENCE_GATE, 0, "Spruce Fence Gate"));
-			self::registerBlock(new FenceGate(Block::BIRCH_FENCE_GATE, 0, "Birch Fence Gate"));
+		self::registerBlock(new FenceGate(Block::BIRCH_FENCE_GATE, 0, "Birch Fence Gate"));
-			self::registerBlock(new FenceGate(Block::JUNGLE_FENCE_GATE, 0, "Jungle Fence Gate"));
+		self::registerBlock(new FenceGate(Block::JUNGLE_FENCE_GATE, 0, "Jungle Fence Gate"));
-			self::registerBlock(new FenceGate(Block::DARK_OAK_FENCE_GATE, 0, "Dark Oak Fence Gate"));
+		self::registerBlock(new FenceGate(Block::DARK_OAK_FENCE_GATE, 0, "Dark Oak Fence Gate"));
-			self::registerBlock(new FenceGate(Block::ACACIA_FENCE_GATE, 0, "Acacia Fence Gate"));
+		self::registerBlock(new FenceGate(Block::ACACIA_FENCE_GATE, 0, "Acacia Fence Gate"));
-			//TODO: REPEATING_COMMAND_BLOCK
+		//TODO: REPEATING_COMMAND_BLOCK
-			//TODO: CHAIN_COMMAND_BLOCK
+		//TODO: CHAIN_COMMAND_BLOCK
 
-			self::registerBlock(new WoodenDoor(Block::SPRUCE_DOOR_BLOCK, 0, "Spruce Door", Item::SPRUCE_DOOR));
+		self::registerBlock(new WoodenDoor(Block::SPRUCE_DOOR_BLOCK, 0, "Spruce Door", Item::SPRUCE_DOOR));
-			self::registerBlock(new WoodenDoor(Block::BIRCH_DOOR_BLOCK, 0, "Birch Door", Item::BIRCH_DOOR));
+		self::registerBlock(new WoodenDoor(Block::BIRCH_DOOR_BLOCK, 0, "Birch Door", Item::BIRCH_DOOR));
-			self::registerBlock(new WoodenDoor(Block::JUNGLE_DOOR_BLOCK, 0, "Jungle Door", Item::JUNGLE_DOOR));
+		self::registerBlock(new WoodenDoor(Block::JUNGLE_DOOR_BLOCK, 0, "Jungle Door", Item::JUNGLE_DOOR));
-			self::registerBlock(new WoodenDoor(Block::ACACIA_DOOR_BLOCK, 0, "Acacia Door", Item::ACACIA_DOOR));
+		self::registerBlock(new WoodenDoor(Block::ACACIA_DOOR_BLOCK, 0, "Acacia Door", Item::ACACIA_DOOR));
-			self::registerBlock(new WoodenDoor(Block::DARK_OAK_DOOR_BLOCK, 0, "Dark Oak Door", Item::DARK_OAK_DOOR));
+		self::registerBlock(new WoodenDoor(Block::DARK_OAK_DOOR_BLOCK, 0, "Dark Oak Door", Item::DARK_OAK_DOOR));
-			self::registerBlock(new GrassPath());
+		self::registerBlock(new GrassPath());
-			self::registerBlock(new ItemFrame());
+		self::registerBlock(new ItemFrame());
-			//TODO: CHORUS_FLOWER
+		//TODO: CHORUS_FLOWER
-			self::registerBlock(new Purpur());
+		self::registerBlock(new Purpur());
 
-			self::registerBlock(new PurpurStairs());
+		self::registerBlock(new PurpurStairs());
 
-			//TODO: UNDYED_SHULKER_BOX
+		//TODO: UNDYED_SHULKER_BOX
-			self::registerBlock(new EndStoneBricks());
+		self::registerBlock(new EndStoneBricks());
-			//TODO: FROSTED_ICE
+		//TODO: FROSTED_ICE
-			self::registerBlock(new EndRod());
+		self::registerBlock(new EndRod());
-			//TODO: END_GATEWAY
+		//TODO: END_GATEWAY
 
-			self::registerBlock(new Magma());
+		self::registerBlock(new Magma());
-			self::registerBlock(new NetherWartBlock());
+		self::registerBlock(new NetherWartBlock());
-			self::registerBlock(new NetherBrick(Block::RED_NETHER_BRICK, 0, "Red Nether Bricks"));
+		self::registerBlock(new NetherBrick(Block::RED_NETHER_BRICK, 0, "Red Nether Bricks"));
-			self::registerBlock(new BoneBlock());
+		self::registerBlock(new BoneBlock());
 
-			//TODO: SHULKER_BOX
+		//TODO: SHULKER_BOX
-			self::registerBlock(new GlazedTerracotta(Block::PURPLE_GLAZED_TERRACOTTA, 0, "Purple Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::PURPLE_GLAZED_TERRACOTTA, 0, "Purple Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::WHITE_GLAZED_TERRACOTTA, 0, "White Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::WHITE_GLAZED_TERRACOTTA, 0, "White Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::ORANGE_GLAZED_TERRACOTTA, 0, "Orange Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::ORANGE_GLAZED_TERRACOTTA, 0, "Orange Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::MAGENTA_GLAZED_TERRACOTTA, 0, "Magenta Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::MAGENTA_GLAZED_TERRACOTTA, 0, "Magenta Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::LIGHT_BLUE_GLAZED_TERRACOTTA, 0, "Light Blue Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::LIGHT_BLUE_GLAZED_TERRACOTTA, 0, "Light Blue Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::YELLOW_GLAZED_TERRACOTTA, 0, "Yellow Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::YELLOW_GLAZED_TERRACOTTA, 0, "Yellow Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::LIME_GLAZED_TERRACOTTA, 0, "Lime Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::LIME_GLAZED_TERRACOTTA, 0, "Lime Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::PINK_GLAZED_TERRACOTTA, 0, "Pink Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::PINK_GLAZED_TERRACOTTA, 0, "Pink Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::GRAY_GLAZED_TERRACOTTA, 0, "Grey Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::GRAY_GLAZED_TERRACOTTA, 0, "Grey Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::SILVER_GLAZED_TERRACOTTA, 0, "Light Grey Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::SILVER_GLAZED_TERRACOTTA, 0, "Light Grey Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::CYAN_GLAZED_TERRACOTTA, 0, "Cyan Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::CYAN_GLAZED_TERRACOTTA, 0, "Cyan Glazed Terracotta"));
 
-			self::registerBlock(new GlazedTerracotta(Block::BLUE_GLAZED_TERRACOTTA, 0, "Blue Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::BLUE_GLAZED_TERRACOTTA, 0, "Blue Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::BROWN_GLAZED_TERRACOTTA, 0, "Brown Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::BROWN_GLAZED_TERRACOTTA, 0, "Brown Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::GREEN_GLAZED_TERRACOTTA, 0, "Green Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::GREEN_GLAZED_TERRACOTTA, 0, "Green Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::RED_GLAZED_TERRACOTTA, 0, "Red Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::RED_GLAZED_TERRACOTTA, 0, "Red Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::BLACK_GLAZED_TERRACOTTA, 0, "Black Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::BLACK_GLAZED_TERRACOTTA, 0, "Black Glazed Terracotta"));
-			self::registerBlock(new Concrete());
+		self::registerBlock(new Concrete());
-			self::registerBlock(new ConcretePowder());
+		self::registerBlock(new ConcretePowder());
 
-			//TODO: CHORUS_PLANT
+		//TODO: CHORUS_PLANT
-			self::registerBlock(new StainedGlass());
+		self::registerBlock(new StainedGlass());
 
-			self::registerBlock(new Podzol());
+		self::registerBlock(new Podzol());
-			self::registerBlock(new Beetroot());
+		self::registerBlock(new Beetroot());
-			self::registerBlock(new Stonecutter());
+		self::registerBlock(new Stonecutter());
-			self::registerBlock(new GlowingObsidian());
+		self::registerBlock(new GlowingObsidian());
-			self::registerBlock(new NetherReactor());
+		self::registerBlock(new NetherReactor());
-			//TODO: INFO_UPDATE
+		//TODO: INFO_UPDATE
-			//TODO: INFO_UPDATE2
+		//TODO: INFO_UPDATE2
-			//TODO: MOVINGBLOCK
+		//TODO: MOVINGBLOCK
-			//TODO: OBSERVER
+		//TODO: OBSERVER
-			//TODO: STRUCTURE_BLOCK
+		//TODO: STRUCTURE_BLOCK
 
-			//TODO: RESERVED6
+		//TODO: RESERVED6
 
-			foreach(self::$list as $id => $block){
+		for($id = 0, $size = self::$fullList->getSize() >> 4; $id < $size; ++$id){
-				if($block === null){
+			if(self::$fullList[$id << 4] === null){
-					self::registerBlock(new UnknownBlock($id));
+				self::registerBlock(new UnknownBlock($id));
-				}
 			}
 		}
 	}
@@ -348,8 +350,6 @@ class BlockFactory{
 			throw new \RuntimeException("Trying to overwrite an already registered block");
 		}
 
-		self::$list[$id] = clone $block;
-
 		for($meta = 0; $meta < 16; ++$meta){
 			$variant = clone $block;
 			$variant->setDamage($meta);
@@ -360,7 +360,7 @@ class BlockFactory{
 		self::$transparent[$id] = $block->isTransparent();
 		self::$hardness[$id] = $block->getHardness();
 		self::$light[$id] = $block->getLightLevel();
-		self::$lightFilter[$id] = $block->getLightFilter() + 1; //opacity plus 1 standard light filter
+		self::$lightFilter[$id] = min(15, $block->getLightFilter() + 1); //opacity plus 1 standard light filter
 		self::$diffusesSkyLight[$id] = $block->diffusesSkyLight();
 		self::$blastResistance[$id] = $block->getBlastResistance();
 	}
@@ -390,9 +390,9 @@ class BlockFactory{
 		}
 
 		if($pos !== null){
-			$block->x = $pos->x;
+			$block->x = $pos->getFloorX();
-			$block->y = $pos->y;
+			$block->y = $pos->getFloorY();
-			$block->z = $pos->z;
+			$block->z = $pos->getFloorZ();
 			$block->level = $pos->level;
 		}
 
@@ -414,7 +414,50 @@ class BlockFactory{
 	 * @return bool
 	 */
 	public static function isRegistered(int $id) : bool{
-		$b = self::$list[$id];
+		$b = self::$fullList[$id << 4];
 		return $b !== null and !($b instanceof UnknownBlock);
 	}
-}
+
+	public static function registerStaticRuntimeIdMappings() : void{
+		/** @var mixed[] $runtimeIdMap */
+		$runtimeIdMap = json_decode(file_get_contents(\pocketmine\RESOURCE_PATH . "runtimeid_table.json"), true);
+		foreach($runtimeIdMap as $obj){
+			self::registerMapping($obj["runtimeID"], $obj["id"], $obj["data"]);
+		}
+	}
+
+	/**
+	 * @internal
+	 *
+	 * @param int $id
+	 * @param int $meta
+	 *
+	 * @return int
+	 */
+	public static function toStaticRuntimeId(int $id, int $meta = 0) : int{
+		/*
+		 * try id+meta first
+		 * if not found, try id+0 (strip meta)
+		 * if still not found, return update! block
+		 */
+		return self::$staticRuntimeIdMap[($id << 4) | $meta] ?? self::$staticRuntimeIdMap[$id << 4] ?? self::$staticRuntimeIdMap[BlockIds::INFO_UPDATE << 4];
+	}
+
+	/**
+	 * @internal
+	 *
+	 * @param int $runtimeId
+	 *
+	 * @return int[] [id, meta]
+	 */
+	public static function fromStaticRuntimeId(int $runtimeId) : array{
+		$v = self::$legacyIdMap[$runtimeId];
+		return [$v >> 4, $v & 0xf];
+	}
+
+	private static function registerMapping(int $staticRuntimeId, int $legacyId, int $legacyMeta) : void{
+		self::$staticRuntimeIdMap[($legacyId << 4) | $legacyMeta] = $staticRuntimeId;
+		self::$legacyIdMap[$staticRuntimeId] = ($legacyId << 4) | $legacyMeta;
+		self::$lastRuntimeId = max(self::$lastRuntimeId, $staticRuntimeId);
+	}
+}

src/pocketmine/block/BlockToolType.php

@@ -21,21 +21,19 @@
 
 declare(strict_types=1);
 
+namespace pocketmine\block;
+
 /**
- * Math related classes, like matrices, bounding boxes and vector
+ * Types of tools that can be used to break blocks
+ * Blocks may allow multiple tool types by combining these bitflags
  */
-namespace pocketmine\math;
+interface BlockToolType{
 
+	public const TYPE_NONE = 0;
+	public const TYPE_SWORD = 1 << 0;
+	public const TYPE_SHOVEL = 1 << 1;
+	public const TYPE_PICKAXE = 1 << 2;
+	public const TYPE_AXE = 1 << 3;
+	public const TYPE_SHEARS = 1 << 4;
 
-abstract class Math{
+}
-
-	public static function floorFloat($n) : int{
-		$i = (int) $n;
-		return $n >= $i ? $i : $i - 1;
-	}
-
-	public static function ceilFloat($n) : int{
-		$i = (int) ($n + 1);
-		return $n >= $i ? $i : $i - 1;
-	}
-}

src/pocketmine/block/BoneBlock.php

@@ -25,7 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\block\utils\PillarRotationHelper;
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
+use pocketmine\item\TieredTool;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -46,7 +46,11 @@ class BoneBlock extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
@@ -57,13 +61,4 @@ class BoneBlock extends Solid{
 	public function getVariantBitmask() : int{
 		return 0x03;
 	}
-
+}
-	public function getDrops(Item $item) : array{
-		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return parent::getDrops($item);
-		}
-
-		return [];
-	}
-
-}

src/pocketmine/block/Bookshelf.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 
 class Bookshelf extends Solid{
 
@@ -44,10 +43,10 @@ class Bookshelf extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
 			ItemFactory::get(Item::BOOK, 0, 3)
 		];
@@ -57,4 +56,11 @@ class Bookshelf extends Solid{
 		return 300;
 	}
 
-}
+	public function getFlameEncouragement() : int{
+		return 30;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
+}

src/pocketmine/block/BrewingStand.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
+use pocketmine\item\TieredTool;
 
 class BrewingStand extends Transparent{
 
@@ -42,7 +42,11 @@ class BrewingStand extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function getVariantBitmask() : int{
@@ -50,4 +54,4 @@ class BrewingStand extends Transparent{
 	}
 
 	//TODO
-}
+}

src/pocketmine/block/BrickStairs.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
+use pocketmine\item\TieredTool;
 
 class BrickStairs extends Stair{
 
@@ -42,11 +42,14 @@ class BrickStairs extends Stair{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function getName() : string{
 		return "Brick Stairs";
 	}
-
+}
-}

src/pocketmine/block/Bricks.php

@@ -23,8 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Bricks extends Solid{
 
@@ -43,18 +42,14 @@ class Bricks extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function getName() : string{
 		return "Bricks";
 	}
-
+}
-	public function getDrops(Item $item) : array{
-		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return parent::getDrops($item);
-		}
-
-		return [];
-	}
-}

src/pocketmine/block/BrownMushroom.php

@@ -34,4 +34,4 @@ class BrownMushroom extends RedMushroom{
 	public function getLightLevel() : int{
 		return 1;
 	}
-}
+}

src/pocketmine/block/BrownMushroomBlock.php

@@ -33,9 +33,9 @@ class BrownMushroomBlock extends RedMushroomBlock{
 		return "Brown Mushroom Block";
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
 			Item::get(Item::BROWN_MUSHROOM, 0, mt_rand(0, 2))
 		];
 	}
-}
+}

src/pocketmine/block/BurningFurnace.php

@@ -24,9 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
+use pocketmine\item\TieredTool;
 use pocketmine\math\Vector3;
-use pocketmine\nbt\tag\StringTag;
 use pocketmine\Player;
 use pocketmine\tile\Furnace as TileFurnace;
 use pocketmine\tile\Tile;
@@ -35,6 +34,8 @@ class BurningFurnace extends Solid{
 
 	protected $id = self::BURNING_FURNACE;
 
+	protected $itemId = self::FURNACE;
+
 	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
@@ -48,7 +49,11 @@ class BurningFurnace extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function getLightLevel() : int{
@@ -77,7 +82,7 @@ class BurningFurnace extends Solid{
 				$furnace = Tile::createTile(Tile::FURNACE, $this->getLevel(), TileFurnace::createNBT($this));
 			}
 
-			if($furnace->namedtag->hasTag("Lock", StringTag::class) and $furnace->namedtag->getString("Lock") !== $item->getCustomName()){
+			if(!$furnace->canOpenWith($item->getCustomName())){
 				return true;
 			}
 
@@ -90,12 +95,4 @@ class BurningFurnace extends Solid{
 	public function getVariantBitmask() : int{
 		return 0;
 	}
-
+}
-	public function getDrops(Item $item) : array{
-		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return parent::getDrops($item);
-		}
-
-		return [];
-	}
-}

src/pocketmine/block/Button.php

@@ -48,4 +48,4 @@ abstract class Button extends Flowable{
 		//TODO
 		return true;
 	}
-}
+}

src/pocketmine/block/Cactus.php

@@ -28,7 +28,6 @@ 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;
 use pocketmine\Player;
@@ -66,50 +65,49 @@ class Cactus extends Transparent{
 		);
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function onEntityCollide(Entity $entity) : void{
 		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_CONTACT, 1);
 		$entity->attack($ev);
 	}
 
-	public function onUpdate(int $type){
+	public function onNearbyBlockChange() : void{
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+		$down = $this->getSide(Vector3::SIDE_DOWN);
-			$down = $this->getSide(Vector3::SIDE_DOWN);
+		if($down->getId() !== self::SAND and $down->getId() !== self::CACTUS){
-			if($down->getId() !== self::SAND and $down->getId() !== self::CACTUS){
+			$this->getLevel()->useBreakOn($this);
-				$this->getLevel()->useBreakOn($this);
+		}else{
-			}else{
+			for($side = 2; $side <= 5; ++$side){
-				for($side = 2; $side <= 5; ++$side){
+				$b = $this->getSide($side);
-					$b = $this->getSide($side);
+				if($b->isSolid()){
-					if(!$b->canBeFlowedInto()){
+					$this->getLevel()->useBreakOn($this);
-						$this->getLevel()->useBreakOn($this);
+					break;
-					}
-				}
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::CACTUS){
-				if($this->meta === 0x0f){
-					for($y = 1; $y < 3; ++$y){
-						$b = $this->getLevel()->getBlockAt($this->x, $this->y + $y, $this->z);
-						if($b->getId() === self::AIR){
-							Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($b, BlockFactory::get(Block::CACTUS)));
-							if(!$ev->isCancelled()){
-								$this->getLevel()->setBlock($b, $ev->getNewState(), true);
-							}
-						}
-					}
-					$this->meta = 0;
-					$this->getLevel()->setBlock($this, $this);
-				}else{
-					++$this->meta;
-					$this->getLevel()->setBlock($this, $this);
 				}
 			}
 		}
+	}
 
-		return false;
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::CACTUS){
+			if($this->meta === 0x0f){
+				for($y = 1; $y < 3; ++$y){
+					$b = $this->getLevel()->getBlockAt($this->x, $this->y + $y, $this->z);
+					if($b->getId() === self::AIR){
+						Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($b, BlockFactory::get(Block::CACTUS)));
+						if(!$ev->isCancelled()){
+							$this->getLevel()->setBlock($b, $ev->getNewState(), true);
+						}
+					}
+				}
+				$this->meta = 0;
+				$this->getLevel()->setBlock($this, $this);
+			}else{
+				++$this->meta;
+				$this->getLevel()->setBlock($this, $this);
+			}
+		}
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
@@ -119,7 +117,7 @@ class Cactus extends Transparent{
 			$block1 = $this->getSide(Vector3::SIDE_SOUTH);
 			$block2 = $this->getSide(Vector3::SIDE_WEST);
 			$block3 = $this->getSide(Vector3::SIDE_EAST);
-			if($block0->isTransparent() === true and $block1->isTransparent() === true and $block2->isTransparent() === true and $block3->isTransparent() === true){
+			if(!$block0->isSolid() and !$block1->isSolid() and !$block2->isSolid() and !$block3->isSolid()){
 				$this->getLevel()->setBlock($this, $this, true);
 
 				return true;
@@ -132,4 +130,4 @@ class Cactus extends Transparent{
 	public function getVariantBitmask() : int{
 		return 0;
 	}
-}
+}

src/pocketmine/block/Cake.php

@@ -23,11 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\entity\Effect;
+use pocketmine\entity\EffectInstance;
-use pocketmine\event\entity\EntityEatBlockEvent;
+use pocketmine\entity\Living;
 use pocketmine\item\FoodSource;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -45,7 +44,7 @@ class Cake extends Transparent implements FoodSource{
 	}
 
 	public function getName() : string{
-		return "Cake Block";
+		return "Cake";
 	}
 
 	protected function recalculateBoundingBox() : ?AxisAlignedBB{
@@ -73,37 +72,24 @@ class Cake extends Transparent implements FoodSource{
 		return false;
 	}
 
-	public function onUpdate(int $type){
+	public function onNearbyBlockChange() : void{
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
+			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
-				$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
 		}
-
-		return false;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [];
 	}
 
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
+
 	public function onActivate(Item $item, Player $player = null) : bool{
-		//TODO: refactor this into generic food handling
+		if($player !== null){
-		if($player instanceof Player and $player->getFood() < $player->getMaxFood()){
+			$player->consumeObject($this);
-			$player->getServer()->getPluginManager()->callEvent($ev = new EntityEatBlockEvent($player, $this));
+			return true;
-
-			if(!$ev->isCancelled()){
-				$player->addFood($ev->getFoodRestore());
-				$player->addSaturation($ev->getSaturationRestore());
-				foreach($ev->getAdditionalEffects() as $effect){
-					$player->addEffect($effect);
-				}
-
-				$this->getLevel()->setBlock($this, $ev->getResidue());
-				return true;
-			}
 		}
 
 		return false;
@@ -117,6 +103,13 @@ class Cake extends Transparent implements FoodSource{
 		return 0.4;
 	}
 
+	public function requiresHunger() : bool{
+		return true;
+	}
+
+	/**
+	 * @return Block
+	 */
 	public function getResidue(){
 		$clone = clone $this;
 		$clone->meta++;
@@ -127,9 +120,13 @@ class Cake extends Transparent implements FoodSource{
 	}
 
 	/**
-	 * @return Effect[]
+	 * @return EffectInstance[]
 	 */
 	public function getAdditionalEffects() : array{
 		return [];
 	}
+
+	public function onConsume(Living $consumer) : void{
+		$this->level->setBlock($this, $this->getResidue());
+	}
 }

src/pocketmine/block/Carpet.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\block\utils\ColorBlockMetaHelper;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -73,16 +72,17 @@ class Carpet extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
+	public function onNearbyBlockChange() : void{
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){
+			$this->getLevel()->useBreakOn($this);
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
 		}
-
-		return false;
 	}
 
-}
+	public function getFlameEncouragement() : int{
+		return 30;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
+}

src/pocketmine/block/Carrot.php

@@ -38,7 +38,7 @@ class Carrot extends Crops{
 		return "Carrot Block";
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
 			ItemFactory::get(Item::CARROT, 0, $this->meta >= 0x07 ? mt_rand(1, 4) : 1)
 		];
@@ -47,4 +47,4 @@ class Carrot extends Crops{
 	public function getPickedItem() : Item{
 		return ItemFactory::get(Item::CARROT);
 	}
-}
+}

src/pocketmine/block/Chest.php

@@ -24,10 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
-use pocketmine\nbt\tag\StringTag;
 use pocketmine\Player;
 use pocketmine\tile\Chest as TileChest;
 use pocketmine\tile\Tile;
@@ -49,7 +47,7 @@ class Chest extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	protected function recalculateBoundingBox() : ?AxisAlignedBB{
@@ -102,16 +100,6 @@ class Chest extends Transparent{
 		return true;
 	}
 
-	public function onBreak(Item $item, Player $player = null) : bool{
-		$t = $this->getLevel()->getTile($this);
-		if($t instanceof TileChest){
-			$t->unpair();
-		}
-		$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true, true);
-
-		return true;
-	}
-
 	public function onActivate(Item $item, Player $player = null) : bool{
 		if($player instanceof Player){
 
@@ -126,7 +114,7 @@ class Chest extends Transparent{
 			if(
 				!$this->getSide(Vector3::SIDE_UP)->isTransparent() or
 				($chest->isPaired() and !$chest->getPair()->getBlock()->getSide(Vector3::SIDE_UP)->isTransparent()) or
-				($chest->namedtag->hasTag("Lock", StringTag::class) and $chest->namedtag->getString("Lock") !== $item->getCustomName())
+				!$chest->canOpenWith($item->getCustomName())
 			){
 				return true;
 			}
@@ -144,4 +132,4 @@ class Chest extends Transparent{
 	public function getFuelTime() : int{
 		return 300;
 	}
-}
+}

src/pocketmine/block/Clay.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 
 class Clay extends Solid{
 
@@ -40,16 +39,16 @@ class Clay extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	public function getName() : string{
 		return "Clay Block";
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
 			ItemFactory::get(Item::CLAY_BALL, 0, 4)
 		];
 	}
-}
+}

src/pocketmine/block/Coal.php

@@ -23,8 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Coal extends Solid{
 
@@ -39,22 +38,26 @@ class Coal extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function getName() : string{
 		return "Coal Block";
 	}
 
-	public function getDrops(Item $item) : array{
-		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return parent::getDrops($item);
-		}
-
-		return [];
-	}
-
 	public function getFuelTime() : int{
 		return 16000;
 	}
-}
+
+	public function getFlameEncouragement() : int{
+		return 5;
+	}
+
+	public function getFlammability() : int{
+		return 5;
+	}
+}

src/pocketmine/block/CoalOre.php

@@ -25,7 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
+use pocketmine\item\TieredTool;
 
 class CoalOre extends Solid{
 
@@ -40,21 +40,24 @@ class CoalOre extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function getName() : string{
 		return "Coal Ore";
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
-		if($item->isPickaxe() >= Tool::TIER_WOODEN){
+		return [
-			return [
+			ItemFactory::get(Item::COAL)
-				ItemFactory::get(Item::COAL, 0, 1)
+		];
-			];
-		}
-
-		return [];
 	}
 
-}
+	protected function getXpDropAmount() : int{
+		return mt_rand(0, 2);
+	}
+}

src/pocketmine/block/Cobblestone.php

@@ -23,8 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Cobblestone extends Solid{
 
@@ -35,7 +34,11 @@ class Cobblestone extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function getName() : string{
@@ -45,12 +48,4 @@ class Cobblestone extends Solid{
 	public function getHardness() : float{
 		return 2;
 	}
-
+}
-	public function getDrops(Item $item) : array{
-		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return parent::getDrops($item);
-		}
-
-		return [];
-	}
-}

src/pocketmine/block/CobblestoneStairs.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
+use pocketmine\item\TieredTool;
 
 class CobblestoneStairs extends Stair{
 
@@ -38,11 +38,14 @@ class CobblestoneStairs extends Stair{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function getName() : string{
 		return "Cobblestone Stairs";
 	}
-
+}
-}

src/pocketmine/block/CobblestoneWall.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
+use pocketmine\item\TieredTool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 
@@ -38,7 +38,11 @@ class CobblestoneWall extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function getHardness() : float{
@@ -86,5 +90,4 @@ class CobblestoneWall extends Transparent{
 	public function canConnect(Block $block){
 		return $block instanceof static or $block instanceof FenceGate or ($block->isSolid() and !$block->isTransparent());
 	}
-
 }

src/pocketmine/block/Cobweb.php

@@ -25,7 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
+use pocketmine\item\ItemFactory;
 
 class Cobweb extends Flowable{
 
@@ -48,19 +48,24 @@ class Cobweb extends Flowable{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SWORD;
+		return BlockToolType::TYPE_SWORD | BlockToolType::TYPE_SHEARS;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return 1;
 	}
 
 	public function onEntityCollide(Entity $entity) : void{
 		$entity->resetFallDistance();
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
-		//TODO: correct drops
+		return [
-		return [];
+			ItemFactory::get(Item::STRING)
+		];
 	}
 
 	public function diffusesSkyLight() : bool{
 		return true;
 	}
-}
+}

src/pocketmine/block/CocoaBlock.php

@@ -35,5 +35,17 @@ class CocoaBlock extends Transparent{
 		return "Cocoa Block";
 	}
 
+	public function getHardness() : float{
+		return 0.2;
+	}
+
+	public function getToolType() : int{
+		return BlockToolType::TYPE_AXE;
+	}
+
 	//TODO
+
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
 }

src/pocketmine/block/Concrete.php

@@ -24,8 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\ColorBlockMetaHelper;
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Concrete extends Solid{
 
@@ -44,15 +43,10 @@ class Concrete extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getToolHarvestLevel() : int{
-		if($item->isPickaxe() >= Tool::TIER_WOODEN){
+		return TieredTool::TIER_WOODEN;
-			return parent::getDrops($item);
-		}
-
-		return [];
 	}
-
+}
-}

src/pocketmine/block/ConcretePowder.php

@@ -24,8 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\ColorBlockMetaHelper;
-use pocketmine\item\Tool;
-use pocketmine\level\Level;
 
 class ConcretePowder extends Fallable{
 
@@ -44,16 +42,15 @@ class ConcretePowder extends Fallable{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
-	public function onUpdate(int $type){
+	public function onNearbyBlockChange() : void{
-		if($type === Level::BLOCK_UPDATE_NORMAL and ($block = $this->checkAdjacentWater()) !== null){
+		if(($block = $this->checkAdjacentWater()) !== null){
 			$this->level->setBlock($this, $block);
-			return $type;
+		}else{
+			parent::onNearbyBlockChange();
 		}
-
-		return parent::onUpdate($type);
 	}
 
 	/**
@@ -69,10 +66,10 @@ class ConcretePowder extends Fallable{
 	private function checkAdjacentWater() : ?Block{
 		for($i = 1; $i < 6; ++$i){ //Do not check underneath
 			if($this->getSide($i) instanceof Water){
-				return Block::get(Block::CONCRETE, $this->meta);
+				return BlockFactory::get(Block::CONCRETE, $this->meta);
 			}
 		}
 
 		return null;
 	}
-}
+}

src/pocketmine/block/CraftingTable.php

@@ -23,9 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\inventory\BigCraftingGrid;
+use pocketmine\inventory\CraftingGrid;
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 use pocketmine\Player;
 
 class CraftingTable extends Solid{
@@ -45,12 +44,12 @@ class CraftingTable extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 	public function onActivate(Item $item, Player $player = null) : bool{
 		if($player instanceof Player){
-			$player->setCraftingGrid(new BigCraftingGrid($player));
+			$player->setCraftingGrid(new CraftingGrid($player, CraftingGrid::SIZE_BIG));
 		}
 
 		return true;
@@ -59,4 +58,4 @@ class CraftingTable extends Solid{
 	public function getFuelTime() : int{
 		return 300;
 	}
-}
+}

src/pocketmine/block/Crops.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\Server;
@@ -65,34 +64,31 @@ abstract class Crops extends Flowable{
 		return false;
 	}
 
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::FARMLAND){
+			$this->getLevel()->useBreakOn($this);
+		}
+	}
+
 	public function ticksRandomly() : bool{
 		return true;
 	}
 
-	public function onUpdate(int $type){
+	public function onRandomTick() : void{
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+		if(mt_rand(0, 2) === 1){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::FARMLAND){
+			if($this->meta < 0x07){
-				$this->getLevel()->useBreakOn($this);
+				$block = clone $this;
-				return Level::BLOCK_UPDATE_NORMAL;
+				++$block->meta;
-			}
+				Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
-		}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()){
+				if(!$ev->isCancelled()){
-						$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
+					$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
-					}else{
-						return Level::BLOCK_UPDATE_RANDOM;
-					}
 				}
-			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
 			}
 		}
+	}
 
+	public function isAffectedBySilkTouch() : bool{
 		return false;
 	}
-}
+}

src/pocketmine/block/Dandelion.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -52,15 +51,17 @@ class Dandelion extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
+	public function onNearbyBlockChange() : void{
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
+			$this->getLevel()->useBreakOn($this);
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
 		}
-
-		return false;
 	}
-}
+
+	public function getFlameEncouragement() : int{
+		return 60;
+	}
+
+	public function getFlammability() : int{
+		return 100;
+	}
+}

src/pocketmine/block/DaylightSensor.php

@@ -43,5 +43,9 @@ class DaylightSensor extends Transparent{
 		return 300;
 	}
 
+	public function getToolType() : int{
+		return BlockToolType::TYPE_AXE;
+	}
+
 	//TODO
 }

src/pocketmine/block/DeadBush.php

@@ -25,9 +25,8 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
+use pocketmine\Player;
 
 class DeadBush extends Flowable{
 
@@ -41,29 +40,43 @@ class DeadBush extends Flowable{
 		return "Dead Bush";
 	}
 
-	public function onUpdate(int $type){
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+		if(!$this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
+			return parent::place($item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
 		}
 
 		return false;
 	}
 
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			$this->getLevel()->useBreakOn($this);
+		}
+	}
+
 	public function getToolType() : int{
-		return Tool::TYPE_SHEARS;
+		return BlockToolType::TYPE_SHEARS;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return 1;
 	}
 
 	public function getDrops(Item $item) : array{
-		if($item->isShears()){
+		if(!$this->isCompatibleWithTool($item)){
-			return parent::getDrops($item);
+			return [
+				ItemFactory::get(Item::STICK, 0, mt_rand(0, 2))
+			];
 		}
 
-		return [
+		return parent::getDrops($item);
-			ItemFactory::get(Item::STICK, 0, mt_rand(0, 2))
-		];
 	}
-}
+
+	public function getFlameEncouragement() : int{
+		return 60;
+	}
+
+	public function getFlammability() : int{
+		return 100;
+	}
+}

src/pocketmine/block/Diamond.php

@@ -23,8 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Diamond extends Solid{
 
@@ -43,14 +42,10 @@ class Diamond extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getToolHarvestLevel() : int{
-		if($item->isPickaxe() >= Tool::TIER_IRON){
+		return TieredTool::TIER_IRON;
-			return parent::getDrops($item);
-		}
-
-		return [];
 	}
-}
+}

src/pocketmine/block/DiamondOre.php

@@ -25,7 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
+use pocketmine\item\TieredTool;
 
 class DiamondOre extends Solid{
 
@@ -44,16 +44,20 @@ class DiamondOre extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getToolHarvestLevel() : int{
-		if($item->isPickaxe() >= Tool::TIER_IRON){
+		return TieredTool::TIER_IRON;
-			return [
-				ItemFactory::get(Item::DIAMOND, 0, 1)
-			];
-		}
-
-		return [];
 	}
-}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [
+			ItemFactory::get(Item::DIAMOND)
+		];
+	}
+
+	protected function getXpDropAmount() : int{
+		return mt_rand(3, 7);
+	}
+}

src/pocketmine/block/Dirt.php

@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\item\Hoe;
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 use pocketmine\Player;
 
 class Dirt extends Solid{
@@ -40,7 +40,7 @@ class Dirt extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	public function getName() : string{
@@ -51,8 +51,8 @@ class Dirt extends Solid{
 	}
 
 	public function onActivate(Item $item, Player $player = null) : bool{
-		if($item->isHoe()){
+		if($item instanceof Hoe){
-			$item->useOn($this);
+			$item->applyDamage(1);
 			if($this->meta === 1){
 				$this->getLevel()->setBlock($this, BlockFactory::get(Block::DIRT), true);
 			}else{
@@ -64,4 +64,4 @@ class Dirt extends Solid{
 
 		return false;
 	}
-}
+}

src/pocketmine/block/Door.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\level\sound\DoorSound;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -201,26 +200,20 @@ abstract class Door extends Transparent{
 		return $bb;
 	}
 
-	public function onUpdate(int $type){
+	public function onNearbyBlockChange() : void{
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
+			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), false);
-				$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), false);
+			if($this->getSide(Vector3::SIDE_UP) instanceof Door){
-				if($this->getSide(Vector3::SIDE_UP) instanceof Door){
+				$this->getLevel()->setBlock($this->getSide(Vector3::SIDE_UP), BlockFactory::get(Block::AIR), false);
-					$this->getLevel()->setBlock($this->getSide(Vector3::SIDE_UP), BlockFactory::get(Block::AIR), false);
-				}
-
-				return Level::BLOCK_UPDATE_NORMAL;
 			}
 		}
-
-		return false;
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		if($face === Vector3::SIDE_UP){
 			$blockUp = $this->getSide(Vector3::SIDE_UP);
 			$blockDown = $this->getSide(Vector3::SIDE_DOWN);
-			if($blockUp->canBeReplaced() === false or $blockDown->isTransparent() === true){
+			if(!$blockUp->canBeReplaced() or $blockDown->isTransparent()){
 				return false;
 			}
 			$direction = $player instanceof Player ? $player->getDirection() : 0;
@@ -233,36 +226,19 @@ abstract class Door extends Transparent{
 			$next = $this->getSide($faces[($direction + 2) % 4]);
 			$next2 = $this->getSide($faces[$direction]);
 			$metaUp = 0x08;
-			if($next->getId() === $this->getId() or ($next2->isTransparent() === false and $next->isTransparent() === true)){ //Door hinge
+			if($next->getId() === $this->getId() or (!$next2->isTransparent() and $next->isTransparent())){ //Door hinge
 				$metaUp |= 0x01;
 			}
 
 			$this->setDamage($player->getDirection() & 0x03);
 			$this->getLevel()->setBlock($blockReplace, $this, true, true); //Bottom
-			$this->getLevel()->setBlock($blockUp, $b = BlockFactory::get($this->getId(), $metaUp), true); //Top
+			$this->getLevel()->setBlock($blockUp, BlockFactory::get($this->getId(), $metaUp), true); //Top
 			return true;
 		}
 
 		return false;
 	}
 
-	public function onBreak(Item $item, Player $player = null) : bool{
-		if(($this->getDamage() & 0x08) === 0x08){
-			$down = $this->getSide(Vector3::SIDE_DOWN);
-			if($down->getId() === $this->getId()){
-				$this->getLevel()->setBlock($down, BlockFactory::get(Block::AIR), true);
-			}
-		}else{
-			$up = $this->getSide(Vector3::SIDE_UP);
-			if($up->getId() === $this->getId()){
-				$this->getLevel()->setBlock($up, BlockFactory::get(Block::AIR), true);
-			}
-		}
-		$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
-
-		return true;
-	}
-
 	public function onActivate(Item $item, Player $player = null) : bool{
 		if(($this->getDamage() & 0x08) === 0x08){ //Top
 			$down = $this->getSide(Vector3::SIDE_DOWN);
@@ -286,4 +262,32 @@ abstract class Door extends Transparent{
 	public function getVariantBitmask() : int{
 		return 0;
 	}
-}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		if(($this->meta & 0x08) === 0){ //bottom half only
+			return parent::getDropsForCompatibleTool($item);
+		}
+
+		return [];
+	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
+
+	public function getAffectedBlocks() : array{
+		if(($this->getDamage() & 0x08) === 0x08){
+			$down = $this->getSide(Vector3::SIDE_DOWN);
+			if($down->getId() === $this->getId()){
+				return [$this, $down];
+			}
+		}else{
+			$up = $this->getSide(Vector3::SIDE_UP);
+			if($up->getId() === $this->getId()){
+				return [$this, $up];
+			}
+		}
+
+		return parent::getAffectedBlocks();
+	}
+}

src/pocketmine/block/DoublePlant.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -84,46 +83,45 @@ class DoublePlant extends Flowable{
 		);
 	}
 
-	public function onUpdate(int $type){
+	public function onNearbyBlockChange() : void{
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+		if(!$this->isValidHalfPlant() or (($this->meta & self::BITFLAG_TOP) === 0 and $this->getSide(Vector3::SIDE_DOWN)->isTransparent())){
-			$down = $this->getSide(Vector3::SIDE_DOWN);
+			$this->getLevel()->useBreakOn($this);
-			if(!$this->isValidHalfPlant() or (($this->meta & self::BITFLAG_TOP) === 0 and $down->isTransparent())){
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
 		}
-
-		return false;
-	}
-
-	public function onBreak(Item $item, Player $player = null) : bool{
-		if(parent::onBreak($item, $player) and $this->isValidHalfPlant()){
-			$this->getLevel()->useBreakOn($this->getSide(($this->meta & self::BITFLAG_TOP) !== 0 ? Vector3::SIDE_DOWN : Vector3::SIDE_UP), $item, $player, $player !== null);
-		}
-
-		return false;
 	}
 
 	public function getVariantBitmask() : int{
 		return 0x07;
 	}
 
+	public function getToolType() : int{
+		return ($this->meta === 2 or $this->meta === 3) ? BlockToolType::TYPE_SHEARS : BlockToolType::TYPE_NONE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return ($this->meta === 2 or $this->meta === 3) ? 1 : 0; //only grass or fern require shears
+	}
+
 	public function getDrops(Item $item) : array{
 		if($this->meta & self::BITFLAG_TOP){
-			if(!$item->isShears() and ($this->meta === 2 or $this->meta === 3)){ //grass or fern
+			if($this->isCompatibleWithTool($item)){
-				if(mt_rand(0, 24) === 0){
+				return parent::getDrops($item);
-					return [
-						ItemFactory::get(Item::SEEDS, 0, 1)
-					];
-				}
-
-				return [];
 			}
 
-			return parent::getDrops($item);
+			if(mt_rand(0, 24) === 0){
+				return [
+					ItemFactory::get(Item::SEEDS)
+				];
+			}
 		}
 
 		return [];
 	}
-}
+
+	public function getAffectedBlocks() : array{
+		if($this->isValidHalfPlant()){
+			return [$this, $this->getSide(($this->meta & self::BITFLAG_TOP) !== 0 ? Vector3::SIDE_DOWN : Vector3::SIDE_UP)];
+		}
+
+		return parent::getAffectedBlocks();
+	}
+}

src/pocketmine/block/DoubleSlab.php

@@ -35,13 +35,16 @@ abstract class DoubleSlab extends Solid{
 	abstract public function getSlabId() : int;
 
 	public function getName() : string{
-		return "Double " . BlockFactory::get($this->getSlabId(), $this->getVariant())->getName() . " Slab";
+		return "Double " . BlockFactory::get($this->getSlabId(), $this->getVariant())->getName();
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
 			ItemFactory::get($this->getSlabId(), $this->getVariant(), 2)
 		];
 	}
 
-}
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
+}

src/pocketmine/block/DoubleStoneSlab.php

@@ -23,8 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class DoubleStoneSlab extends DoubleSlab{
 
@@ -39,15 +38,10 @@ class DoubleStoneSlab extends DoubleSlab{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getToolHarvestLevel() : int{
-		if($item->isPickaxe() >= Tool::TIER_WOODEN){
+		return TieredTool::TIER_WOODEN;
-			return parent::getDrops($item);
-		}
-
-		return [];
 	}
-
+}
-}

src/pocketmine/block/DoubleStoneSlab2.php

@@ -30,5 +30,4 @@ class DoubleStoneSlab2 extends DoubleStoneSlab{
 	public function getSlabId() : int{
 		return self::STONE_SLAB2;
 	}
-
+}
-}

src/pocketmine/block/DoubleWoodenSlab.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
-
 class DoubleWoodenSlab extends DoubleSlab{
 
 	protected $id = self::DOUBLE_WOODEN_SLAB;
@@ -38,6 +36,14 @@ class DoubleWoodenSlab extends DoubleSlab{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
-}
+
+	public function getFlameEncouragement() : int{
+		return 5;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
+}

src/pocketmine/block/Emerald.php

@@ -23,8 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Emerald extends Solid{
 
@@ -39,18 +38,14 @@ class Emerald extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_IRON;
 	}
 
 	public function getName() : string{
 		return "Emerald Block";
 	}
-
+}
-	public function getDrops(Item $item) : array{
-		if($item->isPickaxe() >= Tool::TIER_IRON){
-			return parent::getDrops($item);
-		}
-
-		return [];
-	}
-}

src/pocketmine/block/EmeraldOre.php

@@ -25,7 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
+use pocketmine\item\TieredTool;
 
 class EmeraldOre extends Solid{
 
@@ -40,20 +40,24 @@ class EmeraldOre extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_IRON;
 	}
 
 	public function getHardness() : float{
 		return 3;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
-		if($item->isPickaxe() >= Tool::TIER_IRON){
+		return [
-			return [
+			ItemFactory::get(Item::EMERALD)
-				ItemFactory::get(Item::EMERALD, 0, 1)
+		];
-			];
-		}
-
-		return [];
 	}
-}
+
+	protected function getXpDropAmount() : int{
+		return mt_rand(3, 7);
+	}
+}

src/pocketmine/block/EnchantingTable.php

@@ -25,7 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\inventory\EnchantInventory;
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
+use pocketmine\item\TieredTool;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\tile\EnchantTable as TileEnchantTable;
@@ -60,7 +60,11 @@ class EnchantingTable extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function onActivate(Item $item, Player $player = null) : bool{
@@ -72,12 +76,4 @@ class EnchantingTable extends Transparent{
 
 		return true;
 	}
-
+}
-	public function getDrops(Item $item) : array{
-		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return parent::getDrops($item);
-		}
-
-		return [];
-	}
-}

src/pocketmine/block/EndPortalFrame.php

@@ -65,4 +65,4 @@ class EndPortalFrame extends Solid{
 			$this->z + 1
 		);
 	}
-}
+}

src/pocketmine/block/EndRod.php

@@ -101,4 +101,4 @@ class EndRod extends Flowable{
 	public function getVariantBitmask() : int{
 		return 0;
 	}
-}
+}

src/pocketmine/block/EndStone.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
+use pocketmine\item\TieredTool;
 
 class EndStone extends Solid{
 
@@ -38,10 +38,14 @@ class EndStone extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function getHardness() : float{
 		return 3;
 	}
-}
+}

src/pocketmine/block/EndStoneBricks.php

@@ -23,8 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class EndStoneBricks extends Solid{
 
@@ -43,15 +42,10 @@ class EndStoneBricks extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getToolHarvestLevel() : int{
-		if($item->isPickaxe() >= Tool::TIER_WOODEN){
+		return TieredTool::TIER_WOODEN;
-			return parent::getDrops($item);
-		}
-
-		return [];
 	}
-
+}
-}

src/pocketmine/block/EnderChest.php

@@ -25,7 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
+use pocketmine\item\TieredTool;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\tile\EnderChest as TileEnderChest;
@@ -52,7 +52,11 @@ class EnderChest extends Chest{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
@@ -71,10 +75,6 @@ class EnderChest extends Chest{
 		return true;
 	}
 
-	public function onBreak(Item $item, Player $player = null) : bool{
-		return Block::onBreak($item, $player);
-	}
-
 	public function onActivate(Item $item, Player $player = null) : bool{
 		if($player instanceof Player){
 
@@ -97,16 +97,13 @@ class EnderChest extends Chest{
 		return true;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
-		if($item->isPickaxe() >= Tool::TIER_WOODEN){
+		return [
-			return [ItemFactory::get(Item::OBSIDIAN, 0, 8)];
+			ItemFactory::get(Item::OBSIDIAN, 0, 8)
-		}
+		];
-
-		return [];
 	}
 
 	public function getFuelTime() : int{
 		return 0;
 	}
-
+}
-}

src/pocketmine/block/Fallable.php

@@ -24,26 +24,23 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 
 abstract class Fallable extends Solid{
 
-	public function onUpdate(int $type){
+	public function onNearbyBlockChange() : void{
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+		$down = $this->getSide(Vector3::SIDE_DOWN);
-			$down = $this->getSide(Vector3::SIDE_DOWN);
+		if($down->getId() === self::AIR or $down instanceof Liquid or $down instanceof Fire){
-			if($down->getId() === self::AIR or $down instanceof Liquid or $down instanceof Fire){
+			$this->level->setBlock($this, BlockFactory::get(Block::AIR), true);
-				$this->level->setBlock($this, BlockFactory::get(Block::AIR), true);
 
-				$nbt = Entity::createBaseNBT($this->add(0.5, 0, 0.5));
+			$nbt = Entity::createBaseNBT($this->add(0.5, 0, 0.5));
-				$nbt->setInt("TileID", $this->getId());
+			$nbt->setInt("TileID", $this->getId());
-				$nbt->setByte("Data", $this->getDamage());
+			$nbt->setByte("Data", $this->getDamage());
 
-				$fall = Entity::createEntity("FallingSand", $this->getLevel(), $nbt);
+			$fall = Entity::createEntity("FallingSand", $this->getLevel(), $nbt);
 
-				if($fall !== null){
+			if($fall !== null){
-					$fall->spawnToAll();
+				$fall->spawnToAll();
-				}
 			}
 		}
 	}
@@ -54,4 +51,4 @@ abstract class Fallable extends Solid{
 	public function tickFalling() : ?Block{
 		return null;
 	}
-}
+}

src/pocketmine/block/Farmland.php

@@ -25,8 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 
@@ -47,12 +45,9 @@ class Farmland extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
 
 	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 		return new AxisAlignedBB(
@@ -65,29 +60,28 @@ class Farmland extends Transparent{
 		);
 	}
 
-	public function onUpdate(int $type){
+	public function onNearbyBlockChange() : void{
-		if($type === Level::BLOCK_UPDATE_NORMAL and $this->getSide(Vector3::SIDE_UP)->isSolid()){
+		if($this->getSide(Vector3::SIDE_UP)->isSolid()){
 			$this->level->setBlock($this, BlockFactory::get(Block::DIRT), true);
-			return $type;
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if(!$this->canHydrate()){
-				if($this->meta > 0){
-					$this->meta--;
-					$this->level->setBlock($this, $this, false, false);
-				}else{
-					$this->level->setBlock($this, BlockFactory::get(Block::DIRT), false, true);
-				}
-
-				return $type;
-			}elseif($this->meta < 7){
-				$this->meta = 7;
-				$this->level->setBlock($this, $this, false, false);
-
-				return $type;
-			}
 		}
+	}
 
-		return false;
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
+		if(!$this->canHydrate()){
+			if($this->meta > 0){
+				$this->meta--;
+				$this->level->setBlock($this, $this, false, false);
+			}else{
+				$this->level->setBlock($this, BlockFactory::get(Block::DIRT), false, true);
+			}
+		}elseif($this->meta < 7){
+			$this->meta = 7;
+			$this->level->setBlock($this, $this, false, false);
+		}
 	}
 
 	protected function canHydrate() : bool{
@@ -108,9 +102,13 @@ class Farmland extends Transparent{
 		return false;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			ItemFactory::get(Item::DIRT, 0, 1)
+			ItemFactory::get(Item::DIRT)
 		];
 	}
-}
+
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
+}

src/pocketmine/block/Fence.php

@@ -105,5 +105,4 @@ abstract class Fence extends Transparent{
 	public function canConnect(Block $block){
 		return $block instanceof static or $block instanceof FenceGate or ($block->isSolid() and !$block->isTransparent());
 	}
-
 }

src/pocketmine/block/FenceGate.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
 use pocketmine\level\sound\DoorSound;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -37,7 +36,7 @@ class FenceGate extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_AXE;
+		return BlockToolType::TYPE_AXE;
 	}
 
 
@@ -95,4 +94,12 @@ class FenceGate extends Transparent{
 	public function getFuelTime() : int{
 		return 300;
 	}
+
+	public function getFlameEncouragement() : int{
+		return 5;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
 }

src/pocketmine/block/Fire.php

@@ -25,11 +25,11 @@ namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\entity\projectile\Arrow;
+use pocketmine\event\block\BlockBurnEvent;
 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\math\Vector3;
 use pocketmine\Server;
 
@@ -61,10 +61,6 @@ class Fire extends Flowable{
 		return true;
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function onEntityCollide(Entity $entity) : void{
 		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1);
 		$entity->attack($ev);
@@ -79,39 +75,94 @@ class Fire extends Flowable{
 		}
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [];
 	}
 
-	public function onUpdate(int $type){
+	public function onNearbyBlockChange() : void{
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+		if(!$this->getSide(Vector3::SIDE_DOWN)->isSolid() and !$this->hasAdjacentFlammableBlocks()){
-			for($s = 0; $s <= 5; ++$s){
-				$side = $this->getSide($s);
-				if($side->getId() !== self::AIR and !($side instanceof Liquid)){
-					return false;
-				}
-			}
 			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
+		}else{
+			$this->level->scheduleDelayedBlockUpdate($this, mt_rand(30, 40));
+		}
+	}
 
-			return Level::BLOCK_UPDATE_NORMAL;
+	public function ticksRandomly() : bool{
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
+		return true;
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::NETHERRACK){
+	}
-				if(mt_rand(0, 2) === 0){
-					if($this->meta === 0x0F){
-						$this->level->setBlock($this, BlockFactory::get(Block::AIR));
-					}else{
-						$this->meta++;
-						$this->level->setBlock($this, $this);
-					}
 
-					return Level::BLOCK_UPDATE_NORMAL;
+	public function onRandomTick() : void{
+		$down = $this->getSide(Vector3::SIDE_DOWN);
+
+		$result = null;
+		if($this->meta < 15 and mt_rand(0, 2) === 0){
+			$this->meta++;
+			$result = $this;
+		}
+		$canSpread = true;
+
+		if(!$down->burnsForever()){
+			//TODO: check rain
+			if($this->meta === 15){
+				if(!$down->isFlammable() and mt_rand(0, 3) === 3){ //1/4 chance to extinguish
+					$canSpread = false;
+					$result = BlockFactory::get(Block::AIR);
+				}
+			}elseif(!$this->hasAdjacentFlammableBlocks()){
+				$canSpread = false;
+				if(!$down->isSolid() or $this->meta > 3){ //fire older than 3, or without a solid block below
+					$result = BlockFactory::get(Block::AIR);
 				}
 			}
+		}
+
+		if($result !== null){
+			$this->level->setBlock($this, $result);
+		}
+
+		$this->level->scheduleDelayedBlockUpdate($this, mt_rand(30, 40));
+
+		if($canSpread){
+			//TODO: raise upper bound for chance in humid biomes
+
+			foreach($this->getHorizontalSides() as $side){
+				$this->burnBlock($side, 300);
+			}
+
+			//vanilla uses a 250 upper bound here, but I don't think they intended to increase the chance of incineration
+			$this->burnBlock($this->getSide(Vector3::SIDE_UP), 350);
+			$this->burnBlock($this->getSide(Vector3::SIDE_DOWN), 350);
 
 			//TODO: fire spread
 		}
+	}
+
+	public function onScheduledUpdate() : void{
+		$this->onRandomTick();
+	}
+
+	private function hasAdjacentFlammableBlocks() : bool{
+		for($i = 0; $i <= 5; ++$i){
+			if($this->getSide($i)->isFlammable()){
+				return true;
+			}
+		}
 
 		return false;
 	}
 
-}
+	private function burnBlock(Block $block, int $chanceBound) : void{
+		if(mt_rand(0, $chanceBound) < $block->getFlammability()){
+			$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockBurnEvent($block, $this));
+			if(!$ev->isCancelled()){
+				$block->onIncinerate();
+
+				if(mt_rand(0, $this->meta + 9) < 5){ //TODO: check rain
+					$this->level->setBlock($block, BlockFactory::get(Block::FIRE, min(15, $this->meta + (mt_rand(0, 4) >> 2))));
+				}else{
+					$this->level->setBlock($block, BlockFactory::get(Block::AIR));
+				}
+			}
+		}
+	}
+}

src/pocketmine/block/Flowable.php

@@ -42,4 +42,4 @@ abstract class Flowable extends Transparent{
 	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 		return null;
 	}
-}
+}

src/pocketmine/block/Flower.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -71,15 +70,17 @@ class Flower extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
+	public function onNearbyBlockChange() : void{
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			$this->getLevel()->useBreakOn($this);
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
 		}
-
-		return false;
 	}
-}
+
+	public function getFlameEncouragement() : int{
+		return 60;
+	}
+
+	public function getFlammability() : int{
+		return 100;
+	}
+}

src/pocketmine/block/FlowerPot.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -68,16 +67,10 @@ class FlowerPot extends Flowable{
 		return true;
 	}
 
-	public function onUpdate(int $type){
+	public function onNearbyBlockChange() : void{
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
+			$this->getLevel()->useBreakOn($this);
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
 		}
-
-		return false;
 	}
 
 	public function onActivate(Item $item, Player $player = null) : bool{
@@ -96,8 +89,12 @@ class FlowerPot extends Flowable{
 		return true;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getVariantBitmask() : int{
-		$items = parent::getDrops($item);
+		return 0;
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		$items = parent::getDropsForCompatibleTool($item);
 
 		$tile = $this->getLevel()->getTile($this);
 		if($tile instanceof TileFlowerPot){
@@ -110,4 +107,7 @@ class FlowerPot extends Flowable{
 		return $items;
 	}
 
-}
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
+}

src/pocketmine/block/Furnace.php

@@ -35,4 +35,4 @@ class Furnace extends BurningFurnace{
 	public function getLightLevel() : int{
 		return 0;
 	}
-}
+}

src/pocketmine/block/Glass.php

@@ -41,7 +41,7 @@ class Glass extends Transparent{
 		return 0.3;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [];
 	}
-}
+}

src/pocketmine/block/GlassPane.php

@@ -41,7 +41,7 @@ class GlassPane extends Thin{
 		return 0.3;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [];
 	}
-}
+}

src/pocketmine/block/GlazedTerracotta.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
+use pocketmine\item\TieredTool;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -36,7 +36,11 @@ class GlazedTerracotta extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
@@ -56,12 +60,4 @@ class GlazedTerracotta extends Solid{
 	public function getVariantBitmask() : int{
 		return 0;
 	}
-
+}
-	public function getDrops(Item $item) : array{
-		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return parent::getDrops($item);
-		}
-
-		return [];
-	}
-}

src/pocketmine/block/GlowingObsidian.php

@@ -24,6 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 
+use pocketmine\item\TieredTool;
+
 class GlowingObsidian extends Solid{
 
 	protected $id = self::GLOWING_OBSIDIAN;
@@ -47,4 +49,12 @@ class GlowingObsidian extends Solid{
 	public function getBlastResistance() : float{
 		return 50;
 	}
-}
+
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_DIAMOND;
+	}
+}

src/pocketmine/block/GlowingRedstoneOre.php

@@ -23,12 +23,15 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\level\Level;
+use pocketmine\item\Item;
+use pocketmine\Player;
 
 class GlowingRedstoneOre extends RedstoneOre{
 
 	protected $id = self::GLOWING_REDSTONE_ORE;
 
+	protected $itemId = self::REDSTONE_ORE;
+
 	public function getName() : string{
 		return "Glowing Redstone Ore";
 	}
@@ -37,13 +40,19 @@ class GlowingRedstoneOre extends RedstoneOre{
 		return 9;
 	}
 
-	public function onUpdate(int $type){
+	public function onActivate(Item $item, Player $player = null) : bool{
-		if($type === Level::BLOCK_UPDATE_SCHEDULED or $type === Level::BLOCK_UPDATE_RANDOM){
-			$this->getLevel()->setBlock($this, BlockFactory::get(Block::REDSTONE_ORE, $this->meta), false, false);
-
-			return Level::BLOCK_UPDATE_WEAK;
-		}
-
 		return false;
 	}
-}
+
+	public function onNearbyBlockChange() : void{
+
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
+		$this->getLevel()->setBlock($this, BlockFactory::get(Block::REDSTONE_ORE, $this->meta), false, false);
+	}
+}

src/pocketmine/block/Glowstone.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 
 class Glowstone extends Transparent{
 
@@ -44,16 +43,16 @@ class Glowstone extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function getLightLevel() : int{
 		return 15;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
 			ItemFactory::get(Item::GLOWSTONE_DUST, 0, mt_rand(2, 4))
 		];
 	}
-}
+}

src/pocketmine/block/Gold.php

@@ -23,8 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Gold extends Solid{
 
@@ -43,14 +42,10 @@ class Gold extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getToolHarvestLevel() : int{
-		if($item->isPickaxe() >= Tool::TIER_IRON){
+		return TieredTool::TIER_IRON;
-			return parent::getDrops($item);
-		}
-
-		return [];
 	}
-}
+}

src/pocketmine/block/GoldOre.php

@@ -23,8 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class GoldOre extends Solid{
 
@@ -43,14 +42,10 @@ class GoldOre extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getToolHarvestLevel() : int{
-		if($item->isPickaxe() >= Tool::TIER_IRON){
+		return TieredTool::TIER_IRON;
-			return parent::getDrops($item);
-		}
-
-		return [];
 	}
-}
+}

src/pocketmine/block/Grass.php

@@ -24,11 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\event\block\BlockSpreadEvent;
+use pocketmine\item\Hoe;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
+use pocketmine\item\Shovel;
 use pocketmine\level\generator\object\TallGrass as TallGrassObject;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\utils\Random;
@@ -50,12 +50,12 @@ class Grass extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			ItemFactory::get(Item::DIRT, 0, 1)
+			ItemFactory::get(Item::DIRT)
 		];
 	}
 
@@ -63,43 +63,35 @@ class Grass extends Solid{
 		return true;
 	}
 
-	public function onUpdate(int $type){
+	public function onRandomTick() : void{
-		if($type === Level::BLOCK_UPDATE_RANDOM){
+		$lightAbove = $this->level->getFullLightAt($this->x, $this->y + 1, $this->z);
-			$lightAbove = $this->level->getFullLightAt($this->x, $this->y + 1, $this->z);
+		if($lightAbove < 4 and BlockFactory::$lightFilter[$this->level->getBlockIdAt($this->x, $this->y + 1, $this->z)] >= 3){ //2 plus 1 standard filter amount
-			if($lightAbove < 4 and BlockFactory::$lightFilter[$this->level->getBlockIdAt($this->x, $this->y + 1, $this->z)] >= 3){ //2 plus 1 standard filter amount
+			//grass dies
-				//grass dies
+			$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($this, $this, BlockFactory::get(Block::DIRT)));
-				$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($this, $this, BlockFactory::get(Block::DIRT)));
+			if(!$ev->isCancelled()){
+				$this->level->setBlock($this, $ev->getNewState(), false, false);
+			}
+		}elseif($lightAbove >= 9){
+			//try grass spread
+			for($i = 0; $i < 4; ++$i){
+				$x = mt_rand($this->x - 1, $this->x + 1);
+				$y = mt_rand($this->y - 3, $this->y + 1);
+				$z = mt_rand($this->z - 1, $this->z + 1);
+				if(
+					$this->level->getBlockIdAt($x, $y, $z) !== Block::DIRT or
+					$this->level->getBlockDataAt($x, $y, $z) === 1 or
+					$this->level->getFullLightAt($x, $y + 1, $z) < 4 or
+					BlockFactory::$lightFilter[$this->level->getBlockIdAt($x, $y + 1, $z)] >= 3
+				){
+					continue;
+				}
+
+				$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($b = $this->level->getBlockAt($x, $y, $z), $this, BlockFactory::get(Block::GRASS)));
 				if(!$ev->isCancelled()){
-					$this->level->setBlock($this, $ev->getNewState(), false, false);
+					$this->level->setBlock($b, $ev->getNewState(), false, false);
 				}
-
-				return Level::BLOCK_UPDATE_RANDOM;
-			}elseif($lightAbove >= 9){
-				//try grass spread
-				for($i = 0; $i < 4; ++$i){
-					$x = mt_rand($this->x - 1, $this->x + 1);
-					$y = mt_rand($this->y - 3, $this->y + 1);
-					$z = mt_rand($this->z - 1, $this->z + 1);
-					if(
-						$this->level->getBlockIdAt($x, $y, $z) !== Block::DIRT or
-						$this->level->getBlockDataAt($x, $y, $z) === 1 or
-						$this->level->getFullLightAt($x, $y + 1, $z) < 4 or
-						BlockFactory::$lightFilter[$this->level->getBlockIdAt($x, $y + 1, $z)] >= 3
-					){
-						continue;
-					}
-
-					$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($b = $this->level->getBlockAt($x, $y, $z), $this, BlockFactory::get(Block::GRASS)));
-					if(!$ev->isCancelled()){
-						$this->level->setBlock($b, $ev->getNewState(), false, false);
-					}
-				}
-
-				return Level::BLOCK_UPDATE_RANDOM;
 			}
 		}
-
-		return false;
 	}
 
 	public function onActivate(Item $item, Player $player = null) : bool{
@@ -108,13 +100,13 @@ class Grass extends Solid{
 			TallGrassObject::growGrass($this->getLevel(), $this, new Random(mt_rand()), 8, 2);
 
 			return true;
-		}elseif($item->isHoe()){
+		}elseif($item instanceof Hoe){
-			$item->useOn($this);
+			$item->applyDamage(1);
 			$this->getLevel()->setBlock($this, BlockFactory::get(Block::FARMLAND));
 
 			return true;
-		}elseif($item->isShovel() and $this->getSide(Vector3::SIDE_UP)->getId() === Block::AIR){
+		}elseif($item instanceof Shovel and $this->getSide(Vector3::SIDE_UP)->getId() === Block::AIR){
-			$item->useOn($this);
+			$item->applyDamage(1);
 			$this->getLevel()->setBlock($this, BlockFactory::get(Block::GRASS_PATH));
 
 			return true;

src/pocketmine/block/GrassPath.php

@@ -25,8 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 
@@ -43,7 +41,7 @@ class GrassPath extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
 	protected function recalculateBoundingBox() : ?AxisAlignedBB{
@@ -61,18 +59,15 @@ class GrassPath extends Transparent{
 		return 0.6;
 	}
 
-	public function onUpdate(int $type){
+	public function onNearbyBlockChange() : void{
-		if($type === Level::BLOCK_UPDATE_NORMAL and $this->getSide(Vector3::SIDE_UP)->isSolid()){
+		if($this->getSide(Vector3::SIDE_UP)->isSolid()){
 			$this->level->setBlock($this, BlockFactory::get(Block::DIRT), true);
-			return $type;
 		}
-
-		return false;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			ItemFactory::get(Item::DIRT, 0, 1)
+			ItemFactory::get(Item::DIRT)
 		];
 	}
-}
+}

src/pocketmine/block/Gravel.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\item\Tool;
 
 class Gravel extends Fallable{
 
@@ -44,17 +43,16 @@ class Gravel extends Fallable{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_SHOVEL;
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		if(mt_rand(1, 10) === 1){
 			return [
-				ItemFactory::get(Item::FLINT, 0, 1)
+				ItemFactory::get(Item::FLINT)
 			];
 		}
 
-		return parent::getDrops($item);
+		return parent::getDropsForCompatibleTool($item);
 	}
-
+}
-}

src/pocketmine/block/HardenedClay.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Tool;
+use pocketmine\item\TieredTool;
 
 class HardenedClay extends Solid{
 
@@ -38,10 +38,14 @@ class HardenedClay extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function getHardness() : float{
 		return 1.25;
 	}
-}
+}

src/pocketmine/block/HayBale.php

@@ -54,4 +54,12 @@ class HayBale extends Solid{
 	public function getVariantBitmask() : int{
 		return 0x03;
 	}
-}
+
+	public function getFlameEncouragement() : int{
+		return 60;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
+}

src/pocketmine/block/Ice.php

@@ -23,9 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\item\enchantment\Enchantment;
 use pocketmine\item\Item;
-use pocketmine\item\Tool;
-use pocketmine\level\Level;
 use pocketmine\Player;
 
 class Ice extends Transparent{
@@ -53,29 +52,27 @@ class Ice extends Transparent{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
 	public function onBreak(Item $item, Player $player = null) : bool{
-		return $this->getLevel()->setBlock($this, BlockFactory::get(Block::WATER), true);
+		if(!$item->hasEnchantment(Enchantment::SILK_TOUCH)){
+			return $this->getLevel()->setBlock($this, BlockFactory::get(Block::WATER), true);
+		}
+		return parent::onBreak($item, $player);
 	}
 
 	public function ticksRandomly() : bool{
 		return true;
 	}
 
-	public function onUpdate(int $type){
+	public function onRandomTick() : void{
-		if($type === Level::BLOCK_UPDATE_RANDOM){
+		if($this->level->getHighestAdjacentBlockLight($this->x, $this->y, $this->z) >= 12){
-			if($this->level->getHighestAdjacentBlockLight($this->x, $this->y, $this->z) >= 12){
+			$this->level->useBreakOn($this);
-				$this->level->useBreakOn($this);
-
-				return $type;
-			}
 		}
-		return false;
 	}
 
-	public function getDrops(Item $item) : array{
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [];
 	}
-}
+}

src/pocketmine/block/Iron.php

@@ -23,8 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class Iron extends Solid{
 
@@ -39,18 +38,14 @@ class Iron extends Solid{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_STONE;
 	}
 
 	public function getHardness() : float{
 		return 5;
 	}
-
+}
-	public function getDrops(Item $item) : array{
-		if($item->isPickaxe() >= Tool::TIER_STONE){
-			return parent::getDrops($item);
-		}
-
-		return [];
-	}
-}

src/pocketmine/block/IronBars.php

@@ -23,8 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
-use pocketmine\item\Tool;
 
 class IronBars extends Thin{
 
@@ -43,20 +42,14 @@ class IronBars extends Thin{
 	}
 
 	public function getToolType() : int{
-		return Tool::TYPE_PICKAXE;
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
 
 	public function getVariantBitmask() : int{
 		return 0;
 	}
-
-	public function getDrops(Item $item) : array{
-		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return parent::getDrops($item);
-		}
-
-		return [];
-	}
-
 }
-