diff --git a/.github/workflows/branch-sync-cron-trigger.yml b/.github/workflows/branch-sync-cron-trigger.yml
new file mode 100644
index 000000000..145fcd222
--- /dev/null
+++ b/.github/workflows/branch-sync-cron-trigger.yml
@@ -0,0 +1,32 @@
+#Since GitHub automatically disables cron actions after 60 days of repo inactivity, we need the active repo (PM)
+#to trigger the branch merge workflow explicitly. This avoids the need for TOS-violating actions which we previously
+#used to keep the restricted action active, as the workflow depends on the activity of this repo anyway.
+
+name: Trigger branch sync
+
+on:
+  schedule:
+    - cron: "0 0 * * *" #once per day so we don't spam merge commits on busy days
+  workflow_dispatch: #for testing
+
+jobs:
+  trigger:
+    name: Trigger branch sync RestrictedActions workflow
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Generate access token
+        id: generate-token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ vars.RESTRICTED_ACTIONS_DISPATCH_ID }}
+          private-key: ${{ secrets.RESTRICTED_ACTIONS_DISPATCH_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: RestrictedActions
+
+      - name: Dispatch branch sync restricted action
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          repository: ${{ github.repository_owner }}/RestrictedActions
+          event-type: pocketmine_mp_branch_sync
diff --git a/.github/workflows/pr-remove-waiting-label.yml b/.github/workflows/pr-remove-waiting-label.yml
index eb46043bd..b7cd85acd 100644
--- a/.github/workflows/pr-remove-waiting-label.yml
+++ b/.github/workflows/pr-remove-waiting-label.yml
@@ -15,19 +15,23 @@ jobs:
         with:
           github-token: ${{ github.token }}
           script: |
-            const [owner, repo] = context.payload.repository.full_name.split('/');
-            try {
-              await github.rest.issues.removeLabel({
-                owner: owner,
-                repo: repo,
-                issue_number: context.payload.number,
-                name: "Status: Waiting on Author",
-              });
-            } catch (error) {
-              if (error.status === 404) {
-                //probably label wasn't set on the issue
-                console.log('Failed to remove label (probably label isn\'t on the PR): ' + error.message);
-              } else {
-                throw error;
+            async function removeLabel(owner, repo, issue_number, name) {
+              try {
+                await github.rest.issues.removeLabel({
+                  owner: owner,
+                  repo: repo,
+                  issue_number: issue_number,
+                  name: name,
+                });
+              } catch (error) {
+                if (error.status === 404) {
+                  //probably label wasn't set on the issue
+                  console.log('Failed to remove label ' + name + ' (probably label isn\'t on the PR): ' + error.message);
+                } else {
+                  throw error;
+                }
               }
             }
+            const [owner, repo] = context.payload.repository.full_name.split('/');
+            removeLabel(owner, repo, context.payload.number, "Status: Waiting on Author");
+            removeLabel(owner, repo, context.payload.number, "Stale");
diff --git a/changelogs/5.28.md b/changelogs/5.28.md
new file mode 100644
index 000000000..f378031f7
--- /dev/null
+++ b/changelogs/5.28.md
@@ -0,0 +1,34 @@
+# 5.28.0
+Released 9th May 2025.
+
+This is a support release for Minecraft: Bedrock Edition 1.21.80.
+
+**Plugin compatibility:** Plugins for previous 5.x versions will run unchanged on this release, unless they use internal APIs, reflection, or packages like the `pocketmine\network\mcpe` or `pocketmine\data` namespace.
+Do not update plugin minimum API versions unless you need new features added in this release.
+
+**WARNING: If your plugin uses the `pocketmine\network\mcpe` namespace, you're not shielded by API change constraints.**
+Consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you're using packets directly.
+
+## General
+- Added support for Minecraft: Bedrock Edition 1.21.80.
+- Removed support for earlier versions.
+
+## Fixes
+- `AvailableEnchantmentRegistry` now requires provided tags to always be `string`. Previously, this wasn't enforced, leading to random crashes in core code related to enchanting.
+- `Entity->setFireTicks()` and `Entity->setOnFire()` now truncate the fire time to the max value instead of throwing exceptions.
+
+## Internals
+- Improved PHPStan error reporting for unsafe foreaches. Foreach on an array with implicit keys now generates different errors than foreach on an array with string keys.
+
+# 5.28.1
+Released 17th May 2025.
+
+## Fixes
+- Fixed errors when PlayStation players attempt to join due to null `TitleID`.
+
+# 5.28.2
+Released 17th May 2025.
+
+## Fixes
+- Fixed version constraints which were incorrectly updated during the 1.21.80 update. This led to an unnoticed failure to update BedrockProtocol in the previous patch release.
+- Actually fixed PlayStation issues this time
diff --git a/composer.json b/composer.json
index 583116c0f..e205a0798 100644
--- a/composer.json
+++ b/composer.json
@@ -34,9 +34,9 @@
       "adhocore/json-comment": "~1.2.0",
       "netresearch/jsonmapper": "~v5.0.0",
       "pocketmine/bedrock-block-upgrade-schema": "~5.1.0+bedrock-1.21.60",
-      "pocketmine/bedrock-data": "~4.1.0+bedrock-1.21.70",
+      "pocketmine/bedrock-data": "~5.0.0+bedrock-1.21.80",
       "pocketmine/bedrock-item-upgrade-schema": "~1.14.0+bedrock-1.21.50",
-      "pocketmine/bedrock-protocol": "~37.0.0+bedrock-1.21.70",
+      "pocketmine/bedrock-protocol": "~38.0.0+bedrock-1.21.80",
       "pocketmine/binaryutils": "^0.2.1",
       "pocketmine/callback-validator": "^1.0.2",
       "pocketmine/color": "^0.3.0",
@@ -52,11 +52,15 @@
       "symfony/filesystem": "~6.4.0"
    },
    "require-dev": {
-      "phpstan/phpstan": "2.1.11",
+      "phpstan/phpstan": "2.1.16",
       "phpstan/phpstan-phpunit": "^2.0.0",
       "phpstan/phpstan-strict-rules": "^2.0.0",
       "phpunit/phpunit": "^10.5.24"
    },
+   "replace": {
+      "symfony/polyfill-ctype": "*",
+      "symfony/polyfill-mbstring": "*"
+   },
    "autoload": {
       "psr-4": {
          "pocketmine\\": "src/"
diff --git a/composer.lock b/composer.lock
index 23f312317..9cb0721fc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "818c679a25da8e6b466bc454ad48dec3",
+    "content-hash": "ceb98091ac3f61f1a4b87708c48dc75a",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -204,16 +204,16 @@
         },
         {
             "name": "pocketmine/bedrock-data",
-            "version": "4.1.0+bedrock-1.21.70",
+            "version": "5.0.0+bedrock-1.21.80",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/BedrockData.git",
-                "reference": "d53fe98cb3b596ac016e275df5bd5e89b04a4817"
+                "reference": "e38d5ea19f794ec5216e5f96742237e8c4e7f080"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/d53fe98cb3b596ac016e275df5bd5e89b04a4817",
-                "reference": "d53fe98cb3b596ac016e275df5bd5e89b04a4817",
+                "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/e38d5ea19f794ec5216e5f96742237e8c4e7f080",
+                "reference": "e38d5ea19f794ec5216e5f96742237e8c4e7f080",
                 "shasum": ""
             },
             "type": "library",
@@ -224,9 +224,9 @@
             "description": "Blobs of data generated from Minecraft: Bedrock Edition, used by PocketMine-MP",
             "support": {
                 "issues": "https://github.com/pmmp/BedrockData/issues",
-                "source": "https://github.com/pmmp/BedrockData/tree/bedrock-1.21.70"
+                "source": "https://github.com/pmmp/BedrockData/tree/bedrock-1.21.80"
             },
-            "time": "2025-03-25T19:43:31+00:00"
+            "time": "2025-05-09T14:15:18+00:00"
         },
         {
             "name": "pocketmine/bedrock-item-upgrade-schema",
@@ -256,16 +256,16 @@
         },
         {
             "name": "pocketmine/bedrock-protocol",
-            "version": "37.0.0+bedrock-1.21.70",
+            "version": "38.0.1+bedrock-1.21.80",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/BedrockProtocol.git",
-                "reference": "7091dad2c12ed4a4106432df21fc698960c6be9e"
+                "reference": "0c1c13e970a2e1ded1609d0b442b4fcfd24cd21f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/7091dad2c12ed4a4106432df21fc698960c6be9e",
-                "reference": "7091dad2c12ed4a4106432df21fc698960c6be9e",
+                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/0c1c13e970a2e1ded1609d0b442b4fcfd24cd21f",
+                "reference": "0c1c13e970a2e1ded1609d0b442b4fcfd24cd21f",
                 "shasum": ""
             },
             "require": {
@@ -296,9 +296,9 @@
             "description": "An implementation of the Minecraft: Bedrock Edition protocol in PHP",
             "support": {
                 "issues": "https://github.com/pmmp/BedrockProtocol/issues",
-                "source": "https://github.com/pmmp/BedrockProtocol/tree/37.0.0+bedrock-1.21.70"
+                "source": "https://github.com/pmmp/BedrockProtocol/tree/38.0.1+bedrock-1.21.80"
             },
-            "time": "2025-03-27T15:19:36+00:00"
+            "time": "2025-05-17T11:56:33+00:00"
         },
         {
             "name": "pocketmine/binaryutils",
@@ -973,180 +973,21 @@
                 }
             ],
             "time": "2024-10-25T15:07:50+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.31.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
-                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "provide": {
-                "ext-ctype": "*"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-09-09T11:45:10+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.31.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
-                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "provide": {
-                "ext-mbstring": "*"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-09-09T11:45:10+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "myclabs/deep-copy",
-            "version": "1.13.0",
+            "version": "1.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "024473a478be9df5fdaca2c793f2232fe788e414"
+                "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/024473a478be9df5fdaca2c793f2232fe788e414",
-                "reference": "024473a478be9df5fdaca2c793f2232fe788e414",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/1720ddd719e16cf0db4eb1c6eca108031636d46c",
+                "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c",
                 "shasum": ""
             },
             "require": {
@@ -1185,7 +1026,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.0"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.1"
             },
             "funding": [
                 {
@@ -1193,7 +1034,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-12T12:17:51+00:00"
+            "time": "2025-04-29T12:36:36+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -1373,16 +1214,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.11",
+            "version": "2.1.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "8ca5f79a8f63c49b2359065832a654e1ec70ac30"
+                "reference": "b8c1cf533cba0c305d91c6ccd23f3dd0566ba5f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8ca5f79a8f63c49b2359065832a654e1ec70ac30",
-                "reference": "8ca5f79a8f63c49b2359065832a654e1ec70ac30",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b8c1cf533cba0c305d91c6ccd23f3dd0566ba5f9",
+                "reference": "b8c1cf533cba0c305d91c6ccd23f3dd0566ba5f9",
                 "shasum": ""
             },
             "require": {
@@ -1427,7 +1268,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-24T13:45:00+00:00"
+            "time": "2025-05-16T09:40:10+00:00"
         },
         {
             "name": "phpstan/phpstan-phpunit",
@@ -1853,16 +1694,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.45",
+            "version": "10.5.46",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "bd68a781d8e30348bc297449f5234b3458267ae8"
+                "reference": "8080be387a5be380dda48c6f41cee4a13aadab3d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bd68a781d8e30348bc297449f5234b3458267ae8",
-                "reference": "bd68a781d8e30348bc297449f5234b3458267ae8",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8080be387a5be380dda48c6f41cee4a13aadab3d",
+                "reference": "8080be387a5be380dda48c6f41cee4a13aadab3d",
                 "shasum": ""
             },
             "require": {
@@ -1872,7 +1713,7 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.12.1",
+                "myclabs/deep-copy": "^1.13.1",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.1",
@@ -1934,7 +1775,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.45"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.46"
             },
             "funding": [
                 {
@@ -1945,12 +1786,20 @@
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
                 },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-06T16:08:12+00:00"
+            "time": "2025-05-02T06:46:24+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -2921,7 +2770,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
@@ -2952,7 +2801,7 @@
         "ext-zlib": ">=1.2.11",
         "composer-runtime-api": "^2.0"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "platform-overrides": {
         "php": "8.1.0"
     },
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index f93819d56..5bbbf982b 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -13,7 +13,7 @@ rules:
 	- pocketmine\phpstan\rules\DisallowDynamicNewRule
 	- pocketmine\phpstan\rules\DisallowForeachByReferenceRule
 	- pocketmine\phpstan\rules\ExplodeLimitRule
-	- pocketmine\phpstan\rules\UnsafeForeachArrayWithStringKeysRule
+	- pocketmine\phpstan\rules\UnsafeForeachRule
 #	- pocketmine\phpstan\rules\ThreadedSupportedTypesRule
 
 parameters:
diff --git a/src/VersionInfo.php b/src/VersionInfo.php
index 44238dba3..615024656 100644
--- a/src/VersionInfo.php
+++ b/src/VersionInfo.php
@@ -31,7 +31,7 @@ use function str_repeat;
 
 final class VersionInfo{
 	public const NAME = "PocketMine-MP";
-	public const BASE_VERSION = "5.27.2";
+	public const BASE_VERSION = "5.28.3";
 	public const IS_DEVELOPMENT_BUILD = true;
 	public const BUILD_CHANNEL = "stable";
 
diff --git a/src/data/bedrock/BedrockDataFiles.php b/src/data/bedrock/BedrockDataFiles.php
index 1ecb707cc..53bd9b11e 100644
--- a/src/data/bedrock/BedrockDataFiles.php
+++ b/src/data/bedrock/BedrockDataFiles.php
@@ -31,8 +31,7 @@ final class BedrockDataFiles{
 	}
 
 	public const BANNER_PATTERNS_JSON = BEDROCK_DATA_PATH . '/banner_patterns.json';
-	public const BIOME_DEFINITIONS_NBT = BEDROCK_DATA_PATH . '/biome_definitions.nbt';
-	public const BIOME_DEFINITIONS_FULL_NBT = BEDROCK_DATA_PATH . '/biome_definitions_full.nbt';
+	public const BIOME_DEFINITIONS_JSON = BEDROCK_DATA_PATH . '/biome_definitions.json';
 	public const BIOME_ID_MAP_JSON = BEDROCK_DATA_PATH . '/biome_id_map.json';
 	public const BLOCK_ID_TO_ITEM_ID_MAP_JSON = BEDROCK_DATA_PATH . '/block_id_to_item_id_map.json';
 	public const BLOCK_PROPERTIES_TABLE_JSON = BEDROCK_DATA_PATH . '/block_properties_table.json';
diff --git a/src/data/bedrock/WorldDataVersions.php b/src/data/bedrock/WorldDataVersions.php
new file mode 100644
index 000000000..e79478b11
--- /dev/null
+++ b/src/data/bedrock/WorldDataVersions.php
@@ -0,0 +1,66 @@
+<?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\data\bedrock;
+
+use pocketmine\world\format\io\leveldb\ChunkVersion;
+use pocketmine\world\format\io\leveldb\SubChunkVersion;
+
+/**
+ * All version infos related to current Minecraft data version support
+ * These are mostly related to world storage but may also influence network stuff
+ */
+final class WorldDataVersions{
+	/**
+	 * Bedrock version of the most recent backwards-incompatible change to blockstates.
+	 *
+	 * This is *NOT* the same as current game version. It should match the numbers in the
+	 * newest blockstate upgrade schema used in BedrockBlockUpgradeSchema.
+	 */
+	public const BLOCK_STATES =
+		(1 << 24) | //major
+		(21 << 16) | //minor
+		(60 << 8) | //patch
+		(33); //revision
+
+	public const CHUNK = ChunkVersion::v1_21_40;
+	public const SUBCHUNK = SubChunkVersion::PALETTED_MULTI;
+
+	public const STORAGE = 10;
+
+	/**
+	 * Highest NetworkVersion of Bedrock worlds currently supported by PocketMine-MP.
+	 *
+	 * This may be lower than the current protocol version if PocketMine-MP does not yet support features of the newer
+	 * version. This allows the protocol to be updated independently of world format support.
+	 */
+	public const NETWORK = 800;
+
+	public const LAST_OPENED_IN = [
+		1, //major
+		21, //minor
+		80, //patch
+		3, //revision
+		0 //is beta
+	];
+}
diff --git a/src/data/bedrock/block/BlockStateData.php b/src/data/bedrock/block/BlockStateData.php
index 600eba938..6cfcfee6c 100644
--- a/src/data/bedrock/block/BlockStateData.php
+++ b/src/data/bedrock/block/BlockStateData.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\data\bedrock\block;
 
+use pocketmine\data\bedrock\WorldDataVersions;
 use pocketmine\nbt\NbtException;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\Tag;
@@ -36,17 +37,7 @@ use function implode;
  * Contains the common information found in a serialized blockstate.
  */
 final class BlockStateData{
-	/**
-	 * Bedrock version of the most recent backwards-incompatible change to blockstates.
-	 *
-	 * This is *not* the same as current game version. It should match the numbers in the
-	 * newest blockstate upgrade schema used in BedrockBlockUpgradeSchema.
-	 */
-	public const CURRENT_VERSION =
-		(1 << 24) | //major
-		(21 << 16) | //minor
-		(70 << 8) | //patch
-		(1); //revision
+	public const CURRENT_VERSION = WorldDataVersions::BLOCK_STATES;
 
 	public const TAG_NAME = "name";
 	public const TAG_STATES = "states";
diff --git a/src/data/bedrock/block/BlockStateNames.php b/src/data/bedrock/block/BlockStateNames.php
index 9fed77e4a..704798d1d 100644
--- a/src/data/bedrock/block/BlockStateNames.php
+++ b/src/data/bedrock/block/BlockStateNames.php
@@ -113,6 +113,7 @@ final class BlockStateNames{
 	public const RAIL_DATA_BIT = "rail_data_bit";
 	public const RAIL_DIRECTION = "rail_direction";
 	public const REDSTONE_SIGNAL = "redstone_signal";
+	public const REHYDRATION_LEVEL = "rehydration_level";
 	public const REPEATER_DELAY = "repeater_delay";
 	public const RESPAWN_ANCHOR_CHARGE = "respawn_anchor_charge";
 	public const ROTATION = "rotation";
diff --git a/src/data/bedrock/block/BlockTypeNames.php b/src/data/bedrock/block/BlockTypeNames.php
index bc30800fc..527a01345 100644
--- a/src/data/bedrock/block/BlockTypeNames.php
+++ b/src/data/bedrock/block/BlockTypeNames.php
@@ -392,6 +392,7 @@ final class BlockTypeNames{
 	public const DOUBLE_CUT_COPPER_SLAB = "minecraft:double_cut_copper_slab";
 	public const DRAGON_EGG = "minecraft:dragon_egg";
 	public const DRAGON_HEAD = "minecraft:dragon_head";
+	public const DRIED_GHAST = "minecraft:dried_ghast";
 	public const DRIED_KELP_BLOCK = "minecraft:dried_kelp_block";
 	public const DRIPSTONE_BLOCK = "minecraft:dripstone_block";
 	public const DROPPER = "minecraft:dropper";
diff --git a/src/data/bedrock/item/ItemTypeNames.php b/src/data/bedrock/item/ItemTypeNames.php
index ea95d57f0..5f86cde96 100644
--- a/src/data/bedrock/item/ItemTypeNames.php
+++ b/src/data/bedrock/item/ItemTypeNames.php
@@ -68,6 +68,7 @@ final class ItemTypeNames{
 	public const BIRCH_SIGN = "minecraft:birch_sign";
 	public const BLACK_BUNDLE = "minecraft:black_bundle";
 	public const BLACK_DYE = "minecraft:black_dye";
+	public const BLACK_HARNESS = "minecraft:black_harness";
 	public const BLADE_POTTERY_SHERD = "minecraft:blade_pottery_sherd";
 	public const BLAZE_POWDER = "minecraft:blaze_powder";
 	public const BLAZE_ROD = "minecraft:blaze_rod";
@@ -76,6 +77,7 @@ final class ItemTypeNames{
 	public const BLUE_BUNDLE = "minecraft:blue_bundle";
 	public const BLUE_DYE = "minecraft:blue_dye";
 	public const BLUE_EGG = "minecraft:blue_egg";
+	public const BLUE_HARNESS = "minecraft:blue_harness";
 	public const BOARD = "minecraft:board";
 	public const BOAT = "minecraft:boat";
 	public const BOGGED_SPAWN_EGG = "minecraft:bogged_spawn_egg";
@@ -95,6 +97,7 @@ final class ItemTypeNames{
 	public const BROWN_BUNDLE = "minecraft:brown_bundle";
 	public const BROWN_DYE = "minecraft:brown_dye";
 	public const BROWN_EGG = "minecraft:brown_egg";
+	public const BROWN_HARNESS = "minecraft:brown_harness";
 	public const BRUSH = "minecraft:brush";
 	public const BUCKET = "minecraft:bucket";
 	public const BUNDLE = "minecraft:bundle";
@@ -166,6 +169,7 @@ final class ItemTypeNames{
 	public const CROSSBOW = "minecraft:crossbow";
 	public const CYAN_BUNDLE = "minecraft:cyan_bundle";
 	public const CYAN_DYE = "minecraft:cyan_dye";
+	public const CYAN_HARNESS = "minecraft:cyan_harness";
 	public const DANGER_POTTERY_SHERD = "minecraft:danger_pottery_sherd";
 	public const DARK_OAK_BOAT = "minecraft:dark_oak_boat";
 	public const DARK_OAK_CHEST_BOAT = "minecraft:dark_oak_chest_boat";
@@ -265,12 +269,15 @@ final class ItemTypeNames{
 	public const GOLDEN_SWORD = "minecraft:golden_sword";
 	public const GRAY_BUNDLE = "minecraft:gray_bundle";
 	public const GRAY_DYE = "minecraft:gray_dye";
+	public const GRAY_HARNESS = "minecraft:gray_harness";
 	public const GREEN_BUNDLE = "minecraft:green_bundle";
 	public const GREEN_DYE = "minecraft:green_dye";
+	public const GREEN_HARNESS = "minecraft:green_harness";
 	public const GUARDIAN_SPAWN_EGG = "minecraft:guardian_spawn_egg";
 	public const GUNPOWDER = "minecraft:gunpowder";
 	public const GUSTER_BANNER_PATTERN = "minecraft:guster_banner_pattern";
 	public const GUSTER_POTTERY_SHERD = "minecraft:guster_pottery_sherd";
+	public const HAPPY_GHAST_SPAWN_EGG = "minecraft:happy_ghast_spawn_egg";
 	public const HARD_STAINED_GLASS = "minecraft:hard_stained_glass";
 	public const HARD_STAINED_GLASS_PANE = "minecraft:hard_stained_glass_pane";
 	public const HEART_OF_THE_SEA = "minecraft:heart_of_the_sea";
@@ -321,10 +328,13 @@ final class ItemTypeNames{
 	public const LIGHT_BLOCK = "minecraft:light_block";
 	public const LIGHT_BLUE_BUNDLE = "minecraft:light_blue_bundle";
 	public const LIGHT_BLUE_DYE = "minecraft:light_blue_dye";
+	public const LIGHT_BLUE_HARNESS = "minecraft:light_blue_harness";
 	public const LIGHT_GRAY_BUNDLE = "minecraft:light_gray_bundle";
 	public const LIGHT_GRAY_DYE = "minecraft:light_gray_dye";
+	public const LIGHT_GRAY_HARNESS = "minecraft:light_gray_harness";
 	public const LIME_BUNDLE = "minecraft:lime_bundle";
 	public const LIME_DYE = "minecraft:lime_dye";
+	public const LIME_HARNESS = "minecraft:lime_harness";
 	public const LINGERING_POTION = "minecraft:lingering_potion";
 	public const LLAMA_SPAWN_EGG = "minecraft:llama_spawn_egg";
 	public const LODESTONE_COMPASS = "minecraft:lodestone_compass";
@@ -333,6 +343,7 @@ final class ItemTypeNames{
 	public const MACE = "minecraft:mace";
 	public const MAGENTA_BUNDLE = "minecraft:magenta_bundle";
 	public const MAGENTA_DYE = "minecraft:magenta_dye";
+	public const MAGENTA_HARNESS = "minecraft:magenta_harness";
 	public const MAGMA_CREAM = "minecraft:magma_cream";
 	public const MAGMA_CUBE_SPAWN_EGG = "minecraft:magma_cube_spawn_egg";
 	public const MANGROVE_BOAT = "minecraft:mangrove_boat";
@@ -400,6 +411,7 @@ final class ItemTypeNames{
 	public const OMINOUS_TRIAL_KEY = "minecraft:ominous_trial_key";
 	public const ORANGE_BUNDLE = "minecraft:orange_bundle";
 	public const ORANGE_DYE = "minecraft:orange_dye";
+	public const ORANGE_HARNESS = "minecraft:orange_harness";
 	public const OXIDIZED_COPPER_DOOR = "minecraft:oxidized_copper_door";
 	public const PAINTING = "minecraft:painting";
 	public const PALE_OAK_BOAT = "minecraft:pale_oak_boat";
@@ -419,6 +431,7 @@ final class ItemTypeNames{
 	public const PILLAGER_SPAWN_EGG = "minecraft:pillager_spawn_egg";
 	public const PINK_BUNDLE = "minecraft:pink_bundle";
 	public const PINK_DYE = "minecraft:pink_dye";
+	public const PINK_HARNESS = "minecraft:pink_harness";
 	public const PITCHER_POD = "minecraft:pitcher_pod";
 	public const PLANKS = "minecraft:planks";
 	public const PLENTY_POTTERY_SHERD = "minecraft:plenty_pottery_sherd";
@@ -439,6 +452,7 @@ final class ItemTypeNames{
 	public const PUMPKIN_SEEDS = "minecraft:pumpkin_seeds";
 	public const PURPLE_BUNDLE = "minecraft:purple_bundle";
 	public const PURPLE_DYE = "minecraft:purple_dye";
+	public const PURPLE_HARNESS = "minecraft:purple_harness";
 	public const QUARTZ = "minecraft:quartz";
 	public const RABBIT = "minecraft:rabbit";
 	public const RABBIT_FOOT = "minecraft:rabbit_foot";
@@ -455,6 +469,7 @@ final class ItemTypeNames{
 	public const RED_BUNDLE = "minecraft:red_bundle";
 	public const RED_DYE = "minecraft:red_dye";
 	public const RED_FLOWER = "minecraft:red_flower";
+	public const RED_HARNESS = "minecraft:red_harness";
 	public const REDSTONE = "minecraft:redstone";
 	public const REPEATER = "minecraft:repeater";
 	public const RESIN_BRICK = "minecraft:resin_brick";
@@ -563,6 +578,7 @@ final class ItemTypeNames{
 	public const WHEAT_SEEDS = "minecraft:wheat_seeds";
 	public const WHITE_BUNDLE = "minecraft:white_bundle";
 	public const WHITE_DYE = "minecraft:white_dye";
+	public const WHITE_HARNESS = "minecraft:white_harness";
 	public const WILD_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:wild_armor_trim_smithing_template";
 	public const WIND_CHARGE = "minecraft:wind_charge";
 	public const WITCH_SPAWN_EGG = "minecraft:witch_spawn_egg";
@@ -583,6 +599,7 @@ final class ItemTypeNames{
 	public const WRITTEN_BOOK = "minecraft:written_book";
 	public const YELLOW_BUNDLE = "minecraft:yellow_bundle";
 	public const YELLOW_DYE = "minecraft:yellow_dye";
+	public const YELLOW_HARNESS = "minecraft:yellow_harness";
 	public const ZOGLIN_SPAWN_EGG = "minecraft:zoglin_spawn_egg";
 	public const ZOMBIE_HORSE_SPAWN_EGG = "minecraft:zombie_horse_spawn_egg";
 	public const ZOMBIE_PIGMAN_SPAWN_EGG = "minecraft:zombie_pigman_spawn_egg";
diff --git a/src/event/server/CommandEvent.php b/src/event/server/CommandEvent.php
index 1881ad496..f8feb6808 100644
--- a/src/event/server/CommandEvent.php
+++ b/src/event/server/CommandEvent.php
@@ -26,6 +26,7 @@ namespace pocketmine\event\server;
 use pocketmine\command\CommandSender;
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
+use pocketmine\event\Event;
 
 /**
  * Called when any CommandSender runs a command, before it is parsed.
@@ -41,7 +42,7 @@ use pocketmine\event\CancellableTrait;
  *
  * The message DOES NOT begin with a slash.
  */
-class CommandEvent extends ServerEvent implements Cancellable{
+class CommandEvent extends Event implements Cancellable{
 	use CancellableTrait;
 
 	public function __construct(
diff --git a/src/event/server/DataPacketDecodeEvent.php b/src/event/server/DataPacketDecodeEvent.php
index 44aefbb91..9a3b9be21 100644
--- a/src/event/server/DataPacketDecodeEvent.php
+++ b/src/event/server/DataPacketDecodeEvent.php
@@ -25,13 +25,14 @@ namespace pocketmine\event\server;
 
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
+use pocketmine\event\Event;
 use pocketmine\network\mcpe\NetworkSession;
 
 /**
  * Called before a packet is decoded and handled by the network session.
  * Cancelling this event will drop the packet without decoding it, minimizing wasted CPU time.
  */
-class DataPacketDecodeEvent extends ServerEvent implements Cancellable{
+class DataPacketDecodeEvent extends Event implements Cancellable{
 	use CancellableTrait;
 
 	public function __construct(
diff --git a/src/event/server/DataPacketReceiveEvent.php b/src/event/server/DataPacketReceiveEvent.php
index 17224003d..41d2a2445 100644
--- a/src/event/server/DataPacketReceiveEvent.php
+++ b/src/event/server/DataPacketReceiveEvent.php
@@ -25,10 +25,11 @@ namespace pocketmine\event\server;
 
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
+use pocketmine\event\Event;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\ServerboundPacket;
 
-class DataPacketReceiveEvent extends ServerEvent implements Cancellable{
+class DataPacketReceiveEvent extends Event implements Cancellable{
 	use CancellableTrait;
 
 	public function __construct(
diff --git a/src/event/server/DataPacketSendEvent.php b/src/event/server/DataPacketSendEvent.php
index 147d99db3..d46990015 100644
--- a/src/event/server/DataPacketSendEvent.php
+++ b/src/event/server/DataPacketSendEvent.php
@@ -25,6 +25,7 @@ namespace pocketmine\event\server;
 
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
+use pocketmine\event\Event;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\utils\Utils;
@@ -32,7 +33,7 @@ use pocketmine\utils\Utils;
 /**
  * Called when packets are sent to network sessions.
  */
-class DataPacketSendEvent extends ServerEvent implements Cancellable{
+class DataPacketSendEvent extends Event implements Cancellable{
 	use CancellableTrait;
 
 	/**
diff --git a/src/event/server/LowMemoryEvent.php b/src/event/server/LowMemoryEvent.php
index aea9afa80..a30e747e5 100644
--- a/src/event/server/LowMemoryEvent.php
+++ b/src/event/server/LowMemoryEvent.php
@@ -23,13 +23,14 @@ declare(strict_types=1);
 
 namespace pocketmine\event\server;
 
+use pocketmine\event\Event;
 use pocketmine\utils\Process;
 
 /**
  * Called when the server is in a low-memory state as defined by the properties
  * Plugins should free caches or other non-essential data.
  */
-class LowMemoryEvent extends ServerEvent{
+class LowMemoryEvent extends Event{
 	public function __construct(
 		private int $memory,
 		private int $memoryLimit,
diff --git a/src/event/server/NetworkInterfaceEvent.php b/src/event/server/NetworkInterfaceEvent.php
index 5c1675f19..2278c1bc2 100644
--- a/src/event/server/NetworkInterfaceEvent.php
+++ b/src/event/server/NetworkInterfaceEvent.php
@@ -23,9 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\event\server;
 
+use pocketmine\event\Event;
 use pocketmine\network\NetworkInterface;
 
-class NetworkInterfaceEvent extends ServerEvent{
+class NetworkInterfaceEvent extends Event{
 	public function __construct(
 		protected NetworkInterface $interface
 	){}
diff --git a/src/event/server/QueryRegenerateEvent.php b/src/event/server/QueryRegenerateEvent.php
index c51bc5054..02146621a 100644
--- a/src/event/server/QueryRegenerateEvent.php
+++ b/src/event/server/QueryRegenerateEvent.php
@@ -23,9 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\event\server;
 
+use pocketmine\event\Event;
 use pocketmine\network\query\QueryInfo;
 
-class QueryRegenerateEvent extends ServerEvent{
+class QueryRegenerateEvent extends Event{
 	public function __construct(private QueryInfo $queryInfo){}
 
 	public function getQueryInfo() : QueryInfo{
diff --git a/src/event/server/UpdateNotifyEvent.php b/src/event/server/UpdateNotifyEvent.php
index 9a36a8bc8..f9b756546 100644
--- a/src/event/server/UpdateNotifyEvent.php
+++ b/src/event/server/UpdateNotifyEvent.php
@@ -23,13 +23,14 @@ declare(strict_types=1);
 
 namespace pocketmine\event\server;
 
+use pocketmine\event\Event;
 use pocketmine\updater\UpdateChecker;
 
 /**
  * Called when the update checker receives notification of an available PocketMine-MP update.
  * Plugins may use this event to perform actions when an update notification is received.
  */
-class UpdateNotifyEvent extends ServerEvent{
+class UpdateNotifyEvent extends Event{
 	public function __construct(private UpdateChecker $updater){}
 
 	public function getUpdater() : UpdateChecker{
diff --git a/src/network/mcpe/cache/StaticPacketCache.php b/src/network/mcpe/cache/StaticPacketCache.php
index 88a522600..861881437 100644
--- a/src/network/mcpe/cache/StaticPacketCache.php
+++ b/src/network/mcpe/cache/StaticPacketCache.php
@@ -23,13 +23,22 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\cache;
 
+use pocketmine\color\Color;
 use pocketmine\data\bedrock\BedrockDataFiles;
+use pocketmine\data\SavedDataLoadingException;
 use pocketmine\network\mcpe\protocol\AvailableActorIdentifiersPacket;
 use pocketmine\network\mcpe\protocol\BiomeDefinitionListPacket;
 use pocketmine\network\mcpe\protocol\serializer\NetworkNbtSerializer;
+use pocketmine\network\mcpe\protocol\types\biome\BiomeDefinitionEntry;
 use pocketmine\network\mcpe\protocol\types\CacheableNbt;
 use pocketmine\utils\Filesystem;
 use pocketmine\utils\SingletonTrait;
+use pocketmine\utils\Utils;
+use pocketmine\world\biome\model\BiomeDefinitionEntryData;
+use function count;
+use function get_debug_type;
+use function is_array;
+use function json_decode;
 
 class StaticPacketCache{
 	use SingletonTrait;
@@ -41,9 +50,61 @@ class StaticPacketCache{
 		return new CacheableNbt((new NetworkNbtSerializer())->read(Filesystem::fileGetContents($filePath))->mustGetCompoundTag());
 	}
 
+	/**
+	 * @return list<BiomeDefinitionEntry>
+	 */
+	private static function loadBiomeDefinitionModel(string $filePath) : array{
+		$biomeEntries = json_decode(Filesystem::fileGetContents($filePath), associative: true);
+		if(!is_array($biomeEntries)){
+			throw new SavedDataLoadingException("$filePath root should be an array, got " . get_debug_type($biomeEntries));
+		}
+
+		$jsonMapper = new \JsonMapper();
+		$jsonMapper->bExceptionOnMissingData = true;
+		$jsonMapper->bStrictObjectTypeChecking = true;
+		$jsonMapper->bEnforceMapType = false;
+
+		$entries = [];
+		foreach(Utils::promoteKeys($biomeEntries) as $biomeName => $entry){
+			if(!is_array($entry)){
+				throw new SavedDataLoadingException("$filePath should be an array of objects, got " . get_debug_type($entry));
+			}
+
+			try{
+				$biomeDefinition = $jsonMapper->map($entry, new BiomeDefinitionEntryData());
+
+				$mapWaterColour = $biomeDefinition->mapWaterColour;
+				$entries[] = new BiomeDefinitionEntry(
+					(string) $biomeName,
+					$biomeDefinition->id,
+					$biomeDefinition->temperature,
+					$biomeDefinition->downfall,
+					$biomeDefinition->redSporeDensity,
+					$biomeDefinition->blueSporeDensity,
+					$biomeDefinition->ashDensity,
+					$biomeDefinition->whiteAshDensity,
+					$biomeDefinition->depth,
+					$biomeDefinition->scale,
+					new Color(
+						$mapWaterColour->r,
+						$mapWaterColour->g,
+						$mapWaterColour->b,
+						$mapWaterColour->a
+					),
+					$biomeDefinition->rain,
+					count($biomeDefinition->tags) > 0 ? $biomeDefinition->tags : null,
+				);
+			}catch(\JsonMapper_Exception $e){
+				throw new \RuntimeException($e->getMessage(), 0, $e);
+			}
+		}
+
+		return $entries;
+	}
+
 	private static function make() : self{
 		return new self(
-			BiomeDefinitionListPacket::create(self::loadCompoundFromFile(BedrockDataFiles::BIOME_DEFINITIONS_NBT)),
+			BiomeDefinitionListPacket::fromDefinitions(self::loadBiomeDefinitionModel(BedrockDataFiles::BIOME_DEFINITIONS_JSON)),
 			AvailableActorIdentifiersPacket::create(self::loadCompoundFromFile(BedrockDataFiles::ENTITY_IDENTIFIERS_NBT))
 		);
 	}
diff --git a/src/network/mcpe/handler/InGamePacketHandler.php b/src/network/mcpe/handler/InGamePacketHandler.php
index 93a01fdcc..eec200e4b 100644
--- a/src/network/mcpe/handler/InGamePacketHandler.php
+++ b/src/network/mcpe/handler/InGamePacketHandler.php
@@ -73,7 +73,6 @@ use pocketmine\network\mcpe\protocol\NetworkStackLatencyPacket;
 use pocketmine\network\mcpe\protocol\PlayerActionPacket;
 use pocketmine\network\mcpe\protocol\PlayerAuthInputPacket;
 use pocketmine\network\mcpe\protocol\PlayerHotbarPacket;
-use pocketmine\network\mcpe\protocol\PlayerInputPacket;
 use pocketmine\network\mcpe\protocol\PlayerSkinPacket;
 use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket;
 use pocketmine\network\mcpe\protocol\serializer\BitSet;
@@ -781,10 +780,6 @@ class InGamePacketHandler extends PacketHandler{
 		return false;
 	}
 
-	public function handlePlayerInput(PlayerInputPacket $packet) : bool{
-		return false; //TODO
-	}
-
 	public function handleSetPlayerGameType(SetPlayerGameTypePacket $packet) : bool{
 		$gameMode = $this->session->getTypeConverter()->protocolGameModeToCore($packet->gamemode);
 		if($gameMode !== $this->player->getGamemode()){
diff --git a/src/thread/CommonThreadPartsTrait.php b/src/thread/CommonThreadPartsTrait.php
index e1c9d7c6b..de606a7b2 100644
--- a/src/thread/CommonThreadPartsTrait.php
+++ b/src/thread/CommonThreadPartsTrait.php
@@ -94,7 +94,17 @@ trait CommonThreadPartsTrait{
 		}
 	}
 
-	public function getCrashInfo() : ?ThreadCrashInfo{ return $this->crashInfo; }
+	public function getCrashInfo() : ?ThreadCrashInfo{
+		//TODO: Joining a crashed worker might be a bit sus, but we need to make sure the thread's shutdown
+		//handler has run before we try to collect the crash info. As of 6.1.1, pmmpthread sets isTerminated=true
+		//*before* the shutdown handler is invoked, so we might land here before the crash info has been set.
+		//In the future this should probably be fixed by running the shutdown handlers before setting isTerminated,
+		//but this workaround should be good enough for now.
+		if($this->isTerminated() && !$this->isJoined()){
+			$this->join();
+		}
+		return $this->crashInfo;
+	}
 
 	public function start(int $options = NativeThread::INHERIT_NONE) : bool{
 		ThreadManager::getInstance()->add($this);
diff --git a/src/thread/ThreadCrashInfo.php b/src/thread/ThreadCrashInfo.php
index 66aae927a..6fffdc83b 100644
--- a/src/thread/ThreadCrashInfo.php
+++ b/src/thread/ThreadCrashInfo.php
@@ -84,6 +84,6 @@ final class ThreadCrashInfo extends ThreadSafe{
 	public function getThreadName() : string{ return $this->threadName; }
 
 	public function makePrettyMessage() : string{
-		return sprintf("%s: \"%s\" in \"%s\" on line %d", $this->type ?? "Fatal error", $this->message, Filesystem::cleanPath($this->file), $this->line);
+		return sprintf("%s: \"%s\" in \"%s\" on line %d", $this->type, $this->message, Filesystem::cleanPath($this->file), $this->line);
 	}
 }
diff --git a/src/world/biome/model/BiomeDefinitionEntryData.php b/src/world/biome/model/BiomeDefinitionEntryData.php
new file mode 100644
index 000000000..8a5c3d354
--- /dev/null
+++ b/src/world/biome/model/BiomeDefinitionEntryData.php
@@ -0,0 +1,69 @@
+<?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\world\biome\model;
+
+/**
+ * Model for loading biome definition entries data from JSON.
+ */
+final class BiomeDefinitionEntryData{
+	/** @required */
+	public ?int $id;
+
+	/** @required */
+	public float $temperature;
+
+	/** @required */
+	public float $downfall;
+
+	/** @required */
+	public float $redSporeDensity;
+
+	/** @required */
+	public float $blueSporeDensity;
+
+	/** @required */
+	public float $ashDensity;
+
+	/** @required */
+	public float $whiteAshDensity;
+
+	/** @required */
+	public float $depth;
+
+	/** @required */
+	public float $scale;
+
+	/** @required */
+	public ColorData $mapWaterColour;
+
+	/** @required */
+	public bool $rain;
+
+	/**
+	 * @required
+	 * @var string[]
+	 * @phpstan-var list<string>
+	 */
+	public array $tags;
+}
diff --git a/src/event/server/ServerEvent.php b/src/world/biome/model/ColorData.php
similarity index 75%
rename from src/event/server/ServerEvent.php
rename to src/world/biome/model/ColorData.php
index 97e79279d..f70a77d15 100644
--- a/src/event/server/ServerEvent.php
+++ b/src/world/biome/model/ColorData.php
@@ -21,13 +21,21 @@
 
 declare(strict_types=1);
 
+namespace pocketmine\world\biome\model;
+
 /**
- * Events related to the server core, like networking, stop, console commands
+ * Model for loading color data from JSON.
  */
-namespace pocketmine\event\server;
+final class ColorData{
+	/** @required */
+	public int $r;
 
-use pocketmine\event\Event;
+	/** @required */
+	public int $g;
 
-abstract class ServerEvent extends Event{
+	/** @required */
+	public int $b;
 
+	/** @required */
+	public int $a;
 }
diff --git a/src/world/format/io/data/BedrockWorldData.php b/src/world/format/io/data/BedrockWorldData.php
index 5b1945739..68eb6dc81 100644
--- a/src/world/format/io/data/BedrockWorldData.php
+++ b/src/world/format/io/data/BedrockWorldData.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\world\format\io\data;
 
+use pocketmine\data\bedrock\WorldDataVersions;
 use pocketmine\nbt\LittleEndianNbtSerializer;
 use pocketmine\nbt\NbtDataException;
 use pocketmine\nbt\tag\CompoundTag;
@@ -50,15 +51,9 @@ use function time;
 
 class BedrockWorldData extends BaseNbtWorldData{
 
-	public const CURRENT_STORAGE_VERSION = 10;
-	public const CURRENT_STORAGE_NETWORK_VERSION = 786;
-	public const CURRENT_CLIENT_VERSION_TARGET = [
-		1, //major
-		21, //minor
-		70, //patch
-		3, //revision
-		0 //is beta
-	];
+	public const CURRENT_STORAGE_VERSION = WorldDataVersions::STORAGE;
+	public const CURRENT_STORAGE_NETWORK_VERSION = WorldDataVersions::NETWORK;
+	public const CURRENT_CLIENT_VERSION_TARGET = WorldDataVersions::LAST_OPENED_IN;
 
 	public const GENERATOR_LIMITED = 0;
 	public const GENERATOR_INFINITE = 1;
diff --git a/src/world/format/io/leveldb/LevelDB.php b/src/world/format/io/leveldb/LevelDB.php
index 41c477867..6223e66b8 100644
--- a/src/world/format/io/leveldb/LevelDB.php
+++ b/src/world/format/io/leveldb/LevelDB.php
@@ -27,6 +27,7 @@ use pocketmine\block\Block;
 use pocketmine\data\bedrock\BiomeIds;
 use pocketmine\data\bedrock\block\BlockStateDeserializeException;
 use pocketmine\data\bedrock\block\convert\UnsupportedBlockStateException;
+use pocketmine\data\bedrock\WorldDataVersions;
 use pocketmine\nbt\LittleEndianNbtSerializer;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\NbtDataException;
@@ -78,8 +79,8 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 
 	protected const ENTRY_FLAT_WORLD_LAYERS = "game_flatworldlayers";
 
-	protected const CURRENT_LEVEL_CHUNK_VERSION = ChunkVersion::v1_21_40;
-	protected const CURRENT_LEVEL_SUBCHUNK_VERSION = SubChunkVersion::PALETTED_MULTI;
+	protected const CURRENT_LEVEL_CHUNK_VERSION = WorldDataVersions::CHUNK;
+	protected const CURRENT_LEVEL_SUBCHUNK_VERSION = WorldDataVersions::SUBCHUNK;
 
 	private const CAVES_CLIFFS_EXPERIMENTAL_SUBCHUNK_KEY_OFFSET = 4;
 
diff --git a/tests/phpstan/rules/UnsafeForeachArrayWithStringKeysRule.php b/tests/phpstan/rules/UnsafeForeachRule.php
similarity index 69%
rename from tests/phpstan/rules/UnsafeForeachArrayWithStringKeysRule.php
rename to tests/phpstan/rules/UnsafeForeachRule.php
index 83f47f092..cb463c61d 100644
--- a/tests/phpstan/rules/UnsafeForeachArrayWithStringKeysRule.php
+++ b/tests/phpstan/rules/UnsafeForeachRule.php
@@ -41,7 +41,7 @@ use function sprintf;
 /**
  * @implements Rule<Foreach_>
  */
-final class UnsafeForeachArrayWithStringKeysRule implements Rule{
+final class UnsafeForeachRule implements Rule{
 
 	public function getNodeType() : string{
 		return Foreach_::class;
@@ -73,7 +73,7 @@ final class UnsafeForeachArrayWithStringKeysRule implements Rule{
 				$benevolentUnionDepth--;
 				return $result;
 			}
-			if($type instanceof IntegerType && $benevolentUnionDepth === 0){
+			if($type instanceof IntegerType){
 				$expectsIntKeyTypes = true;
 				return $type;
 			}
@@ -87,24 +87,31 @@ final class UnsafeForeachArrayWithStringKeysRule implements Rule{
 			$hasCastableKeyTypes = true;
 			return $type;
 		});
-		if($hasCastableKeyTypes && !$expectsIntKeyTypes){
-			$tip = $implicitType ?
-				sprintf(
-					"Declare a key type using @phpstan-var or @phpstan-param, or use %s() to promote the key type to get proper error reporting",
+		$errors = [];
+		if($implicitType){
+			$errors[] = RuleErrorBuilder::message("Possible unreported errors in foreach on array with unspecified key type.")
+				->tip(sprintf(
+					<<<TIP
+PHPStan might not be reporting some type errors if the key type is not specified.
+Declare a key type using @phpstan-var or @phpstan-param, or use %s() to force PHPStan to report proper errors.
+TIP,
 					Utils::getNiceClosureName(Utils::promoteKeys(...))
-				) :
-				sprintf(
-					"Use %s() to get a \Generator that will force the keys to string",
-					Utils::getNiceClosureName(Utils::stringifyKeys(...)),
-				);
-			return [
-				RuleErrorBuilder::message(sprintf(
-					"Unsafe foreach on array with key type %s (they might be casted to int).",
-					$iterableType->getIterableKeyType()->describe(VerbosityLevel::value())
-				))->tip($tip)->identifier('pocketmine.foreach.stringKeys')->build()
-			];
+				))->identifier('pocketmine.foreach.implicitKeys')->build();
 		}
-		return [];
+		if($hasCastableKeyTypes && !$expectsIntKeyTypes){
+			$errors[] = RuleErrorBuilder::message(sprintf(
+				"Unsafe foreach on array with key type %s.",
+				$iterableType->getIterableKeyType()->describe(VerbosityLevel::value())
+			))
+				->tip(sprintf(
+					<<<TIP
+PHP coerces numeric strings to integers when used as array keys, which can lead to unexpected type errors when passing the key to a function.
+Use %s() to wrap the array in a \Generator that will force the keys back to string during iteration.
+TIP,
+					Utils::getNiceClosureName(Utils::stringifyKeys(...))
+				))->identifier('pocketmine.foreach.stringKeys')->build();
+		}
+		return $errors;
 	}
 
 }
diff --git a/tools/generate-bedrock-data-from-packets.php b/tools/generate-bedrock-data-from-packets.php
index 50639f51d..b0aae57df 100644
--- a/tools/generate-bedrock-data-from-packets.php
+++ b/tools/generate-bedrock-data-from-packets.php
@@ -54,7 +54,6 @@ use pocketmine\network\mcpe\protocol\PacketPool;
 use pocketmine\network\mcpe\protocol\serializer\ItemTypeDictionary;
 use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
 use pocketmine\network\mcpe\protocol\StartGamePacket;
-use pocketmine\network\mcpe\protocol\types\CacheableNbt;
 use pocketmine\network\mcpe\protocol\types\inventory\CreativeGroupEntry;
 use pocketmine\network\mcpe\protocol\types\inventory\ItemStack;
 use pocketmine\network\mcpe\protocol\types\inventory\ItemStackExtraData;
@@ -76,6 +75,8 @@ use pocketmine\network\PacketHandlingException;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Filesystem;
 use pocketmine\utils\Utils;
+use pocketmine\world\biome\model\BiomeDefinitionEntryData;
+use pocketmine\world\biome\model\ColorData;
 use pocketmine\world\format\io\GlobalBlockStateHandlers;
 use Ramsey\Uuid\Exception\InvalidArgumentException;
 use Symfony\Component\Filesystem\Path;
@@ -100,6 +101,7 @@ use function json_encode;
 use function ksort;
 use function mkdir;
 use function ord;
+use function round;
 use function strlen;
 use const FILE_IGNORE_NEW_LINES;
 use const JSON_PRETTY_PRINT;
@@ -572,34 +574,34 @@ class ParserPacketHandler extends PacketHandler{
 	public function handleBiomeDefinitionList(BiomeDefinitionListPacket $packet) : bool{
 		echo "storing biome definitions" . PHP_EOL;
 
-		file_put_contents($this->bedrockDataPath . '/biome_definitions_full.nbt', $packet->definitions->getEncodedNbt());
+		$definitions = [];
+		foreach($packet->buildDefinitionsFromData() as $entry){
+			$mapWaterColor = new ColorData();
+			$mapWaterColor->r = $entry->getMapWaterColor()->getR();
+			$mapWaterColor->g = $entry->getMapWaterColor()->getG();
+			$mapWaterColor->b = $entry->getMapWaterColor()->getB();
+			$mapWaterColor->a = $entry->getMapWaterColor()->getA();
 
-		$nbt = $packet->definitions->getRoot();
-		if(!$nbt instanceof CompoundTag){
-			throw new AssumptionFailedError();
-		}
-		$strippedNbt = clone $nbt;
-		foreach($strippedNbt as $compound){
-			if($compound instanceof CompoundTag){
-				foreach([
-					"minecraft:capped_surface",
-					"minecraft:consolidated_features",
-					"minecraft:frozen_ocean_surface",
-					"minecraft:legacy_world_generation_rules",
-					"minecraft:mesa_surface",
-					"minecraft:mountain_parameters",
-					"minecraft:multinoise_generation_rules",
-					"minecraft:overworld_generation_rules",
-					"minecraft:surface_material_adjustments",
-					"minecraft:surface_parameters",
-					"minecraft:swamp_surface",
-				] as $remove){
-					$compound->removeTag($remove);
-				}
-			}
+			$data = new BiomeDefinitionEntryData();
+			$data->id = $entry->getId();
+			$data->temperature = round($entry->getTemperature(), 3);
+			$data->downfall = round($entry->getDownfall(), 3);
+			$data->redSporeDensity = round($entry->getRedSporeDensity(), 3);
+			$data->blueSporeDensity = round($entry->getBlueSporeDensity(), 3);
+			$data->ashDensity = round($entry->getAshDensity(), 3);
+			$data->whiteAshDensity = round($entry->getWhiteAshDensity(), 3);
+			$data->depth = round($entry->getDepth(), 3);
+			$data->scale = round($entry->getScale(), 3);
+			$data->mapWaterColour = $mapWaterColor;
+			$data->rain = $entry->hasRain();
+			$data->tags = $entry->getTags() ?? [];
+
+			$definitions[$entry->getBiomeName()] = self::objectToOrderedArray($data);
 		}
 
-		file_put_contents($this->bedrockDataPath . '/biome_definitions.nbt', (new CacheableNbt($strippedNbt))->getEncodedNbt());
+		ksort($definitions, SORT_STRING);
+
+		file_put_contents($this->bedrockDataPath . '/biome_definitions.json', json_encode($definitions, JSON_PRETTY_PRINT) . "\n");
 
 		return true;
 	}