Release 3.19.0

This reverts commit c7cdaeae85.

.github/workflows/main.yml

@@ -180,3 +180,102 @@ jobs:
 
       - 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

.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");

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`.

README.md

@@ -23,6 +23,7 @@
 
 ## 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/DevTools/) - Development tools plugin for creating plugins
  * [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features

build/make-release.php

@@ -71,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"');

changelogs/3.18.md

@@ -16,3 +16,16 @@ Plugin developers should **only** update their required API to this version if y
 - 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,17 @@
+**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

composer.json

@@ -18,13 +18,14 @@
       "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",
       "composer-runtime-api": "^2.0",
-      "adhocore/json-comment": "^0.1.0",
+      "adhocore/json-comment": "^1.1",
       "pocketmine/binaryutils": "^0.1.9",
       "pocketmine/callback-validator": "^1.0.2",
       "pocketmine/classloader": "^0.1.0",
@@ -37,7 +38,7 @@
       "pocketmine/spl": "^0.4.0"
    },
    "require-dev": {
-      "phpstan/phpstan": "0.12.80",
+      "phpstan/phpstan": "0.12.83",
       "phpstan/phpstan-phpunit": "^0.12.6",
       "phpstan/phpstan-strict-rules": "^0.12.2",
       "phpunit/phpunit": "^9.2"

composer.lock

@@ -4,27 +4,28 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0ff6c2c87e1c350034929c4507151e38",
+    "content-hash": "c07802390fc058bf06b3a1741ef7c08e",
     "packages": [
         {
             "name": "adhocore/json-comment",
-            "version": "0.1.0",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/adhocore/php-json-comment.git",
-                "reference": "8448076039389f558f39ad0553aab87db3f81614"
+                "reference": "cf7998124d1050b83d7d985447fefd630e09c1a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/adhocore/php-json-comment/zipball/8448076039389f558f39ad0553aab87db3f81614",
-                "reference": "8448076039389f558f39ad0553aab87db3f81614",
+                "url": "https://api.github.com/repos/adhocore/php-json-comment/zipball/cf7998124d1050b83d7d985447fefd630e09c1a2",
+                "reference": "cf7998124d1050b83d7d985447fefd630e09c1a2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4"
+                "ext-ctype": "*",
+                "php": ">=7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.5 || ^7.5"
+                "phpunit/phpunit": "^6.5 || ^7.5 || ^8.5"
             },
             "type": "library",
             "autoload": {
@@ -50,9 +51,15 @@
             ],
             "support": {
                 "issues": "https://github.com/adhocore/php-json-comment/issues",
-                "source": "https://github.com/adhocore/php-json-comment/tree/0.1.0"
+                "source": "https://github.com/adhocore/php-json-comment/tree/1.1.0"
             },
-            "time": "2020-01-03T13:51:23+00:00"
+            "funding": [
+                {
+                    "url": "https://paypal.me/ji10",
+                    "type": "custom"
+                }
+            ],
+            "time": "2021-04-05T13:11:13+00:00"
         },
         {
             "name": "pocketmine/binaryutils",
@@ -935,16 +942,16 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.12.2",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "245710e971a030f42e08f4912863805570f23d39"
+                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/245710e971a030f42e08f4912863805570f23d39",
-                "reference": "245710e971a030f42e08f4912863805570f23d39",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
+                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
                 "shasum": ""
             },
             "require": {
@@ -996,22 +1003,22 @@
             ],
             "support": {
                 "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/1.12.2"
+                "source": "https://github.com/phpspec/prophecy/tree/1.13.0"
             },
-            "time": "2020-12-19T10:15:11+00:00"
+            "time": "2021-03-17T13:42:18+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.80",
+            "version": "0.12.83",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "c6a1b17f22ecf708d434d6bee05092647ec7e686"
+                "reference": "4a967cec6efb46b500dd6d768657336a3ffe699f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6a1b17f22ecf708d434d6bee05092647ec7e686",
-                "reference": "c6a1b17f22ecf708d434d6bee05092647ec7e686",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4a967cec6efb46b500dd6d768657336a3ffe699f",
+                "reference": "4a967cec6efb46b500dd6d768657336a3ffe699f",
                 "shasum": ""
             },
             "require": {
@@ -1042,7 +1049,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/0.12.80"
+                "source": "https://github.com/phpstan/phpstan/tree/0.12.83"
             },
             "funding": [
                 {
@@ -1058,7 +1065,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-28T20:22:43+00:00"
+            "time": "2021-04-03T15:35:45+00:00"
         },
         {
             "name": "phpstan/phpstan-phpunit",
@@ -1168,16 +1175,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.5",
+            "version": "9.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "f3e026641cc91909d421802dd3ac7827ebfd97e1"
+                "reference": "f6293e1b30a2354e8428e004689671b83871edde"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f3e026641cc91909d421802dd3ac7827ebfd97e1",
-                "reference": "f3e026641cc91909d421802dd3ac7827ebfd97e1",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f6293e1b30a2354e8428e004689671b83871edde",
+                "reference": "f6293e1b30a2354e8428e004689671b83871edde",
                 "shasum": ""
             },
             "require": {
@@ -1233,7 +1240,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.5"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.6"
             },
             "funding": [
                 {
@@ -1241,7 +1248,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-28T06:44:49+00:00"
+            "time": "2021-03-28T07:26:59+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1486,16 +1493,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.2",
+            "version": "9.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "f661659747f2f87f9e72095bb207bceb0f151cb4"
+                "reference": "c73c6737305e779771147af66c96ca6a7ed8a741"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f661659747f2f87f9e72095bb207bceb0f151cb4",
-                "reference": "f661659747f2f87f9e72095bb207bceb0f151cb4",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c73c6737305e779771147af66c96ca6a7ed8a741",
+                "reference": "c73c6737305e779771147af66c96ca6a7ed8a741",
                 "shasum": ""
             },
             "require": {
@@ -1573,7 +1580,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.2"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.4"
             },
             "funding": [
                 {
@@ -1585,7 +1592,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-02-02T14:45:58+00:00"
+            "time": "2021-03-23T07:16:29+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -2682,30 +2689,35 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "1.9.1",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozarts/assert.git",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0 || ^8.0",
+                "php": "^7.2 || ^8.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
                 "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<3.9.1"
+                "vimeo/psalm": "<4.6.1 || 4.6.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
+                "phpunit/phpunit": "^8.5.13"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.10-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Webmozart\\Assert\\": "src/"
@@ -2729,9 +2741,9 @@
             ],
             "support": {
                 "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.9.1"
+                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
             },
-            "time": "2020-07-08T17:02:28+00:00"
+            "time": "2021-03-09T10:59:23+00:00"
         }
     ],
     "aliases": [],
@@ -2753,6 +2765,7 @@
         "ext-phar": "*",
         "ext-pthreads": "~3.2.0",
         "ext-reflection": "*",
+        "ext-simplexml": "*",
         "ext-sockets": "*",
         "ext-spl": "*",
         "ext-yaml": ">=2.0.0",

doxygen/index.md

@@ -7,4 +7,4 @@ This site can be accessed via https://apidoc.pmmp.io.
 ### Additional developer resources
  - [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,7 +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/gc-hacks.neon
 	- tests/phpstan/configs/l7-baseline.neon
 	- tests/phpstan/configs/l8-baseline.neon

src/pocketmine/Player.php

@@ -152,7 +152,12 @@ use pocketmine\network\mcpe\protocol\types\ContainerIds;
 use pocketmine\network\mcpe\protocol\types\DimensionIds;
 use pocketmine\network\mcpe\protocol\types\Experiments;
 use pocketmine\network\mcpe\protocol\types\GameMode;
+use pocketmine\network\mcpe\protocol\types\inventory\MismatchTransactionData;
+use pocketmine\network\mcpe\protocol\types\inventory\NormalTransactionData;
+use pocketmine\network\mcpe\protocol\types\inventory\ReleaseItemTransactionData;
 use pocketmine\network\mcpe\protocol\types\inventory\UIInventorySlotOffset;
+use pocketmine\network\mcpe\protocol\types\inventory\UseItemOnEntityTransactionData;
+use pocketmine\network\mcpe\protocol\types\inventory\UseItemTransactionData;
 use pocketmine\network\mcpe\protocol\types\NetworkInventoryAction;
 use pocketmine\network\mcpe\protocol\types\PersonaPieceTintColor;
 use pocketmine\network\mcpe\protocol\types\PersonaSkinPiece;
@@ -196,7 +201,9 @@ use function get_class;
 use function gettype;
 use function implode;
 use function in_array;
+use function is_infinite;
 use function is_int;
+use function is_nan;
 use function is_object;
 use function is_string;
 use function json_encode;
@@ -411,7 +418,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 	/** @var float */
 	protected $lastRightClickTime = 0.0;
-	/** @var \stdClass|null */
+	/** @var UseItemTransactionData|null */
 	protected $lastRightClickData = null;
 
 	/**
@@ -2357,8 +2364,15 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	}
 
 	public function handleMovePlayer(MovePlayerPacket $packet) : bool{
-		$newPos = $packet->position->round(4)->subtract(0, $this->baseOffset, 0);
+		$rawPos = $packet->position;
+		foreach([$rawPos->x, $rawPos->y, $rawPos->z, $packet->yaw, $packet->headYaw, $packet->pitch] as $float){
+			if(is_infinite($float) || is_nan($float)){
+				$this->server->getLogger()->debug("Invalid movement from " . $this->getName() . ", contains NAN/INF components");
+				return false;
+			}
+		}
 
+		$newPos = $rawPos->round(4)->subtract(0, $this->baseOffset, 0);
 		if($this->forceMoveSync !== null and $newPos->distanceSquared($this->forceMoveSync) > 1){  //Tolerate up to 1 block to avoid problems with client-sided physics when spawning in blocks
 			$this->server->getLogger()->debug("Got outdated pre-teleport movement from " . $this->getName() . ", received " . $newPos . ", expected " . $this->asVector3());
 			//Still getting movements from before teleport, ignore them
@@ -2426,14 +2440,14 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		/** @var InventoryAction[] $actions */
 		$actions = [];
 		$isCraftingPart = false;
-		foreach($packet->actions as $networkInventoryAction){
+		foreach($packet->trData->getActions() as $networkInventoryAction){
 			if(
 				$networkInventoryAction->sourceType === NetworkInventoryAction::SOURCE_TODO and (
 					$networkInventoryAction->windowId === NetworkInventoryAction::SOURCE_TYPE_CRAFTING_RESULT or
 					$networkInventoryAction->windowId === NetworkInventoryAction::SOURCE_TYPE_CRAFTING_USE_INGREDIENT
 				) or (
 					$this->craftingTransaction !== null &&
-					!$networkInventoryAction->oldItem->equalsExact($networkInventoryAction->newItem) &&
+					!$networkInventoryAction->oldItem->getItemStack()->equalsExact($networkInventoryAction->newItem->getItemStack()) &&
 					$networkInventoryAction->sourceType === NetworkInventoryAction::SOURCE_CONTAINER &&
 					$networkInventoryAction->windowId === ContainerIds::UI &&
 					$networkInventoryAction->inventorySlot === UIInventorySlotOffset::CREATED_ITEM_OUTPUT
@@ -2484,321 +2498,313 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			$this->craftingTransaction = null;
 		}
 
-		switch($packet->transactionType){
-			case InventoryTransactionPacket::TYPE_NORMAL:
-				$this->setUsingItem(false);
-				$transaction = new InventoryTransaction($this, $actions);
+		if($packet->trData instanceof NormalTransactionData){
+			$this->setUsingItem(false);
+			$transaction = new InventoryTransaction($this, $actions);
 
-				try{
-					$transaction->execute();
-				}catch(TransactionValidationException $e){
-					$this->server->getLogger()->debug("Failed to execute inventory transaction from " . $this->getName() . ": " . $e->getMessage());
-					$this->server->getLogger()->debug("Actions: " . json_encode($packet->actions));
+			try{
+				$transaction->execute();
+			}catch(TransactionValidationException $e){
+				$this->server->getLogger()->debug("Failed to execute inventory transaction from " . $this->getName() . ": " . $e->getMessage());
+				$this->server->getLogger()->debug("Actions: " . json_encode($packet->trData->getActions()));
 
-					return false;
-				}
+				return false;
+			}
 
-				//TODO: fix achievement for getting iron from furnace
+			//TODO: fix achievement for getting iron from furnace
 
-				return true;
-			case InventoryTransactionPacket::TYPE_MISMATCH:
-				if(count($packet->actions) > 0){
-					$this->server->getLogger()->debug("Expected 0 actions for mismatch, got " . count($packet->actions) . ", " . json_encode($packet->actions));
-				}
-				$this->setUsingItem(false);
-				$this->sendAllInventories();
+			return true;
+		}elseif($packet->trData instanceof MismatchTransactionData){
+			if(count($packet->trData->getActions()) > 0){
+				$this->server->getLogger()->debug("Expected 0 actions for mismatch, got " . count($packet->trData->getActions()) . ", " . json_encode($packet->trData->getActions()));
+			}
+			$this->setUsingItem(false);
+			$this->sendAllInventories();
 
-				return true;
-			case InventoryTransactionPacket::TYPE_USE_ITEM:
-				$blockVector = new Vector3($packet->trData->x, $packet->trData->y, $packet->trData->z);
-				$face = $packet->trData->face;
+			return true;
+		}elseif($packet->trData instanceof UseItemTransactionData){
 
-				$type = $packet->trData->actionType;
-				switch($type){
-					case InventoryTransactionPacket::USE_ITEM_ACTION_CLICK_BLOCK:
-						//TODO: start hack for client spam bug
-						$spamBug = ($this->lastRightClickData !== null and
-							microtime(true) - $this->lastRightClickTime < 0.1 and //100ms
-							$this->lastRightClickData->playerPos->distanceSquared($packet->trData->playerPos) < 0.00001 and
-							$this->lastRightClickData->x === $packet->trData->x and
-							$this->lastRightClickData->y === $packet->trData->y and
-							$this->lastRightClickData->z === $packet->trData->z and
-							$this->lastRightClickData->clickPos->distanceSquared($packet->trData->clickPos) < 0.00001 //signature spam bug has 0 distance, but allow some error
-						);
-						//get rid of continued spam if the player clicks and holds right-click
-						$this->lastRightClickData = $packet->trData;
-						$this->lastRightClickTime = microtime(true);
-						if($spamBug){
-							return true;
-						}
-						//TODO: end hack for client spam bug
-
-						$this->setUsingItem(false);
-
-						if(!$this->canInteract($blockVector->add(0.5, 0.5, 0.5), 13)){
-						}elseif($this->isCreative()){
-							$item = $this->inventory->getItemInHand();
-							if($this->level->useItemOn($blockVector, $item, $face, $packet->trData->clickPos, $this, true)){
-								return true;
-							}
-						}elseif(!$this->inventory->getItemInHand()->equals($packet->trData->itemInHand)){
-							$this->inventory->sendHeldItem($this);
-						}else{
-							$item = $this->inventory->getItemInHand();
-							$oldItem = clone $item;
-							if($this->level->useItemOn($blockVector, $item, $face, $packet->trData->clickPos, $this, true)){
-								if(!$item->equalsExact($oldItem) and $oldItem->equalsExact($this->inventory->getItemInHand())){
-									$this->inventory->setItemInHand($item);
-									$this->inventory->sendHeldItem($this->hasSpawned);
-								}
-
-								return true;
-							}
-						}
-
-						$this->inventory->sendHeldItem($this);
-
-						if($blockVector->distanceSquared($this) > 10000){
-							return true;
-						}
-
-						$target = $this->level->getBlock($blockVector);
-						$block = $target->getSide($face);
-
-						/** @var Block[] $blocks */
-						$blocks = array_merge($target->getAllSides(), $block->getAllSides()); //getAllSides() on each of these will include $target and $block because they are next to each other
-
-						$this->level->sendBlocks([$this], $blocks, UpdateBlockPacket::FLAG_ALL_PRIORITY);
+			$blockVector = $packet->trData->getBlockPos();
+			$face = $packet->trData->getFace();
 
+			switch($packet->trData->getActionType()){
+				case UseItemTransactionData::ACTION_CLICK_BLOCK:
+					//TODO: start hack for client spam bug
+					$spamBug = ($this->lastRightClickData !== null and
+						microtime(true) - $this->lastRightClickTime < 0.1 and //100ms
+						$this->lastRightClickData->getPlayerPos()->distanceSquared($packet->trData->getPlayerPos()) < 0.00001 and
+						$this->lastRightClickData->getBlockPos()->equals($packet->trData->getBlockPos()) and
+						$this->lastRightClickData->getClickPos()->distanceSquared($packet->trData->getClickPos()) < 0.00001 //signature spam bug has 0 distance, but allow some error
+					);
+					//get rid of continued spam if the player clicks and holds right-click
+					$this->lastRightClickData = $packet->trData;
+					$this->lastRightClickTime = microtime(true);
+					if($spamBug){
 						return true;
-					case InventoryTransactionPacket::USE_ITEM_ACTION_BREAK_BLOCK:
-						$this->doCloseInventory();
+					}
+					//TODO: end hack for client spam bug
 
+					$this->setUsingItem(false);
+
+					if(!$this->canInteract($blockVector->add(0.5, 0.5, 0.5), 13)){
+					}elseif($this->isCreative()){
+						$item = $this->inventory->getItemInHand();
+						if($this->level->useItemOn($blockVector, $item, $face, $packet->trData->getClickPos(), $this, true)){
+							return true;
+						}
+					}elseif(!$this->inventory->getItemInHand()->equals($packet->trData->getItemInHand()->getItemStack())){
+						$this->inventory->sendHeldItem($this);
+					}else{
 						$item = $this->inventory->getItemInHand();
 						$oldItem = clone $item;
-
-						if($this->canInteract($blockVector->add(0.5, 0.5, 0.5), $this->isCreative() ? 13 : 7) and $this->level->useBreakOn($blockVector, $item, $this, true)){
-							if($this->isSurvival()){
-								if(!$item->equalsExact($oldItem) and $oldItem->equalsExact($this->inventory->getItemInHand())){
-									$this->inventory->setItemInHand($item);
-									$this->inventory->sendHeldItem($this->hasSpawned);
-								}
-
-								$this->exhaust(0.025, PlayerExhaustEvent::CAUSE_MINING);
+						if($this->level->useItemOn($blockVector, $item, $face, $packet->trData->getClickPos(), $this, true)){
+							if(!$item->equalsExact($oldItem) and $oldItem->equalsExact($this->inventory->getItemInHand())){
+								$this->inventory->setItemInHand($item);
+								$this->inventory->sendHeldItem($this->hasSpawned);
 							}
+
 							return true;
 						}
+					}
 
-						$this->inventory->sendContents($this);
-						$this->inventory->sendHeldItem($this);
-
-						$target = $this->level->getBlock($blockVector);
-						/** @var Block[] $blocks */
-						$blocks = $target->getAllSides();
-						$blocks[] = $target;
-
-						$this->level->sendBlocks([$this], $blocks, UpdateBlockPacket::FLAG_ALL_PRIORITY);
-
-						foreach($blocks as $b){
-							$tile = $this->level->getTile($b);
-							if($tile instanceof Spawnable){
-								$tile->spawnTo($this);
-							}
-						}
+					$this->inventory->sendHeldItem($this);
 
+					if($blockVector->distanceSquared($this) > 10000){
 						return true;
-					case InventoryTransactionPacket::USE_ITEM_ACTION_CLICK_AIR:
-						if($this->isUsingItem()){
-							$slot = $this->inventory->getItemInHand();
-							if($slot instanceof Consumable and !($slot instanceof MaybeConsumable and !$slot->canBeConsumed())){
-								$ev = new PlayerItemConsumeEvent($this, $slot);
-								if($this->hasItemCooldown($slot)){
-									$ev->setCancelled();
-								}
-								$ev->call();
-								if($ev->isCancelled() or !$this->consumeObject($slot)){
-									$this->inventory->sendContents($this);
-									return true;
-								}
-								$this->resetItemCooldown($slot);
-								if($this->isSurvival()){
-									$slot->pop();
-									$this->inventory->setItemInHand($slot);
-									$this->inventory->addItem($slot->getResidue());
-								}
-								$this->setUsingItem(false);
+					}
+
+					$target = $this->level->getBlock($blockVector);
+					$block = $target->getSide($face);
+
+					/** @var Block[] $blocks */
+					$blocks = array_merge($target->getAllSides(), $block->getAllSides()); //getAllSides() on each of these will include $target and $block because they are next to each other
+
+					$this->level->sendBlocks([$this], $blocks, UpdateBlockPacket::FLAG_ALL_PRIORITY);
+
+					return true;
+				case UseItemTransactionData::ACTION_BREAK_BLOCK:
+					$this->doCloseInventory();
+
+					$item = $this->inventory->getItemInHand();
+					$oldItem = clone $item;
+
+					if($this->canInteract($blockVector->add(0.5, 0.5, 0.5), $this->isCreative() ? 13 : 7) and $this->level->useBreakOn($blockVector, $item, $this, true)){
+						if($this->isSurvival()){
+							if(!$item->equalsExact($oldItem) and $oldItem->equalsExact($this->inventory->getItemInHand())){
+								$this->inventory->setItemInHand($item);
+								$this->inventory->sendHeldItem($this->hasSpawned);
 							}
-						}
-						$directionVector = $this->getDirectionVector();
 
-						if($this->isCreative()){
-							$item = $this->inventory->getItemInHand();
-						}elseif(!$this->inventory->getItemInHand()->equals($packet->trData->itemInHand)){
-							$this->inventory->sendHeldItem($this);
-							return true;
-						}else{
-							$item = $this->inventory->getItemInHand();
+							$this->exhaust(0.025, PlayerExhaustEvent::CAUSE_MINING);
 						}
+						return true;
+					}
 
-						$ev = new PlayerInteractEvent($this, $item, null, $directionVector, $face, PlayerInteractEvent::RIGHT_CLICK_AIR);
-						if($this->hasItemCooldown($item) or $this->isSpectator()){
-							$ev->setCancelled();
+					$this->inventory->sendContents($this);
+					$this->inventory->sendHeldItem($this);
+
+					$target = $this->level->getBlock($blockVector);
+					/** @var Block[] $blocks */
+					$blocks = $target->getAllSides();
+					$blocks[] = $target;
+
+					$this->level->sendBlocks([$this], $blocks, UpdateBlockPacket::FLAG_ALL_PRIORITY);
+
+					foreach($blocks as $b){
+						$tile = $this->level->getTile($b);
+						if($tile instanceof Spawnable){
+							$tile->spawnTo($this);
 						}
+					}
 
-						$ev->call();
-						if($ev->isCancelled()){
-							$this->inventory->sendHeldItem($this);
-							return true;
-						}
-
-						if($item->onClickAir($this, $directionVector)){
-							$this->resetItemCooldown($item);
+					return true;
+				case UseItemTransactionData::ACTION_CLICK_AIR:
+					if($this->isUsingItem()){
+						$slot = $this->inventory->getItemInHand();
+						if($slot instanceof Consumable and !($slot instanceof MaybeConsumable and !$slot->canBeConsumed())){
+							$ev = new PlayerItemConsumeEvent($this, $slot);
+							if($this->hasItemCooldown($slot)){
+								$ev->setCancelled();
+							}
+							$ev->call();
+							if($ev->isCancelled() or !$this->consumeObject($slot)){
+								$this->inventory->sendContents($this);
+								return true;
+							}
+							$this->resetItemCooldown($slot);
 							if($this->isSurvival()){
+								$slot->pop();
+								$this->inventory->setItemInHand($slot);
+								$this->inventory->addItem($slot->getResidue());
+							}
+							$this->setUsingItem(false);
+						}
+					}
+					$directionVector = $this->getDirectionVector();
+
+					if($this->isCreative()){
+						$item = $this->inventory->getItemInHand();
+					}elseif(!$this->inventory->getItemInHand()->equals($packet->trData->getItemInHand()->getItemStack())){
+						$this->inventory->sendHeldItem($this);
+						return true;
+					}else{
+						$item = $this->inventory->getItemInHand();
+					}
+
+					$ev = new PlayerInteractEvent($this, $item, null, $directionVector, $face, PlayerInteractEvent::RIGHT_CLICK_AIR);
+					if($this->hasItemCooldown($item) or $this->isSpectator()){
+						$ev->setCancelled();
+					}
+
+					$ev->call();
+					if($ev->isCancelled()){
+						$this->inventory->sendHeldItem($this);
+						return true;
+					}
+
+					if($item->onClickAir($this, $directionVector)){
+						$this->resetItemCooldown($item);
+						if($this->isSurvival()){
+							$this->inventory->setItemInHand($item);
+						}
+					}
+
+					$this->setUsingItem(true);
+
+					return true;
+				default:
+					//unknown
+					break;
+			}
+
+			$this->inventory->sendContents($this);
+			return false;
+		}elseif($packet->trData instanceof UseItemOnEntityTransactionData){
+			$target = $this->level->getEntity($packet->trData->getEntityRuntimeId());
+			if($target === null){
+				return false;
+			}
+
+			switch($packet->trData->getActionType()){
+				case UseItemOnEntityTransactionData::ACTION_INTERACT:
+					break; //TODO
+				case UseItemOnEntityTransactionData::ACTION_ATTACK:
+					if(!$target->isAlive()){
+						return true;
+					}
+					if($target instanceof ItemEntity or $target instanceof Arrow){
+						$this->kick("Attempting to attack an invalid entity");
+						$this->server->getLogger()->warning($this->getServer()->getLanguage()->translateString("pocketmine.player.invalidEntity", [$this->getName()]));
+						return false;
+					}
+
+					$cancelled = false;
+
+					$heldItem = $this->inventory->getItemInHand();
+					$oldItem = clone $heldItem;
+
+					if(!$this->canInteract($target, 8) or $this->isSpectator()){
+						$cancelled = true;
+					}elseif($target instanceof Player){
+						if(!$this->server->getConfigBool("pvp")){
+							$cancelled = true;
+						}
+					}
+
+					$ev = new EntityDamageByEntityEvent($this, $target, EntityDamageEvent::CAUSE_ENTITY_ATTACK, $heldItem->getAttackPoints());
+
+					$meleeEnchantmentDamage = 0;
+					/** @var EnchantmentInstance[] $meleeEnchantments */
+					$meleeEnchantments = [];
+					foreach($heldItem->getEnchantments() as $enchantment){
+						$type = $enchantment->getType();
+						if($type instanceof MeleeWeaponEnchantment and $type->isApplicableTo($target)){
+							$meleeEnchantmentDamage += $type->getDamageBonus($enchantment->getLevel());
+							$meleeEnchantments[] = $enchantment;
+						}
+					}
+					$ev->setModifier($meleeEnchantmentDamage, EntityDamageEvent::MODIFIER_WEAPON_ENCHANTMENTS);
+
+					if($cancelled){
+						$ev->setCancelled();
+					}
+
+					if(!$this->isSprinting() and !$this->isFlying() and $this->fallDistance > 0 and !$this->hasEffect(Effect::BLINDNESS) and !$this->isUnderwater()){
+						$ev->setModifier($ev->getFinalDamage() / 2, EntityDamageEvent::MODIFIER_CRITICAL);
+					}
+
+					$target->attack($ev);
+
+					if($ev->isCancelled()){
+						if($heldItem instanceof Durable and $this->isSurvival()){
+							$this->inventory->sendContents($this);
+						}
+						return true;
+					}
+
+					if($ev->getModifier(EntityDamageEvent::MODIFIER_CRITICAL) > 0){
+						$pk = new AnimatePacket();
+						$pk->action = AnimatePacket::ACTION_CRITICAL_HIT;
+						$pk->entityRuntimeId = $target->getId();
+						$this->server->broadcastPacket($target->getViewers(), $pk);
+						if($target instanceof Player){
+							$target->dataPacket($pk);
+						}
+					}
+
+					foreach($meleeEnchantments as $enchantment){
+						$type = $enchantment->getType();
+						assert($type instanceof MeleeWeaponEnchantment);
+						$type->onPostAttack($this, $target, $enchantment->getLevel());
+					}
+
+					if($this->isAlive()){
+						//reactive damage like thorns might cause us to be killed by attacking another mob, which
+						//would mean we'd already have dropped the inventory by the time we reached here
+						if($heldItem->onAttackEntity($target) and $this->isSurvival() and $oldItem->equalsExact($this->inventory->getItemInHand())){ //always fire the hook, even if we are survival
+							$this->inventory->setItemInHand($heldItem);
+						}
+
+						$this->exhaust(0.3, PlayerExhaustEvent::CAUSE_ATTACK);
+					}
+
+					return true;
+				default:
+					break; //unknown
+			}
+
+			$this->inventory->sendContents($this);
+			return false;
+		}elseif($packet->trData instanceof ReleaseItemTransactionData){
+			try{
+				switch($packet->trData->getActionType()){
+					case ReleaseItemTransactionData::ACTION_RELEASE:
+						if($this->isUsingItem()){
+							$item = $this->inventory->getItemInHand();
+							if($this->hasItemCooldown($item)){
+								$this->inventory->sendContents($this);
+								return false;
+							}
+							if($item->onReleaseUsing($this)){
+								$this->resetItemCooldown($item);
 								$this->inventory->setItemInHand($item);
 							}
+							return true;
 						}
-
-						$this->setUsingItem(true);
-
-						return true;
+						break;
 					default:
-						//unknown
 						break;
 				}
-				break;
-			case InventoryTransactionPacket::TYPE_USE_ITEM_ON_ENTITY:
-				$target = $this->level->getEntity($packet->trData->entityRuntimeId);
-				if($target === null){
-					return false;
-				}
-
-				$type = $packet->trData->actionType;
-
-				switch($type){
-					case InventoryTransactionPacket::USE_ITEM_ON_ENTITY_ACTION_INTERACT:
-						break; //TODO
-					case InventoryTransactionPacket::USE_ITEM_ON_ENTITY_ACTION_ATTACK:
-						if(!$target->isAlive()){
-							return true;
-						}
-						if($target instanceof ItemEntity or $target instanceof Arrow){
-							$this->kick("Attempting to attack an invalid entity");
-							$this->server->getLogger()->warning($this->getServer()->getLanguage()->translateString("pocketmine.player.invalidEntity", [$this->getName()]));
-							return false;
-						}
-
-						$cancelled = false;
-
-						$heldItem = $this->inventory->getItemInHand();
-						$oldItem = clone $heldItem;
-
-						if(!$this->canInteract($target, 8) or $this->isSpectator()){
-							$cancelled = true;
-						}elseif($target instanceof Player){
-							if(!$this->server->getConfigBool("pvp")){
-								$cancelled = true;
-							}
-						}
-
-						$ev = new EntityDamageByEntityEvent($this, $target, EntityDamageEvent::CAUSE_ENTITY_ATTACK, $heldItem->getAttackPoints());
-
-						$meleeEnchantmentDamage = 0;
-						/** @var EnchantmentInstance[] $meleeEnchantments */
-						$meleeEnchantments = [];
-						foreach($heldItem->getEnchantments() as $enchantment){
-							$type = $enchantment->getType();
-							if($type instanceof MeleeWeaponEnchantment and $type->isApplicableTo($target)){
-								$meleeEnchantmentDamage += $type->getDamageBonus($enchantment->getLevel());
-								$meleeEnchantments[] = $enchantment;
-							}
-						}
-						$ev->setModifier($meleeEnchantmentDamage, EntityDamageEvent::MODIFIER_WEAPON_ENCHANTMENTS);
-
-						if($cancelled){
-							$ev->setCancelled();
-						}
-
-						if(!$this->isSprinting() and !$this->isFlying() and $this->fallDistance > 0 and !$this->hasEffect(Effect::BLINDNESS) and !$this->isUnderwater()){
-							$ev->setModifier($ev->getFinalDamage() / 2, EntityDamageEvent::MODIFIER_CRITICAL);
-						}
-
-						$target->attack($ev);
-
-						if($ev->isCancelled()){
-							if($heldItem instanceof Durable and $this->isSurvival()){
-								$this->inventory->sendContents($this);
-							}
-							return true;
-						}
-
-						if($ev->getModifier(EntityDamageEvent::MODIFIER_CRITICAL) > 0){
-							$pk = new AnimatePacket();
-							$pk->action = AnimatePacket::ACTION_CRITICAL_HIT;
-							$pk->entityRuntimeId = $target->getId();
-							$this->server->broadcastPacket($target->getViewers(), $pk);
-							if($target instanceof Player){
-								$target->dataPacket($pk);
-							}
-						}
-
-						foreach($meleeEnchantments as $enchantment){
-							$type = $enchantment->getType();
-							assert($type instanceof MeleeWeaponEnchantment);
-							$type->onPostAttack($this, $target, $enchantment->getLevel());
-						}
-
-						if($this->isAlive()){
-							//reactive damage like thorns might cause us to be killed by attacking another mob, which
-							//would mean we'd already have dropped the inventory by the time we reached here
-							if($heldItem->onAttackEntity($target) and $this->isSurvival() and $oldItem->equalsExact($this->inventory->getItemInHand())){ //always fire the hook, even if we are survival
-								$this->inventory->setItemInHand($heldItem);
-							}
-
-							$this->exhaust(0.3, PlayerExhaustEvent::CAUSE_ATTACK);
-						}
-
-						return true;
-					default:
-						break; //unknown
-				}
-
-				break;
-			case InventoryTransactionPacket::TYPE_RELEASE_ITEM:
-				try{
-					$type = $packet->trData->actionType;
-					switch($type){
-						case InventoryTransactionPacket::RELEASE_ITEM_ACTION_RELEASE:
-							if($this->isUsingItem()){
-								$item = $this->inventory->getItemInHand();
-								if($this->hasItemCooldown($item)){
-									$this->inventory->sendContents($this);
-									return false;
-								}
-								if($item->onReleaseUsing($this)){
-									$this->resetItemCooldown($item);
-									$this->inventory->setItemInHand($item);
-								}
-							}else{
-								break;
-							}
-
-							return true;
-						default:
-							break;
-					}
-				}finally{
-					$this->setUsingItem(false);
-				}
-
-				$this->inventory->sendContents($this);
-				break;
-			default:
-				$this->inventory->sendContents($this);
-				break;
+			}finally{
+				$this->setUsingItem(false);
+			}
 
+			$this->inventory->sendContents($this);
+			return false;
+		}else{
+			$this->inventory->sendContents($this);
+			return false;
 		}
-
-		return false; //TODO
 	}
 
 	public function handleMobEquipment(MobEquipmentPacket $packet) : bool{
@@ -2808,8 +2814,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 		$item = $this->inventory->getItem($packet->hotbarSlot);
 
-		if(!$item->equals($packet->item)){
-			$this->server->getLogger()->debug("Tried to equip " . $packet->item . " but have " . $item . " in target slot");
+		if(!$item->equals($packet->item->getItemStack())){
+			$this->server->getLogger()->debug("Tried to equip " . $packet->item->getItemStack() . " but have " . $item . " in target slot");
 			$this->inventory->sendContents($this);
 			return false;
 		}
@@ -2825,15 +2831,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		if(!$this->spawned or !$this->isAlive()){
 			return true;
 		}
-		if($packet->action === InteractPacket::ACTION_MOUSEOVER and $packet->target === 0){
-			//TODO HACK: silence useless spam (MCPE 1.8)
-			//this packet is EXPECTED to only be sent when interacting with an entity, but due to some messy Mojang
-			//hacks, it also sends it when changing the held item now, which causes us to think the inventory was closed
-			//when it wasn't.
-			return true;
-		}
 
-		$this->doCloseInventory();
+		if($packet->action !== InteractPacket::ACTION_MOUSEOVER){
+			//mouseover fires when the player swaps their held itemstack in the inventory menu
+			$this->doCloseInventory();
+		}
 
 		$target = $this->level->getEntity($packet->target);
 		if($target === null){
@@ -2928,6 +2930,16 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 					break;
 				}
 
+				$tile = $this->level->getTile($pos);
+				if($tile instanceof ItemFrame and $tile->hasItem()){
+					if (lcg_value() <= $tile->getItemDropChance()){
+						$this->level->dropItem($tile->getBlock(), $tile->getItem());
+					}
+					$tile->setItem(null);
+					$tile->setItemRotation(0);
+					break;
+				}
+
 				$block = $target->getSide($packet->face);
 				if($block->getId() === Block::FIRE){
 					$this->level->setBlock($block, BlockFactory::get(Block::AIR));
@@ -3097,7 +3109,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		}
 		if(isset($this->windowIndex[$packet->windowId])){
 			$this->closingWindowId = $packet->windowId;
-			(new InventoryCloseEvent($this->windowIndex[$packet->windowId], $this))->call();
 			$this->removeWindow($this->windowIndex[$packet->windowId]);
 			$this->closingWindowId = null;
 			//removeWindow handles sending the appropriate
@@ -3115,11 +3126,12 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$handled = false;
 
 		$isFlying = $packet->getFlag(AdventureSettingsPacket::FLYING);
-		if($isFlying and !$this->allowFlight){
-			$this->kick($this->server->getLanguage()->translateString("kick.reason.cheat", ["%ability.flight"]));
-			return true;
-		}elseif($isFlying !== $this->isFlying()){
+		if($isFlying !== $this->isFlying()){
 			$ev = new PlayerToggleFlightEvent($this, $isFlying);
+			if($isFlying and !$this->allowFlight){
+				$ev->setCancelled();
+			}
+
 			$ev->call();
 			if($ev->isCancelled()){
 				$this->sendSettings();
@@ -4120,6 +4132,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		}
 
 		if($id !== null){
+			(new InventoryCloseEvent($inventory, $this))->call();
 			$inventory->close($this);
 			unset($this->windows[$hash], $this->windowIndex[$id], $this->permanentWindows[$id]);
 		}

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.18.0";
+const BASE_VERSION = "3.19.0";
 const IS_DEVELOPMENT_BUILD = false;
 const BUILD_NUMBER = 0;

src/pocketmine/command/CommandReader.php

@@ -116,37 +116,28 @@ class CommandReader extends Thread{
 	 * @return bool if the main execution should continue reading lines
 	 */
 	private function readLine() : bool{
-		$line = "";
-
 		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;
+		$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){

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;
@@ -813,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/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/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/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/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/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,12 +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;
@@ -58,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());
@@ -193,83 +197,122 @@ class NetworkBinaryStream extends BinaryStream{
 		$this->putString($image->getData());
 	}
 
-	public function getSlot() : Item{
+	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();
-		$netData = $auxValue >> 8;
-		$cnt = $auxValue & 0xff;
+		$cnt = $this->getLShort();
+		$netData = $this->getUnsignedVarInt();
 
 		[$id, $meta] = ItemTranslator::getInstance()->fromNetworkId($netId, $netData);
 
-		$nbtLen = $this->getLShort();
+		$readExtraCrapInTheMiddle($this);
 
-		/** @var CompoundTag|null $nbt */
-		$nbt = null;
-		if($nbtLen === 0xffff){
-			$nbtDataVersion = $this->getByte();
-			if($nbtDataVersion !== 1){
-				throw new \UnexpectedValueException("Unexpected NBT data version $nbtDataVersion");
+		$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")){
-			$this->getVarLong(); //"blocking tick" (ffs mojang)
-		}
-		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;
+			if($netId === ItemTypeDictionary::getInstance()->fromStringId("minecraft:shield")){
+				$extraData->getLLong(); //"blocking tick" (ffs mojang)
+			}
+			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;
+					}
 				}
 			}
-		}
-		return ItemFactory::get($id, $meta, $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;
 		}
 
-		[$netId, $netData] = ItemTranslator::getInstance()->toNetworkId($item->getId(), $item->getDamage());
+		$coreData = $item->getDamage();
+		[$netId, $netData] = ItemTranslator::getInstance()->toNetworkId($item->getId(), $coreData);
 
 		$this->putVarInt($netId);
-		$auxValue = (($netData & 0x7fff) << 8) | $item->getCount();
-		$this->putVarInt($auxValue);
+		$this->putLShort($item->getCount());
+		$this->putUnsignedVarInt($netData);
+
+		$writeExtraCrapInTheMiddle($this);
+
+		$block = $item->getBlock();
+		$this->putVarInt($block->getId() === BlockIds::AIR ? 0 : RuntimeBlockMapping::toStaticRuntimeId($block->getId(), $block->getDamage()));
 
 		$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);
@@ -279,23 +322,37 @@ class NetworkBinaryStream extends BinaryStream{
 			}else{
 				$nbt = new CompoundTag();
 			}
-			$nbt->setInt(self::DAMAGE_TAG, $item->getDamage());
+			$nbt->setInt(self::DAMAGE_TAG, $coreData);
+		}elseif($block->getId() !== BlockIds::AIR && $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($netId === ItemTypeDictionary::getInstance()->fromStringId("minecraft: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{

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

@@ -139,6 +139,9 @@ final class ItemTranslator{
 	 * @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];
 		}

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

@@ -28,7 +28,6 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\inventory\FurnaceRecipe;
 use pocketmine\inventory\ShapedRecipe;
 use pocketmine\inventory\ShapelessRecipe;
-use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\network\mcpe\convert\ItemTranslator;
 use pocketmine\network\mcpe\NetworkBinaryStream;
@@ -92,7 +91,7 @@ class CraftingDataPacket extends DataPacket{
 					$resultCount = $this->getUnsignedVarInt();
 					$entry["output"] = [];
 					for($k = 0; $k < $resultCount; ++$k){
-						$entry["output"][] = $this->getSlot();
+						$entry["output"][] = $this->getItemStackWithoutStackId();
 					}
 					$entry["uuid"] = $this->getUUID()->toString();
 					$entry["block"] = $this->getString();
@@ -114,7 +113,7 @@ class CraftingDataPacket extends DataPacket{
 					$resultCount = $this->getUnsignedVarInt();
 					$entry["output"] = [];
 					for($k = 0; $k < $resultCount; ++$k){
-						$entry["output"][] = $this->getSlot();
+						$entry["output"][] = $this->getItemStackWithoutStackId();
 					}
 					$entry["uuid"] = $this->getUUID()->toString();
 					$entry["block"] = $this->getString();
@@ -132,7 +131,7 @@ class CraftingDataPacket extends DataPacket{
 						[$inputId, $inputData] = ItemTranslator::getInstance()->fromNetworkIdWithWildcardHandling($inputIdNet, $inputMetaNet);
 					}
 					$entry["input"] = ItemFactory::get($inputId, $inputData);
-					$entry["output"] = $out = $this->getSlot();
+					$entry["output"] = $out = $this->getItemStackWithoutStackId();
 					if($out->getDamage() === 0x7fff){
 						$out->setDamage(0); //TODO HACK: some 1.12 furnace recipe outputs have wildcard damage values
 					}
@@ -199,7 +198,7 @@ class CraftingDataPacket extends DataPacket{
 		$results = $recipe->getResults();
 		$stream->putUnsignedVarInt(count($results));
 		foreach($results as $item){
-			$stream->putSlot($item);
+			$stream->putItemStackWithoutStackId($item);
 		}
 
 		$stream->put(str_repeat("\x00", 16)); //Null UUID
@@ -224,7 +223,7 @@ class CraftingDataPacket extends DataPacket{
 		$results = $recipe->getResults();
 		$stream->putUnsignedVarInt(count($results));
 		foreach($results as $item){
-			$stream->putSlot($item);
+			$stream->putItemStackWithoutStackId($item);
 		}
 
 		$stream->put(str_repeat("\x00", 16)); //Null UUID
@@ -245,7 +244,7 @@ class CraftingDataPacket extends DataPacket{
 		}
 		$stream->putVarInt($netId);
 		$stream->putVarInt($netData);
-		$stream->putSlot($recipe->getResult());
+		$stream->putItemStackWithoutStackId($recipe->getResult());
 		$stream->putString("furnace"); //TODO: blocktype (no prefix) (this might require internal API breaks)
 		return CraftingDataPacket::ENTRY_FURNACE_DATA;
 	}

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

@@ -25,8 +25,8 @@ namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\item\Item;
 use pocketmine\network\mcpe\NetworkSession;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\utils\UUID;
 use function count;
 
@@ -39,9 +39,9 @@ class CraftingEventPacket extends DataPacket{
 	public $type;
 	/** @var UUID */
 	public $id;
-	/** @var Item[] */
+	/** @var ItemStackWrapper[] */
 	public $input = [];
-	/** @var Item[] */
+	/** @var ItemStackWrapper[] */
 	public $output = [];
 
 	public function clean(){
@@ -57,12 +57,12 @@ class CraftingEventPacket extends DataPacket{
 
 		$size = $this->getUnsignedVarInt();
 		for($i = 0; $i < $size and $i < 128; ++$i){
-			$this->input[] = $this->getSlot();
+			$this->input[] = ItemStackWrapper::read($this);
 		}
 
 		$size = $this->getUnsignedVarInt();
 		for($i = 0; $i < $size and $i < 128; ++$i){
-			$this->output[] = $this->getSlot();
+			$this->output[] = ItemStackWrapper::read($this);
 		}
 	}
 
@@ -73,12 +73,12 @@ class CraftingEventPacket extends DataPacket{
 
 		$this->putUnsignedVarInt(count($this->input));
 		foreach($this->input as $item){
-			$this->putSlot($item);
+			$item->write($this);
 		}
 
 		$this->putUnsignedVarInt(count($this->output));
 		foreach($this->output as $item){
-			$this->putSlot($item);
+			$item->write($this);
 		}
 	}
 

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

@@ -48,6 +48,13 @@ class EventPacket extends DataPacket{
 	public const TYPE_CAULDRON_BLOCK_USED = 15;
 	public const TYPE_COMPOSTER_BLOCK_USED = 16;
 	public const TYPE_BELL_BLOCK_USED = 17;
+	public const TYPE_ACTOR_DEFINITION = 18;
+	public const TYPE_RAID_UPDATE = 19;
+	public const TYPE_PLAYER_MOVEMENT_ANOMALY = 20; //anti cheat
+	public const TYPE_PLAYER_MOVEMENT_CORRECTED = 21;
+	public const TYPE_HONEY_HARVESTED = 22;
+	public const TYPE_TARGET_BLOCK_HIT = 23;
+	public const TYPE_PIGLIN_BARTER = 24;
 
 	/** @var int */
 	public $playerRuntimeId;

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

@@ -25,9 +25,15 @@ namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\network\mcpe\NetworkSession;
+use pocketmine\network\mcpe\NetworkSession as PacketHandlerInterface;
 use pocketmine\network\mcpe\protocol\types\inventory\InventoryTransactionChangedSlotsHack;
-use pocketmine\network\mcpe\protocol\types\NetworkInventoryAction;
+use pocketmine\network\mcpe\protocol\types\inventory\MismatchTransactionData;
+use pocketmine\network\mcpe\protocol\types\inventory\NormalTransactionData;
+use pocketmine\network\mcpe\protocol\types\inventory\ReleaseItemTransactionData;
+use pocketmine\network\mcpe\protocol\types\inventory\TransactionData;
+use pocketmine\network\mcpe\protocol\types\inventory\UseItemOnEntityTransactionData;
+use pocketmine\network\mcpe\protocol\types\inventory\UseItemTransactionData;
+use UnexpectedValueException as PacketDecodeException;
 use function count;
 
 class InventoryTransactionPacket extends DataPacket{
@@ -39,137 +45,64 @@ class InventoryTransactionPacket extends DataPacket{
 	public const TYPE_USE_ITEM_ON_ENTITY = 3;
 	public const TYPE_RELEASE_ITEM = 4;
 
-	public const USE_ITEM_ACTION_CLICK_BLOCK = 0;
-	public const USE_ITEM_ACTION_CLICK_AIR = 1;
-	public const USE_ITEM_ACTION_BREAK_BLOCK = 2;
-
-	public const RELEASE_ITEM_ACTION_RELEASE = 0; //bow shoot
-	public const RELEASE_ITEM_ACTION_CONSUME = 1; //eat food, drink potion
-
-	public const USE_ITEM_ON_ENTITY_ACTION_INTERACT = 0;
-	public const USE_ITEM_ON_ENTITY_ACTION_ATTACK = 1;
-
 	/** @var int */
 	public $requestId;
 	/** @var InventoryTransactionChangedSlotsHack[] */
 	public $requestChangedSlots;
-
-	/** @var int */
-	public $transactionType;
-	/** @var bool */
-	public $hasItemStackIds;
-
-	/** @var NetworkInventoryAction[] */
-	public $actions = [];
-
-	/** @var \stdClass */
+	/** @var TransactionData */
 	public $trData;
 
-	protected function decodePayload(){
-		$this->requestId = $this->readGenericTypeNetworkId();
+	protected function decodePayload() : void{
+		$in = $this;
+		$this->requestId = $in->readGenericTypeNetworkId();
 		$this->requestChangedSlots = [];
 		if($this->requestId !== 0){
-			for($i = 0, $len = $this->getUnsignedVarInt(); $i < $len; ++$i){
-				$this->requestChangedSlots[] = InventoryTransactionChangedSlotsHack::read($this);
+			for($i = 0, $len = $in->getUnsignedVarInt(); $i < $len; ++$i){
+				$this->requestChangedSlots[] = InventoryTransactionChangedSlotsHack::read($in);
 			}
 		}
 
-		$this->transactionType = $this->getUnsignedVarInt();
+		$transactionType = $in->getUnsignedVarInt();
 
-		$this->hasItemStackIds = $this->getBool();
-
-		for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
-			$this->actions[] = $action = (new NetworkInventoryAction())->read($this, $this->hasItemStackIds);
-		}
-
-		$this->trData = new \stdClass();
-
-		switch($this->transactionType){
+		switch($transactionType){
 			case self::TYPE_NORMAL:
+				$this->trData = new NormalTransactionData();
+				break;
 			case self::TYPE_MISMATCH:
-				//Regular ComplexInventoryTransaction doesn't read any extra data
+				$this->trData = new MismatchTransactionData();
 				break;
 			case self::TYPE_USE_ITEM:
-				$this->trData->actionType = $this->getUnsignedVarInt();
-				$this->getBlockPosition($this->trData->x, $this->trData->y, $this->trData->z);
-				$this->trData->face = $this->getVarInt();
-				$this->trData->hotbarSlot = $this->getVarInt();
-				$this->trData->itemInHand = $this->getSlot();
-				$this->trData->playerPos = $this->getVector3();
-				$this->trData->clickPos = $this->getVector3();
-				$this->trData->blockRuntimeId = $this->getUnsignedVarInt();
+				$this->trData = new UseItemTransactionData();
 				break;
 			case self::TYPE_USE_ITEM_ON_ENTITY:
-				$this->trData->entityRuntimeId = $this->getEntityRuntimeId();
-				$this->trData->actionType = $this->getUnsignedVarInt();
-				$this->trData->hotbarSlot = $this->getVarInt();
-				$this->trData->itemInHand = $this->getSlot();
-				$this->trData->playerPos = $this->getVector3();
-				$this->trData->clickPos = $this->getVector3();
+				$this->trData = new UseItemOnEntityTransactionData();
 				break;
 			case self::TYPE_RELEASE_ITEM:
-				$this->trData->actionType = $this->getUnsignedVarInt();
-				$this->trData->hotbarSlot = $this->getVarInt();
-				$this->trData->itemInHand = $this->getSlot();
-				$this->trData->headPos = $this->getVector3();
+				$this->trData = new ReleaseItemTransactionData();
 				break;
 			default:
-				throw new \UnexpectedValueException("Unknown transaction type $this->transactionType");
+				throw new PacketDecodeException("Unknown transaction type $transactionType");
 		}
+
+		$this->trData->decode($in);
 	}
 
-	protected function encodePayload(){
-		$this->writeGenericTypeNetworkId($this->requestId);
+	protected function encodePayload() : void{
+		$out = $this;
+		$out->writeGenericTypeNetworkId($this->requestId);
 		if($this->requestId !== 0){
-			$this->putUnsignedVarInt(count($this->requestChangedSlots));
+			$out->putUnsignedVarInt(count($this->requestChangedSlots));
 			foreach($this->requestChangedSlots as $changedSlots){
-				$changedSlots->write($this);
+				$changedSlots->write($out);
 			}
 		}
 
-		$this->putUnsignedVarInt($this->transactionType);
+		$out->putUnsignedVarInt($this->trData->getTypeId());
 
-		$this->putBool($this->hasItemStackIds);
-
-		$this->putUnsignedVarInt(count($this->actions));
-		foreach($this->actions as $action){
-			$action->write($this, $this->hasItemStackIds);
-		}
-
-		switch($this->transactionType){
-			case self::TYPE_NORMAL:
-			case self::TYPE_MISMATCH:
-				break;
-			case self::TYPE_USE_ITEM:
-				$this->putUnsignedVarInt($this->trData->actionType);
-				$this->putBlockPosition($this->trData->x, $this->trData->y, $this->trData->z);
-				$this->putVarInt($this->trData->face);
-				$this->putVarInt($this->trData->hotbarSlot);
-				$this->putSlot($this->trData->itemInHand);
-				$this->putVector3($this->trData->playerPos);
-				$this->putVector3($this->trData->clickPos);
-				$this->putUnsignedVarInt($this->trData->blockRuntimeId);
-				break;
-			case self::TYPE_USE_ITEM_ON_ENTITY:
-				$this->putEntityRuntimeId($this->trData->entityRuntimeId);
-				$this->putUnsignedVarInt($this->trData->actionType);
-				$this->putVarInt($this->trData->hotbarSlot);
-				$this->putSlot($this->trData->itemInHand);
-				$this->putVector3($this->trData->playerPos);
-				$this->putVector3($this->trData->clickPos);
-				break;
-			case self::TYPE_RELEASE_ITEM:
-				$this->putUnsignedVarInt($this->trData->actionType);
-				$this->putVarInt($this->trData->hotbarSlot);
-				$this->putSlot($this->trData->itemInHand);
-				$this->putVector3($this->trData->headPos);
-				break;
-			default:
-				throw new \InvalidArgumentException("Unknown transaction type $this->transactionType");
-		}
+		$this->trData->encode($out);
 	}
 
-	public function handle(NetworkSession $session) : bool{
-		return $session->handleInventoryTransaction($this);
+	public function handle(PacketHandlerInterface $handler) : bool{
+		return $handler->handleInventoryTransaction($this);
 	}
 }

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

@@ -255,7 +255,7 @@ class LevelSoundEventPacket extends DataPacket{
 	public const SOUND_BLOCK_TURTLE_EGG_BREAK = 224;
 	public const SOUND_BLOCK_TURTLE_EGG_CRACK = 225;
 	public const SOUND_BLOCK_TURTLE_EGG_HATCH = 226;
-
+	public const SOUND_LAY_EGG = 227;
 	public const SOUND_BLOCK_TURTLE_EGG_ATTACK = 228;
 	public const SOUND_BEACON_ACTIVATE = 229;
 	public const SOUND_BEACON_AMBIENT = 230;
@@ -309,7 +309,56 @@ class LevelSoundEventPacket extends DataPacket{
 	public const SOUND_BLOCK_SMOKER_SMOKE = 278;
 	public const SOUND_BLOCK_BLASTFURNACE_FIRE_CRACKLE = 279;
 	public const SOUND_BLOCK_SMITHING_TABLE_USE = 280;
-	public const SOUND_UNDEFINED = 281;
+	public const SOUND_SCREECH = 281;
+	public const SOUND_SLEEP = 282;
+	public const SOUND_BLOCK_FURNACE_LIT = 283;
+	public const SOUND_CONVERT_MOOSHROOM = 284;
+	public const SOUND_MILK_SUSPICIOUSLY = 285;
+	public const SOUND_CELEBRATE = 286;
+	public const SOUND_JUMP_PREVENT = 287;
+	public const SOUND_AMBIENT_POLLINATE = 288;
+	public const SOUND_BLOCK_BEEHIVE_DRIP = 289;
+	public const SOUND_BLOCK_BEEHIVE_ENTER = 290;
+	public const SOUND_BLOCK_BEEHIVE_EXIT = 291;
+	public const SOUND_BLOCK_BEEHIVE_WORK = 292;
+	public const SOUND_BLOCK_BEEHIVE_SHEAR = 293;
+	public const SOUND_DRINK_HONEY = 294;
+	public const SOUND_AMBIENT_CAVE = 295;
+	public const SOUND_RETREAT = 296;
+	public const SOUND_CONVERTED_TO_ZOMBIFIED = 297;
+	public const SOUND_ADMIRE = 298;
+	public const SOUND_STEP_LAVA = 299;
+	public const SOUND_TEMPT = 300;
+	public const SOUND_PANIC = 301;
+	public const SOUND_ANGRY = 302;
+	public const SOUND_AMBIENT_WARPED_FOREST_MOOD = 303;
+	public const SOUND_AMBIENT_SOULSAND_VALLEY_MOOD = 304;
+	public const SOUND_AMBIENT_NETHER_WASTES_MOOD = 305;
+	public const SOUND_RESPAWN_ANCHOR_BASALT_DELTAS_MOOD = 306;
+	public const SOUND_AMBIENT_CRIMSON_FOREST_MOOD = 307;
+	public const SOUND_RESPAWN_ANCHOR_CHARGE = 308;
+	public const SOUND_RESPAWN_ANCHOR_DEPLETE = 309;
+	public const SOUND_RESPAWN_ANCHOR_SET_SPAWN = 310;
+	public const SOUND_RESPAWN_ANCHOR_AMBIENT = 311;
+	public const SOUND_PARTICLE_SOUL_ESCAPE_QUIET = 312;
+	public const SOUND_PARTICLE_SOUL_ESCAPE_LOUD = 313;
+	public const SOUND_RECORD_PIGSTEP = 314;
+	public const SOUND_LODESTONE_COMPASS_LINK_COMPASS_TO_LODESTONE = 315;
+	public const SOUND_SMITHING_TABLE_USE = 316;
+	public const SOUND_ARMOR_EQUIP_NETHERITE = 317;
+	public const SOUND_AMBIENT_WARPED_FOREST_LOOP = 318;
+	public const SOUND_AMBIENT_SOULSAND_VALLEY_LOOP = 319;
+	public const SOUND_AMBIENT_NETHER_WASTES_LOOP = 320;
+	public const SOUND_AMBIENT_BASALT_DELTAS_LOOP = 321;
+	public const SOUND_AMBIENT_CRIMSON_FOREST_LOOP = 322;
+	public const SOUND_AMBIENT_WARPED_FOREST_ADDITIONS = 323;
+	public const SOUND_AMBIENT_SOULSAND_VALLEY_ADDITIONS = 324;
+	public const SOUND_AMBIENT_NETHER_WASTES_ADDITIONS = 325;
+	public const SOUND_AMBIENT_BASALT_DELTAS_ADDITIONS = 326;
+	public const SOUND_AMBIENT_CRIMSON_FOREST_ADDITIONS = 327;
+	public const SOUND_BUCKET_FILL_POWDER_SNOW = 328;
+	public const SOUND_BUCKET_EMPTY_POWDER_SNOW = 329;
+	public const SOUND_UNDEFINED = 330;
 
 	/** @var int */
 	public $sound;

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

@@ -25,8 +25,8 @@ namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\item\Item;
 use pocketmine\network\mcpe\NetworkSession;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 
 class MobArmorEquipmentPacket extends DataPacket{
 	public const NETWORK_ID = ProtocolInfo::MOB_ARMOR_EQUIPMENT_PACKET;
@@ -36,29 +36,29 @@ class MobArmorEquipmentPacket extends DataPacket{
 
 	//this intentionally doesn't use an array because we don't want any implicit dependencies on internal order
 
-	/** @var Item */
+	/** @var ItemStackWrapper */
 	public $head;
-	/** @var Item */
+	/** @var ItemStackWrapper */
 	public $chest;
-	/** @var Item */
+	/** @var ItemStackWrapper */
 	public $legs;
-	/** @var Item */
+	/** @var ItemStackWrapper */
 	public $feet;
 
 	protected function decodePayload(){
 		$this->entityRuntimeId = $this->getEntityRuntimeId();
-		$this->head = $this->getSlot();
-		$this->chest = $this->getSlot();
-		$this->legs = $this->getSlot();
-		$this->feet = $this->getSlot();
+		$this->head = ItemStackWrapper::read($this);
+		$this->chest = ItemStackWrapper::read($this);
+		$this->legs = ItemStackWrapper::read($this);
+		$this->feet = ItemStackWrapper::read($this);
 	}
 
 	protected function encodePayload(){
 		$this->putEntityRuntimeId($this->entityRuntimeId);
-		$this->putSlot($this->head);
-		$this->putSlot($this->chest);
-		$this->putSlot($this->legs);
-		$this->putSlot($this->feet);
+		$this->head->write($this);
+		$this->chest->write($this);
+		$this->legs->write($this);
+		$this->feet->write($this);
 	}
 
 	public function handle(NetworkSession $session) : bool{

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

@@ -25,15 +25,15 @@ namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\item\Item;
 use pocketmine\network\mcpe\NetworkSession;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 
 class MobEquipmentPacket extends DataPacket{
 	public const NETWORK_ID = ProtocolInfo::MOB_EQUIPMENT_PACKET;
 
 	/** @var int */
 	public $entityRuntimeId;
-	/** @var Item */
+	/** @var ItemStackWrapper */
 	public $item;
 	/** @var int */
 	public $inventorySlot;
@@ -44,7 +44,7 @@ class MobEquipmentPacket extends DataPacket{
 
 	protected function decodePayload(){
 		$this->entityRuntimeId = $this->getEntityRuntimeId();
-		$this->item = $this->getSlot();
+		$this->item = ItemStackWrapper::read($this);
 		$this->inventorySlot = $this->getByte();
 		$this->hotbarSlot = $this->getByte();
 		$this->windowId = $this->getByte();
@@ -52,7 +52,7 @@ class MobEquipmentPacket extends DataPacket{
 
 	protected function encodePayload(){
 		$this->putEntityRuntimeId($this->entityRuntimeId);
-		$this->putSlot($this->item);
+		$this->item->write($this);
 		$this->putByte($this->inventorySlot);
 		$this->putByte($this->hotbarSlot);
 		$this->putByte($this->windowId);

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

@@ -28,6 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\types\InputMode;
+use pocketmine\network\mcpe\protocol\types\PlayerAuthInputFlags;
 use pocketmine\network\mcpe\protocol\types\PlayMode;
 use function assert;
 
@@ -60,6 +61,7 @@ class PlayerAuthInputPacket extends DataPacket/* implements ServerboundPacket*/{
 	private $delta;
 
 	/**
+	 * @param int          $inputFlags @see InputFlags
 	 * @param int          $inputMode @see InputMode
 	 * @param int          $playMode @see PlayMode
 	 * @param Vector3|null $vrGazeDirection only used when PlayMode::VR
@@ -111,6 +113,9 @@ class PlayerAuthInputPacket extends DataPacket/* implements ServerboundPacket*/{
 		return $this->moveVecZ;
 	}
 
+	/**
+	 * @see PlayerAuthInputFlags
+	 */
 	public function getInputFlags() : int{
 		return $this->inputFlags;
 	}

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

@@ -37,11 +37,11 @@ interface ProtocolInfo{
 	 */
 
 	/** Actual Minecraft: PE protocol version */
-	public const CURRENT_PROTOCOL = 428;
+	public const CURRENT_PROTOCOL = 431;
 	/** Current Minecraft PE version reported by the server. This is usually the earliest currently supported version. */
-	public const MINECRAFT_VERSION = 'v1.16.210';
+	public const MINECRAFT_VERSION = 'v1.16.220';
 	/** Version number sent to clients in ping responses. */
-	public const MINECRAFT_VERSION_NETWORK = '1.16.210';
+	public const MINECRAFT_VERSION_NETWORK = '1.16.220';
 
 	public const LOGIN_PACKET = 0x01;
 	public const PLAY_STATUS_PACKET = 0x02;

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

@@ -36,6 +36,9 @@ class SetTitlePacket extends DataPacket{
 	public const TYPE_SET_SUBTITLE = 3;
 	public const TYPE_SET_ACTIONBAR_MESSAGE = 4;
 	public const TYPE_SET_ANIMATION_TIMES = 5;
+	public const TYPE_SET_TITLE_JSON = 6;
+	public const TYPE_SET_SUBTITLE_JSON = 7;
+	public const TYPE_SET_ACTIONBAR_MESSAGE_JSON = 8;
 
 	/** @var int */
 	public $type;

src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php

@@ -30,6 +30,7 @@ use pocketmine\inventory\transaction\action\InventoryAction;
 use pocketmine\inventory\transaction\action\SlotChangeAction;
 use pocketmine\item\Item;
 use pocketmine\network\mcpe\NetworkBinaryStream;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\network\mcpe\protocol\types\inventory\UIInventorySlotOffset;
 use pocketmine\Player;
 use function array_key_exists;
@@ -79,17 +80,15 @@ class NetworkInventoryAction{
 	public $sourceFlags = 0;
 	/** @var int */
 	public $inventorySlot;
-	/** @var Item */
+	/** @var ItemStackWrapper */
 	public $oldItem;
-	/** @var Item */
+	/** @var ItemStackWrapper */
 	public $newItem;
-	/** @var int|null */
-	public $newItemStackId = null;
 
 	/**
 	 * @return $this
 	 */
-	public function read(NetworkBinaryStream $packet, bool $hasItemStackIds){
+	public function read(NetworkBinaryStream $packet){
 		$this->sourceType = $packet->getUnsignedVarInt();
 
 		switch($this->sourceType){
@@ -109,11 +108,8 @@ class NetworkInventoryAction{
 		}
 
 		$this->inventorySlot = $packet->getUnsignedVarInt();
-		$this->oldItem = $packet->getSlot();
-		$this->newItem = $packet->getSlot();
-		if($hasItemStackIds){
-			$this->newItemStackId = $packet->readGenericTypeNetworkId();
-		}
+		$this->oldItem = ItemStackWrapper::read($packet);
+		$this->newItem = ItemStackWrapper::read($packet);
 
 		return $this;
 	}
@@ -121,7 +117,7 @@ class NetworkInventoryAction{
 	/**
 	 * @return void
 	 */
-	public function write(NetworkBinaryStream $packet, bool $hasItemStackIds){
+	public function write(NetworkBinaryStream $packet){
 		$packet->putUnsignedVarInt($this->sourceType);
 
 		switch($this->sourceType){
@@ -141,14 +137,8 @@ class NetworkInventoryAction{
 		}
 
 		$packet->putUnsignedVarInt($this->inventorySlot);
-		$packet->putSlot($this->oldItem);
-		$packet->putSlot($this->newItem);
-		if($hasItemStackIds){
-			if($this->newItemStackId === null){
-				throw new \InvalidStateException("Item stack ID for newItem must be provided");
-			}
-			$packet->writeGenericTypeNetworkId($this->newItemStackId);
-		}
+		$this->oldItem->write($packet);
+		$this->newItem->write($packet);
 	}
 
 	/**
@@ -157,7 +147,9 @@ class NetworkInventoryAction{
 	 * @throws \UnexpectedValueException
 	 */
 	public function createInventoryAction(Player $player){
-		if($this->oldItem->equalsExact($this->newItem)){
+		$oldItem = $this->oldItem->getItemStack();
+		$newItem = $this->newItem->getItemStack();
+		if($oldItem->equalsExact($newItem)){
 			//filter out useless noise in 1.13
 			return null;
 		}
@@ -187,7 +179,7 @@ class NetworkInventoryAction{
 					$slot = $this->inventorySlot;
 				}
 				if($window !== null){
-					return new SlotChangeAction($window, $slot, $this->oldItem, $this->newItem);
+					return new SlotChangeAction($window, $slot, $oldItem, $newItem);
 				}
 
 				throw new \UnexpectedValueException("Player " . $player->getName() . " has no open container with window ID $this->windowId");
@@ -196,7 +188,7 @@ class NetworkInventoryAction{
 					throw new \UnexpectedValueException("Only expecting drop-item world actions from the client!");
 				}
 
-				return new DropItemAction($this->newItem);
+				return new DropItemAction($newItem);
 			case self::SOURCE_CREATIVE:
 				switch($this->inventorySlot){
 					case self::ACTION_MAGIC_SLOT_CREATIVE_DELETE_ITEM:
@@ -210,7 +202,7 @@ class NetworkInventoryAction{
 
 				}
 
-				return new CreativeInventoryAction($this->oldItem, $this->newItem, $type);
+				return new CreativeInventoryAction($oldItem, $newItem, $type);
 			case self::SOURCE_TODO:
 				//These types need special handling.
 				switch($this->windowId){

src/pocketmine/network/mcpe/protocol/types/PlayerAuthInputFlags.php

@@ -0,0 +1,75 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\network\mcpe\protocol\types;
+
+use pocketmine\network\mcpe\protocol\PlayerAuthInputPacket;
+
+/**
+ * These flags are used in PlayerAuthInputPacket's inputFlags field.
+ * The flags should be written as
+ * `flags |= (1 << flag)`
+ * and read as
+ * `(flags & (1 & flag)) !== 0`
+ *
+ * @see PlayerAuthInputPacket
+ */
+final class PlayerAuthInputFlags{
+	public const ASCEND = 0;
+	public const DESCEND = 1;
+	public const NORTH_JUMP = 2;
+	public const JUMP_DOWN = 3;
+	public const SPRINT_DOWN = 4;
+	public const CHANGE_HEIGHT = 5;
+	public const JUMPING = 6;
+	public const AUTO_JUMPING_IN_WATER = 7;
+	public const SNEAKING = 8;
+	public const SNEAK_DOWN = 9;
+	public const UP = 10;
+	public const DOWN = 11;
+	public const LEFT = 12;
+	public const RIGHT = 13;
+	public const UP_LEFT = 14;
+	public const UP_RIGHT = 15;
+	public const WANT_UP = 16;
+	public const WANT_DOWN = 17;
+	public const WANT_DOWN_SLOW = 18;
+	public const WANT_UP_SLOW = 19;
+	public const SPRINTING = 20;
+	public const ASCEND_SCAFFOLDING = 21;
+	public const DESCEND_SCAFFOLDING = 22;
+	public const SNEAK_TOGGLE_DOWN = 23;
+	public const PERSIST_SNEAK = 24;
+	public const START_SPRINTING = 25;
+	public const STOP_SPRINTING = 26;
+	public const START_SNEAKING = 27;
+	public const STOP_SNEAKING = 28;
+	public const START_SWIMMING = 29;
+	public const STOP_SWIMMING = 30;
+	public const START_JUMPING = 31;
+	public const START_GLIDING = 32;
+	public const STOP_GLIDING = 33;
+	public const PERFORM_ITEM_INTERACTION = 34;
+	public const PERFORM_BLOCK_ACTIONS = 35;
+	public const PERFORM_ITEM_STACK_REQUEST = 36;
+}

src/pocketmine/network/mcpe/protocol/types/inventory/CreativeContentEntry.php

@@ -44,12 +44,12 @@ final class CreativeContentEntry{
 
 	public static function read(NetworkBinaryStream $in) : self{
 		$entryId = $in->readGenericTypeNetworkId();
-		$item = $in->getSlot();
+		$item = $in->getItemStackWithoutStackId();
 		return new self($entryId, $item);
 	}
 
 	public function write(NetworkBinaryStream $out) : void{
 		$out->writeGenericTypeNetworkId($this->entryId);
-		$out->putSlot($this->item);
+		$out->putItemStackWithoutStackId($this->item);
 	}
 }

src/pocketmine/network/mcpe/protocol/types/inventory/ItemStackWrapper.php

@@ -47,13 +47,22 @@ final class ItemStackWrapper{
 	public function getItemStack() : Item{ return $this->itemStack; }
 
 	public static function read(NetworkBinaryStream $in) : self{
-		$stackId = $in->readGenericTypeNetworkId();
-		$stack = $in->getSlot();
+		$stackId = 0;
+		$stack = $in->getItemStack(function(NetworkBinaryStream $in) use (&$stackId) : void{
+			$hasNetId = $in->getBool();
+			if($hasNetId){
+				$stackId = $in->readGenericTypeNetworkId();
+			}
+		});
 		return new self($stackId, $stack);
 	}
 
 	public function write(NetworkBinaryStream $out) : void{
-		$out->writeGenericTypeNetworkId($this->stackId);
-		$out->putSlot($this->itemStack);
+		$out->putItemStack($this->itemStack, function(NetworkBinaryStream $out) : void{
+			$out->putBool($this->stackId !== 0);
+			if($this->stackId !== 0){
+				$out->writeGenericTypeNetworkId($this->stackId);
+			}
+		});
 	}
 }

src/pocketmine/network/mcpe/protocol/types/inventory/MismatchTransactionData.php

@@ -0,0 +1,50 @@
+<?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\types\inventory;
+
+use pocketmine\network\mcpe\NetworkBinaryStream as PacketSerializer;
+use pocketmine\network\mcpe\protocol\InventoryTransactionPacket;
+use UnexpectedValueException as PacketDecodeException;
+use function count;
+
+class MismatchTransactionData extends TransactionData{
+
+	public function getTypeId() : int{
+		return InventoryTransactionPacket::TYPE_MISMATCH;
+	}
+
+	protected function decodeData(PacketSerializer $stream) : void{
+		if(count($this->actions) > 0){
+			throw new PacketDecodeException("Mismatch transaction type should not have any actions associated with it, but got " . count($this->actions));
+		}
+	}
+
+	protected function encodeData(PacketSerializer $stream) : void{
+
+	}
+
+	public static function new() : self{
+		return new self; //no arguments
+	}
+}

src/pocketmine/network/mcpe/protocol/types/inventory/NormalTransactionData.php

@@ -0,0 +1,54 @@
+<?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\types\inventory;
+
+use pocketmine\network\mcpe\NetworkBinaryStream as PacketSerializer;
+use pocketmine\network\mcpe\protocol\InventoryTransactionPacket;
+use pocketmine\network\mcpe\protocol\types\NetworkInventoryAction;
+
+class NormalTransactionData extends TransactionData{
+
+	public function getTypeId() : int{
+		return InventoryTransactionPacket::TYPE_NORMAL;
+	}
+
+	protected function decodeData(PacketSerializer $stream) : void{
+
+	}
+
+	protected function encodeData(PacketSerializer $stream) : void{
+
+	}
+
+	/**
+	 * @param NetworkInventoryAction[] $actions
+	 *
+	 * @return NormalTransactionData
+	 */
+	public static function new(array $actions) : self{
+		$result = new self();
+		$result->actions = $actions;
+		return $result;
+	}
+}

src/pocketmine/network/mcpe/protocol/types/inventory/ReleaseItemTransactionData.php

@@ -0,0 +1,91 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\network\mcpe\protocol\types\inventory;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\NetworkBinaryStream as PacketSerializer;
+use pocketmine\network\mcpe\protocol\InventoryTransactionPacket;
+use pocketmine\network\mcpe\protocol\types\NetworkInventoryAction;
+
+class ReleaseItemTransactionData extends TransactionData{
+	public const ACTION_RELEASE = 0; //bow shoot
+	public const ACTION_CONSUME = 1; //eat food, drink potion
+
+	/** @var int */
+	private $actionType;
+	/** @var int */
+	private $hotbarSlot;
+	/** @var ItemStackWrapper */
+	private $itemInHand;
+	/** @var Vector3 */
+	private $headPos;
+
+	public function getActionType() : int{
+		return $this->actionType;
+	}
+
+	public function getHotbarSlot() : int{
+		return $this->hotbarSlot;
+	}
+
+	public function getItemInHand() : ItemStackWrapper{
+		return $this->itemInHand;
+	}
+
+	public function getHeadPos() : Vector3{
+		return $this->headPos;
+	}
+
+	public function getTypeId() : int{
+		return InventoryTransactionPacket::TYPE_RELEASE_ITEM;
+	}
+
+	protected function decodeData(PacketSerializer $stream) : void{
+		$this->actionType = $stream->getUnsignedVarInt();
+		$this->hotbarSlot = $stream->getVarInt();
+		$this->itemInHand = ItemStackWrapper::read($stream);
+		$this->headPos = $stream->getVector3();
+	}
+
+	protected function encodeData(PacketSerializer $stream) : void{
+		$stream->putUnsignedVarInt($this->actionType);
+		$stream->putVarInt($this->hotbarSlot);
+		$this->itemInHand->write($stream);
+		$stream->putVector3($this->headPos);
+	}
+
+	/**
+	 * @param NetworkInventoryAction[] $actions
+	 */
+	public static function new(array $actions, int $actionType, int $hotbarSlot, ItemStackWrapper $itemInHand, Vector3 $headPos) : self{
+		$result = new self;
+		$result->actions = $actions;
+		$result->actionType = $actionType;
+		$result->hotbarSlot = $hotbarSlot;
+		$result->itemInHand = $itemInHand;
+		$result->headPos = $headPos;
+
+		return $result;
+	}
+}

src/pocketmine/network/mcpe/protocol/types/inventory/TransactionData.php

@@ -0,0 +1,72 @@
+<?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\types\inventory;
+
+use pocketmine\network\mcpe\NetworkBinaryStream as PacketSerializer;
+use pocketmine\network\mcpe\protocol\types\NetworkInventoryAction;
+use pocketmine\utils\BinaryDataException;
+use UnexpectedValueException as PacketDecodeException;
+use function count;
+
+abstract class TransactionData{
+	/** @var NetworkInventoryAction[] */
+	protected $actions = [];
+
+	/**
+	 * @return NetworkInventoryAction[]
+	 */
+	final public function getActions() : array{
+		return $this->actions;
+	}
+
+	abstract public function getTypeId() : int;
+
+	/**
+	 * @throws BinaryDataException
+	 * @throws PacketDecodeException
+	 */
+	final public function decode(PacketSerializer $stream) : void{
+		$actionCount = $stream->getUnsignedVarInt();
+		for($i = 0; $i < $actionCount; ++$i){
+			$this->actions[] = (new NetworkInventoryAction())->read($stream);
+		}
+		$this->decodeData($stream);
+	}
+
+	/**
+	 * @throws BinaryDataException
+	 * @throws PacketDecodeException
+	 */
+	abstract protected function decodeData(PacketSerializer $stream) : void;
+
+	final public function encode(PacketSerializer $stream) : void{
+		$stream->putUnsignedVarInt(count($this->actions));
+		foreach($this->actions as $action){
+			$action->write($stream);
+		}
+		$this->encodeData($stream);
+	}
+
+	abstract protected function encodeData(PacketSerializer $stream) : void;
+}

src/pocketmine/network/mcpe/protocol/types/inventory/UseItemOnEntityTransactionData.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\types\inventory;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\NetworkBinaryStream as PacketSerializer;
+use pocketmine\network\mcpe\protocol\InventoryTransactionPacket;
+use pocketmine\network\mcpe\protocol\types\NetworkInventoryAction;
+
+class UseItemOnEntityTransactionData extends TransactionData{
+	public const ACTION_INTERACT = 0;
+	public const ACTION_ATTACK = 1;
+
+	/** @var int */
+	private $entityRuntimeId;
+	/** @var int */
+	private $actionType;
+	/** @var int */
+	private $hotbarSlot;
+	/** @var ItemStackWrapper */
+	private $itemInHand;
+	/** @var Vector3 */
+	private $playerPos;
+	/** @var Vector3 */
+	private $clickPos;
+
+	public function getEntityRuntimeId() : int{
+		return $this->entityRuntimeId;
+	}
+
+	public function getActionType() : int{
+		return $this->actionType;
+	}
+
+	public function getHotbarSlot() : int{
+		return $this->hotbarSlot;
+	}
+
+	public function getItemInHand() : ItemStackWrapper{
+		return $this->itemInHand;
+	}
+
+	public function getPlayerPos() : Vector3{
+		return $this->playerPos;
+	}
+
+	public function getClickPos() : Vector3{
+		return $this->clickPos;
+	}
+
+	public function getTypeId() : int{
+		return InventoryTransactionPacket::TYPE_USE_ITEM_ON_ENTITY;
+	}
+
+	protected function decodeData(PacketSerializer $stream) : void{
+		$this->entityRuntimeId = $stream->getEntityRuntimeId();
+		$this->actionType = $stream->getUnsignedVarInt();
+		$this->hotbarSlot = $stream->getVarInt();
+		$this->itemInHand = ItemStackWrapper::read($stream);
+		$this->playerPos = $stream->getVector3();
+		$this->clickPos = $stream->getVector3();
+	}
+
+	protected function encodeData(PacketSerializer $stream) : void{
+		$stream->putEntityRuntimeId($this->entityRuntimeId);
+		$stream->putUnsignedVarInt($this->actionType);
+		$stream->putVarInt($this->hotbarSlot);
+		$this->itemInHand->write($stream);
+		$stream->putVector3($this->playerPos);
+		$stream->putVector3($this->clickPos);
+	}
+
+	/**
+	 * @param NetworkInventoryAction[] $actions
+	 */
+	public static function new(array $actions, int $entityRuntimeId, int $actionType, int $hotbarSlot, ItemStackWrapper $itemInHand, Vector3 $playerPos, Vector3 $clickPos) : self{
+		$result = new self;
+		$result->actions = $actions;
+		$result->entityRuntimeId = $entityRuntimeId;
+		$result->actionType = $actionType;
+		$result->hotbarSlot = $hotbarSlot;
+		$result->itemInHand = $itemInHand;
+		$result->playerPos = $playerPos;
+		$result->clickPos = $clickPos;
+		return $result;
+	}
+}

src/pocketmine/network/mcpe/protocol/types/inventory/UseItemTransactionData.php

@@ -0,0 +1,129 @@
+<?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\types\inventory;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\NetworkBinaryStream as PacketSerializer;
+use pocketmine\network\mcpe\protocol\InventoryTransactionPacket;
+use pocketmine\network\mcpe\protocol\types\NetworkInventoryAction;
+
+class UseItemTransactionData extends TransactionData{
+	public const ACTION_CLICK_BLOCK = 0;
+	public const ACTION_CLICK_AIR = 1;
+	public const ACTION_BREAK_BLOCK = 2;
+
+	/** @var int */
+	private $actionType;
+	/** @var Vector3 */
+	private $blockPos;
+	/** @var int */
+	private $face;
+	/** @var int */
+	private $hotbarSlot;
+	/** @var ItemStackWrapper */
+	private $itemInHand;
+	/** @var Vector3 */
+	private $playerPos;
+	/** @var Vector3 */
+	private $clickPos;
+	/** @var int */
+	private $blockRuntimeId;
+
+	public function getActionType() : int{
+		return $this->actionType;
+	}
+
+	public function getBlockPos() : Vector3{
+		return $this->blockPos;
+	}
+
+	public function getFace() : int{
+		return $this->face;
+	}
+
+	public function getHotbarSlot() : int{
+		return $this->hotbarSlot;
+	}
+
+	public function getItemInHand() : ItemStackWrapper{
+		return $this->itemInHand;
+	}
+
+	public function getPlayerPos() : Vector3{
+		return $this->playerPos;
+	}
+
+	public function getClickPos() : Vector3{
+		return $this->clickPos;
+	}
+
+	public function getBlockRuntimeId() : int{
+		return $this->blockRuntimeId;
+	}
+
+	public function getTypeId() : int{
+		return InventoryTransactionPacket::TYPE_USE_ITEM;
+	}
+
+	protected function decodeData(PacketSerializer $stream) : void{
+		$this->actionType = $stream->getUnsignedVarInt();
+		$x = $y = $z = 0;
+		$stream->getBlockPosition($x, $y, $z);
+		$this->blockPos = new Vector3($x, $y, $z);
+		$this->face = $stream->getVarInt();
+		$this->hotbarSlot = $stream->getVarInt();
+		$this->itemInHand = ItemStackWrapper::read($stream);
+		$this->playerPos = $stream->getVector3();
+		$this->clickPos = $stream->getVector3();
+		$this->blockRuntimeId = $stream->getUnsignedVarInt();
+	}
+
+	protected function encodeData(PacketSerializer $stream) : void{
+		$stream->putUnsignedVarInt($this->actionType);
+		$stream->putBlockPosition($this->blockPos->x, $this->blockPos->y, $this->blockPos->z);
+		$stream->putVarInt($this->face);
+		$stream->putVarInt($this->hotbarSlot);
+		$this->itemInHand->write($stream);
+		$stream->putVector3($this->playerPos);
+		$stream->putVector3($this->clickPos);
+		$stream->putUnsignedVarInt($this->blockRuntimeId);
+	}
+
+	/**
+	 * @param NetworkInventoryAction[] $actions
+	 */
+	public static function new(array $actions, int $actionType, Vector3 $blockPos, int $face, int $hotbarSlot, ItemStackWrapper $itemInHand, Vector3 $playerPos, Vector3 $clickPos, int $blockRuntimeId) : self{
+		$result = new self;
+		$result->actions = $actions;
+		$result->actionType = $actionType;
+		$result->blockPos = $blockPos;
+		$result->face = $face;
+		$result->hotbarSlot = $hotbarSlot;
+		$result->itemInHand = $itemInHand;
+		$result->playerPos = $playerPos;
+		$result->clickPos = $clickPos;
+		$result->blockRuntimeId = $blockRuntimeId;
+		return $result;
+	}
+}

src/pocketmine/network/mcpe/protocol/types/inventory/stackrequest/DeprecatedCraftingResultsStackRequestAction.php

@@ -58,7 +58,7 @@ final class DeprecatedCraftingResultsStackRequestAction extends ItemStackRequest
 	public static function read(NetworkBinaryStream $in) : self{
 		$results = [];
 		for($i = 0, $len = $in->getUnsignedVarInt(); $i < $len; ++$i){
-			$results[] = $in->getSlot();
+			$results[] = $in->getItemStackWithoutStackId();
 		}
 		$iterations = $in->getByte();
 		return new self($results, $iterations);
@@ -67,7 +67,7 @@ final class DeprecatedCraftingResultsStackRequestAction extends ItemStackRequest
 	public function write(NetworkBinaryStream $out) : void{
 		$out->putUnsignedVarInt(count($this->results));
 		foreach($this->results as $result){
-			$out->putSlot($result);
+			$out->putItemStackWithoutStackId($result);
 		}
 		$out->putByte($this->iterations);
 	}

src/pocketmine/network/upnp/UPnP.php

@@ -19,63 +19,238 @@
  *
 */
 
+// This code is based on a Go implementation and its license is below:
+// Copyright (c) 2010 Jack Palevich. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 declare(strict_types=1);
 
 /**
- * UPnP port forwarding support. Only for Windows
+ * UPnP port forwarding support.
  */
 namespace pocketmine\network\upnp;
 
+use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Internet;
-use pocketmine\utils\Utils;
-use function class_exists;
-use function is_object;
+use function count;
+use function libxml_use_internal_errors;
+use function parse_url;
+use function preg_last_error;
+use function preg_match;
+use function socket_close;
+use function socket_create;
+use function socket_last_error;
+use function socket_recvfrom;
+use function socket_sendto;
+use function socket_set_option;
+use function socket_strerror;
+use function sprintf;
+use function strlen;
+use function trim;
+use const AF_INET;
+use const SO_RCVTIMEO;
+use const SOCK_DGRAM;
+use const SOCKET_ETIMEDOUT;
+use const SOL_SOCKET;
+use const SOL_UDP;
 
 abstract class UPnP{
+	private const MAX_DISCOVERY_ATTEMPTS = 3;
+
+	/** @var string|null */
+	private static $serviceURL = null;
+
+	private static function makePcreError() : \RuntimeException{
+		$errorCode = preg_last_error();
+		$message = [
+			PREG_INTERNAL_ERROR => "Internal error",
+			PREG_BACKTRACK_LIMIT_ERROR => "Backtrack limit reached",
+			PREG_RECURSION_LIMIT_ERROR => "Recursion limit reached",
+			PREG_BAD_UTF8_ERROR => "Malformed UTF-8",
+			PREG_BAD_UTF8_OFFSET_ERROR => "Bad UTF-8 offset",
+			PREG_JIT_STACKLIMIT_ERROR => "PCRE JIT stack limit reached"
+		][$errorCode] ?? "Unknown (code $errorCode)";
+		throw new \RuntimeException("PCRE error: $message");
+	}
+
+	public static function getServiceUrl() : string{
+		$socket = @socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
+		if($socket === false){
+			throw new \RuntimeException("Socket error: " . trim(socket_strerror(socket_last_error())));
+		}
+		if(!@socket_set_option($socket, SOL_SOCKET, SO_RCVTIMEO, ["sec" => 3, "usec" => 0])){
+			throw new \RuntimeException("Socket error: " . trim(socket_strerror(socket_last_error($socket))));
+		}
+		$contents =
+			"M-SEARCH * HTTP/1.1\r\n" .
+			"MX: 2\r\n" .
+			"HOST: 239.255.255.250:1900\r\n" .
+			"MAN: \"ssdp:discover\"\r\n" .
+			"ST: upnp:rootdevice\r\n\r\n";
+		$location = null;
+		for($i = 0; $i < self::MAX_DISCOVERY_ATTEMPTS; ++$i){
+			$sendbyte = @socket_sendto($socket, $contents, strlen($contents), 0, "239.255.255.250", 1900);
+			if($sendbyte === false){
+				throw new \RuntimeException("Socket error: " . trim(socket_strerror(socket_last_error($socket))));
+			}
+			if($sendbyte !== strlen($contents)){
+				throw new \RuntimeException("Socket error: Unable to send the entire contents.");
+			}
+			while(true){
+				if(@socket_recvfrom($socket, $buffer, 1024, 0, $responseHost, $responsePort) === false){
+					if(socket_last_error($socket) === SOCKET_ETIMEDOUT){
+						continue 2;
+					}
+					throw new \RuntimeException("Socket error: " . trim(socket_strerror(socket_last_error($socket))));
+				}
+				$pregResult = preg_match('/location\s*:\s*(.+)\n/i', $buffer, $matches);
+				if($pregResult === false){
+					//TODO: replace with preg_last_error_msg() in PHP 8.
+					throw self::makePcreError();
+				}
+				if($pregResult !== 0){ //this might be garbage from somewhere other than the router
+					$location = trim($matches[1]);
+					break 2;
+				}
+			}
+		}
+		socket_close($socket);
+		if($location === null){
+			throw new \RuntimeException("Unable to find the router. Ensure that network discovery is enabled in Control Panel.");
+		}
+		$url = parse_url($location);
+		if($url === false){
+			throw new \RuntimeException("Failed to parse the router's url: {$location}");
+		}
+		if(!isset($url['host'])){
+			throw new \RuntimeException("Failed to recognize the host name from the router's url: {$location}");
+		}
+		$urlHost = $url['host'];
+		if(!isset($url['port'])){
+			throw new \RuntimeException("Failed to recognize the port number from the router's url: {$location}");
+		}
+		$urlPort = $url['port'];
+		$response = Internet::getURL($location, 3, [], $err, $headers, $httpCode);
+		if($response === false){
+			throw new \RuntimeException("Unable to access XML: {$err}");
+		}
+		if($httpCode !== 200){
+			throw new \RuntimeException("Unable to access XML: {$response}");
+		}
+
+		$defaultInternalError = libxml_use_internal_errors(true);
+		try{
+			$root = new \SimpleXMLElement($response);
+		}catch(\Exception $e){
+			throw new \RuntimeException("Broken XML.");
+		}
+		libxml_use_internal_errors($defaultInternalError);
+		$root->registerXPathNamespace("upnp", "urn:schemas-upnp-org:device-1-0");
+		$xpathResult = $root->xpath(
+			'//upnp:device[upnp:deviceType="urn:schemas-upnp-org:device:InternetGatewayDevice:1"]' .
+			'/upnp:deviceList/upnp:device[upnp:deviceType="urn:schemas-upnp-org:device:WANDevice:1"]' .
+			'/upnp:deviceList/upnp:device[upnp:deviceType="urn:schemas-upnp-org:device:WANConnectionDevice:1"]' .
+			'/upnp:serviceList/upnp:service[upnp:serviceType="urn:schemas-upnp-org:service:WANIPConnection:1"]' .
+			'/upnp:controlURL'
+		);
+		if($xpathResult === false){
+			//this should be an array of 0 if there is no matching elements; false indicates a problem with the query itself
+			throw new AssumptionFailedError("xpath query should not error here");
+		}
+		if(count($xpathResult) === 0){
+			throw new \RuntimeException("Your router does not support portforwarding");
+		}
+		$controlURL = (string) $xpathResult[0];
+		$serviceURL = sprintf("%s:%d/%s", $urlHost, $urlPort, $controlURL);
+		return $serviceURL;
+	}
 
 	public static function PortForward(int $port) : void{
 		if(!Internet::$online){
 			throw new \RuntimeException("Server is offline");
 		}
-		if(Utils::getOS() !== Utils::OS_WINDOWS){
-			throw new \RuntimeException("UPnP is only supported on Windows");
+
+		if(self::$serviceURL === null){
+			self::$serviceURL = self::getServiceUrl();
 		}
-		if(!class_exists("COM")){
-			throw new \RuntimeException("UPnP requires the com_dotnet extension");
+		$body =
+			'<u:AddPortMapping xmlns:u="urn:schemas-upnp-org:service:WANIPConnection:1">' .
+				'<NewRemoteHost></NewRemoteHost>' .
+				'<NewExternalPort>' . $port . '</NewExternalPort>' .
+				'<NewProtocol>UDP</NewProtocol>' .
+				'<NewInternalPort>' . $port . '</NewInternalPort>' .
+				'<NewInternalClient>' . Internet::getInternalIP() . '</NewInternalClient>' .
+				'<NewEnabled>1</NewEnabled>' .
+				'<NewPortMappingDescription>PocketMine-MP</NewPortMappingDescription>' .
+				'<NewLeaseDuration>0</NewLeaseDuration>' .
+			'</u:AddPortMapping>';
+
+		$contents =
+			'<?xml version="1.0"?>' .
+			'<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">' .
+			'<s:Body>' . $body . '</s:Body></s:Envelope>';
+
+		$headers = [
+			'Content-Type: text/xml',
+			'SOAPAction: "urn:schemas-upnp-org:service:WANIPConnection:1#AddPortMapping"'
+		];
+
+		if(Internet::postURL(self::$serviceURL, $contents, 3, $headers, $err) === false){
+			throw new \RuntimeException("Failed to portforward using UPnP: " . $err);
 		}
-
-		$myLocalIP = Internet::getInternalIP();
-
-		/** @noinspection PhpUndefinedClassInspection */
-		$com = new \COM("HNetCfg.NATUPnP");
-		/** @noinspection PhpUndefinedFieldInspection */
-
-		if(!is_object($com->StaticPortMappingCollection)){
-			throw new \RuntimeException("Failed to portforward using UPnP. Ensure that network discovery is enabled in Control Panel.");
-		}
-
-		/** @noinspection PhpUndefinedFieldInspection */
-		$com->StaticPortMappingCollection->Add($port, "UDP", $port, $myLocalIP, true, "PocketMine-MP");
 	}
 
 	public static function RemovePortForward(int $port) : bool{
 		if(!Internet::$online){
 			return false;
 		}
-		if(Utils::getOS() !== Utils::OS_WINDOWS or !class_exists("COM")){
+		if(self::$serviceURL === null){
 			return false;
 		}
 
-		try{
-			/** @noinspection PhpUndefinedClassInspection */
-			$com = new \COM("HNetCfg.NATUPnP");
-			/** @noinspection PhpUndefinedFieldInspection */
-			if(!is_object($com->StaticPortMappingCollection)){
-				return false;
-			}
-			/** @noinspection PhpUndefinedFieldInspection */
-			$com->StaticPortMappingCollection->Remove($port, "UDP");
-		}catch(\Throwable $e){
+		$body =
+			'<u:DeletePortMapping xmlns:u="urn:schemas-upnp-org:service:WANIPConnection:1">' .
+				'<NewRemoteHost></NewRemoteHost>' .
+				'<NewExternalPort>' . $port . '</NewExternalPort>' .
+				'<NewProtocol>UDP</NewProtocol>' .
+			'</u:DeletePortMapping>';
+
+		$contents =
+			'<?xml version="1.0"?>' .
+			'<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">' .
+			'<s:Body>' . $body . '</s:Body></s:Envelope>';
+
+		$headers = [
+			'Content-Type: text/xml',
+			'SOAPAction: "urn:schemas-upnp-org:service:WANIPConnection:1#DeletePortMapping"'
+		];
+
+		if(Internet::postURL(self::$serviceURL, $contents, 3, $headers) === false){
 			return false;
 		}
 

src/pocketmine/resources/pocketmine.yml

@@ -87,7 +87,7 @@ network:
   compression-level: 6
   #Use AsyncTasks for compression. Adds half/one tick delay, less CPU load on main thread
   async-compression: false
-  #Experimental, only for Windows. Tries to use UPnP to automatically port forward
+  #Experimental. Use UPnP to automatically port forward
   upnp-forwarding: false
   #Maximum size in bytes of packets sent over the network (default 1492 bytes). Packets larger than this will be
   #fragmented or split into smaller parts. Clients can request MTU sizes up to but not more than this number.

src/pocketmine/utils/MainLogger.php

@@ -331,10 +331,11 @@ class MainLogger extends \AttachableThreadedLogger{
 	 * @return void
 	 */
 	public function syncFlushBuffer(){
-		$this->syncFlush = true;
 		$this->synchronized(function() : void{
+			$this->syncFlush = true;
 			$this->notify(); //write immediately
-
+		});
+		$this->synchronized(function() : void{
 			while($this->syncFlush){
 				$this->wait(); //block until it's all been written to disk
 			}
@@ -371,7 +372,7 @@ class MainLogger extends \AttachableThreadedLogger{
 		while(!$this->shutdown){
 			$this->writeLogStream($logResource);
 			$this->synchronized(function() : void{
-				if(!$this->shutdown){
+				if(!$this->shutdown && !$this->syncFlush){
 					$this->wait();
 				}
 			});

src/pocketmine/wizard/SetupWizard.php

@@ -221,7 +221,7 @@ LICENSE;
 
 		$config->save();
 	}
-	
+
 	private function printIpDetails() : void{
 		$this->message($this->lang->get("ip_get"));
 

tests/phpstan/configs/actual-problems.neon

@@ -11,7 +11,12 @@ parameters:
 			path: ../../../src/pocketmine/Player.php
 
 		-
-			message: "#^Cannot instantiate interface pocketmine\\\\level\\\\format\\\\io\\\\LevelProvider\\.$#"
+			message: "#^Instanceof between pocketmine\\\\command\\\\CommandReader and pocketmine\\\\command\\\\CommandReader will always evaluate to true\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/Server.php
+
+		-
+			message: "#^Instanceof between pocketmine\\\\network\\\\Network and pocketmine\\\\network\\\\Network will always evaluate to true\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/Server.php
 
@@ -25,16 +30,6 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/Server.php
 
-		-
-			message: "#^Instanceof between pocketmine\\\\command\\\\CommandReader and pocketmine\\\\command\\\\CommandReader will always evaluate to true\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/Server.php
-
-		-
-			message: "#^Instanceof between pocketmine\\\\network\\\\Network and pocketmine\\\\network\\\\Network will always evaluate to true\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/Server.php
-
 		-
 			message: "#^pocketmine\\\\block\\\\Air\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\block\\\\Block\\.$#"
 			count: 1

tests/phpstan/configs/check-explicit-mixed-baseline.neon

@@ -1,52 +1,42 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Cannot access offset string on mixed\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/CrashDump.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/CrashDump.php
-
 		-
 			message: "#^Cannot access offset float\\|int on mixed\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/CrashDump.php
 
+		-
+			message: "#^Cannot access offset string on mixed\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/CrashDump.php
+
 		-
 			message: "#^Parameter \\#1 \\$path of static method pocketmine\\\\utils\\\\Utils\\:\\:cleanPath\\(\\) expects string, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/CrashDump.php
 
-		-
-			message: "#^Cannot access offset 'name' on mixed\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/CrashDump.php
-
 		-
 			message: "#^Cannot cast mixed to int\\.$#"
 			count: 7
 			path: ../../../src/pocketmine/MemoryManager.php
 
-		-
-			message: "#^Cannot cast mixed to int\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/Player.php
-
 		-
 			message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
 			count: 3
 			path: ../../../src/pocketmine/Player.php
 
 		-
-			message: "#^Parameter \\#1 \\$skinId of class pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\SkinData constructor expects string, mixed given\\.$#"
+			message: "#^Cannot cast mixed to int\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/Player.php
 
 		-
-			message: "#^Parameter \\#2 \\$playFabId of class pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\SkinData constructor expects string, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$height of class pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\SkinImage constructor expects int, mixed given\\.$#"
+			count: 2
+			path: ../../../src/pocketmine/Player.php
+
+		-
+			message: "#^Parameter \\#1 \\$skinId of class pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\SkinData constructor expects string, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/Player.php
 
@@ -56,17 +46,7 @@ parameters:
 			path: ../../../src/pocketmine/Player.php
 
 		-
-			message: "#^Parameter \\#1 \\$height of class pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\SkinImage constructor expects int, mixed given\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/Player.php
-
-		-
-			message: "#^Parameter \\#2 \\$width of class pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\SkinImage constructor expects int, mixed given\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/Player.php
-
-		-
-			message: "#^Parameter \\#9 \\$premium of class pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\SkinData constructor expects bool, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\.\\.\\.\\$slots of method pocketmine\\\\inventory\\\\BaseInventory\\:\\:addItem\\(\\) expects pocketmine\\\\item\\\\Item, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/Player.php
 
@@ -96,7 +76,17 @@ parameters:
 			path: ../../../src/pocketmine/Player.php
 
 		-
-			message: "#^Parameter \\#1 \\.\\.\\.\\$slots of method pocketmine\\\\inventory\\\\BaseInventory\\:\\:addItem\\(\\) expects pocketmine\\\\item\\\\Item, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$playFabId of class pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\SkinData constructor expects string, mixed given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/Player.php
+
+		-
+			message: "#^Parameter \\#2 \\$width of class pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\SkinImage constructor expects int, mixed given\\.$#"
+			count: 2
+			path: ../../../src/pocketmine/Player.php
+
+		-
+			message: "#^Parameter \\#9 \\$premium of class pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\SkinData constructor expects bool, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/Player.php
 
@@ -106,18 +96,28 @@ parameters:
 			path: ../../../src/pocketmine/PocketMine.php
 
 		-
-			message: "#^Parameter \\#1 \\$name of static method pocketmine\\\\level\\\\format\\\\io\\\\LevelProviderManager\\:\\:getProviderByName\\(\\) expects string, mixed given\\.$#"
+			message: "#^Cannot access offset 'type' on mixed\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/Server.php
 
+		-
+			message: "#^Cannot cast mixed to float\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/Server.php
+
+		-
+			message: "#^Cannot cast mixed to int\\.$#"
+			count: 7
+			path: ../../../src/pocketmine/Server.php
+
 		-
 			message: "#^Cannot cast mixed to string\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/Server.php
 
 		-
-			message: "#^Cannot cast mixed to int\\.$#"
-			count: 7
+			message: "#^Parameter \\#1 \\$name of static method pocketmine\\\\level\\\\format\\\\io\\\\LevelProviderManager\\:\\:getProviderByName\\(\\) expects string, mixed given\\.$#"
+			count: 1
 			path: ../../../src/pocketmine/Server.php
 
 		-
@@ -130,11 +130,6 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/Server.php
 
-		-
-			message: "#^Cannot cast mixed to float\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/Server.php
-
 		-
 			message: "#^Parameter \\#2 \\$endpoint of class pocketmine\\\\updater\\\\AutoUpdater constructor expects string, mixed given\\.$#"
 			count: 1
@@ -145,11 +140,6 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/Server.php
 
-		-
-			message: "#^Cannot access offset 'type' on mixed\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/Server.php
-
 		-
 			message: "#^Method pocketmine\\\\ThreadManager\\:\\:getAll\\(\\) should return array\\<pocketmine\\\\Thread\\|pocketmine\\\\Worker\\> but returns array\\.$#"
 			count: 1
@@ -165,23 +155,23 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/command/defaults/StatusCommand.php
 
-		-
-			message: "#^Parameter \\#2 \\$host of class class@anonymous/src/pocketmine/command/defaults/TimingsCommand\\.php\\:126 constructor expects string, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/command/defaults/TimingsCommand.php
-
 		-
 			message: "#^Cannot access offset 0 on mixed\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/command/defaults/TimingsCommand.php
 
 		-
-			message: "#^Cannot cast mixed to int\\.$#"
+			message: "#^Parameter \\#2 \\$host of class class@anonymous/src/pocketmine/command/defaults/TimingsCommand\\.php\\:126 constructor expects string, mixed given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/command/defaults/TimingsCommand.php
+
+		-
+			message: "#^Cannot cast mixed to float\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/command/defaults/VanillaCommand.php
 
 		-
-			message: "#^Cannot cast mixed to float\\.$#"
+			message: "#^Cannot cast mixed to int\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/command/defaults/VanillaCommand.php
 
@@ -241,12 +231,12 @@ parameters:
 			path: ../../../src/pocketmine/level/format/io/leveldb/LevelDB.php
 
 		-
-			message: "#^Parameter \\#2 \\$value of class pocketmine\\\\nbt\\\\tag\\\\StringTag constructor expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$str of function explode expects string, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/level/format/io/leveldb/LevelDB.php
 
 		-
-			message: "#^Parameter \\#2 \\$str of function explode expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$value of class pocketmine\\\\nbt\\\\tag\\\\StringTag constructor expects string, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/level/format/io/leveldb/LevelDB.php
 
@@ -265,56 +255,11 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/level/generator/Flat.php
 
-		-
-			message: "#^Parameter \\#4 \\$q0 of static method pocketmine\\\\level\\\\generator\\\\noise\\\\Noise\\:\\:linearLerp\\(\\) expects float, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/generator/noise/Noise.php
-
-		-
-			message: "#^Parameter \\#5 \\$q1 of static method pocketmine\\\\level\\\\generator\\\\noise\\\\Noise\\:\\:linearLerp\\(\\) expects float, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/generator/noise/Noise.php
-
-		-
-			message: "#^Cannot access offset int on mixed\\.$#"
-			count: 6
-			path: ../../../src/pocketmine/level/generator/noise/Noise.php
-
 		-
 			message: "#^Parameter \\#1 \\$buffer of class pocketmine\\\\network\\\\mcpe\\\\protocol\\\\BatchPacket constructor expects string, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/network/CompressBatchedTask.php
 
-		-
-			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\utils\\\\BinaryStream\\:\\:putByte\\(\\) expects int, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
-
-		-
-			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\utils\\\\BinaryStream\\:\\:putLShort\\(\\) expects int, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
-
-		-
-			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\utils\\\\BinaryStream\\:\\:putVarInt\\(\\) expects int, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
-
-		-
-			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\utils\\\\BinaryStream\\:\\:putLFloat\\(\\) expects float, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
-
-		-
-			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\network\\\\mcpe\\\\NetworkBinaryStream\\:\\:putString\\(\\) expects string, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
-
-		-
-			message: "#^Parameter \\#1 \\$data of method pocketmine\\\\nbt\\\\NBTStream\\:\\:write\\(\\) expects array\\<pocketmine\\\\nbt\\\\tag\\\\NamedTag\\>\\|pocketmine\\\\nbt\\\\tag\\\\NamedTag, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
-
 		-
 			message: "#^Cannot access property \\$x on mixed\\.$#"
 			count: 1
@@ -330,6 +275,36 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
 
+		-
+			message: "#^Parameter \\#1 \\$data of method pocketmine\\\\nbt\\\\NBTStream\\:\\:write\\(\\) expects array\\<pocketmine\\\\nbt\\\\tag\\\\NamedTag\\>\\|pocketmine\\\\nbt\\\\tag\\\\NamedTag, mixed given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
+
+		-
+			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\network\\\\mcpe\\\\NetworkBinaryStream\\:\\:putString\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
+
+		-
+			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\utils\\\\BinaryStream\\:\\:putByte\\(\\) expects int, mixed given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
+
+		-
+			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\utils\\\\BinaryStream\\:\\:putLFloat\\(\\) expects float, mixed given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
+
+		-
+			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\utils\\\\BinaryStream\\:\\:putLShort\\(\\) expects int, mixed given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
+
+		-
+			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\utils\\\\BinaryStream\\:\\:putVarInt\\(\\) expects int, mixed given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
+
 		-
 			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\utils\\\\BinaryStream\\:\\:putVarLong\\(\\) expects int, mixed given\\.$#"
 			count: 1
@@ -340,11 +315,6 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
 
-		-
-			message: "#^Cannot cast mixed to int\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/network/mcpe/RakLibInterface.php
-
 		-
 			message: "#^Cannot access offset 'down' on mixed\\.$#"
 			count: 1
@@ -356,14 +326,9 @@ parameters:
 			path: ../../../src/pocketmine/network/mcpe/RakLibInterface.php
 
 		-
-			message: "#^Cannot access offset 'x5u' on mixed\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/network/mcpe/VerifyLoginTask.php
-
-		-
-			message: "#^Cannot access offset 'nbf' on mixed\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/network/mcpe/VerifyLoginTask.php
+			message: "#^Cannot cast mixed to int\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/network/mcpe/RakLibInterface.php
 
 		-
 			message: "#^Cannot access offset 'exp' on mixed\\.$#"
@@ -375,6 +340,16 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/VerifyLoginTask.php
 
+		-
+			message: "#^Cannot access offset 'nbf' on mixed\\.$#"
+			count: 2
+			path: ../../../src/pocketmine/network/mcpe/VerifyLoginTask.php
+
+		-
+			message: "#^Cannot access offset 'x5u' on mixed\\.$#"
+			count: 2
+			path: ../../../src/pocketmine/network/mcpe/VerifyLoginTask.php
+
 		-
 			message: "#^Cannot access offset string on mixed\\.$#"
 			count: 1
@@ -401,8 +376,8 @@ parameters:
 			path: ../../../src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php
 
 		-
-			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\LoginPacket\\:\\:\\$chainData \\(array\\(\\?'chain' \\=\\> array\\<int, string\\>\\)\\) does not accept mixed\\.$#"
-			count: 1
+			message: "#^Cannot access offset 'XUID' on mixed\\.$#"
+			count: 2
 			path: ../../../src/pocketmine/network/mcpe/protocol/LoginPacket.php
 
 		-
@@ -421,12 +396,7 @@ parameters:
 			path: ../../../src/pocketmine/network/mcpe/protocol/LoginPacket.php
 
 		-
-			message: "#^Cannot access offset 'XUID' on mixed\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/network/mcpe/protocol/LoginPacket.php
-
-		-
-			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\LoginPacket\\:\\:\\$identityPublicKey \\(string\\) does not accept mixed\\.$#"
+			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\LoginPacket\\:\\:\\$chainData \\(array\\(\\?'chain' \\=\\> array\\<int, string\\>\\)\\) does not accept mixed\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/protocol/LoginPacket.php
 
@@ -436,7 +406,7 @@ parameters:
 			path: ../../../src/pocketmine/network/mcpe/protocol/LoginPacket.php
 
 		-
-			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\LoginPacket\\:\\:\\$serverAddress \\(string\\) does not accept mixed\\.$#"
+			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\LoginPacket\\:\\:\\$identityPublicKey \\(string\\) does not accept mixed\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/protocol/LoginPacket.php
 
@@ -445,6 +415,11 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/protocol/LoginPacket.php
 
+		-
+			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\LoginPacket\\:\\:\\$serverAddress \\(string\\) does not accept mixed\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/network/mcpe/protocol/LoginPacket.php
+
 		-
 			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\SetActorDataPacket\\:\\:\\$metadata \\(array\\<int, array\\(int, mixed\\)\\>\\) does not accept array\\<int, mixed\\>\\.$#"
 			count: 1
@@ -460,13 +435,38 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/permission/Permission.php
 
+		-
+			message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/plugin/PluginDescription.php
+
+		-
+			message: "#^Array \\(array\\<string\\>\\) does not accept mixed\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/plugin/PluginDescription.php
+
+		-
+			message: "#^Cannot cast mixed to string\\.$#"
+			count: 4
+			path: ../../../src/pocketmine/plugin/PluginDescription.php
+
+		-
+			message: "#^Parameter \\#1 \\$data of static method pocketmine\\\\permission\\\\Permission\\:\\:loadPermissions\\(\\) expects array\\<string, array\\<string, mixed\\>\\>, mixed given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/plugin/PluginDescription.php
+
+		-
+			message: "#^Parameter \\#1 \\$haystack of function stripos expects string, mixed given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/plugin/PluginDescription.php
+
 		-
 			message: "#^Parameter \\#1 \\$plugin of method pocketmine\\\\plugin\\\\PluginDescription\\:\\:loadMap\\(\\) expects array, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/plugin/PluginDescription.php
 
 		-
-			message: "#^Property pocketmine\\\\plugin\\\\PluginDescription\\:\\:\\$name \\(string\\) does not accept mixed\\.$#"
+			message: "#^Parameter \\#1 \\$str of function mb_strtoupper expects string, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/plugin/PluginDescription.php
 
@@ -480,23 +480,13 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/plugin/PluginDescription.php
 
-		-
-			message: "#^Cannot cast mixed to string\\.$#"
-			count: 4
-			path: ../../../src/pocketmine/plugin/PluginDescription.php
-
 		-
 			message: "#^Property pocketmine\\\\plugin\\\\PluginDescription\\:\\:\\$main \\(string\\) does not accept mixed\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/plugin/PluginDescription.php
 
 		-
-			message: "#^Parameter \\#1 \\$haystack of function stripos expects string, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/plugin/PluginDescription.php
-
-		-
-			message: "#^Parameter \\#1 \\$str of function mb_strtoupper expects string, mixed given\\.$#"
+			message: "#^Property pocketmine\\\\plugin\\\\PluginDescription\\:\\:\\$name \\(string\\) does not accept mixed\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/plugin/PluginDescription.php
 
@@ -505,80 +495,60 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/plugin/PluginDescription.php
 
-		-
-			message: "#^Array \\(array\\<string\\>\\) does not accept mixed\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/plugin/PluginDescription.php
-
-		-
-			message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/plugin/PluginDescription.php
-
-		-
-			message: "#^Parameter \\#1 \\$data of static method pocketmine\\\\permission\\\\Permission\\:\\:loadPermissions\\(\\) expects array\\<string, array\\<string, mixed\\>\\>, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/plugin/PluginDescription.php
-
 		-
 			message: "#^Parameter \\#1 \\$description of method pocketmine\\\\command\\\\Command\\:\\:setDescription\\(\\) expects string, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/plugin/PluginManager.php
 
-		-
-			message: "#^Parameter \\#1 \\$usage of method pocketmine\\\\command\\\\Command\\:\\:setUsage\\(\\) expects string, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/plugin/PluginManager.php
-
 		-
 			message: "#^Parameter \\#1 \\$permissionMessage of method pocketmine\\\\command\\\\Command\\:\\:setPermissionMessage\\(\\) expects string, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/plugin/PluginManager.php
 
+		-
+			message: "#^Parameter \\#1 \\$usage of method pocketmine\\\\command\\\\Command\\:\\:setUsage\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/plugin/PluginManager.php
+
 		-
 			message: "#^Parameter \\#2 \\$code of class pocketmine\\\\resourcepacks\\\\ResourcePackException constructor expects int, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/resourcepacks/ZippedResourcePack.php
 
-		-
-			message: "#^Property pocketmine\\\\scheduler\\\\AsyncTask\\:\\:\\$result \\(bool\\|float\\|int\\|string\\|null\\) does not accept mixed\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/scheduler/AsyncTask.php
-
 		-
 			message: "#^Parameter \\#1 \\$variable_representation of function unserialize expects string, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/scheduler/AsyncTask.php
 
 		-
-			message: "#^Parameter \\#2 \\$timestamp of function date expects int, mixed given\\.$#"
+			message: "#^Property pocketmine\\\\scheduler\\\\AsyncTask\\:\\:\\$result \\(bool\\|float\\|int\\|string\\|null\\) does not accept mixed\\.$#"
 			count: 1
-			path: ../../../src/pocketmine/updater/AutoUpdater.php
+			path: ../../../src/pocketmine/scheduler/AsyncTask.php
 
 		-
 			message: "#^Parameter \\#1 \\$baseVersion of class pocketmine\\\\utils\\\\VersionString constructor expects string, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/updater/AutoUpdater.php
 
-		-
-			message: "#^Parameter \\#2 \\$isDevBuild of class pocketmine\\\\utils\\\\VersionString constructor expects bool, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/updater/AutoUpdater.php
-
-		-
-			message: "#^Parameter \\#3 \\$buildNumber of class pocketmine\\\\utils\\\\VersionString constructor expects int, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/updater/AutoUpdater.php
-
 		-
 			message: "#^Parameter \\#1 \\$str of function strtolower expects string, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/updater/AutoUpdater.php
 
 		-
-			message: "#^Parameter \\#3 \\$length of function substr expects int, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$isDevBuild of class pocketmine\\\\utils\\\\VersionString constructor expects bool, mixed given\\.$#"
 			count: 1
-			path: ../../../src/pocketmine/utils/Internet.php
+			path: ../../../src/pocketmine/updater/AutoUpdater.php
+
+		-
+			message: "#^Parameter \\#2 \\$timestamp of function date expects int, mixed given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/updater/AutoUpdater.php
+
+		-
+			message: "#^Parameter \\#3 \\$buildNumber of class pocketmine\\\\utils\\\\VersionString constructor expects int, mixed given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/updater/AutoUpdater.php
 
 		-
 			message: "#^Parameter \\#2 \\$start of function substr expects int, mixed given\\.$#"
@@ -586,9 +556,9 @@ parameters:
 			path: ../../../src/pocketmine/utils/Internet.php
 
 		-
-			message: "#^Parameter \\#2 \\$str of function fwrite expects string, mixed given\\.$#"
+			message: "#^Parameter \\#3 \\$length of function substr expects int, mixed given\\.$#"
 			count: 1
-			path: ../../../src/pocketmine/utils/MainLogger.php
+			path: ../../../src/pocketmine/utils/Internet.php
 
 		-
 			message: "#^Cannot access offset 'status' on mixed\\.$#"
@@ -600,13 +570,13 @@ parameters:
 			count: 2
 			path: ../../../src/pocketmine/utils/Timezone.php
 
-		-
-			message: "#^Parameter \\#2 \\$input1 of function array_map expects array, mixed given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/utils/Utils.php
-
 		-
 			message: "#^Parameter \\#1 \\$path of static method pocketmine\\\\utils\\\\Utils\\:\\:cleanPath\\(\\) expects string, mixed given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/utils/Utils.php
 
+		-
+			message: "#^Parameter \\#2 \\$input1 of function array_map expects array, mixed given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/utils/Utils.php
+

tests/phpstan/configs/com-dotnet-magic.neon

@@ -1,7 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Access to an undefined property COM\\:\\:\\$StaticPortMappingCollection\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/network/upnp/UPnP.php
-

tests/phpstan/configs/gc-hacks.neon

@@ -1,7 +1,7 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Property pocketmine\\\\Player\\:\\:\\$sessionAdapter \\(pocketmine\\\\network\\\\mcpe\\\\PlayerNetworkSessionAdapter\\) does not accept null\\.$#"
+			message: "#^Property pocketmine\\\\Player\\:\\:\\$craftingGrid \\(pocketmine\\\\inventory\\\\CraftingGrid\\) does not accept null\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/Player.php
 
@@ -11,12 +11,12 @@ parameters:
 			path: ../../../src/pocketmine/Player.php
 
 		-
-			message: "#^Property pocketmine\\\\Player\\:\\:\\$craftingGrid \\(pocketmine\\\\inventory\\\\CraftingGrid\\) does not accept null\\.$#"
+			message: "#^Property pocketmine\\\\Player\\:\\:\\$perm \\(pocketmine\\\\permission\\\\PermissibleBase\\) does not accept null\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/Player.php
 
 		-
-			message: "#^Property pocketmine\\\\Player\\:\\:\\$perm \\(pocketmine\\\\permission\\\\PermissibleBase\\) does not accept null\\.$#"
+			message: "#^Property pocketmine\\\\Player\\:\\:\\$sessionAdapter \\(pocketmine\\\\network\\\\mcpe\\\\PlayerNetworkSessionAdapter\\) does not accept null\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/Player.php
 
@@ -26,12 +26,12 @@ parameters:
 			path: ../../../src/pocketmine/entity/Entity.php
 
 		-
-			message: "#^Property pocketmine\\\\entity\\\\Human\\:\\:\\$inventory \\(pocketmine\\\\inventory\\\\PlayerInventory\\) does not accept null\\.$#"
+			message: "#^Property pocketmine\\\\entity\\\\Human\\:\\:\\$enderChestInventory \\(pocketmine\\\\inventory\\\\EnderChestInventory\\) does not accept null\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/entity/Human.php
 
 		-
-			message: "#^Property pocketmine\\\\entity\\\\Human\\:\\:\\$enderChestInventory \\(pocketmine\\\\inventory\\\\EnderChestInventory\\) does not accept null\\.$#"
+			message: "#^Property pocketmine\\\\entity\\\\Human\\:\\:\\$inventory \\(pocketmine\\\\inventory\\\\PlayerInventory\\) does not accept null\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/entity/Human.php
 
@@ -51,12 +51,12 @@ parameters:
 			path: ../../../src/pocketmine/inventory/DoubleChestInventory.php
 
 		-
-			message: "#^Property pocketmine\\\\level\\\\Level\\:\\:\\$provider \\(pocketmine\\\\level\\\\format\\\\io\\\\LevelProvider\\) does not accept null\\.$#"
+			message: "#^Property pocketmine\\\\level\\\\Level\\:\\:\\$blockMetadata \\(pocketmine\\\\metadata\\\\BlockMetadataStore\\) does not accept null\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/level/Level.php
 
 		-
-			message: "#^Property pocketmine\\\\level\\\\Level\\:\\:\\$blockMetadata \\(pocketmine\\\\metadata\\\\BlockMetadataStore\\) does not accept null\\.$#"
+			message: "#^Property pocketmine\\\\level\\\\Level\\:\\:\\$provider \\(pocketmine\\\\level\\\\format\\\\io\\\\LevelProvider\\) does not accept null\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/level/Level.php
 

tests/phpstan/configs/l7-baseline.neon

@@ -5,23 +5,23 @@ parameters:
 			count: 1
 			path: ../../../build/make-release.php
 
-		-
-			message: "#^Parameter \\#1 \\$strings of function pocketmine\\\\build\\\\server_phar\\\\preg_quote_array expects array\\<string\\>, array\\<int, string\\|false\\> given\\.$#"
-			count: 1
-			path: ../../../build/server-phar.php
-
 		-
 			message: "#^Parameter \\#1 \\$pharPath of function pocketmine\\\\build\\\\server_phar\\\\buildPhar expects string, array\\<int, mixed\\>\\|string\\|false given\\.$#"
 			count: 1
 			path: ../../../build/server-phar.php
 
 		-
-			message: "#^Parameter \\#1 \\$fp of function fwrite expects resource, resource\\|false given\\.$#"
+			message: "#^Parameter \\#1 \\$strings of function pocketmine\\\\build\\\\server_phar\\\\preg_quote_array expects array\\<string\\>, array\\<int, string\\|false\\> given\\.$#"
+			count: 1
+			path: ../../../build/server-phar.php
+
+		-
+			message: "#^Parameter \\#1 \\$fp of function fclose expects resource, resource\\|false given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/MemoryManager.php
 
 		-
-			message: "#^Parameter \\#1 \\$fp of function fclose expects resource, resource\\|false given\\.$#"
+			message: "#^Parameter \\#1 \\$fp of function fwrite expects resource, resource\\|false given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/MemoryManager.php
 
@@ -46,13 +46,13 @@ parameters:
 			path: ../../../src/pocketmine/Player.php
 
 		-
-			message: "#^Parameter \\#1 \\$haystack of function substr_count expects string, string\\|false given\\.$#"
-			count: 1
+			message: "#^Binary operation \"\\.\" between array\\<int, mixed\\>\\|string\\|false and '/'\\|'\\\\\\\\' results in an error\\.$#"
+			count: 2
 			path: ../../../src/pocketmine/PocketMine.php
 
 		-
-			message: "#^Parameter \\#1 \\$version1 of function version_compare expects string, string\\|false given\\.$#"
-			count: 2
+			message: "#^Parameter \\#1 \\$haystack of function substr_count expects string, string\\|false given\\.$#"
+			count: 1
 			path: ../../../src/pocketmine/PocketMine.php
 
 		-
@@ -61,15 +61,30 @@ parameters:
 			path: ../../../src/pocketmine/PocketMine.php
 
 		-
-			message: "#^Binary operation \"\\.\" between array\\<int, mixed\\>\\|string\\|false and '/'\\|'\\\\\\\\' results in an error\\.$#"
+			message: "#^Parameter \\#1 \\$path of function realpath expects string, string\\|false given\\.$#"
 			count: 2
 			path: ../../../src/pocketmine/PocketMine.php
 
 		-
-			message: "#^Parameter \\#1 \\$path of function realpath expects string, string\\|false given\\.$#"
+			message: "#^Parameter \\#1 \\$version1 of function version_compare expects string, string\\|false given\\.$#"
 			count: 2
 			path: ../../../src/pocketmine/PocketMine.php
 
+		-
+			message: "#^Cannot cast array\\<int, mixed\\>\\|string\\|false to int\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/Server.php
+
+		-
+			message: "#^Cannot cast array\\<int, mixed\\>\\|string\\|false to string\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/Server.php
+
+		-
+			message: "#^Only numeric types are allowed in \\+, int\\|false given on the left side\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/Server.php
+
 		-
 			message: "#^Parameter \\#1 \\$buffer of method pocketmine\\\\nbt\\\\NBTStream\\:\\:readCompressed\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
@@ -80,26 +95,11 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/Server.php
 
-		-
-			message: "#^Cannot cast array\\<int, mixed\\>\\|string\\|false to string\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/Server.php
-
-		-
-			message: "#^Cannot cast array\\<int, mixed\\>\\|string\\|false to int\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/Server.php
-
 		-
 			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, string\\|false given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/Server.php
 
-		-
-			message: "#^Only numeric types are allowed in \\+, int\\|false given on the left side\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/Server.php
-
 		-
 			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
@@ -125,36 +125,36 @@ parameters:
 			count: 3
 			path: ../../../src/pocketmine/block/Grass.php
 
-		-
-			message: "#^Parameter \\#1 \\$x of static method pocketmine\\\\level\\\\Level\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
-			count: 3
-			path: ../../../src/pocketmine/block/Liquid.php
-
-		-
-			message: "#^Parameter \\#2 \\$y of static method pocketmine\\\\level\\\\Level\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
-			count: 3
-			path: ../../../src/pocketmine/block/Liquid.php
-
-		-
-			message: "#^Parameter \\#3 \\$z of static method pocketmine\\\\level\\\\Level\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
-			count: 3
-			path: ../../../src/pocketmine/block/Liquid.php
-
 		-
 			message: "#^Parameter \\#1 \\$blockX of method pocketmine\\\\block\\\\Liquid\\:\\:calculateFlowCost\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/block/Liquid.php
 
+		-
+			message: "#^Parameter \\#1 \\$x of static method pocketmine\\\\level\\\\Level\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
+			count: 3
+			path: ../../../src/pocketmine/block/Liquid.php
+
 		-
 			message: "#^Parameter \\#2 \\$blockY of method pocketmine\\\\block\\\\Liquid\\:\\:calculateFlowCost\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/block/Liquid.php
 
+		-
+			message: "#^Parameter \\#2 \\$y of static method pocketmine\\\\level\\\\Level\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
+			count: 3
+			path: ../../../src/pocketmine/block/Liquid.php
+
 		-
 			message: "#^Parameter \\#3 \\$blockZ of method pocketmine\\\\block\\\\Liquid\\:\\:calculateFlowCost\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/block/Liquid.php
 
+		-
+			message: "#^Parameter \\#3 \\$z of static method pocketmine\\\\level\\\\Level\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
+			count: 3
+			path: ../../../src/pocketmine/block/Liquid.php
+
 		-
 			message: "#^Parameter \\#1 \\$min of function mt_rand expects int, float\\|int given\\.$#"
 			count: 3
@@ -196,7 +196,7 @@ parameters:
 			path: ../../../src/pocketmine/block/Sugarcane.php
 
 		-
-			message: "#^Static property pocketmine\\\\command\\\\CommandReader\\:\\:\\$stdin \\(resource\\) does not accept resource\\|false\\.$#"
+			message: "#^Cannot access offset 'mode' on array\\(0 \\=\\> int, 1 \\=\\> int, 2 \\=\\> int, 3 \\=\\> int, 4 \\=\\> int, 5 \\=\\> int, 6 \\=\\> int, 7 \\=\\> int, \\.\\.\\.\\)\\|false\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/command/CommandReader.php
 
@@ -206,7 +206,7 @@ parameters:
 			path: ../../../src/pocketmine/command/CommandReader.php
 
 		-
-			message: "#^Cannot access offset 'mode' on array\\(0 \\=\\> int, 1 \\=\\> int, 2 \\=\\> int, 3 \\=\\> int, 4 \\=\\> int, 5 \\=\\> int, 6 \\=\\> int, 7 \\=\\> int, \\.\\.\\.\\)\\|false\\.$#"
+			message: "#^Static property pocketmine\\\\command\\\\CommandReader\\:\\:\\$stdin \\(resource\\) does not accept resource\\|false\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/command/CommandReader.php
 
@@ -221,8 +221,8 @@ parameters:
 			path: ../../../src/pocketmine/command/defaults/PardonIpCommand.php
 
 		-
-			message: "#^Parameter \\#1 \\$fp of static method pocketmine\\\\timings\\\\TimingsHandler\\:\\:printTimings\\(\\) expects resource, resource\\|false given\\.$#"
-			count: 1
+			message: "#^Parameter \\#1 \\$fp of function fclose expects resource, resource\\|false given\\.$#"
+			count: 2
 			path: ../../../src/pocketmine/command/defaults/TimingsCommand.php
 
 		-
@@ -231,13 +231,13 @@ parameters:
 			path: ../../../src/pocketmine/command/defaults/TimingsCommand.php
 
 		-
-			message: "#^Parameter \\#1 \\$source of function stream_get_contents expects resource, resource\\|false given\\.$#"
+			message: "#^Parameter \\#1 \\$fp of static method pocketmine\\\\timings\\\\TimingsHandler\\:\\:printTimings\\(\\) expects resource, resource\\|false given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/command/defaults/TimingsCommand.php
 
 		-
-			message: "#^Parameter \\#1 \\$fp of function fclose expects resource, resource\\|false given\\.$#"
-			count: 2
+			message: "#^Parameter \\#1 \\$source of function stream_get_contents expects resource, resource\\|false given\\.$#"
+			count: 1
 			path: ../../../src/pocketmine/command/defaults/TimingsCommand.php
 
 		-
@@ -281,12 +281,12 @@ parameters:
 			path: ../../../src/pocketmine/event/HandlerList.php
 
 		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
+			message: "#^Method pocketmine\\\\inventory\\\\CraftingManager\\:\\:hashOutputs\\(\\) should return string but returns string\\|false\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/inventory/CraftingManager.php
 
 		-
-			message: "#^Method pocketmine\\\\inventory\\\\CraftingManager\\:\\:hashOutputs\\(\\) should return string but returns string\\|false\\.$#"
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/inventory/CraftingManager.php
 
@@ -306,47 +306,7 @@ parameters:
 			path: ../../../src/pocketmine/lang/BaseLang.php
 
 		-
-			message: "#^Parameter \\#1 \\$x of static method pocketmine\\\\level\\\\Level\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/level/Explosion.php
-
-		-
-			message: "#^Parameter \\#2 \\$y of static method pocketmine\\\\level\\\\Level\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/level/Explosion.php
-
-		-
-			message: "#^Parameter \\#3 \\$z of static method pocketmine\\\\level\\\\Level\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/level/Explosion.php
-
-		-
-			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:setBlockIdAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Explosion.php
-
-		-
-			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:setBlockIdAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Explosion.php
-
-		-
-			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:setBlockIdAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Explosion.php
-
-		-
-			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:setBlockDataAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Explosion.php
-
-		-
-			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:setBlockDataAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Explosion.php
-
-		-
-			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:setBlockDataAt\\(\\) expects int, float\\|int given\\.$#"
+			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/level/Explosion.php
 
@@ -355,39 +315,54 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/level/Explosion.php
 
-		-
-			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:getTileAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Explosion.php
-
-		-
-			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:getTileAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Explosion.php
-
 		-
 			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/level/Explosion.php
 
+		-
+			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:setBlockDataAt\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Explosion.php
+
+		-
+			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:setBlockIdAt\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Explosion.php
+
+		-
+			message: "#^Parameter \\#1 \\$x of static method pocketmine\\\\level\\\\Level\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
+			count: 2
+			path: ../../../src/pocketmine/level/Explosion.php
+
+		-
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Explosion.php
+
+		-
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:getTileAt\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Explosion.php
+
 		-
 			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/level/Explosion.php
 
 		-
-			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:setBlockDataAt\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/level/Explosion.php
 
 		-
-			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:setBlockIdAt\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/level/Explosion.php
 
 		-
-			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
+			message: "#^Parameter \\#2 \\$y of static method pocketmine\\\\level\\\\Level\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
+			count: 2
 			path: ../../../src/pocketmine/level/Explosion.php
 
 		-
@@ -395,13 +370,63 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/level/Explosion.php
 
+		-
+			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:getTileAt\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Explosion.php
+
+		-
+			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Explosion.php
+
+		-
+			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:setBlockDataAt\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Explosion.php
+
+		-
+			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:setBlockIdAt\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Explosion.php
+
+		-
+			message: "#^Parameter \\#3 \\$z of static method pocketmine\\\\level\\\\Level\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
+			count: 2
+			path: ../../../src/pocketmine/level/Explosion.php
+
+		-
+			message: "#^Cannot access offset 'data' on array\\('priority' \\=\\> int, 'data' \\=\\> pocketmine\\\\math\\\\Vector3\\)\\|int\\|pocketmine\\\\math\\\\Vector3\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Level.php
+
 		-
 			message: "#^Cannot access offset 'priority' on array\\('priority' \\=\\> int, 'data' \\=\\> pocketmine\\\\math\\\\Vector3\\)\\|int\\|pocketmine\\\\math\\\\Vector3\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/level/Level.php
 
 		-
-			message: "#^Cannot access offset 'data' on array\\('priority' \\=\\> int, 'data' \\=\\> pocketmine\\\\math\\\\Vector3\\)\\|int\\|pocketmine\\\\math\\\\Vector3\\.$#"
+			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:getFullBlock\\(\\) expects int, float\\|int given\\.$#"
+			count: 2
+			path: ../../../src/pocketmine/level/Level.php
+
+		-
+			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:getFullLightAt\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Level.php
+
+		-
+			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
+			count: 4
+			path: ../../../src/pocketmine/level/Level.php
+
+		-
+			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:updateBlockLight\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Level.php
+
+		-
+			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:updateBlockSkyLight\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/level/Level.php
 
@@ -410,16 +435,81 @@ parameters:
 			count: 3
 			path: ../../../src/pocketmine/level/Level.php
 
+		-
+			message: "#^Parameter \\#1 \\$x of static method pocketmine\\\\level\\\\Level\\:\\:chunkBlockHash\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Level.php
+
+		-
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:getFullBlock\\(\\) expects int, float\\|int given\\.$#"
+			count: 2
+			path: ../../../src/pocketmine/level/Level.php
+
+		-
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:getFullLightAt\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Level.php
+
+		-
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
+			count: 4
+			path: ../../../src/pocketmine/level/Level.php
+
+		-
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:updateBlockLight\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Level.php
+
+		-
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:updateBlockSkyLight\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Level.php
+
 		-
 			message: "#^Parameter \\#2 \\$y of static method pocketmine\\\\level\\\\Level\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
 			count: 3
 			path: ../../../src/pocketmine/level/Level.php
 
+		-
+			message: "#^Parameter \\#2 \\$y of static method pocketmine\\\\level\\\\Level\\:\\:chunkBlockHash\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Level.php
+
+		-
+			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:getFullBlock\\(\\) expects int, float\\|int given\\.$#"
+			count: 2
+			path: ../../../src/pocketmine/level/Level.php
+
+		-
+			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:getFullLightAt\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Level.php
+
+		-
+			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
+			count: 4
+			path: ../../../src/pocketmine/level/Level.php
+
+		-
+			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:updateBlockLight\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Level.php
+
+		-
+			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:updateBlockSkyLight\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Level.php
+
 		-
 			message: "#^Parameter \\#3 \\$z of static method pocketmine\\\\level\\\\Level\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
 			count: 3
 			path: ../../../src/pocketmine/level/Level.php
 
+		-
+			message: "#^Parameter \\#3 \\$z of static method pocketmine\\\\level\\\\Level\\:\\:chunkBlockHash\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/Level.php
+
 		-
 			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\UpdateBlockPacket\\:\\:\\$x \\(int\\) does not accept float\\|int\\.$#"
 			count: 2
@@ -435,106 +525,6 @@ parameters:
 			count: 2
 			path: ../../../src/pocketmine/level/Level.php
 
-		-
-			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:getFullBlock\\(\\) expects int, float\\|int given\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:getFullBlock\\(\\) expects int, float\\|int given\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:getFullBlock\\(\\) expects int, float\\|int given\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
-			count: 4
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
-			count: 4
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
-			count: 4
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:getFullLightAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:getFullLightAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:getFullLightAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:updateBlockSkyLight\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:updateBlockSkyLight\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:updateBlockSkyLight\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\level\\\\Level\\:\\:updateBlockLight\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\Level\\:\\:updateBlockLight\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\level\\\\Level\\:\\:updateBlockLight\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#1 \\$x of static method pocketmine\\\\level\\\\Level\\:\\:chunkBlockHash\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#2 \\$y of static method pocketmine\\\\level\\\\Level\\:\\:chunkBlockHash\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#3 \\$z of static method pocketmine\\\\level\\\\Level\\:\\:chunkBlockHash\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#6 \\$xpDrops of class pocketmine\\\\event\\\\block\\\\BlockBreakEvent constructor expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Parameter \\#2 \\$amount of method pocketmine\\\\level\\\\Level\\:\\:dropExperience\\(\\) expects int, float\\|int\\<1, max\\> given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/Level.php
-
 		-
 			message: "#^Parameter \\#1 \\$string of function strlen expects string, string\\|false given\\.$#"
 			count: 2
@@ -580,38 +570,38 @@ parameters:
 			count: 2
 			path: ../../../src/pocketmine/level/generator/object/TallGrass.php
 
-		-
-			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\ChunkManager\\:\\:setBlockIdAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/generator/object/TallGrass.php
-
 		-
 			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\ChunkManager\\:\\:setBlockDataAt\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/level/generator/object/TallGrass.php
 
 		-
-			message: "#^Parameter \\#1 \\$str of method pocketmine\\\\utils\\\\BinaryStream\\:\\:put\\(\\) expects string, string\\|false given\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\level\\\\ChunkManager\\:\\:setBlockIdAt\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/generator/object/TallGrass.php
 
 		-
 			message: "#^Method pocketmine\\\\network\\\\mcpe\\\\NetworkBinaryStream\\:\\:getGameRules\\(\\) should return array\\<string, array\\(int, bool\\|float\\|int\\)\\> but returns array\\<string, array\\(int, bool\\|float\\|int\\|null\\)\\>\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
 
+		-
+			message: "#^Parameter \\#1 \\$str of method pocketmine\\\\utils\\\\BinaryStream\\:\\:put\\(\\) expects string, string\\|false given\\.$#"
+			count: 2
+			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
+
 		-
 			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\utils\\\\BinaryStream\\:\\:putBool\\(\\) expects bool, bool\\|float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
 
 		-
-			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\utils\\\\BinaryStream\\:\\:putUnsignedVarInt\\(\\) expects int, bool\\|float\\|int given\\.$#"
+			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\utils\\\\BinaryStream\\:\\:putLFloat\\(\\) expects float, bool\\|float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
 
 		-
-			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\utils\\\\BinaryStream\\:\\:putLFloat\\(\\) expects float, bool\\|float\\|int given\\.$#"
+			message: "#^Parameter \\#1 \\$v of method pocketmine\\\\utils\\\\BinaryStream\\:\\:putUnsignedVarInt\\(\\) expects int, bool\\|float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/NetworkBinaryStream.php
 
@@ -625,23 +615,23 @@ parameters:
 			count: 2
 			path: ../../../src/pocketmine/network/mcpe/VerifyLoginTask.php
 
-		-
-			message: "#^Parameter \\#1 \\$string of function strlen expects string, string\\|false given\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/network/mcpe/VerifyLoginTask.php
-
 		-
 			message: "#^Parameter \\#1 \\$str of function str_split expects string, string\\|false given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/VerifyLoginTask.php
 
 		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
+			message: "#^Parameter \\#1 \\$string of function strlen expects string, string\\|false given\\.$#"
+			count: 2
+			path: ../../../src/pocketmine/network/mcpe/VerifyLoginTask.php
+
+		-
+			message: "#^Parameter \\#1 \\$buffer of class pocketmine\\\\network\\\\mcpe\\\\NetworkBinaryStream constructor expects string, string\\|false given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/convert/RuntimeBlockMapping.php
 
 		-
-			message: "#^Parameter \\#1 \\$buffer of class pocketmine\\\\network\\\\mcpe\\\\NetworkBinaryStream constructor expects string, string\\|false given\\.$#"
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/convert/RuntimeBlockMapping.php
 
@@ -696,19 +686,34 @@ parameters:
 			path: ../../../src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php
 
 		-
-			message: "#^Call to an undefined method object\\:\\:Add\\(\\)\\.$#"
+			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\network\\\\mcpe\\\\NetworkBinaryStream\\:\\:putBlockPosition\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
-			path: ../../../src/pocketmine/network/upnp/UPnP.php
+			path: ../../../src/pocketmine/network/mcpe/protocol/types/inventory/UseItemTransactionData.php
 
 		-
-			message: "#^Call to an undefined method object\\:\\:Remove\\(\\)\\.$#"
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\network\\\\mcpe\\\\NetworkBinaryStream\\:\\:putBlockPosition\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
-			path: ../../../src/pocketmine/network/upnp/UPnP.php
+			path: ../../../src/pocketmine/network/mcpe/protocol/types/inventory/UseItemTransactionData.php
 
 		-
-			message: "#^Parameter \\#1 \\$event of method pocketmine\\\\plugin\\\\PluginManager\\:\\:registerEvent\\(\\) expects class\\-string\\<pocketmine\\\\event\\\\Event\\>, class\\-string\\<object\\> given\\.$#"
+			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\network\\\\mcpe\\\\NetworkBinaryStream\\:\\:putBlockPosition\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
-			path: ../../../src/pocketmine/plugin/PluginManager.php
+			path: ../../../src/pocketmine/network/mcpe/protocol/types/inventory/UseItemTransactionData.php
+
+		-
+			message: "#^Method pocketmine\\\\resourcepacks\\\\ZippedResourcePack\\:\\:getPackChunk\\(\\) should return string but returns string\\|false\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/resourcepacks/ZippedResourcePack.php
+
+		-
+			message: "#^Method pocketmine\\\\resourcepacks\\\\ZippedResourcePack\\:\\:getPackSize\\(\\) should return int but returns int\\|false\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/resourcepacks/ZippedResourcePack.php
+
+		-
+			message: "#^Method pocketmine\\\\resourcepacks\\\\ZippedResourcePack\\:\\:getSha256\\(\\) should return string but returns string\\|false\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/resourcepacks/ZippedResourcePack.php
 
 		-
 			message: "#^Parameter \\#1 \\$string of function strlen expects string, string\\|false given\\.$#"
@@ -725,26 +730,11 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/resourcepacks/ZippedResourcePack.php
 
-		-
-			message: "#^Method pocketmine\\\\resourcepacks\\\\ZippedResourcePack\\:\\:getPackSize\\(\\) should return int but returns int\\|false\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/resourcepacks/ZippedResourcePack.php
-
 		-
 			message: "#^Property pocketmine\\\\resourcepacks\\\\ZippedResourcePack\\:\\:\\$sha256 \\(string\\|null\\) does not accept string\\|false\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/resourcepacks/ZippedResourcePack.php
 
-		-
-			message: "#^Method pocketmine\\\\resourcepacks\\\\ZippedResourcePack\\:\\:getSha256\\(\\) should return string but returns string\\|false\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/resourcepacks/ZippedResourcePack.php
-
-		-
-			message: "#^Method pocketmine\\\\resourcepacks\\\\ZippedResourcePack\\:\\:getPackChunk\\(\\) should return string but returns string\\|false\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/resourcepacks/ZippedResourcePack.php
-
 		-
 			message: "#^Cannot call method getNextRun\\(\\) on array\\<string, int\\|pocketmine\\\\scheduler\\\\TaskHandler\\>\\|int\\|pocketmine\\\\scheduler\\\\TaskHandler\\.$#"
 			count: 1
@@ -765,6 +755,11 @@ parameters:
 			count: 2
 			path: ../../../src/pocketmine/tile/Chest.php
 
+		-
+			message: "#^Parameter \\#2 \\$value of class pocketmine\\\\nbt\\\\tag\\\\IntTag constructor expects int, float\\|int given\\.$#"
+			count: 3
+			path: ../../../src/pocketmine/tile/Spawnable.php
+
 		-
 			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\BlockActorDataPacket\\:\\:\\$x \\(int\\) does not accept float\\|int\\.$#"
 			count: 1
@@ -780,11 +775,6 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/tile/Spawnable.php
 
-		-
-			message: "#^Parameter \\#2 \\$value of class pocketmine\\\\nbt\\\\tag\\\\IntTag constructor expects int, float\\|int given\\.$#"
-			count: 3
-			path: ../../../src/pocketmine/tile/Spawnable.php
-
 		-
 			message: "#^Array \\(array\\<class\\-string\\<pocketmine\\\\tile\\\\Tile\\>, string\\>\\) does not accept string\\|false\\.$#"
 			count: 1

tests/phpstan/configs/phpstan-bugs.neon

@@ -21,12 +21,12 @@ parameters:
 			path: ../../../src/pocketmine/network/mcpe/protocol/DataPacket.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between string and false will always evaluate to false\\.$#"
+			message: "#^Parameter \\#1 \\$ of closure expects TMemberType, TMemberType given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/utils/Utils.php
 
 		-
-			message: "#^Parameter \\#1 \\$ of closure expects TMemberType, TMemberType given\\.$#"
+			message: "#^Strict comparison using \\=\\=\\= between string and false will always evaluate to false\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/utils/Utils.php
 

tests/phpstan/configs/runtime-type-checks.neon

@@ -25,6 +25,16 @@ parameters:
 			count: 3
 			path: ../../../src/pocketmine/item/Item.php
 
+		-
+			message: "#^Call to function is_object\\(\\) with \\*NEVER\\* will always evaluate to true\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/item/ItemFactory.php
+
+		-
+			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/item/ItemFactory.php
+
 		-
 			message: "#^If condition is always false\\.$#"
 			count: 1
@@ -37,29 +47,19 @@ parameters:
 
 		-
 			message: "#^Call to function is_object\\(\\) with \\*NEVER\\* will always evaluate to true\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/item/ItemFactory.php
+			count: 2
+			path: ../../../src/pocketmine/level/Level.php
 
 		-
 			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/item/ItemFactory.php
+			count: 2
+			path: ../../../src/pocketmine/level/Level.php
 
 		-
 			message: "#^Instanceof between pocketmine\\\\math\\\\Vector3 and pocketmine\\\\math\\\\Vector3 will always evaluate to true\\.$#"
 			count: 2
 			path: ../../../src/pocketmine/level/Level.php
 
-		-
-			message: "#^Call to function is_object\\(\\) with \\*NEVER\\* will always evaluate to true\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/level/Level.php
-
-		-
-			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/level/Level.php
-
 		-
 			message: "#^Call to function is_subclass_of\\(\\) with class\\-string\\<pocketmine\\\\level\\\\generator\\\\Generator\\> and 'pocketmine\\\\\\\\level\\\\\\\\generator\\\\\\\\Generator' will always evaluate to true\\.$#"
 			count: 1