Release 3.4.1

this should have been done a long time ago, but we didn't want to cause compatibility problems with CA. Now it enforces version checks, this isn't a problem anymore.

.editorconfig

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

.gitattributes

@@ -6,6 +6,7 @@
 *.properties text eol=lf
 *.bat text eol=crlf
 *.cmd text eol=crlf
+*.ps1 text eol=crlf
 
 # Custom for Visual Studio
 *.cs     diff=csharp

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,48 @@
+### Issue description
+<!---
+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
+
+Any issues requesting updates to new versions of MCPE will be treated as spam.
+Please do not create issues for missing/un-implemented gameplay features - they will be closed.
+-->
+
+<!--- Write a short description about the issue -->
+
+<!--- If you are reporting a regression or unexpected behaviour, please include the below information: -->
+- Expected result: What were you expecting to happen?
+- Actual result: What actually happened?
+
+### Steps to reproduce the issue
+<!--- help us find the problem by adding steps to reproduce the issue -->
+1. ...
+2. ...
+
+### OS and versions
+<!--- use the 'version' command in PocketMine-MP
+
+NOTE: LATEST is not a valid version. PocketMine-MP version should include Jenkins build number and/or git commit hash.
+
+NO support whatsoever will be provided for third-party modified variants of PocketMine-MP. Issues relating to third-party modifications will be closed as spam.
+
+Note that 32-bit platforms are no longer supported by PocketMine-MP and issues concerning 32-bit platforms will be closed.
+-->
+* PocketMine-MP: <!-- LATEST IS NOT A VALID VERSION -->
+* PHP:
+* Server OS:
+* Game version: PE/Win10 (delete as appropriate)
+
+### Plugins
+- Test on a clean server without plugins: is the issue reproducible without any plugins loaded?
+
+If the issue is **not** reproducible without plugins:
+- Have you asked for help on our forums before creating an issue?
+- Can you provide sample, *minimal* reproducing code for the issue? If so, paste it in the bottom section
+- Paste your list of plugins here (use the 'plugins' command in PocketMine-MP)
+
+### 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
+
+* ...

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,40 @@
+## Introduction
+<!-- Explain existing problems or why this pull request is necessary -->
+
+### Relevant issues
+<!-- List relevant issues here -->
+<!--
+
+* Fixes #1
+* Fixes #2
+
+-->
+
+## Changes
+### API changes
+<!-- Any additions to the API that should be documented in release notes? -->
+
+### Behavioural changes
+<!-- Any change in how the server behaves, or its performance? -->
+
+## Backwards compatibility
+<!-- Any possible backwards incompatible changes? How are they solved, or how can they be solved? -->
+
+## Follow-up
+<!-- Suggest any actions to be done before/after merging this pull request -->
+<!--
+
+Requires translations:
+
+| Name | Value in eng.ini |
+| :--: | :---: |
+| `foo.bar` | `Foo bar` |
+
+-->
+
+## Tests
+<!--
+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,16 +1,20 @@
 players/*
 worlds/*
+plugin_data/*
 plugins/*
-bin/*
+bin*/*
 timings/*
+crashdumps/*
 *.log
 *.txt
 *.phar
 server.properties
-pocketmine.yml
+/pocketmine.yml
+memory_dumps/*
+resource_packs/
 
 # Common IDEs
-.idea/*
+.idea/
 nbproject/*
 
 # Windows image file caches
@@ -26,3 +30,12 @@ Desktop.ini
 # Sphinx-doc
 /docs/build/
 !/docs/requirements.txt
+
+# Composer
+vendor/*
+
+# Travis files
+test_data/*
+
+# Doxygen
+Documentation/*

.gitmodules

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

.mailmap

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

.travis.yml

@@ -1,21 +1,24 @@
 language: php
 
 php:
- - 5.6
-
-branches:
- - master
+ - 7.2
 
 before_script:
- - mkdir plugins
- - wget -O plugins/DevTools.phar https://github.com/PocketMine/DevTools/releases/download/v1.9.0/DevTools_v1.9.0.phar
- - pecl install channel://pecl.php.net/pthreads-2.0.10
- - pecl install channel://pecl.php.net/weakref-0.2.6
- - echo | pecl install channel://pecl.php.net/yaml-1.1.1
+# - 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/pmmp/pthreads.git
+ - cd pthreads
+ - git checkout c8cfacda84f21032d6014b53e72bf345ac901dac
+ - phpize
+ - ./configure
+ - make
+ - make install
+ - cd ..
+ - echo "extension=pthreads.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+ - composer install
 
 script:
- - php tests/TravisTest.php
- 
+ - ./tests/travis.sh -t4
+
 notifications:
  email: false
- #webhooks: http://n.tkte.ch/h/214/wsNvmG43-ncxUVRrFPwSM-r0

CONTRIBUTING.md

@@ -2,63 +2,100 @@
 
 # PocketMine-MP Contribution Guidelines
 
-You must follow these guidelines if you wish to contribute to the PocketMine-MP code base, or participate in issue tracking.
-
-## I have a question
-* For questions, please refer to the _#pocketmine_ or _#mcpedevs_ IRC channel on Freenode. There is a [WebIRC](http://webchat.freenode.net?channels=pocketmine,mcpedevs&uio=d4) if you want.
-* You can ask directly to _[@PocketMine](https://twitter.com/PocketMine)_ in Twitter, but don't expect an immediate reply.
-* You may use our [Forum](http://forums.pocketmine.net) to ask questions.
-* We do not accept questions or support requests in our issue tracker.
 
 ## Creating an Issue
- - First, use the [Issue Search](https://github.com/PocketMine/PocketMine-MP/search?ref=cmdform&type=Issues) to check if anyone has reported it.
- - If your issue is related to a plugin, you must contact their original author instead of reporting it here.
- - If your issue is related to a PocketMine official plugin, or our Android application, you must create an issue on that specific repository.
- - **Support requests are not bugs.** Issues such as "How do I do this" are not bugs and are closed as soon as a collaborator spots it. They are referred to our Forum to seek assistance.
- - **No generic titles** such as "Question", "Help", "Crash Report" etc. If an issue has a generic title they will either be closed on the spot, or a collaborator will edit it to describe the actual symptom.
- - Information must be provided in the issue body, not in the title. No tags are allowed in the title, and do not change the title if the issue has been solved.
- - Similarly, no generic issue reports. It is the issue submitter's responsibility to provide us an issue that is **trackable, debuggable, reproducible, reported professionally and is an actual bug**. If you do not provide us with a summary or instructions on how to reproduce the issue, it is a support request until the actual bug has been found and therefore the issue is closed.
+- If you are reporting a bug:
+  - **make sure that you are using the latest supported version** before opening an issue.
+  - **test it on a clean test server, WITHOUT PLUGINS**, to see if the issue still occurs. If not then it may be a plugin issue. Please also indicate the result of such tests.
+- **[Search the issue tracker](https://github.com/pmmp/PocketMine-MP/issues?utf8=%E2%9C%93&q=is%3Aissue)** to check if anyone has already reported it, to avoid needlessly creating duplicate issues. Make sure you also check closed issues, as an issue you think is valid may already have been resolved.
+- **Do not report plugin issues here.** If your issue is related to a plugin, 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.
+- **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).
+<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>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
+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.
+
+### Licensing
+By proposing a pull request to the project, you agree to your code being distributed within PocketMine-MP under the [LGPL license](LICENSE).
+
+### 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**.
+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.**
+
+### Pull requests
+- **Create a new branch for each pull request.** Do not create a pull request with commits that exist in another pull request.
+- **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.
+- **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.
+- **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.
 
-## Contributing Code
-* Use the [Pull Request](https://github.com/PocketMine/PocketMine-MP/pull/new) system, your request will be checked and discussed.
-* __Create a single branch for that pull request__
-* Code using the syntax as in PocketMine-MP. See below for an example.
-* The code must be clear and written in English, comments included.
-* Use descriptive commit titles
-* __No merge commits are allowed, or multiple features per pull request__
 
 **Thanks for contributing to PocketMine-MP!**
 
+
+
 ### Code Syntax
 
 It is mainly [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-1-basic-coding-standard.md) with a few exceptions.
-* Opening braces MUST go on the same line, and MUST NOT have spaces before.
-* `else if` MUST be written as `elseif`. _(It is in PSR-2, but using a SHOULD)_
-* Control structure keywords or opening braces MUST NOT have one space after them.
-* Code MUST use tabs for indenting.
-* Long arrays MAY be split across multiple lines, where each subsequent line is indented once. 
-* Files MUST use only the `<?php` tag.
-* Files MUST NOT have an ending `?>` tag.
-* Code MUST use namespaces.
-* Strings SHOULD use the double quote `"` except when the single quote is required.
-* Argument lists MAY NOT be split across multiple lines, except long arrays.
+
+- Opening braces MUST go on the same line, and MUST NOT have spaces before.
+- `else if` MUST be written as `elseif`. _(It is in PSR-2, but using a SHOULD)_
+- Control structure keywords or opening braces MUST NOT have one space before or after them.
+- Code MUST use tabs for indenting.
+- Long arrays MAY be split across multiple lines, where each subsequent line is indented once.
+- Files MUST use only the `<?php` tag.
+- Files MUST NOT have an ending `?>` tag.
+- Code MUST use namespaces.
+- Strings SHOULD use the double quote `"` except when the single quote is required.
+- All code SHOULD have parameter and type declarations where possible.
+- Strict types SHOULD be enabled on new files where it is sensible to do so.
+- All constant declarations SHOULD be preceded by a visibility modifier.
 
 ```php
-<?php 
+<?php
+
+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;
-	
-	public function __construct($firstArgument, &$secondArgument = null){
-		if($firstArgument === "exampleValue"){ //Remember to use === instead == when possible
+
+	/**
+	 * Creates an instance of ExampleClass
+	 *
+	 * @param string      $firstArgument  the first argument
+	 * @param string|null $secondArgument default null
+	 */
+	public function __construct(string $firstArgument, ?string &$secondArgument = null){
+		if($firstArgument === "exampleValue"){ //Remember to use === instead of == when possible
 			//do things
 		}elseif($firstArgument === "otherValue"){
 			$secondArgument = function(){
-				return [
+				$this->examplePrivateVariable = [
 					0 => "value1",
 					1 => "value2",
 					2 => "value3",
@@ -66,13 +103,17 @@ class ExampleClass{
 					4 => "value5",
 					5 => "value6",
 				];
-			}
+			};
 		}
 	}
 
+	public function doStuff(string $stuff) : string{
+		return $stuff;
+	}
 }
 ```
 
+<!-- TODO: RFC and voting on the forums instead -->
 ### RFC and Voting
 * These are big Pull Requests or contributions that change important behavior.
 * RFCs will be tagged with the *PR: RFC* label
@@ -83,58 +124,3 @@ class ExampleClass{
 * An RFC will be rejected if less than 50% + 1 (simple majority) has voted Yes.
 * If the RFC is approved, Team Members have the final word on its implementation or rejection.
 * RFCs with complex voting options will specify the vote percentage or other details.
-
-
-## Bug Tracking for Collaborators
-
-### Labels
-To provide a concise bug tracking environment, prevent the issue tracker from over flowing and to keep support requests out of the bug tracker, PocketMine-MP uses a label scheme a bit different from the default GitHub Issues labels.
-
-PocketMine-MP uses GitHub Issues Labels. There are a total of 12 labels.
-
-Note: For future reference, labels must not be longer than 15 letters.
-
-#### Categories
-Category labels are prefixed by `C:`. Multiple category labels may be applied to a single issue(but try to keep this to a minimum and do not overuse category labels).
- - C: Core - This label is applied when the bug results in a fatal crash, or is related to neither Gameplay nor Plugin API.
- - C: Gameplay - This label is applied when the bug effects the gameplay.
- - C: API - This label is applied when the bug effects the Plugin API.
-
-#### Pull Requests
-Pull Requests are prefixed by `PR:`. Only one label may be applied for a Pull Request.
- - PR: Bug Fix - This label is applied when the Pull Request fixes a bug. 
- - PR: Contribution - This label is applied when the Pull Request contributes code to PocketMine-MP such as a new feature or an improvement.
- - PR: RFC - Request for Comments
-
-#### Status
-Status labels show the status of the issue. Multiple status labels may be applied.
- - Reproduced - This label is applied when the bug has been reproduced, or multiple people are reporting the same issue and symptoms in which case it is automatically assumed that the bug has been reproduced in different environments.
- - Debugged - This label is applied when the cause of the bug has been found.
- - Priority - This label is applied when the bug is easy to fix, or if the scale of the bug is global.
- - Won't Fix - This label is applied if the bug has been decided not be fixed for some reason. e.g. when the bug benefits gameplay. *This label may only be applied to a closed issue.*
-
-#### Miscellaneous
-Miscellaneous labels are labels that show status not related to debugging that bug. The To-Do label and the Mojang label may not be applied to a single issue at the same time.
- - To-Do - This label is applied when the issue is not a bug, but a feature request or a list of features to be implemented that count towards a milestone.
- - Mojang - This label is applied when the issue is suspected of being caused by the Minecraft: Pocket Edition client, but has not been confirmed.
- - Invalid - This label is applied when the issue is reporting a false bug that works as intended, a support request, etc. *This label may only be applied to a closed issue.*
-
-### Closing Issues
-To keep the bug tracker clear of non-related issues and to prevent it from overflowing, **issues must be closed as soon as possible** (This may sound unethical, but it is MUCH better than having the BUG TRACKER filled with SUPPORT REQUESTS and "I NEED HELP").
-
-If an issue does not conform to the "Creating an Issue" guidelines above, the issue should be closed.
-
-### Milestones
-PocketMine-MP uses GitHub Milestones to set a goal for a new release. A milestone is set on the following occasions.
-
- - A new Beta release
- - A new Stable release
-
-A milestone must use the following format:
-```
-Alpha_<version_number> [release_title][release_version]
-```
-For example:
-```
-Alpha_1.4 beta2
-```

README.md

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

composer.json

@@ -0,0 +1,71 @@
+{
+   "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.0",
+      "php-64bit": "*",
+      "ext-bcmath": "*",
+      "ext-curl": "*",
+      "ext-ctype": "*",
+      "ext-date": "*",
+      "ext-hash": "*",
+      "ext-json": "*",
+      "ext-mbstring": "*",
+      "ext-openssl": "*",
+      "ext-pcre": "*",
+      "ext-phar": "*",
+      "ext-pthreads": ">=3.1.7dev",
+      "ext-reflection": "*",
+      "ext-sockets": "*",
+      "ext-spl": "*",
+      "ext-yaml": ">=2.0.0",
+      "ext-zip": "*",
+      "ext-zlib": ">=1.2.11",
+      "pocketmine/raklib": "^0.12.0",
+      "pocketmine/spl": "^0.3.0",
+      "pocketmine/binaryutils": "^0.1.0",
+      "pocketmine/nbt": "^0.2.1",
+      "pocketmine/math": "^0.2.0",
+      "pocketmine/snooze": "^0.1.0",
+      "daverandom/callback-validator": "dev-master"
+   },
+   "autoload": {
+      "psr-4": {
+         "": ["src"]
+      }
+   },
+   "autoload-dev": {
+      "psr-4": {
+         "pocketmine\\": "tests/phpunit/"
+      }
+   },
+   "repositories": [
+      {
+         "type": "vcs",
+         "url": "https://github.com/pmmp/RakLib"
+      },
+      {
+         "type": "vcs",
+         "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

@@ -0,0 +1,297 @@
+{
+    "_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#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "2d120a3dd7d68958809c3662d1cb7c99",
+    "packages": [
+        {
+            "name": "daverandom/callback-validator",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/DaveRandom/CallbackValidator.git",
+                "reference": "d87a08cddbc6099816ed01e50ce25cdfc43b542f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/DaveRandom/CallbackValidator/zipball/d87a08cddbc6099816ed01e50ce25cdfc43b542f",
+                "reference": "d87a08cddbc6099816ed01e50ce25cdfc43b542f",
+                "shasum": ""
+            },
+            "require": {
+                "ext-reflection": "*",
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DaveRandom\\CallbackValidator\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Wright",
+                    "email": "cw@daverandom.com"
+                }
+            ],
+            "description": "Tools for validating callback signatures",
+            "time": "2017-04-03T15:22:41+00:00"
+        },
+        {
+            "name": "pocketmine/binaryutils",
+            "version": "0.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/BinaryUtils.git",
+                "reference": "54efeb978be0ff9335022729fe63c1e2077bf1be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/54efeb978be0ff9335022729fe63c1e2077bf1be",
+                "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.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/NBT.git",
+                "reference": "291bf5cc2a94500eada1edbda51d15bed25a1e1c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/NBT/zipball/291bf5cc2a94500eada1edbda51d15bed25a1e1c",
+                "reference": "291bf5cc2a94500eada1edbda51d15bed25a1e1c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-zlib": "*",
+                "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.3",
+                "issues": "https://github.com/pmmp/NBT/issues"
+            },
+            "time": "2018-12-03T16:08:28+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.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/SPL.git",
+                "reference": "7fd53857cd000491ba69e8db865792a024dd2c49"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/SPL/zipball/7fd53857cd000491ba69e8db865792a024dd2c49",
+                "reference": "7fd53857cd000491ba69e8db865792a024dd2c49",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "exclude-from-classmap": [
+                    "stubs"
+                ],
+                "classmap": [
+                    "./"
+                ]
+            },
+            "license": [
+                "LGPL-3.0"
+            ],
+            "description": "Standard library files required by PocketMine-MP and related projects",
+            "support": {
+                "source": "https://github.com/pmmp/SPL/tree/master"
+            },
+            "time": "2018-08-12T15:17:39+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": {
+        "ext-pthreads": 20,
+        "daverandom/callback-validator": 20
+    },
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=7.2.0",
+        "php-64bit": "*",
+        "ext-bcmath": "*",
+        "ext-curl": "*",
+        "ext-ctype": "*",
+        "ext-date": "*",
+        "ext-hash": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*",
+        "ext-openssl": "*",
+        "ext-pcre": "*",
+        "ext-phar": "*",
+        "ext-pthreads": ">=3.1.7dev",
+        "ext-reflection": "*",
+        "ext-sockets": "*",
+        "ext-spl": "*",
+        "ext-yaml": ">=2.0.0",
+        "ext-zip": "*",
+        "ext-zlib": ">=1.2.11"
+    },
+    "platform-dev": []
+}

src/pocketmine/Achievement.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -14,13 +14,16 @@
  * (at your option) any later version.
  *
  * @author PocketMine Team
-
- * 
+ * @link http://www.pocketmine.net/
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine;
 
+use pocketmine\lang\TranslationContainer;
 use pocketmine\utils\TextFormat;
 
 /**
@@ -38,78 +41,85 @@ abstract class Achievement{
 		"mineWood" => [
 			"name" => "Getting Wood",
 			"requires" => [ //"openInventory",
-			],
+			]
 		],
 		"buildWorkBench" => [
 			"name" => "Benchmarking",
 			"requires" => [
-				"mineWood",
-			],
+				"mineWood"
+			]
 		],
 		"buildPickaxe" => [
 			"name" => "Time to Mine!",
 			"requires" => [
-				"buildWorkBench",
-			],
+				"buildWorkBench"
+			]
 		],
 		"buildFurnace" => [
 			"name" => "Hot Topic",
 			"requires" => [
-				"buildPickaxe",
-			],
+				"buildPickaxe"
+			]
 		],
 		"acquireIron" => [
 			"name" => "Acquire hardware",
 			"requires" => [
-				"buildFurnace",
-			],
+				"buildFurnace"
+			]
 		],
 		"buildHoe" => [
 			"name" => "Time to Farm!",
 			"requires" => [
-				"buildWorkBench",
-			],
+				"buildWorkBench"
+			]
 		],
 		"makeBread" => [
 			"name" => "Bake Bread",
 			"requires" => [
-				"buildHoe",
-			],
+				"buildHoe"
+			]
 		],
 		"bakeCake" => [
 			"name" => "The Lie",
 			"requires" => [
-				"buildHoe",
-			],
+				"buildHoe"
+			]
 		],
 		"buildBetterPickaxe" => [
 			"name" => "Getting an Upgrade",
 			"requires" => [
-				"buildPickaxe",
-			],
+				"buildPickaxe"
+			]
 		],
 		"buildSword" => [
 			"name" => "Time to Strike!",
 			"requires" => [
-				"buildWorkBench",
-			],
+				"buildWorkBench"
+			]
 		],
 		"diamonds" => [
 			"name" => "DIAMONDS!",
 			"requires" => [
-				"acquireIron",
-			],
-		],
+				"acquireIron"
+			]
+		]
 
 	];
 
 
-	public static function broadcast(Player $player, $achievementId){
+	/**
+	 * @param Player $player
+	 * @param string $achievementId
+	 *
+	 * @return bool
+	 */
+	public static function broadcast(Player $player, string $achievementId) : bool{
 		if(isset(Achievement::$list[$achievementId])){
-			if(Server::getInstance()->getConfigString("announce-player-achievements", true) === true){
-				Server::getInstance()->broadcastMessage($player->getDisplayName() . " has just earned the achievement " . TextFormat::GREEN . Achievement::$list[$achievementId]["name"]);
+			$translation = new TranslationContainer("chat.type.achievement", [$player->getDisplayName(), TextFormat::GREEN . Achievement::$list[$achievementId]["name"] . TextFormat::RESET]);
+			if(Server::getInstance()->getConfigBool("announce-player-achievements", true)){
+				Server::getInstance()->broadcastMessage($translation);
 			}else{
-				$player->sendMessage("You have just earned the achievement " . TextFormat::GREEN . Achievement::$list[$achievementId]["name"]);
+				$player->sendMessage($translation);
 			}
 
 			return true;
@@ -118,11 +128,18 @@ abstract class Achievement{
 		return false;
 	}
 
-	public static function add($achievementId, $achievementName, array $requires = []){
+	/**
+	 * @param string $achievementId
+	 * @param string $achievementName
+	 * @param array  $requires
+	 *
+	 * @return bool
+	 */
+	public static function add(string $achievementId, string $achievementName, array $requires = []) : bool{
 		if(!isset(Achievement::$list[$achievementId])){
 			Achievement::$list[$achievementId] = [
 				"name" => $achievementName,
-				"requires" => $requires,
+				"requires" => $requires
 			];
 
 			return true;
@@ -130,6 +147,4 @@ abstract class Achievement{
 
 		return false;
 	}
-
-
 }

src/pocketmine/Collectable.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine;
+
+abstract class Collectable extends \Threaded{
+
+	private $isGarbage = false;
+
+	public function isGarbage() : bool{
+		return $this->isGarbage;
+	}
+
+	public function setGarbage(){
+		$this->isGarbage = true;
+	}
+}

src/pocketmine/CrashDump.php

@@ -14,38 +14,55 @@
  * (at your option) any later version.
  *
  * @author PocketMine Team
-
+ * @link http://www.pocketmine.net/
  *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine;
 
-use pocketmine\network\protocol\Info;
+use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\plugin\PluginBase;
 use pocketmine\plugin\PluginLoadOrder;
+use pocketmine\plugin\PluginManager;
 use pocketmine\utils\Utils;
 use pocketmine\utils\VersionString;
 use raklib\RakLib;
 
 class CrashDump{
 
+	/**
+	 * Crashdump data format version, used by the crash archive to decide how to decode the crashdump
+	 * This should be incremented when backwards incompatible changes are introduced, such as fields being removed or
+	 * having their content changed, version format changing, etc.
+	 * It is not necessary to increase this when adding new fields.
+	 */
+	private const FORMAT_VERSION = 1;
+
 	/** @var Server */
 	private $server;
 	private $fp;
 	private $time;
 	private $data = [];
-	private $encodedData = null;
+	/** @var string */
+	private $encodedData = "";
+	/** @var string */
 	private $path;
 
 	public function __construct(Server $server){
 		$this->time = time();
 		$this->server = $server;
-		$this->path = $this->server->getDataPath() . "CrashDump_" . date("D_M_j-H.i.s-T_Y", $this->time) . ".log";
+		if(!is_dir($this->server->getDataPath() . "crashdumps")){
+			mkdir($this->server->getDataPath() . "crashdumps");
+		}
+		$this->path = $this->server->getDataPath() . "crashdumps/" . date("D_M_j-H.i.s-T_Y", $this->time) . ".log";
 		$this->fp = @fopen($this->path, "wb");
 		if(!is_resource($this->fp)){
 			throw new \RuntimeException("Could not create Crash Dump");
 		}
+		$this->data["format_version"] = self::FORMAT_VERSION;
 		$this->data["time"] = $this->time;
 		$this->addLine($this->server->getName() . " Crash Dump " . date("D M j H:i:s T Y", $this->time));
 		$this->addLine();
@@ -56,9 +73,11 @@ class CrashDump{
 		$this->extraData();
 
 		$this->encodeData();
+
+		fclose($this->fp);
 	}
 
-	public function getPath(){
+	public function getPath() : string{
 		return $this->path;
 	}
 
@@ -66,7 +85,7 @@ class CrashDump{
 		return $this->encodedData;
 	}
 
-	public function getData(){
+	public function getData() : array{
 		return $this->data;
 	}
 
@@ -83,7 +102,7 @@ class CrashDump{
 	}
 
 	private function pluginsData(){
-		if(class_exists("pocketmine\\plugin\\PluginManager", false)){
+		if($this->server->getPluginManager() instanceof PluginManager){
 			$this->addLine();
 			$this->addLine("Loaded plugins:");
 			$this->data["plugins"] = [];
@@ -107,10 +126,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");
@@ -140,7 +159,7 @@ class CrashDump{
 			$error = $lastExceptionError;
 		}else{
 			$error = (array) error_get_last();
-			$error["trace"] = @getTrace(3);
+			$error["trace"] = Utils::getTrace(4); //Skipping CrashDump->baseCrash, CrashDump->construct, Server->crashDump
 			$errorConversion = [
 				E_ERROR => "E_ERROR",
 				E_WARNING => "E_WARNING",
@@ -156,11 +175,11 @@ class CrashDump{
 				E_STRICT => "E_STRICT",
 				E_RECOVERABLE_ERROR => "E_RECOVERABLE_ERROR",
 				E_DEPRECATED => "E_DEPRECATED",
-				E_USER_DEPRECATED => "E_USER_DEPRECATED",
+				E_USER_DEPRECATED => "E_USER_DEPRECATED"
 			];
 			$error["fullFile"] = $error["file"];
-			$error["file"] = cleanPath($error["file"]);
-			$error["type"] = isset($errorConversion[$error["type"]]) ? $errorConversion[$error["type"]] : $error["type"];
+			$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);
 			}
@@ -178,7 +197,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;
@@ -187,7 +206,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());
@@ -202,11 +221,11 @@ class CrashDump{
 		$this->addLine("Code:");
 		$this->data["code"] = [];
 
-		if($this->server->getProperty("auto-report.send-code", true) !== false){
+		if($this->server->getProperty("auto-report.send-code", true) !== false and file_exists($error["fullFile"])){
 			$file = @file($error["fullFile"], FILE_IGNORE_NEW_LINES);
-			for($l = max(0, $error["line"] - 10); $l < $error["line"] + 10; ++$l){
-				$this->addLine("[" . ($l + 1) . "] " . @$file[$l]);
-				$this->data["code"][$l + 1] = @$file[$l];
+			for($l = max(0, $error["line"] - 10); $l < $error["line"] + 10 and isset($file[$l]); ++$l){
+				$this->addLine("[" . ($l + 1) . "] " . $file[$l]);
+				$this->data["code"][$l + 1] = $file[$l];
 			}
 		}
 
@@ -219,12 +238,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"]["version"] = $version->get(false);
-		$this->data["general"]["build"] = $version->getBuild();
-		$this->data["general"]["protocol"] = Info::CURRENT_PROTOCOL;
-		$this->data["general"]["api"] = \pocketmine\API_VERSION;
+		$this->data["general"]["name"] = $this->server->getName();
+		$this->data["general"]["base_version"] = \pocketmine\BASE_VERSION;
+		$this->data["general"]["build"] = \pocketmine\BUILD_NUMBER;
+		$this->data["general"]["is_dev"] = \pocketmine\IS_DEVELOPMENT_BUILD;
+		$this->data["general"]["protocol"] = ProtocolInfo::CURRENT_PROTOCOL;
 		$this->data["general"]["git"] = \pocketmine\GIT_COMMIT;
 		$this->data["general"]["raklib"] = RakLib::VERSION;
 		$this->data["general"]["uname"] = php_uname("a");
@@ -232,7 +252,7 @@ class CrashDump{
 		$this->data["general"]["zend"] = zend_version();
 		$this->data["general"]["php_os"] = PHP_OS;
 		$this->data["general"]["os"] = Utils::getOS();
-		$this->addLine("PocketMine-MP version: " . $version->get(false) . " #" . $version->getBuild() . " [Protocol " . Info::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());
@@ -247,5 +267,4 @@ class CrashDump{
 	public function add($str){
 		fwrite($this->fp, $str);
 	}
-
-}
+}

src/pocketmine/IPlayer.php

@@ -19,6 +19,8 @@
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine;
 
 use pocketmine\permission\ServerOperator;
@@ -28,32 +30,32 @@ interface IPlayer extends ServerOperator{
 	/**
 	 * @return bool
 	 */
-	public function isOnline();
+	public function isOnline() : bool;
 
 	/**
 	 * @return string
 	 */
-	public function getName();
+	public function getName() : string;
 
 	/**
 	 * @return bool
 	 */
-	public function isBanned();
+	public function isBanned() : bool;
 
 	/**
 	 * @param bool $banned
 	 */
-	public function setBanned($banned);
+	public function setBanned(bool $banned);
 
 	/**
 	 * @return bool
 	 */
-	public function isWhitelisted();
+	public function isWhitelisted() : bool;
 
 	/**
 	 * @param bool $value
 	 */
-	public function setWhitelisted($value);
+	public function setWhitelisted(bool $value);
 
 	/**
 	 * @return Player|null
@@ -61,18 +63,18 @@ interface IPlayer extends ServerOperator{
 	public function getPlayer();
 
 	/**
-	 * @return int|double
+	 * @return int|null
 	 */
 	public function getFirstPlayed();
 
 	/**
-	 * @return int|double
+	 * @return int|null
 	 */
 	public function getLastPlayed();
 
 	/**
-	 * @return mixed
+	 * @return bool
 	 */
-	public function hasPlayedBefore();
+	public function hasPlayedBefore() : bool;
 
 }

src/pocketmine/MemoryManager.php

@@ -0,0 +1,483 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine;
+
+use pocketmine\event\server\LowMemoryEvent;
+use pocketmine\scheduler\DumpWorkerMemoryTask;
+use pocketmine\scheduler\GarbageCollectionTask;
+use pocketmine\timings\Timings;
+use pocketmine\utils\Utils;
+
+class MemoryManager{
+
+	/** @var Server */
+	private $server;
+
+	/** @var int */
+	private $memoryLimit;
+	/** @var int */
+	private $globalMemoryLimit;
+	/** @var int */
+	private $checkRate;
+	/** @var int */
+	private $checkTicker = 0;
+	/** @var bool */
+	private $lowMemory = false;
+
+	/** @var bool */
+	private $continuousTrigger = true;
+	/** @var int */
+	private $continuousTriggerRate;
+	/** @var int */
+	private $continuousTriggerCount = 0;
+	/** @var int */
+	private $continuousTriggerTicker = 0;
+
+	/** @var int */
+	private $garbageCollectionPeriod;
+	/** @var int */
+	private $garbageCollectionTicker = 0;
+	/** @var bool */
+	private $garbageCollectionTrigger;
+	/** @var bool */
+	private $garbageCollectionAsync;
+
+	/** @var int */
+	private $lowMemChunkRadiusOverride;
+	/** @var bool */
+	private $lowMemChunkGC;
+
+	/** @var bool */
+	private $lowMemDisableChunkCache;
+	/** @var bool */
+	private $lowMemClearWorldCache;
+
+	/** @var bool */
+	private $dumpWorkers = true;
+
+	public function __construct(Server $server){
+		$this->server = $server;
+
+		$this->init();
+	}
+
+	private function init(){
+		$this->memoryLimit = ((int) $this->server->getProperty("memory.main-limit", 0)) * 1024 * 1024;
+
+		$defaultMemory = 1024;
+
+		if(preg_match("/([0-9]+)([KMGkmg])/", $this->server->getConfigString("memory-limit", ""), $matches) > 0){
+			$m = (int) $matches[1];
+			if($m <= 0){
+				$defaultMemory = 0;
+			}else{
+				switch(strtoupper($matches[2])){
+					case "K":
+						$defaultMemory = $m / 1024;
+						break;
+					case "M":
+						$defaultMemory = $m;
+						break;
+					case "G":
+						$defaultMemory = $m * 1024;
+						break;
+					default:
+						$defaultMemory = $m;
+						break;
+				}
+			}
+		}
+
+		$hardLimit = ((int) $this->server->getProperty("memory.main-hard-limit", $defaultMemory));
+
+		if($hardLimit <= 0){
+			ini_set("memory_limit", '-1');
+		}else{
+			ini_set("memory_limit", $hardLimit . "M");
+		}
+
+		$this->globalMemoryLimit = ((int) $this->server->getProperty("memory.global-limit", 0)) * 1024 * 1024;
+		$this->checkRate = (int) $this->server->getProperty("memory.check-rate", 20);
+		$this->continuousTrigger = (bool) $this->server->getProperty("memory.continuous-trigger", true);
+		$this->continuousTriggerRate = (int) $this->server->getProperty("memory.continuous-trigger-rate", 30);
+
+		$this->garbageCollectionPeriod = (int) $this->server->getProperty("memory.garbage-collection.period", 36000);
+		$this->garbageCollectionTrigger = (bool) $this->server->getProperty("memory.garbage-collection.low-memory-trigger", true);
+		$this->garbageCollectionAsync = (bool) $this->server->getProperty("memory.garbage-collection.collect-async-worker", true);
+
+		$this->lowMemChunkRadiusOverride = (int) $this->server->getProperty("memory.max-chunks.chunk-radius", 4);
+		$this->lowMemChunkGC = (bool) $this->server->getProperty("memory.max-chunks.trigger-chunk-collect", true);
+
+		$this->lowMemDisableChunkCache = (bool) $this->server->getProperty("memory.world-caches.disable-chunk-cache", true);
+		$this->lowMemClearWorldCache = (bool) $this->server->getProperty("memory.world-caches.low-memory-trigger", true);
+
+		$this->dumpWorkers = (bool) $this->server->getProperty("memory.memory-dump.dump-async-worker", true);
+		gc_enable();
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isLowMemory() : bool{
+		return $this->lowMemory;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function canUseChunkCache() : bool{
+		return !$this->lowMemory or !$this->lowMemDisableChunkCache;
+	}
+
+	/**
+	 * Returns the allowed chunk radius based on the current memory usage.
+	 *
+	 * @param int $distance
+	 *
+	 * @return int
+	 */
+	public function getViewDistance(int $distance) : int{
+		return ($this->lowMemory and $this->lowMemChunkRadiusOverride > 0) ? (int) min($this->lowMemChunkRadiusOverride, $distance) : $distance;
+	}
+
+	/**
+	 * Triggers garbage collection and cache cleanup to try and free memory.
+	 *
+	 * @param int  $memory
+	 * @param int  $limit
+	 * @param bool $global
+	 * @param int  $triggerCount
+	 */
+	public function trigger(int $memory, int $limit, bool $global = false, int $triggerCount = 0){
+		$this->server->getLogger()->debug(sprintf("[Memory Manager] %sLow memory triggered, limit %gMB, using %gMB",
+			$global ? "Global " : "", round(($limit / 1024) / 1024, 2), round(($memory / 1024) / 1024, 2)));
+		if($this->lowMemClearWorldCache){
+			foreach($this->server->getLevels() as $level){
+				$level->clearCache(true);
+			}
+		}
+
+		if($this->lowMemChunkGC){
+			foreach($this->server->getLevels() as $level){
+				$level->doChunkGarbageCollection();
+			}
+		}
+
+		$ev = new LowMemoryEvent($memory, $limit, $global, $triggerCount);
+		$ev->call();
+
+		$cycles = 0;
+		if($this->garbageCollectionTrigger){
+			$cycles = $this->triggerGarbageCollector();
+		}
+
+		$this->server->getLogger()->debug(sprintf("[Memory Manager] Freed %gMB, $cycles cycles", round(($ev->getMemoryFreed() / 1024) / 1024, 2)));
+	}
+
+	/**
+	 * Called every tick to update the memory manager state.
+	 */
+	public function check(){
+		Timings::$memoryManagerTimer->startTiming();
+
+		if(($this->memoryLimit > 0 or $this->globalMemoryLimit > 0) and ++$this->checkTicker >= $this->checkRate){
+			$this->checkTicker = 0;
+			$memory = Utils::getMemoryUsage(true);
+			$trigger = false;
+			if($this->memoryLimit > 0 and $memory[0] > $this->memoryLimit){
+				$trigger = 0;
+			}elseif($this->globalMemoryLimit > 0 and $memory[1] > $this->globalMemoryLimit){
+				$trigger = 1;
+			}
+
+			if($trigger !== false){
+				if($this->lowMemory and $this->continuousTrigger){
+					if(++$this->continuousTriggerTicker >= $this->continuousTriggerRate){
+						$this->continuousTriggerTicker = 0;
+						$this->trigger($memory[$trigger], $this->memoryLimit, $trigger > 0, ++$this->continuousTriggerCount);
+					}
+				}else{
+					$this->lowMemory = true;
+					$this->continuousTriggerCount = 0;
+					$this->trigger($memory[$trigger], $this->memoryLimit, $trigger > 0);
+				}
+			}else{
+				$this->lowMemory = false;
+			}
+		}
+
+		if($this->garbageCollectionPeriod > 0 and ++$this->garbageCollectionTicker >= $this->garbageCollectionPeriod){
+			$this->garbageCollectionTicker = 0;
+			$this->triggerGarbageCollector();
+		}
+
+		Timings::$memoryManagerTimer->stopTiming();
+	}
+
+	/**
+	 * @return int
+	 */
+	public function triggerGarbageCollector() : int{
+		Timings::$garbageCollectorTimer->startTiming();
+
+		if($this->garbageCollectionAsync){
+			$pool = $this->server->getAsyncPool();
+			if(($w = $pool->shutdownUnusedWorkers()) > 0){
+				$this->server->getLogger()->debug("Shut down $w idle async pool workers");
+			}
+			foreach($pool->getRunningWorkers() as $i){
+				$pool->submitTaskToWorker(new GarbageCollectionTask(), $i);
+			}
+		}
+
+		$cycles = gc_collect_cycles();
+
+		Timings::$garbageCollectorTimer->stopTiming();
+
+		return $cycles;
+	}
+
+	/**
+	 * Dumps the server memory into the specified output folder.
+	 *
+	 * @param string $outputFolder
+	 * @param int    $maxNesting
+	 * @param int    $maxStringSize
+	 */
+	public function dumpServerMemory(string $outputFolder, int $maxNesting, int $maxStringSize){
+		$this->server->getLogger()->notice("[Dump] After the memory dump is done, the server might crash");
+		self::dumpMemory($this->server, $outputFolder, $maxNesting, $maxStringSize, $this->server->getLogger());
+
+		if($this->dumpWorkers){
+			$pool = $this->server->getAsyncPool();
+			foreach($pool->getRunningWorkers() as $i){
+				$pool->submitTaskToWorker(new DumpWorkerMemoryTask($outputFolder, $maxNesting, $maxStringSize), $i);
+			}
+		}
+	}
+
+	/**
+	 * Static memory dumper accessible from any thread.
+	 *
+	 * @param mixed   $startingObject
+	 * @param string  $outputFolder
+	 * @param int     $maxNesting
+	 * @param int     $maxStringSize
+	 * @param \Logger $logger
+	 *
+	 * @throws \ReflectionException
+	 */
+	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();
+
+		if(!file_exists($outputFolder)){
+			mkdir($outputFolder, 0777, true);
+		}
+
+		$obData = fopen($outputFolder . "/objects.js", "wb+");
+
+		$data = [];
+
+		$objects = [];
+
+		$refCounts = [];
+
+		$instanceCounts = [];
+
+		$staticProperties = [];
+		$staticCount = 0;
+
+		foreach(get_declared_classes() as $className){
+			$reflection = new \ReflectionClass($className);
+			$staticProperties[$className] = [];
+			foreach($reflection->getProperties() as $property){
+				if(!$property->isStatic() or $property->getDeclaringClass()->getName() !== $className){
+					continue;
+				}
+
+				if(!$property->isPublic()){
+					$property->setAccessible(true);
+				}
+
+				$staticCount++;
+				self::continueDump($property->getValue(), $staticProperties[$className][$property->getName()], $objects, $refCounts, 0, $maxNesting, $maxStringSize);
+			}
+
+			if(count($staticProperties[$className]) === 0){
+				unset($staticProperties[$className]);
+			}
+		}
+
+		file_put_contents($outputFolder . "/staticProperties.js", json_encode($staticProperties, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+		$logger->info("[Dump] Wrote $staticCount static properties");
+
+		if(isset($GLOBALS)){ //This might be null if we're on a different thread
+			$globalVariables = [];
+			$globalCount = 0;
+
+			$ignoredGlobals = [
+				'GLOBALS' => true,
+				'_SERVER' => true,
+				'_REQUEST' => true,
+				'_POST' => true,
+				'_GET' => true,
+				'_FILES' => true,
+				'_ENV' => true,
+				'_COOKIE' => true,
+				'_SESSION' => true
+			];
+
+			foreach($GLOBALS as $varName => $value){
+				if(isset($ignoredGlobals[$varName])){
+					continue;
+				}
+
+				$globalCount++;
+				self::continueDump($value, $globalVariables[$varName], $objects, $refCounts, 0, $maxNesting, $maxStringSize);
+			}
+
+			file_put_contents($outputFolder . "/globalVariables.js", json_encode($globalVariables, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+			$logger->info("[Dump] Wrote $globalCount global variables");
+		}
+
+		self::continueDump($startingObject, $data, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
+
+		do{
+			$continue = false;
+			foreach($objects as $hash => $object){
+				if(!is_object($object)){
+					continue;
+				}
+				$continue = true;
+
+				$className = get_class($object);
+				if(!isset($instanceCounts[$className])){
+					$instanceCounts[$className] = 1;
+				}else{
+					$instanceCounts[$className]++;
+				}
+
+				$objects[$hash] = true;
+
+				$reflection = new \ReflectionObject($object);
+
+				$info = [
+					"information" => "$hash@$className",
+					"properties" => []
+				];
+
+				if($reflection->getParentClass()){
+					$info["parent"] = $reflection->getParentClass()->getName();
+				}
+
+				if(count($reflection->getInterfaceNames()) > 0){
+					$info["implements"] = implode(", ", $reflection->getInterfaceNames());
+				}
+
+				for($original = $reflection; $reflection !== false; $reflection = $reflection->getParentClass()){
+					foreach($reflection->getProperties() as $property){
+						if($property->isStatic()){
+							continue;
+						}
+
+						$name = $property->getName();
+						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);
+					}
+				}
+
+				fwrite($obData, "$hash@$className: " . json_encode($info, JSON_UNESCAPED_SLASHES) . "\n");
+			}
+
+
+		}while($continue);
+
+		$logger->info("[Dump] Wrote " . count($objects) . " objects");
+
+		fclose($obData);
+
+		file_put_contents($outputFolder . "/serverEntry.js", json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+		file_put_contents($outputFolder . "/referenceCounts.js", json_encode($refCounts, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+
+		arsort($instanceCounts, SORT_NUMERIC);
+		file_put_contents($outputFolder . "/instanceCounts.js", json_encode($instanceCounts, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+
+		$logger->info("[Dump] Finished!");
+
+		ini_set('memory_limit', $hardLimit);
+		gc_enable();
+	}
+
+	/**
+	 * @param mixed    $from
+	 * @param mixed    &$data
+	 * @param object[] &$objects
+	 * @param int[]    &$refCounts
+	 * @param int      $recursion
+	 * @param int      $maxNesting
+	 * @param int      $maxStringSize
+	 */
+	private static function continueDump($from, &$data, array &$objects, array &$refCounts, int $recursion, int $maxNesting, int $maxStringSize){
+		if($maxNesting <= 0){
+			$data = "(error) NESTING LIMIT REACHED";
+			return;
+		}
+
+		--$maxNesting;
+
+		if(is_object($from)){
+			if(!isset($objects[$hash = spl_object_hash($from)])){
+				$objects[$hash] = $from;
+				$refCounts[$hash] = 0;
+			}
+
+			++$refCounts[$hash];
+
+			$data = "(object) $hash@" . get_class($from);
+		}elseif(is_array($from)){
+			if($recursion >= 5){
+				$data = "(error) ARRAY RECURSION LIMIT REACHED";
+				return;
+			}
+			$data = [];
+			foreach($from as $key => $value){
+				self::continueDump($value, $data[$key], $objects, $refCounts, $recursion + 1, $maxNesting, $maxStringSize);
+			}
+		}elseif(is_string($from)){
+			$data = "(string) len(" . strlen($from) . ") " . substr(Utils::printable($from), 0, $maxStringSize);
+		}elseif(is_resource($from)){
+			$data = "(resource) " . print_r($from, true);
+		}else{
+			$data = $from;
+		}
+	}
+}

src/pocketmine/OfflinePlayer.php

@@ -19,38 +19,41 @@
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine;
 
-
+use pocketmine\metadata\Metadatable;
 use pocketmine\metadata\MetadataValue;
-use pocketmine\nbt\tag\Compound;
+use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\plugin\Plugin;
 
-class OfflinePlayer implements IPlayer{
+class OfflinePlayer implements IPlayer, Metadatable{
 
+	/** @var string */
 	private $name;
+	/** @var Server */
 	private $server;
-	private $namedtag;
+	/** @var CompoundTag|null */
+	private $namedtag = null;
 
 	/**
 	 * @param Server $server
 	 * @param string $name
 	 */
-	public function __construct(Server $server, $name){
+	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($this->server->hasOfflinePlayerData($this->name)){
 			$this->namedtag = $this->server->getOfflinePlayerData($this->name);
-		}else{
-			$this->namedtag = null;
 		}
 	}
 
-	public function isOnline(){
+	public function isOnline() : bool{
 		return $this->getPlayer() !== null;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return $this->name;
 	}
 
@@ -58,77 +61,75 @@ class OfflinePlayer implements IPlayer{
 		return $this->server;
 	}
 
-	public function isOp(){
-		return $this->server->isOp(strtolower($this->getName()));
+	public function isOp() : bool{
+		return $this->server->isOp($this->name);
 	}
 
-	public function setOp($value){
+	public function setOp(bool $value){
 		if($value === $this->isOp()){
 			return;
 		}
 
-		if($value === true){
-			$this->server->addOp(strtolower($this->getName()));
+		if($value){
+			$this->server->addOp($this->name);
 		}else{
-			$this->server->removeOp(strtolower($this->getName()));
+			$this->server->removeOp($this->name);
 		}
 	}
 
-	public function isBanned(){
-		return $this->server->getNameBans()->isBanned(strtolower($this->getName()));
+	public function isBanned() : bool{
+		return $this->server->getNameBans()->isBanned($this->name);
 	}
 
-	public function setBanned($value){
-		if($value === true){
-			$this->server->getNameBans()->addBan($this->getName(), null, null, null);
+	public function setBanned(bool $value){
+		if($value){
+			$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(){
-		return $this->server->isWhitelisted(strtolower($this->getName()));
+	public function isWhitelisted() : bool{
+		return $this->server->isWhitelisted($this->name);
 	}
 
-	public function setWhitelisted($value){
-		if($value === true){
-			$this->server->addWhitelist(strtolower($this->getName()));
+	public function setWhitelisted(bool $value){
+		if($value){
+			$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(){
-		return $this->namedtag instanceof Compound ? $this->namedtag["firstPlayed"] : null;
+		return $this->namedtag instanceof CompoundTag ? $this->namedtag->getLong("firstPlayed", 0, true) : null;
 	}
 
 	public function getLastPlayed(){
-		return $this->namedtag instanceof Compound ? $this->namedtag["lastPlayed"] : null;
+		return $this->namedtag instanceof CompoundTag ? $this->namedtag->getLong("lastPlayed", 0, true) : null;
 	}
 
-	public function hasPlayedBefore(){
-		return $this->namedtag instanceof Compound;
+	public function hasPlayedBefore() : bool{
+		return $this->namedtag instanceof CompoundTag;
 	}
 
-	public function setMetadata($metadataKey, MetadataValue $metadataValue){
-		$this->server->getPlayerMetadata()->setMetadata($this, $metadataKey, $metadataValue);
+	public function setMetadata(string $metadataKey, MetadataValue $newMetadataValue){
+		$this->server->getPlayerMetadata()->setMetadata($this, $metadataKey, $newMetadataValue);
 	}
 
-	public function getMetadata($metadataKey){
+	public function getMetadata(string $metadataKey){
 		return $this->server->getPlayerMetadata()->getMetadata($this, $metadataKey);
 	}
 
-	public function hasMetadata($metadataKey){
+	public function hasMetadata(string $metadataKey) : bool{
 		return $this->server->getPlayerMetadata()->hasMetadata($this, $metadataKey);
 	}
 
-	public function removeMetadata($metadataKey, Plugin $plugin){
-		$this->server->getPlayerMetadata()->removeMetadata($this, $metadataKey, $plugin);
+	public function removeMetadata(string $metadataKey, Plugin $owningPlugin){
+		$this->server->getPlayerMetadata()->removeMetadata($this, $metadataKey, $owningPlugin);
 	}
-
-
 }

src/pocketmine/PocketMine.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,459 +15,257 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace {
-	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_integer($key) ? $key : '"' . $key . '"') . "]=>" . PHP_EOL;
-						++$cnt;
-						safe_var_dump($value);
-						--$cnt;
-					}
-					echo str_repeat("  ", $cnt) . "}" . PHP_EOL;
-					break;
-				case is_integer($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(){
-
-	}
+	const INT32_MIN = -0x80000000;
+	const INT32_MAX = 0x7fffffff;
 }
 
 namespace pocketmine {
-	use pocketmine\utils\Binary;
-	use pocketmine\utils\MainLogger;
-	use pocketmine\utils\Utils;
-	use pocketmine\wizard\Installer;
 
-	const VERSION = "1.4.1";
-	const API_VERSION = "1.11.0";
-	const CODENAME = "絶好(Zekkou)ケーキ(Cake)";
-	const MINECRAFT_VERSION = "v0.10.5 alpha";
+	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;
+
+	const NAME = "PocketMine-MP";
+	const BASE_VERSION = "3.4.1";
+	const IS_DEVELOPMENT_BUILD = false;
+	const BUILD_NUMBER = 0;
+
+	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(\Phar::running(true) !== ""){
-		@define("pocketmine\\PATH", \Phar::running(true) . "/");
-	}else{
-		@define("pocketmine\\PATH", \getcwd() . DIRECTORY_SEPARATOR);
-	}
-
-	if(!extension_loaded("pthreads")){
-		echo "[CRITICAL] Unable to find the pthreads extension." . PHP_EOL;
-		echo "[CRITICAL] Please use the installer provided on the homepage." . PHP_EOL;
-		exit(1);
-	}
-
-	if(!class_exists("ClassLoader", false)){
-		require_once(\pocketmine\PATH . "src/spl/ThreadedFactory.php");
-		require_once(\pocketmine\PATH . "src/spl/ClassLoader.php");
-		require_once(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
-		require_once(\pocketmine\PATH . "src/pocketmine/CompatibleClassLoader.php");
-	}
-
-	$autoloader = new CompatibleClassLoader();
-	$autoloader->addPath(\pocketmine\PATH . "src");
-	$autoloader->addPath(\pocketmine\PATH . "src" . DIRECTORY_SEPARATOR . "spl");
-	$autoloader->register(true);
-
-
-	set_time_limit(0); //Who set it to 30 seconds?!?!
-
-	gc_enable();
-	error_reporting(-1);
-	ini_set("allow_url_fopen", 1);
-	ini_set("display_errors", 1);
-	ini_set("display_startup_errors", 1);
-	ini_set("default_charset", "utf-8");
-
-	ini_set("memory_limit", -1);
-	define("pocketmine\\START_TIME", microtime(true));
-
-	$opts = getopt("", ["enable-ansi", "disable-ansi", "data:", "plugins:", "no-wizard", "enable-profiler"]);
-
-	define("pocketmine\\DATA", isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR);
-	define("pocketmine\\PLUGIN_PATH", isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
-
-	define("pocketmine\\ANSI", (Utils::getOS() !== "win" or isset($opts["enable-ansi"])) and !isset($opts["disable-ansi"]));
-
-
-	if(!file_exists(\pocketmine\DATA)){
-		mkdir(\pocketmine\DATA, 0777, true);
-	}
-
-	//Logger has a dependency on timezone, so we'll set it to UTC until we can get the actual timezone.
-	date_default_timezone_set("UTC");
-	$logger = new MainLogger(\pocketmine\DATA . "server.log", \pocketmine\ANSI);
-
-	if(!ini_get("date.timezone")){
-		if(($timezone = detect_system_timezone()) and date_default_timezone_set($timezone)){
-			//Success! Timezone has already been set and validated in the if statement.
-			//This here is just for redundancy just in case some program wants to read timezone data from the ini.
-			ini_set("date.timezone", $timezone);
-		}else{
-			//If system timezone detection fails or timezone is an invalid value.
-			if($response = Utils::getURL("http://ip-api.com/json")
-				and $ip_geolocation_data = json_decode($response, true)
-				and $ip_geolocation_data['status'] != 'fail'
-				and date_default_timezone_set($ip_geolocation_data['timezone'])
-			){
-				//Again, for redundancy.
-				ini_set("date.timezone", $ip_geolocation_data['timezone']);
-			}else{
-				ini_set("date.timezone", "UTC");
-				date_default_timezone_set("UTC");
-				$logger->warning("Timezone could not be automatically determined. An incorrect timezone will result in incorrect timestamps on console logs. It has been set to \"UTC\" by default. You can change it on the php.ini file.");
-			}
-		}
-	}else{
-		/*
-		 * This is here so that people don't come to us complaining and fill up the issue tracker when they put
-		 * an incorrect timezone abbreviation in php.ini apparently.
-		 */
-		$default_timezone = date_default_timezone_get();
-		if(strpos($default_timezone, "/") === false){
-			$default_timezone = timezone_name_from_abbr($default_timezone);
-			ini_set("date.timezone", $default_timezone);
-			date_default_timezone_set($default_timezone);
-		}
-	}
-
-	function detect_system_timezone(){
-		switch(Utils::getOS()){
-			case 'win':
-				$regex = '/(UTC)(\+*\-*\d*\d*\:*\d*\d*)/';
-
-				/*
-				 * wmic timezone get Caption
-				 * Get the timezone offset
-				 *
-				 * Sample Output var_dump
-				 * array(3) {
-				 *	  [0] =>
-				 *	  string(7) "Caption"
-				 *	  [1] =>
-				 *	  string(20) "(UTC+09:30) Adelaide"
-				 *	  [2] =>
-				 *	  string(0) ""
-				 *	}
-				 */
-				exec("wmic timezone get Caption", $output);
-
-				$string = trim(implode("\n", $output));
-
-				//Detect the Time Zone string
-				preg_match($regex, $string, $matches);
-
-				if(!isset($matches[2])){
-					return false;
-				}
-
-				$offset = $matches[2];
-
-				if($offset == ""){
-					return "UTC";
-				}
-
-				return parse_offset($offset);
-				break;
-			case 'linux':
-				// Ubuntu / Debian.
-				if(file_exists('/etc/timezone')){
-					$data = file_get_contents('/etc/timezone');
-					if($data){
-						return trim($data);
-					}
-				}
-
-				// RHEL / CentOS
-				if(file_exists('/etc/sysconfig/clock')){
-					$data = parse_ini_file('/etc/sysconfig/clock');
-					if(!empty($data['ZONE'])){
-						return trim($data['ZONE']);
-					}
-				}
-
-				//Portable method for incompatible linux distributions.
-
-				$offset = trim(exec('date +%:z'));
-
-				if($offset == "+00:00"){
-					return "UTC";
-				}
-
-				return parse_offset($offset);
-				break;
-			case 'mac':
-				if(is_link('/etc/localtime')){
-					$filename = readlink('/etc/localtime');
-					if(strpos($filename, '/usr/share/zoneinfo/') === 0){
-						$timezone = substr($filename, 20);
-						return trim($timezone);
-					}
-				}
-
-				return false;
-				break;
-			default:
-				return false;
-				break;
-		}
-	}
-
 	/**
-	 * @param string $offset In the format of +09:00, +02:00, -04:00 etc.
-	 *
-	 * @return string
+	 * @return string[]
 	 */
-	function parse_offset($offset){
-		//Make signed offsets unsigned for date_parse
-		if(strpos($offset, '-') !== false){
-			$negative_offset = true;
-			$offset = str_replace('-', '', $offset);
-		}else{
-			if(strpos($offset, '+') !== false){
-				$negative_offset = false;
-				$offset = str_replace('+', '', $offset);
-			}else{
-				return false;
-			}
-		}
-
-		$parsed = date_parse($offset);
-		$offset = $parsed['hour'] * 3600 + $parsed['minute'] * 60 + $parsed['second'];
-
-		//After date_parse is done, put the sign back
-		if($negative_offset == true){
-			$offset = -abs($offset);
-		}
-
-		//And then, look the offset up.
-		//timezone_name_from_abbr is not used because it returns false on some(most) offsets because it's mapping function is weird.
-		//That's been a bug in PHP since 2008!
-		foreach(timezone_abbreviations_list() as $zones){
-			foreach($zones as $timezone){
-				if($timezone['offset'] == $offset){
-					return $timezone['timezone_id'];
-				}
-			}
-		}
-
-		return false;
-	}
-
-	if(isset($opts["enable-profiler"])){
-		if(function_exists("profiler_enable")){
-			\profiler_enable();
-			$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:
-				exec("kill -9 " . ((int) $pid) . " > /dev/null 2>&1");
-		}
-	}
-
-	function getTrace($start = 1, $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();
-			}
+	function check_platform_dependencies(){
+		if(version_compare(MIN_PHP_VERSION, PHP_VERSION) > 0){
+			//If PHP version isn't high enough, anything below might break, so don't bother checking it.
+			return [
+				\pocketmine\NAME . " requires PHP >= " . MIN_PHP_VERSION . ", but you have PHP " . PHP_VERSION . "."
+			];
 		}
 
 		$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"];
-				}
-				foreach($args as $name => $value){
-					$params .= (is_object($value) ? get_class($value) . " " . (method_exists($value, "__toString") ? $value->__toString() : "object") : gettype($value) . " " . (is_array($value) ? "Array()" : @strval($value))) . ", ";
-				}
+
+		if(PHP_INT_SIZE < 8){
+			$messages[] = "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 if this is a 64-bit system.";
+		}
+
+		if(php_sapi_name() !== "cli"){
+			$messages[] = "You must run " . \pocketmine\NAME . " using the CLI.";
+		}
+
+		$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)){
+				$messages[] = "Unable to find the $name ($ext) extension.";
 			}
-			$messages[] = "#$j " . (isset($trace[$i]["file"]) ? cleanPath($trace[$i]["file"]) : "") . "(" . (isset($trace[$i]["line"]) ? $trace[$i]["line"] : "") . "): " . (isset($trace[$i]["class"]) ? $trace[$i]["class"] . (($trace[$i]["type"] === "dynamic" or $trace[$i]["type"] === "->") ? "->" : "::") : "") . $trace[$i]["function"] . "(" . substr($params, 0, -2) . ")";
+		}
+
+		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){
+				$messages[] = "pthreads >= 3.1.7dev is required, while you have $pthreads_version.";
+			}
+		}
+
+		if(extension_loaded("leveldb")){
+			$leveldb_version = phpversion("leveldb");
+			if(version_compare($leveldb_version, "0.2.1") < 0){
+				$messages[] = "php-leveldb >= 0.2.1 is required, while you have $leveldb_version.";
+			}
+		}
+
+		if(extension_loaded("pocketmine")){
+			$messages[] = "The native PocketMine extension is no longer supported.";
 		}
 
 		return $messages;
 	}
 
-	function cleanPath($path){
-		return rtrim(str_replace(["\\", ".php", "phar://", rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PATH), "/"), rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PLUGIN_PATH), "/")], ["/", "", "", "", ""], $path), "/");
-	}
-
-	set_error_handler([\ExceptionHandler::class, "handler"], -1);
-
-	$errors = 0;
-
-	if(version_compare("5.6.0", PHP_VERSION) > 0){
-		$logger->critical("You must use PHP >= 5.6");
-		++$errors;
-	}
-
-	if(php_sapi_name() !== "cli"){
-		$logger->critical("You must run PocketMine-MP using the CLI.");
-		++$errors;
-	}
-
-	if(!extension_loaded("sockets")){
-		$logger->critical("Unable to find the Socket extension.");
-		++$errors;
-	}
-
-	$pthreads_version = phpversion("pthreads");
-	if(substr_count($pthreads_version, ".") < 2){
-		$pthreads_version = "0.$pthreads_version";
-	}
-	if(version_compare($pthreads_version, "2.0.9") < 0){
-		$logger->critical("pthreads >= 2.0.9 is required, while you have $pthreads_version.");
-		++$errors;
-	}
-
-	if(!extension_loaded("uopz")){
-		//$logger->notice("Couldn't find the uopz extension. Some functions may be limited");
-	}
-
-	if(extension_loaded("pocketmine")){
-		if(version_compare(phpversion("pocketmine"), "0.0.1") < 0){
-			$logger->critical("You have the native PocketMine extension, but your version is lower than 0.0.1.");
-			++$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(!empty($messages = check_platform_dependencies())){
+		echo PHP_EOL;
+		$binary = version_compare(PHP_VERSION, "5.4") >= 0 ? PHP_BINARY : "unknown";
+		critical_error("Selected PHP binary ($binary) does not satisfy some requirements.");
+		foreach($messages as $m){
+			echo " - $m" . PHP_EOL;
 		}
+		critical_error("Please recompile PHP with the needed configuration, or refer to the installation instructions at http://pmmp.rtfd.io/en/rtfd/installation.html.");
+		echo PHP_EOL;
+		exit(1);
+	}
+	unset($messages);
+
+	error_reporting(-1);
+
+	if(\Phar::running(true) !== ""){
+		define('pocketmine\PATH', \Phar::running(true) . "/");
+	}else{
+		define('pocketmine\PATH', dirname(__FILE__, 3) . DIRECTORY_SEPARATOR);
 	}
 
-	if(!extension_loaded("Weakref") and !extension_loaded("weakref")){
-		$logger->critical("Unable to find the Weakref extension.");
-		++$errors;
+	$opts = getopt("", ["bootstrap:"]);
+	if(isset($opts["bootstrap"])){
+		$bootstrap = realpath($opts["bootstrap"]) ?: $opts["bootstrap"];
+	}else{
+		$bootstrap = \pocketmine\PATH . 'vendor/autoload.php';
+	}
+	define('pocketmine\COMPOSER_AUTOLOADER_PATH', $bootstrap);
+
+	if(\pocketmine\COMPOSER_AUTOLOADER_PATH !== false and is_file(\pocketmine\COMPOSER_AUTOLOADER_PATH)){
+		require_once(\pocketmine\COMPOSER_AUTOLOADER_PATH);
+	}else{
+		critical_error("Composer autoloader not found at " . $bootstrap);
+		critical_error("Please install/update Composer dependencies or use provided builds.");
+		exit(1);
 	}
 
-	if(!extension_loaded("curl")){
-		$logger->critical("Unable to find the cURL extension.");
-		++$errors;
+	set_error_handler([Utils::class, 'errorExceptionHandler']);
+
+	/*
+	 * We now use the Composer autoloader, but this autoloader is still for loading plugins.
+	 */
+	$autoloader = new \BaseClassLoader();
+	$autoloader->register(false);
+
+	set_time_limit(0); //Who set it to 30 seconds?!?!
+
+	ini_set("allow_url_fopen", '1');
+	ini_set("display_errors", '1');
+	ini_set("display_startup_errors", '1');
+	ini_set("default_charset", "utf-8");
+
+	ini_set("memory_limit", '-1');
+	define('pocketmine\START_TIME', microtime(true));
+
+	define('pocketmine\RESOURCE_PATH', \pocketmine\PATH . 'src' . DIRECTORY_SEPARATOR . 'pocketmine' . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR);
+
+	$opts = getopt("", ["data:", "plugins:", "no-wizard"]);
+
+	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 : realpath(getcwd()) . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
+
+	if(!file_exists(\pocketmine\DATA)){
+		mkdir(\pocketmine\DATA, 0777, true);
 	}
 
-	if(!extension_loaded("sqlite3")){
-		$logger->critical("Unable to find the SQLite3 extension.");
-		++$errors;
+	//Logger has a dependency on timezone
+	$tzError = Timezone::init();
+
+	$logger = new MainLogger(\pocketmine\DATA . "server.log");
+	$logger->registerStatic();
+
+	foreach($tzError as $e){
+		$logger->warning($e);
 	}
+	unset($tzError);
 
-	if(!extension_loaded("yaml")){
-		$logger->critical("Unable to find the YAML extension.");
-		++$errors;
-	}
-
-	if(!extension_loaded("zlib")){
-		$logger->critical("Unable to find the Zlib extension.");
-		++$errors;
-	}
-
-	if($errors > 0){
-		$logger->critical("Please use the installer provided on the homepage, or recompile PHP again.");
-		$logger->shutdown();
-		$logger->join();
-		exit(1); //Exit with error
-	}
-
-	if(file_exists(\pocketmine\PATH . ".git/refs/heads/master")){ //Found Git information!
-		define("pocketmine\\GIT_COMMIT", strtolower(trim(file_get_contents(\pocketmine\PATH . ".git/refs/heads/master"))));
-	}else{ //Unknown :(
-		define("pocketmine\\GIT_COMMIT", str_repeat("00", 20));
-	}
-
-	@define("ENDIANNESS", (pack("d", 1) === "\77\360\0\0\0\0\0\0" ? Binary::BIG_ENDIAN : Binary::LITTLE_ENDIAN));
-	@define("INT32_MASK", is_int(0xffffffff) ? 0xffffffff : -1);
-	@ini_set("opcache.mmap_base", bin2hex(Utils::getRandomBytes(8, false))); //Fix OPCache address errors
-
-	if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){
-		new Installer();
+	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(\Phar::running(true) === ""){
-		$logger->warning("Non-packaged PocketMine-MP installation detected, do not use on production.");
+		$logger->warning("Non-packaged " . \pocketmine\NAME . " installation detected. Consider using a phar in production for better performance.");
 	}
 
-	ThreadManager::init();
-	$server = new Server($autoloader, $logger, \pocketmine\PATH, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
+	$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
+	define('pocketmine\VERSION', $version->getFullVersion(true));
 
-	$logger->info("Stopping other threads");
+	$gitHash = str_repeat("00", 20);
 
-	foreach(ThreadManager::getInstance()->getAll() as $id => $thread){
-		if($thread->isRunning()){
-			$logger->debug("Stopping " . (new \ReflectionClass($thread))->getShortName() . " thread");
-			if($thread instanceof Thread){
-				$thread->kill();
-				sleep(1);
-				if($thread->isRunning()){
-					$thread->detach();
-				}
-			}elseif($thread instanceof Worker){
-				$thread->kill();
-				sleep(1);
-				if($thread->isRunning()){
-					$thread->detach();
-				}
+	if(\Phar::running(true) === ""){
+		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";
 			}
-		}elseif(!$thread->isJoined()){
-			$logger->debug("Joining " . (new \ReflectionClass($thread))->getShortName() . " thread");
-			$thread->join();
+		}
+	}else{
+		$phar = new \Phar(\Phar::running(false));
+		$meta = $phar->getMetadata();
+		if(isset($meta["git"])){
+			$gitHash = $meta["git"];
 		}
 	}
 
+	define('pocketmine\GIT_COMMIT', $gitHash);
+
+
+	@define("INT32_MASK", is_int(0xffffffff) ? 0xffffffff : -1);
+	@ini_set("opcache.mmap_base", bin2hex(random_bytes(8))); //Fix OPCache address errors
+
+	$exitCode = 0;
+	do{
+		if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){
+			$installer = new SetupWizard();
+			if(!$installer->run()){
+				$exitCode = -1;
+				break;
+			}
+		}
+
+		ThreadManager::init();
+		new Server($autoloader, $logger, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
+
+		$logger->info("Stopping other threads");
+
+		$killer = new ServerKiller(8);
+		$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;
+			}
+			Utils::kill(getmypid());
+		}
+	}while(false);
+
 	$logger->shutdown();
 	$logger->join();
 
-	exit(0);
+	echo Terminal::$FORMAT_RESET . PHP_EOL;
 
+	exit($exitCode);
 }

src/pocketmine/Thread.php

@@ -19,6 +19,8 @@
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine;
 
 /**
@@ -26,13 +28,66 @@ namespace pocketmine;
  */
 abstract class Thread extends \Thread{
 
-	public function start($options = PTHREADS_INHERIT_ALL){
+	/** @var \ClassLoader */
+	protected $classLoader;
+	/** @var string|null */
+	protected $composerAutoloaderPath;
+
+	protected $isKilled = false;
+
+	public function getClassLoader(){
+		return $this->classLoader;
+	}
+
+	public function setClassLoader(\ClassLoader $loader = null){
+		$this->composerAutoloaderPath = \pocketmine\COMPOSER_AUTOLOADER_PATH;
+
+		if($loader === null){
+			$loader = Server::getInstance()->getLoader();
+		}
+		$this->classLoader = $loader;
+	}
+
+	/**
+	 * Registers the class loader for this thread.
+	 *
+	 * WARNING: This method MUST be called from any descendent threads' run() method to make autoloading usable.
+	 * If you do not do this, you will not be able to use new classes that were not loaded when the thread was started
+	 * (unless you are using a custom autoloader).
+	 */
+	public function registerClassLoader(){
+		if($this->composerAutoloaderPath !== null){
+			require $this->composerAutoloaderPath;
+		}
+		if($this->classLoader !== null){
+			$this->classLoader->register(false);
+		}
+	}
+
+	public function start(?int $options = \PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
-		if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated()){
-			return parent::start($options);
+		if($this->getClassLoader() === null){
+			$this->setClassLoader();
+		}
+		return parent::start($options);
+	}
+
+	/**
+	 * Stops the thread using the best way possible. Try to stop it yourself before calling this.
+	 */
+	public function quit(){
+		$this->isKilled = true;
+
+		if(!$this->isJoined()){
+			$this->notify();
+			$this->join();
 		}
 
-		return false;
+		ThreadManager::getInstance()->remove($this);
 	}
-}
+
+	public function getThreadName() : string{
+		return (new \ReflectionClass($this))->getShortName();
+	}
+}

src/pocketmine/ThreadManager.php

@@ -19,9 +19,13 @@
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine;
 
-class ThreadManager extends \Threaded{
+use pocketmine\utils\MainLogger;
+
+class ThreadManager extends \Volatile{
 
 	/** @var ThreadManager */
 	private static $instance = null;
@@ -58,7 +62,7 @@ class ThreadManager extends \Threaded{
 	/**
 	 * @return Worker[]|Thread[]
 	 */
-	public function getAll(){
+	public function getAll() : array{
 		$array = [];
 		foreach($this as $key => $thread){
 			$array[$key] = $thread;
@@ -66,4 +70,23 @@ class ThreadManager extends \Threaded{
 
 		return $array;
 	}
-}
+
+	public function stopAll() : int{
+		$logger = MainLogger::getLogger();
+
+		$erroredThreads = 0;
+
+		foreach($this->getAll() as $thread){
+			$logger->debug("Stopping " . $thread->getThreadName() . " thread");
+			try{
+				$thread->quit();
+				$logger->debug($thread->getThreadName() . " thread stopped successfully.");
+			}catch(\ThreadException $e){
+				++$erroredThreads;
+				$logger->debug("Could not stop " . $thread->getThreadName() . " thread: " . $e->getMessage());
+			}
+		}
+
+		return $erroredThreads;
+	}
+}

src/pocketmine/Worker.php

@@ -19,6 +19,8 @@
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine;
 
 /**
@@ -26,13 +28,67 @@ namespace pocketmine;
  */
 abstract class Worker extends \Worker{
 
-	public function start($options = PTHREADS_INHERIT_ALL){
+	/** @var \ClassLoader */
+	protected $classLoader;
+	/** @var string|null */
+	protected $composerAutoloaderPath;
+
+	protected $isKilled = false;
+
+	public function getClassLoader(){
+		return $this->classLoader;
+	}
+
+	public function setClassLoader(\ClassLoader $loader = null){
+		$this->composerAutoloaderPath = \pocketmine\COMPOSER_AUTOLOADER_PATH;
+
+		if($loader === null){
+			$loader = Server::getInstance()->getLoader();
+		}
+		$this->classLoader = $loader;
+	}
+
+	/**
+	 * Registers the class loader for this thread.
+	 *
+	 * WARNING: This method MUST be called from any descendent threads' run() method to make autoloading usable.
+	 * If you do not do this, you will not be able to use new classes that were not loaded when the thread was started
+	 * (unless you are using a custom autoloader).
+	 */
+	public function registerClassLoader(){
+		if($this->composerAutoloaderPath !== null){
+			require $this->composerAutoloaderPath;
+		}
+		if($this->classLoader !== null){
+			$this->classLoader->register(false);
+		}
+	}
+
+	public function start(?int $options = \PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
-		if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated() and !$this->isShutdown()){
-			return parent::start($options);
+		if($this->getClassLoader() === null){
+			$this->setClassLoader();
+		}
+		return parent::start($options);
+	}
+
+	/**
+	 * Stops the thread using the best way possible. Try to stop it yourself before calling this.
+	 */
+	public function quit(){
+		$this->isKilled = true;
+
+		if($this->isRunning()){
+			while($this->unstack() !== null);
+			$this->notify();
+			$this->shutdown();
 		}
 
-		return false;
+		ThreadManager::getInstance()->remove($this);
 	}
-}
+
+	public function getThreadName() : string{
+		return (new \ReflectionClass($this))->getShortName();
+	}
+}

src/pocketmine/block/ActivatorRail.php

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

src/pocketmine/block/Air.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,13 +15,16 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\math\AxisAlignedBB;
 
 
 /**
@@ -30,38 +33,52 @@ use pocketmine\item\Item;
 class Air extends Transparent{
 
 	protected $id = self::AIR;
-	protected $meta = 0;
-
-	public function __construct(){
 
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Air";
 	}
 
-	public function isBreakable(Item $item){
-		return false;
-	}
-
-	public function canBeFlowedInto(){
+	public function canPassThrough() : bool{
 		return true;
 	}
 
-	public function canBeReplaced(){
+	public function isBreakable(Item $item) : bool{
+		return false;
+	}
+
+	public function canBeFlowedInto() : bool{
 		return true;
 	}
 
-	public function canBePlaced(){
+	public function canBeReplaced() : bool{
+		return true;
+	}
+
+	public function canBePlaced() : bool{
 		return false;
 	}
 
-	public function isSolid(){
+	public function isSolid() : bool{
 		return false;
 	}
 
-	public function getBoundingBox(){
+	public function getBoundingBox() : ?AxisAlignedBB{
 		return null;
 	}
 
-}
+	public function getCollisionBoxes() : array{
+		return [];
+	}
+
+	public function getHardness() : float{
+		return -1;
+	}
+
+	public function getBlastResistance() : float{
+		return 0;
+	}
+}

src/pocketmine/block/Anvil.php

@@ -0,0 +1,115 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\inventory\AnvilInventory;
+use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
+
+class Anvil extends Fallable{
+
+	public const TYPE_NORMAL = 0;
+	public const TYPE_SLIGHTLY_DAMAGED = 4;
+	public const TYPE_VERY_DAMAGED = 8;
+
+	protected $id = self::ANVIL;
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function isTransparent() : bool{
+		return true;
+	}
+
+	public function getHardness() : float{
+		return 5;
+	}
+
+	public function getBlastResistance() : float{
+		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->getVariant()] ?? "Anvil";
+	}
+
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
+	}
+
+	public function recalculateBoundingBox() : ?AxisAlignedBB{
+		$inset = 0.125;
+
+		if($this->meta & 0x01){ //east/west
+			return new AxisAlignedBB(
+				$this->x,
+				$this->y,
+				$this->z + $inset,
+				$this->x + 1,
+				$this->y + 1,
+				$this->z + 1 - $inset
+			);
+		}else{
+			return new AxisAlignedBB(
+				$this->x + $inset,
+				$this->y,
+				$this->z,
+				$this->x + 1 - $inset,
+				$this->y + 1,
+				$this->z + 1
+			);
+		}
+	}
+
+	public function onActivate(Item $item, Player $player = null) : bool{
+		if($player instanceof Player){
+			$player->addWindow(new AnvilInventory($this));
+		}
+
+		return true;
+	}
+
+	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->getVariant() | $direction;
+		return $this->getLevel()->setBlock($blockReplace, $this, true, true);
+	}
+}

src/pocketmine/block/BaseRail.php

@@ -0,0 +1,266 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
+
+abstract class BaseRail extends Flowable{
+
+	public const STRAIGHT_NORTH_SOUTH = 0;
+	public const STRAIGHT_EAST_WEST = 1;
+	public const ASCENDING_EAST = 2;
+	public const ASCENDING_WEST = 3;
+	public const ASCENDING_NORTH = 4;
+	public const ASCENDING_SOUTH = 5;
+
+	private const ASCENDING_SIDES = [
+		self::ASCENDING_NORTH => Vector3::SIDE_NORTH,
+		self::ASCENDING_EAST => Vector3::SIDE_EAST,
+		self::ASCENDING_SOUTH => Vector3::SIDE_SOUTH,
+		self::ASCENDING_WEST => Vector3::SIDE_WEST
+	];
+
+	protected const FLAG_ASCEND = 1 << 24; //used to indicate direction-up
+
+	protected const CONNECTIONS = [
+		//straights
+		self::STRAIGHT_NORTH_SOUTH => [
+			Vector3::SIDE_NORTH,
+			Vector3::SIDE_SOUTH
+		],
+		self::STRAIGHT_EAST_WEST => [
+			Vector3::SIDE_EAST,
+			Vector3::SIDE_WEST
+		],
+
+		//ascending
+		self::ASCENDING_EAST => [
+			Vector3::SIDE_WEST,
+			Vector3::SIDE_EAST | self::FLAG_ASCEND
+		],
+		self::ASCENDING_WEST => [
+			Vector3::SIDE_EAST,
+			Vector3::SIDE_WEST | self::FLAG_ASCEND
+		],
+		self::ASCENDING_NORTH => [
+			Vector3::SIDE_SOUTH,
+			Vector3::SIDE_NORTH | self::FLAG_ASCEND
+		],
+		self::ASCENDING_SOUTH => [
+			Vector3::SIDE_NORTH,
+			Vector3::SIDE_SOUTH | self::FLAG_ASCEND
+		]
+	];
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getHardness() : float{
+		return 0.7;
+	}
+
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		if(!$blockReplace->getSide(Vector3::SIDE_DOWN)->isTransparent() and $this->getLevel()->setBlock($blockReplace, $this, true, true)){
+			$this->tryReconnect();
+			return true;
+		}
+
+		return false;
+	}
+
+	protected static function searchState(array $connections, array $lookup) : int{
+		$meta = array_search($connections, $lookup, true);
+		if($meta === false){
+			$meta = array_search(array_reverse($connections), $lookup, true);
+		}
+		if($meta === false){
+			throw new \InvalidArgumentException("No meta value matches connections " . implode(", ", array_map('dechex', $connections)));
+		}
+
+		return $meta;
+	}
+
+	/**
+	 * Returns a meta value for the rail with the given connections.
+	 *
+	 * @param array $connections
+	 *
+	 * @return int
+	 *
+	 * @throws \InvalidArgumentException if no state matches the given connections
+	 */
+	protected function getMetaForState(array $connections) : int{
+		return self::searchState($connections, self::CONNECTIONS);
+	}
+
+	/**
+	 * Returns the connection directions of this rail (depending on the current block state)
+	 *
+	 * @return int[]
+	 */
+	abstract protected function getConnectionsForState() : array;
+
+	/**
+	 * Returns all the directions this rail is already connected in.
+	 *
+	 * @return int[]
+	 */
+	private function getConnectedDirections() : array{
+		/** @var int[] $connections */
+		$connections = [];
+
+		/** @var int $connection */
+		foreach($this->getConnectionsForState() as $connection){
+			$other = $this->getSide($connection & ~self::FLAG_ASCEND);
+			$otherConnection = Vector3::getOppositeSide($connection & ~self::FLAG_ASCEND);
+
+			if(($connection & self::FLAG_ASCEND) !== 0){
+				$other = $other->getSide(Vector3::SIDE_UP);
+
+			}elseif(!($other instanceof BaseRail)){ //check for rail sloping up to meet this one
+				$other = $other->getSide(Vector3::SIDE_DOWN);
+				$otherConnection |= self::FLAG_ASCEND;
+			}
+
+			if(
+				$other instanceof BaseRail and
+				in_array($otherConnection, $other->getConnectionsForState(), true)
+			){
+				$connections[] = $connection;
+			}
+		}
+
+		return $connections;
+	}
+
+	private function getPossibleConnectionDirections(array $constraints) : array{
+		switch(count($constraints)){
+			case 0:
+				//No constraints, can connect in any direction
+				$possible = [
+					Vector3::SIDE_NORTH => true,
+					Vector3::SIDE_SOUTH => true,
+					Vector3::SIDE_WEST => true,
+					Vector3::SIDE_EAST => true
+				];
+				foreach($possible as $p => $_){
+					$possible[$p | self::FLAG_ASCEND] = true;
+				}
+
+				return $possible;
+			case 1:
+				return $this->getPossibleConnectionDirectionsOneConstraint(array_shift($constraints));
+			case 2:
+				return [];
+			default:
+				throw new \InvalidArgumentException("Expected at most 2 constraints, got " . count($constraints));
+		}
+	}
+
+	protected function getPossibleConnectionDirectionsOneConstraint(int $constraint) : array{
+		$opposite = Vector3::getOppositeSide($constraint & ~self::FLAG_ASCEND);
+
+		$possible = [$opposite => true];
+
+		if(($constraint & self::FLAG_ASCEND) === 0){
+			//We can slope the other way if this connection isn't already a slope
+			$possible[$opposite | self::FLAG_ASCEND] = true;
+		}
+
+		return $possible;
+	}
+
+	private function tryReconnect() : void{
+		$thisConnections = $this->getConnectedDirections();
+		$changed = false;
+
+		do{
+			$possible = $this->getPossibleConnectionDirections($thisConnections);
+			$continue = false;
+
+			foreach($possible as $thisSide => $_){
+				$otherSide = Vector3::getOppositeSide($thisSide & ~self::FLAG_ASCEND);
+
+				$other = $this->getSide($thisSide & ~self::FLAG_ASCEND);
+
+				if(($thisSide & self::FLAG_ASCEND) !== 0){
+					$other = $other->getSide(Vector3::SIDE_UP);
+
+				}elseif(!($other instanceof BaseRail)){ //check if other rails can slope up to meet this one
+					$other = $other->getSide(Vector3::SIDE_DOWN);
+					$otherSide |= self::FLAG_ASCEND;
+				}
+
+				if(!($other instanceof BaseRail) or count($otherConnections = $other->getConnectedDirections()) >= 2){
+					//we can only connect to a rail that has less than 2 connections
+					continue;
+				}
+
+				$otherPossible = $other->getPossibleConnectionDirections($otherConnections);
+
+				if(isset($otherPossible[$otherSide])){
+					$otherConnections[] = $otherSide;
+					$other->updateState($otherConnections);
+
+					$changed = true;
+					$thisConnections[] = $thisSide;
+					$continue = count($thisConnections) < 2;
+
+					break; //force recomputing possible directions, since this connection could invalidate others
+				}
+			}
+		}while($continue);
+
+		if($changed){
+			$this->updateState($thisConnections);
+		}
+	}
+
+	private function updateState(array $connections) : void{
+		if(count($connections) === 1){
+			$connections[] = Vector3::getOppositeSide($connections[0] & ~self::FLAG_ASCEND);
+		}elseif(count($connections) !== 2){
+			throw new \InvalidArgumentException("Expected exactly 2 connections, got " . count($connections));
+		}
+
+		$this->meta = $this->getMetaForState($connections);
+		$this->level->setBlock($this, $this, false, false); //avoid recursion
+	}
+
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() or (
+			isset(self::ASCENDING_SIDES[$this->meta & 0x07]) and
+			$this->getSide(self::ASCENDING_SIDES[$this->meta & 0x07])->isTransparent()
+		)){
+			$this->getLevel()->useBreakOn($this);
+		}
+	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+}

src/pocketmine/block/Bed.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,39 +15,46 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
-use pocketmine\network\protocol\ChatPacket;
+use pocketmine\math\Vector3;
 use pocketmine\Player;
+use pocketmine\tile\Bed as TileBed;
+use pocketmine\tile\Tile;
+use pocketmine\utils\TextFormat;
 
 class Bed extends Transparent{
+	public const BITFLAG_OCCUPIED = 0x04;
+	public const BITFLAG_HEAD = 0x08;
 
 	protected $id = self::BED_BLOCK;
 
-	public function __construct($meta = 0){
+	protected $itemId = Item::BED;
+
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function canBeActivated(){
-		return true;
+	public function getHardness() : float{
+		return 0.2;
 	}
 
-	public function getHardness(){
-		return 1;
-	}
-
-	public function getName(){
+	public function getName() : string{
 		return "Bed Block";
 	}
 
-	protected function recalculateBoundingBox(){
+	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 		return new AxisAlignedBB(
 			$this->x,
 			$this->y,
@@ -58,71 +65,123 @@ class Bed extends Transparent{
 		);
 	}
 
-	public function onActivate(Item $item, Player $player = null){
+	public function isHeadPart() : bool{
+		return ($this->meta & self::BITFLAG_HEAD) !== 0;
+	}
 
-		$time = $this->getLevel()->getTime() % Level::TIME_FULL;
+	/**
+	 * @return bool
+	 */
+	public function isOccupied() : bool{
+		return ($this->meta & self::BITFLAG_OCCUPIED) !== 0;
+	}
 
-		$isNight = ($time >= Level::TIME_NIGHT and $time < Level::TIME_SUNRISE);
-
-		if($player instanceof Player and !$isNight){
-			$pk = new ChatPacket();
-			$pk->message = "You can only sleep at night";
-			$player->dataPacket($pk);
-
-			return true;
+	public function setOccupied(bool $occupied = true){
+		if($occupied){
+			$this->meta |= self::BITFLAG_OCCUPIED;
+		}else{
+			$this->meta &= ~self::BITFLAG_OCCUPIED;
 		}
 
-		$blockNorth = $this->getSide(2); //Gets the blocks around them
-		$blockSouth = $this->getSide(3);
-		$blockEast = $this->getSide(5);
-		$blockWest = $this->getSide(4);
-		if(($this->meta & 0x08) === 0x08){ //This is the Top part of bed
-			$b = $this;
-		}else{ //Bottom Part of Bed
-			if($blockNorth->getId() === $this->id and ($blockNorth->meta & 0x08) === 0x08){
-				$b = $blockNorth;
-			}elseif($blockSouth->getId() === $this->id and ($blockSouth->meta & 0x08) === 0x08){
-				$b = $blockSouth;
-			}elseif($blockEast->getId() === $this->id and ($blockEast->meta & 0x08) === 0x08){
-				$b = $blockEast;
-			}elseif($blockWest->getId() === $this->id and ($blockWest->meta & 0x08) === 0x08){
-				$b = $blockWest;
-			}else{
-				if($player instanceof Player){
-					$pk = new ChatPacket();
-					$pk->message = "This bed is incomplete";
-					$player->dataPacket($pk);
-				}
+		$this->getLevel()->setBlock($this, $this, false, false);
+
+		if(($other = $this->getOtherHalf()) !== null and $other->isOccupied() !== $occupied){
+			$other->setOccupied($occupied);
+		}
+	}
+
+	/**
+	 * @param int  $meta
+	 * @param bool $isHead
+	 *
+	 * @return int
+	 */
+	public static function getOtherHalfSide(int $meta, bool $isHead = false) : int{
+		$rotation = $meta & 0x03;
+		$side = -1;
+
+		switch($rotation){
+			case 0x00: //South
+				$side = Vector3::SIDE_SOUTH;
+				break;
+			case 0x01: //West
+				$side = Vector3::SIDE_WEST;
+				break;
+			case 0x02: //North
+				$side = Vector3::SIDE_NORTH;
+				break;
+			case 0x03: //East
+				$side = Vector3::SIDE_EAST;
+				break;
+		}
+
+		if($isHead){
+			$side = Vector3::getOppositeSide($side);
+		}
+
+		return $side;
+	}
+
+	/**
+	 * @return Bed|null
+	 */
+	public function getOtherHalf() : ?Bed{
+		$other = $this->getSide(self::getOtherHalfSide($this->meta, $this->isHeadPart()));
+		if($other instanceof Bed and $other->getId() === $this->getId() and $other->isHeadPart() !== $this->isHeadPart() and (($other->getDamage() & 0x03) === ($this->getDamage() & 0x03))){
+			return $other;
+		}
+
+		return null;
+	}
+
+	public function onActivate(Item $item, Player $player = null) : bool{
+		if($player !== null){
+			$other = $this->getOtherHalf();
+			if($other === null){
+				$player->sendMessage(TextFormat::GRAY . "This bed is incomplete");
+
+				return true;
+			}elseif($player->distanceSquared($this) > 4 and $player->distanceSquared($other) > 4){
+				$player->sendMessage(new TranslationContainer(TextFormat::GRAY . "%tile.bed.tooFar"));
+				return true;
+			}
+
+			$time = $this->getLevel()->getTime() % Level::TIME_FULL;
+
+			$isNight = ($time >= Level::TIME_NIGHT and $time < Level::TIME_SUNRISE);
+
+			if(!$isNight){
+				$player->sendMessage(new TranslationContainer(TextFormat::GRAY . "%tile.bed.noSleep"));
 
 				return true;
 			}
-		}
 
-		if($player instanceof Player and $player->sleepOn($b) === false){
-			$pk = new ChatPacket();
-			$pk->message = "This bed is occupied";
-			$player->dataPacket($pk);
+			$b = ($this->isHeadPart() ? $this : $other);
+
+			if($b->isOccupied()){
+				$player->sendMessage(new TranslationContainer(TextFormat::GRAY . "%tile.bed.occupied"));
+
+				return true;
+			}
+
+			$player->sleepOn($b);
 		}
 
 		return true;
+
 	}
 
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$down = $this->getSide(0);
-		if($down->isTransparent() === false){
-			$faces = [
-				0 => 3,
-				1 => 4,
-				2 => 2,
-				3 => 5,
-			];
-			$d = $player instanceof Player ? $player->getDirection() : 0;
-			$next = $this->getSide($faces[(($d + 3) % 4)]);
-			$downNext = $this->getSide(0);
-			if($next->canBeReplaced() === true and $downNext->isTransparent() === false){
-				$meta = (($d + 3) % 4) & 0x03;
-				$this->getLevel()->setBlock($block, Block::get($this->id, $meta), true, true);
-				$this->getLevel()->setBlock($next, Block::get($this->id, $meta | 0x08), true, true);
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		$down = $this->getSide(Vector3::SIDE_DOWN);
+		if(!$down->isTransparent()){
+			$meta = (($player instanceof Player ? $player->getDirection() : 0) - 1) & 0x03;
+			$next = $this->getSide(self::getOtherHalfSide($meta));
+			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);
+
+				Tile::createTile(Tile::BED, $this->getLevel(), TileBed::createNBT($this, $face, $item, $player));
+				Tile::createTile(Tile::BED, $this->getLevel(), TileBed::createNBT($next, $face, $item, $player));
 
 				return true;
 			}
@@ -131,42 +190,36 @@ class Bed extends Transparent{
 		return false;
 	}
 
-	public function onBreak(Item $item){
-		$blockNorth = $this->getSide(2); //Gets the blocks around them
-		$blockSouth = $this->getSide(3);
-		$blockEast = $this->getSide(5);
-		$blockWest = $this->getSide(4);
-
-		if(($this->meta & 0x08) === 0x08){ //This is the Top part of bed
-			if($blockNorth->getId() === $this->id and $blockNorth->meta !== 0x08){ //Checks if the block ID and meta are right
-				$this->getLevel()->setBlock($blockNorth, new Air(), true, true);
-			}elseif($blockSouth->getId() === $this->id and $blockSouth->meta !== 0x08){
-				$this->getLevel()->setBlock($blockSouth, new Air(), true, true);
-			}elseif($blockEast->getId() === $this->id and $blockEast->meta !== 0x08){
-				$this->getLevel()->setBlock($blockEast, new Air(), true, true);
-			}elseif($blockWest->getId() === $this->id and $blockWest->meta !== 0x08){
-				$this->getLevel()->setBlock($blockWest, new Air(), true, true);
-			}
-		}else{ //Bottom Part of Bed
-			if($blockNorth->getId() === $this->id and ($blockNorth->meta & 0x08) === 0x08){
-				$this->getLevel()->setBlock($blockNorth, new Air(), true, true);
-			}elseif($blockSouth->getId() === $this->id and ($blockSouth->meta & 0x08) === 0x08){
-				$this->getLevel()->setBlock($blockSouth, new Air(), true, true);
-			}elseif($blockEast->getId() === $this->id and ($blockEast->meta & 0x08) === 0x08){
-				$this->getLevel()->setBlock($blockEast, new Air(), true, true);
-			}elseif($blockWest->getId() === $this->id and ($blockWest->meta & 0x08) === 0x08){
-				$this->getLevel()->setBlock($blockWest, new Air(), true, true);
-			}
+	public function getDropsForCompatibleTool(Item $item) : array{
+		if($this->isHeadPart()){
+			return [$this->getItem()];
 		}
-		$this->getLevel()->setBlock($this, new Air(), true, true);
 
-		return true;
+		return [];
 	}
 
-	public function getDrops(Item $item){
-		return [
-			[Item::BED, 0, 1],
-		];
+	public function getPickedItem() : Item{
+		return $this->getItem();
 	}
 
-}
+	private function getItem() : Item{
+		$tile = $this->getLevel()->getTile($this);
+		if($tile instanceof TileBed){
+			return ItemFactory::get($this->getItemId(), $tile->getColor());
+		}
+
+		return ItemFactory::get($this->getItemId(), 14); //Red
+	}
+
+	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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,10 +15,12 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
@@ -27,20 +29,23 @@ class Bedrock extends Solid{
 
 	protected $id = self::BEDROCK;
 
-	public function __construct(){
-
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Bedrock";
 	}
 
-	public function getHardness(){
+	public function getHardness() : float{
+		return -1;
+	}
+
+	public function getBlastResistance() : float{
 		return 18000000;
 	}
 
-	public function isBreakable(Item $item){
+	public function isBreakable(Item $item) : bool{
 		return false;
 	}
-
-}
+}

src/pocketmine/block/Beetroot.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,35 +15,43 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 
 class Beetroot extends Crops{
 
 	protected $id = self::BEETROOT_BLOCK;
 
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Beetroot Block";
 	}
 
-	public function getDrops(Item $item){
-		$drops = [];
+	public function getDropsForCompatibleTool(Item $item) : array{
 		if($this->meta >= 0x07){
-			$drops[] = [Item::BEETROOT, 0, 1];
-			$drops[] = [Item::BEETROOT_SEEDS, 0, mt_rand(0, 3)];
-		}else{
-			$drops[] = [Item::BEETROOT_SEEDS, 0, 1];
+			return [
+				ItemFactory::get(Item::BEETROOT),
+				ItemFactory::get(Item::BEETROOT_SEEDS, 0, mt_rand(0, 3))
+			];
 		}
 
-		return $drops;
+		return [
+			ItemFactory::get(Item::BEETROOT_SEEDS)
+		];
 	}
-}
+
+	public function getPickedItem() : Item{
+		return ItemFactory::get(Item::BEETROOT_SEEDS);
+	}
+}

src/pocketmine/block/BlockFactory.php

@@ -0,0 +1,468 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+use pocketmine\level\Position;
+
+/**
+ * Manages block registration and instance creation
+ */
+class BlockFactory{
+	/** @var \SplFixedArray<Block> */
+	private static $fullList = null;
+
+	/** @var \SplFixedArray<bool> */
+	public static $solid = null;
+	/** @var \SplFixedArray<bool> */
+	public static $transparent = null;
+	/** @var \SplFixedArray<float> */
+	public static $hardness = null;
+	/** @var \SplFixedArray<int> */
+	public static $light = null;
+	/** @var \SplFixedArray<int> */
+	public static $lightFilter = null;
+	/** @var \SplFixedArray<bool> */
+	public static $diffusesSkyLight = null;
+	/** @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.
+	 */
+	public static function init() : void{
+		self::$fullList = new \SplFixedArray(4096);
+
+		self::$light = new \SplFixedArray(256);
+		self::$lightFilter = new \SplFixedArray(256);
+		self::$solid = new \SplFixedArray(256);
+		self::$hardness = new \SplFixedArray(256);
+		self::$transparent = new \SplFixedArray(256);
+		self::$diffusesSkyLight = new \SplFixedArray(256);
+		self::$blastResistance = new \SplFixedArray(256);
+
+		self::registerBlock(new Air());
+		self::registerBlock(new Stone());
+		self::registerBlock(new Grass());
+		self::registerBlock(new Dirt());
+		self::registerBlock(new Cobblestone());
+		self::registerBlock(new Planks());
+		self::registerBlock(new Sapling());
+		self::registerBlock(new Bedrock());
+		self::registerBlock(new Water());
+		self::registerBlock(new StillWater());
+		self::registerBlock(new Lava());
+		self::registerBlock(new StillLava());
+		self::registerBlock(new Sand());
+		self::registerBlock(new Gravel());
+		self::registerBlock(new GoldOre());
+		self::registerBlock(new IronOre());
+		self::registerBlock(new CoalOre());
+		self::registerBlock(new Wood());
+		self::registerBlock(new Leaves());
+		self::registerBlock(new Sponge());
+		self::registerBlock(new Glass());
+		self::registerBlock(new LapisOre());
+		self::registerBlock(new Lapis());
+		//TODO: DISPENSER
+		self::registerBlock(new Sandstone());
+		self::registerBlock(new NoteBlock());
+		self::registerBlock(new Bed());
+		self::registerBlock(new PoweredRail());
+		self::registerBlock(new DetectorRail());
+		//TODO: STICKY_PISTON
+		self::registerBlock(new Cobweb());
+		self::registerBlock(new TallGrass());
+		self::registerBlock(new DeadBush());
+		//TODO: PISTON
+		//TODO: PISTONARMCOLLISION
+		self::registerBlock(new Wool());
+
+		self::registerBlock(new Dandelion());
+		self::registerBlock(new Flower());
+		self::registerBlock(new BrownMushroom());
+		self::registerBlock(new RedMushroom());
+		self::registerBlock(new Gold());
+		self::registerBlock(new Iron());
+		self::registerBlock(new DoubleStoneSlab());
+		self::registerBlock(new StoneSlab());
+		self::registerBlock(new Bricks());
+		self::registerBlock(new TNT());
+		self::registerBlock(new Bookshelf());
+		self::registerBlock(new MossyCobblestone());
+		self::registerBlock(new Obsidian());
+		self::registerBlock(new Torch());
+		self::registerBlock(new Fire());
+		self::registerBlock(new MonsterSpawner());
+		self::registerBlock(new WoodenStairs(Block::OAK_STAIRS, 0, "Oak Stairs"));
+		self::registerBlock(new Chest());
+		//TODO: REDSTONE_WIRE
+		self::registerBlock(new DiamondOre());
+		self::registerBlock(new Diamond());
+		self::registerBlock(new CraftingTable());
+		self::registerBlock(new Wheat());
+		self::registerBlock(new Farmland());
+		self::registerBlock(new Furnace());
+		self::registerBlock(new BurningFurnace());
+		self::registerBlock(new SignPost());
+		self::registerBlock(new WoodenDoor(Block::OAK_DOOR_BLOCK, 0, "Oak Door", Item::OAK_DOOR));
+		self::registerBlock(new Ladder());
+		self::registerBlock(new Rail());
+		self::registerBlock(new CobblestoneStairs());
+		self::registerBlock(new WallSign());
+		self::registerBlock(new Lever());
+		self::registerBlock(new StonePressurePlate());
+		self::registerBlock(new IronDoor());
+		self::registerBlock(new WoodenPressurePlate());
+		self::registerBlock(new RedstoneOre());
+		self::registerBlock(new GlowingRedstoneOre());
+		self::registerBlock(new RedstoneTorchUnlit());
+		self::registerBlock(new RedstoneTorch());
+		self::registerBlock(new StoneButton());
+		self::registerBlock(new SnowLayer());
+		self::registerBlock(new Ice());
+		self::registerBlock(new Snow());
+		self::registerBlock(new Cactus());
+		self::registerBlock(new Clay());
+		self::registerBlock(new Sugarcane());
+		//TODO: JUKEBOX
+		self::registerBlock(new WoodenFence());
+		self::registerBlock(new Pumpkin());
+		self::registerBlock(new Netherrack());
+		self::registerBlock(new SoulSand());
+		self::registerBlock(new Glowstone());
+		//TODO: PORTAL
+		self::registerBlock(new LitPumpkin());
+		self::registerBlock(new Cake());
+		//TODO: REPEATER_BLOCK
+		//TODO: POWERED_REPEATER
+		//TODO: INVISIBLEBEDROCK
+		self::registerBlock(new Trapdoor());
+		//TODO: MONSTER_EGG
+		self::registerBlock(new StoneBricks());
+		self::registerBlock(new BrownMushroomBlock());
+		self::registerBlock(new RedMushroomBlock());
+		self::registerBlock(new IronBars());
+		self::registerBlock(new GlassPane());
+		self::registerBlock(new Melon());
+		self::registerBlock(new PumpkinStem());
+		self::registerBlock(new MelonStem());
+		self::registerBlock(new Vine());
+		self::registerBlock(new FenceGate(Block::OAK_FENCE_GATE, 0, "Oak Fence Gate"));
+		self::registerBlock(new BrickStairs());
+		self::registerBlock(new StoneBrickStairs());
+		self::registerBlock(new Mycelium());
+		self::registerBlock(new WaterLily());
+		self::registerBlock(new NetherBrick(Block::NETHER_BRICK_BLOCK, 0, "Nether Bricks"));
+		self::registerBlock(new NetherBrickFence());
+		self::registerBlock(new NetherBrickStairs());
+		self::registerBlock(new NetherWartPlant());
+		self::registerBlock(new EnchantingTable());
+		self::registerBlock(new BrewingStand());
+		//TODO: CAULDRON_BLOCK
+		//TODO: END_PORTAL
+		self::registerBlock(new EndPortalFrame());
+		self::registerBlock(new EndStone());
+		//TODO: DRAGON_EGG
+		self::registerBlock(new RedstoneLamp());
+		self::registerBlock(new LitRedstoneLamp());
+		//TODO: DROPPER
+		self::registerBlock(new ActivatorRail());
+		self::registerBlock(new CocoaBlock());
+		self::registerBlock(new SandstoneStairs());
+		self::registerBlock(new EmeraldOre());
+		self::registerBlock(new EnderChest());
+		self::registerBlock(new TripwireHook());
+		self::registerBlock(new Tripwire());
+		self::registerBlock(new Emerald());
+		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::JUNGLE_STAIRS, 0, "Jungle Stairs"));
+		//TODO: COMMAND_BLOCK
+		//TODO: BEACON
+		self::registerBlock(new CobblestoneWall());
+		self::registerBlock(new FlowerPot());
+		self::registerBlock(new Carrot());
+		self::registerBlock(new Potato());
+		self::registerBlock(new WoodenButton());
+		self::registerBlock(new Skull());
+		self::registerBlock(new Anvil());
+		self::registerBlock(new TrappedChest());
+		self::registerBlock(new WeightedPressurePlateLight());
+		self::registerBlock(new WeightedPressurePlateHeavy());
+		//TODO: COMPARATOR_BLOCK
+		//TODO: POWERED_COMPARATOR
+		self::registerBlock(new DaylightSensor());
+		self::registerBlock(new Redstone());
+		self::registerBlock(new NetherQuartzOre());
+		//TODO: HOPPER_BLOCK
+		self::registerBlock(new Quartz());
+		self::registerBlock(new QuartzStairs());
+		self::registerBlock(new DoubleWoodenSlab());
+		self::registerBlock(new WoodenSlab());
+		self::registerBlock(new StainedClay());
+		self::registerBlock(new StainedGlassPane());
+		self::registerBlock(new Leaves2());
+		self::registerBlock(new Wood2());
+		self::registerBlock(new WoodenStairs(Block::ACACIA_STAIRS, 0, "Acacia Stairs"));
+		self::registerBlock(new WoodenStairs(Block::DARK_OAK_STAIRS, 0, "Dark Oak Stairs"));
+		//TODO: SLIME
+
+		self::registerBlock(new IronTrapdoor());
+		self::registerBlock(new Prismarine());
+		self::registerBlock(new SeaLantern());
+		self::registerBlock(new HayBale());
+		self::registerBlock(new Carpet());
+		self::registerBlock(new HardenedClay());
+		self::registerBlock(new Coal());
+		self::registerBlock(new PackedIce());
+		self::registerBlock(new DoublePlant());
+		self::registerBlock(new StandingBanner());
+		self::registerBlock(new WallBanner());
+		//TODO: DAYLIGHT_DETECTOR_INVERTED
+		self::registerBlock(new RedSandstone());
+		self::registerBlock(new RedSandstoneStairs());
+		self::registerBlock(new DoubleStoneSlab2());
+		self::registerBlock(new StoneSlab2());
+		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::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::ACACIA_FENCE_GATE, 0, "Acacia Fence Gate"));
+		//TODO: REPEATING_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::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::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 GrassPath());
+		self::registerBlock(new ItemFrame());
+		//TODO: CHORUS_FLOWER
+		self::registerBlock(new Purpur());
+
+		self::registerBlock(new PurpurStairs());
+
+		//TODO: UNDYED_SHULKER_BOX
+		self::registerBlock(new EndStoneBricks());
+		//TODO: FROSTED_ICE
+		self::registerBlock(new EndRod());
+		//TODO: END_GATEWAY
+
+		self::registerBlock(new Magma());
+		self::registerBlock(new NetherWartBlock());
+		self::registerBlock(new NetherBrick(Block::RED_NETHER_BRICK, 0, "Red Nether Bricks"));
+		self::registerBlock(new BoneBlock());
+
+		//TODO: SHULKER_BOX
+		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::ORANGE_GLAZED_TERRACOTTA, 0, "Orange 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::YELLOW_GLAZED_TERRACOTTA, 0, "Yellow 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::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::CYAN_GLAZED_TERRACOTTA, 0, "Cyan 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::GREEN_GLAZED_TERRACOTTA, 0, "Green 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 Concrete());
+		self::registerBlock(new ConcretePowder());
+
+		//TODO: CHORUS_PLANT
+		self::registerBlock(new StainedGlass());
+
+		self::registerBlock(new Podzol());
+		self::registerBlock(new Beetroot());
+		self::registerBlock(new Stonecutter());
+		self::registerBlock(new GlowingObsidian());
+		self::registerBlock(new NetherReactor());
+		//TODO: INFO_UPDATE
+		//TODO: INFO_UPDATE2
+		//TODO: MOVINGBLOCK
+		//TODO: OBSERVER
+		//TODO: STRUCTURE_BLOCK
+
+		//TODO: RESERVED6
+
+		for($id = 0, $size = self::$fullList->getSize() >> 4; $id < $size; ++$id){
+			if(self::$fullList[$id << 4] === null){
+				self::registerBlock(new UnknownBlock($id));
+			}
+		}
+	}
+
+	public static function isInit() : bool{
+		return self::$fullList !== null;
+	}
+
+	/**
+	 * Registers a block type into the index. Plugins may use this method to register new block types or override
+	 * existing ones.
+	 *
+	 * NOTE: If you are registering a new block type, you will need to add it to the creative inventory yourself - it
+	 * will not automatically appear there.
+	 *
+	 * @param Block $block
+	 * @param bool  $override Whether to override existing registrations
+	 *
+	 * @throws \RuntimeException if something attempted to override an already-registered block without specifying the
+	 * $override parameter.
+	 */
+	public static function registerBlock(Block $block, bool $override = false) : void{
+		$id = $block->getId();
+
+		if(!$override and self::isRegistered($id)){
+			throw new \RuntimeException("Trying to overwrite an already registered block");
+		}
+
+		for($meta = 0; $meta < 16; ++$meta){
+			$variant = clone $block;
+			$variant->setDamage($meta);
+			self::$fullList[($id << 4) | $meta] = $variant;
+		}
+
+		self::$solid[$id] = $block->isSolid();
+		self::$transparent[$id] = $block->isTransparent();
+		self::$hardness[$id] = $block->getHardness();
+		self::$light[$id] = $block->getLightLevel();
+		self::$lightFilter[$id] = min(15, $block->getLightFilter() + 1); //opacity plus 1 standard light filter
+		self::$diffusesSkyLight[$id] = $block->diffusesSkyLight();
+		self::$blastResistance[$id] = $block->getBlastResistance();
+	}
+
+	/**
+	 * Returns a new Block instance with the specified ID, meta and position.
+	 *
+	 * @param int      $id
+	 * @param int      $meta
+	 * @param Position $pos
+	 *
+	 * @return Block
+	 */
+	public static function get(int $id, int $meta = 0, Position $pos = null) : Block{
+		if($meta < 0 or $meta > 0xf){
+			throw new \InvalidArgumentException("Block meta value $meta is out of bounds");
+		}
+
+		try{
+			if(self::$fullList !== null){
+				$block = clone self::$fullList[($id << 4) | $meta];
+			}else{
+				$block = new UnknownBlock($id, $meta);
+			}
+		}catch(\RuntimeException $e){
+			throw new \InvalidArgumentException("Block ID $id is out of bounds");
+		}
+
+		if($pos !== null){
+			$block->x = $pos->getFloorX();
+			$block->y = $pos->getFloorY();
+			$block->z = $pos->getFloorZ();
+			$block->level = $pos->level;
+		}
+
+		return $block;
+	}
+
+	/**
+	 * @internal
+	 * @return \SplFixedArray
+	 */
+	public static function getBlockStatesArray() : \SplFixedArray{
+		return self::$fullList;
+	}
+
+	/**
+	 * Returns whether a specified block ID is already registered in the block factory.
+	 *
+	 * @param int $id
+	 *
+	 * @return bool
+	 */
+	public static function isRegistered(int $id) : bool{
+		$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 $k => $obj){
+			self::registerMapping($k, $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/BlockIds.php

@@ -0,0 +1,279 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+interface BlockIds{
+
+	public const AIR = 0;
+	public const STONE = 1;
+	public const GRASS = 2;
+	public const DIRT = 3;
+	public const COBBLESTONE = 4;
+	public const PLANKS = 5, WOODEN_PLANKS = 5;
+	public const SAPLING = 6;
+	public const BEDROCK = 7;
+	public const FLOWING_WATER = 8;
+	public const STILL_WATER = 9, WATER = 9;
+	public const FLOWING_LAVA = 10;
+	public const LAVA = 11, STILL_LAVA = 11;
+	public const SAND = 12;
+	public const GRAVEL = 13;
+	public const GOLD_ORE = 14;
+	public const IRON_ORE = 15;
+	public const COAL_ORE = 16;
+	public const LOG = 17, WOOD = 17;
+	public const LEAVES = 18;
+	public const SPONGE = 19;
+	public const GLASS = 20;
+	public const LAPIS_ORE = 21;
+	public const LAPIS_BLOCK = 22;
+	public const DISPENSER = 23;
+	public const SANDSTONE = 24;
+	public const NOTEBLOCK = 25, NOTE_BLOCK = 25;
+	public const BED_BLOCK = 26;
+	public const GOLDEN_RAIL = 27, POWERED_RAIL = 27;
+	public const DETECTOR_RAIL = 28;
+	public const STICKY_PISTON = 29;
+	public const COBWEB = 30, WEB = 30;
+	public const TALLGRASS = 31, TALL_GRASS = 31;
+	public const DEADBUSH = 32, DEAD_BUSH = 32;
+	public const PISTON = 33;
+	public const PISTONARMCOLLISION = 34, PISTON_ARM_COLLISION = 34;
+	public const WOOL = 35;
+
+	public const DANDELION = 37, YELLOW_FLOWER = 37;
+	public const POPPY = 38, RED_FLOWER = 38;
+	public const BROWN_MUSHROOM = 39;
+	public const RED_MUSHROOM = 40;
+	public const GOLD_BLOCK = 41;
+	public const IRON_BLOCK = 42;
+	public const DOUBLE_STONE_SLAB = 43;
+	public const STONE_SLAB = 44;
+	public const BRICK_BLOCK = 45;
+	public const TNT = 46;
+	public const BOOKSHELF = 47;
+	public const MOSSY_COBBLESTONE = 48, MOSS_STONE = 48;
+	public const OBSIDIAN = 49;
+	public const TORCH = 50;
+	public const FIRE = 51;
+	public const MOB_SPAWNER = 52, MONSTER_SPAWNER = 52;
+	public const OAK_STAIRS = 53, WOODEN_STAIRS = 53;
+	public const CHEST = 54;
+	public const REDSTONE_WIRE = 55;
+	public const DIAMOND_ORE = 56;
+	public const DIAMOND_BLOCK = 57;
+	public const CRAFTING_TABLE = 58, WORKBENCH = 58;
+	public const WHEAT_BLOCK = 59;
+	public const FARMLAND = 60;
+	public const FURNACE = 61;
+	public const BURNING_FURNACE = 62, LIT_FURNACE = 62;
+	public const SIGN_POST = 63, STANDING_SIGN = 63;
+	public const OAK_DOOR_BLOCK = 64, WOODEN_DOOR_BLOCK = 64;
+	public const LADDER = 65;
+	public const RAIL = 66;
+	public const COBBLESTONE_STAIRS = 67, STONE_STAIRS = 67;
+	public const WALL_SIGN = 68;
+	public const LEVER = 69;
+	public const STONE_PRESSURE_PLATE = 70;
+	public const IRON_DOOR_BLOCK = 71;
+	public const WOODEN_PRESSURE_PLATE = 72;
+	public const REDSTONE_ORE = 73;
+	public const GLOWING_REDSTONE_ORE = 74, LIT_REDSTONE_ORE = 74;
+	public const UNLIT_REDSTONE_TORCH = 75;
+	public const LIT_REDSTONE_TORCH = 76, REDSTONE_TORCH = 76;
+	public const STONE_BUTTON = 77;
+	public const SNOW_LAYER = 78;
+	public const ICE = 79;
+	public const SNOW = 80, SNOW_BLOCK = 80;
+	public const CACTUS = 81;
+	public const CLAY_BLOCK = 82;
+	public const REEDS_BLOCK = 83, SUGARCANE_BLOCK = 83;
+	public const JUKEBOX = 84;
+	public const FENCE = 85;
+	public const PUMPKIN = 86;
+	public const NETHERRACK = 87;
+	public const SOUL_SAND = 88;
+	public const GLOWSTONE = 89;
+	public const PORTAL = 90;
+	public const JACK_O_LANTERN = 91, LIT_PUMPKIN = 91;
+	public const CAKE_BLOCK = 92;
+	public const REPEATER_BLOCK = 93, UNPOWERED_REPEATER = 93;
+	public const POWERED_REPEATER = 94;
+	public const INVISIBLEBEDROCK = 95, INVISIBLE_BEDROCK = 95;
+	public const TRAPDOOR = 96, WOODEN_TRAPDOOR = 96;
+	public const MONSTER_EGG = 97;
+	public const STONEBRICK = 98, STONE_BRICK = 98, STONE_BRICKS = 98;
+	public const BROWN_MUSHROOM_BLOCK = 99;
+	public const RED_MUSHROOM_BLOCK = 100;
+	public const IRON_BARS = 101;
+	public const GLASS_PANE = 102;
+	public const MELON_BLOCK = 103;
+	public const PUMPKIN_STEM = 104;
+	public const MELON_STEM = 105;
+	public const VINE = 106, VINES = 106;
+	public const FENCE_GATE = 107, OAK_FENCE_GATE = 107;
+	public const BRICK_STAIRS = 108;
+	public const STONE_BRICK_STAIRS = 109;
+	public const MYCELIUM = 110;
+	public const LILY_PAD = 111, WATERLILY = 111, WATER_LILY = 111;
+	public const NETHER_BRICK_BLOCK = 112;
+	public const NETHER_BRICK_FENCE = 113;
+	public const NETHER_BRICK_STAIRS = 114;
+	public const NETHER_WART_PLANT = 115;
+	public const ENCHANTING_TABLE = 116, ENCHANTMENT_TABLE = 116;
+	public const BREWING_STAND_BLOCK = 117;
+	public const CAULDRON_BLOCK = 118;
+	public const END_PORTAL = 119;
+	public const END_PORTAL_FRAME = 120;
+	public const END_STONE = 121;
+	public const DRAGON_EGG = 122;
+	public const REDSTONE_LAMP = 123;
+	public const LIT_REDSTONE_LAMP = 124;
+	public const DROPPER = 125;
+	public const ACTIVATOR_RAIL = 126;
+	public const COCOA = 127, COCOA_BLOCK = 127;
+	public const SANDSTONE_STAIRS = 128;
+	public const EMERALD_ORE = 129;
+	public const ENDER_CHEST = 130;
+	public const TRIPWIRE_HOOK = 131;
+	public const TRIPWIRE = 132, TRIP_WIRE = 132;
+	public const EMERALD_BLOCK = 133;
+	public const SPRUCE_STAIRS = 134;
+	public const BIRCH_STAIRS = 135;
+	public const JUNGLE_STAIRS = 136;
+	public const COMMAND_BLOCK = 137;
+	public const BEACON = 138;
+	public const COBBLESTONE_WALL = 139, STONE_WALL = 139;
+	public const FLOWER_POT_BLOCK = 140;
+	public const CARROTS = 141, CARROT_BLOCK = 141;
+	public const POTATOES = 142, POTATO_BLOCK = 142;
+	public const WOODEN_BUTTON = 143;
+	public const MOB_HEAD_BLOCK = 144, SKULL_BLOCK = 144;
+	public const ANVIL = 145;
+	public const TRAPPED_CHEST = 146;
+	public const LIGHT_WEIGHTED_PRESSURE_PLATE = 147;
+	public const HEAVY_WEIGHTED_PRESSURE_PLATE = 148;
+	public const COMPARATOR_BLOCK = 149, UNPOWERED_COMPARATOR = 149;
+	public const POWERED_COMPARATOR = 150;
+	public const DAYLIGHT_DETECTOR = 151, DAYLIGHT_SENSOR = 151;
+	public const REDSTONE_BLOCK = 152;
+	public const NETHER_QUARTZ_ORE = 153, QUARTZ_ORE = 153;
+	public const HOPPER_BLOCK = 154;
+	public const QUARTZ_BLOCK = 155;
+	public const QUARTZ_STAIRS = 156;
+	public const DOUBLE_WOODEN_SLAB = 157;
+	public const WOODEN_SLAB = 158;
+	public const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159, TERRACOTTA = 159;
+	public const STAINED_GLASS_PANE = 160;
+	public const LEAVES2 = 161;
+	public const LOG2 = 162, WOOD2 = 162;
+	public const ACACIA_STAIRS = 163;
+	public const DARK_OAK_STAIRS = 164;
+	public const SLIME = 165, SLIME_BLOCK = 165;
+
+	public const IRON_TRAPDOOR = 167;
+	public const PRISMARINE = 168;
+	public const SEALANTERN = 169, SEA_LANTERN = 169;
+	public const HAY_BALE = 170, HAY_BLOCK = 170;
+	public const CARPET = 171;
+	public const HARDENED_CLAY = 172;
+	public const COAL_BLOCK = 173;
+	public const PACKED_ICE = 174;
+	public const DOUBLE_PLANT = 175;
+	public const STANDING_BANNER = 176;
+	public const WALL_BANNER = 177;
+	public const DAYLIGHT_DETECTOR_INVERTED = 178, DAYLIGHT_SENSOR_INVERTED = 178;
+	public const RED_SANDSTONE = 179;
+	public const RED_SANDSTONE_STAIRS = 180;
+	public const DOUBLE_STONE_SLAB2 = 181;
+	public const STONE_SLAB2 = 182;
+	public const SPRUCE_FENCE_GATE = 183;
+	public const BIRCH_FENCE_GATE = 184;
+	public const JUNGLE_FENCE_GATE = 185;
+	public const DARK_OAK_FENCE_GATE = 186;
+	public const ACACIA_FENCE_GATE = 187;
+	public const REPEATING_COMMAND_BLOCK = 188;
+	public const CHAIN_COMMAND_BLOCK = 189;
+
+	public const SPRUCE_DOOR_BLOCK = 193;
+	public const BIRCH_DOOR_BLOCK = 194;
+	public const JUNGLE_DOOR_BLOCK = 195;
+	public const ACACIA_DOOR_BLOCK = 196;
+	public const DARK_OAK_DOOR_BLOCK = 197;
+	public const GRASS_PATH = 198;
+	public const FRAME_BLOCK = 199, ITEM_FRAME_BLOCK = 199;
+	public const CHORUS_FLOWER = 200;
+	public const PURPUR_BLOCK = 201;
+
+	public const PURPUR_STAIRS = 203;
+
+	public const UNDYED_SHULKER_BOX = 205;
+	public const END_BRICKS = 206;
+	public const FROSTED_ICE = 207;
+	public const END_ROD = 208;
+	public const END_GATEWAY = 209;
+
+	public const MAGMA = 213;
+	public const NETHER_WART_BLOCK = 214;
+	public const RED_NETHER_BRICK = 215;
+	public const BONE_BLOCK = 216;
+
+	public const SHULKER_BOX = 218;
+	public const PURPLE_GLAZED_TERRACOTTA = 219;
+	public const WHITE_GLAZED_TERRACOTTA = 220;
+	public const ORANGE_GLAZED_TERRACOTTA = 221;
+	public const MAGENTA_GLAZED_TERRACOTTA = 222;
+	public const LIGHT_BLUE_GLAZED_TERRACOTTA = 223;
+	public const YELLOW_GLAZED_TERRACOTTA = 224;
+	public const LIME_GLAZED_TERRACOTTA = 225;
+	public const PINK_GLAZED_TERRACOTTA = 226;
+	public const GRAY_GLAZED_TERRACOTTA = 227;
+	public const SILVER_GLAZED_TERRACOTTA = 228;
+	public const CYAN_GLAZED_TERRACOTTA = 229;
+
+	public const BLUE_GLAZED_TERRACOTTA = 231;
+	public const BROWN_GLAZED_TERRACOTTA = 232;
+	public const GREEN_GLAZED_TERRACOTTA = 233;
+	public const RED_GLAZED_TERRACOTTA = 234;
+	public const BLACK_GLAZED_TERRACOTTA = 235;
+	public const CONCRETE = 236;
+	public const CONCRETEPOWDER = 237, CONCRETE_POWDER = 237;
+
+	public const CHORUS_PLANT = 240;
+	public const STAINED_GLASS = 241;
+
+	public const PODZOL = 243;
+	public const BEETROOT_BLOCK = 244;
+	public const STONECUTTER = 245;
+	public const GLOWINGOBSIDIAN = 246, GLOWING_OBSIDIAN = 246;
+	public const NETHERREACTOR = 247, NETHER_REACTOR = 247;
+	public const INFO_UPDATE = 248;
+	public const INFO_UPDATE2 = 249;
+	public const MOVINGBLOCK = 250, MOVING_BLOCK = 250;
+	public const OBSERVER = 251;
+	public const STRUCTURE_BLOCK = 252;
+
+	public const RESERVED6 = 255;
+
+}

src/pocketmine/block/BlockToolType.php

@@ -0,0 +1,39 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+/**
+ * Types of tools that can be used to break blocks
+ * Blocks may allow multiple tool types by combining these bitflags
+ */
+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;
+
+}

src/pocketmine/block/BoneBlock.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\PillarRotationHelper;
+use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
+
+class BoneBlock extends Solid{
+
+	protected $id = Block::BONE_BLOCK;
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName() : string{
+		return "Bone Block";
+	}
+
+	public function getHardness() : float{
+		return 2;
+	}
+
+	public function getToolType() : int{
+		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{
+		$this->meta = PillarRotationHelper::getMetaFromFace($this->meta, $face);
+		return $this->getLevel()->setBlock($blockReplace, $this, true, true);
+	}
+
+	public function getVariantBitmask() : int{
+		return 0x03;
+	}
+}

src/pocketmine/block/Bookshelf.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,27 +15,52 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
+use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 
 class Bookshelf extends Solid{
 
 	protected $id = self::BOOKSHELF;
 
-	public function __construct(){
-
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Bookshelf";
 	}
 
-	public function getHardness(){
-		return 7.5;
+	public function getHardness() : float{
+		return 1.5;
 	}
 
-}
+	public function getToolType() : int{
+		return BlockToolType::TYPE_AXE;
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [
+			ItemFactory::get(Item::BOOK, 0, 3)
+		];
+	}
+
+	public function getFuelTime() : int{
+		return 300;
+	}
+
+	public function getFlameEncouragement() : int{
+		return 30;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
+}

src/pocketmine/block/BrewingStand.php

@@ -0,0 +1,60 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
+
+class BrewingStand extends Transparent{
+
+	protected $id = self::BREWING_STAND_BLOCK;
+
+	protected $itemId = Item::BREWING_STAND;
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName() : string{
+		return "Brewing Stand";
+	}
+
+	public function getHardness() : float{
+		return 0.5;
+	}
+
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
+	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+
+	//TODO
+}

src/pocketmine/block/BrickStairs.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,23 +15,41 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
+use pocketmine\item\TieredTool;
 
 class BrickStairs extends Stair{
 
 	protected $id = self::BRICK_STAIRS;
 
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function getName(){
-		return "Brick Stairs";
+	public function getHardness() : float{
+		return 2;
 	}
 
-}
+	public function getBlastResistance() : float{
+		return 30;
+	}
+
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
+	}
+
+	public function getName() : string{
+		return "Brick Stairs";
+	}
+}

src/pocketmine/block/Bricks.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,54 +15,41 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
 
 class Bricks extends Solid{
 
-	protected $id = self::BRICKS_BLOCK;
-
-	public function __construct(){
+	protected $id = self::BRICK_BLOCK;
 
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getHardness(){
+	public function getHardness() : float{
+		return 2;
+	}
+
+	public function getBlastResistance() : float{
 		return 30;
 	}
 
-	public function getName(){
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
+	}
+
+	public function getName() : string{
 		return "Bricks";
 	}
-
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.4;
-			case 4:
-				return 0.5;
-			case 3:
-				return 0.75;
-			case 2:
-				return 0.25;
-			case 1:
-				return 1.5;
-			default:
-				return 10;
-		}
-	}
-
-	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 1){
-			return [
-				[Item::BRICKS_BLOCK, 0, 1],
-			];
-		}else{
-			return [];
-		}
-	}
-}
+}

src/pocketmine/block/BrownMushroom.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,57 +15,23 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\Player;
-
-class BrownMushroom extends Flowable{
+class BrownMushroom extends RedMushroom{
 
 	protected $id = self::BROWN_MUSHROOM;
 
-	public function __construct($meta = 0){
-		$this->meta = $meta;
-	}
-
-	public function getName(){
+	public function getName() : string{
 		return "Brown Mushroom";
 	}
 
-	public function getLightLevel(){
+	public function getLightLevel() : int{
 		return 1;
 	}
-
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent() === true){
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}
-
-		return false;
-	}
-
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$down = $this->getSide(0);
-		if($down->isTransparent() === false){
-			$this->getLevel()->setBlock($block, $this, true, true);
-
-			return true;
-		}
-
-		return false;
-	}
-
-	public function getBoundingBox(){
-		return null;
-	}
-
-}
+}

src/pocketmine/block/BrownMushroomBlock.php

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

src/pocketmine/block/BurningFurnace.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,93 +15,74 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\nbt\NBT;
-use pocketmine\nbt\tag\Compound;
-use pocketmine\nbt\tag\Enum;
-use pocketmine\nbt\tag\Int;
-use pocketmine\nbt\tag\String;
+use pocketmine\item\TieredTool;
+use pocketmine\math\Vector3;
 use pocketmine\Player;
-use pocketmine\tile\Furnace;
+use pocketmine\tile\Furnace as TileFurnace;
 use pocketmine\tile\Tile;
 
 class BurningFurnace extends Solid{
 
 	protected $id = self::BURNING_FURNACE;
 
-	public function __construct($meta = 0){
+	protected $itemId = self::FURNACE;
+
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Burning Furnace";
 	}
 
-	public function canBeActivated(){
-		return true;
+	public function getHardness() : float{
+		return 3.5;
 	}
 
-	public function getHardness(){
-		return 17.5;
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
-	public function getLightLevel(){
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
+	}
+
+	public function getLightLevel() : int{
 		return 13;
 	}
 
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$faces = [
 			0 => 4,
 			1 => 2,
 			2 => 5,
-			3 => 3,
+			3 => 3
 		];
 		$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0];
-		$this->getLevel()->setBlock($block, $this, true, true);
-		$nbt = new Compound(false, [
-			new Enum("Items", []),
-			new String("id", Tile::FURNACE),
-			new Int("x", $this->x),
-			new Int("y", $this->y),
-			new Int("z", $this->z)
-		]);
-		$nbt->Items->setTagType(NBT::TAG_Compound);
-		Tile::createTile("Furnace", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+		$this->getLevel()->setBlock($blockReplace, $this, true, true);
+
+		Tile::createTile(Tile::FURNACE, $this->getLevel(), TileFurnace::createNBT($this, $face, $item, $player));
 
 		return true;
 	}
 
-	public function onBreak(Item $item){
-		$this->getLevel()->setBlock($this, new Air(), true, true);
-
-		return true;
-	}
-
-	public function onActivate(Item $item, Player $player = null){
+	public function onActivate(Item $item, Player $player = null) : bool{
 		if($player instanceof Player){
-			$t = $this->getLevel()->getTile($this);
-			$furnace = false;
-			if($t instanceof Furnace){
-				$furnace = $t;
-			}else{
-				$nbt = new Compound(false, [
-					new Enum("Items", []),
-					new String("id", Tile::FURNACE),
-					new Int("x", $this->x),
-					new Int("y", $this->y),
-					new Int("z", $this->z)
-				]);
-				$nbt->Items->setTagType(NBT::TAG_Compound);
-				$furnace = Tile::createTile("Furnace", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+			$furnace = $this->getLevel()->getTile($this);
+			if(!($furnace instanceof TileFurnace)){
+				$furnace = Tile::createTile(Tile::FURNACE, $this->getLevel(), TileFurnace::createNBT($this));
 			}
 
-			if(($player->getGamemode() & 0x01) === 0x01){
+			if(!$furnace->canOpenWith($item->getCustomName())){
 				return true;
 			}
 
@@ -111,29 +92,7 @@ class BurningFurnace extends Solid{
 		return true;
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.7;
-			case 4:
-				return 0.9;
-			case 3:
-				return 1.35;
-			case 2:
-				return 0.45;
-			case 1:
-				return 2.65;
-			default:
-				return 17.5;
-		}
+	public function getVariantBitmask() : int{
+		return 0;
 	}
-
-	public function getDrops(Item $item){
-		$drops = [];
-		if($item->isPickaxe() >= 1){
-			$drops[] = [Item::FURNACE, 0, 1];
-		}
-
-		return $drops;
-	}
-}
+}

src/pocketmine/block/Button.php

@@ -0,0 +1,51 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
+
+abstract class Button extends Flowable{
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		//TODO: check valid target block
+		$this->meta = $face;
+
+		return $this->level->setBlock($this, $this, true, true);
+	}
+
+	public function onActivate(Item $item, Player $player = null) : bool{
+		//TODO
+		return true;
+	}
+}

src/pocketmine/block/Cactus.php

@@ -19,110 +19,105 @@
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageEvent;
-use pocketmine\inventory\InventoryHolder;
-use pocketmine\inventory\PlayerInventory;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
-use pocketmine\Server;
 
 class Cactus extends Transparent{
 
 	protected $id = self::CACTUS;
 
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function getHardness(){
-		return 2;
+	public function getHardness() : float{
+		return 0.4;
 	}
 
-	public function hasEntityCollision(){
+	public function hasEntityCollision() : bool{
 		return true;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Cactus";
 	}
 
-	protected function recalculateBoundingBox(){
+	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 
 		return new AxisAlignedBB(
 			$this->x + 0.0625,
-			$this->y,
+			$this->y + 0.0625,
 			$this->z + 0.0625,
 			$this->x + 0.9375,
-			$this->y + 1,
+			$this->y + 0.9375,
 			$this->z + 0.9375
 		);
 	}
 
-	public function onEntityCollide(Entity $entity){
-		$damage = [EntityDamageEvent::MODIFIER_BASE => 1];
-		if($entity instanceof InventoryHolder){
-			$inventory = $entity->getInventory();
-			if($inventory instanceof PlayerInventory){
-				$damage[EntityDamageEvent::MODIFIER_ARMOR] = $inventory->getArmorPoints();
-			}
-		}
-		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_CONTACT, $damage);
-		$entity->attack($ev->getFinalDamage(), $ev);
+	public function onEntityCollide(Entity $entity) : void{
+		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_CONTACT, 1);
+		$entity->attack($ev);
 	}
 
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			$down = $this->getSide(0);
-			if($down->getId() !== self::SAND and $down->getId() !== self::CACTUS){
-				$this->getLevel()->useBreakOn($this);
-			}else{
-				for($side = 2; $side <= 5; ++$side){
-					$b = $this->getSide($side);
-					if(!$b->canBeFlowedInto()){
-						$this->getLevel()->useBreakOn($this);
-					}
+	public function onNearbyBlockChange() : void{
+		$down = $this->getSide(Vector3::SIDE_DOWN);
+		if($down->getId() !== self::SAND and $down->getId() !== self::CACTUS){
+			$this->getLevel()->useBreakOn($this);
+		}else{
+			for($side = 2; $side <= 5; ++$side){
+				$b = $this->getSide($side);
+				if($b->isSolid()){
+					$this->getLevel()->useBreakOn($this);
+					break;
 				}
 			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if($this->getSide(0)->getId() !== self::CACTUS){
-				if($this->meta == 0x0F){
-					for($y = 1; $y < 3; ++$y){
-						$b = $this->getLevel()->getBlock(new Vector3($this->x, $this->y + $y, $this->z));
-						if($b->getId() === self::AIR){
-							Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($b, new Cactus()));
-							if(!$ev->isCancelled()){
-								$this->getLevel()->setBlock($b, $ev->getNewState(), true);
-							}
+		}
+	}
+
+	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){
+						$ev = new BlockGrowEvent($b, BlockFactory::get(Block::CACTUS));
+						$ev->call();
+						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);
 				}
+				$this->meta = 0;
+				$this->getLevel()->setBlock($this, $this);
+			}else{
+				++$this->meta;
+				$this->getLevel()->setBlock($this, $this);
 			}
 		}
-
-		return false;
 	}
 
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$down = $this->getSide(0);
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		$down = $this->getSide(Vector3::SIDE_DOWN);
 		if($down->getId() === self::SAND or $down->getId() === self::CACTUS){
-			$block0 = $this->getSide(2);
-			$block1 = $this->getSide(3);
-			$block2 = $this->getSide(4);
-			$block3 = $this->getSide(5);
-			if($block0->isTransparent() === true and $block1->isTransparent() === true and $block2->isTransparent() === true and $block3->isTransparent() === true){
+			$block0 = $this->getSide(Vector3::SIDE_NORTH);
+			$block1 = $this->getSide(Vector3::SIDE_SOUTH);
+			$block2 = $this->getSide(Vector3::SIDE_WEST);
+			$block3 = $this->getSide(Vector3::SIDE_EAST);
+			if(!$block0->isSolid() and !$block1->isSolid() and !$block2->isSolid() and !$block3->isSolid()){
 				$this->getLevel()->setBlock($this, $this, true);
 
 				return true;
@@ -132,9 +127,7 @@ class Cactus extends Transparent{
 		return false;
 	}
 
-	public function getDrops(Item $item){
-		return [
-			[$this->id, 0, 1],
-		];
+	public function getVariantBitmask() : int{
+		return 0;
 	}
 }

src/pocketmine/block/Cake.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,45 +15,46 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
-use pocketmine\event\entity\EntityRegainHealthEvent;
+use pocketmine\entity\EffectInstance;
+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;
-use pocketmine\Server;
 
-class Cake extends Transparent{
+class Cake extends Transparent implements FoodSource{
 
 	protected $id = self::CAKE_BLOCK;
 
-	public function __construct($meta = 0){
+	protected $itemId = Item::CAKE;
+
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function canBeActivated(){
-		return true;
+	public function getHardness() : float{
+		return 0.5;
 	}
 
-	public function getHardness(){
-		return 2.5;
+	public function getName() : string{
+		return "Cake";
 	}
 
-	public function getName(){
-		return "Cake Block";
-	}
+	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 
-	protected function recalculateBoundingBox(){
-
-		$f = (1 + $this->getDamage() * 2) / 16;
+		$f = $this->getDamage() * 0.125; //1 slice width
 
 		return new AxisAlignedBB(
-			$this->x + $f,
+			$this->x + 0.0625 + $f,
 			$this->y,
 			$this->z + 0.0625,
 			$this->x + 1 - 0.0625,
@@ -62,10 +63,10 @@ class Cake extends Transparent{
 		);
 	}
 
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$down = $this->getSide(0);
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		$down = $this->getSide(Vector3::SIDE_DOWN);
 		if($down->getId() !== self::AIR){
-			$this->getLevel()->setBlock($block, $this, true, true);
+			$this->getLevel()->setBlock($blockReplace, $this, true, true);
 
 			return true;
 		}
@@ -73,39 +74,61 @@ class Cake extends Transparent{
 		return false;
 	}
 
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->getId() === self::AIR){ //Replace with common break method
-				$this->getLevel()->setBlock($this, new Air(), true);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
+			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
 		}
-
-		return false;
 	}
 
-	public function getDrops(Item $item){
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [];
 	}
 
-	public function onActivate(Item $item, Player $player = null){
-		if($player instanceof Player and $player->getHealth() < 20){
-			++$this->meta;
-			Server::getInstance()->getPluginManager()->callEvent($ev = new EntityRegainHealthEvent($player, 3, EntityRegainHealthEvent::CAUSE_EATING));
-			if(!$ev->isCancelled()){
-				$player->heal($ev->getAmount(), $ev);
-			}
-			if($this->meta >= 0x06){
-				$this->getLevel()->setBlock($this, new Air(), true);
-			}else{
-				$this->getLevel()->setBlock($this, $this, true);
-			}
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
 
+	public function onActivate(Item $item, Player $player = null) : bool{
+		if($player !== null){
+			$player->consumeObject($this);
 			return true;
 		}
 
 		return false;
 	}
 
-}
+	public function getFoodRestore() : int{
+		return 2;
+	}
+
+	public function getSaturationRestore() : float{
+		return 0.4;
+	}
+
+	public function requiresHunger() : bool{
+		return true;
+	}
+
+	/**
+	 * @return Block
+	 */
+	public function getResidue(){
+		$clone = clone $this;
+		$clone->meta++;
+		if($clone->meta > 0x06){
+			$clone = BlockFactory::get(Block::AIR);
+		}
+		return $clone;
+	}
+
+	/**
+	 * @return EffectInstance[]
+	 */
+	public function getAdditionalEffects() : array{
+		return [];
+	}
+
+	public function onConsume(Living $consumer) : void{
+		$this->level->setBlock($this, $this->getResidue());
+	}
+}

src/pocketmine/block/Carpet.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,52 +15,41 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 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;
 
 class Carpet extends Flowable{
 
 	protected $id = self::CARPET;
 
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function isSolid(){
+	public function getHardness() : float{
+		return 0.1;
+	}
+
+	public function isSolid() : bool{
 		return true;
 	}
 
-	public function getName(){
-		static $names = [
-			0 => "White Carpet",
-			1 => "Orange Carpet",
-			2 => "Magenta Carpet",
-			3 => "Light Blue Carpet",
-			4 => "Yellow Carpet",
-			5 => "Lime Carpet",
-			6 => "Pink Carpet",
-			7 => "Gray Carpet",
-			8 => "Light Gray Carpet",
-			9 => "Cyan Carpet",
-			10 => "Purple Carpet",
-			11 => "Blue Carpet",
-			12 => "Brown Carpet",
-			13 => "Green Carpet",
-			14 => "Red Carpet",
-			15 => "Black Carpet",
-		];
-		return $names[$this->meta & 0x0f];
+	public function getName() : string{
+		return ColorBlockMetaHelper::getColorFromMeta($this->meta) . " Carpet";
 	}
 
-	protected function recalculateBoundingBox(){
+	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 
 		return new AxisAlignedBB(
 			$this->x,
@@ -72,10 +61,10 @@ class Carpet extends Flowable{
 		);
 	}
 
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$down = $this->getSide(0);
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		$down = $this->getSide(Vector3::SIDE_DOWN);
 		if($down->getId() !== self::AIR){
-			$this->getLevel()->setBlock($block, $this, true, true);
+			$this->getLevel()->setBlock($blockReplace, $this, true, true);
 
 			return true;
 		}
@@ -83,16 +72,17 @@ class Carpet extends Flowable{
 		return false;
 	}
 
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->getId() === self::AIR){
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){
+			$this->getLevel()->useBreakOn($this);
 		}
-
-		return false;
 	}
 
-}
+	public function getFlameEncouragement() : int{
+		return 30;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
+}

src/pocketmine/block/Carrot.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,34 +15,36 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 
 class Carrot extends Crops{
 
 	protected $id = self::CARROT_BLOCK;
 
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Carrot Block";
 	}
 
-	public function getDrops(Item $item){
-		$drops = [];
-		if($this->meta >= 0x07){
-			$drops[] = [Item::CARROT, 0, mt_rand(1, 4)];
-		}else{
-			$drops[] = [Item::CARROT, 0, 1];
-		}
-
-		return $drops;
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [
+			ItemFactory::get(Item::CARROT, 0, $this->meta >= 0x07 ? mt_rand(1, 4) : 1)
+		];
 	}
-}
+
+	public function getPickedItem() : Item{
+		return ItemFactory::get(Item::CARROT);
+	}
+}

src/pocketmine/block/Chest.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,19 +15,17 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
-use pocketmine\nbt\NBT;
-use pocketmine\nbt\tag\Compound;
-use pocketmine\nbt\tag\Enum;
-use pocketmine\nbt\tag\Int;
-use pocketmine\nbt\tag\String;
+use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\tile\Chest as TileChest;
 use pocketmine\tile\Tile;
@@ -36,39 +34,40 @@ class Chest extends Transparent{
 
 	protected $id = self::CHEST;
 
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function canBeActivated(){
-		return true;
+	public function getHardness() : float{
+		return 2.5;
 	}
 
-	public function getHardness(){
-		return 15;
-	}
-
-	public function getName(){
+	public function getName() : string{
 		return "Chest";
 	}
 
-	protected function recalculateBoundingBox(){
+	public function getToolType() : int{
+		return BlockToolType::TYPE_AXE;
+	}
+
+	protected function recalculateBoundingBox() : ?AxisAlignedBB{
+		//these are slightly bigger than in PC
 		return new AxisAlignedBB(
-			$this->x + 0.0625,
+			$this->x + 0.025,
 			$this->y,
-			$this->z + 0.0625,
-			$this->x + 0.9375,
-			$this->y + 0.9475,
-			$this->z + 0.9375
+			$this->z + 0.025,
+			$this->x + 0.975,
+			$this->y + 0.95,
+			$this->z + 0.975
 		);
 	}
 
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$faces = [
 			0 => 4,
 			1 => 2,
 			2 => 5,
-			3 => 3,
+			3 => 3
 		];
 
 		$chest = null;
@@ -81,7 +80,7 @@ class Chest extends Transparent{
 				continue;
 			}
 			$c = $this->getSide($side);
-			if($c instanceof Chest and $c->getDamage() === $this->meta){
+			if($c->getId() === $this->id and $c->getDamage() === $this->meta){
 				$tile = $this->getLevel()->getTile($c);
 				if($tile instanceof TileChest and !$tile->isPaired()){
 					$chest = $tile;
@@ -90,16 +89,8 @@ class Chest extends Transparent{
 			}
 		}
 
-		$this->getLevel()->setBlock($block, $this, true, true);
-		$nbt = new Compound(false, [
-			new Enum("Items", []),
-			new String("id", Tile::CHEST),
-			new Int("x", $this->x),
-			new Int("y", $this->y),
-			new Int("z", $this->z)
-		]);
-		$nbt->Items->setTagType(NBT::TAG_Compound);
-		$tile = Tile::createTile("Chest", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+		$this->getLevel()->setBlock($blockReplace, $this, true, true);
+		$tile = Tile::createTile(Tile::CHEST, $this->getLevel(), TileChest::createNBT($this, $face, $item, $player));
 
 		if($chest instanceof TileChest and $tile instanceof TileChest){
 			$chest->pairWith($tile);
@@ -109,52 +100,36 @@ class Chest extends Transparent{
 		return true;
 	}
 
-	public function onBreak(Item $item){
-		$t = $this->getLevel()->getTile($this);
-		if($t instanceof TileChest){
-			$t->unpair();
-		}
-		$this->getLevel()->setBlock($this, new Air(), true, true);
-
-		return true;
-	}
-
-	public function onActivate(Item $item, Player $player = null){
+	public function onActivate(Item $item, Player $player = null) : bool{
 		if($player instanceof Player){
-			$top = $this->getSide(1);
-			if($top->isTransparent() !== true){
-				return true;
-			}
 
 			$t = $this->getLevel()->getTile($this);
 			$chest = null;
 			if($t instanceof TileChest){
 				$chest = $t;
 			}else{
-				$nbt = new Compound(false, [
-					new Enum("Items", []),
-					new String("id", Tile::CHEST),
-					new Int("x", $this->x),
-					new Int("y", $this->y),
-					new Int("z", $this->z)
-				]);
-				$nbt->Items->setTagType(NBT::TAG_Compound);
-				$chest = Tile::createTile("Chest", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+				$chest = Tile::createTile(Tile::CHEST, $this->getLevel(), TileChest::createNBT($this));
 			}
 
-
-			if($player->isCreative()){
+			if(
+				!$this->getSide(Vector3::SIDE_UP)->isTransparent() or
+				($chest->isPaired() and !$chest->getPair()->getBlock()->getSide(Vector3::SIDE_UP)->isTransparent()) or
+				!$chest->canOpenWith($item->getCustomName())
+			){
 				return true;
 			}
+
 			$player->addWindow($chest->getInventory());
 		}
 
 		return true;
 	}
 
-	public function getDrops(Item $item){
-		return [
-			[$this->id, 0, 1],
-		];
+	public function getVariantBitmask() : int{
+		return 0;
 	}
-}
+
+	public function getFuelTime() : int{
+		return 300;
+	}
+}

src/pocketmine/block/Clay.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,33 +15,40 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 
 class Clay extends Solid{
 
 	protected $id = self::CLAY_BLOCK;
 
-	public function __construct(){
-
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getHardness(){
-		return 3;
+	public function getHardness() : float{
+		return 0.6;
 	}
 
-	public function getName(){
+	public function getToolType() : int{
+		return BlockToolType::TYPE_SHOVEL;
+	}
+
+	public function getName() : string{
 		return "Clay Block";
 	}
 
-	public function getDrops(Item $item){
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			[Item::CLAY, 0, 4],
+			ItemFactory::get(Item::CLAY_BALL, 0, 4)
 		];
 	}
-}
+}

src/pocketmine/block/Coal.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,54 +15,49 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
 
 class Coal extends Solid{
 
 	protected $id = self::COAL_BLOCK;
 
-	public function __construct(){
-
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getHardness(){
-		return 30;
+	public function getHardness() : float{
+		return 5;
 	}
 
-	public function getName(){
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
+	}
+
+	public function getName() : string{
 		return "Coal Block";
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.95;
-			case 4:
-				return 1.25;
-			case 3:
-				return 1.9;
-			case 2:
-				return 0.65;
-			case 1:
-				return 3.75;
-			default:
-				return 25;
-		}
+	public function getFuelTime() : int{
+		return 16000;
 	}
 
-	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 1){
-			return [
-				[Item::COAL_BLOCK, 0, 1],
-			];
-		}else{
-			return [];
-		}
+	public function getFlameEncouragement() : int{
+		return 5;
 	}
-}
+
+	public function getFlammability() : int{
+		return 5;
+	}
+}

src/pocketmine/block/CoalOre.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,55 +15,49 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
+use pocketmine\item\TieredTool;
 
 class CoalOre extends Solid{
 
 	protected $id = self::COAL_ORE;
 
-	public function __construct(){
-
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getHardness(){
-		return 15;
+	public function getHardness() : float{
+		return 3;
 	}
 
-	public function getName(){
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
+	}
+
+	public function getName() : string{
 		return "Coal Ore";
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			case 3:
-				return 1.15;
-			case 2:
-				return 0.4;
-			case 1:
-				return 2.25;
-			default:
-				return 15;
-		}
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [
+			ItemFactory::get(Item::COAL)
+		];
 	}
 
-	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 1){
-			return [
-				[Item::COAL, 0, 1],
-			];
-		}else{
-			return [];
-		}
+	protected function getXpDropAmount() : int{
+		return mt_rand(0, 2);
 	}
-
-}
+}

src/pocketmine/block/Cobblestone.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,54 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
 
 class Cobblestone extends Solid{
 
 	protected $id = self::COBBLESTONE;
 
-	public function __construct(){
-
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getName(){
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
+	}
+
+	public function getName() : string{
 		return "Cobblestone";
 	}
 
-	public function getHardness(){
-		return 30;
+	public function getHardness() : float{
+		return 2;
 	}
-
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.4;
-			case 4:
-				return 0.5;
-			case 3:
-				return 0.75;
-			case 2:
-				return 0.25;
-			case 1:
-				return 1.5;
-			default:
-				return 10;
-		}
-	}
-
-	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 1){
-			return [
-				[Item::COBBLESTONE, 0, 1],
-			];
-		}else{
-			return [];
-		}
-	}
-}
+}

src/pocketmine/block/CobblestoneStairs.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,23 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
+use pocketmine\item\TieredTool;
 
 class CobblestoneStairs extends Stair{
 
 	protected $id = self::COBBLESTONE_STAIRS;
 
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function getName(){
-		return "Cobblestone Stairs";
+	public function getHardness() : float{
+		return 2;
 	}
 
-}
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
+	}
+
+	public function getName() : string{
+		return "Cobblestone Stairs";
+	}
+}

src/pocketmine/block/CobblestoneWall.php

@@ -0,0 +1,93 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\item\TieredTool;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
+
+class CobblestoneWall extends Transparent{
+	public const NONE_MOSSY_WALL = 0;
+	public const MOSSY_WALL = 1;
+
+	protected $id = self::COBBLESTONE_WALL;
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
+	}
+
+	public function getHardness() : float{
+		return 2;
+	}
+
+	public function getName() : string{
+		if($this->meta === 0x01){
+			return "Mossy Cobblestone Wall";
+		}
+
+		return "Cobblestone Wall";
+	}
+
+	protected function recalculateBoundingBox() : ?AxisAlignedBB{
+		//walls don't have any special collision boxes like fences do
+
+		$north = $this->canConnect($this->getSide(Vector3::SIDE_NORTH));
+		$south = $this->canConnect($this->getSide(Vector3::SIDE_SOUTH));
+		$west = $this->canConnect($this->getSide(Vector3::SIDE_WEST));
+		$east = $this->canConnect($this->getSide(Vector3::SIDE_EAST));
+
+		$inset = 0.25;
+		if(
+			$this->getSide(Vector3::SIDE_UP)->getId() === Block::AIR and //if there is a block on top, it stays as a post
+			(
+				($north and $south and !$west and !$east) or
+				(!$north and !$south and $west and $east)
+			)
+		){
+			//If connected to two sides on the same axis but not any others, AND there is not a block on top, there is no post and the wall is thinner
+			$inset = 0.3125;
+		}
+
+		return new AxisAlignedBB(
+			$this->x + ($west ? 0 : $inset),
+			$this->y,
+			$this->z + ($north ? 0 : $inset),
+			$this->x + 1 - ($east ? 0 : $inset),
+			$this->y + 1.5,
+			$this->z + 1 - ($south ? 0 : $inset)
+		);
+	}
+
+	public function canConnect(Block $block){
+		return $block instanceof static or $block instanceof FenceGate or ($block->isSolid() and !$block->isTransparent());
+	}
+}

src/pocketmine/block/Cobweb.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,41 +15,57 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 
 class Cobweb extends Flowable{
 
 	protected $id = self::COBWEB;
 
-	public function __construct(){
-
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function hasEntityCollision(){
+	public function hasEntityCollision() : bool{
 		return true;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Cobweb";
 	}
 
-	public function getHardness(){
-		return 25;
+	public function getHardness() : float{
+		return 4;
 	}
 
-	public function onEntityCollide(Entity $entity){
+	public function getToolType() : int{
+		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){
-		//TODO: correct drops
-		return [];
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [
+			ItemFactory::get(Item::STRING)
+		];
 	}
-}
+
+	public function diffusesSkyLight() : bool{
+		return true;
+	}
+}

src/pocketmine/block/CocoaBlock.php

@@ -0,0 +1,51 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+class CocoaBlock extends Transparent{
+
+	protected $id = self::COCOA_BLOCK;
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName() : string{
+		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

@@ -0,0 +1,52 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\ColorBlockMetaHelper;
+use pocketmine\item\TieredTool;
+
+class Concrete extends Solid{
+
+	protected $id = Block::CONCRETE;
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName() : string{
+		return ColorBlockMetaHelper::getColorFromMeta($this->meta) . " Concrete";
+	}
+
+	public function getHardness() : float{
+		return 1.8;
+	}
+
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
+	}
+}

src/pocketmine/block/ConcretePowder.php

@@ -0,0 +1,75 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\ColorBlockMetaHelper;
+
+class ConcretePowder extends Fallable{
+
+	protected $id = self::CONCRETE_POWDER;
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName() : string{
+		return ColorBlockMetaHelper::getColorFromMeta($this->meta) . " Concrete Powder";
+	}
+
+	public function getHardness() : float{
+		return 0.5;
+	}
+
+	public function getToolType() : int{
+		return BlockToolType::TYPE_SHOVEL;
+	}
+
+	public function onNearbyBlockChange() : void{
+		if(($block = $this->checkAdjacentWater()) !== null){
+			$this->level->setBlock($this, $block);
+		}else{
+			parent::onNearbyBlockChange();
+		}
+	}
+
+	/**
+	 * @return null|Block
+	 */
+	public function tickFalling() : ?Block{
+		return $this->checkAdjacentWater();
+	}
+
+	/**
+	 * @return null|Block
+	 */
+	private function checkAdjacentWater() : ?Block{
+		for($i = 1; $i < 6; ++$i){ //Do not check underneath
+			if($this->getSide($i) instanceof Water){
+				return BlockFactory::get(Block::CONCRETE, $this->meta);
+			}
+		}
+
+		return null;
+	}
+}

src/pocketmine/block/CraftingTable.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,47 +15,47 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
+use pocketmine\inventory\CraftingGrid;
 use pocketmine\item\Item;
 use pocketmine\Player;
 
-//TODO: check orientation
-class Workbench extends Solid{
+class CraftingTable extends Solid{
 
-	protected $id = self::WORKBENCH;
+	protected $id = self::CRAFTING_TABLE;
 
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function canBeActivated(){
-		return true;
+	public function getHardness() : float{
+		return 2.5;
 	}
 
-	public function getHardness(){
-		return 15;
-	}
-
-	public function getName(){
+	public function getName() : string{
 		return "Crafting Table";
 	}
 
-	public function onActivate(Item $item, Player $player = null){
+	public function getToolType() : int{
+		return BlockToolType::TYPE_AXE;
+	}
+
+	public function onActivate(Item $item, Player $player = null) : bool{
 		if($player instanceof Player){
-			$player->craftingType = 1;
+			$player->setCraftingGrid(new CraftingGrid($player, CraftingGrid::SIZE_BIG));
 		}
 
 		return true;
 	}
 
-	public function getDrops(Item $item){
-		return [
-			[$this->id, 0, 1],
-		];
+	public function getFuelTime() : int{
+		return 300;
 	}
-}
+}

src/pocketmine/block/Crops.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,28 +15,24 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 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;
 
 abstract class Crops extends Flowable{
 
-	public function canBeActivated(){
-		return true;
-	}
-
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$down = $this->getSide(0);
-		if($down->getId() === self::FARMLAND){
-			$this->getLevel()->setBlock($block, $this, true, true);
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		if($blockReplace->getSide(Vector3::SIDE_DOWN)->getId() === Block::FARMLAND){
+			$this->getLevel()->setBlock($blockReplace, $this, true, true);
 
 			return true;
 		}
@@ -45,7 +41,7 @@ abstract class Crops extends Flowable{
 	}
 
 
-	public function onActivate(Item $item, Player $player = null){
+	public function onActivate(Item $item, Player $player = null) : bool{
 		if($item->getId() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
 			$block = clone $this;
 			$block->meta += mt_rand(2, 5);
@@ -53,8 +49,8 @@ abstract class Crops extends Flowable{
 				$block->meta = 7;
 			}
 
-			Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
-
+			$ev = new BlockGrowEvent($this, $block);
+			$ev->call();
 			if(!$ev->isCancelled()){
 				$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
 			}
@@ -67,30 +63,31 @@ abstract class Crops extends Flowable{
 		return false;
 	}
 
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent() === true){
-				$this->getLevel()->useBreakOn($this);
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if(mt_rand(0, 2) == 1){
-				if($this->meta < 0x07){
-					$block = clone $this;
-					++$block->meta;
-					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::FARMLAND){
+			$this->getLevel()->useBreakOn($this);
+		}
+	}
 
-					if(!$ev->isCancelled()){
-						$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
-					}else{
-						return Level::BLOCK_UPDATE_RANDOM;
-					}
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
+		if(mt_rand(0, 2) === 1){
+			if($this->meta < 0x07){
+				$block = clone $this;
+				++$block->meta;
+				$ev = new BlockGrowEvent($this, $block);
+				$ev->call();
+				if(!$ev->isCancelled()){
+					$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
 				}
-			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
 			}
 		}
+	}
 
+	public function isAffectedBySilkTouch() : bool{
 		return false;
 	}
-}
+}

src/pocketmine/block/Dandelion.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,33 +15,35 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
+use pocketmine\math\Vector3;
 use pocketmine\Player;
 
 class Dandelion extends Flowable{
 
 	protected $id = self::DANDELION;
 
-	public function __construct(){
-
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Dandelion";
 	}
 
 
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$down = $this->getSide(0);
-		if($down->getId() === 2 or $down->getId() === 3 or $down->getId() === 60){
-			$this->getLevel()->setBlock($block, $this, true, true);
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		$down = $this->getSide(Vector3::SIDE_DOWN);
+		if($down->getId() === Block::GRASS or $down->getId() === Block::DIRT or $down->getId() === Block::FARMLAND){
+			$this->getLevel()->setBlock($blockReplace, $this, true, true);
 
 			return true;
 		}
@@ -49,15 +51,17 @@ class Dandelion extends Flowable{
 		return false;
 	}
 
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent() === true){
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			$this->getLevel()->useBreakOn($this);
 		}
-
-		return false;
 	}
-}
+
+	public function getFlameEncouragement() : int{
+		return 60;
+	}
+
+	public function getFlammability() : int{
+		return 100;
+	}
+}

src/pocketmine/block/DaylightSensor.php

@@ -0,0 +1,51 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+class DaylightSensor extends Transparent{
+
+	protected $id = self::DAYLIGHT_SENSOR;
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName() : string{
+		return "Daylight Sensor";
+	}
+
+	public function getHardness() : float{
+		return 0.2;
+	}
+
+	public function getFuelTime() : int{
+		return 300;
+	}
+
+	public function getToolType() : int{
+		return BlockToolType::TYPE_AXE;
+	}
+
+	//TODO
+}

src/pocketmine/block/DeadBush.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,37 +15,68 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
-use pocketmine\level\Level;
+use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
 
 class DeadBush extends Flowable{
 
 	protected $id = self::DEAD_BUSH;
 
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Dead Bush";
 	}
 
-
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent() === true){
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		if(!$this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			return parent::place($item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 		}
 
 		return false;
 	}
 
-}
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			$this->getLevel()->useBreakOn($this);
+		}
+	}
+
+	public function getToolType() : int{
+		return BlockToolType::TYPE_SHEARS;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return 1;
+	}
+
+	public function getDrops(Item $item) : array{
+		if(!$this->isCompatibleWithTool($item)){
+			return [
+				ItemFactory::get(Item::STICK, 0, mt_rand(0, 2))
+			];
+		}
+
+		return parent::getDrops($item);
+	}
+
+	public function getFlameEncouragement() : int{
+		return 60;
+	}
+
+	public function getFlammability() : int{
+		return 100;
+	}
+}

src/pocketmine/block/DetectorRail.php

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

src/pocketmine/block/Diamond.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,48 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
 
 class Diamond extends Solid{
 
 	protected $id = self::DIAMOND_BLOCK;
 
-	public function __construct(){
-
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getHardness(){
-		return 30;
+	public function getHardness() : float{
+		return 5;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Diamond Block";
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.95;
-			case 4:
-				return 1.25;
-			default:
-				return 25;
-		}
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
-	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 4){
-			return [
-				[Item::DIAMOND_BLOCK, 0, 1],
-			];
-		}else{
-			return [];
-		}
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_IRON;
 	}
-}
+}

src/pocketmine/block/DiamondOre.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,48 +15,49 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
+use pocketmine\item\TieredTool;
 
 class DiamondOre extends Solid{
 
 	protected $id = self::DIAMOND_ORE;
 
-	public function __construct(){
-
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getHardness(){
-		return 15;
+	public function getHardness() : float{
+		return 3;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Diamond Ore";
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			default:
-				return 15;
-		}
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
-	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 4){
-			return [
-				[Item::DIAMOND, 0, 1],
-			];
-		}else{
-			return [];
-		}
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_IRON;
 	}
-}
+
+	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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,12 +15,15 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
+use pocketmine\item\Hoe;
 use pocketmine\item\Item;
 use pocketmine\Player;
 
@@ -28,30 +31,37 @@ class Dirt extends Solid{
 
 	protected $id = self::DIRT;
 
-	public function __construct(){
-
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function canBeActivated(){
-		return true;
+	public function getHardness() : float{
+		return 0.5;
 	}
 
-	public function getHardness(){
-		return 2.5;
+	public function getToolType() : int{
+		return BlockToolType::TYPE_SHOVEL;
 	}
 
-	public function getName(){
+	public function getName() : string{
+		if($this->meta === 1){
+			return "Coarse Dirt";
+		}
 		return "Dirt";
 	}
 
-	public function onActivate(Item $item, Player $player = null){
-		if($item->isHoe()){
-			$item->useOn($this);
-			$this->getLevel()->setBlock($this, Block::get(Item::FARMLAND, 0), true);
+	public function onActivate(Item $item, Player $player = null) : bool{
+		if($item instanceof Hoe){
+			$item->applyDamage(1);
+			if($this->meta === 1){
+				$this->getLevel()->setBlock($this, BlockFactory::get(Block::DIRT), true);
+			}else{
+				$this->getLevel()->setBlock($this, BlockFactory::get(Block::FARMLAND), true);
+			}
 
 			return true;
 		}
 
 		return false;
 	}
-}
+}

src/pocketmine/block/Door.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,48 +15,45 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+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\network\protocol\LevelEventPacket;
+use pocketmine\math\Vector3;
 use pocketmine\Player;
-use pocketmine\Server;
 
 
 abstract class Door extends Transparent{
 
-	public function canBeActivated(){
-		return true;
-	}
-
-	public function isSolid(){
+	public function isSolid() : bool{
 		return false;
 	}
 
 	private function getFullDamage(){
 		$damage = $this->getDamage();
-		$flag = ($damage & 0x08) > 0;
+		$isUp = ($damage & 0x08) > 0;
 
-		if($flag){
-			$first = $this->getSide(0)->getDamage();
-			$second = $damage;
+		if($isUp){
+			$down = $this->getSide(Vector3::SIDE_DOWN)->getDamage();
+			$up = $damage;
 		}else{
-			$first = $damage;
-			$second = $this->getSide(1)->getDamage();
+			$down = $damage;
+			$up = $this->getSide(Vector3::SIDE_UP)->getDamage();
 		}
 
-		$flag1 = ($second & 0x01) > 0;
+		$isRight = ($up & 0x01) > 0;
 
-		return $first & 0x07 | ($flag ? 8 : 0) | ($flag1 ? 0x10 : 0);
+		return $down & 0x07 | ($isUp ? 8 : 0) | ($isRight ? 0x10 : 0);
 	}
 
-	protected function recalculateBoundingBox(){
+	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 
 		$f = 0.1875;
 		$damage = $this->getFullDamage();
@@ -71,12 +68,12 @@ abstract class Door extends Transparent{
 		);
 
 		$j = $damage & 0x03;
-		$flag = (($damage & 0x04) > 0);
-		$flag1 = (($damage & 0x10) > 0);
+		$isOpen = (($damage & 0x04) > 0);
+		$isRight = (($damage & 0x10) > 0);
 
 		if($j === 0){
-			if($flag){
-				if(!$flag1){
+			if($isOpen){
+				if(!$isRight){
 					$bb->setBounds(
 						$this->x,
 						$this->y,
@@ -106,8 +103,8 @@ abstract class Door extends Transparent{
 				);
 			}
 		}elseif($j === 1){
-			if($flag){
-				if(!$flag1){
+			if($isOpen){
+				if(!$isRight){
 					$bb->setBounds(
 						$this->x + 1 - $f,
 						$this->y,
@@ -137,8 +134,8 @@ abstract class Door extends Transparent{
 				);
 			}
 		}elseif($j === 2){
-			if($flag){
-				if(!$flag1){
+			if($isOpen){
+				if(!$isRight){
 					$bb->setBounds(
 						$this->x,
 						$this->y,
@@ -168,8 +165,8 @@ abstract class Door extends Transparent{
 				);
 			}
 		}elseif($j === 3){
-			if($flag){
-				if(!$flag1){
+			if($isOpen){
+				if(!$isRight){
 					$bb->setBounds(
 						$this->x,
 						$this->y,
@@ -203,106 +200,94 @@ abstract class Door extends Transparent{
 		return $bb;
 	}
 
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->getId() === self::AIR){ //Replace with common break method
-				$this->getLevel()->setBlock($this, new Air(), false);
-				if($this->getSide(1) instanceof Door){
-					$this->getLevel()->setBlock($this->getSide(1), new Air(), false);
-				}
-
-				return Level::BLOCK_UPDATE_NORMAL;
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
+			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), false);
+			if($this->getSide(Vector3::SIDE_UP) instanceof Door){
+				$this->getLevel()->setBlock($this->getSide(Vector3::SIDE_UP), BlockFactory::get(Block::AIR), false);
 			}
 		}
-
-		return false;
 	}
 
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		if($face === 1){
-			$blockUp = $this->getSide(1);
-			$blockDown = $this->getSide(0);
-			if($blockUp->canBeReplaced() === false or $blockDown->isTransparent() === true){
+	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() or $blockDown->isTransparent()){
 				return false;
 			}
 			$direction = $player instanceof Player ? $player->getDirection() : 0;
-			$face = [
+			$faces = [
 				0 => 3,
 				1 => 4,
 				2 => 2,
-				3 => 5,
+				3 => 5
 			];
-			$next = $this->getSide($face[(($direction + 2) % 4)]);
-			$next2 = $this->getSide($face[$direction]);
+			$next = $this->getSide($faces[($direction + 2) % 4]);
+			$next2 = $this->getSide($faces[$direction]);
 			$metaUp = 0x08;
-			if($next->getId() === $this->id or ($next2->isTransparent() === false and $next->isTransparent() === true)){ //Door hinge
+			if($next->getId() === $this->getId() or (!$next2->isTransparent() and $next->isTransparent())){ //Door hinge
 				$metaUp |= 0x01;
 			}
 
-			$this->meta = $player->getDirection() & 0x03;
-			$this->getLevel()->setBlock($block, $this, true, true); //Bottom
-			$this->getLevel()->setBlock($blockUp, $b = Block::get($this->id, $metaUp), true); //Top
+			$this->setDamage($player->getDirection() & 0x03);
+			$this->getLevel()->setBlock($blockReplace, $this, true, true); //Bottom
+			$this->getLevel()->setBlock($blockUp, BlockFactory::get($this->getId(), $metaUp), true); //Top
 			return true;
 		}
 
 		return false;
 	}
 
-	public function onBreak(Item $item){
-		if(($this->meta & 0x08) === 0x08){
-			$down = $this->getSide(0);
-			if($down->getId() === $this->id){
-				$this->getLevel()->setBlock($down, new Air(), true);
-			}
-		}else{
-			$up = $this->getSide(1);
-			if($up->getId() === $this->id){
-				$this->getLevel()->setBlock($up, new Air(), true);
-			}
-		}
-		$this->getLevel()->setBlock($this, new Air(), true);
-
-		return true;
-	}
-
-	public function onActivate(Item $item, Player $player = null){
-		if(($this->meta & 0x08) === 0x08){ //Top
-			$down = $this->getSide(0);
-			if($down->getId() === $this->id){
+	public function onActivate(Item $item, Player $player = null) : bool{
+		if(($this->getDamage() & 0x08) === 0x08){ //Top
+			$down = $this->getSide(Vector3::SIDE_DOWN);
+			if($down->getId() === $this->getId()){
 				$meta = $down->getDamage() ^ 0x04;
-				$this->getLevel()->setBlock($down, Block::get($this->id, $meta), true);
-				$players = $this->getLevel()->getUsingChunk($this->x >> 4, $this->z >> 4);
-				if($player instanceof Player){
-					unset($players[$player->getId()]);
-				}
-				$pk = new LevelEventPacket();
-				$pk->x = $this->x;
-				$pk->y = $this->y;
-				$pk->z = $this->z;
-				$pk->evid = 1003;
-				$pk->data = 0;
-				Server::broadcastPacket($players, $pk);
-
+				$this->level->setBlock($down, BlockFactory::get($this->getId(), $meta), true);
+				$this->level->addSound(new DoorSound($this));
 				return true;
 			}
 
 			return false;
 		}else{
 			$this->meta ^= 0x04;
-			$this->getLevel()->setBlock($this, $this, true);
-			$players = $this->getLevel()->getUsingChunk($this->x >> 4, $this->z >> 4);
-			if($player instanceof Player){
-				unset($players[$player->getId()]);
-			}
-			$pk = new LevelEventPacket();
-			$pk->x = $this->x;
-			$pk->y = $this->y;
-			$pk->z = $this->z;
-			$pk->evid = 1003;
-			$pk->data = 0;
-			Server::broadcastPacket($players, $pk);
+			$this->level->setBlock($this, $this, true);
+			$this->level->addSound(new DoorSound($this));
 		}
 
 		return true;
 	}
-}
+
+	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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,28 +15,33 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
+use pocketmine\item\ItemFactory;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
 
 class DoublePlant extends Flowable{
+	public const BITFLAG_TOP = 0x08;
 
 	protected $id = self::DOUBLE_PLANT;
 
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function canBeReplaced(){
-		return true;
+	public function canBeReplaced() : bool{
+		return $this->meta === 2 or $this->meta === 3; //grass or fern
 	}
 
-	public function getName(){
+	public function getName() : string{
 		static $names = [
 			0 => "Sunflower",
 			1 => "Lilac",
@@ -45,26 +50,78 @@ class DoublePlant extends Flowable{
 			4 => "Rose Bush",
 			5 => "Peony"
 		];
-		return $names[$this->meta & 0x07];
+		return $names[$this->getVariant()] ?? "";
 	}
 
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		$id = $blockReplace->getSide(Vector3::SIDE_DOWN)->getId();
+		if(($id === Block::GRASS or $id === Block::DIRT) and $blockReplace->getSide(Vector3::SIDE_UP)->canBeReplaced()){
+			$this->getLevel()->setBlock($blockReplace, $this, false, false);
+			$this->getLevel()->setBlock($blockReplace->getSide(Vector3::SIDE_UP), BlockFactory::get($this->id, $this->meta | self::BITFLAG_TOP), false, false);
 
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent() === true){ //Replace with common break method
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+			return true;
 		}
 
 		return false;
 	}
 
-	public function getDrops(Item $item){
-		//TODO
+	/**
+	 * Returns whether this double-plant has a corresponding other half.
+	 * @return bool
+	 */
+	public function isValidHalfPlant() : bool{
+		if($this->meta & self::BITFLAG_TOP){
+			$other = $this->getSide(Vector3::SIDE_DOWN);
+		}else{
+			$other = $this->getSide(Vector3::SIDE_UP);
+		}
+
+		return (
+			$other->getId() === $this->getId() and
+			$other->getVariant() === $this->getVariant() and
+			($other->getDamage() & self::BITFLAG_TOP) !== ($this->getDamage() & self::BITFLAG_TOP)
+		);
+	}
+
+	public function onNearbyBlockChange() : void{
+		if(!$this->isValidHalfPlant() or (($this->meta & self::BITFLAG_TOP) === 0 and $this->getSide(Vector3::SIDE_DOWN)->isTransparent())){
+			$this->getLevel()->useBreakOn($this);
+		}
+	}
+
+	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($this->isCompatibleWithTool($item)){
+				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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,65 +15,40 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 
-class DoubleSlab extends Solid{
+abstract class DoubleSlab extends Solid{
 
-	protected $id = self::DOUBLE_SLAB;
-
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function getHardness(){
-		return 30;
+	abstract public function getSlabId() : int;
+
+	public function getName() : string{
+		return "Double " . BlockFactory::get($this->getSlabId(), $this->getVariant())->getName();
 	}
 
-	public function getName(){
-		static $names = [
-			0 => "Stone",
-			1 => "Sandstone",
-			2 => "Wooden",
-			3 => "Cobblestone",
-			4 => "Brick",
-			5 => "Stone Brick",
-			6 => "Quartz",
-			7 => "",
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [
+			ItemFactory::get($this->getSlabId(), $this->getVariant(), 2)
 		];
-		return "Double " . $names[$this->meta & 0x07] . " Slab";
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.4;
-			case 4:
-				return 0.5;
-			case 3:
-				return 0.75;
-			case 2:
-				return 0.25;
-			case 1:
-				return 1.5;
-			default:
-				return 10;
-		}
+	public function isAffectedBySilkTouch() : bool{
+		return false;
 	}
 
-	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 1){
-			return [
-				[Item::SLAB, $this->meta & 0x07, 2],
-			];
-		}else{
-			return [];
-		}
+	public function getPickedItem() : Item{
+		return ItemFactory::get($this->getSlabId(), $this->getVariant());
 	}
-
-}
+}

src/pocketmine/block/DoubleStoneSlab.php

@@ -0,0 +1,47 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\item\TieredTool;
+
+class DoubleStoneSlab extends DoubleSlab{
+
+	protected $id = self::DOUBLE_STONE_SLAB;
+
+	public function getSlabId() : int{
+		return self::STONE_SLAB;
+	}
+
+	public function getHardness() : float{
+		return 2;
+	}
+
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
+	}
+}

src/pocketmine/block/DoubleStoneSlab2.php

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

src/pocketmine/block/DoubleWoodenSlab.php

@@ -0,0 +1,49 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+class DoubleWoodenSlab extends DoubleSlab{
+
+	protected $id = self::DOUBLE_WOODEN_SLAB;
+
+	public function getSlabId() : int{
+		return self::WOODEN_SLAB;
+	}
+
+	public function getHardness() : float{
+		return 2;
+	}
+
+	public function getToolType() : int{
+		return BlockToolType::TYPE_AXE;
+	}
+
+	public function getFlameEncouragement() : int{
+		return 5;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
+}

src/pocketmine/block/Emerald.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,48 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
 
 class Emerald extends Solid{
 
 	protected $id = self::EMERALD_BLOCK;
 
-	public function __construct(){
-
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getHardness(){
-		return 30;
+	public function getHardness() : float{
+		return 5;
 	}
 
-	public function getName(){
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_IRON;
+	}
+
+	public function getName() : string{
 		return "Emerald Block";
 	}
-
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.95;
-			case 4:
-				return 1.25;
-			default:
-				return 25;
-		}
-	}
-
-	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 4){
-			return [
-				[Item::EMERALD_BLOCK, 0, 1],
-			];
-		}else{
-			return [];
-		}
-	}
-}
+}

src/pocketmine/block/EmeraldOre.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,48 +15,49 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
+use pocketmine\item\TieredTool;
 
 class EmeraldOre extends Solid{
 
 	protected $id = self::EMERALD_ORE;
 
-	public function __construct(){
-
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Emerald Ore";
 	}
 
-	public function getHardness(){
-		return 15;
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			default:
-				return 15;
-		}
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_IRON;
 	}
 
-	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 4){
-			return [
-				[Item::EMERALD, 0, 1],
-			];
-		}else{
-			return [];
-		}
+	public function getHardness() : float{
+		return 3;
 	}
-}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [
+			ItemFactory::get(Item::EMERALD)
+		];
+	}
+
+	protected function getXpDropAmount() : int{
+		return mt_rand(3, 7);
+	}
+}

src/pocketmine/block/EnchantingTable.php

@@ -0,0 +1,79 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\inventory\EnchantInventory;
+use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
+use pocketmine\tile\EnchantTable as TileEnchantTable;
+use pocketmine\tile\Tile;
+
+class EnchantingTable extends Transparent{
+
+	protected $id = self::ENCHANTING_TABLE;
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		$this->getLevel()->setBlock($blockReplace, $this, true, true);
+
+		Tile::createTile(Tile::ENCHANT_TABLE, $this->getLevel(), TileEnchantTable::createNBT($this, $face, $item, $player));
+
+		return true;
+	}
+
+	public function getHardness() : float{
+		return 5;
+	}
+
+	public function getBlastResistance() : float{
+		return 6000;
+	}
+
+	public function getName() : string{
+		return "Enchanting Table";
+	}
+
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
+	}
+
+	public function onActivate(Item $item, Player $player = null) : bool{
+		if($player instanceof Player){
+			//TODO lock
+
+			$player->addWindow(new EnchantInventory($this));
+		}
+
+		return true;
+	}
+}

src/pocketmine/block/EndPortalFrame.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,10 +15,12 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
@@ -28,27 +30,31 @@ class EndPortalFrame extends Solid{
 
 	protected $id = self::END_PORTAL_FRAME;
 
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function getLightLevel(){
+	public function getLightLevel() : int{
 		return 1;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "End Portal Frame";
 	}
 
-	public function getHardness(){
+	public function getHardness() : float{
+		return -1;
+	}
+
+	public function getBlastResistance() : float{
 		return 18000000;
 	}
 
-	public function isBreakable(Item $item){
+	public function isBreakable(Item $item) : bool{
 		return false;
 	}
 
-	protected function recalculateBoundingBox(){
+	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 
 		return new AxisAlignedBB(
 			$this->x,
@@ -59,4 +65,4 @@ class EndPortalFrame extends Solid{
 			$this->z + 1
 		);
 	}
-}
+}

src/pocketmine/block/EndRod.php

@@ -0,0 +1,104 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
+
+class EndRod extends Flowable{
+
+	protected $id = Block::END_ROD;
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName() : string{
+		return "End Rod";
+	}
+
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		if($face === Vector3::SIDE_UP or $face === Vector3::SIDE_DOWN){
+			$this->meta = $face;
+		}else{
+			$this->meta = $face ^ 0x01;
+		}
+		if($blockClicked instanceof EndRod and $blockClicked->getDamage() === $this->meta){
+			$this->meta ^= 0x01;
+		}
+
+		return $this->level->setBlock($blockReplace, $this, true, true);
+	}
+
+	public function isSolid() : bool{
+		return true;
+	}
+
+	public function getLightLevel() : int{
+		return 14;
+	}
+
+	protected function recalculateBoundingBox() : ?AxisAlignedBB{
+		$m = $this->meta & ~0x01;
+		$width = 0.375;
+
+		switch($m){
+			case 0x00: //up/down
+				return new AxisAlignedBB(
+					$this->x + $width,
+					$this->y,
+					$this->z + $width,
+					$this->x + 1 - $width,
+					$this->y + 1,
+					$this->z + 1 - $width
+				);
+			case 0x02: //north/south
+				return new AxisAlignedBB(
+					$this->x,
+					$this->y + $width,
+					$this->z + $width,
+					$this->x + 1,
+					$this->y + 1 - $width,
+					$this->z + 1 - $width
+				);
+			case 0x04: //east/west
+				return new AxisAlignedBB(
+					$this->x + $width,
+					$this->y + $width,
+					$this->z,
+					$this->x + 1 - $width,
+					$this->y + 1 - $width,
+					$this->z + 1
+				);
+		}
+
+		return null;
+	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+}

src/pocketmine/block/EndStone.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,44 +15,37 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
 
 class EndStone extends Solid{
 
 	protected $id = self::END_STONE;
 
-	public function __construct(){
-
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "End Stone";
 	}
 
-	public function getHardness(){
-		return 45;
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			case 3:
-				return 1.15;
-			case 2:
-				return 0.4;
-			case 1:
-				return 2.25;
-			default:
-				return 15;
-		}
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
 	}
-}
+
+	public function getHardness() : float{
+		return 3;
+	}
+}

src/pocketmine/block/EndStoneBricks.php

@@ -0,0 +1,51 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\item\TieredTool;
+
+class EndStoneBricks extends Solid{
+
+	protected $id = self::END_BRICKS;
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName() : string{
+		return "End Stone Bricks";
+	}
+
+	public function getHardness() : float{
+		return 0.8;
+	}
+
+	public function getToolType() : int{
+		return BlockToolType::TYPE_PICKAXE;
+	}
+
+	public function getToolHarvestLevel() : int{
+		return TieredTool::TIER_WOODEN;
+	}
+}

src/pocketmine/block/EnderChest.php

@@ -0,0 +1,109 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
+use pocketmine\item\TieredTool;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
+use pocketmine\tile\EnderChest as TileEnderChest;
+use pocketmine\tile\Tile;
+
+class EnderChest extends Chest{
+
+	protected $id = self::ENDER_CHEST;
+
+	public function getHardness() : float{
+		return 22.5;
+	}
+
+	public function getBlastResistance() : float{
+		return 3000;
+	}
+
+	public function getLightLevel() : int{
+		return 7;
+	}
+
+	public function getName() : string{
+		return "Ender Chest";
+	}
+
+	public function getToolType() : int{
+		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{
+		$faces = [
+			0 => 4,
+			1 => 2,
+			2 => 5,
+			3 => 3
+		];
+
+		$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0];
+
+		$this->getLevel()->setBlock($blockReplace, $this, true, true);
+		Tile::createTile(Tile::ENDER_CHEST, $this->getLevel(), TileEnderChest::createNBT($this, $face, $item, $player));
+
+		return true;
+	}
+
+	public function onActivate(Item $item, Player $player = null) : bool{
+		if($player instanceof Player){
+
+			$t = $this->getLevel()->getTile($this);
+			$enderChest = null;
+			if($t instanceof TileEnderChest){
+				$enderChest = $t;
+			}else{
+				$enderChest = Tile::createTile(Tile::ENDER_CHEST, $this->getLevel(), TileEnderChest::createNBT($this));
+			}
+
+			if(!$this->getSide(Vector3::SIDE_UP)->isTransparent()){
+				return true;
+			}
+
+			$player->getEnderChestInventory()->setHolderPosition($enderChest);
+			$player->addWindow($player->getEnderChestInventory());
+		}
+
+		return true;
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [
+			ItemFactory::get(Item::OBSIDIAN, 0, 8)
+		];
+	}
+
+	public function getFuelTime() : int{
+		return 0;
+	}
+}

src/pocketmine/block/Fallable.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,56 +15,40 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
-use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\nbt\tag\Byte;
-use pocketmine\nbt\tag\Compound;
-use pocketmine\nbt\tag\Double;
-use pocketmine\nbt\tag\Enum;
-use pocketmine\nbt\tag\Float;
-use pocketmine\nbt\tag\Int;
-use pocketmine\Player;
+use pocketmine\math\Vector3;
 
 abstract class Fallable extends Solid{
 
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$ret = $this->getLevel()->setBlock($this, $this, true, true);
+	public function onNearbyBlockChange() : void{
+		$down = $this->getSide(Vector3::SIDE_DOWN);
+		if($down->getId() === self::AIR or $down instanceof Liquid or $down instanceof Fire){
+			$this->level->setBlock($this, BlockFactory::get(Block::AIR), true);
 
-		return $ret;
-	}
+			$nbt = Entity::createBaseNBT($this->add(0.5, 0, 0.5));
+			$nbt->setInt("TileID", $this->getId());
+			$nbt->setByte("Data", $this->getDamage());
 
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			$down = $this->getSide(0);
-			if($down->getId() === self::AIR or ($down instanceof Liquid)){
-				$fall = Entity::createEntity("FallingSand", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), new Compound("", [
-					"Pos" => new Enum("Pos", [
-						new Double("", $this->x + 0.5),
-						new Double("", $this->y),
-						new Double("", $this->z + 0.5)
-					]),
-					"Motion" => new Enum("Motion", [
-						new Double("", 0),
-						new Double("", 0),
-						new Double("", 0)
-					]),
-					"Rotation" => new Enum("Rotation", [
-						new Float("", 0),
-						new Float("", 0)
-					]),
-					"TileID" => new Int("TileID", $this->getId()),
-					"Data" => new Byte("Data", $this->getDamage()),
-				]));
+			$fall = Entity::createEntity("FallingSand", $this->getLevel(), $nbt);
 
+			if($fall !== null){
 				$fall->spawnToAll();
 			}
 		}
 	}
-}
+
+	/**
+	 * @return null|Block
+	 */
+	public function tickFalling() : ?Block{
+		return null;
+	}
+}

src/pocketmine/block/Farmland.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,45 +15,104 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
 
-class Farmland extends Solid{
+class Farmland extends Transparent{
 
 	protected $id = self::FARMLAND;
 
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Farmland";
 	}
 
-	public function getHardness(){
-		return 3;
+	public function getHardness() : float{
+		return 0.6;
 	}
 
-	protected function recalculateBoundingBox(){
+	public function getToolType() : int{
+		return BlockToolType::TYPE_SHOVEL;
+	}
+
+
+	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 		return new AxisAlignedBB(
 			$this->x,
 			$this->y,
 			$this->z,
 			$this->x + 1,
-			$this->y + 0.9375,
+			$this->y + 1, //TODO: this should be 0.9375, but MCPE currently treats them as a full block (https://bugs.mojang.com/browse/MCPE-12109)
 			$this->z + 1
 		);
 	}
 
-	public function getDrops(Item $item){
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_UP)->isSolid()){
+			$this->level->setBlock($this, BlockFactory::get(Block::DIRT), true);
+		}
+	}
+
+	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{
+		//TODO: check rain
+		$start = $this->add(-4, 0, -4);
+		$end = $this->add(4, 1, 4);
+		for($y = $start->y; $y <= $end->y; ++$y){
+			for($z = $start->z; $z <= $end->z; ++$z){
+				for($x = $start->x; $x <= $end->x; ++$x){
+					$id = $this->level->getBlockIdAt($x, $y, $z);
+					if($id === Block::STILL_WATER or $id === Block::FLOWING_WATER){
+						return true;
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			[Item::DIRT, 0, 1],
+			ItemFactory::get(Item::DIRT)
 		];
 	}
-}
+
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
+
+	public function getPickedItem() : Item{
+		return ItemFactory::get(Item::DIRT);
+	}
+}

src/pocketmine/block/Fence.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,65 +15,94 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
 
-class Fence extends Transparent{
+abstract class Fence extends Transparent{
 
-	protected $id = self::FENCE;
-
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function getHardness(){
-		return 15;
+	public function getThickness() : float{
+		return 0.25;
 	}
 
-
-	public function getName(){
-		static $names = [
-			0 => "Oak Fence",
-			1 => "Spruce Fence",
-			2 => "Birch Fence",
-			3 => "Jungle Fence",
-			4 => "Acacia Fence",
-			5 => "Dark Oak Fence",
-			"",
-			""
-		];
-		return $names[$this->meta & 0x07];
-	}
-
-	protected function recalculateBoundingBox(){
-
-		$flag = $this->canConnect($this->getSide(2));
-		$flag1 = $this->canConnect($this->getSide(3));
-		$flag2 = $this->canConnect($this->getSide(4));
-		$flag3 = $this->canConnect($this->getSide(5));
-
-		$f = $flag2 ? 0 : 0.375;
-		$f1 = $flag3 ? 1 : 0.625;
-		$f2 = $flag ? 0 : 0.375;
-		$f3 = $flag1 ? 1 : 0.625;
+	protected function recalculateBoundingBox() : ?AxisAlignedBB{
+		$width = 0.5 - $this->getThickness() / 2;
 
 		return new AxisAlignedBB(
-			$this->x + $f,
+			$this->x + ($this->canConnect($this->getSide(Vector3::SIDE_WEST)) ? 0 : $width),
 			$this->y,
-			$this->z + $f2,
-			$this->x + $f1,
+			$this->z + ($this->canConnect($this->getSide(Vector3::SIDE_NORTH)) ? 0 : $width),
+			$this->x + 1 - ($this->canConnect($this->getSide(Vector3::SIDE_EAST)) ? 0 : $width),
 			$this->y + 1.5,
-			$this->z + $f3
+			$this->z + 1 - ($this->canConnect($this->getSide(Vector3::SIDE_SOUTH)) ? 0 : $width)
 		);
 	}
 
-	public function canConnect(Block $block){
-		return (!($block instanceof Fence) and !($block instanceof FenceGate)) ? $block->isSolid() : true;
+	protected function recalculateCollisionBoxes() : array{
+		$inset = 0.5 - $this->getThickness() / 2;
+
+		/** @var AxisAlignedBB[] $bbs */
+		$bbs = [];
+
+		$connectWest = $this->canConnect($this->getSide(Vector3::SIDE_WEST));
+		$connectEast = $this->canConnect($this->getSide(Vector3::SIDE_EAST));
+
+		if($connectWest or $connectEast){
+			//X axis (west/east)
+			$bbs[] = new AxisAlignedBB(
+				$this->x + ($connectWest ? 0 : $inset),
+				$this->y,
+				$this->z + $inset,
+				$this->x + 1 - ($connectEast ? 0 : $inset),
+				$this->y + 1.5,
+				$this->z + 1 - $inset
+			);
+		}
+
+		$connectNorth = $this->canConnect($this->getSide(Vector3::SIDE_NORTH));
+		$connectSouth = $this->canConnect($this->getSide(Vector3::SIDE_SOUTH));
+
+		if($connectNorth or $connectSouth){
+			//Z axis (north/south)
+			$bbs[] = new AxisAlignedBB(
+				$this->x + $inset,
+				$this->y,
+				$this->z + ($connectNorth ? 0 : $inset),
+				$this->x + 1 - $inset,
+				$this->y + 1.5,
+				$this->z + 1 - ($connectSouth ? 0 : $inset)
+			);
+		}
+
+		if(empty($bbs)){
+			//centre post AABB (only needed if not connected on any axis - other BBs overlapping will do this if any connections are made)
+			return [
+				new AxisAlignedBB(
+					$this->x + $inset,
+					$this->y,
+					$this->z + $inset,
+					$this->x + 1 - $inset,
+					$this->y + 1.5,
+					$this->z + 1 - $inset
+				)
+			];
+		}
+
+		return $bbs;
 	}
 
+	public function canConnect(Block $block){
+		return $block instanceof static or $block instanceof FenceGate or ($block->isSolid() and !$block->isTransparent());
+	}
 }

src/pocketmine/block/FenceGate.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,45 +15,39 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\level\sound\DoorSound;
 use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
 use pocketmine\Player;
 
 class FenceGate extends Transparent{
 
-	protected $id = self::FENCE_GATE;
-
-	public function __construct($meta = 0){
-		$this->meta = $meta;
+	public function getHardness() : float{
+		return 2;
 	}
 
-	public function getName(){
-		return "Oak Fence Gate";
-	}
-
-	public function getHardness(){
-		return 15;
-	}
-
-	public function canBeActivated(){
-		return true;
+	public function getToolType() : int{
+		return BlockToolType::TYPE_AXE;
 	}
 
 
-	protected function recalculateBoundingBox(){
+	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 
 		if(($this->getDamage() & 0x04) > 0){
 			return null;
 		}
 
 		$i = ($this->getDamage() & 0x03);
-		if($i === 2 and $i === 0){
+		if($i === 2 or $i === 0){
 			return new AxisAlignedBB(
 				$this->x,
 				$this->y,
@@ -74,35 +68,38 @@ class FenceGate extends Transparent{
 		}
 	}
 
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$faces = [
-			0 => 3,
-			1 => 0,
-			2 => 1,
-			3 => 2,
-		];
-		$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0] & 0x03;
-		$this->getLevel()->setBlock($block, $this, true, true);
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		$this->meta = ($player instanceof Player ? ($player->getDirection() - 1) & 0x03 : 0);
+		$this->getLevel()->setBlock($blockReplace, $this, true, true);
 
 		return true;
 	}
 
-	public function getDrops(Item $item){
-		return [
-			[$this->id, 0, 1],
-		];
+	public function getVariantBitmask() : int{
+		return 0;
 	}
 
-	public function onActivate(Item $item, Player $player = null){
-		$faces = [
-			0 => 3,
-			1 => 0,
-			2 => 1,
-			3 => 2,
-		];
-		$this->meta = ($faces[$player instanceof Player ? $player->getDirection() : 0] & 0x03) | ((~$this->meta) & 0x04);
+	public function onActivate(Item $item, Player $player = null) : bool{
+		$this->meta = (($this->meta ^ 0x04) & ~0x02);
+
+		if($player !== null){
+			$this->meta |= (($player->getDirection() - 1) & 0x02);
+		}
+
 		$this->getLevel()->setBlock($this, $this, true);
-
+		$this->level->addSound(new DoorSound($this));
 		return true;
 	}
-}
+
+	public function getFuelTime() : int{
+		return 300;
+	}
+
+	public function getFlameEncouragement() : int{
+		return 5;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
+}

src/pocketmine/block/FenceGateAcacia.php

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

src/pocketmine/block/FenceGateSpruce.php

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

src/pocketmine/block/Fire.php

@@ -19,88 +19,150 @@
  *
 */
 
+declare(strict_types=1);
+
 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\inventory\InventoryHolder;
-use pocketmine\inventory\PlayerInventory;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\Server;
+use pocketmine\math\Vector3;
 
 class Fire extends Flowable{
 
 	protected $id = self::FIRE;
 
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function hasEntityCollision(){
+	public function hasEntityCollision() : bool{
 		return true;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Fire Block";
 	}
 
-	public function getLightLevel(){
+	public function getLightLevel() : int{
 		return 15;
 	}
 
-	public function isBreakable(Item $item){
+	public function isBreakable(Item $item) : bool{
 		return false;
 	}
 
-	public function canBeReplaced(){
+	public function canBeReplaced() : bool{
 		return true;
 	}
 
-	public function onEntityCollide(Entity $entity){
-		$damage = [EntityDamageEvent::MODIFIER_BASE => 1];
-		if($entity instanceof InventoryHolder){
-			$inventory = $entity->getInventory();
-			if($inventory instanceof PlayerInventory){
-				$damage[EntityDamageEvent::MODIFIER_ARMOR] = $inventory->getArmorPoints();
-			}
-		}
-		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, $damage);
-		$entity->attack($ev->getFinalDamage(), $ev);
+	public function onEntityCollide(Entity $entity) : void{
+		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1);
+		$entity->attack($ev);
 
 		$ev = new EntityCombustByBlockEvent($this, $entity, 8);
-		Server::getInstance()->getPluginManager()->callEvent($ev);
+		if($entity instanceof Arrow){
+			$ev->setCancelled();
+		}
+		$ev->call();
 		if(!$ev->isCancelled()){
 			$entity->setOnFire($ev->getDuration());
 		}
 	}
 
-	public function getDrops(Item $item){
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [];
 	}
 
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			for($s = 0; $s <= 5; ++$s){
-				$side = $this->getSide($s);
-				if($side->getId() !== self::AIR and !($side instanceof Liquid)){
-					return false;
+	public function onNearbyBlockChange() : void{
+		if(!$this->getSide(Vector3::SIDE_DOWN)->isSolid() and !$this->hasAdjacentFlammableBlocks()){
+			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
+		}else{
+			$this->level->scheduleDelayedBlockUpdate($this, mt_rand(30, 40));
+		}
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	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);
 				}
 			}
-			$this->getLevel()->setBlock($this, new Air(), true);
+		}
 
-			return Level::BLOCK_UPDATE_NORMAL;
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if($this->getSide(0)->getId() !== self::NETHERRACK){
-				$this->getLevel()->setBlock($this, new Air(), true);
+		if($result !== null){
+			$this->level->setBlock($this, $result);
+		}
 
-				return Level::BLOCK_UPDATE_NORMAL;
+		$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()){
+			$ev = new BlockBurnEvent($block, $this);
+			$ev->call();
+			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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,28 +15,31 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
+use pocketmine\math\AxisAlignedBB;
 
 abstract class Flowable extends Transparent{
 
-	public function canBeFlowedInto(){
+	public function canBeFlowedInto() : bool{
 		return true;
 	}
 
-	public function isSolid(){
+	public function getHardness() : float{
+		return 0;
+	}
+
+	public function isSolid() : bool{
 		return false;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 		return null;
 	}
-
-	public function getHardness(){
-		return 0;
-	}
-}
+}

src/pocketmine/block/Flower.php

@@ -0,0 +1,86 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
+
+class Flower extends Flowable{
+	public const TYPE_POPPY = 0;
+	public const TYPE_BLUE_ORCHID = 1;
+	public const TYPE_ALLIUM = 2;
+	public const TYPE_AZURE_BLUET = 3;
+	public const TYPE_RED_TULIP = 4;
+	public const TYPE_ORANGE_TULIP = 5;
+	public const TYPE_WHITE_TULIP = 6;
+	public const TYPE_PINK_TULIP = 7;
+	public const TYPE_OXEYE_DAISY = 8;
+
+	protected $id = self::RED_FLOWER;
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName() : string{
+		static $names = [
+			self::TYPE_POPPY => "Poppy",
+			self::TYPE_BLUE_ORCHID => "Blue Orchid",
+			self::TYPE_ALLIUM => "Allium",
+			self::TYPE_AZURE_BLUET => "Azure Bluet",
+			self::TYPE_RED_TULIP => "Red Tulip",
+			self::TYPE_ORANGE_TULIP => "Orange Tulip",
+			self::TYPE_WHITE_TULIP => "White Tulip",
+			self::TYPE_PINK_TULIP => "Pink Tulip",
+			self::TYPE_OXEYE_DAISY => "Oxeye Daisy"
+		];
+		return $names[$this->meta] ?? "Unknown";
+	}
+
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		$down = $this->getSide(Vector3::SIDE_DOWN);
+		if($down->getId() === Block::GRASS or $down->getId() === Block::DIRT or $down->getId() === Block::FARMLAND){
+			$this->getLevel()->setBlock($blockReplace, $this, true);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			$this->getLevel()->useBreakOn($this);
+		}
+	}
+
+	public function getFlameEncouragement() : int{
+		return 60;
+	}
+
+	public function getFlammability() : int{
+		return 100;
+	}
+}

src/pocketmine/block/FlowerPot.php

@@ -0,0 +1,113 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
+use pocketmine\tile\FlowerPot as TileFlowerPot;
+use pocketmine\tile\Tile;
+
+class FlowerPot extends Flowable{
+
+	public const STATE_EMPTY = 0;
+	public const STATE_FULL = 1;
+
+	protected $id = self::FLOWER_POT_BLOCK;
+	protected $itemId = Item::FLOWER_POT;
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName() : string{
+		return "Flower Pot";
+	}
+
+	protected function recalculateBoundingBox() : ?AxisAlignedBB{
+		return new AxisAlignedBB(
+			$this->x + 0.3125,
+			$this->y,
+			$this->z + 0.3125,
+			$this->x + 0.6875,
+			$this->y + 0.375,
+			$this->z + 0.6875
+		);
+	}
+
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			return false;
+		}
+
+		$this->getLevel()->setBlock($blockReplace, $this, true, true);
+		Tile::createTile(Tile::FLOWER_POT, $this->getLevel(), TileFlowerPot::createNBT($this, $face, $item, $player));
+		return true;
+	}
+
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			$this->getLevel()->useBreakOn($this);
+		}
+	}
+
+	public function onActivate(Item $item, Player $player = null) : bool{
+		$pot = $this->getLevel()->getTile($this);
+		if(!($pot instanceof TileFlowerPot)){
+			return false;
+		}
+		if(!$pot->canAddItem($item)){
+			return true;
+		}
+
+		$this->setDamage(self::STATE_FULL); //specific damage value is unnecessary, it just needs to be non-zero to show an item.
+		$this->getLevel()->setBlock($this, $this, true, false);
+		$pot->setItem($item->pop());
+
+		return true;
+	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		$items = parent::getDropsForCompatibleTool($item);
+
+		$tile = $this->getLevel()->getTile($this);
+		if($tile instanceof TileFlowerPot){
+			$item = $tile->getItem();
+			if($item->getId() !== Item::AIR){
+				$items[] = $item;
+			}
+		}
+
+		return $items;
+	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
+}

src/pocketmine/block/Furnace.php

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

src/pocketmine/block/Glass.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,10 +15,12 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
@@ -27,19 +29,19 @@ class Glass extends Transparent{
 
 	protected $id = self::GLASS;
 
-	public function __construct(){
-
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Glass";
 	}
 
-	public function getHardness(){
-		return 1.5;
+	public function getHardness() : float{
+		return 0.3;
 	}
 
-	public function getDrops(Item $item){
+	public function getDropsForCompatibleTool(Item $item) : array{
 		return [];
 	}
-}
+}

src/pocketmine/block/GlassPane.php

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

src/pocketmine/block/GlazedTerracotta.php

@@ -0,0 +1,63 @@
+<?php
+
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+use pocketmine\item\TieredTool;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
+
+class GlazedTerracotta extends Solid{
+
+	public function getHardness() : float{
+		return 1.4;
+	}
+
+	public function getToolType() : int{
+		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{
+		if($player !== null){
+			$faces = [
+				0 => 4,
+				1 => 3,
+				2 => 5,
+				3 => 2
+			];
+			$this->meta = $faces[(~($player->getDirection() - 1)) & 0x03];
+		}
+
+		return $this->getLevel()->setBlock($blockReplace, $this, true, true);
+	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+}

src/pocketmine/block/GlowingObsidian.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,27 +15,46 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 
+use pocketmine\item\TieredTool;
+
 class GlowingObsidian extends Solid{
 
 	protected $id = self::GLOWING_OBSIDIAN;
 
-	public function __construct($meta = 0){
+	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}
 
-	public function getName(){
+	public function getName() : string{
 		return "Glowing Obsidian";
 	}
 
-	public function getLightLevel(){
+	public function getLightLevel() : int{
 		return 12;
 	}
 
-}
+	public function getHardness() : float{
+		return 10;
+	}
+
+	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

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,65 +15,44 @@
  *
  * @author PocketMine Team
  * @link http://www.pocketmine.net/
- * 
+ *
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
+use pocketmine\Player;
 
-class GlowingRedstoneOre extends Solid{
+class GlowingRedstoneOre extends RedstoneOre{
 
 	protected $id = self::GLOWING_REDSTONE_ORE;
 
-	public function __construct(){
+	protected $itemId = self::REDSTONE_ORE;
 
-	}
-
-	public function getHardness(){
-		return 15;
-	}
-
-	public function getName(){
+	public function getName() : string{
 		return "Glowing Redstone Ore";
 	}
 
-	public function getLightLevel(){
+	public function getLightLevel() : int{
 		return 9;
 	}
 
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_SCHEDULED or $type === Level::BLOCK_UPDATE_RANDOM){
-			$this->getLevel()->setBlock($this, Block::get(Item::REDSTONE_ORE, $this->meta), false, false, true);
-
-			return Level::BLOCK_UPDATE_WEAK;
-		}
-
+	public function onActivate(Item $item, Player $player = null) : bool{
 		return false;
 	}
 
+	public function onNearbyBlockChange() : void{
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			default:
-				return 15;
-		}
 	}
 
-	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 4){
-			return [
-				[Item::REDSTONE_DUST, 0, mt_rand(4, 5)],
-			];
-		}else{
-			return [];
-		}
+	public function ticksRandomly() : bool{
+		return true;
 	}
 
-}
+	public function onRandomTick() : void{
+		$this->getLevel()->setBlock($this, BlockFactory::get(Block::REDSTONE_ORE, $this->meta), false, false);
+	}
+}