Release 3.19.1

this would cause disruption to generation on a patch release, which is unacceptable.
This would be better for 3.20 or 4.0.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Help & support on Discord
+    url: https://discord.gg/bmSAZBG
+    about: We don't accept support requests on the issue tracker. Please try asking on Discord instead.
+  - name: Help & support on forums
+    url: https://forums.pmmp.io
+    about: We don't accept support requests on the issue tracker. Please try asking on forums instead.
+  - name: Documentation
+    url: https://pmmp.rtfd.io
+    about: PocketMine-MP documentation

.github/ISSUE_TEMPLATE/crash.md

@@ -9,6 +9,7 @@ assignees: ''
 
 <!--- submit crashdump files to https://crash.pmmp.io -->
 <!--- or, copy the data between ===BEGIN CRASH DUMP=== and ===END CRASH DUMP and paste it on a site like https://pastebin.com -->
+<!--- DON'T JUST PASTE the crashdump into an issue -->
 Link to crashdump: 
 
 <!--- write additional information about the crash to help us find the problem -->

.github/ISSUE_TEMPLATE/help---support.md

@@ -1,14 +0,0 @@
----
-name: Help & support
-about: We don't accept support requests here. Try the links on the README.
-title: ''
-labels: Support request
-assignees: ''
-
----
-
-We don't accept support requests on the issue tracker. Please try the following links instead:
-
-Documentation: http://pmmp.rtfd.io
-Forums: https://forums.pmmp.io
-Discord: https://discord.gg/bmSAZBG

.github/ISSUE_TEMPLATE/security-dos-vulnerability.md

@@ -1,12 +0,0 @@
----
-name: Security/DoS vulnerability
-about: 'Bug or exploit that can be used to attack servers (hint: don''t report it
-  on a public issue tracker)'
-title: ''
-labels: 'Auto: Spam'
-assignees: ''
-
----
-
-Please DO NOT report security vulnerabilities here.
-Instead, send an email to team@pmmp.io or contact a developer directly, IN PRIVATE.

.github/support.yml

@@ -1,16 +0,0 @@
-# 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: >
-  Thanks, but this issue tracker is not intended for support requests. Please read the guidelines on [submitting an issue](https://github.com/pmmp/PocketMine-MP/blob/master/CONTRIBUTING.md#creating-an-issue).
-
-
-  [Docs](https://pmmp.rtfd.io) | [Discord](https://discord.gg/bmSAZBG) | [Forums](https://forums.pmmp.io)
-
-# Whether to close issues marked as support requests
-close: true
-# Whether to lock issues marked as support requests
-lock: false

.github/workflows/main.yml

@@ -0,0 +1,281 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build-php:
+    name: Prepare PHP
+    runs-on: ${{ matrix.image }}
+
+    strategy:
+      matrix:
+        image: [ubuntu-20.04]
+        php: [7.3.27, 7.4.16]
+
+    steps:
+      - uses: actions/checkout@v2 #needed for build.sh
+      - name: Check for PHP build cache
+        id: php-build-cache
+        uses: actions/cache@v2
+        with:
+          path: "./bin"
+          key: "php-build-generic-${{ matrix.php }}-${{ matrix.image }}-${{ hashFiles('./tests/gh-actions/build.sh') }}"
+
+      - name: Compile PHP
+        if: steps.php-build-cache.outputs.cache-hit != 'true'
+        run: ./tests/gh-actions/build.sh "${{ matrix.php }}"
+
+  phpstan:
+    name: PHPStan analysis
+    needs: build-php
+    runs-on: ${{ matrix.image }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        image: [ubuntu-20.04]
+        php: [7.3.27, 7.4.16]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Restore PHP build cache
+        id: php-build-cache
+        uses: actions/cache@v2
+        with:
+          path: "./bin"
+          key: "php-build-generic-${{ matrix.php }}-${{ matrix.image }}-${{ hashFiles('./tests/gh-actions/build.sh') }}"
+
+      - name: Kill build on PHP build cache miss (should never happen)
+        if: steps.php-build-cache.outputs.cache-hit != 'true'
+        run: exit 1
+
+      - name: Install cached PHP's dependencies
+        if: steps.php-build-cache.outputs.cache-hit == 'true'
+        run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh
+
+      - name: Prefix PHP to PATH
+        run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH
+
+      - name: Install Composer
+        run: curl -sS https://getcomposer.org/installer | php
+
+      - name: Restore Composer package cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/composer/files
+            ~/.cache/composer/vcs
+          key: "composer-v2-cache-${{ matrix.php }}-${{ hashFiles('./composer.lock') }}"
+          restore-keys: |
+            composer-v2-cache-
+
+      - name: Install Composer dependencies
+        run: php composer.phar install --prefer-dist --no-interaction
+
+      - name: Run PHPStan
+        run: ./vendor/bin/phpstan analyze --no-progress --memory-limit=2G
+
+  phpunit:
+    name: PHPUnit tests
+    needs: build-php
+    runs-on: ${{ matrix.image }}
+    strategy:
+      fail-fast: false
+      matrix:
+        image: [ubuntu-20.04]
+        php: [7.3.27, 7.4.16]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Restore PHP build cache
+        id: php-build-cache
+        uses: actions/cache@v2
+        with:
+          path: "./bin"
+          key: "php-build-generic-${{ matrix.php }}-${{ matrix.image }}-${{ hashFiles('./tests/gh-actions/build.sh') }}"
+
+      - name: Kill build on PHP build cache miss (should never happen)
+        if: steps.php-build-cache.outputs.cache-hit != 'true'
+        run: exit 1
+
+      - name: Install cached PHP's dependencies
+        if: steps.php-build-cache.outputs.cache-hit == 'true'
+        run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh
+
+      - name: Prefix PHP to PATH
+        run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH
+
+      - name: Install Composer
+        run: curl -sS https://getcomposer.org/installer | php
+
+      - name: Restore Composer package cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/composer/files
+            ~/.cache/composer/vcs
+          key: "composer-v2-cache-${{ matrix.php }}-${{ hashFiles('./composer.lock') }}"
+          restore-keys: |
+            composer-v2-cache-
+
+      - name: Install Composer dependencies
+        run: php composer.phar install --prefer-dist --no-interaction
+
+      - name: Run PHPUnit tests
+        run: ./vendor/bin/phpunit --bootstrap vendor/autoload.php --fail-on-warning tests/phpunit
+
+  integration:
+    name: Integration tests
+    needs: build-php
+    runs-on: ${{ matrix.image }}
+    strategy:
+      fail-fast: false
+      matrix:
+        image: [ubuntu-20.04]
+        php: [7.3.27, 7.4.16]
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Restore PHP build cache
+        id: php-build-cache
+        uses: actions/cache@v2
+        with:
+          path: "./bin"
+          key: "php-build-generic-${{ matrix.php }}-${{ matrix.image }}-${{ hashFiles('./tests/gh-actions/build.sh') }}"
+
+      - name: Kill build on PHP build cache miss (should never happen)
+        if: steps.php-build-cache.outputs.cache-hit != 'true'
+        run: exit 1
+
+      - name: Install cached PHP's dependencies
+        if: steps.php-build-cache.outputs.cache-hit == 'true'
+        run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh
+
+      - name: Prefix PHP to PATH
+        run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH
+
+      - name: Install Composer
+        run: curl -sS https://getcomposer.org/installer | php
+
+      - name: Restore Composer package cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/composer/files
+            ~/.cache/composer/vcs
+          key: "composer-v2-cache-${{ matrix.php }}-${{ hashFiles('./composer.lock') }}"
+          restore-keys: |
+            composer-v2-cache-
+
+      - name: Install Composer dependencies
+        run: php composer.phar install --no-dev --prefer-dist --no-interaction
+
+      - name: Run integration tests
+        run: ./tests/travis.sh -t4
+
+  preprocessor:
+    name: Preprocessor tests
+    needs: build-php
+    runs-on: ${{ matrix.image }}
+    strategy:
+      fail-fast: false
+      matrix:
+        image: [ubuntu-20.04]
+        php: [7.3.27, 7.4.16]
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Restore PHP build cache
+        id: php-build-cache
+        uses: actions/cache@v2
+        with:
+          path: "./bin"
+          key: "php-build-generic-${{ matrix.php }}-${{ matrix.image }}-${{ hashFiles('./tests/gh-actions/build.sh') }}"
+
+      - name: Kill build on PHP build cache miss (should never happen)
+        if: steps.php-build-cache.outputs.cache-hit != 'true'
+        run: exit 1
+
+      - name: Install cached PHP's dependencies
+        if: steps.php-build-cache.outputs.cache-hit == 'true'
+        run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh
+
+      - name: Prefix PHP to PATH
+        run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH
+
+      - name: Install Composer
+        run: curl -sS https://getcomposer.org/installer | php
+
+      - name: Restore Composer package cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/composer/files
+            ~/.cache/composer/vcs
+          key: "composer-v2-cache-${{ matrix.php }}-${{ hashFiles('./composer.lock') }}"
+          restore-keys: |
+            composer-v2-cache-
+
+      - name: Install Composer dependencies
+        run: php composer.phar install --no-dev --prefer-dist --no-interaction
+
+      - name: Run preprocessor
+        run: |
+          PM_PREPROCESSOR_PATH="$GITHUB_WORKSPACE/build/preprocessor"
+          php "$PM_PREPROCESSOR_PATH/PreProcessor.php" --path=src --multisize || (echo "Preprocessor exited with code $?" && exit 1)
+
+          #dump the diff of preprocessor replacements to a patch in case it has bugs
+          git diff > preprocessor_diff.patch
+
+          VENDOR_PM="$GITHUB_WORKSPACE/vendor"
+          VENDOR_PM_BACKUP="$GITHUB_WORKSPACE/vendor-before-preprocess"
+          cp -r "$VENDOR_PM" "$VENDOR_PM_BACKUP"
+          for f in $(ls $VENDOR_PM/pocketmine); do
+            echo "Processing directory \"$f\"..."
+            php "$PM_PREPROCESSOR_PATH/PreProcessor.php" --path="$VENDOR_PM/pocketmine/$f" --multisize || (echo "Preprocessor exited with code $?" && exit 1)
+            echo "Checking for changes in \"$f\"..."
+            DIFF=$(git diff --no-index "$VENDOR_PM_BACKUP/pocketmine/$f" "$VENDOR_PM/pocketmine/$f" || true)
+            if [ "$DIFF" != "" ]; then
+              PATCH="$GITHUB_WORKSPACE/preprocessor_diff_$f.patch"
+              echo "$DIFF" > "$PATCH"
+              echo "Generated patch file \"$PATCH\""
+            else
+              echo "No diff generated for \"$f\" (preprocessor made no changes)"
+            fi
+          done
+
+      - name: Upload preprocessor diffs
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: preprocessor_diffs_${{ matrix.php }}_${{ matrix.image }}
+          path: ${{ github.workspace }}/preprocessor_diff*.patch
+
+  codestyle:
+    name: Code Style checks
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP and tools
+        uses: shivammathur/setup-php@2.9.0
+        with:
+          php-version: 7.4
+          tools: php-cs-fixer
+
+      - name: Run PHP-CS-Fixer
+        run: php-cs-fixer fix --dry-run --diff --diff-format=udiff

.github/workflows/support.yml

@@ -0,0 +1,22 @@
+name: 'Manage support request issues'
+
+on:
+  issues:
+    types: [labeled, unlabeled, reopened]
+
+jobs:
+  support:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/support-requests@v2
+        with:
+          github-token: ${{ github.token }}
+          support-label:  "Support request"
+          issue-comment: >
+            Thanks, but this issue tracker is not intended for support requests. Please read the guidelines on [submitting an issue](https://github.com/pmmp/PocketMine-MP/blob/master/CONTRIBUTING.md#creating-an-issue).
+
+
+            [Docs](https://pmmp.rtfd.io) | [Discord](https://discord.gg/bmSAZBG) | [Forums](https://forums.pmmp.io)
+
+          close-issue: true
+          lock-issue: false

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "src/pocketmine/lang/locale"]
 	path = src/pocketmine/lang/locale
-	url = https://github.com/pmmp/PocketMine-Language.git
+	url = https://github.com/pmmp/Language.git
 [submodule "tests/preprocessor"]
 	path = build/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 "tests/plugins/DevTools"]
+	path = tests/plugins/DevTools
+	url = https://github.com/pmmp/DevTools.git
 [submodule "build/php"]
 	path = build/php
 	url = https://github.com/pmmp/php-build-scripts.git

.php_cs

@@ -0,0 +1,71 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+	->in(__DIR__ . '/src')
+	->in(__DIR__ . '/build')
+	->in(__DIR__ . '/tests')
+	->notPath('plugins/DevTools')
+	->notPath('preprocessor')
+	->notContains('#ifndef COMPILE') //preprocessor will break if these are changed
+	->notName('PocketMine.php');
+
+return PhpCsFixer\Config::create()
+	->setRiskyAllowed(true)
+	->setRules([
+		'align_multiline_comment' => [
+			'comment_type' => 'phpdocs_only'
+		],
+		'array_indentation' => true,
+		'array_syntax' => [
+			'syntax' => 'short'
+		],
+		'blank_line_after_namespace' => true,
+		'blank_line_after_opening_tag' => true,
+		'blank_line_before_statement' => [
+			'statements' => [
+				'declare'
+			]
+		],
+		'cast_spaces' => [
+			'space' => 'single'
+		],
+		'concat_space' => [
+			'spacing' => 'one'
+		],
+		'declare_strict_types' => true,
+		'elseif' => true,
+		'global_namespace_import' => [
+			'import_constants' => true,
+			'import_functions' => true,
+			'import_classes' => null,
+		],
+		'indentation_type' => true,
+		'native_function_invocation' => [
+		    'scope' => 'namespaced'
+		],
+		'no_closing_tag' => true,
+		'no_empty_phpdoc' => true,
+		'no_extra_blank_lines' => true,
+		'no_superfluous_phpdoc_tags' => [
+            'allow_mixed' => true,
+		],
+		'no_trailing_whitespace' => true,
+		'no_trailing_whitespace_in_comment' => true,
+		'no_whitespace_in_blank_line' => true,
+		'no_unused_imports' => true,
+		'ordered_imports' => [
+			'imports_order' => [
+				'class',
+				'function',
+				'const',
+			],
+			'sort_algorithm' => 'alpha'
+		],
+		'phpdoc_trim' => true,
+		'phpdoc_trim_consecutive_blank_line_separation' => true,
+		'single_import_per_statement' => true,
+		'strict_param' => true,
+	])
+	->setFinder($finder)
+	->setIndent("\t")
+	->setLineEnding("\n");

.travis.yml

@@ -1,32 +0,0 @@
-language: php
-
-php:
- - 7.3
-
-before_script:
- - phpenv config-rm xdebug.ini
- - echo | pecl install channel://pecl.php.net/yaml-2.1.0
- - git clone https://github.com/pmmp/pthreads.git
- - cd pthreads
- - git checkout 646dac62ae0d48c1ada7b007e15575fb84f7d71d
- - phpize
- - ./configure
- - make
- - make install
- - cd ..
- - echo "extension=pthreads.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-
-script:
- - composer install --prefer-dist
- - ./vendor/bin/phpstan analyze --no-progress --memory-limit=2G
- - ./vendor/bin/phpunit --bootstrap vendor/autoload.php --fail-on-warning tests/phpunit
- - composer install --no-dev --prefer-dist
- - ./tests/travis.sh -t4
-
-cache:
- directories:
-  - $HOME/.composer/cache/files
-  - $HOME/.composer/cache/vcs
-
-notifications:
- email: false

BUILDING.md

@@ -8,7 +8,7 @@
 ## Custom PHP binaries
 Because PocketMine-MP requires several non-standard PHP extensions and configuration, PMMP provides scripts to build custom binaries for running PocketMine-MP, as well as prebuilt binaries.
 
-- [Prebuilt binaries](https://jenkins.pmmp.io/job/PHP-7.3-Aggregate)
+- [Prebuilt binaries](https://jenkins.pmmp.io/job/PHP-7.4-Aggregate)
 - [Compile scripts](https://github.com/pmmp/php-build-scripts) are provided as a submodule in the path `build/php`
 
 If you use a custom binary, you'll need to replace `composer` usages in this guide with `path/to/your/php path/to/your/composer.phar`.
@@ -30,9 +30,15 @@ If you use a custom binary, you'll need to replace `composer` usages in this gui
 Preprocessor requires that the `cpp` (c preprocessor) is available in your PATH.
 
 ## Building `PocketMine-MP.phar`
-Run `build/server-phar.php` using your preferred PHP binary. It'll drop a `PocketMine-MP.phar` into the current working directory.
+Run `composer make-server` using your preferred PHP binary. It'll drop a `PocketMine-MP.phar` into the current working directory.
 
 You can also use the `--out` option to change the output filename.
 
+There is a bug in PHP that might cause an error which looks like this:
+```
+Fatal error: Uncaught BadMethodCallException: unable to create temporary file in PocketMine-MP/build/server-phar.php:119
+```
+You can work around it by setting `ulimit -n` to some bigger number, e.g. `8192`, or by updating your PHP version to at least 7.4.16 or 8.0.3.
+
 ## Running PocketMine-MP from source code
 Run `src/pocketmine/PocketMine.php` using your preferred PHP binary.

CONTRIBUTING.md

@@ -116,7 +116,7 @@ class ExampleClass{
 <!-- 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
+* RFCs will be tagged with the *Type: Request For Comments* label
 * A vote will be held once the RFC is ready. All users can vote commenting on the Pull Request
 * Comments MUST use "Yes" or "No" on the FIRST sentence to signify the vote, except when they don't want it to be counted.
 * If your comment is a voting comment, specify the reason of your vote or it won't be counted.

README.md

@@ -3,7 +3,12 @@
 	<b>A highly customisable, open source server software for Minecraft: Bedrock Edition written in PHP</b>
 </p>
 
-[![Build Status](https://travis-ci.com/pmmp/PocketMine-MP.svg?branch=master)](https://travis-ci.com/pmmp/PocketMine-MP)
+<p align="center">
+	<img src="https://github.com/pmmp/PocketMine-MP/workflows/CI/badge.svg" alt="CI" />
+	<a href="https://github.com/pmmp/PocketMine-MP/releases"><img src="https://img.shields.io/github/v/tag/pmmp/PocketMine-MP?label=release&logo=github" alt="GitHub tag (latest semver)" /></a>
+	<a href="https://hub.docker.com/r/pmmp/pocketmine-mp"><img src="https://img.shields.io/docker/v/pmmp/pocketmine-mp?logo=docker&label=image" alt="Docker image version (latest semver)" /></a>
+	<a href="https://discord.gg/bmSAZBG"><img src="https://img.shields.io/discord/373199722573201408?label=discord&color=7289DA&logo=discord" alt="Discord" /></a>
+</p>
 
 ## Getting started
 - [Documentation](http://pmmp.readthedocs.org/)
@@ -18,8 +23,9 @@
 
 ## For developers
  * [Building and running from source](BUILDING.md)
+ * [Developer documentation](https://devdoc.pmmp.io) - General documentation for PocketMine-MP plugin 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/) - Development tools plugin for creating plugins
+ * [DevTools](https://github.com/pmmp/DevTools/) - Development tools plugin for creating plugins
  * [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features
  * [Contributing Guidelines](CONTRIBUTING.md)
 

SECURITY.md

@@ -0,0 +1,33 @@
+# Security Policy
+
+## Supported Versions
+The following release lines are currently receiving active security updates and bug fixes:
+
+| Version  | Supported          |
+| -------- | ------------------ |
+| 3.15.x   | :white_check_mark: |
+| < 3.15.0 | :x:                |
+
+## Reporting a Vulnerability
+
+**DO NOT report vulnerabilities on the GitHub issue tracker.**
+GitHub is public and anyone can see the issues you post on the issue tracker, including people who would exploit vulnerabilities for their own gain.
+
+**WARNING: You may put live servers at risk by reporting a vulnerability on the GitHub issue tracker.**
+
+**Contact us** by sending an email to [**team@pmmp.io**](mailto:team@pmmp.io?subject=Security%20Vulnerability%20in%20PocketMine-MP). Include the following information:
+
+- Version of PocketMine-MP
+- Detailed description of the vulnerability (e.g. how to exploit it, what the effects are)
+
+Please note that we can't guarantee a reply to every email.
+
+## FAQ
+### Do you offer a bug bounty?
+No.
+
+### How soon can I expect a fix for a vulnerability I've reported?
+This depends on the nature of the problem. We can't provide any general ETA (nor would it be wise to provide one).
+In general, it depends on when developers have time to look into the problem, how complex the problem is to fix, and how many users it impacts.
+
+When a fix for a severe vulnerability is pushed, a patch release for the target version will usually be released within 24 hours so that users can update.

build/make-release.php

@@ -37,7 +37,6 @@ use const STDIN;
 
 require_once dirname(__DIR__) . '/vendor/autoload.php';
 
-
 function replaceVersion(string $versionInfoPath, string $newVersion, bool $isDev) : void{
 	$versionInfo = file_get_contents($versionInfoPath);
 	$versionInfo = preg_replace(
@@ -72,7 +71,7 @@ function main(array $argv) : void{
 
 	$versionInfoPath = dirname(__DIR__) . '/src/pocketmine/VersionInfo.php';
 	replaceVersion($versionInfoPath, $currentVer->getBaseVersion(), false);
-	
+
 	echo "please add appropriate notes to the changelog and press enter...";
 	fgets(STDIN);
 	system('git add "' . dirname(__DIR__) . '/changelogs"');
@@ -86,6 +85,4 @@ function main(array $argv) : void{
 	system('git push origin HEAD ' . $currentVer->getBaseVersion());
 }
 
-if(!defined('pocketmine\_PHPSTAN_ANALYSIS')){
-	main($argv);
-}
+main($argv);

build/server-phar.php

@@ -26,7 +26,6 @@ namespace pocketmine\build\server_phar;
 use pocketmine\utils\Git;
 use function array_map;
 use function count;
-use function defined;
 use function dirname;
 use function file_exists;
 use function getcwd;
@@ -41,6 +40,7 @@ use function rtrim;
 use function sprintf;
 use function str_replace;
 use function unlink;
+use const PHP_EOL;
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
@@ -129,6 +129,10 @@ function main() : void{
 		echo "Set phar.readonly to 0 with -dphar.readonly=0" . PHP_EOL;
 		exit(1);
 	}
+	if(file_exists(dirname(__DIR__) . '/vendor/phpunit')){
+		echo "Remove Composer dev dependencies before building (composer install --no-dev)" . PHP_EOL;
+		exit(1);
+	}
 
 	$opts = getopt("", ["out:", "git:"]);
 	if(isset($opts["git"])){
@@ -169,6 +173,4 @@ STUB
 	}
 }
 
-if(!defined('pocketmine\_PHPSTAN_ANALYSIS')){
-	main();
-}
+main();

changelogs/3.14.md

@@ -23,3 +23,18 @@ Plugin developers should **only** update their required API to this version if y
 - `/plugins`, `/whitelist list`, `/banlist` and `/list` now show output in alphabetical order.
 - Some `pocketmine\event` APIs which accept arrays now have more robust type checking, fixing type errors caused by plugin input occurring in core code.
 - `Attribute::getAttributeByName()` is now aware of the `minecraft:lava_movement` attribute.
+
+# 3.14.2
+- Exception stack traces are now logged as CRITICAL. It's hoped that users will recognize that they are just as important as the error message and not leave them out when asking for help with errors on Discord.
+- `TaskScheduler` no longer accepts tasks that already have a handler. This fixes undefined behaviour which occurs when scheduling the same task instance twice, but it does break plugins such as **MyPlot** which unintentionally used this buggy behaviour.
+- Players will now correctly receive the needed number of spawn chunks if they are teleported between `PlayerLoginEvent` and `PlayerJoinEvent`. This fixes a bug that could occur when teleporting players in delayed tasks between login and join.
+- `PlayerRespawnEvent->setRespawnPosition()` now throws an exception if the provided `Position` has an invalid world associated with it (null or unloaded).
+- Fixed a crash that occurred when stats reporting was enabled.
+
+# 3.14.3
+- Fixed deprecation error when running `/whitelist list` on PHP 7.4.
+- Fixed podzol breaking animation being incorrect (incorrect hardness).
+- `Entity::getSaveId()` now reports the class name in the message thrown for unregistered entities.
+- Fixed `CraftingManager->validate()` producing different results when called multiple times for the same transaction.
+- Fixed various issues with batch-crafting items using the recipe book and shift-clicking.
+- `tests/plugins/PocketMine-DevTools` submodule has been renamed to `tests/plugins/DevTools`.

changelogs/3.15.md

@@ -0,0 +1,54 @@
+**For Minecraft: Bedrock Edition 1.16.20**
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 3.x.y version will also run on these releases and do not need API bumps.
+Plugin developers should **only** update their required API to this version if you need the changes in this build.
+
+**WARNING: If your plugin uses the protocol, you're not shielded by API change constraints.** You should consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you do.
+
+# 3.15.0
+- Added support for Minecraft: Bedrock Edition 1.16.20.
+- Removed compatibility with 1.16.0.
+
+## Known issues (please don't open issues for these)
+- Walls don't connect to each other
+- Pumpkin and melon stems may not connect to their corresponding pumpkin/melon
+- New blocks, items & mobs aren't implemented
+- Nether doesn't exist
+
+# 3.15.1
+- Fixed various PHP 7.4 compatibility issues in Composer dependencies (primarily callback-validator).
+- Fixed LevelDB worlds with corrupted `level.dat` crashing the server instead of failing gracefully.
+- Fixed error spam when using strings for layers in flatworld presets (`e.g. bedrock,3xdirt,grass`).
+- Fixed blocks not getting updated properly on explosions.
+- Fixed `BlockGrowEvent` not being called when sugarcane grows.
+- Potato crops now drop poisonous potatoes when harvested.
+- Fixed the wrong number of potatoes being dropped when harvesting potato crops.
+- Players no longer get pullbacks when sprinting on slabs, stairs and various other blocks when `player.anti-cheat.allow-movement-cheats` is set to `false`. (This bug has been around for over 5 years, so many of you will be used to its existence.)
+- Fixed entity collision box calculation not taking clip distance into account.
+- Entities now step up the correct height of the target block, instead of jumping into the air 0.6 blocks and falling back down.
+
+# 3.15.2
+- Fixed issues with preloading `SubChunk`.
+- `/gc` and automatic garbage collection will now release unused heap blocks back to the OS. Previously, the PHP process might hold onto these blocks indefinitely even when not used, causing elevated real memory usage.
+- Added some documentation to `FurnaceBurnEvent`.
+
+# 3.15.3
+- Fixed fall damage accumulation over continuous knockbacks (e.g. combo attacks in PvP).
+- Fixed a bug in `Human->addXp()` that would cause a crash when saving player data.
+- `Human->addXp()` will no longer modify the target's total XP if `PlayerExperienceChangeEvent` was cancelled.
+- `AsyncPool->getTaskQueueSizes()` has been added to allow external detection of async pool overload. This is planned to be implemented as a core feature in the future, but it hasn't been done yet.
+- `BaseInventory->canAddItem()` behaviour now matches `addItem()` by considering the max stack size of the given item.
+- Fixed a bug in generator options handling for worlds loaded via `pocketmine.yml`. This fix has the following side effects:
+  - It's now possible to provide generator options as an `options` key when loading a world via `pocketmine.yml`.
+  - If generator options are not provided, the options from `server.properties` will be used, instead of using an empty preset. (It's not clear whether this is desired behaviour, but it was clearly intended, since there is code to do this which was broken until this release. As such, this behaviour is subject to change in the future.)
+- Fixed a bug in region-based world loading where some files without filename extensions and names containing a region filename extension (e.g a file named `amca` in a McRegion world) would cause the world not to load. These files are now ignored.
+- Default network compression level has been lowered to 6, due to level 7 being 25% more expensive for only a marginal improvement in bandwidth.
+- Fixed a performance issue with chunk requesting when players trigger chunk generation on first join.
+- Setup wizard will now always show IP information, even if the user chose to skip the setup wizard when prompted. (This doesn't affect `--no-wizard` in any way.)
+- `Maximum memory (system)` is no longer reported in `/status` due to having a misleading output (it was the same as the current memory usage).
+- The `Player Chunk Send` timer on timings reports now actually reports measurements of chunk sending, not chunk loading.
+- A new parent timer `World Load` has been added to timings reports, which aggregates timings from `syncChunkLoad` and subtimings from all worlds.
+
+# 3.15.4
+- Fixed a bug in the inventory transaction system that caused the server to freeze under some circumstances.

changelogs/3.16.md

@@ -0,0 +1,24 @@
+**For Minecraft: Bedrock Edition 1.16.100**
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 3.x.y version will also run on these releases and do not need API bumps.
+Plugin developers should **only** update their required API to this version if you need the changes in this build.
+
+**WARNING: If your plugin uses the protocol, you're not shielded by API change constraints.** You should consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you do.
+
+# 3.16.0
+- Added support for Minecraft: Bedrock Edition 1.16.100.
+- Removed compatibility with earlier versions.
+- Added new custom composer commands `make-server` and `make-devtools` to ease setting up a development environment and building the server.
+
+## Known issues (please don't open issues for these)
+- Walls don't connect to each other
+- Pumpkin and melon stems may not connect to their corresponding pumpkin/melon
+- New blocks, items & mobs aren't implemented
+- Nether doesn't exist
+
+# 3.16.1
+- Fixed incorrect encoding of skins in the protocol.
+- `/version` no longer crashes when a plugin provides `string[]` for the `author` field in `plugin.yml`.
+- `author` in `plugin.yml` now accepts arrays, just like `authors`.
+- Fixed `HellBiome` never being registered.

changelogs/3.17.md

@@ -0,0 +1,63 @@
+**For Minecraft: Bedrock Edition 1.16.200**
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 3.x.y version will also run on these releases and do not need API bumps.
+Plugin developers should **only** update their required API to this version if you need the changes in this build.
+
+**WARNING: If your plugin uses the protocol, you're not shielded by API change constraints.** You should consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you do.
+
+# 3.17.0
+- Added support for Minecraft: Bedrock Edition 1.16.200.
+- Removed compatibility with earlier versions.
+
+## Known issues (please don't open issues for these)
+- Walls don't connect to each other
+- Pumpkin and melon stems may not connect to their corresponding pumpkin/melon
+- New blocks, items & mobs aren't implemented
+- Nether doesn't exist
+
+# 3.17.1
+- Fixed some instances of plugin-caused crashes not being detected (eval()'d code, custom plugin paths).
+- Server uptime is now included in crash reports.
+- Hoes now take damage when used to break sponges.
+- Using lava as fuel in a furnace now leaves behind an empty bucket.
+
+# 3.17.2
+- Fixed region header corruption when chunks with larger-than-expected lengths are found. These chunks are now treated as corrupted, instead of automatically attempting to salvage them (which usually fails anyway).
+- `RegionLoader->removeChunk()` now allows the space used by the removed chunk to be reused by future region saves.
+- Extracted `Living->applyConsumptionResults()` from `Living->consumeObject()` (preparation for a future bug fix).
+
+# 3.17.3
+- Improved performance of chunk loading in Region-based worlds.
+- Improved performance of region header validation in Region-based worlds (indirect improvement to chunk loading performance).
+- Fixed some PHP 8.0 language-level compatibility issues.
+- Source installations will now exit with an error when Composer dependencies are not in sync with the current Git revision. Now, it's required to run `composer install` after every git pull to make sure the correct dependency versions are installed.
+
+# 3.17.4
+- Removed `readline` support. This hasn't been maintained for many years, never worked correctly, and isn't thread-safe in any case.
+- Fixed false-positives of region corruption in Region-based worlds (outdated file stat cache).
+- Fixed more deprecation warnings on PHP 8.0 (optional parameter before required).
+- `CraftItemEvent->getInputs()` now returns a list starting at offset 0, instead of random offsets. (Note that the contents still won't be ordered.)
+- `CraftItemEvent->getOutputs()` now returns a list starting at offset 0, instead of random offsets. (Note that the contents still won't be ordered.)
+- Fixed a bug that broke synchronized building, bridging, towering and more.
+- Objects in memory dumps no longer show inherited properties multiple times.
+
+# 3.17.5
+- Reduced CPU wastage by the logger thread.
+- Fixed LevelDB deprecation errors on PHP 8.0.
+- Added some protocol changes for 1.16.200 which were previously overlooked.
+- Player XUIDs are now tracked. If a player's XUID does not match the previously recorded XUID when they next join the server, they will be kicked. This can be disabled by the `player.verify-xuid` setting in `pocketmine.yml`.
+- `BUILDING.md` now has a note about `build/server-phar.php`'s compression bug (a bug in PHP).
+
+# 3.17.6
+- Fixed core race conditions that could have led to server freezes (race conditions in pmmp/Snooze).
+- The log message about Xbox Live authentication being enabled has been reduced to INFO, and the tip on how to turn it off removed (disabling it should usually only be done by power users anyway).
+- Fixed `PlayerMoveEvent->getFrom()` returning incorrect results for players who experienced movement reversions.
+- Fixed a bug in `ResourcePackClientResponsePacket` decoding that caused unexpected results when decoding the packet twice.
+- XUID verification now compares XUIDs against players who are already on the server to detect mismatches to avoid unnecessary loading of playerdata.
+- Fixed an inventory duplication bug which could occur when the same player joined with two devices at the same time.
+- Fixed cursor item not being synced on inventory transaction rollbacks.
+- Fixed items with TAG_Float in their NBT not being able to be moved around in the inventory.
+
+# 3.17.7
+- Fixed crash caused by preprocessor in 3.17.6.

changelogs/3.18.md

@@ -0,0 +1,31 @@
+**For Minecraft: Bedrock Edition 1.16.210**
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 3.x.y version will also run on these releases and do not need API bumps.
+Plugin developers should **only** update their required API to this version if you need the changes in this build.
+
+**WARNING: If your plugin uses the protocol, you're not shielded by API change constraints.** You should consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you do.
+
+# 3.18.0
+- Added support for Minecraft: Bedrock Edition 1.16.210.
+- Removed compatibility with earlier versions.
+
+## Known issues (please don't open issues for these)
+- Walls don't connect to each other
+- Pumpkin and melon stems may not connect to their corresponding pumpkin/melon
+- New blocks, items & mobs aren't implemented
+- Nether doesn't exist
+- Items can't be removed from item frames in Survival mode
+
+# 3.18.1
+- UPnP is now supported on all platforms instead of just Windows. Note that it's still experimental. Please file issues for any bugs that you find.
+- Fixed server joining when default game mode is set to Spectator mode.
+- Fixed items not being able to be removed from item frames in Survival mode.
+- Fixed field order in ClientCacheBlobStatusPacket (hits and misses were inverted).
+- Fixed a deadlock that could occur when MainLogger->syncFlushBuffer() was used (usually only used during exception logging).
+- Updated constants for various things in the protocol.
+
+# 3.18.2
+- Fixed `InventoryCloseEvent` not being called on server-initiated inventory closures.
+- `PlayerToggleFlightEvent` may now be pre-cancelled if the player attempted to enable flight when flying was not allowed. This replaces the previous behaviour of kicking the player.
+- Fixed being unable to change the item in hand from the inventory window when looking at an entity.

changelogs/3.19.md

@@ -0,0 +1,23 @@
+**For Minecraft: Bedrock Edition 1.16.220**
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 3.x.y version will also run on these releases and do not need API bumps.
+Plugin developers should **only** update their required API to this version if you need the changes in this build.
+
+**WARNING: If your plugin uses the protocol, you're not shielded by API change constraints.** You should consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you do.
+
+# 3.19.0
+- Added support for Minecraft: Bedrock Edition 1.16.220.
+- Removed compatibility with earlier versions.
+
+## Known issues (please don't open issues for these)
+- Walls don't connect to each other
+- Pumpkin and melon stems may not connect to their corresponding pumpkin/melon
+- New blocks, items & mobs aren't implemented
+- Nether doesn't exist
+
+# 3.19.1
+- Fixed some particles not working since 1.16.220.
+- Fixed issues with creative inventory items appearing in the wrong places since 1.16.220.
+- `Item->removeEnchantment()` now removes the `ench` tag from item NBT when removing the only enchantment on an item.
+- Fixed temporary memory leak of repeating tasks which cancelled themselves during their `onRun()` handler (they were pushed back onto the task queue even though cancelled, and only removed at their next attempted repeat).

composer.json

@@ -5,11 +5,10 @@
    "homepage": "https://pmmp.io",
    "license": "LGPL-3.0",
    "require": {
-      "php": ">=7.3.0",
+      "php": "^7.3 || ^8.0",
       "php-64bit": "*",
-      "ext-bcmath": "*",
-      "ext-curl": "*",
       "ext-ctype": "*",
+      "ext-curl": "*",
       "ext-date": "*",
       "ext-hash": "*",
       "ext-json": "*",
@@ -19,26 +18,27 @@
       "ext-phar": "*",
       "ext-pthreads": "~3.2.0",
       "ext-reflection": "*",
+      "ext-simplexml": "*",
       "ext-sockets": "*",
       "ext-spl": "*",
       "ext-yaml": ">=2.0.0",
       "ext-zip": "*",
       "ext-zlib": ">=1.2.11",
-      "pocketmine/raklib": "^0.12.7",
-      "pocketmine/spl": "^0.4.0",
+      "composer-runtime-api": "^2.0",
+      "adhocore/json-comment": "^1.1",
       "pocketmine/binaryutils": "^0.1.9",
-      "pocketmine/nbt": "^0.2.10",
-      "pocketmine/math": "^0.2.0",
-      "pocketmine/snooze": "^0.1.0",
+      "pocketmine/callback-validator": "^1.0.2",
       "pocketmine/classloader": "^0.1.0",
       "pocketmine/log": "^0.2.0",
       "pocketmine/log-pthreads": "^0.1.0",
-      "pocketmine/callback-validator": "^1.0.1",
-      "adhocore/json-comment": "^0.1.0",
-      "ocramius/package-versions": "^1.5"
+      "pocketmine/math": "^0.2.0",
+      "pocketmine/nbt": "^0.2.18",
+      "pocketmine/raklib": "^0.12.7",
+      "pocketmine/snooze": "^0.1.0",
+      "pocketmine/spl": "^0.4.0"
    },
    "require-dev": {
-      "phpstan/phpstan": "0.12.29",
+      "phpstan/phpstan": "0.12.84",
       "phpstan/phpstan-phpunit": "^0.12.6",
       "phpstan/phpstan-strict-rules": "^0.12.2",
       "phpunit/phpunit": "^9.2"
@@ -57,5 +57,18 @@
       "psr-4": {
          "pocketmine\\": "tests/phpunit/"
       }
+   },
+   "config": {
+      "platform": {
+         "php": "7.3.0"
+      },
+      "sort-packages": true
+   },
+   "scripts": {
+      "make-devtools": "@php -dphar.readonly=0 tests/plugins/DevTools/src/DevTools/ConsoleScript.php --make tests/plugins/DevTools --out plugins/DevTools.phar",
+      "make-server": [
+         "@composer install --no-dev --classmap-authoritative",
+         "@php -dphar.readonly=0 build/server-phar.php"
+      ]
    }
 }

doxygen/index.md

@@ -5,6 +5,6 @@ This site contains auto-generated API documentation for PocketMine-MP (and depen
 This site can be accessed via https://apidoc.pmmp.io.
 
 ### Additional developer resources
- - [DevTools](https://github.com/pmmp/PocketMine-DevTools/) - Development tools plugin for creating plugins
+ - [DevTools](https://github.com/pmmp/DevTools/) - Development tools plugin for creating plugins
  - [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features
- - [DeveloperDocs](https://github.com/pmmp/DeveloperDocs/) - Reference, guides and specifications for the PocketMine-MP API
+ - [DeveloperDocs](https://devdoc.pmmp.io) - General documentation for PocketMine-MP plugin developers

phpstan.neon.dist

@@ -1,8 +1,6 @@
 includes:
 	- tests/phpstan/configs/actual-problems.neon
 	- tests/phpstan/configs/check-explicit-mixed-baseline.neon
-	- tests/phpstan/configs/com-dotnet-magic.neon
-	- tests/phpstan/configs/custom-leveldb.neon
 	- tests/phpstan/configs/gc-hacks.neon
 	- tests/phpstan/configs/l7-baseline.neon
 	- tests/phpstan/configs/l8-baseline.neon
@@ -18,8 +16,11 @@ includes:
 parameters:
 	level: 8
 	checkExplicitMixed: true
+	checkMissingCallableSignature: true
 	bootstrapFiles:
 		- tests/phpstan/bootstrap.php
+	scanDirectories:
+	    - tests/plugins/TesterPlugin
 	scanFiles:
 		- src/pocketmine/PocketMine.php
 		- build/make-release.php
@@ -29,6 +30,7 @@ parameters:
 		- build/make-release.php
 		- build/server-phar.php
 		- tests/phpunit
+		- tests/plugins/TesterPlugin
 	dynamicConstantNames:
 		- pocketmine\IS_DEVELOPMENT_BUILD
 		- pocketmine\DEBUG
@@ -39,3 +41,9 @@ parameters:
 	reportUnmatchedIgnoredErrors: false #no other way to silence platform-specific non-warnings
 	staticReflectionClassNamePatterns:
 		- "#^COM$#"
+	typeAliases:
+	    #variadics don't work for this - mixed probably shouldn't work either, but for now it does
+	    #what we actually need is something that accepts an infinite number of parameters, but in the absence of that,
+	    #we'll just fill it with 10 - it's very unlikely to encounter a callable with 10 parameters anyway.
+	    anyCallable: 'callable(mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed) : mixed'
+	    anyClosure: '\Closure(mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed) : mixed'

src/pocketmine/CrashDump.php

@@ -23,11 +23,12 @@ declare(strict_types=1);
 
 namespace pocketmine;
 
-use PackageVersions\Versions;
+use Composer\InstalledVersions;
 use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\plugin\PluginBase;
 use pocketmine\plugin\PluginLoadOrder;
 use pocketmine\plugin\PluginManager;
+use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Utils;
 use pocketmine\utils\VersionString;
 use function base64_encode;
@@ -46,6 +47,7 @@ use function is_resource;
 use function json_encode;
 use function json_last_error_msg;
 use function max;
+use function microtime;
 use function mkdir;
 use function ob_end_clean;
 use function ob_get_contents;
@@ -54,10 +56,10 @@ use function php_uname;
 use function phpinfo;
 use function phpversion;
 use function preg_replace;
+use function sprintf;
 use function str_split;
 use function strpos;
 use function substr;
-use function time;
 use function zend_version;
 use function zlib_encode;
 use const E_COMPILE_ERROR;
@@ -88,7 +90,7 @@ class CrashDump{
 	 * having their content changed, version format changing, etc.
 	 * It is not necessary to increase this when adding new fields.
 	 */
-	private const FORMAT_VERSION = 3;
+	private const FORMAT_VERSION = 4;
 
 	private const PLUGIN_INVOLVEMENT_NONE = "none";
 	private const PLUGIN_INVOLVEMENT_DIRECT = "direct";
@@ -98,7 +100,7 @@ class CrashDump{
 	private $server;
 	/** @var resource */
 	private $fp;
-	/** @var int */
+	/** @var float */
 	private $time;
 	/**
 	 * @var mixed[]
@@ -111,12 +113,12 @@ class CrashDump{
 	private $path;
 
 	public function __construct(Server $server){
-		$this->time = time();
+		$this->time = microtime(true);
 		$this->server = $server;
 		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->path = $this->server->getDataPath() . "crashdumps/" . date("D_M_j-H.i.s-T_Y", (int) $this->time) . ".log";
 		$fp = @fopen($this->path, "wb");
 		if(!is_resource($fp)){
 			throw new \RuntimeException("Could not create Crash Dump");
@@ -124,7 +126,8 @@ class CrashDump{
 		$this->fp = $fp;
 		$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->data["uptime"] = $this->time - \pocketmine\START_TIME;
+		$this->addLine($this->server->getName() . " Crash Dump " . date("D M j H:i:s T Y", (int) $this->time));
 		$this->addLine();
 		$this->baseCrash();
 		$this->generalData();
@@ -165,7 +168,9 @@ class CrashDump{
 		if($json === false){
 			throw new \RuntimeException("Failed to encode crashdump JSON: " . json_last_error_msg());
 		}
-		$this->encodedData = zlib_encode($json, ZLIB_ENCODING_DEFLATE, 9);
+		$zlibEncoded = zlib_encode($json, ZLIB_ENCODING_DEFLATE, 9);
+		if($zlibEncoded === false) throw new AssumptionFailedError("ZLIB compression failed");
+		$this->encodedData = $zlibEncoded;
 		foreach(str_split(base64_encode($this->encodedData), 76) as $line){
 			$this->addLine($line);
 		}
@@ -201,9 +206,16 @@ class CrashDump{
 
 		if($this->server->getProperty("auto-report.send-settings", true) !== false){
 			$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");
+			if(($serverDotProperties = @file_get_contents($this->server->getDataPath() . "server.properties")) !== false){
+				$this->data["server.properties"] = preg_replace("#^rcon\\.password=(.*)$#m", "rcon.password=******", $serverDotProperties);
+			}else{
+				$this->data["server.properties"] = $serverDotProperties;
+			}
+			if(($pocketmineDotYml = @file_get_contents($this->server->getDataPath() . "pocketmine.yml")) !== false){
+				$this->data["pocketmine.yml"] = $pocketmineDotYml;
+			}else{
+				$this->data["pocketmine.yml"] = "";
+			}
 		}else{
 			$this->data["pocketmine.yml"] = "";
 			$this->data["server.properties"] = "";
@@ -309,8 +321,8 @@ class CrashDump{
 	}
 
 	private function determinePluginFromFile(string $filePath, bool $crashFrame) : bool{
-		$frameCleanPath = Utils::cleanPath($filePath); //this will be empty in phar stub
-		if(strpos($frameCleanPath, "plugins") === 0 and file_exists($filePath)){
+		$frameCleanPath = Utils::cleanPath($filePath);
+		if(strpos($frameCleanPath, Utils::CLEAN_PATH_SRC_PREFIX) !== 0){
 			$this->addLine();
 			if($crashFrame){
 				$this->addLine("THIS CRASH WAS CAUSED BY A PLUGIN");
@@ -320,15 +332,17 @@ class CrashDump{
 				$this->data["plugin_involvement"] = self::PLUGIN_INVOLVEMENT_INDIRECT;
 			}
 
-			$reflection = new \ReflectionClass(PluginBase::class);
-			$file = $reflection->getProperty("file");
-			$file->setAccessible(true);
-			foreach($this->server->getPluginManager()->getPlugins() as $plugin){
-				$filePath = Utils::cleanPath($file->getValue($plugin));
-				if(strpos($frameCleanPath, $filePath) === 0){
-					$this->data["plugin"] = $plugin->getName();
-					$this->addLine("BAD PLUGIN: " . $plugin->getDescription()->getFullName());
-					break;
+			if(file_exists($filePath)){
+				$reflection = new \ReflectionClass(PluginBase::class);
+				$file = $reflection->getProperty("file");
+				$file->setAccessible(true);
+				foreach($this->server->getPluginManager()->getPlugins() as $plugin){
+					$filePath = Utils::cleanPath($file->getValue($plugin));
+					if(strpos($frameCleanPath, $filePath) === 0){
+						$this->data["plugin"] = $plugin->getName();
+						$this->addLine("BAD PLUGIN: " . $plugin->getDescription()->getFullName());
+						break;
+					}
 				}
 			}
 			return true;
@@ -338,6 +352,15 @@ class CrashDump{
 
 	private function generalData() : void{
 		$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
+		$composerLibraries = [];
+		foreach(InstalledVersions::getInstalledPackages() as $package){
+			$composerLibraries[$package] = sprintf(
+				"%s@%s",
+				InstalledVersions::getPrettyVersion($package) ?? "unknown",
+				InstalledVersions::getReference($package) ?? "unknown"
+			);
+		}
+
 		$this->data["general"] = [];
 		$this->data["general"]["name"] = $this->server->getName();
 		$this->data["general"]["base_version"] = \pocketmine\BASE_VERSION;
@@ -350,7 +373,7 @@ class CrashDump{
 		$this->data["general"]["zend"] = zend_version();
 		$this->data["general"]["php_os"] = PHP_OS;
 		$this->data["general"]["os"] = Utils::getOS();
-		$this->data["general"]["composer_libraries"] = Versions::VERSIONS;
+		$this->data["general"]["composer_libraries"] = $composerLibraries;
 		$this->addLine($this->server->getName() . " version: " . $version->getFullVersion(true) . " [Protocol " . ProtocolInfo::CURRENT_PROTOCOL . "]");
 		$this->addLine("Git commit: " . \pocketmine\GIT_COMMIT);
 		$this->addLine("uname -a: " . php_uname("a"));
@@ -358,7 +381,7 @@ class CrashDump{
 		$this->addLine("Zend version: " . zend_version());
 		$this->addLine("OS : " . PHP_OS . ", " . Utils::getOS());
 		$this->addLine("Composer libraries: ");
-		foreach(Versions::VERSIONS as $library => $libraryVersion){
+		foreach($composerLibraries as $library => $libraryVersion){
 			$this->addLine("- $library $libraryVersion");
 		}
 	}

src/pocketmine/MemoryManager.php

@@ -40,6 +40,7 @@ use function fwrite;
 use function gc_collect_cycles;
 use function gc_disable;
 use function gc_enable;
+use function gc_mem_caches;
 use function get_class;
 use function get_declared_classes;
 use function implode;
@@ -273,6 +274,7 @@ class MemoryManager{
 		}
 
 		$cycles = gc_collect_cycles();
+		gc_mem_caches();
 
 		Timings::$garbageCollectorTimer->stopTiming();
 
@@ -421,8 +423,12 @@ class MemoryManager{
 						}
 
 						$name = $property->getName();
-						if($reflection !== $original and !$property->isPublic()){
-							$name = $reflection->getName() . ":" . $name;
+						if($reflection !== $original){
+							if($property->isPrivate()){
+								$name = $reflection->getName() . ":" . $name;
+							}else{
+								continue;
+							}
 						}
 						if(!$property->isPublic()){
 							$property->setAccessible(true);

src/pocketmine/PocketMine.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine {
 
+	use Composer\InstalledVersions;
 	use pocketmine\utils\Git;
 	use pocketmine\utils\MainLogger;
 	use pocketmine\utils\Process;
@@ -73,7 +74,6 @@ namespace pocketmine {
 		}
 
 		$extensions = [
-			"bcmath" => "BC Math",
 			"curl" => "cURL",
 			"ctype" => "ctype",
 			"date" => "Date",
@@ -206,6 +206,19 @@ namespace pocketmine {
 
 		define('pocketmine\GIT_COMMIT', $gitHash);
 
+		$composerGitHash = InstalledVersions::getReference('pocketmine/pocketmine-mp');
+		if($composerGitHash !== null){
+			$currentGitHash = explode("-", \pocketmine\GIT_COMMIT)[0];
+			if($currentGitHash !== $composerGitHash){
+				critical_error("Composer dependencies and/or autoloader are out of sync.");
+				critical_error("- Current revision is $currentGitHash");
+				critical_error("- Composer dependencies were last synchronized for revision $composerGitHash");
+				critical_error("Out-of-sync Composer dependencies may result in crashes and classes not being found.");
+				critical_error("Please synchronize Composer dependencies before running the server.");
+				exit(1);
+			}
+		}
+
 		$opts = getopt("", ["data:", "plugins:", "no-wizard", "enable-ansi", "disable-ansi"]);
 
 		define('pocketmine\DATA', isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR);
@@ -215,7 +228,12 @@ namespace pocketmine {
 			mkdir(\pocketmine\DATA, 0777, true);
 		}
 
-		define('pocketmine\LOCK_FILE', fopen(\pocketmine\DATA . 'server.lock', "a+b"));
+		$lockFile = fopen(\pocketmine\DATA . 'server.lock', "a+b");
+		if($lockFile === false){
+			critical_error("Unable to open server.lock file. Please check that the current user has read/write permissions to it.");
+			exit(1);
+		}
+		define('pocketmine\LOCK_FILE', $lockFile);
 		if(!flock(\pocketmine\LOCK_FILE, LOCK_EX | LOCK_NB)){
 			//wait for a shared lock to avoid race conditions if two servers started at the same time - this makes sure the
 			//other server wrote its PID and released exclusive lock before we get our lock
@@ -280,7 +298,7 @@ namespace pocketmine {
 
 			if(ThreadManager::getInstance()->stopAll() > 0){
 				$logger->debug("Some threads could not be stopped, performing a force-kill");
-				Process::kill(getmypid());
+				Process::kill(Process::pid());
 			}
 		}while(false);
 
@@ -300,7 +318,5 @@ namespace pocketmine {
 		exit($exitCode);
 	}
 
-	if(!defined('pocketmine\_PHPSTAN_ANALYSIS')){
-		\pocketmine\server();
-	}
+	\pocketmine\server();
 }

src/pocketmine/Server.php

@@ -126,7 +126,6 @@ use function file_put_contents;
 use function filemtime;
 use function function_exists;
 use function get_class;
-use function getmypid;
 use function getopt;
 use function gettype;
 use function implode;
@@ -1400,10 +1399,10 @@ class Server{
 				Network::$BATCH_THRESHOLD = -1;
 			}
 
-			$this->networkCompressionLevel = (int) $this->getProperty("network.compression-level", 7);
+			$this->networkCompressionLevel = (int) $this->getProperty("network.compression-level", 6);
 			if($this->networkCompressionLevel < 1 or $this->networkCompressionLevel > 9){
-				$this->logger->warning("Invalid network compression level $this->networkCompressionLevel set, setting to default 7");
-				$this->networkCompressionLevel = 7;
+				$this->logger->warning("Invalid network compression level $this->networkCompressionLevel set, setting to default 6");
+				$this->networkCompressionLevel = 6;
 			}
 			$this->networkCompressionAsync = (bool) $this->getProperty("network.async-compression", true);
 
@@ -1462,8 +1461,7 @@ class Server{
 
 			$this->onlineMode = $this->getConfigBool("xbox-auth", true);
 			if($this->onlineMode){
-				$this->logger->notice($this->getLanguage()->translateString("pocketmine.server.auth.enabled"));
-				$this->logger->notice($this->getLanguage()->translateString("pocketmine.server.authProperty.enabled"));
+				$this->logger->info($this->getLanguage()->translateString("pocketmine.server.auth.enabled"));
 			}else{
 				$this->logger->warning($this->getLanguage()->translateString("pocketmine.server.auth.disabled"));
 				$this->logger->warning($this->getLanguage()->translateString("pocketmine.server.authWarning"));
@@ -1543,7 +1541,7 @@ class Server{
 					if(isset($options["generator"])){
 						$generatorOptions = explode(":", $options["generator"]);
 						$generator = GeneratorManager::getGenerator(array_shift($generatorOptions));
-						if(count($options) > 0){
+						if(count($generatorOptions) > 0){
 							$options["preset"] = implode(":", $generatorOptions);
 						}
 					}else{
@@ -1939,7 +1937,7 @@ class Server{
 		}catch(\Throwable $e){
 			$this->logger->logException($e);
 			$this->logger->emergency("Crashed while crashing, killing process");
-			@Process::kill(getmypid());
+			@Process::kill(Process::pid());
 		}
 
 	}
@@ -2132,7 +2130,7 @@ class Server{
 			echo "--- Waiting $spacing seconds to throttle automatic restart (you can kill the process safely now) ---" . PHP_EOL;
 			sleep($spacing);
 		}
-		@Process::kill(getmypid());
+		@Process::kill(Process::pid());
 		exit(1);
 	}
 

src/pocketmine/VersionInfo.php

@@ -33,6 +33,6 @@ if(defined('pocketmine\_VERSION_INFO_INCLUDED')){
 const _VERSION_INFO_INCLUDED = true;
 
 const NAME = "PocketMine-MP";
-const BASE_VERSION = "3.14.1";
+const BASE_VERSION = "3.19.1";
 const IS_DEVELOPMENT_BUILD = false;
 const BUILD_NUMBER = 0;

src/pocketmine/block/BlockToolType.php

@@ -35,5 +35,6 @@ interface BlockToolType{
 	public const TYPE_PICKAXE = 1 << 2;
 	public const TYPE_AXE = 1 << 3;
 	public const TYPE_SHEARS = 1 << 4;
+	public const TYPE_HOE = 1 << 5;
 
 }

src/pocketmine/block/Liquid.php

@@ -418,6 +418,9 @@ abstract class Liquid extends Transparent{
 		return $isOptimalFlowDirection;
 	}
 
+	/**
+	 * @phpstan-impure This function modifies the adjacent sources count (premature optimisation)
+	 */
 	private function getSmallestFlowDecay(Block $block, int $decay) : int{
 		$blockDecay = $this->getFlowDecay($block);
 

src/pocketmine/block/Podzol.php

@@ -40,6 +40,6 @@ class Podzol extends Solid{
 	}
 
 	public function getHardness() : float{
-		return 2.5;
+		return 0.5;
 	}
 }

src/pocketmine/block/Potato.php

@@ -40,9 +40,13 @@ class Potato extends Crops{
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{
-		return [
-			ItemFactory::get(Item::POTATO, 0, $this->getDamage() >= 0x07 ? mt_rand(1, 4) : 1)
+		$result = [
+			ItemFactory::get(Item::POTATO, 0, $this->getDamage() >= 0x07 ? mt_rand(1, 5) : 1)
 		];
+		if($this->getDamage() >= 7 && mt_rand(0, 49) === 0){
+			$result[] = ItemFactory::get(Item::POISONOUS_POTATO);
+		}
+		return $result;
 	}
 
 	public function getPickedItem() : Item{

src/pocketmine/block/Sponge.php

@@ -31,6 +31,10 @@ class Sponge extends Solid{
 		$this->meta = $meta;
 	}
 
+	public function getToolType() : int{
+		return BlockToolType::TYPE_HOE;
+	}
+
 	public function getHardness() : float{
 		return 0.6;
 	}

src/pocketmine/block/Sugarcane.php

@@ -87,7 +87,12 @@ class Sugarcane extends Flowable{
 				for($y = 1; $y < 3; ++$y){
 					$b = $this->getLevelNonNull()->getBlockAt($this->x, $this->y + $y, $this->z);
 					if($b->getId() === self::AIR){
-						$this->getLevelNonNull()->setBlock($b, BlockFactory::get(Block::SUGARCANE_BLOCK), true);
+						$ev = new BlockGrowEvent($b, BlockFactory::get(Block::SUGARCANE_BLOCK));
+						$ev->call();
+						if($ev->isCancelled()){
+							break;
+						}
+						$this->getLevelNonNull()->setBlock($b, $ev->getNewState(), true);
 						break;
 					}
 				}

src/pocketmine/command/CommandReader.php

@@ -25,23 +25,18 @@ namespace pocketmine\command;
 
 use pocketmine\snooze\SleeperNotifier;
 use pocketmine\Thread;
-use pocketmine\utils\Utils;
-use function extension_loaded;
 use function fclose;
 use function fgets;
 use function fopen;
 use function fstat;
-use function getopt;
 use function is_resource;
 use function microtime;
 use function preg_replace;
 use function readline;
-use function readline_add_history;
 use function stream_isatty;
 use function stream_select;
 use function trim;
 use function usleep;
-use const STDIN;
 
 class CommandReader extends Thread{
 
@@ -65,12 +60,6 @@ class CommandReader extends Thread{
 	public function __construct(?SleeperNotifier $notifier = null){
 		$this->buffer = new \Threaded;
 		$this->notifier = $notifier;
-
-		$opts = getopt("", ["disable-readline", "enable-readline"]);
-
-		if(extension_loaded("readline") and (Utils::getOS() === Utils::OS_WINDOWS ? isset($opts["enable-readline"]) : !isset($opts["disable-readline"])) and !$this->isPipe(STDIN)){
-			$this->type = self::TYPE_READLINE;
-		}
 	}
 
 	/**
@@ -127,44 +116,28 @@ class CommandReader extends Thread{
 	 * @return bool if the main execution should continue reading lines
 	 */
 	private function readLine() : bool{
-		$line = "";
-		if($this->type === self::TYPE_READLINE){
-			if(($raw = readline("> ")) !== false and ($line = trim($raw)) !== ""){
-				readline_add_history($line);
-			}else{
-				return true;
-			}
-		}else{
-			if(!is_resource(self::$stdin)){
-				$this->initStdin();
-			}
-
-			switch($this->type){
-				/** @noinspection PhpMissingBreakStatementInspection */
-				case self::TYPE_STREAM:
-					//stream_select doesn't work on piped streams for some reason
-					$r = [self::$stdin];
-					$w = $e = null;
-					if(($count = stream_select($r, $w, $e, 0, 200000)) === 0){ //nothing changed in 200000 microseconds
-						return true;
-					}elseif($count === false){ //stream error
-						$this->initStdin();
-					}
-
-				case self::TYPE_PIPED:
-					if(($raw = fgets(self::$stdin)) === false){ //broken pipe or EOF
-						$this->initStdin();
-						$this->synchronized(function() : void{
-							$this->wait(200000);
-						}); //prevent CPU waste if it's end of pipe
-						return true; //loop back round
-					}
-
-					$line = trim($raw);
-					break;
-			}
+		if(!is_resource(self::$stdin)){
+			$this->initStdin();
 		}
 
+		$r = [self::$stdin];
+		$w = $e = null;
+		if(($count = stream_select($r, $w, $e, 0, 200000)) === 0){ //nothing changed in 200000 microseconds
+			return true;
+		}elseif($count === false){ //stream error
+			$this->initStdin();
+		}
+
+		if(($raw = fgets(self::$stdin)) === false){ //broken pipe or EOF
+			$this->initStdin();
+			$this->synchronized(function() : void{
+				$this->wait(200000);
+			}); //prevent CPU waste if it's end of pipe
+			return true; //loop back round
+		}
+
+		$line = trim($raw);
+
 		if($line !== ""){
 			$this->buffer[] = preg_replace("#\\x1b\\x5b([^\\x1b]*\\x7e|[\\x40-\\x50])#", "", $line);
 			if($this->notifier !== null){
@@ -193,17 +166,11 @@ class CommandReader extends Thread{
 	 */
 	public function run(){
 		$this->registerClassLoader();
-
-		if($this->type !== self::TYPE_READLINE){
-			$this->initStdin();
-		}
+		$this->initStdin();
 
 		while(!$this->shutdown and $this->readLine());
 
-		if($this->type !== self::TYPE_READLINE){
-			fclose(self::$stdin);
-		}
-
+		fclose(self::$stdin);
 	}
 
 	public function getThreadName() : string{

src/pocketmine/command/defaults/StatusCommand.php

@@ -54,9 +54,9 @@ class StatusCommand extends VanillaCommand{
 		$server = $sender->getServer();
 		$sender->sendMessage(TextFormat::GREEN . "---- " . TextFormat::WHITE . "Server status" . TextFormat::GREEN . " ----");
 
-		$time = microtime(true) - \pocketmine\START_TIME;
+		$time = (int) (microtime(true) - \pocketmine\START_TIME);
 
-		$seconds = floor($time % 60);
+		$seconds = $time % 60;
 		$minutes = null;
 		$hours = null;
 		$days = null;
@@ -100,7 +100,6 @@ class StatusCommand extends VanillaCommand{
 		$sender->sendMessage(TextFormat::GOLD . "Total memory: " . TextFormat::RED . number_format(round(($mUsage[1] / 1024) / 1024, 2), 2) . " MB.");
 		$sender->sendMessage(TextFormat::GOLD . "Total virtual memory: " . TextFormat::RED . number_format(round(($mUsage[2] / 1024) / 1024, 2), 2) . " MB.");
 		$sender->sendMessage(TextFormat::GOLD . "Heap memory: " . TextFormat::RED . number_format(round(($rUsage[0] / 1024) / 1024, 2), 2) . " MB.");
-		$sender->sendMessage(TextFormat::GOLD . "Maximum memory (system): " . TextFormat::RED . number_format(round(($mUsage[2] / 1024) / 1024, 2), 2) . " MB.");
 
 		if($server->getProperty("memory.global-limit") > 0){
 			$sender->sendMessage(TextFormat::GOLD . "Maximum memory (manager): " . TextFormat::RED . number_format(round($server->getProperty("memory.global-limit"), 2), 2) . " MB.");

src/pocketmine/command/defaults/WhitelistCommand.php

@@ -74,7 +74,7 @@ class WhitelistCommand extends VanillaCommand{
 				case "list":
 					$entries = $sender->getServer()->getWhitelisted()->getAll(true);
 					sort($entries, SORT_STRING);
-					$result = implode($entries, ", ");
+					$result = implode(", ", $entries);
 					$count = count($entries);
 
 					$sender->sendMessage(new TranslationContainer("commands.whitelist.list", [$count, $count]));

src/pocketmine/entity/Entity.php

@@ -77,9 +77,9 @@ use function abs;
 use function assert;
 use function cos;
 use function count;
-use function current;
 use function deg2rad;
 use function floor;
+use function fmod;
 use function get_class;
 use function in_array;
 use function is_a;
@@ -94,6 +94,7 @@ use const M_PI_2;
 abstract class Entity extends Location implements Metadatable, EntityIds{
 
 	public const MOTION_THRESHOLD = 0.00001;
+	protected const STEP_CLIP_MULTIPLIER = 0.4;
 
 	public const NETWORK_ID = -1;
 
@@ -174,56 +175,56 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public const DATA_RIDER_ROTATION_LOCKED = 57; //byte
 	public const DATA_RIDER_MAX_ROTATION = 58; //float
 	public const DATA_RIDER_MIN_ROTATION = 59; //float
-	public const DATA_AREA_EFFECT_CLOUD_RADIUS = 60; //float
-	public const DATA_AREA_EFFECT_CLOUD_WAITING = 61; //int
-	public const DATA_AREA_EFFECT_CLOUD_PARTICLE_ID = 62; //int
-	/* 63 (int) shulker-related */
-	public const DATA_SHULKER_ATTACH_FACE = 64; //byte
-	/* 65 (short) shulker-related */
-	public const DATA_SHULKER_ATTACH_POS = 66; //block coords
-	public const DATA_TRADING_PLAYER_EID = 67; //long
+	public const DATA_AREA_EFFECT_CLOUD_RADIUS = 61; //float
+	public const DATA_AREA_EFFECT_CLOUD_WAITING = 62; //int
+	public const DATA_AREA_EFFECT_CLOUD_PARTICLE_ID = 63; //int
+	/* 64 (int) shulker-related */
+	public const DATA_SHULKER_ATTACH_FACE = 65; //byte
+	/* 66 (short) shulker-related */
+	public const DATA_SHULKER_ATTACH_POS = 67; //block coords
+	public const DATA_TRADING_PLAYER_EID = 68; //long
 
-	/* 69 (byte) command-block */
-	public const DATA_COMMAND_BLOCK_COMMAND = 70; //string
-	public const DATA_COMMAND_BLOCK_LAST_OUTPUT = 71; //string
-	public const DATA_COMMAND_BLOCK_TRACK_OUTPUT = 72; //byte
-	public const DATA_CONTROLLING_RIDER_SEAT_NUMBER = 73; //byte
-	public const DATA_STRENGTH = 74; //int
-	public const DATA_MAX_STRENGTH = 75; //int
-	/* 76 (int) */
-	public const DATA_LIMITED_LIFE = 77;
-	public const DATA_ARMOR_STAND_POSE_INDEX = 78; //int
-	public const DATA_ENDER_CRYSTAL_TIME_OFFSET = 79; //int
-	public const DATA_ALWAYS_SHOW_NAMETAG = 80; //byte: -1 = default, 0 = only when looked at, 1 = always
-	public const DATA_COLOR_2 = 81; //byte
-	/* 82 (unknown) */
-	public const DATA_SCORE_TAG = 83; //string
-	public const DATA_BALLOON_ATTACHED_ENTITY = 84; //int64, entity unique ID of owner
-	public const DATA_PUFFERFISH_SIZE = 85; //byte
-	public const DATA_BOAT_BUBBLE_TIME = 86; //int (time in bubble column)
-	public const DATA_PLAYER_AGENT_EID = 87; //long
-	/* 88 (float) related to panda sitting
-	 * 89 (float) related to panda sitting */
-	public const DATA_EAT_COUNTER = 90; //int (used by pandas)
-	public const DATA_FLAGS2 = 91; //long (extended data flags)
-	/* 92 (float) related to panda lying down
-	 * 93 (float) related to panda lying down */
-	public const DATA_AREA_EFFECT_CLOUD_DURATION = 94; //int
-	public const DATA_AREA_EFFECT_CLOUD_SPAWN_TIME = 95; //int
-	public const DATA_AREA_EFFECT_CLOUD_RADIUS_PER_TICK = 96; //float, usually negative
-	public const DATA_AREA_EFFECT_CLOUD_RADIUS_CHANGE_ON_PICKUP = 97; //float
-	public const DATA_AREA_EFFECT_CLOUD_PICKUP_COUNT = 98; //int
-	public const DATA_INTERACTIVE_TAG = 99; //string (button text)
-	public const DATA_TRADE_TIER = 100; //int
-	public const DATA_MAX_TRADE_TIER = 101; //int
-	public const DATA_TRADE_XP = 102; //int
-	public const DATA_SKIN_ID = 103; //int ???
-	/* 104 (int) related to wither */
-	public const DATA_COMMAND_BLOCK_TICK_DELAY = 105; //int
-	public const DATA_COMMAND_BLOCK_EXECUTE_ON_FIRST_TICK = 106; //byte
-	public const DATA_AMBIENT_SOUND_INTERVAL_MIN = 107; //float
-	public const DATA_AMBIENT_SOUND_INTERVAL_RANGE = 108; //float
-	public const DATA_AMBIENT_SOUND_EVENT = 109; //string
+	/* 70 (byte) command-block */
+	public const DATA_COMMAND_BLOCK_COMMAND = 71; //string
+	public const DATA_COMMAND_BLOCK_LAST_OUTPUT = 72; //string
+	public const DATA_COMMAND_BLOCK_TRACK_OUTPUT = 73; //byte
+	public const DATA_CONTROLLING_RIDER_SEAT_NUMBER = 74; //byte
+	public const DATA_STRENGTH = 75; //int
+	public const DATA_MAX_STRENGTH = 76; //int
+	/* 77 (int) */
+	public const DATA_LIMITED_LIFE = 78;
+	public const DATA_ARMOR_STAND_POSE_INDEX = 79; //int
+	public const DATA_ENDER_CRYSTAL_TIME_OFFSET = 80; //int
+	public const DATA_ALWAYS_SHOW_NAMETAG = 81; //byte: -1 = default, 0 = only when looked at, 1 = always
+	public const DATA_COLOR_2 = 82; //byte
+	/* 83 (unknown) */
+	public const DATA_SCORE_TAG = 84; //string
+	public const DATA_BALLOON_ATTACHED_ENTITY = 85; //int64, entity unique ID of owner
+	public const DATA_PUFFERFISH_SIZE = 86; //byte
+	public const DATA_BOAT_BUBBLE_TIME = 87; //int (time in bubble column)
+	public const DATA_PLAYER_AGENT_EID = 88; //long
+	/* 89 (float) related to panda sitting
+	 * 90 (float) related to panda sitting */
+	public const DATA_EAT_COUNTER = 91; //int (used by pandas)
+	public const DATA_FLAGS2 = 92; //long (extended data flags)
+	/* 93 (float) related to panda lying down
+	 * 94 (float) related to panda lying down */
+	public const DATA_AREA_EFFECT_CLOUD_DURATION = 95; //int
+	public const DATA_AREA_EFFECT_CLOUD_SPAWN_TIME = 96; //int
+	public const DATA_AREA_EFFECT_CLOUD_RADIUS_PER_TICK = 97; //float, usually negative
+	public const DATA_AREA_EFFECT_CLOUD_RADIUS_CHANGE_ON_PICKUP = 98; //float
+	public const DATA_AREA_EFFECT_CLOUD_PICKUP_COUNT = 99; //int
+	public const DATA_INTERACTIVE_TAG = 100; //string (button text)
+	public const DATA_TRADE_TIER = 101; //int
+	public const DATA_MAX_TRADE_TIER = 102; //int
+	public const DATA_TRADE_XP = 103; //int
+	public const DATA_SKIN_ID = 104; //int ???
+	/* 105 (int) related to wither */
+	public const DATA_COMMAND_BLOCK_TICK_DELAY = 106; //int
+	public const DATA_COMMAND_BLOCK_EXECUTE_ON_FIRST_TICK = 107; //byte
+	public const DATA_AMBIENT_SOUND_INTERVAL_MIN = 108; //float
+	public const DATA_AMBIENT_SOUND_INTERVAL_RANGE = 109; //float
+	public const DATA_AMBIENT_SOUND_EVENT = 110; //string
 
 	public const DATA_FLAG_ONFIRE = 0;
 	public const DATA_FLAG_SNEAKING = 1;
@@ -332,8 +333,8 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 */
 	private static $knownEntities = [];
 	/**
-	 * @var string[][]
-	 * @phpstan-var array<class-string<Entity>, list<string>>
+	 * @var string[]
+	 * @phpstan-var array<class-string<Entity>, string>
 	 */
 	private static $saveNames = [];
 
@@ -412,7 +413,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 				self::$knownEntities[$name] = $className;
 			}
 
-			self::$saveNames[$className] = $saveNames;
+			self::$saveNames[$className] = reset($saveNames);
 
 			return true;
 		}
@@ -707,10 +708,10 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 
 		$this->boundingBox->setBounds(
 			$this->x - $halfWidth,
-			$this->y,
+			$this->y + $this->ySize,
 			$this->z - $halfWidth,
 			$this->x + $halfWidth,
-			$this->y + $this->height,
+			$this->y + $this->height + $this->ySize,
 			$this->z + $halfWidth
 		);
 	}
@@ -868,10 +869,9 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 */
 	public function getSaveId() : string{
 		if(!isset(self::$saveNames[static::class])){
-			throw new \InvalidStateException("Entity is not registered");
+			throw new \InvalidStateException("Entity " . static::class . " is not registered");
 		}
-		reset(self::$saveNames[static::class]);
-		return current(self::$saveNames[static::class]);
+		return self::$saveNames[static::class];
 	}
 
 	public function saveNBT() : void{
@@ -1311,7 +1311,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	}
 
 	public function getDirection() : ?int{
-		$rotation = ($this->yaw - 90) % 360;
+		$rotation = fmod($this->yaw - 90, 360);
 		if($rotation < 0){
 			$rotation += 360.0;
 		}
@@ -1449,8 +1449,14 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 				$this->fall($this->fallDistance);
 				$this->resetFallDistance();
 			}
-		}elseif($distanceThisTick < 0){
+		}elseif($distanceThisTick < $this->fallDistance){
+			//we've fallen some distance (distanceThisTick is negative)
+			//or we ascended back towards where fall distance was measured from initially (distanceThisTick is positive but less than existing fallDistance)
 			$this->fallDistance -= $distanceThisTick;
+		}else{
+			//we ascended past the apex where fall distance was originally being measured from
+			//reset it so it will be measured starting from the new, higher position
+			$this->fallDistance = 0;
 		}
 	}
 
@@ -1538,7 +1544,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		if($this->keepMovement){
 			$this->boundingBox->offset($dx, $dy, $dz);
 		}else{
-			$this->ySize *= 0.4;
+			$this->ySize *= self::STEP_CLIP_MULTIPLIER;
 
 			/*
 			if($this->isColliding){ //With cobweb?
@@ -1605,7 +1611,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 
 			$this->boundingBox->offset(0, 0, $dz);
 
-			if($this->stepHeight > 0 and $fallingFlag and $this->ySize < 0.05 and ($movX != $dx or $movZ != $dz)){
+			if($this->stepHeight > 0 and $fallingFlag and ($movX != $dx or $movZ != $dz)){
 				$cx = $dx;
 				$cy = $dy;
 				$cz = $dz;
@@ -1637,13 +1643,20 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 
 				$this->boundingBox->offset(0, 0, $dz);
 
+				$reverseDY = -$dy;
+				foreach($list as $bb){
+					$reverseDY = $bb->calculateYOffset($this->boundingBox, $reverseDY);
+				}
+				$dy += $reverseDY;
+				$this->boundingBox->offset(0, $reverseDY, 0);
+
 				if(($cx ** 2 + $cz ** 2) >= ($dx ** 2 + $dz ** 2)){
 					$dx = $cx;
 					$dy = $cy;
 					$dz = $cz;
 					$this->boundingBox->setBB($axisalignedbb1);
 				}else{
-					$this->ySize += 0.5; //FIXME: this should be the height of the block it walked up, not fixed 0.5
+					$this->ySize += $dy;
 				}
 			}
 		}

src/pocketmine/entity/Human.php

@@ -54,6 +54,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\MovePlayerPacket;
 use pocketmine\network\mcpe\protocol\PlayerListPacket;
 use pocketmine\network\mcpe\protocol\PlayerSkinPacket;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
 use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton;
 use pocketmine\Player;
@@ -300,17 +301,20 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		if($consumable instanceof MaybeConsumable and !$consumable->canBeConsumed()){
 			return false;
 		}
+		if($consumable instanceof FoodSource && $consumable->requiresHunger() and !$this->isHungry()){
+			return false;
+		}
 
+		return parent::consumeObject($consumable);
+	}
+
+	protected function applyConsumptionResults(Consumable $consumable) : void{
 		if($consumable instanceof FoodSource){
-			if($consumable->requiresHunger() and !$this->isHungry()){
-				return false;
-			}
-
 			$this->addFood($consumable->getFoodRestore());
 			$this->addSaturation($consumable->getSaturationRestore());
 		}
 
-		return parent::consumeObject($consumable);
+		parent::applyConsumptionResults($consumable);
 	}
 
 	/**
@@ -400,12 +404,14 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 	 * @param bool $playSound Whether to play level-up and XP gained sounds.
 	 */
 	public function addXp(int $amount, bool $playSound = true) : bool{
-		$this->totalXp += $amount;
-
 		$oldLevel = $this->getXpLevel();
 		$oldTotal = $this->getCurrentTotalXp();
 
 		if($this->setCurrentTotalXp($oldTotal + $amount)){
+			if($amount > 0){
+				$this->totalXp += $amount;
+			}
+
 			if($playSound){
 				$newLevel = $this->getXpLevel();
 				if((int) ($newLevel / 5) > (int) ($oldLevel / 5)){
@@ -808,7 +814,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		$pk->motion = $this->getMotion();
 		$pk->yaw = $this->yaw;
 		$pk->pitch = $this->pitch;
-		$pk->item = $this->getInventory()->getItemInHand();
+		$pk->item = ItemStackWrapper::legacy($this->getInventory()->getItemInHand());
 		$pk->metadata = $this->propertyManager->getAll();
 		$player->dataPacket($pk);
 

src/pocketmine/entity/Living.php

@@ -45,6 +45,7 @@ use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\FloatTag;
 use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\ListTag;
+use pocketmine\nbt\tag\ShortTag;
 use pocketmine\network\mcpe\protocol\ActorEventPacket;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\MobEffectPacket;
@@ -97,17 +98,15 @@ abstract class Living extends Entity implements Damageable{
 		//TODO: load/save armor inventory contents
 		$this->armorInventory->setEventProcessor(new ArmorInventoryEventProcessor($this));
 
-		$health = $this->getMaxHealth();
-
 		if($this->namedtag->hasTag("HealF", FloatTag::class)){
 			$health = $this->namedtag->getFloat("HealF");
 			$this->namedtag->removeTag("HealF");
-		}elseif($this->namedtag->hasTag("Health")){
-			$healthTag = $this->namedtag->getTag("Health");
-			$health = (float) $healthTag->getValue(); //Older versions of PocketMine-MP incorrectly saved this as a short instead of a float
-			if(!($healthTag instanceof FloatTag)){
-				$this->namedtag->removeTag("Health");
-			}
+		}elseif($this->namedtag->hasTag("Health", ShortTag::class)){
+			//Older versions of PocketMine-MP incorrectly saved this as a short instead of a float
+			$health = $this->namedtag->getShort("Health");
+			$this->namedtag->removeTag("Health");
+		}else{
+			$health = $this->namedtag->getFloat("Health", $this->getMaxHealth());
 		}
 
 		$this->setHealth($health);
@@ -364,13 +363,20 @@ abstract class Living extends Entity implements Damageable{
 			return false;
 		}
 
+		$this->applyConsumptionResults($consumable);
+		return true;
+	}
+
+	/**
+	 * Applies effects from consuming the object. This shouldn't do any can-consume checks (those are expected to be
+	 * handled by the caller).
+	 */
+	protected function applyConsumptionResults(Consumable $consumable) : void{
 		foreach($consumable->getAdditionalEffects() as $effect){
 			$this->addEffect($effect);
 		}
 
 		$consumable->onConsume($this);
-
-		return true;
 	}
 
 	/**

src/pocketmine/entity/object/ItemEntity.php

@@ -30,6 +30,7 @@ use pocketmine\event\inventory\InventoryPickupItemEvent;
 use pocketmine\item\Item;
 use pocketmine\network\mcpe\protocol\AddItemActorPacket;
 use pocketmine\network\mcpe\protocol\TakeItemActorPacket;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\Player;
 use function get_class;
 
@@ -173,7 +174,7 @@ class ItemEntity extends Entity{
 		$pk->entityRuntimeId = $this->getId();
 		$pk->position = $this->asVector3();
 		$pk->motion = $this->getMotion();
-		$pk->item = $this->getItem();
+		$pk->item = ItemStackWrapper::legacy($this->getItem());
 		$pk->metadata = $this->propertyManager->getAll();
 
 		$player->dataPacket($pk);

src/pocketmine/entity/utils/ExperienceUtils.php

@@ -24,6 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\entity\utils;
 
 use pocketmine\math\Math;
+use pocketmine\utils\AssumptionFailedError;
+use function count;
 use function max;
 
 abstract class ExperienceUtils{
@@ -59,6 +61,9 @@ abstract class ExperienceUtils{
 	 * This returns a floating-point number, the decimal part being the progress through the resulting level.
 	 */
 	public static function getLevelFromXp(int $xp) : float{
+		if($xp < 0){
+			throw new \InvalidArgumentException("XP must be at least 0");
+		}
 		if($xp <= self::getXpToReachLevel(16)){
 			$a = 1;
 			$b = 6;
@@ -74,6 +79,9 @@ abstract class ExperienceUtils{
 		}
 
 		$x = Math::solveQuadratic($a, $b, $c - $xp);
+		if(count($x) === 0){
+			throw new AssumptionFailedError("Expected at least 1 solution");
+		}
 
 		return max($x); //we're only interested in the positive solution
 	}

src/pocketmine/event/block/BlockBreakEvent.php

@@ -48,7 +48,7 @@ class BlockBreakEvent extends BlockEvent implements Cancellable{
 	/**
 	 * @param Item[] $drops
 	 */
-	public function __construct(Player $player, Block $block, Item $item, bool $instaBreak = false, array $drops, int $xpDrops = 0){
+	public function __construct(Player $player, Block $block, Item $item, bool $instaBreak = false, array $drops = [], int $xpDrops = 0){
 		parent::__construct($block);
 		$this->item = $item;
 		$this->player = $player;

src/pocketmine/event/inventory/FurnaceBurnEvent.php

@@ -28,6 +28,9 @@ use pocketmine\event\Cancellable;
 use pocketmine\item\Item;
 use pocketmine\tile\Furnace;
 
+/**
+ * Called when a furnace is about to consume a new fuel item.
+ */
 class FurnaceBurnEvent extends BlockEvent implements Cancellable{
 	/** @var Furnace */
 	private $furnace;
@@ -53,18 +56,31 @@ class FurnaceBurnEvent extends BlockEvent implements Cancellable{
 		return $this->fuel;
 	}
 
+	/**
+	 * Returns the number of ticks that the furnace will be powered for.
+	 */
 	public function getBurnTime() : int{
 		return $this->burnTime;
 	}
 
+	/**
+	 * Sets the number of ticks that the given fuel will power the furnace for.
+	 */
 	public function setBurnTime(int $burnTime) : void{
 		$this->burnTime = $burnTime;
 	}
 
+	/**
+	 * Returns whether the fuel item will be consumed.
+	 */
 	public function isBurning() : bool{
 		return $this->burning;
 	}
 
+	/**
+	 * Sets whether the fuel will be consumed. If false, the furnace will smelt as if it consumed fuel, but no fuel
+	 * will be deducted.
+	 */
 	public function setBurning(bool $burning) : void{
 		$this->burning = $burning;
 	}

src/pocketmine/event/player/PlayerChatEvent.php

@@ -29,7 +29,6 @@ use pocketmine\permission\PermissionManager;
 use pocketmine\Player;
 use pocketmine\Server;
 use pocketmine\utils\Utils;
-use function array_values;
 use function spl_object_id;
 
 /**

src/pocketmine/event/player/PlayerCreationEvent.php

@@ -39,14 +39,22 @@ class PlayerCreationEvent extends Event{
 	/** @var int */
 	private $port;
 
-	/** @var string */
+	/**
+	 * @var string
+	 * @phpstan-var class-string<Player>
+	 */
 	private $baseClass;
-	/** @var string */
+	/**
+	 * @var string
+	 * @phpstan-var class-string<Player>
+	 */
 	private $playerClass;
 
 	/**
 	 * @param string          $baseClass
 	 * @param string          $playerClass
+	 * @phpstan-param class-string<Player> $baseClass
+	 * @phpstan-param class-string<Player> $playerClass
 	 */
 	public function __construct(SourceInterface $interface, $baseClass, $playerClass, string $address, int $port){
 		$this->interface = $interface;
@@ -80,6 +88,7 @@ class PlayerCreationEvent extends Event{
 
 	/**
 	 * @return string
+	 * @phpstan-return class-string<Player>
 	 */
 	public function getBaseClass(){
 		return $this->baseClass;
@@ -87,6 +96,7 @@ class PlayerCreationEvent extends Event{
 
 	/**
 	 * @param string $class
+	 * @phpstan-param class-string<Player> $class
 	 *
 	 * @return void
 	 */
@@ -100,6 +110,7 @@ class PlayerCreationEvent extends Event{
 
 	/**
 	 * @return string
+	 * @phpstan-return class-string<Player>
 	 */
 	public function getPlayerClass(){
 		return $this->playerClass;
@@ -107,6 +118,7 @@ class PlayerCreationEvent extends Event{
 
 	/**
 	 * @param string $class
+	 * @phpstan-param class-string<Player> $class
 	 *
 	 * @return void
 	 */

src/pocketmine/event/player/PlayerRespawnEvent.php

@@ -43,6 +43,9 @@ class PlayerRespawnEvent extends PlayerEvent{
 	}
 
 	public function setRespawnPosition(Position $position) : void{
+		if(!$position->isValid()){
+			throw new \InvalidArgumentException("Spawn position must reference a valid and loaded World");
+		}
 		$this->position = $position;
 	}
 }

src/pocketmine/inventory/ArmorInventory.php

@@ -98,10 +98,10 @@ class ArmorInventory extends BaseInventory{
 
 		$pk = new MobArmorEquipmentPacket();
 		$pk->entityRuntimeId = $this->getHolder()->getId();
-		$pk->head = $this->getHelmet();
-		$pk->chest = $this->getChestplate();
-		$pk->legs = $this->getLeggings();
-		$pk->feet = $this->getBoots();
+		$pk->head = ItemStackWrapper::legacy($this->getHelmet());
+		$pk->chest = ItemStackWrapper::legacy($this->getChestplate());
+		$pk->legs = ItemStackWrapper::legacy($this->getLeggings());
+		$pk->feet = ItemStackWrapper::legacy($this->getBoots());
 		$pk->encode();
 
 		foreach($target as $player){
@@ -126,10 +126,10 @@ class ArmorInventory extends BaseInventory{
 
 		$pk = new MobArmorEquipmentPacket();
 		$pk->entityRuntimeId = $this->getHolder()->getId();
-		$pk->head = $this->getHelmet();
-		$pk->chest = $this->getChestplate();
-		$pk->legs = $this->getLeggings();
-		$pk->feet = $this->getBoots();
+		$pk->head = ItemStackWrapper::legacy($this->getHelmet());
+		$pk->chest = ItemStackWrapper::legacy($this->getChestplate());
+		$pk->legs = ItemStackWrapper::legacy($this->getLeggings());
+		$pk->feet = ItemStackWrapper::legacy($this->getBoots());
 		$pk->encode();
 
 		foreach($target as $player){

src/pocketmine/inventory/BaseInventory.php

@@ -252,11 +252,11 @@ abstract class BaseInventory implements Inventory{
 		for($i = 0, $size = $this->getSize(); $i < $size; ++$i){
 			$slot = $this->getItem($i);
 			if($item->equals($slot)){
-				if(($diff = $slot->getMaxStackSize() - $slot->getCount()) > 0){
+				if(($diff = min($slot->getMaxStackSize(), $item->getMaxStackSize()) - $slot->getCount()) > 0){
 					$count -= $diff;
 				}
 			}elseif($slot->isNull()){
-				$count -= $this->getMaxStackSize();
+				$count -= min($this->getMaxStackSize(), $item->getMaxStackSize());
 			}
 
 			if($count <= 0){

src/pocketmine/inventory/ContainerInventory.php

@@ -64,6 +64,7 @@ abstract class ContainerInventory extends BaseInventory{
 	public function onClose(Player $who) : void{
 		$pk = new ContainerClosePacket();
 		$pk->windowId = $who->getWindowId($this);
+		$pk->server = $who->getClosingWindowId() !== $pk->windowId;
 		$who->dataPacket($pk);
 		parent::onClose($who);
 	}

src/pocketmine/inventory/CraftingManager.php

@@ -28,8 +28,10 @@ use pocketmine\network\mcpe\protocol\BatchPacket;
 use pocketmine\network\mcpe\protocol\CraftingDataPacket;
 use pocketmine\Server;
 use pocketmine\timings\Timings;
+use pocketmine\utils\AssumptionFailedError;
 use function array_map;
 use function file_get_contents;
+use function is_array;
 use function json_decode;
 use function json_encode;
 use function usort;
@@ -52,41 +54,39 @@ class CraftingManager{
 
 	public function init() : void{
 		$recipes = json_decode(file_get_contents(\pocketmine\RESOURCE_PATH . "vanilla" . DIRECTORY_SEPARATOR . "recipes.json"), true);
+		if(!is_array($recipes)){
+			throw new AssumptionFailedError("recipes.json root should contain a map of recipe types");
+		}
 
 		$itemDeserializerFunc = \Closure::fromCallable([Item::class, 'jsonDeserialize']);
-		foreach($recipes as $recipe){
-			switch($recipe["type"]){
-				case "shapeless":
-					if($recipe["block"] !== "crafting_table"){ //TODO: filter others out for now to avoid breaking economics
-						break;
-					}
-					$this->registerShapelessRecipe(new ShapelessRecipe(
-						array_map($itemDeserializerFunc, $recipe["input"]),
-						array_map($itemDeserializerFunc, $recipe["output"])
-					));
-					break;
-				case "shaped":
-					if($recipe["block"] !== "crafting_table"){ //TODO: filter others out for now to avoid breaking economics
-						break;
-					}
-					$this->registerShapedRecipe(new ShapedRecipe(
-						$recipe["shape"],
-						array_map($itemDeserializerFunc, $recipe["input"]),
-						array_map($itemDeserializerFunc, $recipe["output"])
-					));
-					break;
-				case "smelting":
-					if($recipe["block"] !== "furnace"){ //TODO: filter others out for now to avoid breaking economics
-						break;
-					}
-					$this->registerFurnaceRecipe(new FurnaceRecipe(
-						Item::jsonDeserialize($recipe["output"]),
-						Item::jsonDeserialize($recipe["input"]))
-					);
-					break;
-				default:
-					break;
+
+		foreach($recipes["shapeless"] as $recipe){
+			if($recipe["block"] !== "crafting_table"){ //TODO: filter others out for now to avoid breaking economics
+				continue;
 			}
+			$this->registerShapelessRecipe(new ShapelessRecipe(
+				array_map($itemDeserializerFunc, $recipe["input"]),
+				array_map($itemDeserializerFunc, $recipe["output"])
+			));
+		}
+		foreach($recipes["shaped"] as $recipe){
+			if($recipe["block"] !== "crafting_table"){ //TODO: filter others out for now to avoid breaking economics
+				continue;
+			}
+			$this->registerShapedRecipe(new ShapedRecipe(
+				$recipe["shape"],
+				array_map($itemDeserializerFunc, $recipe["input"]),
+				array_map($itemDeserializerFunc, $recipe["output"])
+			));
+		}
+		foreach($recipes["smelting"] as $recipe){
+			if($recipe["block"] !== "furnace"){ //TODO: filter others out for now to avoid breaking economics
+				continue;
+			}
+			$this->registerFurnaceRecipe(new FurnaceRecipe(
+				Item::jsonDeserialize($recipe["output"]),
+				Item::jsonDeserialize($recipe["input"]))
+			);
 		}
 
 		$this->buildCraftingDataCache();

src/pocketmine/inventory/PlayerCursorInventory.php

@@ -53,4 +53,13 @@ class PlayerCursorInventory extends BaseInventory{
 	public function getHolder(){
 		return $this->holder;
 	}
+
+	public function sendContents($target) : void{
+		//TODO: HACK!
+		//Since 1.13, this is now part of a larger "UI inventory", and sending contents for this larger inventory does
+		//not work the way it's intended to. Even if it did, it would be necessary to send all 51 slots just to update
+		//this one, which is just not worth it.
+		//This workaround isn't great, but it's at least simple.
+		$this->sendSlot(0, $target);
+	}
 }

src/pocketmine/inventory/PlayerInventory.php

@@ -30,6 +30,7 @@ use pocketmine\network\mcpe\protocol\CreativeContentPacket;
 use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
 use pocketmine\network\mcpe\protocol\types\ContainerIds;
 use pocketmine\network\mcpe\protocol\types\inventory\CreativeContentEntry;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\Player;
 use function array_map;
 use function in_array;
@@ -165,7 +166,7 @@ class PlayerInventory extends BaseInventory{
 
 		$pk = new MobEquipmentPacket();
 		$pk->entityRuntimeId = $this->getHolder()->getId();
-		$pk->item = $item;
+		$pk->item = ItemStackWrapper::legacy($item);
 		$pk->inventorySlot = $pk->hotbarSlot = $this->getHeldItemIndex();
 		$pk->windowId = ContainerIds::INVENTORY;
 

src/pocketmine/inventory/transaction/CraftingTransaction.php

@@ -108,9 +108,6 @@ class CraftingTransaction extends InventoryTransaction{
 			}
 		}
 
-		if($iterations < 1){
-			throw new TransactionValidationException("Tried to craft zero times");
-		}
 		if(count($txItems) > 0){
 			//all items should be destroyed in this process
 			throw new TransactionValidationException("Expected 0 ingredients left over, have " . count($txItems));
@@ -166,6 +163,7 @@ class CraftingTransaction extends InventoryTransaction{
 		 */
 		$pk = new ContainerClosePacket();
 		$pk->windowId = Player::HARDCODED_CRAFTING_GRID_WINDOW_ID;
+		$pk->server = true;
 		$this->source->dataPacket($pk);
 	}
 

src/pocketmine/inventory/transaction/InventoryTransaction.php

@@ -30,6 +30,7 @@ use pocketmine\inventory\transaction\action\SlotChangeAction;
 use pocketmine\item\Item;
 use pocketmine\Player;
 use function array_keys;
+use function array_values;
 use function assert;
 use function count;
 use function get_class;
@@ -136,6 +137,8 @@ class InventoryTransaction{
 	 * @throws TransactionValidationException
 	 */
 	protected function matchItems(array &$needItems, array &$haveItems) : void{
+		$needItems = [];
+		$haveItems = [];
 		foreach($this->actions as $key => $action){
 			if(!$action->getTargetItem()->isNull()){
 				$needItems[] = $action->getTargetItem();
@@ -166,6 +169,8 @@ class InventoryTransaction{
 				}
 			}
 		}
+		$needItems = array_values($needItems);
+		$haveItems = array_values($haveItems);
 	}
 
 	/**
@@ -228,21 +233,34 @@ class InventoryTransaction{
 	protected function findResultItem(Item $needOrigin, array $possibleActions) : ?Item{
 		assert(count($possibleActions) > 0);
 
+		$candidate = null;
+		$newList = $possibleActions;
 		foreach($possibleActions as $i => $action){
 			if($action->getSourceItem()->equalsExact($needOrigin)){
-				$newList = $possibleActions;
+				if($candidate !== null){
+					/*
+					 * we found multiple possible actions that match the origin action
+					 * this means that there are multiple ways that this chain could play out
+					 * if we cared so much about this, we could build all the possible chains in parallel and see which
+					 * variation managed to complete the chain, but this has an extremely high complexity which is not
+					 * worth the trouble for this scenario (we don't usually expect to see chains longer than a couple
+					 * of actions in here anyway), and might still result in multiple possible results.
+					 */
+					return null;
+				}
+				$candidate = $action;
 				unset($newList[$i]);
-				if(count($newList) === 0){
-					return $action->getTargetItem();
-				}
-				$result = $this->findResultItem($action->getTargetItem(), $newList);
-				if($result !== null){
-					return $result;
-				}
 			}
 		}
+		if($candidate === null){
+			//chaining is not possible with this origin, none of the actions are valid
+			return null;
+		}
 
-		return null;
+		if(count($newList) === 0){
+			return $candidate->getTargetItem();
+		}
+		return $this->findResultItem($candidate->getTargetItem(), $newList);
 	}
 
 	/**

src/pocketmine/item/Bucket.php

@@ -50,6 +50,14 @@ class Bucket extends Item implements MaybeConsumable{
 		return 0;
 	}
 
+	public function getFuelResidue() : Item{
+		if($this->meta === Block::LAVA or $this->meta === Block::FLOWING_LAVA){
+			return ItemFactory::get(Item::BUCKET);
+		}
+
+		return parent::getFuelResidue();
+	}
+
 	public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : bool{
 		$resultBlock = BlockFactory::get($this->meta);
 

src/pocketmine/item/Hoe.php

@@ -23,11 +23,24 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
+use pocketmine\block\Block;
+use pocketmine\block\BlockToolType;
 use pocketmine\entity\Entity;
 
 class Hoe extends TieredTool{
 
+	public function getBlockToolType() : int{
+		return BlockToolType::TYPE_HOE;
+	}
+
 	public function onAttackEntity(Entity $victim) : bool{
 		return $this->applyDamage(1);
 	}
+
+	public function onDestroyBlock(Block $block) : bool{
+		if($block->getHardness() > 0){
+			return $this->applyDamage(1);
+		}
+		return false;
+	}
 }

src/pocketmine/item/Item.php

@@ -42,6 +42,7 @@ use pocketmine\nbt\tag\NamedTag;
 use pocketmine\nbt\tag\ShortTag;
 use pocketmine\nbt\tag\StringTag;
 use pocketmine\Player;
+use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Binary;
 use function array_map;
 use function base64_decode;
@@ -338,7 +339,11 @@ class Item implements ItemIds, \JsonSerializable{
 			}
 		}
 
-		$this->setNamedTagEntry($ench);
+		if($ench->getCount() > 0){
+			$this->setNamedTagEntry($ench);
+		}else{
+			$this->removeNamedTagEntry(self::TAG_ENCH);
+		}
 	}
 
 	public function removeEnchantments() : void{
@@ -475,7 +480,12 @@ class Item implements ItemIds, \JsonSerializable{
 	public function getLore() : array{
 		$display = $this->getNamedTagEntry(self::TAG_DISPLAY);
 		if($display instanceof CompoundTag and ($lore = $display->getListTag(self::TAG_DISPLAY_LORE)) !== null){
-			return $lore->getAllValues();
+			return array_map(function(NamedTag $line) : string{
+				if(!($line instanceof StringTag)){
+					throw new AssumptionFailedError("Nobody bothered to handle this error case and we can't fix it until PM4, oops ... #blameshoghi");
+				}
+				return $line->getValue();
+			}, $lore->getValue());
 		}
 
 		return [];
@@ -649,6 +659,16 @@ class Item implements ItemIds, \JsonSerializable{
 		return 0;
 	}
 
+	/**
+	 * Returns an item after burning fuel
+	 */
+	public function getFuelResidue() : Item{
+		$item = clone $this;
+		$item->pop();
+
+		return $item;
+	}
+
 	/**
 	 * Returns how many points of damage this item will deal to an entity when used as a weapon.
 	 */

src/pocketmine/level/Explosion.php

@@ -154,7 +154,6 @@ class Explosion{
 	 * and creating sounds and particles.
 	 */
 	public function explodeB() : bool{
-		$send = [];
 		$updateBlocks = [];
 
 		$source = (new Vector3($this->source->x, $this->source->y, $this->source->z))->floor();
@@ -232,7 +231,9 @@ class Explosion{
 
 				$t->close();
 			}
+		}
 
+		foreach($this->affectedBlocks as $block){
 			$pos = new Vector3($block->x, $block->y, $block->z);
 
 			for($side = 0; $side <= 5; $side++){
@@ -252,7 +253,6 @@ class Explosion{
 					$updateBlocks[$index] = true;
 				}
 			}
-			$send[] = new Vector3($block->x - $source->x, $block->y - $source->y, $block->z - $source->z);
 		}
 
 		$this->level->addParticle(new HugeExplodeSeedParticle($source));

src/pocketmine/level/Level.php

@@ -53,7 +53,6 @@ use pocketmine\level\format\io\ChunkRequestTask;
 use pocketmine\level\format\io\exception\CorruptedChunkException;
 use pocketmine\level\format\io\exception\UnsupportedChunkFormatException;
 use pocketmine\level\format\io\LevelProvider;
-use pocketmine\level\generator\Generator;
 use pocketmine\level\generator\GeneratorManager;
 use pocketmine\level\generator\GeneratorRegisterTask;
 use pocketmine\level\generator\GeneratorUnregisterTask;
@@ -289,7 +288,10 @@ class Level implements ChunkManager, Metadatable{
 	/** @var bool */
 	private $doingTick = false;
 
-	/** @var string|Generator */
+	/**
+	 * @var string
+	 * @phpstan-var class-string<\pocketmine\level\generator\Generator>
+	 */
 	private $generator;
 
 	/** @var bool */

src/pocketmine/level/LevelTimings.php

@@ -80,15 +80,14 @@ class LevelTimings{
 		$this->entityTick = new TimingsHandler("** " . $name . "entityTick");
 		$this->tileEntityTick = new TimingsHandler("** " . $name . "tileEntityTick");
 
-		$this->syncChunkSendTimer = new TimingsHandler("** " . $name . "syncChunkSend");
-		$this->syncChunkSendPrepareTimer = new TimingsHandler("** " . $name . "syncChunkSendPrepare");
+		Timings::init(); //make sure the timers we want are available
+		$this->syncChunkSendTimer = new TimingsHandler("** " . $name . "syncChunkSend", Timings::$playerChunkSendTimer);
+		$this->syncChunkSendPrepareTimer = new TimingsHandler("** " . $name . "syncChunkSendPrepare", Timings::$playerChunkSendTimer);
 
-		$this->syncChunkLoadTimer = new TimingsHandler("** " . $name . "syncChunkLoad");
+		$this->syncChunkLoadTimer = new TimingsHandler("** " . $name . "syncChunkLoad", Timings::$worldLoadTimer);
 		$this->syncChunkLoadDataTimer = new TimingsHandler("** " . $name . "syncChunkLoad - Data");
 		$this->syncChunkLoadEntitiesTimer = new TimingsHandler("** " . $name . "syncChunkLoad - Entities");
 		$this->syncChunkLoadTileEntitiesTimer = new TimingsHandler("** " . $name . "syncChunkLoad - TileEntities");
-
-		Timings::init(); //make sure the timer we want is available
 		$this->syncChunkSaveTimer = new TimingsHandler("** " . $name . "syncChunkSave", Timings::$worldSaveTimer);
 
 		$this->doTick = new TimingsHandler($name . "doTick");

src/pocketmine/level/biome/Biome.php

@@ -99,6 +99,8 @@ abstract class Biome{
 		self::register(self::SWAMP, new SwampBiome());
 		self::register(self::RIVER, new RiverBiome());
 
+		self::register(self::HELL, new HellBiome());
+
 		self::register(self::ICE_PLAINS, new IcePlainsBiome());
 
 		self::register(self::SMALL_MOUNTAINS, new SmallMountainsBiome());

src/pocketmine/level/format/Chunk.php

@@ -30,6 +30,7 @@ use pocketmine\block\BlockFactory;
 use pocketmine\entity\Entity;
 use pocketmine\level\Level;
 use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\StringTag;
 use pocketmine\Player;
 use pocketmine\tile\Spawnable;
@@ -691,13 +692,14 @@ class Chunk{
 
 			$level->timings->syncChunkLoadEntitiesTimer->startTiming();
 			foreach($this->NBTentities as $nbt){
-				if(!$nbt->hasTag("id")){ //allow mixed types (because of leveldb)
+				$idTag = $nbt->getTag("id");
+				if(!($idTag instanceof IntTag) && !($idTag instanceof StringTag)){ //allow mixed types (because of leveldb)
 					$changed = true;
 					continue;
 				}
 
 				try{
-					$entity = Entity::createEntity($nbt->getTag("id")->getValue(), $level, $nbt);
+					$entity = Entity::createEntity($idTag->getValue(), $level, $nbt);
 					if(!($entity instanceof Entity)){
 						$changed = true;
 						continue;
@@ -919,7 +921,9 @@ class Chunk{
 
 			$biomeIds = $stream->get(256);
 			if($lightPopulated){
-				$heightMap = array_values(unpack("v*", $stream->get(512)));
+				/** @var int[] $unpackedHeightMap */
+				$unpackedHeightMap = unpack("v*", $stream->get(512)); //unpack() will never fail here
+				$heightMap = array_values($unpackedHeightMap);
 			}
 		}
 
@@ -927,6 +931,7 @@ class Chunk{
 		$chunk->setGenerated($terrainGenerated);
 		$chunk->setPopulated($terrainPopulated);
 		$chunk->setLightPopulated($lightPopulated);
+		$chunk->setChanged(false);
 
 		return $chunk;
 	}

src/pocketmine/level/format/SubChunk.php

@@ -38,6 +38,8 @@ if(!defined(__NAMESPACE__ . '\ZERO_NIBBLE_ARRAY')){
 }
 
 class SubChunk implements SubChunkInterface{
+	private const ZERO_NIBBLE_ARRAY = ZERO_NIBBLE_ARRAY;
+
 	/** @var string */
 	protected $ids;
 	/** @var string */
@@ -68,7 +70,7 @@ class SubChunk implements SubChunkInterface{
 			substr_count($this->ids, "\x00") === 4096 and
 			(!$checkLight or (
 				substr_count($this->skyLight, "\xff") === 2048 and
-				$this->blockLight === ZERO_NIBBLE_ARRAY
+				$this->blockLight === self::ZERO_NIBBLE_ARRAY
 			))
 		);
 	}
@@ -230,14 +232,14 @@ class SubChunk implements SubChunkInterface{
 		 * reference to the const instead of duplicating the whole string. The string will only be duplicated when
 		 * modified, which is perfect for this purpose.
 		 */
-		if($this->data === ZERO_NIBBLE_ARRAY){
-			$this->data = ZERO_NIBBLE_ARRAY;
+		if($this->data === self::ZERO_NIBBLE_ARRAY){
+			$this->data = self::ZERO_NIBBLE_ARRAY;
 		}
-		if($this->skyLight === ZERO_NIBBLE_ARRAY){
-			$this->skyLight = ZERO_NIBBLE_ARRAY;
+		if($this->skyLight === self::ZERO_NIBBLE_ARRAY){
+			$this->skyLight = self::ZERO_NIBBLE_ARRAY;
 		}
-		if($this->blockLight === ZERO_NIBBLE_ARRAY){
-			$this->blockLight = ZERO_NIBBLE_ARRAY;
+		if($this->blockLight === self::ZERO_NIBBLE_ARRAY){
+			$this->blockLight = self::ZERO_NIBBLE_ARRAY;
 		}
 	}
 }

src/pocketmine/level/format/io/LevelProviderManager.php

@@ -63,7 +63,6 @@ abstract class LevelProviderManager{
 			throw new \InvalidArgumentException("Class $class cannot be constructed");
 		}
 
-		/** @var LevelProvider $class */
 		self::$providers[strtolower($class::getProviderName())] = $class;
 	}
 

src/pocketmine/level/format/io/leveldb/LevelDB.php

@@ -131,7 +131,11 @@ class LevelDB extends BaseLevelProvider{
 			throw new LevelException("Truncated level.dat");
 		}
 		$nbt = new LittleEndianNBTStream();
-		$levelData = $nbt->read(substr($rawLevelData, 8));
+		try{
+			$levelData = $nbt->read(substr($rawLevelData, 8));
+		}catch(\UnexpectedValueException $e){
+			throw new LevelException("Invalid level.dat (" . $e->getMessage() . ")", 0, $e);
+		}
 		if($levelData instanceof CompoundTag){
 			$this->levelData = $levelData;
 		}else{
@@ -179,8 +183,6 @@ class LevelDB extends BaseLevelProvider{
 		if(!$this->levelData->hasTag("generatorOptions", StringTag::class)){
 			$this->levelData->setString("generatorOptions", "");
 		}
-
-		$db->close();
 	}
 
 	public static function getProviderName() : string{
@@ -265,9 +267,6 @@ class LevelDB extends BaseLevelProvider{
 				$db->put(self::ENTRY_FLAT_WORLD_LAYERS, $out); //Add vanilla flatworld layers to allow terrain generation by MCPE to continue seamlessly
 			}
 		}
-
-		$db->close();
-
 	}
 
 	public function saveLevelData(){
@@ -364,7 +363,9 @@ class LevelDB extends BaseLevelProvider{
 				if(($maps2d = $this->db->get($index . self::TAG_DATA_2D)) !== false){
 					$binaryStream->setBuffer($maps2d, 0);
 
-					$heightMap = array_values(unpack("v*", $binaryStream->get(512)));
+					/** @var int[] $unpackedHeightMap */
+					$unpackedHeightMap = unpack("v*", $binaryStream->get(512)); //unpack() will never fail here
+					$heightMap = array_values($unpackedHeightMap);
 					$biomeIds = $binaryStream->get(256);
 				}
 				break;
@@ -407,8 +408,13 @@ class LevelDB extends BaseLevelProvider{
 					$subChunks[$yy] = new SubChunk($ids, $data, $skyLight, $blockLight);
 				}
 
-				$heightMap = array_values(unpack("C*", $binaryStream->get(256)));
-				$biomeIds = ChunkUtils::convertBiomeColors(array_values(unpack("N*", $binaryStream->get(1024))));
+				/** @var int[] $unpackedHeightMap */
+				$unpackedHeightMap = unpack("C*", $binaryStream->get(256)); //unpack() will never fail here, but static analysers don't know that
+				$heightMap = array_values($unpackedHeightMap);
+
+				/** @var int[] $unpackedBiomeIds */
+				$unpackedBiomeIds = unpack("N*", $binaryStream->get(1024)); //nor here
+				$biomeIds = ChunkUtils::convertBiomeColors(array_values($unpackedBiomeIds));
 				break;
 			default:
 				//TODO: set chunks read-only so the version on disk doesn't get overwritten
@@ -544,6 +550,6 @@ class LevelDB extends BaseLevelProvider{
 	}
 
 	public function close(){
-		$this->db->close();
+		unset($this->db);
 	}
 }

src/pocketmine/level/format/io/region/McRegion.php

@@ -182,7 +182,9 @@ class McRegion extends BaseLevelProvider{
 
 		$heightMap = [];
 		if($chunk->hasTag("HeightMap", ByteArrayTag::class)){
-			$heightMap = array_values(unpack("C*", $chunk->getByteArray("HeightMap")));
+			/** @var int[] $unpackedHeightMap */
+			$unpackedHeightMap = unpack("C*", $chunk->getByteArray("HeightMap")); //unpack() will never fail here
+			$heightMap = array_values($unpackedHeightMap);
 		}elseif($chunk->hasTag("HeightMap", IntArrayTag::class)){
 			$heightMap = $chunk->getIntArray("HeightMap"); #blameshoghicp
 		}
@@ -245,11 +247,13 @@ class McRegion extends BaseLevelProvider{
 
 		if($isValid){
 			$files = array_filter(scandir($path . "/region/", SCANDIR_SORT_NONE), function(string $file) : bool{
-				return substr($file, strrpos($file, ".") + 1, 2) === "mc"; //region file
+				$extPos = strrpos($file, ".");
+				return $extPos !== false && substr($file, $extPos + 1, 2) === "mc"; //region file
 			});
 
 			foreach($files as $f){
-				if(substr($f, strrpos($f, ".") + 1) !== static::REGION_FILE_EXTENSION){
+				$extPos = strrpos($f, ".");
+				if($extPos !== false && substr($f, $extPos + 1) !== static::REGION_FILE_EXTENSION){
 					$isValid = false;
 					break;
 				}
@@ -389,6 +393,9 @@ class McRegion extends BaseLevelProvider{
 		self::getRegionIndex($chunkX, $chunkZ, $regionX, $regionZ);
 		assert(is_int($regionX) and is_int($regionZ));
 
+		if(!file_exists($this->pathToRegion($regionX, $regionZ))){
+			return null;
+		}
 		$this->loadRegion($regionX, $regionZ);
 
 		$chunkData = $this->getRegion($regionX, $regionZ)->readChunk($chunkX & 0x1f, $chunkZ & 0x1f);

src/pocketmine/level/format/io/region/RegionGarbageMap.php

@@ -69,11 +69,14 @@ final class RegionGarbageMap{
 		/** @var RegionLocationTableEntry|null $prevEntry */
 		$prevEntry = null;
 		foreach($usedMap as $firstSector => $entry){
-			$expectedStart = ($prevEntry !== null ? $prevEntry->getLastSector() + 1 : RegionLoader::FIRST_SECTOR);
-			$actualStart = $entry->getFirstSector();
-			if($expectedStart < $actualStart){
+			$prevEndPlusOne = ($prevEntry !== null ? $prevEntry->getLastSector() + 1 : RegionLoader::FIRST_SECTOR);
+			$currentStart = $entry->getFirstSector();
+			if($prevEndPlusOne < $currentStart){
 				//found a gap in the table
-				$garbageMap[$expectedStart] = new RegionLocationTableEntry($expectedStart, $actualStart - $expectedStart, 0);
+				$garbageMap[$prevEndPlusOne] = new RegionLocationTableEntry($prevEndPlusOne, $currentStart - $prevEndPlusOne, 0);
+			}elseif($prevEndPlusOne > $currentStart){
+				//current entry starts inside the previous. This would be a bug since RegionLoader should prevent this
+				throw new AssumptionFailedError("Overlapping entries detected");
 			}
 			$prevEntry = $entry;
 		}

src/pocketmine/level/format/io/region/RegionLoader.php

@@ -27,12 +27,13 @@ use pocketmine\level\format\ChunkException;
 use pocketmine\level\format\io\exception\CorruptedChunkException;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Binary;
-use pocketmine\utils\MainLogger;
+use pocketmine\utils\BinaryDataException;
+use pocketmine\utils\BinaryStream;
 use function assert;
 use function ceil;
 use function chr;
+use function clearstatcache;
 use function fclose;
-use function feof;
 use function file_exists;
 use function filesize;
 use function fopen;
@@ -43,14 +44,12 @@ use function fwrite;
 use function is_resource;
 use function ksort;
 use function max;
-use function ord;
 use function pack;
 use function str_pad;
 use function str_repeat;
 use function stream_set_read_buffer;
 use function stream_set_write_buffer;
 use function strlen;
-use function substr;
 use function time;
 use function touch;
 use function unpack;
@@ -99,6 +98,7 @@ class RegionLoader{
 	 * @throws CorruptedRegionException
 	 */
 	public function open(){
+		clearstatcache(false, $this->filePath);
 		$exists = file_exists($this->filePath);
 		if(!$exists){
 			touch($this->filePath);
@@ -146,37 +146,34 @@ class RegionLoader{
 
 		fseek($this->filePointer, $this->locationTable[$index]->getFirstSector() << 12);
 
-		$prefix = fread($this->filePointer, 4);
-		if($prefix === false or strlen($prefix) !== 4){
-			throw new CorruptedChunkException("Corrupted chunk header detected (unexpected end of file reading length prefix)");
-		}
-		$length = Binary::readInt($prefix);
+		/*
+		 * this might cause us to read some junk, but under normal circumstances it won't be any more than 4096 bytes wasted.
+		 * doing this in a single call is faster than making two seeks and reads to fetch the chunk.
+		 * this relies on the assumption that the end of the file is always padded to a multiple of 4096 bytes.
+		 */
+		$bytesToRead = $this->locationTable[$index]->getSectorCount() << 12;
+		$payload = fread($this->filePointer, $bytesToRead);
 
-		if($length <= 0){ //TODO: if we reached here, the locationTable probably needs updating
-			return null;
-		}
-		if($length > self::MAX_SECTOR_LENGTH){ //corrupted
-			throw new CorruptedChunkException("Length for chunk x=$x,z=$z ($length) is larger than maximum " . self::MAX_SECTOR_LENGTH);
+		if($payload === false || strlen($payload) !== $bytesToRead){
+			throw new CorruptedChunkException("Corrupted chunk detected (unexpected EOF, truncated or non-padded chunk found)");
 		}
+		$stream = new BinaryStream($payload);
 
-		if($length > ($this->locationTable[$index]->getSectorCount() << 12)){ //Invalid chunk, bigger than defined number of sectors
-			MainLogger::getLogger()->error("Chunk x=$x,z=$z length mismatch (expected " . ($this->locationTable[$index]->getSectorCount() << 12) . " sectors, got $length sectors)");
-			$old = $this->locationTable[$index];
-			$this->locationTable[$index] = new RegionLocationTableEntry($old->getFirstSector(), $length >> 12, time());
-			$this->writeLocationIndex($index);
-		}
+		try{
+			$length = $stream->getInt();
+			if($length <= 0){ //TODO: if we reached here, the locationTable probably needs updating
+				return null;
+			}
 
-		$chunkData = fread($this->filePointer, $length);
-		if($chunkData === false or strlen($chunkData) !== $length){
-			throw new CorruptedChunkException("Corrupted chunk detected (unexpected end of file reading chunk data)");
-		}
+			$compression = $stream->getByte();
+			if($compression !== self::COMPRESSION_ZLIB and $compression !== self::COMPRESSION_GZIP){
+				throw new CorruptedChunkException("Invalid compression type (got $compression, expected " . self::COMPRESSION_ZLIB . " or " . self::COMPRESSION_GZIP . ")");
+			}
 
-		$compression = ord($chunkData[0]);
-		if($compression !== self::COMPRESSION_ZLIB and $compression !== self::COMPRESSION_GZIP){
-			throw new CorruptedChunkException("Invalid compression type (got $compression, expected " . self::COMPRESSION_ZLIB . " or " . self::COMPRESSION_GZIP . ")");
+			return $stream->get($length - 1); //length prefix includes the compression byte
+		}catch(BinaryDataException $e){
+			throw new CorruptedChunkException("Corrupted chunk detected: " . $e->getMessage(), 0, $e);
 		}
-
-		return substr($chunkData, 1);
 	}
 
 	/**
@@ -186,6 +183,23 @@ class RegionLoader{
 		return $this->isChunkGenerated(self::getChunkOffset($x, $z));
 	}
 
+	private function disposeGarbageArea(RegionLocationTableEntry $oldLocation) : void{
+		/* release the area containing the old copy to the garbage pool */
+		$this->garbageTable->add($oldLocation);
+
+		$endGarbage = $this->garbageTable->end();
+		$nextSector = $this->nextSector;
+		for(; $endGarbage !== null and $endGarbage->getLastSector() + 1 === $nextSector; $endGarbage = $this->garbageTable->end()){
+			$nextSector = $endGarbage->getFirstSector();
+			$this->garbageTable->remove($endGarbage);
+		}
+
+		if($nextSector !== $this->nextSector){
+			$this->nextSector = $nextSector;
+			ftruncate($this->filePointer, $this->nextSector << 12);
+		}
+	}
+
 	/**
 	 * @return void
 	 * @throws ChunkException
@@ -230,20 +244,7 @@ class RegionLoader{
 		$this->writeLocationIndex($index);
 
 		if($oldLocation !== null){
-			/* release the area containing the old copy to the garbage pool */
-			$this->garbageTable->add($oldLocation);
-
-			$endGarbage = $this->garbageTable->end();
-			$nextSector = $this->nextSector;
-			for(; $endGarbage !== null and $endGarbage->getLastSector() + 1 === $nextSector; $endGarbage = $this->garbageTable->end()){
-				$nextSector = $endGarbage->getFirstSector();
-				$this->garbageTable->remove($endGarbage);
-			}
-
-			if($nextSector !== $this->nextSector){
-				$this->nextSector = $nextSector;
-				ftruncate($this->filePointer, $this->nextSector << 12);
-			}
+			$this->disposeGarbageArea($oldLocation);
 		}
 	}
 
@@ -253,8 +254,12 @@ class RegionLoader{
 	 */
 	public function removeChunk(int $x, int $z){
 		$index = self::getChunkOffset($x, $z);
+		$oldLocation = $this->locationTable[$index];
 		$this->locationTable[$index] = null;
 		$this->writeLocationIndex($index);
+		if($oldLocation !== null){
+			$this->disposeGarbageArea($oldLocation);
+		}
 	}
 
 	/**
@@ -303,6 +308,7 @@ class RegionLoader{
 			throw new CorruptedRegionException("Corrupted region header (unexpected end of file)");
 		}
 
+		/** @var int[] $data */
 		$data = unpack("N*", $headerRaw);
 
 		for($i = 0; $i < 1024; ++$i){
@@ -335,6 +341,8 @@ class RegionLoader{
 		/** @var int[] $usedOffsets */
 		$usedOffsets = [];
 
+		$fileSize = filesize($this->filePath);
+		if($fileSize === false) throw new AssumptionFailedError("filesize() should not return false here");
 		for($i = 0; $i < 1024; ++$i){
 			$entry = $this->locationTable[$i];
 			if($entry === null){
@@ -347,8 +355,7 @@ class RegionLoader{
 
 			//TODO: more validity checks
 
-			fseek($this->filePointer, $fileOffset);
-			if(feof($this->filePointer)){
+			if($fileOffset >= $fileSize){
 				throw new CorruptedRegionException("Region file location offset x=$x,z=$z points to invalid file location $fileOffset");
 			}
 			if(isset($usedOffsets[$offset])){
@@ -401,6 +408,7 @@ class RegionLoader{
 		fwrite($this->filePointer, Binary::writeInt($entry !== null ? ($entry->getFirstSector() << 8) | $entry->getSectorCount() : 0), 4);
 		fseek($this->filePointer, 4096 + ($index << 2));
 		fwrite($this->filePointer, Binary::writeInt($entry !== null ? $entry->getTimestamp() : 0), 4);
+		clearstatcache(false, $this->filePath);
 	}
 
 	/**

src/pocketmine/level/generator/GeneratorRegisterTask.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\level\generator;
 
 use pocketmine\block\BlockFactory;
+use pocketmine\item\ItemFactory;
 use pocketmine\level\biome\Biome;
 use pocketmine\level\Level;
 use pocketmine\level\SimpleChunkManager;
@@ -34,7 +35,10 @@ use function unserialize;
 
 class GeneratorRegisterTask extends AsyncTask{
 
-	/** @var string */
+	/**
+	 * @var string
+	 * @phpstan-var class-string<Generator>
+	 */
 	public $generatorClass;
 	/** @var string */
 	public $settings;
@@ -47,6 +51,7 @@ class GeneratorRegisterTask extends AsyncTask{
 
 	/**
 	 * @param mixed[] $generatorSettings
+	 * @phpstan-param class-string<Generator> $generatorClass
 	 * @phpstan-param array<string, mixed> $generatorSettings
 	 */
 	public function __construct(Level $level, string $generatorClass, array $generatorSettings = []){
@@ -59,6 +64,7 @@ class GeneratorRegisterTask extends AsyncTask{
 
 	public function onRun(){
 		BlockFactory::init();
+		ItemFactory::init();
 		Biome::init();
 		$manager = new SimpleChunkManager($this->seed, $this->worldHeight);
 		$this->saveToThreadStore("generation.level{$this->levelId}.manager", $manager);

src/pocketmine/level/generator/normal/Normal.php

@@ -144,16 +144,9 @@ class Normal extends Generator{
 						return Biome::BIRCH_FOREST;
 					}
 				}else{
-					//FIXME: This will always cause River to be used since the rainfall is always greater than 0.8 if we
-					//reached this branch. However I don't think that substituting temperature for rainfall is correct given
-					//that mountain biomes are supposed to be pretty cold.
-					if($rainfall < 0.25){
-						return Biome::MOUNTAINS;
-					}elseif($rainfall < 0.70){
-						return Biome::SMALL_MOUNTAINS;
-					}else{
-						return Biome::RIVER;
-					}
+					//Previously here, we had a (broken) condition to generate mountains, but fixing it would have
+					//caused generation changes on a patch release, so we can't keep it here for now.
+					return Biome::RIVER;
 				}
 			}
 		};

src/pocketmine/level/particle/FloatingTextParticle.php

@@ -31,6 +31,7 @@ use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\AddPlayerPacket;
 use pocketmine\network\mcpe\protocol\PlayerListPacket;
 use pocketmine\network\mcpe\protocol\RemoveActorPacket;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
 use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton;
 use pocketmine\utils\UUID;
@@ -104,7 +105,7 @@ class FloatingTextParticle extends Particle{
 			$pk->username = $name;
 			$pk->entityRuntimeId = $this->entityId;
 			$pk->position = $this->asVector3(); //TODO: check offset
-			$pk->item = ItemFactory::get(Item::AIR, 0, 0);
+			$pk->item = ItemStackWrapper::legacy(ItemFactory::get(Item::AIR, 0, 0));
 
 			$flags = (
 				1 << Entity::DATA_FLAG_IMMOBILE

src/pocketmine/level/particle/Particle.php

@@ -56,45 +56,58 @@ abstract class Particle extends Vector3{
 	public const TYPE_DRIP_WATER = 26;
 	public const TYPE_DRIP_LAVA = 27;
 	public const TYPE_DRIP_HONEY = 28;
-	public const TYPE_FALLING_DUST = 29, TYPE_DUST = 29;
-	public const TYPE_MOB_SPELL = 30;
-	public const TYPE_MOB_SPELL_AMBIENT = 31;
-	public const TYPE_MOB_SPELL_INSTANTANEOUS = 32;
-	public const TYPE_INK = 33;
-	public const TYPE_SLIME = 34;
-	public const TYPE_RAIN_SPLASH = 35;
-	public const TYPE_VILLAGER_ANGRY = 36;
-	public const TYPE_VILLAGER_HAPPY = 37;
-	public const TYPE_ENCHANTMENT_TABLE = 38;
-	public const TYPE_TRACKING_EMITTER = 39;
-	public const TYPE_NOTE = 40;
-	public const TYPE_WITCH_SPELL = 41;
-	public const TYPE_CARROT = 42;
-	public const TYPE_MOB_APPEARANCE = 43;
-	public const TYPE_END_ROD = 44;
-	public const TYPE_DRAGONS_BREATH = 45;
-	public const TYPE_SPIT = 46;
-	public const TYPE_TOTEM = 47;
-	public const TYPE_FOOD = 48;
-	public const TYPE_FIREWORKS_STARTER = 49;
-	public const TYPE_FIREWORKS_SPARK = 50;
-	public const TYPE_FIREWORKS_OVERLAY = 51;
-	public const TYPE_BALLOON_GAS = 52;
-	public const TYPE_COLORED_FLAME = 53;
-	public const TYPE_SPARKLER = 54;
-	public const TYPE_CONDUIT = 55;
-	public const TYPE_BUBBLE_COLUMN_UP = 56;
-	public const TYPE_BUBBLE_COLUMN_DOWN = 57;
-	public const TYPE_SNEEZE = 58;
-	public const TYPE_SHULKER_BULLET = 59;
-	public const TYPE_BLEACH = 60;
-	public const TYPE_DRAGON_DESTROY_BLOCK = 61;
-	public const TYPE_MYCELIUM_DUST = 62;
-	public const TYPE_FALLING_RED_DUST = 63;
-	public const TYPE_CAMPFIRE_SMOKE = 64;
-	public const TYPE_TALL_CAMPFIRE_SMOKE = 65;
-	public const TYPE_DRAGON_BREATH_FIRE = 66;
-	public const TYPE_DRAGON_BREATH_TRAIL = 67;
+	public const TYPE_STALACTITE_DRIP_WATER = 29;
+	public const TYPE_STALACTITE_DRIP_LAVA = 30;
+	public const TYPE_FALLING_DUST = 31, TYPE_DUST = 31;
+	public const TYPE_MOB_SPELL = 32;
+	public const TYPE_MOB_SPELL_AMBIENT = 33;
+	public const TYPE_MOB_SPELL_INSTANTANEOUS = 34;
+	public const TYPE_INK = 35;
+	public const TYPE_SLIME = 36;
+	public const TYPE_RAIN_SPLASH = 37;
+	public const TYPE_VILLAGER_ANGRY = 38;
+	public const TYPE_VILLAGER_HAPPY = 39;
+	public const TYPE_ENCHANTMENT_TABLE = 40;
+	public const TYPE_TRACKING_EMITTER = 41;
+	public const TYPE_NOTE = 42;
+	public const TYPE_WITCH_SPELL = 43;
+	public const TYPE_CARROT = 44;
+	public const TYPE_MOB_APPEARANCE = 45;
+	public const TYPE_END_ROD = 46;
+	public const TYPE_DRAGONS_BREATH = 47;
+	public const TYPE_SPIT = 48;
+	public const TYPE_TOTEM = 49;
+	public const TYPE_FOOD = 50;
+	public const TYPE_FIREWORKS_STARTER = 51;
+	public const TYPE_FIREWORKS_SPARK = 52;
+	public const TYPE_FIREWORKS_OVERLAY = 53;
+	public const TYPE_BALLOON_GAS = 54;
+	public const TYPE_COLORED_FLAME = 55;
+	public const TYPE_SPARKLER = 56;
+	public const TYPE_CONDUIT = 57;
+	public const TYPE_BUBBLE_COLUMN_UP = 58;
+	public const TYPE_BUBBLE_COLUMN_DOWN = 59;
+	public const TYPE_SNEEZE = 60;
+	public const TYPE_SHULKER_BULLET = 61;
+	public const TYPE_BLEACH = 62;
+	public const TYPE_DRAGON_DESTROY_BLOCK = 63;
+	public const TYPE_MYCELIUM_DUST = 64;
+	public const TYPE_FALLING_RED_DUST = 65;
+	public const TYPE_CAMPFIRE_SMOKE = 66;
+	public const TYPE_TALL_CAMPFIRE_SMOKE = 67;
+	public const TYPE_DRAGON_BREATH_FIRE = 68;
+	public const TYPE_DRAGON_BREATH_TRAIL = 69;
+	public const TYPE_BLUE_FLAME = 70;
+	public const TYPE_SOUL = 71;
+	public const TYPE_OBSIDIAN_TEAR = 72;
+	public const TYPE_PORTAL_REVERSE = 73;
+	public const TYPE_SNOWFLAKE = 74;
+	public const TYPE_VIBRATION_SIGNAL = 75;
+	public const TYPE_SCULK_SENSOR_REDSTONE = 76;
+	public const TYPE_SPORE_BLOSSOM_SHOWER = 77;
+	public const TYPE_SPORE_BLOSSOM_AMBIENT = 78;
+	public const TYPE_WAX = 79;
+	public const TYPE_ELECTRIC_SPARK = 80;
 
 	/**
 	 * @return DataPacket|DataPacket[]

src/pocketmine/metadata/MetadataStore.php

@@ -29,7 +29,10 @@ namespace pocketmine\metadata;
 use pocketmine\plugin\Plugin;
 
 abstract class MetadataStore{
-	/** @var \SplObjectStorage[]|MetadataValue[][] */
+	/**
+	 * @var \SplObjectStorage[]|MetadataValue[][]
+	 * @phpstan-var array<string, \SplObjectStorage<Plugin, MetadataValue>>
+	 */
 	private $metadataMap;
 
 	/**
@@ -41,6 +44,7 @@ abstract class MetadataStore{
 		$owningPlugin = $newMetadataValue->getOwningPlugin();
 
 		if(!isset($this->metadataMap[$key])){
+			/** @phpstan-var \SplObjectStorage<Plugin, MetadataValue> $entry */
 			$entry = new \SplObjectStorage();
 			$this->metadataMap[$key] = $entry;
 		}else{
@@ -92,7 +96,6 @@ abstract class MetadataStore{
 	 * @return void
 	 */
 	public function invalidateAll(Plugin $owningPlugin){
-		/** @var \SplObjectStorage|MetadataValue[] $values */
 		foreach($this->metadataMap as $values){
 			if(isset($values[$owningPlugin])){
 				$values[$owningPlugin]->invalidate();

src/pocketmine/network/mcpe/NetworkBinaryStream.php

@@ -25,6 +25,7 @@ namespace pocketmine\network\mcpe;
 
 #include <rules/DataPacket.h>
 
+use pocketmine\block\BlockIds;
 use pocketmine\entity\Attribute;
 use pocketmine\entity\Entity;
 use pocketmine\item\Durable;
@@ -32,9 +33,14 @@ use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\ItemIds;
 use pocketmine\math\Vector3;
+use pocketmine\nbt\LittleEndianNBTStream;
 use pocketmine\nbt\NetworkLittleEndianNBTStream;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\NamedTag;
+use pocketmine\network\mcpe\convert\ItemTranslator;
+use pocketmine\network\mcpe\convert\ItemTypeDictionary;
+use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
 use pocketmine\network\mcpe\protocol\types\CommandOriginData;
 use pocketmine\network\mcpe\protocol\types\EntityLink;
 use pocketmine\network\mcpe\protocol\types\GameRuleType;
@@ -47,6 +53,7 @@ use pocketmine\network\mcpe\protocol\types\StructureEditorData;
 use pocketmine\network\mcpe\protocol\types\StructureSettings;
 use pocketmine\utils\BinaryStream;
 use pocketmine\utils\UUID;
+use function assert;
 use function count;
 use function strlen;
 
@@ -54,6 +61,7 @@ class NetworkBinaryStream extends BinaryStream{
 
 	private const DAMAGE_TAG = "Damage"; //TAG_Int
 	private const DAMAGE_TAG_CONFLICT_RESOLUTION = "___Damage_ProtocolCollisionResolution___";
+	private const PM_META_TAG = "___Meta___";
 
 	public function getString() : string{
 		return $this->get($this->getUnsignedVarInt());
@@ -83,6 +91,7 @@ class NetworkBinaryStream extends BinaryStream{
 
 	public function getSkin() : SkinData{
 		$skinId = $this->getString();
+		$skinPlayFabId = $this->getString();
 		$skinResourcePatch = $this->getString();
 		$skinData = $this->getSkinImage();
 		$animationCount = $this->getLInt();
@@ -91,7 +100,8 @@ class NetworkBinaryStream extends BinaryStream{
 			$skinImage = $this->getSkinImage();
 			$animationType = $this->getLInt();
 			$animationFrames = $this->getLFloat();
-			$animations[] = new SkinAnimation($skinImage, $animationType, $animationFrames);
+			$expressionType = $this->getLInt();
+			$animations[] = new SkinAnimation($skinImage, $animationType, $animationFrames, $expressionType);
 		}
 		$capeData = $this->getSkinImage();
 		$geometryData = $this->getString();
@@ -128,7 +138,7 @@ class NetworkBinaryStream extends BinaryStream{
 			);
 		}
 
-		return new SkinData($skinId, $skinResourcePatch, $skinData, $animations, $capeData, $geometryData, $animationData, $premium, $persona, $capeOnClassic, $capeId, $fullSkinId, $armSize, $skinColor, $personaPieces, $pieceTintColors);
+		return new SkinData($skinId, $skinPlayFabId, $skinResourcePatch, $skinData, $animations, $capeData, $geometryData, $animationData, $premium, $persona, $capeOnClassic, $capeId, $fullSkinId, $armSize, $skinColor, $personaPieces, $pieceTintColors);
 	}
 
 	/**
@@ -136,6 +146,7 @@ class NetworkBinaryStream extends BinaryStream{
 	 */
 	public function putSkin(SkinData $skin){
 		$this->putString($skin->getSkinId());
+		$this->putString($skin->getPlayFabId());
 		$this->putString($skin->getResourcePatch());
 		$this->putSkinImage($skin->getSkinImage());
 		$this->putLInt(count($skin->getAnimations()));
@@ -143,6 +154,7 @@ class NetworkBinaryStream extends BinaryStream{
 			$this->putSkinImage($animation->getImage());
 			$this->putLInt($animation->getType());
 			$this->putLFloat($animation->getFrames());
+			$this->putLInt($animation->getExpressionType());
 		}
 		$this->putSkinImage($skin->getCapeImage());
 		$this->putString($skin->getGeometryData());
@@ -185,82 +197,134 @@ class NetworkBinaryStream extends BinaryStream{
 		$this->putString($image->getData());
 	}
 
-	public function getSlot() : Item{
-		$id = $this->getVarInt();
-		if($id === 0){
+	public function getItemStackWithoutStackId() : Item{
+		return $this->getItemStack(function() : void{
+			//NOOP
+		});
+	}
+
+	public function putItemStackWithoutStackId(Item $item) : void{
+		$this->putItemStack($item, function() : void{
+			//NOOP
+		});
+	}
+
+	/**
+	 * @phpstan-param \Closure(NetworkBinaryStream) : void $readExtraCrapInTheMiddle
+	 */
+	public function getItemStack(\Closure $readExtraCrapInTheMiddle) : Item{
+		$netId = $this->getVarInt();
+		if($netId === 0){
 			return ItemFactory::get(0, 0, 0);
 		}
 
-		$auxValue = $this->getVarInt();
-		$data = $auxValue >> 8;
-		$cnt = $auxValue & 0xff;
+		$cnt = $this->getLShort();
+		$netData = $this->getUnsignedVarInt();
 
-		$nbtLen = $this->getLShort();
+		[$id, $meta] = ItemTranslator::getInstance()->fromNetworkId($netId, $netData);
 
-		/** @var CompoundTag|null $nbt */
-		$nbt = null;
-		if($nbtLen === 0xffff){
-			$nbtDataVersion = $this->getByte();
-			if($nbtDataVersion !== 1){
-				throw new \UnexpectedValueException("Unexpected NBT data version $nbtDataVersion");
+		$readExtraCrapInTheMiddle($this);
+
+		$this->getVarInt();
+
+		$extraData = new NetworkBinaryStream($this->getString());
+		return (static function() use ($extraData, $netId, $id, $meta, $cnt) : Item{
+			$nbtLen = $extraData->getLShort();
+
+			/** @var CompoundTag|null $nbt */
+			$nbt = null;
+			if($nbtLen === 0xffff){
+				$nbtDataVersion = $extraData->getByte();
+				if($nbtDataVersion !== 1){
+					throw new \UnexpectedValueException("Unexpected NBT data version $nbtDataVersion");
+				}
+				$decodedNBT = (new LittleEndianNBTStream())->read($extraData->buffer, false, $extraData->offset, 512);
+				if(!($decodedNBT instanceof CompoundTag)){
+					throw new \UnexpectedValueException("Unexpected root tag type for itemstack");
+				}
+				$nbt = $decodedNBT;
+			}elseif($nbtLen !== 0){
+				throw new \UnexpectedValueException("Unexpected fake NBT length $nbtLen");
 			}
-			$decodedNBT = (new NetworkLittleEndianNBTStream())->read($this->buffer, false, $this->offset, 512);
-			if(!($decodedNBT instanceof CompoundTag)){
-				throw new \UnexpectedValueException("Unexpected root tag type for itemstack");
+
+			//TODO
+			for($i = 0, $canPlaceOn = $extraData->getLInt(); $i < $canPlaceOn; ++$i){
+				$extraData->get($extraData->getLShort());
 			}
-			$nbt = $decodedNBT;
-		}elseif($nbtLen !== 0){
-			throw new \UnexpectedValueException("Unexpected fake NBT length $nbtLen");
-		}
 
-		//TODO
-		for($i = 0, $canPlaceOn = $this->getVarInt(); $i < $canPlaceOn; ++$i){
-			$this->getString();
-		}
+			//TODO
+			for($i = 0, $canDestroy = $extraData->getLInt(); $i < $canDestroy; ++$i){
+				$extraData->get($extraData->getLShort());
+			}
 
-		//TODO
-		for($i = 0, $canDestroy = $this->getVarInt(); $i < $canDestroy; ++$i){
-			$this->getString();
-		}
+			if($netId === ItemTypeDictionary::getInstance()->fromStringId("minecraft:shield")){
+				$extraData->getLLong(); //"blocking tick" (ffs mojang)
+			}
 
-		if($id === ItemIds::SHIELD){
-			$this->getVarLong(); //"blocking tick" (ffs mojang)
-		}
-		if($nbt !== null){
-			if($nbt->hasTag(self::DAMAGE_TAG, IntTag::class)){
-				$data = $nbt->getInt(self::DAMAGE_TAG);
-				$nbt->removeTag(self::DAMAGE_TAG);
-				if($nbt->count() === 0){
-					$nbt = null;
-					goto end;
+			if(!$extraData->feof()){
+				throw new \UnexpectedValueException("Unexpected trailing extradata for network item $netId");
+			}
+
+			if($nbt !== null){
+				if($nbt->hasTag(self::DAMAGE_TAG, IntTag::class)){
+					$meta = $nbt->getInt(self::DAMAGE_TAG);
+					$nbt->removeTag(self::DAMAGE_TAG);
+					if(($conflicted = $nbt->getTag(self::DAMAGE_TAG_CONFLICT_RESOLUTION)) !== null){
+						$nbt->removeTag(self::DAMAGE_TAG_CONFLICT_RESOLUTION);
+						$conflicted->setName(self::DAMAGE_TAG);
+						$nbt->setTag($conflicted);
+					}elseif($nbt->count() === 0){
+						$nbt = null;
+					}
+				}elseif(($metaTag = $nbt->getTag(self::PM_META_TAG)) instanceof IntTag){
+					//TODO HACK: This foul-smelling code ensures that we can correctly deserialize an item when the
+					//client sends it back to us, because as of 1.16.220, blockitems quietly discard their metadata
+					//client-side. Aside from being very annoying, this also breaks various server-side behaviours.
+					$meta = $metaTag->getValue();
+					$nbt->removeTag(self::PM_META_TAG);
+					if($nbt->count() === 0){
+						$nbt = null;
+					}
 				}
 			}
-			if(($conflicted = $nbt->getTag(self::DAMAGE_TAG_CONFLICT_RESOLUTION)) !== null){
-				$nbt->removeTag(self::DAMAGE_TAG_CONFLICT_RESOLUTION);
-				$conflicted->setName(self::DAMAGE_TAG);
-				$nbt->setTag($conflicted);
-			}
-		}
-		end:
-		return ItemFactory::get($id, $data, $cnt, $nbt);
+			return ItemFactory::get($id, $meta, $cnt, $nbt);
+		})();
 	}
 
-	public function putSlot(Item $item) : void{
+	/**
+	 * @phpstan-param \Closure(NetworkBinaryStream) : void $writeExtraCrapInTheMiddle
+	 */
+	public function putItemStack(Item $item, \Closure $writeExtraCrapInTheMiddle) : void{
 		if($item->getId() === 0){
 			$this->putVarInt(0);
 
 			return;
 		}
 
-		$this->putVarInt($item->getId());
-		$auxValue = (($item->getDamage() & 0x7fff) << 8) | $item->getCount();
-		$this->putVarInt($auxValue);
+		$coreData = $item->getDamage();
+		[$netId, $netData] = ItemTranslator::getInstance()->toNetworkId($item->getId(), $coreData);
+
+		$this->putVarInt($netId);
+		$this->putLShort($item->getCount());
+		$this->putUnsignedVarInt($netData);
+
+		$writeExtraCrapInTheMiddle($this);
+
+		$blockRuntimeId = 0;
+		$isBlockItem = $item->getId() < 256;
+		if($isBlockItem){
+			$block = $item->getBlock();
+			if($block->getId() !== BlockIds::AIR){
+				$blockRuntimeId = RuntimeBlockMapping::toStaticRuntimeId($block->getId(), $block->getDamage());
+			}
+		}
+		$this->putVarInt($blockRuntimeId);
 
 		$nbt = null;
 		if($item->hasCompoundTag()){
 			$nbt = clone $item->getNamedTag();
 		}
-		if($item instanceof Durable and $item->getDamage() > 0){
+		if($item instanceof Durable and $coreData > 0){
 			if($nbt !== null){
 				if(($existing = $nbt->getTag(self::DAMAGE_TAG)) !== null){
 					$nbt->removeTag(self::DAMAGE_TAG);
@@ -270,34 +334,46 @@ class NetworkBinaryStream extends BinaryStream{
 			}else{
 				$nbt = new CompoundTag();
 			}
-			$nbt->setInt(self::DAMAGE_TAG, $item->getDamage());
+			$nbt->setInt(self::DAMAGE_TAG, $coreData);
+		}elseif($isBlockItem && $coreData !== 0){
+			//TODO HACK: This foul-smelling code ensures that we can correctly deserialize an item when the
+			//client sends it back to us, because as of 1.16.220, blockitems quietly discard their metadata
+			//client-side. Aside from being very annoying, this also breaks various server-side behaviours.
+			if($nbt === null){
+				$nbt = new CompoundTag();
+			}
+			$nbt->setInt(self::PM_META_TAG, $coreData);
 		}
 
-		if($nbt !== null){
-			$this->putLShort(0xffff);
-			$this->putByte(1); //TODO: NBT data version (?)
-			$this->put((new NetworkLittleEndianNBTStream())->write($nbt));
-		}else{
-			$this->putLShort(0);
-		}
+		$this->putString(
+		(static function() use ($nbt, $netId) : string{
+			$extraData = new NetworkBinaryStream();
 
-		$this->putVarInt(0); //CanPlaceOn entry count (TODO)
-		$this->putVarInt(0); //CanDestroy entry count (TODO)
+			if($nbt !== null){
+				$extraData->putLShort(0xffff);
+				$extraData->putByte(1); //TODO: NBT data version (?)
+				$extraData->put((new LittleEndianNBTStream())->write($nbt));
+			}else{
+				$extraData->putLShort(0);
+			}
 
-		if($item->getId() === ItemIds::SHIELD){
-			$this->putVarLong(0); //"blocking tick" (ffs mojang)
-		}
+			$extraData->putLInt(0); //CanPlaceOn entry count (TODO)
+			$extraData->putLInt(0); //CanDestroy entry count (TODO)
+
+			if($netId === ItemTypeDictionary::getInstance()->fromStringId("minecraft:shield")){
+				$extraData->putLLong(0); //"blocking tick" (ffs mojang)
+			}
+			return $extraData->getBuffer();
+		})());
 	}
 
 	public function getRecipeIngredient() : Item{
-		$id = $this->getVarInt();
-		if($id === 0){
+		$netId = $this->getVarInt();
+		if($netId === 0){
 			return ItemFactory::get(ItemIds::AIR, 0, 0);
 		}
-		$meta = $this->getVarInt();
-		if($meta === 0x7fff){
-			$meta = -1;
-		}
+		$netData = $this->getVarInt();
+		[$id, $meta] = ItemTranslator::getInstance()->fromNetworkIdWithWildcardHandling($netId, $netData);
 		$count = $this->getVarInt();
 		return ItemFactory::get($id, $meta, $count);
 	}
@@ -306,8 +382,14 @@ class NetworkBinaryStream extends BinaryStream{
 		if($item->isNull()){
 			$this->putVarInt(0);
 		}else{
-			$this->putVarInt($item->getId());
-			$this->putVarInt($item->getDamage() & 0x7fff);
+			if($item->hasAnyDamageValue()){
+				[$netId, ] = ItemTranslator::getInstance()->toNetworkId($item->getId(), 0);
+				$netData = 0x7fff;
+			}else{
+				[$netId, $netData] = ItemTranslator::getInstance()->toNetworkId($item->getId(), $item->getDamage());
+			}
+			$this->putVarInt($netId);
+			$this->putVarInt($netData);
 			$this->putVarInt($item->getCount());
 		}
 	}
@@ -750,6 +832,25 @@ class NetworkBinaryStream extends BinaryStream{
 		$this->putVarInt($structureEditorData->structureRedstoneSaveMove);
 	}
 
+	public function getNbtRoot() : NamedTag{
+		$offset = $this->getOffset();
+		try{
+			$result = (new NetworkLittleEndianNBTStream())->read($this->getBuffer(), false, $offset, 512);
+			assert($result instanceof NamedTag, "doMultiple is false so we should definitely have a NamedTag here");
+			return $result;
+		}finally{
+			$this->setOffset($offset);
+		}
+	}
+
+	public function getNbtCompoundRoot() : CompoundTag{
+		$root = $this->getNbtRoot();
+		if(!($root instanceof CompoundTag)){
+			throw new \UnexpectedValueException("Expected TAG_Compound root");
+		}
+		return $root;
+	}
+
 	public function readGenericTypeNetworkId() : int{
 		return $this->getVarInt();
 	}

src/pocketmine/network/mcpe/NetworkSession.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\network\mcpe;
 
 use pocketmine\network\mcpe\protocol\ActorEventPacket;
-use pocketmine\network\mcpe\protocol\ActorFallPacket;
 use pocketmine\network\mcpe\protocol\ActorPickRequestPacket;
 use pocketmine\network\mcpe\protocol\AddActorPacket;
 use pocketmine\network\mcpe\protocol\AddBehaviorTreePacket;
@@ -33,6 +32,7 @@ use pocketmine\network\mcpe\protocol\AddItemActorPacket;
 use pocketmine\network\mcpe\protocol\AddPaintingPacket;
 use pocketmine\network\mcpe\protocol\AddPlayerPacket;
 use pocketmine\network\mcpe\protocol\AdventureSettingsPacket;
+use pocketmine\network\mcpe\protocol\AnimateEntityPacket;
 use pocketmine\network\mcpe\protocol\AnimatePacket;
 use pocketmine\network\mcpe\protocol\AnvilDamagePacket;
 use pocketmine\network\mcpe\protocol\AutomationClientConnectPacket;
@@ -45,8 +45,10 @@ use pocketmine\network\mcpe\protocol\BlockPickRequestPacket;
 use pocketmine\network\mcpe\protocol\BookEditPacket;
 use pocketmine\network\mcpe\protocol\BossEventPacket;
 use pocketmine\network\mcpe\protocol\CameraPacket;
+use pocketmine\network\mcpe\protocol\CameraShakePacket;
 use pocketmine\network\mcpe\protocol\ChangeDimensionPacket;
 use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket;
+use pocketmine\network\mcpe\protocol\ClientboundDebugRendererPacket;
 use pocketmine\network\mcpe\protocol\ClientboundMapItemDataPacket;
 use pocketmine\network\mcpe\protocol\ClientCacheBlobStatusPacket;
 use pocketmine\network\mcpe\protocol\ClientCacheMissResponsePacket;
@@ -60,6 +62,7 @@ use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket;
 use pocketmine\network\mcpe\protocol\ContainerClosePacket;
 use pocketmine\network\mcpe\protocol\ContainerOpenPacket;
 use pocketmine\network\mcpe\protocol\ContainerSetDataPacket;
+use pocketmine\network\mcpe\protocol\CorrectPlayerMovePredictionPacket;
 use pocketmine\network\mcpe\protocol\CraftingDataPacket;
 use pocketmine\network\mcpe\protocol\CraftingEventPacket;
 use pocketmine\network\mcpe\protocol\CreativeContentPacket;
@@ -70,6 +73,7 @@ use pocketmine\network\mcpe\protocol\EducationSettingsPacket;
 use pocketmine\network\mcpe\protocol\EmoteListPacket;
 use pocketmine\network\mcpe\protocol\EmotePacket;
 use pocketmine\network\mcpe\protocol\EventPacket;
+use pocketmine\network\mcpe\protocol\FilterTextPacket;
 use pocketmine\network\mcpe\protocol\GameRulesChangedPacket;
 use pocketmine\network\mcpe\protocol\GuiDataPickItemPacket;
 use pocketmine\network\mcpe\protocol\HurtArmorPacket;
@@ -77,6 +81,7 @@ use pocketmine\network\mcpe\protocol\InteractPacket;
 use pocketmine\network\mcpe\protocol\InventoryContentPacket;
 use pocketmine\network\mcpe\protocol\InventorySlotPacket;
 use pocketmine\network\mcpe\protocol\InventoryTransactionPacket;
+use pocketmine\network\mcpe\protocol\ItemComponentPacket;
 use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket;
 use pocketmine\network\mcpe\protocol\ItemStackRequestPacket;
 use pocketmine\network\mcpe\protocol\ItemStackResponsePacket;
@@ -96,6 +101,7 @@ use pocketmine\network\mcpe\protocol\MobEffectPacket;
 use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
 use pocketmine\network\mcpe\protocol\ModalFormRequestPacket;
 use pocketmine\network\mcpe\protocol\ModalFormResponsePacket;
+use pocketmine\network\mcpe\protocol\MotionPredictionHintsPacket;
 use pocketmine\network\mcpe\protocol\MoveActorAbsolutePacket;
 use pocketmine\network\mcpe\protocol\MoveActorDeltaPacket;
 use pocketmine\network\mcpe\protocol\MovePlayerPacket;
@@ -111,6 +117,7 @@ use pocketmine\network\mcpe\protocol\PlayerActionPacket;
 use pocketmine\network\mcpe\protocol\PlayerArmorDamagePacket;
 use pocketmine\network\mcpe\protocol\PlayerAuthInputPacket;
 use pocketmine\network\mcpe\protocol\PlayerEnchantOptionsPacket;
+use pocketmine\network\mcpe\protocol\PlayerFogPacket;
 use pocketmine\network\mcpe\protocol\PlayerHotbarPacket;
 use pocketmine\network\mcpe\protocol\PlayerInputPacket;
 use pocketmine\network\mcpe\protocol\PlayerListPacket;
@@ -171,7 +178,6 @@ use pocketmine\network\mcpe\protocol\TickSyncPacket;
 use pocketmine\network\mcpe\protocol\TransferPacket;
 use pocketmine\network\mcpe\protocol\UpdateAttributesPacket;
 use pocketmine\network\mcpe\protocol\UpdateBlockPacket;
-use pocketmine\network\mcpe\protocol\UpdateBlockPropertiesPacket;
 use pocketmine\network\mcpe\protocol\UpdateBlockSyncedPacket;
 use pocketmine\network\mcpe\protocol\UpdateEquipPacket;
 use pocketmine\network\mcpe\protocol\UpdatePlayerGameTypePacket;
@@ -325,10 +331,6 @@ abstract class NetworkSession{
 		return false;
 	}
 
-	public function handleActorFall(ActorFallPacket $packet) : bool{
-		return false;
-	}
-
 	public function handleHurtArmor(HurtArmorPacket $packet) : bool{
 		return false;
 	}
@@ -705,10 +707,6 @@ abstract class NetworkSession{
 		return false;
 	}
 
-	public function handleUpdateBlockProperties(UpdateBlockPropertiesPacket $packet) : bool{
-		return false;
-	}
-
 	public function handleClientCacheBlobStatus(ClientCacheBlobStatusPacket $packet) : bool{
 		return false;
 	}
@@ -796,4 +794,36 @@ abstract class NetworkSession{
 	public function handlePacketViolationWarning(PacketViolationWarningPacket $packet) : bool{
 		return false;
 	}
+
+	public function handleMotionPredictionHints(MotionPredictionHintsPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleAnimateEntity(AnimateEntityPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleCameraShake(CameraShakePacket $packet) : bool{
+		return false;
+	}
+
+	public function handlePlayerFog(PlayerFogPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleCorrectPlayerMovePrediction(CorrectPlayerMovePredictionPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleItemComponent(ItemComponentPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleFilterText(FilterTextPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleClientboundDebugRenderer(ClientboundDebugRendererPacket $packet) : bool{
+		return false;
+	}
 }

src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php

@@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe;
 
 use pocketmine\event\server\DataPacketReceiveEvent;
 use pocketmine\network\mcpe\protocol\ActorEventPacket;
-use pocketmine\network\mcpe\protocol\ActorFallPacket;
 use pocketmine\network\mcpe\protocol\ActorPickRequestPacket;
 use pocketmine\network\mcpe\protocol\AdventureSettingsPacket;
 use pocketmine\network\mcpe\protocol\AnimatePacket;
@@ -174,10 +173,6 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
 		return $this->player->handlePlayerAction($packet);
 	}
 
-	public function handleActorFall(ActorFallPacket $packet) : bool{
-		return true; //Not used
-	}
-
 	public function handleAnimate(AnimatePacket $packet) : bool{
 		return $this->player->handleAnimate($packet);
 	}

src/pocketmine/network/mcpe/RakLibInterface.php

@@ -212,7 +212,7 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
 				$info->getMaxPlayerCount(),
 				$this->rakLib->getServerId(),
 				$this->server->getName(),
-				Server::getGamemodeName($this->server->getGamemode())
+				Server::getGamemodeName(Player::getClientFriendlyGamemode($this->server->getGamemode()))
 			]) . ";"
 		);
 	}

src/pocketmine/network/mcpe/convert/ItemTranslator.php

@@ -0,0 +1,186 @@
+<?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\network\mcpe\convert;
+
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\SingletonTrait;
+use function array_key_exists;
+use function file_get_contents;
+use function is_array;
+use function is_numeric;
+use function is_string;
+use function json_decode;
+
+/**
+ * This class handles translation between network item ID+metadata to PocketMine-MP internal ID+metadata and vice versa.
+ */
+final class ItemTranslator{
+	use SingletonTrait;
+
+	/**
+	 * @var int[]
+	 * @phpstan-var array<int, int>
+	 */
+	private $simpleCoreToNetMapping = [];
+	/**
+	 * @var int[]
+	 * @phpstan-var array<int, int>
+	 */
+	private $simpleNetToCoreMapping = [];
+
+	/**
+	 * runtimeId = array[internalId][metadata]
+	 * @var int[][]
+	 * @phpstan-var array<int, array<int, int>>
+	 */
+	private $complexCoreToNetMapping = [];
+	/**
+	 * [internalId, metadata] = array[runtimeId]
+	 * @var int[][]
+	 * @phpstan-var array<int, array{int, int}>
+	 */
+	private $complexNetToCoreMapping = [];
+
+	private static function make() : self{
+		$data = file_get_contents(\pocketmine\RESOURCE_PATH . '/vanilla/r16_to_current_item_map.json');
+		if($data === false) throw new AssumptionFailedError("Missing required resource file");
+		$json = json_decode($data, true);
+		if(!is_array($json) or !isset($json["simple"], $json["complex"]) || !is_array($json["simple"]) || !is_array($json["complex"])){
+			throw new AssumptionFailedError("Invalid item table format");
+		}
+
+		$legacyStringToIntMapRaw = file_get_contents(\pocketmine\RESOURCE_PATH . '/vanilla/item_id_map.json');
+		if($legacyStringToIntMapRaw === false){
+			throw new AssumptionFailedError("Missing required resource file");
+		}
+		$legacyStringToIntMap = json_decode($legacyStringToIntMapRaw, true);
+		if(!is_array($legacyStringToIntMap)){
+			throw new AssumptionFailedError("Invalid mapping table format");
+		}
+
+		/** @phpstan-var array<string, int> $simpleMappings */
+		$simpleMappings = [];
+		foreach($json["simple"] as $oldId => $newId){
+			if(!is_string($oldId) || !is_string($newId)){
+				throw new AssumptionFailedError("Invalid item table format");
+			}
+			$simpleMappings[$newId] = $legacyStringToIntMap[$oldId];
+		}
+		foreach($legacyStringToIntMap as $stringId => $intId){
+			if(isset($simpleMappings[$stringId])){
+				throw new \UnexpectedValueException("Old ID $stringId collides with new ID");
+			}
+			$simpleMappings[$stringId] = $intId;
+		}
+
+		/** @phpstan-var array<string, array{int, int}> $complexMappings */
+		$complexMappings = [];
+		foreach($json["complex"] as $oldId => $map){
+			if(!is_string($oldId) || !is_array($map)){
+				throw new AssumptionFailedError("Invalid item table format");
+			}
+			foreach($map as $meta => $newId){
+				if(!is_numeric($meta) || !is_string($newId)){
+					throw new AssumptionFailedError("Invalid item table format");
+				}
+				$complexMappings[$newId] = [$legacyStringToIntMap[$oldId], (int) $meta];
+			}
+		}
+
+		return new self(ItemTypeDictionary::getInstance(), $simpleMappings, $complexMappings);
+	}
+
+	/**
+	 * @param int[] $simpleMappings
+	 * @param int[][] $complexMappings
+	 * @phpstan-param array<string, int> $simpleMappings
+	 * @phpstan-param array<string, array<int, int>> $complexMappings
+	 */
+	public function __construct(ItemTypeDictionary $dictionary, array $simpleMappings, array $complexMappings){
+		foreach($dictionary->getEntries() as $entry){
+			$stringId = $entry->getStringId();
+			$netId = $entry->getNumericId();
+			if(isset($complexMappings[$stringId])){
+				[$id, $meta] = $complexMappings[$stringId];
+				$this->complexCoreToNetMapping[$id][$meta] = $netId;
+				$this->complexNetToCoreMapping[$netId] = [$id, $meta];
+			}elseif(isset($simpleMappings[$stringId])){
+				$this->simpleCoreToNetMapping[$simpleMappings[$stringId]] = $netId;
+				$this->simpleNetToCoreMapping[$netId] = $simpleMappings[$stringId];
+			}elseif($stringId !== "minecraft:unknown"){
+				throw new \InvalidArgumentException("Unmapped entry " . $stringId);
+			}
+		}
+	}
+
+	/**
+	 * @return int[]
+	 * @phpstan-return array{int, int}
+	 */
+	public function toNetworkId(int $internalId, int $internalMeta) : array{
+		if($internalMeta === -1){
+			$internalMeta = 0x7fff;
+		}
+		if(isset($this->complexCoreToNetMapping[$internalId][$internalMeta])){
+			return [$this->complexCoreToNetMapping[$internalId][$internalMeta], 0];
+		}
+		if(array_key_exists($internalId, $this->simpleCoreToNetMapping)){
+			return [$this->simpleCoreToNetMapping[$internalId], $internalMeta];
+		}
+
+		throw new \InvalidArgumentException("Unmapped ID/metadata combination $internalId:$internalMeta");
+	}
+
+	/**
+	 * @return int[]
+	 * @phpstan-return array{int, int}
+	 */
+	public function fromNetworkId(int $networkId, int $networkMeta, ?bool &$isComplexMapping = null) : array{
+		if(isset($this->complexNetToCoreMapping[$networkId])){
+			if($networkMeta !== 0){
+				throw new \UnexpectedValueException("Unexpected non-zero network meta on complex item mapping");
+			}
+			$isComplexMapping = true;
+			return $this->complexNetToCoreMapping[$networkId];
+		}
+		$isComplexMapping = false;
+		if(isset($this->simpleNetToCoreMapping[$networkId])){
+			return [$this->simpleNetToCoreMapping[$networkId], $networkMeta];
+		}
+		throw new \UnexpectedValueException("Unmapped network ID/metadata combination $networkId:$networkMeta");
+	}
+
+	/**
+	 * @return int[]
+	 * @phpstan-return array{int, int}
+	 */
+	public function fromNetworkIdWithWildcardHandling(int $networkId, int $networkMeta) : array{
+		$isComplexMapping = false;
+		if($networkMeta !== 0x7fff){
+			return $this->fromNetworkId($networkId, $networkMeta);
+		}
+		[$id, $meta] = $this->fromNetworkId($networkId, 0, $isComplexMapping);
+		return [$id, $isComplexMapping ? $meta : -1];
+	}
+}

src/pocketmine/network/mcpe/convert/ItemTypeDictionary.php

@@ -0,0 +1,106 @@
+<?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\network\mcpe\convert;
+
+use pocketmine\network\mcpe\protocol\types\ItemTypeEntry;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\SingletonTrait;
+use function array_key_exists;
+use function file_get_contents;
+use function is_array;
+use function is_bool;
+use function is_int;
+use function is_string;
+use function json_decode;
+
+final class ItemTypeDictionary{
+	use SingletonTrait;
+
+	/**
+	 * @var ItemTypeEntry[]
+	 * @phpstan-var list<ItemTypeEntry>
+	 */
+	private $itemTypes;
+	/**
+	 * @var string[]
+	 * @phpstan-var array<int, string>
+	 */
+	private $intToStringIdMap = [];
+	/**
+	 * @var int[]
+	 * @phpstan-var array<string, int>
+	 */
+	private $stringToIntMap = [];
+
+	private static function make() : self{
+		$data = file_get_contents(\pocketmine\RESOURCE_PATH . '/vanilla/required_item_list.json');
+		if($data === false) throw new AssumptionFailedError("Missing required resource file");
+		$table = json_decode($data, true);
+		if(!is_array($table)){
+			throw new AssumptionFailedError("Invalid item list format");
+		}
+
+		$params = [];
+		foreach($table as $name => $entry){
+			if(!is_array($entry) || !is_string($name) || !isset($entry["component_based"], $entry["runtime_id"]) || !is_bool($entry["component_based"]) || !is_int($entry["runtime_id"])){
+				throw new AssumptionFailedError("Invalid item list format");
+			}
+			$params[] = new ItemTypeEntry($name, $entry["runtime_id"], $entry["component_based"]);
+		}
+		return new self($params);
+	}
+
+	/**
+	 * @param ItemTypeEntry[] $itemTypes
+	 */
+	public function __construct(array $itemTypes){
+		$this->itemTypes = $itemTypes;
+		foreach($this->itemTypes as $type){
+			$this->stringToIntMap[$type->getStringId()] = $type->getNumericId();
+			$this->intToStringIdMap[$type->getNumericId()] = $type->getStringId();
+		}
+	}
+
+	/**
+	 * @return ItemTypeEntry[]
+	 * @phpstan-return list<ItemTypeEntry>
+	 */
+	public function getEntries() : array{
+		return $this->itemTypes;
+	}
+
+	public function fromStringId(string $stringId) : int{
+		if(!array_key_exists($stringId, $this->stringToIntMap)){
+			throw new \InvalidArgumentException("Unmapped string ID \"$stringId\"");
+		}
+		return $this->stringToIntMap[$stringId];
+	}
+
+	public function fromIntId(int $intId) : string{
+		if(!array_key_exists($intId, $this->intToStringIdMap)){
+			throw new \InvalidArgumentException("Unmapped int ID $intId");
+		}
+		return $this->intToStringIdMap[$intId];
+	}
+}

src/pocketmine/network/mcpe/convert/RuntimeBlockMapping.php

@@ -27,14 +27,10 @@ use pocketmine\block\BlockIds;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\NetworkLittleEndianNBTStream;
 use pocketmine\nbt\tag\CompoundTag;
-use pocketmine\nbt\tag\ListTag;
 use pocketmine\network\mcpe\NetworkBinaryStream;
+use pocketmine\utils\AssumptionFailedError;
 use function file_get_contents;
-use function getmypid;
 use function json_decode;
-use function mt_rand;
-use function mt_srand;
-use function shuffle;
 
 /**
  * @internal
@@ -53,14 +49,16 @@ final class RuntimeBlockMapping{
 	}
 
 	public static function init() : void{
-		$tag = (new NetworkLittleEndianNBTStream())->read(file_get_contents(\pocketmine\RESOURCE_PATH . "vanilla/required_block_states.nbt"));
-		if(!($tag instanceof ListTag) or $tag->getTagType() !== NBT::TAG_Compound){ //this is a little redundant currently, but good for auto complete and makes phpstan happy
-			throw new \RuntimeException("Invalid blockstates table, expected TAG_List<TAG_Compound> root");
+		$canonicalBlockStatesFile = file_get_contents(\pocketmine\RESOURCE_PATH . "vanilla/canonical_block_states.nbt");
+		if($canonicalBlockStatesFile === false){
+			throw new AssumptionFailedError("Missing required resource file");
 		}
-
-		/** @var CompoundTag[] $list */
-		$list = $tag->getValue();
-		self::$bedrockKnownStates = self::randomizeTable($list);
+		$stream = new NetworkBinaryStream($canonicalBlockStatesFile);
+		$list = [];
+		while(!$stream->feof()){
+			$list[] = $stream->getNbtCompoundRoot();
+		}
+		self::$bedrockKnownStates = $list;
 
 		self::setupLegacyMappings();
 	}
@@ -90,7 +88,7 @@ final class RuntimeBlockMapping{
 		 */
 		$idToStatesMap = [];
 		foreach(self::$bedrockKnownStates as $k => $state){
-			$idToStatesMap[$state->getCompoundTag("block")->getString("name")][] = $k;
+			$idToStatesMap[$state->getString("name")][] = $k;
 		}
 		foreach($legacyStateMap as $pair){
 			$id = $legacyIdMap[$pair->getId()] ?? null;
@@ -105,14 +103,14 @@ final class RuntimeBlockMapping{
 			$mappedState = $pair->getBlockState();
 
 			//TODO HACK: idiotic NBT compare behaviour on 3.x compares keys which are stored by values
-			$mappedState->setName("block");
+			$mappedState->setName("");
 			$mappedName = $mappedState->getString("name");
 			if(!isset($idToStatesMap[$mappedName])){
 				throw new \RuntimeException("Mapped new state does not appear in network table");
 			}
 			foreach($idToStatesMap[$mappedName] as $k){
 				$networkState = self::$bedrockKnownStates[$k];
-				if($mappedState->equals($networkState->getCompoundTag("block"))){
+				if($mappedState->equals($networkState)){
 					self::registerMapping($k, $id, $data);
 					continue 2;
 				}
@@ -127,23 +125,6 @@ final class RuntimeBlockMapping{
 		}
 	}
 
-	/**
-	 * Randomizes the order of the runtimeID table to prevent plugins relying on them.
-	 * Plugins shouldn't use this stuff anyway, but plugin devs have an irritating habit of ignoring what they
-	 * aren't supposed to do, so we have to deliberately break it to make them stop.
-	 *
-	 * @param CompoundTag[] $table
-	 *
-	 * @return CompoundTag[]
-	 */
-	private static function randomizeTable(array $table) : array{
-		$postSeed = mt_rand(); //save a seed to set afterwards, to avoid poor quality randoms
-		mt_srand(getmypid()); //Use a seed which is the same on all threads. This isn't a secure seed, but we don't care.
-		shuffle($table);
-		mt_srand($postSeed); //restore a good quality seed that isn't dependent on PID
-		return $table;
-	}
-
 	public static function toStaticRuntimeId(int $id, int $meta = 0) : int{
 		self::lazyInit();
 		/*

src/pocketmine/network/mcpe/protocol/AddItemActorPacket.php

@@ -25,9 +25,9 @@ namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\NetworkSession;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 
 class AddItemActorPacket extends DataPacket{
 	public const NETWORK_ID = ProtocolInfo::ADD_ITEM_ACTOR_PACKET;
@@ -36,7 +36,7 @@ class AddItemActorPacket extends DataPacket{
 	public $entityUniqueId = null; //TODO
 	/** @var int */
 	public $entityRuntimeId;
-	/** @var Item */
+	/** @var ItemStackWrapper */
 	public $item;
 	/** @var Vector3 */
 	public $position;
@@ -53,7 +53,7 @@ class AddItemActorPacket extends DataPacket{
 	protected function decodePayload(){
 		$this->entityUniqueId = $this->getEntityUniqueId();
 		$this->entityRuntimeId = $this->getEntityRuntimeId();
-		$this->item = $this->getSlot();
+		$this->item = ItemStackWrapper::read($this);
 		$this->position = $this->getVector3();
 		$this->motion = $this->getVector3();
 		$this->metadata = $this->getEntityMetadata();
@@ -63,7 +63,7 @@ class AddItemActorPacket extends DataPacket{
 	protected function encodePayload(){
 		$this->putEntityUniqueId($this->entityUniqueId ?? $this->entityRuntimeId);
 		$this->putEntityRuntimeId($this->entityRuntimeId);
-		$this->putSlot($this->item);
+		$this->item->write($this);
 		$this->putVector3($this->position);
 		$this->putVector3Nullable($this->motion);
 		$this->putEntityMetadata($this->metadata);

src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php

@@ -25,11 +25,11 @@ namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\types\DeviceOS;
 use pocketmine\network\mcpe\protocol\types\EntityLink;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\utils\UUID;
 use function count;
 
@@ -56,7 +56,7 @@ class AddPlayerPacket extends DataPacket{
 	public $yaw = 0.0;
 	/** @var float|null */
 	public $headYaw = null; //TODO
-	/** @var Item */
+	/** @var ItemStackWrapper */
 	public $item;
 	/**
 	 * @var mixed[][]
@@ -98,7 +98,7 @@ class AddPlayerPacket extends DataPacket{
 		$this->pitch = $this->getLFloat();
 		$this->yaw = $this->getLFloat();
 		$this->headYaw = $this->getLFloat();
-		$this->item = $this->getSlot();
+		$this->item = ItemStackWrapper::read($this);
 		$this->metadata = $this->getEntityMetadata();
 
 		$this->uvarint1 = $this->getUnsignedVarInt();
@@ -129,7 +129,7 @@ class AddPlayerPacket extends DataPacket{
 		$this->putLFloat($this->pitch);
 		$this->putLFloat($this->yaw);
 		$this->putLFloat($this->headYaw ?? $this->yaw);
-		$this->putSlot($this->item);
+		$this->item->write($this);
 		$this->putEntityMetadata($this->metadata);
 
 		$this->putUnsignedVarInt($this->uvarint1);

src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php

@@ -54,13 +54,15 @@ class AdventureSettingsPacket extends DataPacket{
 	public const FLYING = 0x200;
 	public const MUTED = 0x400;
 
-	public const BUILD_AND_MINE = 0x01 | self::BITFLAG_SECOND_SET;
+	public const MINE = 0x01 | self::BITFLAG_SECOND_SET;
 	public const DOORS_AND_SWITCHES = 0x02 | self::BITFLAG_SECOND_SET;
 	public const OPEN_CONTAINERS = 0x04 | self::BITFLAG_SECOND_SET;
 	public const ATTACK_PLAYERS = 0x08 | self::BITFLAG_SECOND_SET;
 	public const ATTACK_MOBS = 0x10 | self::BITFLAG_SECOND_SET;
 	public const OPERATOR = 0x20 | self::BITFLAG_SECOND_SET;
 	public const TELEPORT = 0x80 | self::BITFLAG_SECOND_SET;
+	public const BUILD = 0x100 | self::BITFLAG_SECOND_SET;
+	public const DEFAULT = 0x200 | self::BITFLAG_SECOND_SET;
 
 	/** @var int */
 	public $flags = 0;

src/pocketmine/network/mcpe/protocol/AnimateEntityPacket.php

@@ -0,0 +1,108 @@
+<?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\network\mcpe\protocol;
+
+#include <rules/DataPacket.h>
+
+use pocketmine\network\mcpe\NetworkSession;
+use function count;
+
+class AnimateEntityPacket extends DataPacket/* implements ClientboundPacket*/{
+	public const NETWORK_ID = ProtocolInfo::ANIMATE_ENTITY_PACKET;
+
+	/** @var string */
+	private $animation;
+	/** @var string */
+	private $nextState;
+	/** @var string */
+	private $stopExpression;
+	/** @var string */
+	private $controller;
+	/** @var float */
+	private $blendOutTime;
+	/**
+	 * @var int[]
+	 * @phpstan-var list<int>
+	 */
+	private $actorRuntimeIds;
+
+	/**
+	 * @param int[] $actorRuntimeIds
+	 * @phpstan-param list<int> $actorRuntimeIds
+	 */
+	public static function create(string $animation, string $nextState, string $stopExpression, string $controller, float $blendOutTime, array $actorRuntimeIds) : self{
+		$result = new self;
+		$result->animation = $animation;
+		$result->nextState = $nextState;
+		$result->stopExpression = $stopExpression;
+		$result->controller = $controller;
+		$result->blendOutTime = $blendOutTime;
+		$result->actorRuntimeIds = $actorRuntimeIds;
+		return $result;
+	}
+
+	public function getAnimation() : string{ return $this->animation; }
+
+	public function getNextState() : string{ return $this->nextState; }
+
+	public function getStopExpression() : string{ return $this->stopExpression; }
+
+	public function getController() : string{ return $this->controller; }
+
+	public function getBlendOutTime() : float{ return $this->blendOutTime; }
+
+	/**
+	 * @return int[]
+	 * @phpstan-return list<int>
+	 */
+	public function getActorRuntimeIds() : array{ return $this->actorRuntimeIds; }
+
+	protected function decodePayload() : void{
+		$this->animation = $this->getString();
+		$this->nextState = $this->getString();
+		$this->stopExpression = $this->getString();
+		$this->controller = $this->getString();
+		$this->blendOutTime = $this->getLFloat();
+		$this->actorRuntimeIds = [];
+		for($i = 0, $len = $this->getUnsignedVarInt(); $i < $len; ++$i){
+			$this->actorRuntimeIds[] = $this->getEntityRuntimeId();
+		}
+	}
+
+	protected function encodePayload() : void{
+		$this->putString($this->animation);
+		$this->putString($this->nextState);
+		$this->putString($this->stopExpression);
+		$this->putString($this->controller);
+		$this->putLFloat($this->blendOutTime);
+		$this->putUnsignedVarInt(count($this->actorRuntimeIds));
+		foreach($this->actorRuntimeIds as $id){
+			$this->putEntityRuntimeId($id);
+		}
+	}
+
+	public function handle(NetworkSession $handler) : bool{
+		return $handler->handleAnimateEntity($this);
+	}
+}

src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php

@@ -49,25 +49,26 @@ class AvailableCommandsPacket extends DataPacket{
 	 * ARG_FLAG_VALID | (type const)
 	 */
 	public const ARG_TYPE_INT             = 0x01;
-	public const ARG_TYPE_FLOAT           = 0x02;
-	public const ARG_TYPE_VALUE           = 0x03;
-	public const ARG_TYPE_WILDCARD_INT    = 0x04;
-	public const ARG_TYPE_OPERATOR        = 0x05;
-	public const ARG_TYPE_TARGET          = 0x06;
+	public const ARG_TYPE_FLOAT           = 0x03;
+	public const ARG_TYPE_VALUE           = 0x04;
+	public const ARG_TYPE_WILDCARD_INT    = 0x05;
+	public const ARG_TYPE_OPERATOR        = 0x06;
+	public const ARG_TYPE_TARGET          = 0x07;
+	public const ARG_TYPE_WILDCARD_TARGET = 0x08;
 
-	public const ARG_TYPE_FILEPATH = 0x0e;
+	public const ARG_TYPE_FILEPATH = 0x10;
 
-	public const ARG_TYPE_STRING   = 0x1d;
+	public const ARG_TYPE_STRING   = 0x20;
 
-	public const ARG_TYPE_POSITION = 0x25;
+	public const ARG_TYPE_POSITION = 0x28;
 
-	public const ARG_TYPE_MESSAGE  = 0x29;
+	public const ARG_TYPE_MESSAGE  = 0x2c;
 
-	public const ARG_TYPE_RAWTEXT  = 0x2b;
+	public const ARG_TYPE_RAWTEXT  = 0x2e;
 
-	public const ARG_TYPE_JSON     = 0x2f;
+	public const ARG_TYPE_JSON     = 0x32;
 
-	public const ARG_TYPE_COMMAND  = 0x36;
+	public const ARG_TYPE_COMMAND  = 0x3f;
 
 	/**
 	 * Enums are a little different: they are composed as follows:

src/pocketmine/network/mcpe/protocol/BatchPacket.php

@@ -27,6 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\NetworkBinaryStream;
 use pocketmine\network\mcpe\NetworkSession;
+use pocketmine\utils\AssumptionFailedError;
 use function assert;
 use function get_class;
 use function strlen;
@@ -72,7 +73,9 @@ class BatchPacket extends DataPacket{
 	}
 
 	protected function encodePayload(){
-		$this->put(zlib_encode($this->payload, ZLIB_ENCODING_RAW, $this->compressionLevel));
+		$encoded = zlib_encode($this->payload, ZLIB_ENCODING_RAW, $this->compressionLevel);
+		if($encoded === false) throw new AssumptionFailedError("ZLIB compression failed");
+		$this->put($encoded);
 	}
 
 	/**

src/pocketmine/network/mcpe/protocol/CameraShakePacket.php

@@ -0,0 +1,82 @@
+<?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\network\mcpe\protocol;
+
+#include <rules/DataPacket.h>
+
+use pocketmine\network\mcpe\NetworkSession;
+
+class CameraShakePacket extends DataPacket/* implements ClientboundPacket*/{
+	public const NETWORK_ID = ProtocolInfo::CAMERA_SHAKE_PACKET;
+
+	public const TYPE_POSITIONAL = 0;
+	public const TYPE_ROTATIONAL = 1;
+
+	public const ACTION_ADD = 0;
+	public const ACTION_STOP = 1;
+
+	/** @var float */
+	private $intensity;
+	/** @var float */
+	private $duration;
+	/** @var int */
+	private $shakeType;
+	/** @var int */
+	private $shakeAction;
+
+	public static function create(float $intensity, float $duration, int $shakeType, int $shakeAction) : self{
+		$result = new self;
+		$result->intensity = $intensity;
+		$result->duration = $duration;
+		$result->shakeType = $shakeType;
+		$result->shakeAction = $shakeAction;
+		return $result;
+	}
+
+	public function getIntensity() : float{ return $this->intensity; }
+
+	public function getDuration() : float{ return $this->duration; }
+
+	public function getShakeType() : int{ return $this->shakeType; }
+
+	public function getShakeAction() : int{ return $this->shakeAction; }
+
+	protected function decodePayload() : void{
+		$this->intensity = $this->getLFloat();
+		$this->duration = $this->getLFloat();
+		$this->shakeType = $this->getByte();
+		$this->shakeAction = $this->getByte();
+	}
+
+	protected function encodePayload() : void{
+		$this->putLFloat($this->intensity);
+		$this->putLFloat($this->duration);
+		$this->putByte($this->shakeType);
+		$this->putByte($this->shakeAction);
+	}
+
+	public function handle(NetworkSession $handler) : bool{
+		return $handler->handleCameraShake($this);
+	}
+}

src/pocketmine/network/mcpe/protocol/ClientCacheBlobStatusPacket.php

@@ -66,23 +66,23 @@ class ClientCacheBlobStatusPacket extends DataPacket/* implements ServerboundPac
 	}
 
 	protected function decodePayload() : void{
-		$hitCount = $this->getUnsignedVarInt();
 		$missCount = $this->getUnsignedVarInt();
-		for($i = 0; $i < $hitCount; ++$i){
-			$this->hitHashes[] = $this->getLLong();
-		}
+		$hitCount = $this->getUnsignedVarInt();
 		for($i = 0; $i < $missCount; ++$i){
 			$this->missHashes[] = $this->getLLong();
 		}
+		for($i = 0; $i < $hitCount; ++$i){
+			$this->hitHashes[] = $this->getLLong();
+		}
 	}
 
 	protected function encodePayload() : void{
-		$this->putUnsignedVarInt(count($this->hitHashes));
 		$this->putUnsignedVarInt(count($this->missHashes));
-		foreach($this->hitHashes as $hash){
+		$this->putUnsignedVarInt(count($this->hitHashes));
+		foreach($this->missHashes as $hash){
 			$this->putLLong($hash);
 		}
-		foreach($this->missHashes as $hash){
+		foreach($this->hitHashes as $hash){
 			$this->putLLong($hash);
 		}
 	}

src/pocketmine/network/mcpe/protocol/ClientboundDebugRendererPacket.php

@@ -0,0 +1,137 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\network\mcpe\protocol;
+
+#include <rules/DataPacket.h>
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\NetworkSession;
+
+class ClientboundDebugRendererPacket extends DataPacket/* implements ClientboundPacket*/{
+	public const NETWORK_ID = ProtocolInfo::CLIENTBOUND_DEBUG_RENDERER_PACKET;
+
+	public const TYPE_CLEAR = 1;
+	public const TYPE_ADD_CUBE = 2;
+
+	/** @var int */
+	private $type;
+
+	//TODO: if more types are added, we'll probably want to make a separate data type and interfaces
+	/** @var string */
+	private $text;
+	/** @var Vector3 */
+	private $position;
+	/** @var float */
+	private $red;
+	/** @var float */
+	private $green;
+	/** @var float */
+	private $blue;
+	/** @var float */
+	private $alpha;
+	/** @var int */
+	private $durationMillis;
+
+	private static function base(int $type) : self{
+		$result = new self;
+		$result->type = $type;
+		return $result;
+	}
+
+	public static function clear() : self{ return self::base(self::TYPE_CLEAR); }
+
+	public static function addCube(string $text, Vector3 $position, float $red, float $green, float $blue, float $alpha, int $durationMillis) : self{
+		$result = self::base(self::TYPE_ADD_CUBE);
+		$result->text = $text;
+		$result->position = $position;
+		$result->red = $red;
+		$result->green = $green;
+		$result->blue = $blue;
+		$result->alpha = $alpha;
+		$result->durationMillis = $durationMillis;
+		return $result;
+	}
+
+	public function getType() : int{ return $this->type; }
+
+	public function getText() : string{ return $this->text; }
+
+	public function getPosition() : Vector3{ return $this->position; }
+
+	public function getRed() : float{ return $this->red; }
+
+	public function getGreen() : float{ return $this->green; }
+
+	public function getBlue() : float{ return $this->blue; }
+
+	public function getAlpha() : float{ return $this->alpha; }
+
+	public function getDurationMillis() : int{ return $this->durationMillis; }
+
+	protected function decodePayload() : void{
+		$this->type = $this->getLInt();
+
+		switch($this->type){
+			case self::TYPE_CLEAR:
+				//NOOP
+				break;
+			case self::TYPE_ADD_CUBE:
+				$this->text = $this->getString();
+				$this->position = $this->getVector3();
+				$this->red = $this->getLFloat();
+				$this->green = $this->getLFloat();
+				$this->blue = $this->getLFloat();
+				$this->alpha = $this->getLFloat();
+				$this->durationMillis = $this->getLLong();
+				break;
+			default:
+				throw new \UnexpectedValueException("Unknown type " . $this->type);
+		}
+	}
+
+	protected function encodePayload() : void{
+		$this->putLInt($this->type);
+
+		switch($this->type){
+			case self::TYPE_CLEAR:
+				//NOOP
+				break;
+			case self::TYPE_ADD_CUBE:
+				$this->putString($this->text);
+				$this->putVector3($this->position);
+				$this->putLFloat($this->red);
+				$this->putLFloat($this->green);
+				$this->putLFloat($this->blue);
+				$this->putLFloat($this->alpha);
+				$this->putLLong($this->durationMillis);
+				break;
+			default:
+				throw new \InvalidArgumentException("Unknown type " . $this->type);
+		}
+	}
+
+	public function handle(NetworkSession $session) : bool{
+		return $session->handleClientboundDebugRenderer($this);
+	}
+}

src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php

@@ -33,6 +33,11 @@ use function count;
 class CommandOutputPacket extends DataPacket{
 	public const NETWORK_ID = ProtocolInfo::COMMAND_OUTPUT_PACKET;
 
+	public const TYPE_LAST = 1;
+	public const TYPE_SILENT = 2;
+	public const TYPE_ALL = 3;
+	public const TYPE_DATA_SET = 4;
+
 	/** @var CommandOriginData */
 	public $originData;
 	/** @var int */
@@ -53,7 +58,7 @@ class CommandOutputPacket extends DataPacket{
 			$this->messages[] = $this->getCommandMessage();
 		}
 
-		if($this->outputType === 4){
+		if($this->outputType === self::TYPE_DATA_SET){
 			$this->unknownString = $this->getString();
 		}
 	}
@@ -81,7 +86,7 @@ class CommandOutputPacket extends DataPacket{
 			$this->putCommandMessage($message);
 		}
 
-		if($this->outputType === 4){
+		if($this->outputType === self::TYPE_DATA_SET){
 			$this->putString($this->unknownString);
 		}
 	}

src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php

@@ -32,13 +32,17 @@ class ContainerClosePacket extends DataPacket{
 
 	/** @var int */
 	public $windowId;
+	/** @var bool */
+	public $server = false;
 
 	protected function decodePayload(){
 		$this->windowId = $this->getByte();
+		$this->server = $this->getBool();
 	}
 
 	protected function encodePayload(){
 		$this->putByte($this->windowId);
+		$this->putBool($this->server);
 	}
 
 	public function handle(NetworkSession $session) : bool{

src/pocketmine/network/mcpe/protocol/CorrectPlayerMovePredictionPacket.php

@@ -0,0 +1,77 @@
+<?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\network\mcpe\protocol;
+
+#include <rules/DataPacket.h>
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\NetworkSession;
+
+class CorrectPlayerMovePredictionPacket extends DataPacket/* implements ClientboundPacket*/{
+	public const NETWORK_ID = ProtocolInfo::CORRECT_PLAYER_MOVE_PREDICTION_PACKET;
+
+	/** @var Vector3 */
+	private $position;
+	/** @var Vector3 */
+	private $delta;
+	/** @var bool */
+	private $onGround;
+	/** @var int */
+	private $tick;
+
+	public static function create(Vector3 $position, Vector3 $delta, bool $onGround, int $tick) : self{
+		$result = new self;
+		$result->position = $position;
+		$result->delta = $delta;
+		$result->onGround = $onGround;
+		$result->tick = $tick;
+		return $result;
+	}
+
+	public function getPosition() : Vector3{ return $this->position; }
+
+	public function getDelta() : Vector3{ return $this->delta; }
+
+	public function isOnGround() : bool{ return $this->onGround; }
+
+	public function getTick() : int{ return $this->tick; }
+
+	protected function decodePayload() : void{
+		$this->position = $this->getVector3();
+		$this->delta = $this->getVector3();
+		$this->onGround = $this->getBool();
+		$this->tick = $this->getUnsignedVarLong();
+	}
+
+	protected function encodePayload() : void{
+		$this->putVector3($this->position);
+		$this->putVector3($this->delta);
+		$this->putBool($this->onGround);
+		$this->putUnsignedVarLong($this->tick);
+	}
+
+	public function handle(NetworkSession $handler) : bool{
+		return $handler->handleCorrectPlayerMovePrediction($this);
+	}
+}