diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000..e41741f364
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @pmmp/server-developers
diff --git a/.github/ISSUE_TEMPLATE/api-change-request.md b/.github/ISSUE_TEMPLATE/api-change-request.md
index 615ab12ef3..e3d24ea0ff 100644
--- a/.github/ISSUE_TEMPLATE/api-change-request.md
+++ b/.github/ISSUE_TEMPLATE/api-change-request.md
@@ -7,13 +7,13 @@ assignees: ''
 
 ---
 
-<!--- tell us what you want -->
-## Description
+<!--- Describe the problem you want to solve -->
+## Problem description
 
 
-<!--- explain why you want this and why it's a good idea -->
-## Justification
+<!--- Describe what changes you want to make to solve this problem -->
+## Proposed solution
 
 
 <!--- (optional) describe alternative methods you've explored to achieve your goal -->
-## Alternative methods
+## Alternative solutions that don't require API changes
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8a541dfecd..82fd81a1de 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,40 +1,32 @@
-## Introduction
+<!-- Summarize your PR here. Keep it short and simple. -->
 <!-- Explain existing problems or why this pull request is necessary -->
 
-### Relevant issues
-<!-- List relevant issues here -->
+### Related issues & PRs
 <!--
-
 * Fixes #1
-* Fixes #2
-
+* Related to #2
 -->
 
 ## Changes
 ### API changes
 <!-- Any additions to the API that should be documented in release notes? -->
+<!-- If not, you can delete this section -->
 
 ### Behavioural changes
 <!-- Any change in how the server behaves, or its performance? -->
+<!-- If not, you can delete this section -->
 
 ## Backwards compatibility
 <!-- Any possible backwards incompatible changes? How are they solved, or how can they be solved? -->
+<!-- If not, you can delete this section -->
 
 ## Follow-up
 <!-- Suggest any actions to be done before/after merging this pull request -->
-<!--
-
-Requires translations:
-
-| Name | Value in eng.ini |
-| :--: | :---: |
-| `foo.bar` | `Foo bar` |
-
--->
+<!-- For example, future changes that this PR lays the groundwork for -->
 
 ## Tests
 <!--
-Details should be provided of tests done. Simply saying "tested" or equivalent is not acceptable.
-
-Attach scripts or actions to test this pull request, as well as the result
+If this PR affects gameplay or user experience in some way, it must be manually tested.
+Include any screenshots or videos of manual testing here.
+Any test plugin code should also be pasted here if it can't be adapted to a PHPUnit test.
 -->
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 518a26c705..97607ab8fa 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,7 +3,7 @@ updates:
 - package-ecosystem: composer
   directory: "/"
   schedule:
-    interval: daily
+    interval: weekly
     time: "10:00"
   open-pull-requests-limit: 10
   ignore:
@@ -12,6 +12,22 @@ updates:
       update-types:
         - "version-update:semver-major"
         - "version-update:semver-minor"
+  groups:
+    production-patch-updates:
+      dependency-type: production
+      patterns:
+        - "*"
+      update-types:
+        - "patch"
+    development-patch-updates:
+      dependency-type: development
+      patterns:
+        - "*"
+      update-types:
+        - "patch"
+    phpstan:
+      patterns:
+        - "phpstan/*"
 
 - package-ecosystem: gitsubmodule
   directory: "/"
@@ -21,4 +37,4 @@ updates:
 - package-ecosystem: github-actions
   directory: "/"
   schedule:
-    interval: daily
+    interval: weekly
diff --git a/.github/readme/pocketmine-dark.png b/.github/readme/legacy-pocketmine-dark.png
similarity index 100%
rename from .github/readme/pocketmine-dark.png
rename to .github/readme/legacy-pocketmine-dark.png
diff --git a/.github/readme/pocketmine.png b/.github/readme/legacy-pocketmine.png
similarity index 100%
rename from .github/readme/pocketmine.png
rename to .github/readme/legacy-pocketmine.png
diff --git a/.github/readme/pocketmine-dark-rgb.gif b/.github/readme/pocketmine-dark-rgb.gif
new file mode 100644
index 0000000000..ccf6152a45
Binary files /dev/null and b/.github/readme/pocketmine-dark-rgb.gif differ
diff --git a/.github/readme/pocketmine-rgb.gif b/.github/readme/pocketmine-rgb.gif
new file mode 100644
index 0000000000..933891520b
Binary files /dev/null and b/.github/readme/pocketmine-rgb.gif differ
diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
index 99e0fb5524..4325c63f28 100644
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@@ -12,16 +12,23 @@ jobs:
 
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Clone pmmp/PocketMine-Docker repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: pmmp/PocketMine-Docker
           fetch-depth: 1
@@ -30,68 +37,68 @@ jobs:
         id: tag-name
         run: |
           VERSION=$(echo "${{ github.ref }}" | sed 's{^refs/tags/{{')
-          echo ::set-output name=TAG_NAME::$VERSION
-          echo ::set-output name=MAJOR::$(echo $VERSION | cut -d. -f1)
-          echo ::set-output name=MINOR::$(echo $VERSION | cut -d. -f1-2)
+          echo TAG_NAME=$VERSION >> $GITHUB_OUTPUT
+          echo MAJOR=$(echo $VERSION | cut -d. -f1) >> $GITHUB_OUTPUT
+          echo MINOR=$(echo $VERSION | cut -d. -f1-2) >> $GITHUB_OUTPUT
 
       - name: Download new release information
         run: curl -f -L ${{ github.server_url }}/${{ github.repository }}/releases/download/${{ steps.tag-name.outputs.TAG_NAME }}/build_info.json -o new_build_info.json
 
       - name: Detect channel
         id: channel
-        run: echo ::set-output name=CHANNEL::$(jq -r '.channel' new_build_info.json)
+        run: echo CHANNEL=$(jq -r '.channel' new_build_info.json) >> $GITHUB_OUTPUT
 
       - name: Get name of Docker repository name
         id: docker-repo-name
-        run: echo ::set-output name=NAME::$(echo "${GITHUB_REPOSITORY,,}")
+        run: echo NAME=$(echo "${GITHUB_REPOSITORY,,}") >> $GITHUB_OUTPUT
 
       - name: Build image for tag
-        uses: docker/build-push-action@v3.3.0
+        uses: docker/build-push-action@v6.9.0
         with:
           push: true
           context: ./pocketmine-mp
           tags: |
             ${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.TAG_NAME }}
-#            ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.TAG_NAME }}
+            ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.TAG_NAME }}
           build-args: |
             PMMP_TAG=${{ steps.tag-name.outputs.TAG_NAME }}
             PMMP_REPO=${{ github.repository }}
 
       - name: Build image for major tag
         if: steps.channel.outputs.CHANNEL == 'stable'
-        uses: docker/build-push-action@v3.3.0
+        uses: docker/build-push-action@v6.9.0
         with:
           push: true
           context: ./pocketmine-mp
           tags: |
             ${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.MAJOR }}
-#            ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.MAJOR }}
+            ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.MAJOR }}
           build-args: |
             PMMP_TAG=${{ steps.tag-name.outputs.TAG_NAME }}
             PMMP_REPO=${{ github.repository }}
 
       - name: Build image for minor tag
         if: steps.channel.outputs.CHANNEL == 'stable'
-        uses: docker/build-push-action@v3.3.0
+        uses: docker/build-push-action@v6.9.0
         with:
           push: true
           context: ./pocketmine-mp
           tags: |
             ${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.MINOR }}
-#            ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.MINOR }}
+            ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.MINOR }}
           build-args: |
             PMMP_TAG=${{ steps.tag-name.outputs.TAG_NAME }}
             PMMP_REPO=${{ github.repository }}
 
       - name: Build image for latest tag
         if: steps.channel.outputs.CHANNEL == 'stable'
-        uses: docker/build-push-action@v3.3.0
+        uses: docker/build-push-action@v6.9.0
         with:
           push: true
           context: ./pocketmine-mp
           tags: |
             ${{ steps.docker-repo-name.outputs.NAME }}:latest
-#            ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:latest
+            ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:latest
           build-args: |
             PMMP_TAG=${{ steps.tag-name.outputs.TAG_NAME }}
             PMMP_REPO=${{ github.repository }}
diff --git a/.github/workflows/discord-release-embed.php b/.github/workflows/discord-release-embed.php
index 41ef898789..5acffdf2e1 100644
--- a/.github/workflows/discord-release-embed.php
+++ b/.github/workflows/discord-release-embed.php
@@ -18,15 +18,21 @@ require dirname(__DIR__, 2) . '/vendor/autoload.php';
 /**
  * @phpstan-return array<string, mixed>
  */
-function generateDiscordEmbed(string $version, string $channel, string $description, string $detailsUrl, string $sourceUrl, string $pharDownloadUrl, string $buildLogUrl) : array{
+function generateDiscordEmbed(string $version, string $channel, string $description, string $detailsUrl, string $sourceUrl, string $pharDownloadUrl, string $buildLogUrl, int $newsPingRoleId, ?string $phpDownloadUrl) : array{
+	if($phpDownloadUrl !== null){
+		$phpEmbedLink = " | [PHP Binaries]($phpDownloadUrl)";
+	}else{
+		$phpEmbedLink = "";
+	}
 	return [
+		"content" => "<@&$newsPingRoleId> New PocketMine-MP release: $version ($channel)",
 		"embeds" => [
 			[
 				"title" => "New PocketMine-MP release: $version ($channel)",
 				"description" => <<<DESCRIPTION
 $description
 
-[Details]($detailsUrl) | [Source Code]($sourceUrl) | [Build Log]($buildLogUrl) | [Download]($pharDownloadUrl)
+[Details]($detailsUrl) | [Source Code]($sourceUrl) | [Build Log]($buildLogUrl) | [Download]($pharDownloadUrl)$phpEmbedLink
 DESCRIPTION,
 				"url" => $detailsUrl,
 				"color" => $channel === "stable" ? 0x57ab5a : 0xc69026
@@ -35,11 +41,11 @@ DESCRIPTION,
 	];
 }
 
-if(count($argv) !== 5){
-	fwrite(STDERR, "Required arguments: github repo, version, API token\n");
+if(count($argv) !== 6){
+	fwrite(STDERR, "Required arguments: github repo, version, API token, webhook URL, ping role ID\n");
 	exit(1);
 }
-[, $repo, $tagName, $token, $hookURL] = $argv;
+[, $repo, $tagName, $token, $hookURL, $newsPingRoleId] = $argv;
 
 $result = Internet::getURL('https://api.github.com/repos/' . $repo . '/releases/tags/' . $tagName, extraHeaders: [
 	'Authorization: token ' . $token
@@ -83,10 +89,21 @@ $detailsUrl = $buildInfoJson["details_url"];
 $sourceUrl = $buildInfoJson["source_url"];
 $pharDownloadUrl = $buildInfoJson["download_url"];
 $buildLogUrl = $buildInfoJson["build_log_url"];
+$phpBinaryUrl = $buildInfoJson["php_download_url"] ?? null;
 
 $description = $releaseInfoJson["body"];
 
-$discordPayload = generateDiscordEmbed($buildInfoJson["base_version"], $buildInfoJson["channel"], $description, $detailsUrl, $sourceUrl, $pharDownloadUrl, $buildLogUrl);
+$discordPayload = generateDiscordEmbed(
+	$buildInfoJson["base_version"],
+	$buildInfoJson["channel"],
+	$description,
+	$detailsUrl,
+	$sourceUrl,
+	$pharDownloadUrl,
+	$buildLogUrl,
+	(int) $newsPingRoleId,
+	$phpBinaryUrl
+);
 
 $response = Internet::postURL(
 	$hookURL,
diff --git a/.github/workflows/discord-release-notify.yml b/.github/workflows/discord-release-notify.yml
index 595b7374a5..8d0add224e 100644
--- a/.github/workflows/discord-release-notify.yml
+++ b/.github/workflows/discord-release-notify.yml
@@ -10,15 +10,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP and tools
-        uses: shivammathur/setup-php@2.23.0
+        uses: shivammathur/setup-php@2.31.1
         with:
-          php-version: 8.0
+          php-version: 8.2
 
       - name: Restore Composer package cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/composer/files
@@ -32,7 +32,7 @@ jobs:
 
       - name: Get actual tag name
         id: tag-name
-        run: echo ::set-output name=TAG_NAME::$(echo "${{ github.ref }}" | sed 's{^refs/tags/{{')
+        run: echo TAG_NAME=$(echo "${{ github.ref }}" | sed 's{^refs/tags/{{') >> $GITHUB_OUTPUT
 
       - name: Run webhook post script
-        run: php .github/workflows/discord-release-embed.php ${{ github.repository }} ${{ steps.tag-name.outputs.TAG_NAME }} ${{ github.token }} ${{ secrets.DISCORD_RELEASE_WEBHOOK }}
+        run: php .github/workflows/discord-release-embed.php ${{ github.repository }} ${{ steps.tag-name.outputs.TAG_NAME }} ${{ github.token }} ${{ secrets.DISCORD_RELEASE_WEBHOOK }} ${{ secrets.DISCORD_NEWS_PING_ROLE_ID }}
diff --git a/.github/workflows/draft-release-from-pr.yml b/.github/workflows/draft-release-from-pr.yml
new file mode 100644
index 0000000000..8a347853bb
--- /dev/null
+++ b/.github/workflows/draft-release-from-pr.yml
@@ -0,0 +1,65 @@
+name: Draft release from PR
+
+on:
+  #presume that pull_request_target is safe at this point, since the PR was approved and merged
+  #we need write access to prepare the release & create comments
+  pull_request_target:
+    types:
+      - closed
+    branches:
+      - stable
+      - minor-next
+      - major-next
+      - "legacy/*"
+    paths:
+      - "src/VersionInfo.php"
+
+jobs:
+  check:
+    name: Check release
+    uses: ./.github/workflows/draft-release-pr-check.yml
+
+  draft:
+    name: Create GitHub draft release
+    needs: [check]
+    if: needs.check.outputs.valid == 'true'
+
+    uses: ./.github/workflows/draft-release.yml
+
+  post-draft-url-comment:
+    name: Post draft release URL as comment
+    needs: [draft]
+
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Post draft release URL on PR
+        uses: thollander/actions-comment-pull-request@v3
+        with:
+          message: "[Draft release ${{ needs.draft.outputs.version }}](${{ needs.draft.outputs.draft-url }}) has been created for commit ${{ github.sha }}. Please review and publish it."
+
+  trigger-post-release-workflow:
+    name: Trigger post-release RestrictedActions workflow
+    # Not sure if needs is actually needed here
+    needs: [check]
+    if: needs.check.outputs.valid == 'true'
+
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Generate access token
+        id: generate-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ vars.RESTRICTED_ACTIONS_DISPATCH_ID }}
+          private-key: ${{ secrets.RESTRICTED_ACTIONS_DISPATCH_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: RestrictedActions
+
+      - name: Dispatch post-release restricted action
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          repository: ${{ github.repository_owner }}/RestrictedActions
+          event-type: pocketmine_mp_post_release
+          client-payload: '{"branch": "${{ github.ref }}"}'
diff --git a/.github/workflows/draft-release-from-tag.yml b/.github/workflows/draft-release-from-tag.yml
new file mode 100644
index 0000000000..f7a5df5444
--- /dev/null
+++ b/.github/workflows/draft-release-from-tag.yml
@@ -0,0 +1,13 @@
+#Allows creating a release by pushing a tag
+#This might be useful for retroactive releases
+name: Draft release from git tag
+
+on:
+  push:
+    tags: "*"
+
+jobs:
+  draft:
+    name: Create GitHub draft release
+    if: "startsWith(github.event.head_commit.message, 'Release ')"
+    uses: ./.github/workflows/draft-release.yml
diff --git a/.github/workflows/draft-release-pr-check.yml b/.github/workflows/draft-release-pr-check.yml
new file mode 100644
index 0000000000..4c8d0f6854
--- /dev/null
+++ b/.github/workflows/draft-release-pr-check.yml
@@ -0,0 +1,111 @@
+name: Release PR checks
+
+on:
+  #do checks on every PR update
+  pull_request:
+    branches:
+      - stable
+      - minor-next
+      - major-next
+      - "legacy/*"
+    paths:
+      - "src/VersionInfo.php"
+
+  #allow this workflow to be invoked on PR merge, prior to creating the release
+  workflow_call:
+    outputs:
+      valid:
+        description: Whether this commit is valid for release
+        value: ${{ jobs.check-intent.outputs.valid && jobs.check-validity.result == 'success' }}
+
+permissions:
+  contents: read #for user access check
+
+jobs:
+  check-intent:
+    name: Check release trigger
+    runs-on: ubuntu-20.04
+
+    outputs:
+      valid: ${{ steps.validate.outputs.DEV_BUILD == 'false' }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check IS_DEVELOPMENT_BUILD flag
+        id: validate
+        run: |
+          echo DEV_BUILD=$(sed -n "s/^\s*public const IS_DEVELOPMENT_BUILD = \(true\|false\);$/\1/p" src/VersionInfo.php) >> $GITHUB_OUTPUT
+
+  check-validity:
+    name: Validate release info
+    needs: [check-intent]
+    #don't do these checks if this isn't a release - we don't want to generate unnecessary failed statuses
+    if: needs.check-intent.outputs.valid == 'true'
+
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@2.31.1
+        with:
+          php-version: 8.2
+
+      - name: Restore Composer package cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/composer/files
+            ~/.cache/composer/vcs
+          key: "composer-v2-cache-${{ hashFiles('./composer.lock') }}"
+          restore-keys: |
+            composer-v2-cache-
+
+      - name: Install Composer dependencies
+        run: composer install --no-dev --prefer-dist --no-interaction --ignore-platform-reqs
+
+      - name: Check author permissions
+        id: check-permission
+        uses: actions-cool/check-user-permission@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          require: write
+          username: ${{ github.event.pull_request.user.login }}
+          #technically this would be fine for dependabot but generally bots don't count as team members
+          check-bot: true
+
+      - name: Abort if user permissions are insufficient
+        #user doesn't have permission or is a bot
+        if: steps.check-permission.outputs.require-result != 'true' || steps.check-permission.outputs.check-result != 'false'
+        run: |
+          echo "::error::This user is not authorized to trigger releases"
+          exit 1
+
+      - name: Check changelog file is present
+        id: file-presence
+        run: |
+          CHANGELOG_FILE="changelogs/$(php build/dump-version-info.php changelog_file_name)"
+          if [ ! -f "${{ github.workspace }}/$CHANGELOG_FILE" ]; then
+            echo "::error::$CHANGELOG_FILE does not exist"
+            exit 1
+          fi
+          echo FILE="$CHANGELOG_FILE" >> $GITHUB_OUTPUT
+
+      - name: Check header is present in changelog file
+        run: |
+          FILE="${{ steps.file-presence.outputs.FILE }}"
+          VERSION="$(php build/dump-version-info.php base_version)"
+          if ! grep -Fqx "# $VERSION" "${{ github.workspace }}/$FILE"; then
+            echo "::error::Header for $VERSION not found in $FILE"
+            exit 1
+          fi
+
+      - name: Check version is valid for the selected channel
+        run: |
+          CHANNEL="$(php build/dump-version-info.php channel)"
+          if [ "$(php build/dump-version-info.php suffix_valid)" != "true" ]; then
+            echo "::error::Version $(php build/dump-version-info.php base_version) is not allowed on the $CHANNEL channel"
+            exit 1
+          fi
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
index f73bc5f28c..cd1841e4f1 100644
--- a/.github/workflows/draft-release.yml
+++ b/.github/workflows/draft-release.yml
@@ -1,29 +1,41 @@
 name: Draft release
 
 on:
-  push:
-    tags: "*"
+  workflow_call:
+    outputs:
+      draft-url:
+        description: 'The URL of the draft release'
+        value: ${{ jobs.draft.outputs.draft-url }}
+      version:
+        description: 'PocketMine-MP version'
+        value: ${{ jobs.draft.outputs.version }}
 
 jobs:
   draft:
     name: Create GitHub draft release
-    if: "startsWith(github.event.head_commit.message, 'Release ')"
+
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
+      matrix:
+        php-version: [8.2]
+
+    outputs:
+      draft-url: ${{ steps.create-draft.outputs.html_url }}
+      version: ${{ steps.get-pm-version.outputs.PM_VERSION }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.23.0
+        uses: shivammathur/setup-php@2.31.1
         with:
-          php-version: 8.0
+          php-version: ${{ matrix.php-version }}
 
       - name: Restore Composer package cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/composer/files
@@ -40,7 +52,7 @@ jobs:
         run: |
           BUILD_NUMBER=$((2000+$GITHUB_RUN_NUMBER)) #to stay above jenkins
           echo "Build number: $BUILD_NUMBER"
-          echo ::set-output name=BUILD_NUMBER::$BUILD_NUMBER
+          echo BUILD_NUMBER=$BUILD_NUMBER >> $GITHUB_OUTPUT
 
       - name: Minify BedrockData JSON files
         run: php vendor/pocketmine/bedrock-data/.minify_json.php
@@ -51,33 +63,57 @@ jobs:
       - name: Get PocketMine-MP release version
         id: get-pm-version
         run: |
-          echo ::set-output name=PM_VERSION::$(php -r 'require "vendor/autoload.php"; echo \pocketmine\VersionInfo::BASE_VERSION;')
-          echo ::set-output name=MCPE_VERSION::$(php -r 'require "vendor/autoload.php"; echo \pocketmine\network\mcpe\protocol\ProtocolInfo::MINECRAFT_VERSION_NETWORK;')
-          echo ::set-output name=PM_VERSION_SHORT::$(php -r 'require "vendor/autoload.php"; $v = explode(".", \pocketmine\VersionInfo::BASE_VERSION); array_pop($v); echo implode(".", $v);')
-          echo ::set-output name=PM_VERSION_MD::$(php -r 'require "vendor/autoload.php"; echo str_replace(".", "", \pocketmine\VersionInfo::BASE_VERSION);')
+          echo PM_VERSION=$(php build/dump-version-info.php base_version) >> $GITHUB_OUTPUT
+          echo PM_MAJOR=$(php build/dump-version-info.php major_version) >> $GITHUB_OUTPUT
+          echo MCPE_VERSION=$(php build/dump-version-info.php mcpe_version) >> $GITHUB_OUTPUT
+          echo CHANGELOG_FILE_NAME=$(php build/dump-version-info.php changelog_file_name) >> $GITHUB_OUTPUT
+          echo CHANGELOG_MD_HEADER=$(php build/dump-version-info.php changelog_md_header) >> $GITHUB_OUTPUT
+          echo PRERELEASE=$(php build/dump-version-info.php prerelease) >> $GITHUB_OUTPUT
+
+      - name: Generate PHP binary download URL
+        id: php-binary-url
+        run: |
+          echo PHP_BINARY_URL="${{ github.server_url }}/${{ github.repository_owner }}/PHP-Binaries/releases/tag/pm${{ steps.get-pm-version.outputs.PM_MAJOR }}-php-${{ matrix.php-version }}-latest" >> $GITHUB_OUTPUT
 
       - name: Generate build info
-        run: php build/generate-build-info-json.php ${{ github.sha }} ${{ steps.get-pm-version.outputs.PM_VERSION }} ${{ github.repository }} ${{ steps.build-number.outputs.BUILD_NUMBER }} ${{ github.run_id }} > build_info.json
+        run: |
+          php build/generate-build-info-json.php \
+            ${{ github.sha }} \
+            ${{ steps.get-pm-version.outputs.PM_VERSION }} \
+            ${{ github.repository }} \
+            ${{ steps.build-number.outputs.BUILD_NUMBER }} \
+            ${{ github.run_id }} \
+            ${{ steps.php-binary-url.outputs.PHP_BINARY_URL }} \
+            > build_info.json
+
+      - name: Generate core permission doc for doc.pmmp.io
+        run: php tools/generate-permission-doc.php rst
 
       - name: Upload release artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release_artifacts
           path: |
             ${{ github.workspace }}/PocketMine-MP.phar
             ${{ github.workspace }}/start.*
             ${{ github.workspace }}/build_info.json
+            ${{ github.workspace }}/core-permissions.rst
 
       - name: Create draft release
-        uses: ncipollo/release-action@v1.12.0
+        uses: ncipollo/release-action@v1.14.0
+        id: create-draft
         with:
-          artifacts: ${{ github.workspace }}/PocketMine-MP.phar,${{ github.workspace }}/start.*,${{ github.workspace }}/build_info.json
+          artifacts: ${{ github.workspace }}/PocketMine-MP.phar,${{ github.workspace }}/start.*,${{ github.workspace }}/build_info.json,${{ github.workspace }}/core-permissions.rst
           commit: ${{ github.sha }}
           draft: true
+          prerelease: ${{ steps.get-pm-version.outputs.PRERELEASE }}
           name: PocketMine-MP ${{ steps.get-pm-version.outputs.PM_VERSION }}
           tag: ${{ steps.get-pm-version.outputs.PM_VERSION }}
           token: ${{ secrets.GITHUB_TOKEN }}
+          skipIfReleaseExists: true #for release PRs, tags will be created on release publish and trigger the tag release workflow - don't create a second draft
           body: |
             **For Minecraft: Bedrock Edition ${{ steps.get-pm-version.outputs.MCPE_VERSION }}**
 
-            Please see the [changelogs](${{ github.server_url }}/${{ github.repository }}/blob/${{ steps.get-pm-version.outputs.PM_VERSION }}/changelogs/${{ steps.get-pm-version.outputs.PM_VERSION_SHORT }}.md#${{ steps.get-pm-version.outputs.PM_VERSION_MD }}) for details.
+            Please see the [changelogs](${{ github.server_url }}/${{ github.repository }}/blob/${{ steps.get-pm-version.outputs.PM_VERSION }}/changelogs/${{ steps.get-pm-version.outputs.CHANGELOG_FILE_NAME }}#${{ steps.get-pm-version.outputs.CHANGELOG_MD_HEADER }}) for details.
+
+            :information_source: Download the recommended PHP binary [here](${{ steps.php-binary-url.outputs.PHP_BINARY_URL }}).
diff --git a/.github/workflows/main-php-matrix.yml b/.github/workflows/main-php-matrix.yml
new file mode 100644
index 0000000000..e26f7c3187
--- /dev/null
+++ b/.github/workflows/main-php-matrix.yml
@@ -0,0 +1,156 @@
+name: CI (all supported PHP versions)
+
+on:
+  workflow_call:
+    inputs:
+      php:
+        description: 'PHP version in X.Y format'
+        required: true
+        type: string
+
+      #these are parameterized to ease updating
+      pm-version-major:
+        description: 'PocketMine-MP major version'
+        default: 5
+        type: number
+      image:
+        description: 'Runner image to use'
+        default: 'ubuntu-20.04'
+        type: string
+
+jobs:
+  phpstan:
+    name: PHPStan analysis
+    runs-on: ${{ inputs.image }}
+
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: pmmp/setup-php-action@3.2.0
+        with:
+          php-version: ${{ inputs.php }}
+          install-path: "./bin"
+          pm-version-major: ${{ inputs.pm-version-major }}
+
+      - name: Restore Composer package cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/composer/files
+            ~/.cache/composer/vcs
+          key: "composer-v2-cache-${{ inputs.php }}-${{ hashFiles('./composer.lock') }}"
+          restore-keys: |
+            composer-v2-cache-
+
+      - name: Install Composer dependencies
+        run: composer install --prefer-dist --no-interaction
+
+      - name: Run PHPStan
+        run: ./vendor/bin/phpstan analyze --no-progress --memory-limit=2G
+
+  phpunit:
+    name: PHPUnit tests
+    runs-on: ${{ inputs.image }}
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: pmmp/setup-php-action@3.2.0
+        with:
+          php-version: ${{ inputs.php }}
+          install-path: "./bin"
+          pm-version-major: ${{ inputs.pm-version-major }}
+
+      - name: Restore Composer package cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/composer/files
+            ~/.cache/composer/vcs
+          key: "composer-v2-cache-${{ inputs.php }}-${{ hashFiles('./composer.lock') }}"
+          restore-keys: |
+            composer-v2-cache-
+
+      - name: Install Composer dependencies
+        run: composer install --prefer-dist --no-interaction
+
+      - name: Run PHPUnit tests
+        run: ./vendor/bin/phpunit --bootstrap vendor/autoload.php --fail-on-warning tests/phpunit
+
+  integration:
+    name: Integration tests
+    runs-on: ${{ inputs.image }}
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Setup PHP
+        uses: pmmp/setup-php-action@3.2.0
+        with:
+          php-version: ${{ inputs.php }}
+          install-path: "./bin"
+          pm-version-major: ${{ inputs.pm-version-major }}
+
+      - name: Restore Composer package cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/composer/files
+            ~/.cache/composer/vcs
+          key: "composer-v2-cache-${{ inputs.php }}-${{ hashFiles('./composer.lock') }}"
+          restore-keys: |
+            composer-v2-cache-
+
+      - name: Install Composer dependencies
+        run: composer install --no-dev --prefer-dist --no-interaction
+
+      - name: Run integration tests
+        run: ./tests/travis.sh -t4
+
+  codegen:
+    name: Generated Code consistency checks
+    runs-on: ${{ inputs.image }}
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: pmmp/setup-php-action@3.2.0
+        with:
+          php-version: ${{ inputs.php }}
+          install-path: "./bin"
+          pm-version-major: ${{ inputs.pm-version-major }}
+
+      - name: Restore Composer package cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/composer/files
+            ~/.cache/composer/vcs
+          key: "composer-v2-cache-${{ inputs.php }}-${{ hashFiles('./composer.lock') }}"
+          restore-keys: |
+            composer-v2-cache-
+
+      - name: Install Composer dependencies
+        run: composer install --no-dev --prefer-dist --no-interaction
+
+      - name: Update generated code
+        run: composer update-codegen
+
+      - name: Verify code is unchanged
+        run: |
+          git diff
+          git diff --quiet
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a24e3db203..b5a9740b5c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,184 +6,17 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-php:
-    name: Prepare PHP
-    runs-on: ${{ matrix.image }}
-
-    strategy:
-      matrix:
-        image: [ubuntu-20.04]
-        php: [8.0.23, 8.1.10]
-
-    steps:
-      - name: Build and prepare PHP cache
-        uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8
-        with:
-          php-version: ${{ matrix.php }}
-          install-path: "./bin"
-
-  phpstan:
-    name: PHPStan analysis
-    needs: build-php
-    runs-on: ${{ matrix.image }}
-
+  all-php-versions:
+    name: PHP ${{ matrix.php }}
     strategy:
       fail-fast: false
       matrix:
-        image: [ubuntu-20.04]
-        php: [8.0.23, 8.1.10]
+        php: ["8.1", "8.2", "8.3"]
 
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup PHP
-        uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8
-        with:
-          php-version: ${{ matrix.php }}
-          install-path: "./bin"
-
-      - name: Install Composer
-        run: curl -sS https://getcomposer.org/installer | php
-
-      - name: Restore Composer package cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/composer/files
-            ~/.cache/composer/vcs
-          key: "composer-v2-cache-${{ matrix.php }}-${{ hashFiles('./composer.lock') }}"
-          restore-keys: |
-            composer-v2-cache-
-
-      - name: Install Composer dependencies
-        run: php composer.phar install --prefer-dist --no-interaction
-
-      - name: Run PHPStan
-        run: ./vendor/bin/phpstan analyze --no-progress --memory-limit=2G
-
-  phpunit:
-    name: PHPUnit tests
-    needs: build-php
-    runs-on: ${{ matrix.image }}
-    strategy:
-      fail-fast: false
-      matrix:
-        image: [ubuntu-20.04]
-        php: [8.0.23, 8.1.10]
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup PHP
-        uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8
-        with:
-          php-version: ${{ matrix.php }}
-          install-path: "./bin"
-
-      - name: Install Composer
-        run: curl -sS https://getcomposer.org/installer | php
-
-      - name: Restore Composer package cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/composer/files
-            ~/.cache/composer/vcs
-          key: "composer-v2-cache-${{ matrix.php }}-${{ hashFiles('./composer.lock') }}"
-          restore-keys: |
-            composer-v2-cache-
-
-      - name: Install Composer dependencies
-        run: php composer.phar install --prefer-dist --no-interaction
-
-      - name: Run PHPUnit tests
-        run: ./vendor/bin/phpunit --bootstrap vendor/autoload.php --fail-on-warning tests/phpunit
-
-  integration:
-    name: Integration tests
-    needs: build-php
-    runs-on: ${{ matrix.image }}
-    strategy:
-      fail-fast: false
-      matrix:
-        image: [ubuntu-20.04]
-        php: [8.0.23, 8.1.10]
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-
-      - name: Setup PHP
-        uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8
-        with:
-          php-version: ${{ matrix.php }}
-          install-path: "./bin"
-
-      - name: Install Composer
-        run: curl -sS https://getcomposer.org/installer | php
-
-      - name: Restore Composer package cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/composer/files
-            ~/.cache/composer/vcs
-          key: "composer-v2-cache-${{ matrix.php }}-${{ hashFiles('./composer.lock') }}"
-          restore-keys: |
-            composer-v2-cache-
-
-      - name: Install Composer dependencies
-        run: php composer.phar install --no-dev --prefer-dist --no-interaction
-
-      - name: Run integration tests
-        run: ./tests/travis.sh -t4
-
-  codegen:
-    name: Generated Code consistency checks
-    needs: build-php
-    runs-on: ${{ matrix.image }}
-    strategy:
-      fail-fast: false
-      matrix:
-        image: [ubuntu-20.04]
-        php: [8.0.23, 8.1.10]
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup PHP
-        uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8
-        with:
-          php-version: ${{ matrix.php }}
-          install-path: "./bin"
-
-      - name: Install Composer
-        run: curl -sS https://getcomposer.org/installer | php
-
-      - name: Restore Composer package cache
-        uses: actions/cache@v3
-        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: Regenerate registry annotations
-        run: php build/generate-registry-annotations.php src
-
-      - name: Regenerate KnownTranslation APIs
-        run: php build/generate-known-translation-apis.php
-
-      - name: Verify code is unchanged
-        run: |
-          git diff
-          git diff --quiet
+    uses: ./.github/workflows/main-php-matrix.yml
+    with:
+      php: ${{ matrix.php }}
+    secrets: inherit
 
   codestyle:
     name: Code Style checks
@@ -192,15 +25,27 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP and tools
-        uses: shivammathur/setup-php@2.23.0
+        uses: shivammathur/setup-php@2.31.1
         with:
-          php-version: 8.0
-          tools: php-cs-fixer:3.11
+          php-version: 8.2
+          tools: php-cs-fixer:3.49
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Run PHP-CS-Fixer
         run: php-cs-fixer fix --dry-run --diff --ansi
+
+  shellcheck:
+    name: ShellCheck
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Run ShellCheck
+        uses: ludeeus/action-shellcheck@2.0.0
diff --git a/.github/workflows/pr-remove-waiting-label.yml b/.github/workflows/pr-remove-waiting-label.yml
new file mode 100644
index 0000000000..eb46043bdd
--- /dev/null
+++ b/.github/workflows/pr-remove-waiting-label.yml
@@ -0,0 +1,33 @@
+name: Remove waiting label from PRs
+
+on:
+  pull_request_target:
+    types: synchronize
+
+jobs:
+  delabel:
+    name: Remove label
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Remove label
+        uses: actions/github-script@v7
+        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;
+              }
+            }
diff --git a/.github/workflows/support.yml b/.github/workflows/support.yml
index fe726dfef1..68da365cb5 100644
--- a/.github/workflows/support.yml
+++ b/.github/workflows/support.yml
@@ -8,7 +8,7 @@ jobs:
   support:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/support-requests@v3
+      - uses: dessant/support-requests@v4
         with:
           github-token: ${{ github.token }}
           support-label:  "Support request"
diff --git a/.github/workflows/team-pr-auto-approve.yml b/.github/workflows/team-pr-auto-approve.yml
new file mode 100644
index 0000000000..0c2fdd81c0
--- /dev/null
+++ b/.github/workflows/team-pr-auto-approve.yml
@@ -0,0 +1,38 @@
+#Due to GitHub awkwardness, it's not easy to reduce the review requirement for collaborators.
+#Our policy is that 2 collaborators should be aware of every change.
+#For outside PRs, this means 2 collaborator reviews.
+#For PRs made by collaborators, this means 1 reviewer + the author.
+#We trust that collaborators don't need as much oversight.
+name: Auto approve collaborator PRs
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - ready_for_review
+      - synchronize
+
+jobs:
+  dispatch:
+    name: Request approval
+    runs-on: ubuntu-latest
+    if: '! github.event.pull_request.draft'
+
+    steps:
+      - name: Generate access token
+        id: generate-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ vars.RESTRICTED_ACTIONS_DISPATCH_ID }}
+          private-key: ${{ secrets.RESTRICTED_ACTIONS_DISPATCH_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: RestrictedActions
+
+      - name: Dispatch restricted action
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          repository: ${{ github.repository_owner }}/RestrictedActions
+          event-type: auto_approve_collaborator_pr
+          client-payload: '{"repo": "${{ github.repository }}", "pull_request_id": "${{ github.event.pull_request.number }}", "reviewer_id": "0" }'
diff --git a/.github/workflows/update-php-versions.php b/.github/workflows/update-php-versions.php
deleted file mode 100644
index 7ff7985665..0000000000
--- a/.github/workflows/update-php-versions.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
-*/
-
-declare(strict_types=1);
-
-const VERSIONS = [
-	"8.0",
-	"8.1"
-];
-
-$workflowFile = file_get_contents(__DIR__ . '/main.yml');
-$newWorkflowFile = $workflowFile;
-foreach(VERSIONS as $v){
-	$releaseInfo = file_get_contents("https://secure.php.net/releases?json&version=$v");
-	if($releaseInfo === false){
-		throw new \RuntimeException("Failed to contact php.net API");
-	}
-	$data = json_decode($releaseInfo, true);
-	if(!is_array($data) || !isset($data["version"]) || !is_string($data["version"]) || preg_match('/^\d+\.\d+\.\d+(-[A-Za-z\d]+)?$/', $data["version"]) === 0){
-		throw new \RuntimeException("Invalid data returned by API");
-	}
-	$updated = preg_replace("/$v\.\d+/", $data["version"], $newWorkflowFile);
-	if($updated !== $newWorkflowFile){
-		echo "Updated $v revision to " . $data["version"] . "\n";
-	}
-	$newWorkflowFile = $updated;
-}
-
-if($workflowFile !== $newWorkflowFile){
-	echo "Writing modified workflow file\n";
-	file_put_contents(__DIR__ . '/main.yml', $newWorkflowFile);
-}
diff --git a/.github/workflows/update-updater-api.yml b/.github/workflows/update-updater-api.yml
index aaac9b4d2c..3f42062fdb 100644
--- a/.github/workflows/update-updater-api.yml
+++ b/.github/workflows/update-updater-api.yml
@@ -8,30 +8,76 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    concurrency: update-updater-api # only one job can run at a time, to avoid git conflicts when updating the repository
 
     steps:
       - name: Install jq
         run: sudo apt update && sudo apt install jq -y
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          repository: pmmp/update.pmmp.io
+          repository: ${{ github.repository_owner }}/update.pmmp.io
           ssh-key: ${{ secrets.UPDATE_PMMP_IO_DEPLOY_KEY }}
 
       - name: Get actual tag name
         id: tag-name
-        run: echo ::set-output name=TAG_NAME::$(echo "${{ github.ref }}" | sed 's{^refs/tags/{{')
+        run: echo TAG_NAME=$(echo "${{ github.ref }}" | sed 's{^refs/tags/{{') >> $GITHUB_OUTPUT
 
       - name: Download new release information
         run: curl -f -L ${{ github.server_url }}/${{ github.repository }}/releases/download/${{ steps.tag-name.outputs.TAG_NAME }}/build_info.json -o new_build_info.json
 
-      - name: Detect channel
+      - name: Detect channels
         id: channel
-        run: echo ::set-output name=CHANNEL::$(jq -r '.channel' new_build_info.json)
-
-      - name: Copy release information
         run: |
-          cp new_build_info.json channels/${{ steps.channel.outputs.CHANNEL }}.json
+          CHANNEL=$(jq -r '.channel' new_build_info.json)
+          VERSION=${{ steps.tag-name.outputs.TAG_NAME }}
+          echo CHANNEL=$CHANNEL >> $GITHUB_OUTPUT
+          if [ "$CHANNEL" == "stable" ]; then
+            echo MAJOR=$(echo $VERSION | cut -d. -f1) >> $GITHUB_OUTPUT
+            echo MINOR=$(echo $VERSION | cut -d. -f1-2) >> $GITHUB_OUTPUT
+          else
+            echo MAJOR=$(echo $VERSION | cut -d. -f1)-$CHANNEL >> $GITHUB_OUTPUT
+            echo MINOR=$(echo $VERSION | cut -d. -f1-2)-$CHANNEL >> $GITHUB_OUTPUT
+          fi
+
+      - name: Update channel info
+        run: |
+          function version_id() {
+            major=$(echo $1 | cut -d. -f1)
+            minor=$(echo $1 | cut -d. -f2)
+            patch=$(echo $1 | cut -d. -f3)
+            echo $(((major * 1000000) + (minor * 1000) + patch))
+          }
+
+          function update_channel() {
+            local target_file_name="$1"
+            local new_file_name="$2"
+
+            local old_version_id
+            local new_version_id
+
+            if [ ! -f "$target_file_name" ]; then
+              echo "Creating channel file: $target_file_name"
+              cp "$new_file_name" "$target_file_name"
+            else
+              old_version_id=$(version_id "$(jq -r '.base_version' "$target_file_name")")
+              new_version_id=$(version_id "$(jq -r '.base_version' "$new_file_name")")
+
+              echo "Old version ID: $old_version_id"
+              echo "New version ID: $new_version_id"
+
+              if [ $new_version_id -ge $old_version_id ]; then #suffixed versions will have the same version ID - assume they'll always be newer
+                echo "Updating channel file: $target_file_name ($old_version_id -> $new_version_id)"
+                cp "$new_file_name" "$target_file_name"
+              else
+                echo "Version $new_version_id is less than $old_version_id, not updating channel file: $target_file_name"
+              fi
+            fi
+          }
+
+          update_channel "channels/${{ steps.channel.outputs.CHANNEL }}.json" "new_build_info.json"
+          update_channel "channels/${{ steps.channel.outputs.MAJOR }}.json" "new_build_info.json"
+          update_channel "channels/${{ steps.channel.outputs.MINOR }}.json" "new_build_info.json"
           rm new_build_info.json
 
       - name: Commit changes
diff --git a/.gitignore b/.gitignore
index 13c3473764..6456250a6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,6 @@ Documentation/*
 # php-cs-fixer
 /.php_cs.cache
 /.php-cs-fixer.cache
+
+# install-local-protocol.sh
+/composer-local-protocol.*
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index c3fac9558d..466a1a3a40 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -30,6 +30,13 @@
         <option name="USE_TAB_CHARACTER" value="true" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="Markdown">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="PHP">
       <option name="CLASS_BRACE_STYLE" value="1" />
       <option name="METHOD_BRACE_STYLE" value="1" />
diff --git a/BUILDING.md b/BUILDING.md
index d6e97e05c7..986f098e2e 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -2,13 +2,13 @@
 ## Pre-requisites
 - A bash shell (git bash is sufficient for Windows)
 - [`git`](https://git-scm.com) available in your shell
-- PHP 8.0 or newer available in your shell
+- PHP 8.2 or newer available in your shell
 - [`composer`](https://getcomposer.org) available in your shell
 
 ## 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-8.0-Aggregate)
+- [Prebuilt binaries](https://github.com/pmmp/PHP-Binaries/releases)
 - [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`.
@@ -29,11 +29,5 @@ Run `composer make-server` using your preferred PHP binary. It'll drop a `Pocket
 
 You can also use the `--out` option to change the output filename.
 
-There is a bug in PHP that might cause an error which looks like this:
-```
-Fatal error: Uncaught BadMethodCallException: unable to create temporary file in PocketMine-MP/build/server-phar.php:119
-```
-You can work around it by setting `ulimit -n` to some bigger number, e.g. `8192`, or by updating your PHP version to at least 8.0.3.
-
 ## Running PocketMine-MP from source code
 Run `src/PocketMine.php` using your preferred PHP binary.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 84c5ec297a..3490542c5b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,24 +18,47 @@ Larger contributions like feature additions should be preceded by a [Change Prop
 ## Other things you'll need
 - [git](https://git-scm.com/)
 
+## List of `pocketmine` namespaces which are in other repos
+PocketMine-MP has several dependencies which are independent from the main server code. Most of them use the `pocketmine` namespace.
+Some of these add extra classes to packages which already exist in PocketMine-MP.
+
+Take a look at the table below if you can't find the class or function you're looking for.
+
+| Source URL                                                      | Namespace, class or function                                                                                                             |
+|:----------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------|
+| [pmmp/BedrockProtocol](https://github.com/pmmp/BedrockProtocol) | `pocketmine\network\mcpe\protocol`                                                                                                       |
+| [pmmp/BinaryUtils](https://github.com/pmmp/BinaryUtils)         | `pocketmine\utils\BinaryDataException`</br>`pocketmine\utils\BinaryStream`</br>`pocketmine\utils\Binary`                                 |
+| [pmmp/Color](https://github.com/pmmp/Color)                     | `pocketmine\color`                                                                                                                       |
+| [pmmp/ErrorHandler](https://github.com/pmmp/ErrorHandler)       | `pocketmine\errorhandler`                                                                                                                |
+| [pmmp/Log](https://github.com/pmmp/Log)                         | `AttachableLogger`</br>`BufferedLogger`</br>`GlobalLogger`</br>`LogLevel`</br>`Logger`</br>`PrefixedLogger`</br>`SimpleLogger`           |
+| [pmmp/Math](https://github.com/pmmp/Math)                       | `pocketmine\math`                                                                                                                        |
+| [pmmp/NBT](https://github.com/pmmp/NBT)                         | `pocketmine\nbt`                                                                                                                         |
+| [pmmp/RakLibIpc](https://github.com/pmmp/RakLibIpc)             | `raklib\server\ipc`                                                                                                                      |
+| [pmmp/RakLib](https://github.com/pmmp/RakLib)                   | `raklib`                                                                                                                                 |
+| [pmmp/Snooze](https://github.com/pmmp/Snooze)                   | `pocketmine\snooze`                                                                                                                      |
+| [pmmp/ext-chunkutils2](https://github.com/pmmp/ext-chunkutils2) | `pocketmine\world\format\LightArray`</br>`pocketmine\world\format\PalettedBlockArray`</br>`pocketmine\world\format\io\SubChunkConverter` |
+| [pmmp/ext-morton](https://github.com/pmmp/ext-morton)           | `morton2d_decode`</br>`morton2d_encode`</br>`morton3d_decode`</br>`morton3d_encode`                                                      |
+| [pmmp/ext-libdeflate](https://github.com/pmmp/ext-libdeflate)   | `libdeflate_deflate_compress`</br>`libdeflate_gzip_compress`</br>`libdeflate_zlib_compress`                                              |
+
 ## Choosing a target branch
 PocketMine-MP has three primary branches of development.
 
-| Type of change | `stable` | `next-minor` | `next-major` |
-|:---------------|:--------:|:------------:|:------------:|
-| Bug fixes | ✔️ | ✔️ | ✔️ |
-| Improvements to API docs | ✔️ | ✔️ | ✔️ |
-| Cleaning up code | ❌ | ✔️ | ✔️ |
-| Changing code formatting or style | ❌ | ✔️ | ✔️ |
-| Addition of new core features | ❌ | 🟡 Only if non-disruptive | ✔️ |
-| Changing core behaviour (e.g. making something use threads) | ❌ | ✔️ | ✔️ |
-| Addition of new configuration options | ❌ | 🟡 Only if optional | ✔️ |
-| Addition of new API classes, methods or constants | ❌ | ✔️ | ✔️ |
-| Deprecating API classes, methods or constants | ❌ | ✔️ | ✔️ |
-| Adding optional parameters to an API method | ❌ | ✔️ | ✔️ |
-| Changing API behaviour | ❌ | 🟡 Only if backwards-compatible | ✔️ |
-| Removal of API | ❌ | ❌ | ✔️ |
-| Backwards-incompatible API change (e.g. renaming a method) | ❌ | ❌ | ✔️ |
+| Type of change                                                                              | `stable` |          `minor-next`           | `major-next` |
+|:--------------------------------------------------------------------------------------------|:--------:|:-------------------------------:|:------------:|
+| Bug fixes                                                                                   |    ✔️    |               ✔️                |      ✔️      |
+| Improvements to API docs                                                                    |    ✔️    |               ✔️                |      ✔️      |
+| Cleaning up code                                                                            |    ❌     |               ✔️                |      ✔️      |
+| Changing code formatting or style                                                           |    ❌     |               ✔️                |      ✔️      |
+| Addition of new core features                                                               |    ❌     |    🟡 Only if non-disruptive    |      ✔️      |
+| Changing core behaviour (e.g. making something use threads)                                 |    ❌     |               ✔️                |      ✔️      |
+| Addition of new configuration options                                                       |    ❌     |       🟡 Only if optional       |      ✔️      |
+| Addition of new API classes, methods or constants                                           |    ❌     |               ✔️                |      ✔️      |
+| Deprecating API classes, methods or constants                                               |    ❌     |               ✔️                |      ✔️      |
+| Adding optional parameters to an API method                                                 |    ❌     |               ✔️                |      ✔️      |
+| Changing API behaviour                                                                      |    ❌     | 🟡 Only if backwards-compatible |      ✔️      |
+| Removal of API                                                                              |    ❌     |                ❌                |      ✔️      |
+| Backwards-incompatible API change (e.g. renaming a method)                                  |    ❌     |                ❌                |      ✔️      |
+| Backwards-incompatible internals change (e.g. changing things in `pocketmine\network\mcpe`) |    ❌     |               ✔️                |      ✔️      |
 
 ### Notes
 - **Non-disruptive** means that usage should not be significantly altered by the change.
@@ -43,6 +66,10 @@ PocketMine-MP has three primary branches of development.
   - Examples of **disruptive** changes include changing the way the server is run, world format changes (since those require downtime for the user to convert their world).
 - **API** includes all public and protected classes, functions and constants (unless marked as `@internal`).
   - Private members are not part of the API, **unless in a trait**.
+  - The `pocketmine\network\mcpe` package is considered implicitly `@internal` in its entirety (see its [README](src/network/mcpe/README.md) for more details).
+- Minecraft's protocol changes are considered necessary internal changes, and are **not** subject to the same rules.
+  - Protocol changes must always be released in a new minor version, since they disrupt user experience by requiring a client update.
+- BC-breaking changes to the internal network API are allowed, but only in new minor versions. This ensures that plugins which use the internal network API will not break (though they shouldn't use such API anyway).
 
 ## Making a pull request
 The basic procedure to create a pull request is:
@@ -61,45 +88,58 @@ Depending on the changes, maintainers might ask you to make changes to the PR to
 ### Requirements
 The following are required as a minimum for pull requests. PRs that don't meet these requirements will be declined unless updated to meet them.
 
-#### Licensing
-PocketMine-MP is licensed under [LGPLv3 license](LICENSE).
-By proposing a pull request, you agree to your code being distributed within PocketMine-MP under the same license.
-If you take code from other projects, that code MUST be licensed under an LGPL-compatible license.
-
-#### PRs should be about exactly ONE thing
-If you want to make multiple changes, those changes should each be contributed as separate pull requests. **DO NOT** mix unrelated changes.
-
-#### PRs must not include unnecessary/unrelated changes
-Do not include changes which aren't strictly necessary. This makes it harder to review a PR, because the code diff becomes larger and harder to review.
-This means:
-- don't reformat or rearrange existing code
-- don't change things that aren't related to the PR's objective
-- don't rewrite existing code just to make it "look nicer"
-- don't change PhpDocs to native types in code you didn't write
-
-#### Tests must be provided
-Where possible, PHPUnit tests should be written for new or changed code.
-If that's not possible (e.g. for in-game functionality), the code must be tested manually and details of the tests done must be provided.
-**Simply saying "Tested" is not acceptable** and will lead to your PR being declined.
-
-#### Comments and documentation must be written in American English
-English is the shared languages of all current maintainers.
-
-#### Code must be in the PocketMine-MP style
-It's your responsibility to ensure your code matches the formatting and styling of the rest of the code.
-If you use PhpStorm, a `Project` code style is provided, which you can use to automatically format new code.
-You can also use [`php-cs-fixer`](https://github.com/FriendsOfPHP/PHP-CS-Fixer) to format your code.
+- **All code must be licensed under the [LGPLv3 license](LICENSE)** as per PocketMine-MP's own license, or a compatible license.
+  - By proposing a pull request, you agree to your code being distributed within PocketMine-MP under the same license.
+  - If you take code from other projects, that code MUST be licensed under an LGPL-compatible license.
+- **PRs should be about ONE thing**
+  - If you want to make multiple changes, those changes should each be contributed as separate pull requests. **DO NOT** mix unrelated changes.
+  - **Do not include unnecessary changes.** This makes the code diff larger and more noisy, making it harder to review.
+    - Don't change things that aren't related to the PR's objective
+    - Don't reformat or rearrange existing code without a good reason related to the PR's objective
+    - Don't rewrite existing code just to make it "look nicer"
+    - Don't change PhpDocs to native types in code you didn't write, unless that's the objective of the PR
+- **Test code changes, and tell us what tests have been done.**
+  - Where possible, PHPUnit tests should be written for new or changed code. If that's not possible (e.g. for in-game functionality), the code must be tested manually and details of the tests done must be provided.
+  - **Simply saying "Tested" is not acceptable** and could lead to your PR being declined.
+- **Code, comments and documentation must be written in American English.** English is the shared languages of all current maintainers.
+- **Code must be in the PocketMine-MP style.**
+  - It's your responsibility to ensure your code matches the formatting and styling of the rest of the code.
+  - If you use PhpStorm, a `Project` code style is provided, which you can use to automatically format new code.
+  - You can also use [`php-cs-fixer`](https://github.com/FriendsOfPHP/PHP-CS-Fixer) to format your code.
+- **Use `final` and `private` wherever possible**.
+  - Changing from `private` to `protected` or `final` to non-`final` doesn't break backwards compatibility, but the opposite does.
+  - `private` and `final` also enable certain performance optimizations which are otherwise not possible.
+  - `private` members can be freely changed, added and removed in the future, so it's ideal for internal functions. Abusing `protected` makes internal improvements inconvenient.
+  - "Let's leave it protected/public in case someone needs it for ... idk what" is **not a valid reason to expose things**. If there isn't a clear reason for something to be accessible from the outside, don't expose it.
+  - **This is a lesson learned through years of experience.** You may not like it, but it's for the best.
+- **Immutable things are almost always preferred.**
+  - Do not add unnecessary setters or public writable properties to classes. As above, "Let's leave it in case someone needs it" is **not a valid reason to expose things**.
+  - Mutable classes and properties are unpredictable, since code has no way to know if the object it's working with might be randomly modified by another part of the code. This makes it harder to maintain code and debug issues.
+  - Most classes exist only to hold some data. These are called "data transfer objects" (DTOs). These types of classes should pretty much always be immutable.
+  - Make use of `final`, `private` and `readonly` modifiers.
 
 ### Recommendations
-
+- **Be patient.** Reviewing pull requests takes a lot of time and energy, and maintainers are often unavailable or busy. Your PR might not receive attention for a while.
+  - Remember, PRs with small diffs are much easier to review. Small PRs are generally reviewed and merged much faster than large ones.
+- **Start small.** Try fixing minor bugs or doing something isolated (e.g. adding a new block or item) before attempting larger changes.
+  - This helps you get familiar with the codebase, the contribution process, and the expectations of maintainers.
+  - Check out the [issues page]() for something that you could tackle without too much effort.
+- **Do not copy-paste other people's code**. Many PRs involve discussion about the changes, and changes are often requested by reviewers. If you don't understand the code you're copy-pasting, your PR is likely to fail.
 - **Do not edit code directly on github.com.** We recommend learning how to use [`git`](https://git-scm.com). `git` allows you to "clone" a repository onto your computer, so that you can make changes using an IDE.
 - **Use an IDE, not a text editor.** We recommend PhpStorm or VSCode.
+- **Do not make large pull requests without an RFC.**
+  - Large changes should be discussed beforehand using the [RFC / Change Proposal](#rfcs--change-proposals) process.
+  - Large changes are much harder to review, and are more likely to be declined if maintainers don't have a good idea what you're trying to do in advance.
 - **Create a new branch on your fork for each pull request.** This allows you to use the same fork to make multiple pull requests at the same time.
+- **Make your PR diff as small as possible.** Smaller PRs are **much more likely** to be accepted, as they are easier to review.
+  - Avoid moving code around in files if possible.
+  - Don't make random CS changes. This makes the diff noisier and harder to review.
 - **Use descriptive commit titles.** You can see an example [here](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
-- **Do not include multiple unrelated changes in one commit.** An atomic style for commits is preferred - this means that changes included in a commit should be part of a single distinct change set. See [this link](https://www.freshconsulting.com/atomic-commits/) for more information on atomic commits. See the [documentation on `git add`](https://git-scm.com/docs/git-add) for information on how to isolate local changes for committing.
-- **Your pull request will be checked and discussed in due time.** Since the team is scattered all around the world, your PR may not receive any attention for some time.
-- **Do not make large pull requests without an RFC.** Large changes should be discussed beforehand using the [RFC / Change Proposal](#rfcs--change-proposals) process. Large changes are much harder to review and are more likely to be declined if maintainers don't have a good idea what you're trying to do in advance.
-- **Do not copy-paste code**. There are potential license issues implicit with copy-pasting, and copy-paste usually indicates a lack of understanding of the actual code. Copy-pasted code is obvious a mile off and **any PR like this is likely to be closed**. If you want to use somebody else's code from a Git repository, **use [GIT's cherry-pick feature](https://git-scm.com/docs/git-cherry-pick)** to cherry-pick the commit.
+- **Split unrelated changes into multiple commits.**
+  - An atomic style for commits is preferred - this means that changes included in a commit should be part of a single distinct change set.
+  - If you need to use "and" or "multiple changes" in your commit message, the commit probably needs to be split up. There are exceptions, but this is a good rule of thumb.
+  - See [this link](https://www.freshconsulting.com/atomic-commits/) for more information on atomic commits.
+  - See the [documentation on `git add -i` or `git add -p`](https://git-scm.com/docs/git-add) for information on how to split up local changes for committing.
 
 
 **Thanks for contributing to PocketMine-MP!**
diff --git a/README.md b/README.md
index a1075f1aa7..b9e2e18887 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@
 			<img src="https://github.com/pmmp/PocketMine-MP/blob/stable/.github/readme/pocketmine.png" alt="The PocketMine-MP logo" title="PocketMine" loading="eager" />
 		<![endif]-->
 		<picture>
-			<source srcset="https://github.com/pmmp/PocketMine-MP/raw/stable/.github/readme/pocketmine-dark.png" media="(prefers-color-scheme: dark)">
-			<img src="https://github.com/pmmp/PocketMine-MP/raw/stable/.github/readme/pocketmine.png" loading="eager" />
+			<source srcset="https://raw.githubusercontent.com/pmmp/PocketMine-MP/stable/.github/readme/pocketmine-dark-rgb.gif" media="(prefers-color-scheme: dark)">
+			<img src="https://raw.githubusercontent.com/pmmp/PocketMine-MP/stable/.github/readme/pocketmine-rgb.gif" loading="eager" />
 		</picture>
 	</a><br>
 	<b>A highly customisable, open source server software for Minecraft: Bedrock Edition written in PHP</b>
@@ -14,38 +14,67 @@
 <p align="center">
 	<a href="https://github.com/pmmp/PocketMine-MP/actions/workflows/main.yml"><img src="https://github.com/pmmp/PocketMine-MP/workflows/CI/badge.svg" alt="CI" /></a>
 	<a href="https://github.com/pmmp/PocketMine-MP/releases/latest"><img alt="GitHub release (latest SemVer)" src="https://img.shields.io/github/v/release/pmmp/PocketMine-MP?label=release&sort=semver"></a>
-	<a href="https://hub.docker.com/r/pmmp/pocketmine-mp"><img src="https://img.shields.io/docker/v/pmmp/pocketmine-mp?logo=docker&label=image" alt="Docker image version (latest semver)" /></a>
 	<a href="https://discord.gg/bmSAZBG"><img src="https://img.shields.io/discord/373199722573201408?label=discord&color=7289DA&logo=discord" alt="Discord" /></a>
 	<br>
 	<a href="https://github.com/pmmp/PocketMine-MP/releases"><img alt="GitHub all releases" src="https://img.shields.io/github/downloads/pmmp/PocketMine-MP/total?label=downloads%40total"></a>
 	<a href="https://github.com/pmmp/PocketMine-MP/releases/latest"><img alt="GitHub release (latest by SemVer)" src="https://img.shields.io/github/downloads/pmmp/PocketMine-MP/latest/total?sort=semver"></a>
 </p>
 
-## Getting started
+## What is this?
+PocketMine-MP is a highly customisable server software for Minecraft: Bedrock Edition, built from scratch in PHP, with over 10 years of history.
+
+If you're looking to create a Minecraft: Bedrock server with **custom functionality**, look no further.
+
+- 🧩 **Powerful plugin API** - extend and customise gameplay as you see fit
+- 🗺️ **Rich ecosystem** and **large developer community** - find plugins easily and learn to develop your own
+- 🌐 **Multi-world support** - offer a more varied game experience to players without transferring them to other server nodes
+- 🏎️ **Performance** - get 100+ players onto one server (depending on hardware and plugins)
+- ⤴️ **Continuously updated** - new Minecraft versions are usually supported within days
+
+## :x: PocketMine-MP is NOT a vanilla Minecraft server software.
+**It is poorly suited to hosting vanilla survival servers.**
+It doesn't have many features from the vanilla game, such as vanilla world generation, redstone, mob AI, and various other things.
+
+If you just want to play **vanilla survival multiplayer**, consider using the [official Minecraft: Bedrock server software](https://minecraft.net/download/server/bedrock) instead of PocketMine-MP.
+
+If that's not an option for you, you may be able to add some of PocketMine-MP's missing features using plugins from [Poggit](https://poggit.pmmp.io/plugins), or write plugins to implement them yourself.
+
+## Getting Started
 - [Documentation](http://pmmp.readthedocs.org/)
 - [Installation instructions](https://pmmp.readthedocs.io/en/rtfd/installation.html)
-- [Docker image](https://hub.docker.com/r/pmmp/pocketmine-mp)
+- [Docker image](https://github.com/pmmp/PocketMine-MP/pkgs/container/pocketmine-mp)
 - [Plugin repository](https://poggit.pmmp.io/plugins)
 
-## Discussion/Help
-- [Forums](https://forums.pmmp.io/)
-- [Discord](https://discord.gg/bmSAZBG)
-- [StackOverflow](https://stackoverflow.com/tags/pocketmine)
+## Community & Support
+Join our [Discord](https://discord.gg/bmSAZBG) server to chat with other users and developers.
+
+You can also post questions on [StackOverflow](https://stackoverflow.com/tags/pocketmine) under the tag `pocketmine`.
+
+## Developing Plugins
+If you want to write your own plugins, the following resources may be useful.
+Don't forget you can always ask our community if you need help.
 
-## For developers
- * [Building and running from source](BUILDING.md)
  * [Developer documentation](https://devdoc.pmmp.io) - General documentation for PocketMine-MP plugin developers
  * [Latest release API documentation](https://apidoc.pmmp.io) - Doxygen API documentation generated for each release
- * [Latest bleeding-edge API documentation](https://apidoc-dev.pmmp.io) - Doxygen API documentation generated weekly from `next-major` branch
+ * [Latest bleeding-edge API documentation](https://apidoc-dev.pmmp.io) - Doxygen API documentation generated weekly from `major-next` branch
  * [DevTools](https://github.com/pmmp/DevTools/) - Development tools plugin for creating plugins
  * [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features
+
+## Contributing to PocketMine-MP
+PocketMine-MP accepts community contributions! The following resources will be useful if you want to contribute to PocketMine-MP.
+ * [Building and running PocketMine-MP from source](BUILDING.md)
  * [Contributing Guidelines](CONTRIBUTING.md)
 
 ## Donate
-- Bitcoin Cash (BCH): `qq3r46hn6ljnhnqnfwxt5pg3g447eq9jhvw5ddfear`
+PocketMine-MP is free, but it requires a lot of time and effort from unpaid volunteers to develop. Donations enable us to keep delivering support for new versions and adding features your players love.
+
+You can support development using the following methods:
+
+- [Patreon](https://www.patreon.com/pocketminemp)
 - Bitcoin (BTC): `171u8K9e4FtU6j3e5sqNoxKUgEw9qWQdRV`
 - Stellar Lumens (XLM): `GAAC5WZ33HCTE3BFJFZJXONMEIBNHFLBXM2HJVAZHXXPYA3HP5XPPS7T`
-- [Patreon](https://www.patreon.com/pocketminemp)
+
+Thanks for your support!
 
 ## Licensing information
 This project is licensed under LGPL-3.0. Please see the [LICENSE](/LICENSE) file for details.
diff --git a/build/dump-version-info.php b/build/dump-version-info.php
new file mode 100644
index 0000000000..166264d980
--- /dev/null
+++ b/build/dump-version-info.php
@@ -0,0 +1,87 @@
+<?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);
+
+use pocketmine\network\mcpe\protocol\ProtocolInfo;
+use pocketmine\VersionInfo;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+/*
+ * Dumps version info in a machine-readable format for use in GitHub Actions workflows
+ */
+
+/**
+ * @var string[]|\Closure[] $options
+ * @phpstan-var array<string, string|\Closure() : string> $options
+ */
+$options = [
+	"base_version" => VersionInfo::BASE_VERSION,
+	"major_version" => fn() => explode(".", VersionInfo::BASE_VERSION)[0],
+	"mcpe_version" => ProtocolInfo::MINECRAFT_VERSION_NETWORK,
+	"is_dev" => VersionInfo::IS_DEVELOPMENT_BUILD,
+	"changelog_file_name" => function() : string{
+		$version = VersionInfo::VERSION();
+		$result = $version->getMajor() . "." . $version->getMinor();
+		$suffix = $version->getSuffix();
+		if($suffix !== ""){
+			if(preg_match('/^([A-Za-z]+)(\d+)$/', $suffix, $matches) !== 1){
+				fwrite(STDERR, "error: invalid current version suffix \"$suffix\"; aborting" . PHP_EOL);
+				exit(1);
+			}
+			$baseSuffix = $matches[1];
+			$result .= "-" . strtolower($baseSuffix);
+		}
+		return $result . ".md";
+	},
+	"changelog_md_header" => fn() : string => str_replace(".", "", VersionInfo::BASE_VERSION),
+	"prerelease" => fn() : bool => VersionInfo::VERSION()->getSuffix() !== "",
+	"channel" => VersionInfo::BUILD_CHANNEL,
+	"suffix_valid" => function() : bool{
+		//TODO: maybe this should be put into its own script?
+		$suffix = VersionInfo::VERSION()->getSuffix();
+		if(VersionInfo::BUILD_CHANNEL === "stable"){
+			//stable builds may not have suffixes
+			return $suffix === "";
+		}
+		if(VersionInfo::BUILD_CHANNEL === "alpha" || VersionInfo::BUILD_CHANNEL === "beta"){
+			$upperChannel = strtoupper(VersionInfo::BUILD_CHANNEL);
+			$upperSuffix = strtoupper($suffix);
+			return str_starts_with($upperSuffix, $upperChannel) && is_numeric(substr($upperSuffix, strlen($upperChannel)));
+		}
+		return true;
+	}
+];
+if(count($argv) !== 2 || !isset($options[$argv[1]])){
+	fwrite(STDERR, "Please provide an option (one of: " . implode(", ", array_keys($options)) . PHP_EOL);
+	exit(1);
+}
+
+$result = $options[$argv[1]];
+if($result instanceof Closure){
+	$result = $result();
+}
+if(is_bool($result)){
+	echo $result ? "true" : "false";
+}else{
+	echo $result;
+}
diff --git a/build/generate-bedrockdata-path-consts.php b/build/generate-bedrockdata-path-consts.php
new file mode 100644
index 0000000000..6ad6d83fd8
--- /dev/null
+++ b/build/generate-bedrockdata-path-consts.php
@@ -0,0 +1,128 @@
+<?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\build\generate_bedrockdata_path_consts;
+
+use Symfony\Component\Filesystem\Path;
+use function dirname;
+use function fclose;
+use function fopen;
+use function fwrite;
+use function is_file;
+use function scandir;
+use function str_replace;
+use function strtoupper;
+use const PHP_EOL;
+use const pocketmine\BEDROCK_DATA_PATH;
+use const SCANDIR_SORT_ASCENDING;
+use const STDERR;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+function constantify(string $permissionName) : string{
+	return strtoupper(str_replace([".", "-"], "_", $permissionName));
+}
+
+$files = scandir(BEDROCK_DATA_PATH, SCANDIR_SORT_ASCENDING);
+if($files === false){
+	fwrite(STDERR, "Couldn't find any files in " . BEDROCK_DATA_PATH . PHP_EOL);
+	exit(1);
+}
+
+$consts = [];
+
+foreach($files as $file){
+	if($file === '.' || $file === '..'){
+		continue;
+	}
+	if($file[0] === '.'){
+		continue;
+	}
+	$path = Path::join(BEDROCK_DATA_PATH, $file);
+	if(!is_file($path)){
+		continue;
+	}
+
+	foreach([
+		'README.md',
+		'LICENSE',
+		'composer.json',
+	] as $ignored){
+		if($file === $ignored){
+			continue 2;
+		}
+	}
+
+	$consts[] = $file;
+}
+
+$output = fopen(dirname(__DIR__) . '/src/data/bedrock/BedrockDataFiles.php', 'wb');
+if($output === false){
+	fwrite(STDERR, "Couldn't open output file" . PHP_EOL);
+	exit(1);
+}
+fwrite($output, <<<'HEADER'
+<?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 const pocketmine\BEDROCK_DATA_PATH;
+
+final class BedrockDataFiles{
+	private function __construct(){
+		//NOOP
+	}
+
+
+HEADER
+);
+
+foreach($consts as $constName => $fileName){
+	fwrite($output, "\tpublic const " . constantify($fileName) . " = BEDROCK_DATA_PATH . '/$fileName';\n");
+}
+
+fwrite($output, "}\n");
+fclose($output);
+
+echo "Done. Don't forget to run CS fixup after generating code.\n";
diff --git a/build/generate-biome-ids.php b/build/generate-biome-ids.php
new file mode 100644
index 0000000000..56f871f431
--- /dev/null
+++ b/build/generate-biome-ids.php
@@ -0,0 +1,133 @@
+<?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\build\generate_biome_ids;
+
+use pocketmine\data\bedrock\BedrockDataFiles;
+use pocketmine\utils\Filesystem;
+use pocketmine\utils\Utils;
+use function asort;
+use function dirname;
+use function fclose;
+use function fopen;
+use function fwrite;
+use function is_array;
+use function is_int;
+use function is_string;
+use function json_decode;
+use function str_replace;
+use function strtoupper;
+use const SORT_NUMERIC;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+const HEADER = <<<'HEADER'
+<?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);
+
+
+HEADER;
+
+/** @return resource */
+function safe_fopen(string $file, string $flags){
+	$result = fopen($file, $flags);
+	if($result === false){
+		throw new \RuntimeException("Failed to open file");
+	}
+	return $result;
+}
+
+function make_const_name(string $name) : string{
+	return strtoupper(str_replace(['.', 'minecraft:'], ['_', ''], $name));
+}
+
+/**
+ * @param int[] $map
+ * @phpstan-param array<string, int> $map
+ */
+function generate(array $map, string $outputFile) : void{
+	$file = safe_fopen($outputFile, 'wb');
+	fwrite($file, HEADER);
+	fwrite($file, <<<'CLASSHEADER'
+namespace pocketmine\data\bedrock;
+
+final class BiomeIds{
+
+	private function __construct(){
+		//NOOP
+	}
+
+
+CLASSHEADER
+);
+	$list = $map;
+	asort($list, SORT_NUMERIC);
+	$lastId = -1;
+	foreach(Utils::stringifyKeys($list) as $name => $id){
+		if($name === ""){
+			continue;
+		}
+		if($id !== $lastId + 1){
+			fwrite($file, "\n");
+		}
+		$lastId = $id;
+		fwrite($file, "\tpublic const " . make_const_name($name) . ' = ' . $id . ';' . "\n");
+	}
+	fwrite($file, "}\n");
+	fclose($file);
+}
+
+$ids = json_decode(Filesystem::fileGetContents(BedrockDataFiles::BIOME_ID_MAP_JSON), true);
+if(!is_array($ids)){
+	throw new \RuntimeException("Invalid biome ID map, expected array for root JSON object");
+}
+$cleanedIds = [];
+foreach(Utils::promoteKeys($ids) as $name => $id){
+	if(!is_string($name) || !is_int($id)){
+		throw new \RuntimeException("Invalid biome ID map, expected string => int map");
+	}
+	$cleanedIds[$name] = $id;
+}
+generate($cleanedIds, dirname(__DIR__) . '/src/data/bedrock/BiomeIds.php');
+
+echo "Done. Don't forget to run CS fixup after generating code.\n";
diff --git a/build/generate-block-serializer-consts.php b/build/generate-block-serializer-consts.php
new file mode 100644
index 0000000000..875729fcf4
--- /dev/null
+++ b/build/generate-block-serializer-consts.php
@@ -0,0 +1,217 @@
+<?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\build\generate_block_serializer_consts;
+
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\data\bedrock\block\BlockStateNames;
+use pocketmine\data\bedrock\block\BlockStateStringValues;
+use pocketmine\data\bedrock\block\BlockTypeNames;
+use pocketmine\errorhandler\ErrorToExceptionHandler;
+use pocketmine\nbt\NbtException;
+use pocketmine\network\mcpe\convert\BlockStateDictionary;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Utils;
+use function array_values;
+use function asort;
+use function count;
+use function dirname;
+use function explode;
+use function fclose;
+use function file_get_contents;
+use function fopen;
+use function fwrite;
+use function is_string;
+use function ksort;
+use function mb_strtoupper;
+use function preg_replace;
+use function sort;
+use function strrpos;
+use function strtoupper;
+use function substr;
+use const SORT_STRING;
+use const STDERR;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+class BlockPaletteReport{
+	/**
+	 * @var string[]
+	 * @phpstan-var array<string, string>
+	 */
+	public array $seenTypes = [];
+	/**
+	 * @var string[][]
+	 * @phpstan-var array<string, array<mixed, mixed>>
+	 */
+	public array $seenStateValues = [];
+}
+
+/**
+ * @param BlockStateData[] $states
+ * @phpstan-param list<BlockStateData> $states
+ */
+function generateBlockPaletteReport(array $states) : BlockPaletteReport{
+	$result = new BlockPaletteReport();
+
+	foreach($states as $stateData){
+		$name = $stateData->getName();
+		$result->seenTypes[$name] = $name;
+		foreach(Utils::stringifyKeys($stateData->getStates()) as $k => $v){
+			$result->seenStateValues[$k][$v->getValue()] = $v->getValue();
+			asort($result->seenStateValues[$k]);
+		}
+	}
+
+	ksort($result->seenTypes, SORT_STRING);
+	ksort($result->seenStateValues, SORT_STRING);
+	return $result;
+}
+
+function constifyMcId(string $id) : string{
+	return strtoupper(explode(":", $id, 2)[1]);
+}
+
+function generateClassHeader(string $className) : string{
+	$backslashPos = strrpos($className, "\\");
+	if($backslashPos === false){
+		throw new AssumptionFailedError("Expected a namespaced class FQN");
+	}
+	$namespace = substr($className, 0, $backslashPos);
+	$shortName = substr($className, $backslashPos + 1);
+	return <<<HEADER
+<?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 $namespace;
+
+/**
+ * This class is generated automatically from the block palette for the current version. Do not edit it manually.
+ */
+final class $shortName{
+	private function __construct(){
+		//NOOP
+	}
+
+
+HEADER;
+}
+
+/**
+ * @phpstan-param list<string> $seenIds
+ */
+function generateBlockIds(array $seenIds) : void{
+	$output = ErrorToExceptionHandler::trapAndRemoveFalse(fn() => fopen(dirname(__DIR__) . '/src/data/bedrock/block/BlockTypeNames.php', 'wb'));
+
+	fwrite($output, generateClassHeader(BlockTypeNames::class));
+
+	foreach($seenIds as $id){
+		fwrite($output, "\tpublic const " . constifyMcId($id) . " = \"" . $id . "\";\n");
+	}
+
+	fwrite($output, "}\n");
+	fclose($output);
+}
+
+function generateBlockStateNames(BlockPaletteReport $data) : void{
+	$output = ErrorToExceptionHandler::trapAndRemoveFalse(fn() => fopen(dirname(__DIR__) . '/src/data/bedrock/block/BlockStateNames.php', 'wb'));
+
+	fwrite($output, generateClassHeader(BlockStateNames::class));
+	foreach(Utils::stringifyKeys($data->seenStateValues) as $state => $values){
+		$constName = mb_strtoupper(preg_replace("/^minecraft:/", "mc_", $state) ?? throw new AssumptionFailedError("This regex is not invalid"), 'US-ASCII');
+		fwrite($output, "\tpublic const $constName = \"$state\";\n");
+	}
+
+	fwrite($output, "}\n");
+	fclose($output);
+}
+
+function generateBlockStringValues(BlockPaletteReport $data) : void{
+	$output = ErrorToExceptionHandler::trapAndRemoveFalse(fn() => fopen(dirname(__DIR__) . '/src/data/bedrock/block/BlockStateStringValues.php', 'wb'));
+
+	fwrite($output, generateClassHeader(BlockStateStringValues::class));
+	foreach(Utils::stringifyKeys($data->seenStateValues) as $stateName => $values){
+		$anyWritten = false;
+		sort($values, SORT_STRING);
+		foreach($values as $value){
+			if(!is_string($value)){
+				continue;
+			}
+			$anyWritten = true;
+			$constName = mb_strtoupper(preg_replace("/^minecraft:/", "mc_", $stateName) . "_" . $value, 'US-ASCII');
+			fwrite($output, "\tpublic const $constName = \"$value\";\n");
+		}
+		if($anyWritten){
+			fwrite($output, "\n");
+		}
+	}
+	fwrite($output, "}\n");
+	fclose($output);
+}
+
+if(count($argv) !== 2){
+	fwrite(STDERR, "This script regenerates BlockTypeNames, BlockStateNames and BlockStateStringValues from a given palette file\n");
+	fwrite(STDERR, "Required arguments: path to block palette file\n");
+	exit(1);
+}
+
+$palettePath = $argv[1];
+$paletteRaw = file_get_contents($palettePath);
+if($paletteRaw === false){
+	fwrite(STDERR, "Failed to read block palette file\n");
+	exit(1);
+}
+
+try{
+	$states = BlockStateDictionary::loadPaletteFromString($paletteRaw);
+}catch(NbtException){
+	fwrite(STDERR, "Invalid block palette file $argv[1]\n");
+	exit(1);
+}
+
+$report = generateBlockPaletteReport($states);
+generateBlockIds(array_values($report->seenTypes));
+generateBlockStateNames($report);
+generateBlockStringValues($report);
+
+echo "Done. Don't forget to run CS fixup after generating code.\n";
diff --git a/build/generate-build-info-json.php b/build/generate-build-info-json.php
index f0ffe7df87..a2e7489f3a 100644
--- a/build/generate-build-info-json.php
+++ b/build/generate-build-info-json.php
@@ -21,24 +21,28 @@
 
 declare(strict_types=1);
 
+use pocketmine\network\mcpe\protocol\ProtocolInfo;
+use pocketmine\VersionInfo;
+
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-if(count($argv) !== 6){
-	fwrite(STDERR, "required args: <git hash> <tag name> <github repo (owner/name)> <build number> <github actions run ID>\n");
+if(count($argv) !== 7){
+	fwrite(STDERR, "required args: <git hash> <tag name> <github repo (owner/name)> <build number> <github actions run ID> <PHP binary download URL>\n");
 	exit(1);
 }
 
 echo json_encode([
-	"php_version" => sprintf("%d.%d", PHP_MAJOR_VERSION, PHP_MINOR_VERSION),
-	"base_version" => \pocketmine\VersionInfo::BASE_VERSION,
+	"php_version" => sprintf("%d.%d", PHP_MAJOR_VERSION, PHP_MINOR_VERSION), //deprecated
+	"base_version" => VersionInfo::BASE_VERSION,
 	"build" => (int) $argv[4],
-	"is_dev" => \pocketmine\VersionInfo::IS_DEVELOPMENT_BUILD,
-	"channel" => \pocketmine\VersionInfo::BUILD_CHANNEL,
+	"is_dev" => VersionInfo::IS_DEVELOPMENT_BUILD,
+	"channel" => VersionInfo::BUILD_CHANNEL,
 	"git_commit" => $argv[1],
-	"mcpe_version" => \pocketmine\network\mcpe\protocol\ProtocolInfo::MINECRAFT_VERSION_NETWORK,
+	"mcpe_version" => ProtocolInfo::MINECRAFT_VERSION_NETWORK,
 	"date" => time(), //TODO: maybe we should embed this in VersionInfo?
 	"details_url" => "https://github.com/$argv[3]/releases/tag/$argv[2]",
 	"download_url" => "https://github.com/$argv[3]/releases/download/$argv[2]/PocketMine-MP.phar",
 	"source_url" => "https://github.com/$argv[3]/tree/$argv[2]",
 	"build_log_url" => "https://github.com/$argv[3]/actions/runs/$argv[5]",
+	"php_download_url" => $argv[6],
 ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_THROW_ON_ERROR) . "\n";
diff --git a/build/generate-item-type-names.php b/build/generate-item-type-names.php
new file mode 100644
index 0000000000..8d37e949b1
--- /dev/null
+++ b/build/generate-item-type-names.php
@@ -0,0 +1,118 @@
+<?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\build\generate_item_serializer_ids;
+
+use pocketmine\data\bedrock\item\BlockItemIdMap;
+use pocketmine\errorhandler\ErrorToExceptionHandler;
+use pocketmine\network\mcpe\convert\ItemTypeDictionaryFromDataHelper;
+use pocketmine\network\mcpe\protocol\serializer\ItemTypeDictionary;
+use pocketmine\utils\Utils;
+use function asort;
+use function count;
+use function dirname;
+use function explode;
+use function fclose;
+use function file_get_contents;
+use function fopen;
+use function fwrite;
+use function strtoupper;
+use const SORT_STRING;
+use const STDERR;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+function constifyMcId(string $id) : string{
+	return strtoupper(explode(":", $id, 2)[1]);
+}
+
+function generateItemIds(ItemTypeDictionary $dictionary, BlockItemIdMap $blockItemIdMap) : void{
+	$ids = [];
+	foreach($dictionary->getEntries() as $entry){
+		if($entry->getStringId() === "minecraft:air" || $blockItemIdMap->lookupBlockId($entry->getStringId()) !== null){ //blockitems are serialized via BlockStateSerializer
+			continue;
+		}
+		$ids[$entry->getStringId()] = $entry->getStringId();
+	}
+	asort($ids, SORT_STRING);
+
+	$file = ErrorToExceptionHandler::trapAndRemoveFalse(fn() => fopen(dirname(__DIR__) . '/src/data/bedrock/item/ItemTypeNames.php', 'wb'));
+
+	fwrite($file, <<<'HEADER'
+<?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\item;
+
+/**
+ * This class is generated automatically from the item type dictionary for the current version. Do not edit it manually.
+ */
+final class ItemTypeNames{
+
+HEADER
+	);
+
+	foreach(Utils::stringifyKeys($ids) as $id){
+		fwrite($file, "\tpublic const " . constifyMcId($id) . " = \"" . $id . "\";\n");
+	}
+	fwrite($file, "}\n");
+	fclose($file);
+}
+
+if(count($argv) !== 2){
+	fwrite(STDERR, "This script regenerates ItemTypeNames from a given item dictionary file\n");
+	fwrite(STDERR, "Required argument: path to item type dictionary file\n");
+	exit(1);
+}
+
+$raw = file_get_contents($argv[1]);
+if($raw === false){
+	fwrite(STDERR, "Failed to read item type dictionary file\n");
+	exit(1);
+}
+
+$dictionary = ItemTypeDictionaryFromDataHelper::loadFromString($raw);
+$blockItemIdMap = BlockItemIdMap::getInstance();
+generateItemIds($dictionary, $blockItemIdMap);
+
+echo "Done. Don't forget to run CS fixup after generating code.\n";
diff --git a/build/generate-pocketmine-yml-property-consts.php b/build/generate-pocketmine-yml-property-consts.php
new file mode 100644
index 0000000000..f90f3fc667
--- /dev/null
+++ b/build/generate-pocketmine-yml-property-consts.php
@@ -0,0 +1,120 @@
+<?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);
+
+use pocketmine\utils\Filesystem;
+use pocketmine\utils\Utils;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+$defaultConfig = yaml_parse(Filesystem::fileGetContents(dirname(__DIR__) . '/resources/pocketmine.yml'));
+
+if(!is_array($defaultConfig)){
+	fwrite(STDERR, "Invalid default pocketmine.yml\n");
+	exit(1);
+}
+
+$constants = [];
+
+/**
+ * @param mixed[]  $properties
+ * @param string[] $constants
+ * @phpstan-param array<string, string> $constants
+ * @phpstan-param-out array<string, string> $constants
+ */
+function collectProperties(string $prefix, array $properties, array &$constants) : void{
+	foreach(Utils::promoteKeys($properties) as $propertyName => $property){
+		$fullPropertyName = ($prefix !== "" ? $prefix . "." : "") . $propertyName;
+
+		$constName = str_replace([".", "-"], "_", strtoupper($fullPropertyName));
+		$constants[$constName] = $fullPropertyName;
+
+		if(is_array($property)){
+			collectProperties($fullPropertyName, $property, $constants);
+		}
+	}
+}
+
+collectProperties("", $defaultConfig, $constants);
+ksort($constants, SORT_STRING);
+
+$file = fopen(dirname(__DIR__) . '/src/YmlServerProperties.php', 'wb');
+if($file === false){
+	fwrite(STDERR, "Failed to open output file\n");
+	exit(1);
+}
+fwrite($file, "<?php\n");
+fwrite($file, <<<'HEADER'
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * 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/
+ *
+ *
+ */
+
+
+HEADER
+);
+fwrite($file, "declare(strict_types=1);\n\n");
+fwrite($file, "namespace pocketmine;\n\n");
+
+fwrite($file, <<<'DOC'
+/**
+ * @internal
+ * Constants for all properties available in pocketmine.yml.
+ * This is generated by build/generate-pocketmine-yml-property-consts.php.
+ * Do not edit this file manually.
+ */
+
+DOC
+);
+fwrite($file, "final class YmlServerProperties{\n");
+fwrite($file, <<<'CONSTRUCTOR'
+
+	private function __construct(){
+		//NOOP
+	}
+
+
+CONSTRUCTOR
+);
+foreach(Utils::stringifyKeys($constants) as $constName => $propertyName){
+	fwrite($file, "\tpublic const $constName = '$propertyName';\n");
+}
+fwrite($file, "}\n");
+
+fclose($file);
+
+echo "Done. Don't forget to run CS fixup after generating code.\n";
diff --git a/build/generate-registry-annotations.php b/build/generate-registry-annotations.php
index bcdaee4eba..35d0893954 100644
--- a/build/generate-registry-annotations.php
+++ b/build/generate-registry-annotations.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\build\update_registry_annotations;
 
+use pocketmine\utils\Utils;
 use function basename;
 use function class_exists;
 use function count;
@@ -48,6 +49,7 @@ if(count($argv) !== 2){
 
 /**
  * @param object[] $members
+ * @phpstan-param array<string, object> $members
  */
 function generateMethodAnnotations(string $namespaceName, array $members) : string{
 	$selfName = basename(__FILE__);
@@ -60,7 +62,7 @@ function generateMethodAnnotations(string $namespaceName, array $members) : stri
 
 	static $lineTmpl = " * @method static %2\$s %s()";
 	$memberLines = [];
-	foreach($members as $name => $member){
+	foreach(Utils::stringifyKeys($members) as $name => $member){
 		$reflect = new \ReflectionClass($member);
 		while($reflect !== false && $reflect->isAnonymous()){
 			$reflect = $reflect->getParentClass();
diff --git a/build/make-release.php b/build/make-release.php
index 610dbbe6d9..741f9d787a 100644
--- a/build/make-release.php
+++ b/build/make-release.php
@@ -36,11 +36,12 @@ use function fwrite;
 use function getopt;
 use function is_string;
 use function max;
+use function preg_match;
 use function preg_replace;
-use function sleep;
 use function sprintf;
 use function str_pad;
 use function strlen;
+use function strtolower;
 use function system;
 use const STDERR;
 use const STDIN;
@@ -85,7 +86,8 @@ function systemWrapper(string $command, string $errorMessage) : void{
 
 function main() : void{
 	$filteredOpts = [];
-	foreach(Utils::stringifyKeys(getopt("", ["current:", "next:", "channel:", "help"])) as $optName => $optValue){
+	$postCommitOnly = false;
+	foreach(Utils::stringifyKeys(getopt("", ["current:", "next:", "channel:", "help", "post"])) as $optName => $optValue){
 		if($optName === "help"){
 			fwrite(STDOUT, "Options:\n");
 
@@ -95,6 +97,10 @@ function main() : void{
 			}
 			exit(0);
 		}
+		if($optName === "post"){
+			$postCommitOnly = true;
+			continue;
+		}
 		if(!is_string($optValue)){
 			fwrite(STDERR, "--$optName expects exactly 1 value\n");
 			exit(1);
@@ -102,44 +108,67 @@ function main() : void{
 		$filteredOpts[$optName] = $optValue;
 	}
 
+	$channel = $filteredOpts["channel"] ?? null;
 	if(isset($filteredOpts["current"])){
 		$currentVer = new VersionString($filteredOpts["current"]);
 	}else{
 		$currentVer = new VersionString(VersionInfo::BASE_VERSION);
 	}
-	if(isset($filteredOpts["next"])){
-		$nextVer = new VersionString($filteredOpts["next"]);
+
+	$nextVer = isset($filteredOpts["next"]) ? new VersionString($filteredOpts["next"]) : null;
+
+	$suffix = $currentVer->getSuffix();
+	if($suffix !== ""){
+		if($channel === "stable"){
+			fwrite(STDERR, "error: cannot release a suffixed build into the stable channel\n");
+			exit(1);
+		}
+		if(preg_match('/^([A-Za-z]+)(\d+)$/', $suffix, $matches) !== 1){
+			echo "error: invalid current version suffix \"$suffix\"; aborting\n";
+			exit(1);
+		}
+		$nextVer ??= new VersionString(sprintf(
+			"%u.%u.%u-%s%u",
+			$currentVer->getMajor(),
+			$currentVer->getMinor(),
+			$currentVer->getPatch(),
+			$matches[1],
+			((int) $matches[2]) + 1
+		));
+		$channel ??= strtolower($matches[1]);
 	}else{
-		$nextVer = new VersionString(sprintf(
+		$nextVer ??= new VersionString(sprintf(
 			"%u.%u.%u",
 			$currentVer->getMajor(),
 			$currentVer->getMinor(),
 			$currentVer->getPatch() + 1
 		));
+		$channel ??= "stable";
 	}
-	$channel = $filteredOpts["channel"] ?? VersionInfo::BUILD_CHANNEL;
 
-	echo "About to tag version $currentVer. Next version will be $nextVer.\n";
-	echo "$currentVer will be published on release channel \"$channel\".\n";
-	echo "please add appropriate notes to the changelog and press enter...";
-	fgets(STDIN);
-	systemWrapper('git add "' . dirname(__DIR__) . '/changelogs"', "failed to stage changelog changes");
-	system('git diff --cached --quiet "' . dirname(__DIR__) . '/changelogs"', $result);
-	if($result === 0){
-		echo "error: no changelog changes detected; aborting\n";
-		exit(1);
-	}
 	$versionInfoPath = dirname(__DIR__) . '/src/VersionInfo.php';
-	replaceVersion($versionInfoPath, $currentVer->getBaseVersion(), false, $channel);
-	systemWrapper('git commit -m "Release ' . $currentVer->getBaseVersion() . '" --include "' . $versionInfoPath . '"', "failed to create release commit");
-	systemWrapper('git tag ' . $currentVer->getBaseVersion(), "failed to create release tag");
+
+	if($postCommitOnly){
+		echo "Skipping release commit & tag. Bumping to next version $nextVer directly.\n";
+	}else{
+		echo "About to tag version $currentVer. Next version will be $nextVer.\n";
+		echo "$currentVer will be published on release channel \"$channel\".\n";
+		echo "please add appropriate notes to the changelog and press enter...";
+		fgets(STDIN);
+		systemWrapper('git add "' . dirname(__DIR__) . '/changelogs"', "failed to stage changelog changes");
+		system('git diff --cached --quiet "' . dirname(__DIR__) . '/changelogs"', $result);
+		if($result === 0){
+			echo "error: no changelog changes detected; aborting\n";
+			exit(1);
+		}
+		replaceVersion($versionInfoPath, $currentVer->getBaseVersion(), false, $channel);
+		systemWrapper('git commit -m "Release ' . $currentVer->getBaseVersion() . '" --include "' . $versionInfoPath . '"', "failed to create release commit");
+		systemWrapper('git tag ' . $currentVer->getBaseVersion(), "failed to create release tag");
+	}
 
 	replaceVersion($versionInfoPath, $nextVer->getBaseVersion(), true, $channel);
 	systemWrapper('git add "' . $versionInfoPath . '"', "failed to stage changes for post-release commit");
 	systemWrapper('git commit -m "' . $nextVer->getBaseVersion() . ' is next" --include "' . $versionInfoPath . '"', "failed to create post-release commit");
-	echo "pushing changes in 5 seconds\n";
-	sleep(5);
-	systemWrapper('git push origin HEAD ' . $currentVer->getBaseVersion(), "failed to push changes to remote");
 }
 
 main();
diff --git a/build/php b/build/php
index 6b605ed7c4..8a396c63fc 160000
--- a/build/php
+++ b/build/php
@@ -1 +1 @@
-Subproject commit 6b605ed7c458fc8f95080ffe41a7f248a7160107
+Subproject commit 8a396c63fc5e79ea2849bfca100ea21a49ba2933
diff --git a/build/server-phar-stub.php b/build/server-phar-stub.php
new file mode 100644
index 0000000000..b4018e3a78
--- /dev/null
+++ b/build/server-phar-stub.php
@@ -0,0 +1,168 @@
+<?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\server_phar_stub;
+
+use function clearstatcache;
+use function copy;
+use function fclose;
+use function fflush;
+use function flock;
+use function fopen;
+use function fwrite;
+use function getmypid;
+use function hrtime;
+use function is_dir;
+use function is_file;
+use function mkdir;
+use function number_format;
+use function str_replace;
+use function stream_get_contents;
+use function sys_get_temp_dir;
+use function tempnam;
+use function unlink;
+use const DIRECTORY_SEPARATOR;
+use const LOCK_EX;
+use const LOCK_NB;
+use const LOCK_UN;
+
+/**
+ * Finds the appropriate tmp directory to store the decompressed phar cache, accounting for potential file name
+ * collisions.
+ */
+function preparePharCacheDirectory() : string{
+	clearstatcache();
+
+	$i = 0;
+	do{
+		$tmpPath = sys_get_temp_dir() . '/PocketMine-MP-phar-cache.' . $i;
+		$i++;
+	}while(is_file($tmpPath));
+	if(!@mkdir($tmpPath) && !is_dir($tmpPath)){
+		throw new \RuntimeException("Failed to create temporary directory $tmpPath. Please ensure the disk has enough space and that the current user has permission to write to this location.");
+	}
+
+	return $tmpPath;
+}
+
+/**
+ * Deletes caches left behind by previous server instances.
+ * This ensures that the tmp directory doesn't get flooded by servers crashing in restart loops.
+ */
+function cleanupPharCache(string $tmpPath) : void{
+	clearstatcache();
+
+	/** @var string[] $matches */
+	foreach(new \RegexIterator(
+		new \FilesystemIterator(
+			$tmpPath,
+			\FilesystemIterator::CURRENT_AS_PATHNAME | \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::UNIX_PATHS
+		),
+		'/(.+)\.lock$/',
+		\RegexIterator::GET_MATCH
+	) as $matches){
+		$lockFilePath = $matches[0];
+		$baseTmpPath = $matches[1];
+
+		$file = @fopen($lockFilePath, "rb");
+		if($file === false){
+			//another process probably deleted the lock file already
+			continue;
+		}
+
+		if(flock($file, LOCK_EX | LOCK_NB)){
+			//this tmpfile is no longer in use
+			flock($file, LOCK_UN);
+			fclose($file);
+
+			unlink($lockFilePath);
+			unlink($baseTmpPath . ".tar");
+			unlink($baseTmpPath);
+			echo "Deleted stale phar cache at $baseTmpPath\n";
+		}else{
+			$pid = stream_get_contents($file);
+			fclose($file);
+
+			echo "Phar cache at $baseTmpPath is still in use by PID $pid\n";
+		}
+	}
+}
+
+function convertPharToTar(string $tmpName, string $pharPath) : string{
+	$tmpPharPath = $tmpName . ".phar";
+	copy($pharPath, $tmpPharPath);
+
+	$phar = new \Phar($tmpPharPath);
+	//phar requires phar.readonly=0, and zip doesn't support disabling compression - tar is the only viable option
+	//we don't need phar anyway since we don't need to directly execute the file, only require files from inside it
+	$phar->convertToData(\Phar::TAR, \Phar::NONE);
+	unset($phar);
+	\Phar::unlinkArchive($tmpPharPath);
+
+	return $tmpName . ".tar";
+}
+
+/**
+ * Locks a phar tmp cache to prevent it from being deleted by other server instances.
+ * This code looks similar to Filesystem::createLockFile(), but we can't use that because it's inside the compressed
+ * phar.
+ */
+function lockPharCache(string $lockFilePath) : void{
+	//this static variable will keep the file(s) locked until the process ends
+	static $lockFiles = [];
+
+	$lockFile = fopen($lockFilePath, "wb");
+	if($lockFile === false){
+		throw new \RuntimeException("Failed to open temporary file");
+	}
+	flock($lockFile, LOCK_EX); //this tells other server instances not to delete this cache file
+	fwrite($lockFile, (string) getmypid()); //maybe useful for debugging
+	fflush($lockFile);
+	$lockFiles[$lockFilePath] = $lockFile;
+}
+
+/**
+ * Prepares a decompressed .tar of PocketMine-MP.phar in the system temp directory for loading code from.
+ *
+ * @return string path to the temporary decompressed phar (actually a .tar)
+ */
+function preparePharCache(string $tmpPath, string $pharPath) : string{
+	clearstatcache();
+
+	$tmpName = tempnam($tmpPath, "PMMP");
+	if($tmpName === false){
+		throw new \RuntimeException("Failed to create temporary file");
+	}
+
+	lockPharCache($tmpName . ".lock");
+	return convertPharToTar($tmpName, $pharPath);
+}
+
+$tmpDir = preparePharCacheDirectory();
+cleanupPharCache($tmpDir);
+echo "Preparing PocketMine-MP.phar decompressed cache...\n";
+$start = hrtime(true);
+$cacheName = preparePharCache($tmpDir, __FILE__);
+echo "Cache ready at $cacheName in " . number_format((hrtime(true) - $start) / 1e9, 2) . "s\n";
+
+require 'phar://' . str_replace(DIRECTORY_SEPARATOR, '/', $cacheName) . '/src/PocketMine.php';
diff --git a/build/server-phar.php b/build/server-phar.php
index 0665c89d5d..f6bb29d514 100644
--- a/build/server-phar.php
+++ b/build/server-phar.php
@@ -23,7 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\build\server_phar;
 
+use pocketmine\utils\Filesystem;
 use pocketmine\utils\Git;
+use Symfony\Component\Filesystem\Path;
 use function array_map;
 use function count;
 use function dirname;
@@ -32,6 +34,7 @@ use function getcwd;
 use function getopt;
 use function implode;
 use function ini_get;
+use function is_string;
 use function microtime;
 use function preg_quote;
 use function realpath;
@@ -147,8 +150,17 @@ function main() : void{
 	}else{
 		$build = 0;
 	}
+	if(isset($opts["out"])){
+		if(!is_string($opts["out"])){
+			echo "--out cannot be specified multiple times" . PHP_EOL;
+			exit(1);
+		}
+		$pharPath = $opts["out"];
+	}else{
+		$pharPath = getcwd() . DIRECTORY_SEPARATOR . "PocketMine-MP.phar";
+	}
 	foreach(buildPhar(
-		$opts["out"] ?? getcwd() . DIRECTORY_SEPARATOR . "PocketMine-MP.phar",
+		$pharPath,
 		dirname(__DIR__) . DIRECTORY_SEPARATOR,
 		[
 			'resources',
@@ -159,21 +171,7 @@ function main() : void{
 			'git' => $gitHash,
 			'build' => $build
 		],
-		<<<'STUB'
-<?php
-
-$tmpDir = sys_get_temp_dir();
-if(!is_readable($tmpDir) or !is_writable($tmpDir)){
-	echo "ERROR: tmpdir $tmpDir is not accessible." . PHP_EOL;
-	echo "Check that the directory exists, and that the current user has read/write permissions for it." . PHP_EOL;
-	echo "Alternatively, set 'sys_temp_dir' to a different directory in your php.ini file." . PHP_EOL;
-	exit(1);
-}
-
-require("phar://" . __FILE__ . "/src/PocketMine.php");
-__HALT_COMPILER();
-STUB
-,
+		Filesystem::fileGetContents(Path::join(__DIR__, 'server-phar-stub.php')) . "\n__HALT_COMPILER();",
 		\Phar::SHA1,
 		\Phar::GZ
 	) as $line){
diff --git a/changelogs/4.12.md b/changelogs/4.12.md
index ab96c20828..068fefab47 100644
--- a/changelogs/4.12.md
+++ b/changelogs/4.12.md
@@ -93,3 +93,27 @@ Released 16th January 2023.
 
 ## Other changes
 - Increased packet batch budget for player sessions.
+
+# 4.12.10
+Released 18th January 2023.
+
+## Fixes
+- Fixed reported server load not including the time spent processing Snooze interrupts between ticks (e.g. incoming network packets).
+- Fixed `Connection Handler` entry in timings report not including time spent receiving packets.
+
+## Note about server load & performance
+This version will report higher apparent server load than previous versions. The actual performance of the server is unchanged; the previous reported load was inaccurate.
+These bugs have been present for nearly 5 years (ever since the first introduction of Snooze in 3.0.0).
+
+# 4.12.11
+Released 22nd January 2023.
+
+## General
+- Code is now tested and analysed using PHP 8.2 in addition to 8.1 and 8.0.
+
+## Fixes
+- Fixed pthreads 5.0.0 incorrectly being treated as compatible.
+- Fixed deprecation errors on PHP 8.2.
+
+## Documentation
+- Updated documentation in `PlayerPreLoginEvent`.
diff --git a/changelogs/4.13-beta.md b/changelogs/4.13-beta.md
new file mode 100644
index 0000000000..865d2267b3
--- /dev/null
+++ b/changelogs/4.13-beta.md
@@ -0,0 +1,94 @@
+**For Minecraft: Bedrock Edition 1.19.50**
+
+This is a minor feature release for PocketMine-MP, introducing some new features and improvements.
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 4.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.
+
+# 4.13.0-BETA1
+Released 18th January 2023.
+
+## Gameplay
+- Death message is now shown on the death screen when a player dies.
+- Armour damage is now only increased if the armour reduced the damage taken.
+- Implemented Swift Sneak enchantment.
+- Fixed incorrect collision box calculation of walls and glass/bars when connected. Note: Client-side, wall connections are still broken; this only fixes projectile flight server-side.
+
+## Performance
+- Improved performance of chunk selection for chunk random ticking using a cache. This improves performance of chunk random ticking by 10-20%.
+
+## Localization
+- Added localized description for the `/dumpmemory` command.
+
+## Permissions
+- Added the following new core permissions:
+  - `pocketmine.command.effect.other` - allows the player to use the `/effect` command on other players (default operator only)
+  - `pocketmine.command.effect.self` - allows the player to use the `/effect` command on themselves (default operator only)
+  - `pocketmine.command.enchant.other` - allows the player to use the `/enchant` command on other players (default operator only)
+  - `pocketmine.command.enchant.self` - allows the player to use the `/enchant` command on themselves (default operator only)
+  - `pocketmine.command.gamemode.other` - allows the player to use the `/gamemode` command on other players (default operator only)
+  - `pocketmine.command.gamemode.self` - allows the player to use the `/gamemode` command on themselves (default operator only)
+  - `pocketmine.command.give.other` - allows the player to use the `/give` command on other players (default operator only)
+  - `pocketmine.command.give.self` - allows the player to use the `/give` command on themselves (default operator only)
+  - `pocketmine.command.spawnpoint.other` - allows the player to use the `/spawnpoint` command on other players (default operator only)
+  - `pocketmine.command.spawnpoint.self` - allows the player to use the `/spawnpoint` command on themselves (default operator only)
+  - `pocketmine.command.teleport.other` - allows the player to use the `/teleport` command on other players (default operator only)
+  - `pocketmine.command.teleport.self` - allows the player to use the `/teleport` command on themselves (default operator only)
+  - `pocketmine.command.title.other` - allows the player to use the `/title` command on other players (default operator only)
+  - `pocketmine.command.title.self` - allows the player to use the `/title` command on themselves (default operator only)
+
+## Internals
+- Decoupled `Player->sendMessage()` and `Player->sendTranslation()`.
+- Refactored resource pack loading in `ResourcePackManager` to make it easier to understand.
+- Client-aware translation processing has been moved to `NetworkSession` due to being client-specific.
+- Replaced hardcoded strings with constants in various places.
+- `NetworkSession` destructive cleanup is now deferred to the next session tick. This fixes various `InventoryManager` crashes when kicking players during events.
+- Updated code using `strpos()` to use `str_starts_with()`, `str_ends_with()` and `str_contains()` where appropriate.
+- Added documentation for some internal methods.
+
+## API
+### `pocketmine\command`
+- The following new API methods have been added:
+  - `protected VanillaCommand->fetchPermittedPlayerTarget(...) : ?Player` - fetches a player target according to the given sender permissions, or null if not found or not permitted
+
+### `pocketmine\entity`
+- The following new API methods have been added:
+  - `public Living->getDisplayName() : string` - the name of the entity to be shown in death messages, commands etc.
+
+### `pocketmine\event\world`
+- The following new classes have been added:
+  - `WorldSoundEvent` - called when a sound is played in a world
+  - `WorldParticleEvent` - called when a particle is spawned in a world
+
+### `pocketmine\item`
+- The following new API methods have been added:
+  - `public Item->onInteractEntity(Player $player, Entity $entity, Vector3 $clickVector) : bool` - called when a player interacts with an entity with this item in hand
+
+### `pocketmine\lang`
+- `Language->translate()` and `Language->translateString()` no longer parse nested translation in the "base text". This was never intended behaviour, and didn't work beyond the first level anyway.
+
+### `pocketmine\player`
+- The following new interfaces have been added:
+  - `PlayerDataProvider` - implemented by classes which want to offer storage for player data
+- The following new classes have been added:
+  - `DatFilePlayerDataProvider` - the default player data provider, which stores `.dat` files in the `players` folder
+  - `PlayerDataLoadException` - thrown when an error occurs while loading player data
+  - `PlayerDataSaveException` - thrown when an error occurs while saving player data
+- The following API methods have been deprecated:
+  - `Player->sendTranslation()` - use `Player->sendMessage()` instead with a `Translatable` message
+
+### `pocketmine\resourcepacks`
+- The following new API methods have been added:
+  - `public ResourcePackManager->setResourceStack(list<ResourcePack> $resourceStack) : void` - sets the list of resource packs to be applied by players
+  - `public ResourcePackManager->setPackEncryptionKey(string $id, ?string $key) : void` - sets the encryption key to be used for a resource pack
+
+### `pocketmine\utils`
+- The following new API methods have been added:
+  - `public static Filesystem::fileGetContents(...) : string` - a wrapper around `file_get_contents()` which throws an exception on failure
+
+### `pocketmine\world`
+- The following new API methods have been added:
+  - `public World->requestSafeSpawn(?Vector3 $spawn = null) : Promise<Position>` - an async version of `getSafeSpawn()` which generates all the needed chunks before returning
diff --git a/changelogs/4.13.md b/changelogs/4.13.md
new file mode 100644
index 0000000000..085cc03492
--- /dev/null
+++ b/changelogs/4.13.md
@@ -0,0 +1,94 @@
+**For Minecraft: Bedrock Edition 1.19.50**
+
+This is a minor feature release for PocketMine-MP, introducing some new features and improvements.
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 4.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.
+
+# 4.13.0
+Released 30th January 2023.
+
+## Gameplay
+- Death message is now shown on the death screen when a player dies.
+- Armour damage is now only increased if the armour reduced the damage taken.
+- Implemented Swift Sneak enchantment.
+- Fixed incorrect collision box calculation of walls and glass/bars when connected. Note: Client-side, wall connections are still broken; this only fixes projectile flight server-side.
+
+## Performance
+- Improved performance of chunk selection for chunk random ticking using a cache. This improves performance of chunk random ticking by 10-20%.
+
+## Localization
+- Added localized description for the `/dumpmemory` command.
+
+## Permissions
+- Added the following new core permissions:
+  - `pocketmine.command.effect.other` - allows the player to use the `/effect` command on other players (default operator only)
+  - `pocketmine.command.effect.self` - allows the player to use the `/effect` command on themselves (default operator only)
+  - `pocketmine.command.enchant.other` - allows the player to use the `/enchant` command on other players (default operator only)
+  - `pocketmine.command.enchant.self` - allows the player to use the `/enchant` command on themselves (default operator only)
+  - `pocketmine.command.gamemode.other` - allows the player to use the `/gamemode` command on other players (default operator only)
+  - `pocketmine.command.gamemode.self` - allows the player to use the `/gamemode` command on themselves (default operator only)
+  - `pocketmine.command.give.other` - allows the player to use the `/give` command on other players (default operator only)
+  - `pocketmine.command.give.self` - allows the player to use the `/give` command on themselves (default operator only)
+  - `pocketmine.command.spawnpoint.other` - allows the player to use the `/spawnpoint` command on other players (default operator only)
+  - `pocketmine.command.spawnpoint.self` - allows the player to use the `/spawnpoint` command on themselves (default operator only)
+  - `pocketmine.command.teleport.other` - allows the player to use the `/teleport` command on other players (default operator only)
+  - `pocketmine.command.teleport.self` - allows the player to use the `/teleport` command on themselves (default operator only)
+  - `pocketmine.command.title.other` - allows the player to use the `/title` command on other players (default operator only)
+  - `pocketmine.command.title.self` - allows the player to use the `/title` command on themselves (default operator only)
+
+## Internals
+- Decoupled `Player->sendMessage()` and `Player->sendTranslation()`.
+- Refactored resource pack loading in `ResourcePackManager` to make it easier to understand.
+- Client-aware translation processing has been moved to `NetworkSession` due to being client-specific.
+- Replaced hardcoded strings with constants in various places.
+- `NetworkSession` destructive cleanup is now deferred to the next session tick. This fixes various `InventoryManager` crashes when kicking players during events.
+- Updated code using `strpos()` to use `str_starts_with()`, `str_ends_with()` and `str_contains()` where appropriate.
+- Added documentation for some internal methods.
+
+## API
+### `pocketmine\command`
+- The following new API methods have been added:
+  - `protected VanillaCommand->fetchPermittedPlayerTarget(...) : ?Player` - fetches a player target according to the given sender permissions, or null if not found or not permitted
+
+### `pocketmine\entity`
+- The following new API methods have been added:
+  - `public Living->getDisplayName() : string` - the name of the entity to be shown in death messages, commands etc.
+
+### `pocketmine\event\world`
+- The following new classes have been added:
+  - `WorldSoundEvent` - called when a sound is played in a world
+  - `WorldParticleEvent` - called when a particle is spawned in a world
+
+### `pocketmine\item`
+- The following new API methods have been added:
+  - `public Item->onInteractEntity(Player $player, Entity $entity, Vector3 $clickVector) : bool` - called when a player interacts with an entity with this item in hand
+
+### `pocketmine\lang`
+- `Language->translate()` and `Language->translateString()` no longer parse nested translation in the "base text". This was never intended behaviour, and didn't work beyond the first level anyway.
+
+### `pocketmine\player`
+- The following new interfaces have been added:
+  - `PlayerDataProvider` - implemented by classes which want to offer storage for player data
+- The following new classes have been added:
+  - `DatFilePlayerDataProvider` - the default player data provider, which stores `.dat` files in the `players` folder
+  - `PlayerDataLoadException` - thrown when an error occurs while loading player data
+  - `PlayerDataSaveException` - thrown when an error occurs while saving player data
+- The following API methods have been deprecated:
+  - `Player->sendTranslation()` - use `Player->sendMessage()` instead with a `Translatable` message
+
+### `pocketmine\resourcepacks`
+- The following new API methods have been added:
+  - `public ResourcePackManager->setResourceStack(list<ResourcePack> $resourceStack) : void` - sets the list of resource packs to be applied by players
+  - `public ResourcePackManager->setPackEncryptionKey(string $id, ?string $key) : void` - sets the encryption key to be used for a resource pack
+
+### `pocketmine\utils`
+- The following new API methods have been added:
+  - `public static Filesystem::fileGetContents(...) : string` - a wrapper around `file_get_contents()` which throws an exception on failure
+
+### `pocketmine\world`
+- The following new API methods have been added:
+  - `public World->requestSafeSpawn(?Vector3 $spawn = null) : Promise<Position>` - an async version of `getSafeSpawn()` which generates all the needed chunks before returning
diff --git a/changelogs/4.14.md b/changelogs/4.14.md
new file mode 100644
index 0000000000..f266e8b019
--- /dev/null
+++ b/changelogs/4.14.md
@@ -0,0 +1,21 @@
+**For Minecraft: Bedrock Edition 1.19.60**
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 4.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.
+
+# 4.14.0
+Released 8th February 2023.
+
+## General
+- Added support for Minecraft: Bedrock Edition 1.19.60.
+- Removed support for older versions.
+
+# 4.14.1
+Released 15th February 2023.
+
+## Fixes
+- Fixed all players getting kicked with `Receiving packets too fast` if a server tick takes longer than 5 seconds (e.g. because of autosave or GC).
+- Fixed players getting kicked when linking with entities.
diff --git a/changelogs/4.15.md b/changelogs/4.15.md
new file mode 100644
index 0000000000..32413bf7ad
--- /dev/null
+++ b/changelogs/4.15.md
@@ -0,0 +1,38 @@
+**For Minecraft: Bedrock Edition 1.19.62**
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 4.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.
+
+# 4.15.0
+Released 17th February 2023.
+
+## General
+- Added support for Minecraft: Bedrock Edition 1.19.62.
+- Removed support for older versions.
+
+# 4.15.1
+Released 21st February 2023.
+
+## Fixes
+- Fixed dropped items not despawning when in non-ticking chunks.
+- Fixed dropped items not despawning if an infinite pickup delay is set.
+- Fixed infinite despawn delay (never despawn) being ignored for dropped items.
+
+# 4.15.2
+Released 24th February 2023.
+
+## General
+- Accept Minecraft: Bedrock Edition 1.19.63 (identical protocol to 1.19.62, but different version due to Mojang mixup).
+
+## Fixes
+- Fixed `World Population` timer sometimes not being stopped, causing strange results in timings reports.
+
+# 4.15.3
+Released 7th March 2023.
+
+## Fixes
+- Fixed `/dumpmemory` crash when any object contained an `INF` or `NaN` float value.
+- Updated RakLib for security fixes.
diff --git a/changelogs/4.16-beta.md b/changelogs/4.16-beta.md
new file mode 100644
index 0000000000..ba68472868
--- /dev/null
+++ b/changelogs/4.16-beta.md
@@ -0,0 +1,45 @@
+**For Minecraft: Bedrock Edition 1.19.62**
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 4.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.
+
+# 4.16.0-BETA1
+Released 4th March 2023.
+
+## General
+- Added granular timings for packet encode, similar to the existing timings for packet decode.
+- Timings now covers several areas of the network system which were previously not counted by network timings, but were counted by total timings. This provides a better insight into the performance of the network system.
+
+## Performance
+- Improved performance of packet batch handling by avoiding unnecessary object allocations.
+- Improved performance of packet broadcasting when the broadcast size is below the batch threshold. Previously, the packets would be encoded once by every recipient, but now they are encoded once and then added to the send buffer of each session in their raw form.
+  - This change mostly affects servers with larger maps, where players are more widely distributed.
+
+## Build system
+- Added a new script `build/generate-bedrockdata-path-consts.php`, which must be run whenever BedrockData is updated. This script generates a class of constants with the file paths of all BedrockData files.
+
+## API
+### `pocketmine\entity`
+- The following new API methods have been added:
+  - `public Entity->getGravity() : float` - returns the entity's gravity acceleration in blocks/tick^2
+  - `public Entity->setGravity(float $gravity) : void` - sets the entity's gravity acceleration in blocks/tick^2
+
+## Internals
+- Now uses [`pocketmine/bedrock-data` 2.0.0](https://github.com/pmmp/BedrockData/releases/tag/2.0.0+bedrock-1.19.60).
+  - This version is now used by both PM4 and PM5, reducing maintenance burden.
+- Now uses [`pocketmine/bedrock-protocol` 19.3.0](https://github.com/pmmp/BedrockProtocol/releases/tag/19.3.0+bedrock-1.19.62).
+  - This version provides new APIs for handling packet batches which enabled improving performance and adding new features, such as detailed packet encode timings.
+- Crafting recipes and creative inventory data are now loaded from `recipes/legacy_recipes.json` and `recipes/legacy_creativeitems.json` respectively. Previously, these were loaded from BedrockData directly, but BedrockData 2.0 now uses a format which can't be supported in 4.x without BC breaks.
+- Added dependencies on [`pocketmine/bedrock-block-upgrade-schema`](https://github.com/pmmp/BedrockBlockUpgradeSchema) and [`pocketmine/bedrock-item-upgrade-schema`](https://github.com/pmmp/BedrockItemUpgradeSchema). These provide mapping files no longer present in BedrockData 2.0.
+- Reduced and/or eliminated most usages of `PacketBatch`, since it only appeared as a throwaway object and was therefore wasting performance.
+- `Compressor` now exposes `getCompressionThreshold()` instead of `willCompress()`, which allows determining whether a batch will be compressed without allocating it.
+- Added `pocketmine\data\bedrock\BedrockDataFiles`, an auto-generated class of constants with the file paths of all BedrockData files. This makes it easier to locate usages, detect unused files and avoid typos.
+
+# 4.16.0-BETA2
+Released 4th March 2023.
+
+## General
+- Fixed incorrect release channel for 4.16.0-BETA1.
diff --git a/changelogs/4.16.md b/changelogs/4.16.md
new file mode 100644
index 0000000000..9ba623b85b
--- /dev/null
+++ b/changelogs/4.16.md
@@ -0,0 +1,41 @@
+**For Minecraft: Bedrock Edition 1.19.62**
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 4.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.
+
+# 4.16.0
+Released 7th March 2023.
+
+## General
+- Added granular timings for packet encode, similar to the existing timings for packet decode.
+- Split `Player Network Send - Compression` timings into two timers, one for `Session Buffer` compression and one for `Broadcast` compression.
+- Timings now covers several areas of the network system which were previously not counted by network timings, but were counted by total timings. This provides a better insight into the performance of the network system.
+
+## Performance
+- Improved performance of packet batch handling by avoiding unnecessary object allocations.
+- Improved performance of packet broadcasting when the broadcast size is below the batch threshold. Previously, the packets would be encoded once by every recipient, but now they are encoded once and then added to the send buffer of each session in their raw form.
+  - This change mostly affects servers with larger maps, where players are more widely distributed.
+- Improved performance of packet broadcasting when the broadcast has only one recipient (allow the session to compress the packet with the rest of its buffer).
+
+## Build system
+- Added a new script `build/generate-bedrockdata-path-consts.php`, which must be run whenever BedrockData is updated. This script generates a class of constants with the file paths of all BedrockData files.
+
+## API
+### `pocketmine\entity`
+- The following new API methods have been added:
+  - `public Entity->getGravity() : float` - returns the entity's gravity acceleration in blocks/tick^2
+  - `public Entity->setGravity(float $gravity) : void` - sets the entity's gravity acceleration in blocks/tick^2
+
+## Internals
+- Now uses [`pocketmine/bedrock-data` 2.0.0](https://github.com/pmmp/BedrockData/releases/tag/2.0.0+bedrock-1.19.60).
+  - This version is now used by both PM4 and PM5, reducing maintenance burden.
+- Now uses [`pocketmine/bedrock-protocol` 19.3.0](https://github.com/pmmp/BedrockProtocol/releases/tag/19.3.0+bedrock-1.19.62).
+  - This version provides new APIs for handling packet batches which enabled improving performance and adding new features, such as detailed packet encode timings.
+- Crafting recipes and creative inventory data are now loaded from `recipes/legacy_recipes.json` and `recipes/legacy_creativeitems.json` respectively. Previously, these were loaded from BedrockData directly, but BedrockData 2.0 now uses a format which can't be supported in 4.x without BC breaks.
+- Added dependencies on [`pocketmine/bedrock-block-upgrade-schema`](https://github.com/pmmp/BedrockBlockUpgradeSchema) and [`pocketmine/bedrock-item-upgrade-schema`](https://github.com/pmmp/BedrockItemUpgradeSchema). These provide mapping files no longer present in BedrockData 2.0.
+- Reduced and/or eliminated most usages of `PacketBatch`, since it only appeared as a throwaway object and was therefore wasting performance.
+- `Compressor` now exposes `getCompressionThreshold()` instead of `willCompress()`, which allows determining whether a batch will be compressed without allocating it.
+- Added `pocketmine\data\bedrock\BedrockDataFiles`, an auto-generated class of constants with the file paths of all BedrockData files. This makes it easier to locate usages, detect unused files and avoid typos.
diff --git a/changelogs/4.17.md b/changelogs/4.17.md
new file mode 100644
index 0000000000..aa50ccd5a5
--- /dev/null
+++ b/changelogs/4.17.md
@@ -0,0 +1,39 @@
+**For Minecraft: Bedrock Edition 1.19.70**
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 4.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.
+
+# 4.17.0
+Released 14th March 2023.
+
+## General
+- Added support for Minecraft: Bedrock Edition 1.19.70.
+- Removed support for older versions.
+
+# 4.17.1
+Released 22nd March 2023.
+
+## General
+- Docker images for PocketMine-MP are now published on [GitHub Container Registry](https://github.com/pmmp/PocketMine-MP/pkgs/container/pocketmine-mp). The Docker Hub images will stop being maintained in the future.
+- Updated translations.
+
+## Fixes
+- Fixed server crash on empty packets in certain cases.
+- Fixed mushroom blocks dropping the wrong items when broken with a silk-touch tool.
+- Fixed mushroom blocks giving the wrong items when block-picked.
+- Fixed missing ability flag `PRIVILEGED_BUILDER`.
+
+## Internals
+- `update-updater-api.yml` workflow now uses `github.repository_owner` to make it easier to test the workflow on forks.
+- Added version-specific channels to `update.pmmp.io`, such as `4`, `4.18-beta`, `4.17`, etc.
+- Replaced deprecated `::set-output` commands in GitHub Actions workflows.
+- `build/make-release.php` no longer automatically pushes changes, to avoid accidents when testing release workflows on forks.
+
+# 4.17.2
+Released 29th March 2023.
+
+## Fixes
+- Fixed players being unable to join due to the appearance of a new `x5t` field in the JWT header of Xbox Live authentication tokens.
diff --git a/changelogs/4.18-alpha.md b/changelogs/4.18-alpha.md
new file mode 100644
index 0000000000..fde35a1da7
--- /dev/null
+++ b/changelogs/4.18-alpha.md
@@ -0,0 +1,91 @@
+**For Minecraft: Bedrock Edition 1.19.70**
+
+### Note about API versions
+Plugins which don't touch the `pocketmine\network\mcpe` namespace are compatible with any previous 4.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 `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.
+
+### Alpha release warning
+Alpha releases are **experimental**. Features introduced in these releases are subject to change or removal.
+
+APIs which existed **prior** to this version will continue to work as normal, so plugins which use them will continue to work.
+
+### Highlights
+This version makes changes to the internal network system to improve server performance and reduce memory usage.
+
+While these changes don't affect non-internal API, they are still significant enough to warrant a new minor version, as they may break plugins which use the internal network API (not recommended).
+
+# 4.18.0-ALPHA1
+Released 16th March 2023.
+
+## General
+- Improved server performance in congested areas of the world (lots of players and/or entities in the same area).
+
+## API
+### `pocketmine\event\server`
+- The following new classes have been added:
+  - `DataPacketDecodeEvent` - called before a packet is decoded by a `NetworkSession`; useful to mitigate DoS attacks if PocketMine-MP hasn't been patched against new bugs yet
+
+## Internals
+- Introduced new system for broadcasting entity events to network sessions.
+  - This change improves performance when lots of players and/or entities are in the same area.
+  - New interface `EntityEventBroadcaster` and class `StandardEntityEventBroadcaster` have been added to implement this.
+  - All entity-specific `on*()` and `sync*()` methods have been removed from `NetworkSession` (BC break).
+  - `NetworkSession` now accepts an `EntityEventBroadcaster` instance in its constructor.
+  - `NetworkBroadcastUtils::broadcastEntityEvent()` can be used to efficiently broadcast events to unique broadcasters shared by several network sessions.
+- All network sessions now share the same `PacketSerializerContext` and `PacketBroadcaster` by default.
+  - Previously, every session had its own context, meaning that broadcast optimisations were not used, causing significant performance losses compared to 3.x.
+  - This change improves performance in congested areas by allowing reuse of previously encoded packet buffers for all sessions sharing the same context.
+  - Packet broadcasts are automatically encoded separately per unique `PacketSerializerContext` instance. This allows, for example, a multi-version fork to have a separate context for each protocol version, to ensure maximum broadcast efficiency while encoding different packets for different versions.
+  - `PacketSerializerContext` is now passed in `NetworkSession::__construct()`, instead of being created by the session.
+- `StandardPacketBroadcaster` is now locked to a single `PacketSerializer` context, reducing complexity.
+- Introduced `NetworkBroadcastUtils::broadcastPackets()`, replacing `Server->broadcastPackets()`.
+- `Server->broadcastPackets()` has been deprecated. It will be removed in a future version.
+
+# 4.18.0-ALPHA2
+Released 21st March 2023.
+
+## General
+- Included more sections of the network system in Player Network Send timings.
+- Changed the names of some timings to make them more user-friendly.
+- Removed packet IDs from `receivePacket` and `sendPacket` timings, as they were not very useful.
+- Added new specialized timers for the following:
+  - Item entity base ticking (merging)
+  - Player movement processing
+  - Entity movement processing (collision checking section)
+  - Projectile movement (all)
+  - Projectile movement processing (ray tracing section)
+
+## API
+### `pocketmine\crafting`
+- The following new API methods have been added:
+  - `CraftingManager->getCraftingRecipeIndex() : array<int, CraftingRecipe>` - returns a list of all crafting recipes
+  - `CraftingManager->getCraftingRecipeFromIndex(int $index) : ?CraftingRecipe` - returns the crafting recipe at the given index, or null if it doesn't exist
+
+### `pocketmine\inventory\transaction`
+- The following API methods have changed signatures:
+  - `CraftingTransaction->__construct()` now accepts additional arguments `?CraftingRecipe $recipe = null, ?int $repetitions = null`
+- The following new API methods have been added:
+  - `TransactionBuilderInventory->getActualInventory() : Inventory` - returns the actual inventory that this inventory is a proxy for
+
+## Internals
+### Network
+- Introduced support for the `ItemStackRequest` Minecraft: Bedrock network protocol.
+  - This fixes a large number of inventory- and crafting-related bugs.
+  - This also improves server security by closing off many code pathways that might have been used for exploits. `TypeConverter->netItemStackToCore()` is no longer used in server code, and remains for tool usage only.
+  - This system is also significantly more bandwidth-efficient and has lower overhead than the legacy system.
+  - This now opens the gateway to easily implement lots of gameplay features which have been missing for a long time, such as enchanting, anvils, looms, and more.
+  - Significant changes have been made to `pocketmine\network\mcpe\InventoryManager` internals. These shouldn't affect plugins, but may affect plugins which use internal network API.
+  - **No changes have been made to the plugin `InventoryTransaction` API**.
+    - This system has been implemented as a shim for the existing PocketMine-MP transaction system to preserve plugin compatibility. Plugins using `InventoryTransactionEvent` should continue to work seamlessly.
+    - The `InventoryTransaction` API will be redesigned in a future major version to make use of the new information provided by the `ItemStackRequest` system.
+  - `InventoryTransactionPacket` is no longer sent by the client for "regular" inventory actions. However, it is still sent when dropping items, interacting with blocks, and using items.
+- Inventory slot and content syncing is now buffered until the end of the tick. This reduces outbound network usage when the client performs multiple transactions in a single tick (e.g. crafting a stack of items).
+- Renamed some `InventoryManager` internal properties to make them easier to understand.
+- `TypeConverter->createInventoryAction()` has been removed.
+- Packet batch limit has been lowered to `100` packets. With the introduction of `ItemStackRequest`, this is more than sufficient for normal gameplay.
+
+### Other
+- Use `Vector3::zero()` instead of `new Vector3()` in some places.
\ No newline at end of file
diff --git a/changelogs/4.18.md b/changelogs/4.18.md
new file mode 100644
index 0000000000..940a855bd0
--- /dev/null
+++ b/changelogs/4.18.md
@@ -0,0 +1,123 @@
+**For Minecraft: Bedrock Edition 1.19.70**
+
+### Note about API versions
+Plugins which don't touch the `pocketmine\network\mcpe` namespace are compatible with any previous 4.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 `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.
+
+### Highlights
+This version significantly improves server performance with many players and/or entities by making changes to the internal network system.
+
+It also introduces support for the newer `ItemStackRequest` protocol, which fixes many bugs and improves server security.
+
+While these changes don't affect non-internal API, they are still significant enough to warrant a new minor version, as they may break plugins which use the internal network API (not recommended).
+
+# 4.18.0
+Released 25th March 2023.
+
+## General
+- Significantly improved server performance in congested areas of the world (lots of players and/or entities in the same area).
+- Included more sections of the network system in `Player Network Send` performance timings.
+- Changed the names of some performance timings to make them more user-friendly.
+- Removed packet IDs from `receivePacket` and `sendPacket` performance timings, as they were not very useful.
+- Added new specialized performance timings for the following:
+  - Item entity base ticking (merging)
+  - Player movement processing
+  - Entity movement processing (collision checking section)
+  - Projectile movement (all)
+  - Projectile movement processing (ray tracing section)
+
+## API
+### `pocketmine\crafting`
+- The following new API methods have been added:
+  - `CraftingManager->getCraftingRecipeIndex() : array<int, CraftingRecipe>` - returns a list of all crafting recipes
+  - `CraftingManager->getCraftingRecipeFromIndex(int $index) : ?CraftingRecipe` - returns the crafting recipe at the given index, or null if it doesn't exist
+
+### `pocketmine\event\server`
+- The following new classes have been added:
+  - `DataPacketDecodeEvent` - called before a packet is decoded by a `NetworkSession`; useful to mitigate DoS attacks if PocketMine-MP hasn't been patched against new bugs yet
+
+### `pocketmine\inventory\transaction`
+- The following API methods have changed signatures:
+  - `CraftingTransaction->__construct()` now accepts additional arguments `?CraftingRecipe $recipe = null, ?int $repetitions = null`
+- The following new API methods have been added:
+  - `TransactionBuilderInventory->getActualInventory() : Inventory` - returns the actual inventory that this inventory is a proxy for
+
+## Internals
+### Network
+- Introduced new system for broadcasting entity events to network sessions.
+  - This change improves performance when lots of players and/or entities are in the same area.
+  - New interface `EntityEventBroadcaster` and class `StandardEntityEventBroadcaster` have been added to implement this.
+  - All entity-specific `on*()` and `sync*()` methods have been removed from `NetworkSession` (internals backwards compatibility break, not covered by API version guarantee).
+  - `NetworkSession` now accepts an `EntityEventBroadcaster` instance in its constructor.
+  - `NetworkBroadcastUtils::broadcastEntityEvent()` can be used to efficiently broadcast events to unique broadcasters shared by several network sessions.
+- All network sessions now share the same `PacketSerializerContext` and `PacketBroadcaster` by default.
+  - Previously, every session had its own context, meaning that broadcast optimisations were not used, causing significant performance losses compared to 3.x.
+  - This change improves performance in congested areas by allowing reuse of previously encoded packet buffers for all sessions sharing the same context.
+  - Packet broadcasts are automatically encoded separately per unique `PacketSerializerContext` instance. This allows, for example, a multi-version fork to have a separate context for each protocol version, to ensure maximum broadcast efficiency while encoding different packets for different versions.
+  - `PacketSerializerContext` is now passed in `NetworkSession::__construct()`, instead of being created by the session.
+- `StandardPacketBroadcaster` is now locked to a single `PacketSerializer` context, reducing complexity.
+- Introduced `NetworkBroadcastUtils::broadcastPackets()`, replacing `Server->broadcastPackets()`.
+- `Server->broadcastPackets()` has been deprecated. It will be removed in a future version.
+- Introduced support for the `ItemStackRequest` Minecraft: Bedrock network protocol.
+  - This fixes a large number of inventory- and crafting-related bugs.
+  - This also improves server security by closing off many code pathways that might have been used for exploits. `TypeConverter->netItemStackToCore()` is no longer used in server code, and remains for tool usage only.
+  - This system is also significantly more bandwidth-efficient and has lower overhead than the legacy system.
+  - This now opens the gateway to easily implement lots of gameplay features which have been missing for a long time, such as enchanting, anvils, looms, and more.
+  - Significant changes have been made to `pocketmine\network\mcpe\InventoryManager` internals. These shouldn't affect plugins, but may affect plugins which use internal network API.
+  - **No changes have been made to the plugin `InventoryTransaction` API**.
+    - This system has been implemented as a shim for the existing PocketMine-MP transaction system to preserve plugin compatibility. Plugins using `InventoryTransactionEvent` should continue to work seamlessly.
+    - The `InventoryTransaction` API will be redesigned in a future major version to make use of the new information provided by the `ItemStackRequest` system.
+  - `InventoryTransactionPacket` is no longer sent by the client for "regular" inventory actions. However, it is still sent when dropping items, interacting with blocks, and using items.
+- Inventory slot and content syncing is now buffered until the end of the tick. This reduces outbound network usage when the client performs multiple transactions in a single tick (e.g. crafting a stack of items).
+- Renamed some `InventoryManager` internal properties to make them easier to understand.
+- `TypeConverter->createInventoryAction()` has been removed.
+- Packet batch limit has been lowered to `100` packets. With the introduction of `ItemStackRequest`, this is more than sufficient for normal gameplay.
+
+### Other
+- Use `Vector3::zero()` instead of `new Vector3()` in some places.
+
+# 4.18.1
+Released 27th March 2023.
+
+## General
+- `RakLibInterface` now logs the name of the currently active session if a crash occurs when processing a packet. This makes it easier to reproduce bugs, which is important to be able to fix them.
+- Added more detailed debugging information to `InventoryManager->syncSelectedHotbarSlot()`.
+
+## Fixes
+- Fixed server crash when attempting to drop more of an item from a stack than available in the inventory.
+- Fixed packet processing errors when editing writable books.
+- Fixed packet processing errors when shift-clicking on the recipe book to craft recipes which draw from a large number of inventory slots.
+
+# 4.18.2
+Released 29th March 2023.
+
+## Fixes
+- Fixed players being unable to join due to the appearance of a new `x5t` field in the JWT header of Xbox Live authentication tokens.
+- Fixed items' durability appearing to reset when moving them around in the inventory.
+
+# 4.18.3
+Released 5th April 2023.
+
+## Fixes
+- Fixed Average Players not being shown on timings reports when custom player classes are used.
+- Fixed incorrect tick violation calculation in timings reports.
+- Fixed not being able to add or remove items from the offhand slot.
+- Fixed creative inventory item count corruption when taking items (some players would see 64x items in the creative inventory after rejoining or changing gamemode).
+- Fixed not being able to drop items directly from the creative inventory on mobile.
+- Fixed `DataPacketReceiveEvent` not being called for packets sent by `EntityEventBroadcaster`.
+- `CreativeInventory::getItem()` and `CreativeInventory::getAll()` now return cloned itemstacks, to prevent accidental modification of the creative inventory.
+
+# 4.18.4
+Released 10th April 2023.
+
+## Fixes
+- Fixed movement becoming broken when the player moves at high speed (e.g. due to high levels of the Speed effect).
+- Updated dependencies to get fixes in `pocketmine/nbt` and `pocketmine/bedrock-protocol`.
+
+## Internals
+### Network
+- Game packets are now rate-limited in a similar manner to packet batches. This helps to more effectively mitigate certain types of DoS attacks.
+- Added a new class `PacketRateLimiter`, implementing functionality previously baked directly into `NetworkSession` in a more generic way to allow reuse.
diff --git a/changelogs/4.19.md b/changelogs/4.19.md
new file mode 100644
index 0000000000..89ef3140bc
--- /dev/null
+++ b/changelogs/4.19.md
@@ -0,0 +1,111 @@
+**For Minecraft: Bedrock Edition 1.19.70**
+
+### Note about API versions
+Plugins which don't touch the `pocketmine\network\mcpe` namespace are compatible with any previous 4.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 `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.
+
+### Highlights
+This version introduces support for a new, more advanced version of Timings.
+This improved system provides more detail than the old system, and supports being displayed in a tree view, making it much easier to see which timers contribute to which other timers.
+
+In addition, some minor performance improvements have been made, along with a couple of minor API additions.
+
+# 4.19.0
+Released 11th April 2023.
+
+## General
+- Updated the Timings system.
+  - Timings records now include parent information, allowing them to be displayed in a tree view (e.g. https://timings.pmmp.io/?id=303556).
+  - Timings records now include additional information, such as Peak (max time spent on any single tick), and Ticks (number of ticks the timer was active on).
+  - New timings have been added for every event.
+  - A new timer `Player Network Send - Pre-Spawn Game Data` has been added, and covers most of the time spent handling `ResourcePackClientResponsePacket`, giving a clearer picture of what's happening.
+- Improved performance of the plugin event system.
+  - By introducing some caching, the event system now has 90% less overhead than in previous versions.
+- Improved performance of the random chunk ticking system.
+  - The selection of ticked random chunks, and their validation for ticking, is now cached. This significantly reduces the overhead of chunk selection.
+  - Factions servers and other game modes with big maps and sparsely populated areas will see the most benefit from this change.
+  - Real-world performance benefit of this change is anywhere from 0-20%, depending on server type and configuration.
+- The `timings paste` command now logs a debug message with the server response on failure to paste a timings report.
+
+## API
+### `pocketmine\entity\object`
+- The following API constants have been added:
+  - `ExperienceOrb::DEFAULT_DESPAWN_DELAY` - the default delay in ticks before an experience orb despawns
+  - `ExperienceOrb::NEVER_DESPAWN` - magic value for `setDespawnDelay()` to make an experience orb never despawn
+  - `ExperienceOrb::MAX_DESPAWN_DELAY` - the maximum delay in ticks before an experience orb despawns
+- The following API methods have been added:
+  - `public ExperienceOrb->getDespawnDelay() : int` - returns the delay in ticks before this experience orb despawns
+  - `public ExperienceOrb->setDespawnDelay(int $despawnDelay) : void` - sets the delay in ticks before this experience orb despawns
+- The following properties have been deprecated
+  - `ExperienceOrb->age` - superseded by despawn delay methods
+
+### `pocketmine\event`
+- The following API methods have been added:
+  - `public HandlerList->getListenerList() : list<RegisteredListener>` - returns an ordered list of handlers to be called for the event
+
+### `pocketmine\player`
+- The following API methods have behavioural changes:
+  - `ChunkSelector->selectChunks()` now yields the distance in chunks from the center as the key, instead of an incrementing integer.
+- The following classes have been deprecated:
+  - `PlayerChunkLoader` (this was technically internal, but never marked as such)
+
+### `pocketmine\timings`
+- The following API constants have been deprecated:
+  - `Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX` - this is superseded by timings group support (see `Timings::GROUP_BREAKDOWN`)
+- The following API constants have been added:
+  - `Timings::GROUP_BREAKDOWN` - this group makes a timer appear in the `Minecraft - Breakdown` section of a timings report
+- The following API methods have been added:
+  - `public TimingsHandler->getGroup() : string` - returns the name of the table in which this timer will appear in a timings report
+- The following API methods have changed signatures:
+  - `TimingsHandler->__construct()` now accepts an additional, optional `string $group` parameter, which defaults to `Minecraft`.
+
+### `pocketmine\world`
+#### Highlights
+Ticking chunks is now done using the `ChunkTicker` system, which has a much more fine-grained API than the old `TickingChunkLoader` system, as well as better performance.
+It works similarly to the `ChunkLoader` system, in that chunks will be ticked as long as at least one `ChunkTicker` is registered for them.
+
+#### API changes
+- The following classes have been deprecated:
+  - `TickingChunkLoader` - this has been superseded by the more powerful and performant `ChunkTicker` APIs
+- The following classes have been added:
+  - `ChunkTicker` - an opaque object used for `registerTickingChunk()` to instruct the `World` that we want a chunk to be ticked
+- The following API methods have been added:
+  - `public World->registerTickingChunk(ChunkTicker $ticker, int $chunkX, int $chunkZ) : void` - registers a chunk to be ticked by the given `ChunkTicker`
+  - `public World->unregisterTickingChunk(ChunkTicker $ticker, int $chunkX, int $chunkZ) : void` - unregisters a chunk from being ticked by the given `ChunkTicker`
+
+# 4.19.1
+Released 14th April 2023.
+
+## Fixes
+- Fixed inventory rollbacks when spreading items in ender chests.
+- Fixed inventory rollbacks when shift-clicking to craft and the outputs would have been split across multiple inventory slots.
+- Fixed incorrect spawn terrain generation for newly created worlds.
+- Fixed `chunk-ticking.tick-radius` not disabling chunk ticking when set to `0`.
+- Fixed chunks not being ticked if they previously left a player's simulation distance without leaving their view distance.
+- Fixed height of collision boxes for Grass Path and Farmland blocks.
+
+# 4.19.2
+Released 14th April 2023.
+
+## Fixes
+- Fixed player timings duplication leading to extremely large timings reports when timings runs for a long time with many players.
+- Packet timings are now indexed by class FQN instead of packet ID. This prevents erroneous timer reuse on packet ID reuse (e.g. multi version servers).
+- Fixed entity timings being shared by different classes with the same short name. This led to incorrect timings being reported for some entities when custom entities were used.
+
+# 4.19.3
+Released 21st April 2023.
+
+## General
+- Error IDs for `Packet processing error` disconnects are now split into 4-character chunks to make them easier to type (since they can't be copied from the disconnection screen of a client).
+
+## Fixes
+- Fixed entity-block intersections being checked twice per tick. Besides wasting CPU time, this may have caused unexpected behaviour during entity-block interactions with blocks like water or cacti.
+- Fixed performance issue in network inventory synchronization due item NBT being prepared twice.
+- Fixed `tools/simulate-chunk-selector.php` argument parsing being completely broken (weird behaviour of PHP `getopt()`).
+
+## Internals
+- `TimingsHandler->stopTiming()` now logs an error message if a subtimer wasn't stopped, rather than throwing an exception.
+  - Due to interactions between `try...finally` and unexpected errors, throwing exceptions made it difficult for plugin developers to debug errors in their plugins, since it obscured the original error.
diff --git a/changelogs/4.20.md b/changelogs/4.20.md
new file mode 100644
index 0000000000..c767b82205
--- /dev/null
+++ b/changelogs/4.20.md
@@ -0,0 +1,79 @@
+**For Minecraft: Bedrock Edition 1.19.80**
+
+### Note about API versions
+Plugins which don't touch the `pocketmine\network\mcpe` namespace are compatible with any previous 4.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 `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.
+
+### Interim releases
+If you're upgrading from 4.17.x directly to 4.20.x, please also read the following changelogs, as the interim releases contain important changes:
+
+- [4.18.0](https://github.com/pmmp/PocketMine-MP/blob/4.20.0/changelogs/4.18.md#4180) - major performance improvements, internal network changes, minor API additions
+- [4.19.0](https://github.com/pmmp/PocketMine-MP/blob/4.20.0/changelogs/4.19.md#4190) - minor performance improvements, improved timings system, minor API additions
+
+# 4.20.0
+Released 26th April 2023.
+
+## General
+- Added support for Minecraft: Bedrock Edition 1.19.80.
+- Removed support for older versions.
+
+## Fixes
+- Fixed packet processing error when attempting to use a stonecutter.
+- Fixed armor slots containing ghost items when cancelling right-click to equip armor.
+- Fixed crash in `HandlerList->getListenersByPriority()` when no listeners are registered at the given priority.
+
+## API
+### `pocketmine\block`
+- The following API methods have been added:
+  - `public BaseSign->getEditorEntityRuntimeId() : int` - returns the entity runtime ID of the player currently editing this sign, or `null` if none
+  - `public BaseSign->setEditorEntityRuntimeId(?int $editorEntityRuntimeId) : $this` - sets the entity runtime ID of the player currently editing this sign
+
+### `pocketmine\player`
+- The following API methods have been added:
+  - `public Player->openSignEditor(Vector3 $position) : void` - opens the client-side sign editor GUI for the given position
+
+# 4.20.1
+Released 27th April 2023.
+
+## Fixes
+- Fixed server crash when firing a bow while holding arrows in the offhand slot.
+
+## Internals
+- `ItemStackContainerIdTranslator::translate()` now requires an additional `int $slotId` parameter and returns `array{int, int}` (translated window ID, translated slot ID) to be used with `InventoryManager->locateWindowAndSlot()`.
+- `InventoryManager->locateWindowAndSlot()` now checks if the translated slot actually exists in the requested inventory, and returns `null` if not. Previously, it would return potentially invalid slot IDs without checking them, potentially leading to crashes.
+
+# 4.20.2
+Released 4th May 2023.
+
+## Fixes
+- Fixed all types of wooden logs appearing as oak in the inventory.
+- Fixed a performance issue in `BaseInventory->canAddItem()` (missing `continue` causing useless logic to run).
+
+# 4.20.3
+Released 6th May 2023.
+
+## Improvements
+- Reduced memory usage of `RuntimeBlockMapping` from 25 MB to 9 MB. Since every thread has its own copy of the block map, this saves a substantial amount of memory.
+
+## Fixes
+- Fixed players falling through blocks in spectator mode.
+- Fixed timings reports getting bloated by prolific usage of `PluginManager->registerEvent()`.
+  - This was caused by creating a new timings handler for each call, regardless of whether a timer already existed for the given event and callback.
+- Fixed `Full Server Tick` and other records being missing from timings reports.
+  - This was caused by timings handler depth not getting reset when timings was disabled and later re-enabled.
+
+# 4.20.4
+Released 6th May 2023.
+
+## Fixes
+- Fixed players being forced into flight mode in every game mode.
+  - Moral of the story: do not assume anything in Mojang internals does what its name suggests...
+
+# 4.20.5
+Released 30th May 2023.
+
+## Fixes
+- Fixed server crash due to a bug in upstream dependency [`netresearch/jsonmapper`](https://github.com/cweiske/JsonMapper).
diff --git a/changelogs/4.21.md b/changelogs/4.21.md
new file mode 100644
index 0000000000..da4cc78c0a
--- /dev/null
+++ b/changelogs/4.21.md
@@ -0,0 +1,77 @@
+**For Minecraft: Bedrock Edition 1.19.80**
+
+### Note about API versions
+Plugins which don't touch the `pocketmine\network\mcpe` namespace, and don't use reflection or any internal methods,
+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 `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.
+
+# 4.21.0
+Released 17th May 2023.
+
+## General
+- PHP 8.1 is now required. Most plugins should run without changes, but some might need to be updated due to language-level deprecations.
+- Ticking chunk count is now shown separately from loaded chunk count in the `/status` command, providing useful performance information.
+- Further improved performance of ticking chunk selection.
+- Improved performance of some inventory functions.
+- Reduced server memory footprint in most cases by ~9 MB per thread.
+- Due to large overhead, async network compression is now only used for packets larger than 10 KB by default.
+
+## Configuration
+- Added the following new `pocketmine.yml` configuration options:
+  - `network.async-compression-threshold` - minimum size of packet which will be compressed using `AsyncTask`
+    - Default is 10 KB, which means that very few packets will use async compression in practice. This is because the overhead of compressing async is currently so high that it's not worth it for smaller packets.
+
+## Timings
+- Timings reports no longer include the unused metadata fields `Entities` and `LivingEntities`.
+- Timings reports now correctly calculate the peak time of a timer.
+  - Previously it was incorrectly recorded as the longest time spent in a single tick, rather than the longest time spent in a single activation.
+  - Timings report version has been bumped to `2` to reflect this change.
+- All world-specific timers now have generic aggregate timings, making it much easier to locate performance patterns across all worlds.
+
+## Gameplay
+- Players in spectator mode are no longer able to pick blocks, and now have finite resources similar to survival mode.
+
+## API
+### `pocketmine\world`
+- The following API methods have been added:
+  - `public World->getTickingChunks() : list<int>` - returns a list of chunk position hashes (a la `World::chunkHash()`) which are currently valid for random ticking
+
+### `pocketmine\inventory`
+- The following API methods have been added:
+  - `protected BaseInventory->getMatchingItemCount(int $slot, Item $test, bool $checkDamage, bool $checkTags) : int` - returns the number of items in the given stack if the content of the slot matches the test item, or zero otherwise
+    - This should be overridden if directly extending `BaseInventory` to provide a performance-optimised version. A slow default implementation is provided, but it will be removed in the future.
+  
+## Internals
+### Entity
+- Unused `NameTag` tag is no longer saved for `Human` entities.
+
+### Inventory
+- `BaseInventory` now uses a new internal method `getMatchingItemCount()` to locate items in the inventory without useless cloning. This improves performance of various API methods, such as `addItem()`, `contains()`, and more.
+- Specialization of `Inventory->isSlotEmpty()` in `BaseInventory` subclasses has been added to improve performance of some API methods.
+
+### Network
+- `RuntimeBlockMapping` no longer keeps all block palette NBT data in memory.
+  - This significantly reduces server idle memory footprint.
+  - For multi-version implementations, this will have a significant impact on memory usage, since a different block palette is often required to support each version.
+  - NBT will be lazy-loaded into memory and cached if `getBedrockKnownStates()` is called. However, this is not used by PocketMine-MP under normal circumstances.
+- Removed unnecessary usage of `Utils::validateCallableSignature()` from some internal network pathways, improving performance.
+
+### Scheduler
+- `AsyncPool` no longer double-checks progress updates on completed tasks.
+
+### World
+- Ticking chunks are now tracked in `World->validTickingChunks` and `World->recheckTickingChunks`.
+    - This allows avoiding rechecking every ticking chunk for validity during ticking chunk selection, improving performance.
+    - In some cases, this allows bypassing chunk selection entirely, reducing selection cost to zero.
+- Registered but ineligible ticking chunks are no longer rechecked every tick.
+    - This was causing wasted cycles during async worker backlog.
+    - The internal system must call `markTickingChunkForRecheck()` whenever a ticking chunk's eligibility for ticking has potentially changed, rather than just when it has changed from a yes to a no.
+
+# 4.21.1
+Released 30th May 2023.
+
+## Fixes
+- Fixed server crash due to a bug in upstream dependency [`netresearch/jsonmapper`](https://github.com/cweiske/JsonMapper).
diff --git a/changelogs/4.22.md b/changelogs/4.22.md
new file mode 100644
index 0000000000..10c4ddea3d
--- /dev/null
+++ b/changelogs/4.22.md
@@ -0,0 +1,58 @@
+# 4.22.0
+Released 7th June 2023.
+
+**For Minecraft: Bedrock Edition 1.20.0**
+
+This is a support release for Minecraft: Bedrock Edition 1.20.0.
+
+**Plugin compatibility:** Plugins for previous 4.x versions will run unchanged on this release, unless they use internal APIs, reflection, or packages like the `pocketmine\network\mcpe` 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.
+
+## Interim releases
+If you're upgrading from 4.20.x directly to 4.22.x, please also read the following changelogs, as the interim releases contain important changes:
+- [4.21.0](https://github.com/pmmp/PocketMine-MP/blob/4.22.0/changelogs/4.21.md#4210) - PHP 8.1 minimum version, minor performance improvements
+
+## General
+- Added support for Minecraft: Bedrock Edition 1.20.0.
+- Removed support for older versions.
+
+## Fixes
+- Removed deprecated `ReflectionProperty::setAccessible()` calls.
+- Fixed jukebox music not stopping when destroyed by an explosion.
+
+# 4.22.1
+Released 9th June 2023.
+
+## Fixes
+- Replaced workaround for an old teleporting client bug:
+  - This workaround broke due to an additional client bug introduced by 1.20, causing players to become frozen to observers when teleported.
+  - The original client bug has still not been fixed, meaning a new workaround was needed, but no perfect solution could be found.
+  - The new workaround involves broadcasting teleport movements as regular movements, which causes unwanted interpolation between the old and new positions, but otherwise works correctly. This solution is not ideal, but it is the best we can do for now.
+  - See issues [#4394](https://github.com/pmmp/PocketMine-MP/issues/4394) and [#5810](https://github.com/pmmp/PocketMine-MP/issues/5810) for more details.
+
+# 4.22.2
+Released 1st July 2023.
+
+## Changes
+- Added obsoletion warnings to the server log at the end of the startup sequence.
+
+## Fixes
+- Fixed players being disconnected en masse with "Not authenticated" messages.
+  - This occurred due to a check intended to disable the old authentication key after July 1st.
+  - We expected that the new key would have been deployed by Mojang by now, but it seems like that has not yet happened.
+  - Due to the lack of a hard date for the key changeover, we guessed that July 1st would be a safe bet, but this appears to have backfired.
+  - This version will accept both old and new keys indefinitely.
+  - A security release will be published to remove the old key after the transition occurs.
+
+# 4.22.3
+Released 11th July 2023.
+
+## Fixes
+- Fixed mishandling of NBT leading to a server crash when editing signs.
+- Fixed an edge case crash that could occur in `AsyncTask->__destruct()` when thread-local storage referenced other `AsyncTask` objects.
+
+## Internals
+- Added a concurrency lock to prevent the `update-updater-api` GitHub Action from running for multiple releases at the same time (which would have caused one of them to fail due to git conflicts).
diff --git a/changelogs/4.23.md b/changelogs/4.23.md
new file mode 100644
index 0000000000..317b6b458d
--- /dev/null
+++ b/changelogs/4.23.md
@@ -0,0 +1,68 @@
+# 4.23.0
+Released 12th July 2023.
+
+**For Minecraft: Bedrock Edition 1.20.10**
+
+This is a support release for Minecraft: Bedrock Edition 1.20.10.
+
+**Plugin compatibility:** Plugins for previous 4.x versions will run unchanged on this release, unless they use internal APIs, reflection, or packages like the `pocketmine\network\mcpe` 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.20.10.
+- Removed support for older versions.
+
+## Fixes
+- Fixed Docker image build failure due to outdated `build/php` submodule.
+
+# 4.23.1
+Released 14th July 2023.
+
+## Fixes
+- Hardened validation of JWT signing keys in `LoginPacket`.
+- Fixed server crash due to a bug in upstream dependency [`netresearch/jsonmapper`](https://github.com/cweiske/JsonMapper).
+
+# 4.23.2
+Released 18th July 2023.
+
+## Fixes
+- Fixed login errors due to a new `sandboxId` field appearing in the Xbox Live authentication data in `LoginPacket`. All clients, regardless of version, are affected by this change.
+
+# 4.23.3
+Released 24th July 2023.
+
+## Documentation
+- Fixed typo in `ChunkSelector::selectChunks()` documentation.
+
+## Fixes
+- Fixed the server not stopping properly during crash conditions on *nix platforms.
+- Fixed `HORSE_EQUIP` and `SMITHING_TABLE_TEMPLATE` container UI types not being handled by `ItemStackContainerIdTranslator`. This bug prevented plugins from implementing missing inventory types.
+- Player emotes no longer broadcast messages to other players. This was unintended behaviour caused by a client-side behavioural change.
+- Shulker boxes no longer support the placement of torches or other similar blocks.
+- Fire can now be placed on upper slabs and the top of upside-down stairs.
+
+# 4.23.4
+Released 1st August 2023.
+
+## Fixes
+- Fixed exponentially increasing lag when many hundreds of non-mergeable dropped items occupied the same space. This disproportionately affected SkyBlock servers due to large cactus farms using water to collect items together. 
+
+# 4.23.5
+Released 9th August 2023.
+
+## General
+- Updated translation data to [pmmp/Language 2.19.6](https://github.com/pmmp/Language/releases/tag/2.19.6).
+
+## Fixes
+- Fixed `PluginBase->saveResource()` leaking file resources when the data file already exists in the plugin's data folder. This bug existed since 2014 and was only discovered recently.
+- Fixed coral blocks becoming dead after calling `getDropsForCompatibleTool()` on them.
+- Fixed `BlockDeathEvent->getOldState()` returning a block which is already dead.
+
+# 4.23.6
+Released 21st August 2023.
+
+## Fixes
+- Added a workaround for armor and other inventories not working correctly after inventory sync. This is caused by a client bug.
diff --git a/changelogs/4.24.md b/changelogs/4.24.md
new file mode 100644
index 0000000000..2d28e90649
--- /dev/null
+++ b/changelogs/4.24.md
@@ -0,0 +1,17 @@
+# 4.24.0
+Released 20th September 2023.
+
+**For Minecraft: Bedrock Edition 1.20.30**
+
+This is a support release for Minecraft: Bedrock Edition 1.20.30.
+
+**Plugin compatibility:** Plugins for previous 4.x versions will run unchanged on this release, unless they use internal APIs, reflection, or packages like the `pocketmine\network\mcpe` 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.20.30.
+- Removed support for older versions.
+- Updated 4.x obsoletion message.
diff --git a/changelogs/4.25.md b/changelogs/4.25.md
new file mode 100644
index 0000000000..032c09ce8f
--- /dev/null
+++ b/changelogs/4.25.md
@@ -0,0 +1,16 @@
+# 4.25.0
+Released 26th October 2023.
+
+**For Minecraft: Bedrock Edition 1.20.40**
+
+This is a support release for Minecraft: Bedrock Edition 1.20.40.
+
+**Plugin compatibility:** Plugins for previous 4.x versions will run unchanged on this release, unless they use internal APIs, reflection, or packages like the `pocketmine\network\mcpe` 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.20.40.
+- Removed support for older versions.
diff --git a/changelogs/4.26.md b/changelogs/4.26.md
new file mode 100644
index 0000000000..2244c6cae6
--- /dev/null
+++ b/changelogs/4.26.md
@@ -0,0 +1,16 @@
+# 4.26.0
+Released 6th December 2023.
+
+**For Minecraft: Bedrock Edition 1.20.50**
+
+This is a support release for Minecraft: Bedrock Edition 1.20.50.
+
+**Plugin compatibility:** Plugins for previous 4.x versions will run unchanged on this release, unless they use internal APIs, reflection, or packages like the `pocketmine\network\mcpe` 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.20.50.
+- Removed support for older versions.
diff --git a/changelogs/5.0-alpha.md b/changelogs/5.0-alpha.md
new file mode 100644
index 0000000000..981bd37879
--- /dev/null
+++ b/changelogs/5.0-alpha.md
@@ -0,0 +1,1038 @@
+**For Minecraft: Bedrock Edition 1.19.0**
+
+# 5.0.0-ALPHA1
+Released 6th July 2022.
+
+This is a development snapshot of 5.0.0, an upcoming major update to PocketMine-MP. This version includes many new improvements, including support for Bedrock worlds from 1.13 onwards, a large array of new blocks, and various changes to the plugin API.
+
+## WARNING
+**This is an ALPHA release.** It is an early development snapshot of the upcoming 5.0.0 release.
+This means it is LIKELY to be unstable, and/or have performance issues not found in the latest stable releases.
+
+**BACK UP your data before testing this.** This version will work with worlds and player data from 4.x, **BUT** any world or player data loaded in 5.0.0 **will not work in 4.x** due to backwards-incompatible storage format changes.
+
+In addition, there are a number of breaking API changes. Plugins for 4.x may require code changes to run on this version.
+
+The API is **not finalized**. You should expect further changes in later alphas.
+
+## Core
+- Worlds are now saved according to the Bedrock 1.19.0 format.
+- Worlds generated by Bedrock from 1.13.0 and up are now supported (previously, only worlds up to 1.12 were supported).
+- `/particle` now accepts strings for particle data instead of integers.
+- `/particle` no longer accepts integers for block or item IDs.
+- The usage of `blockcrack`, `iconcrack` and `blockdust` particle types in `/particle` now follows the same pattern as other particle types, with the data for each being passed in the `data` parameter instead of being baked into the particle name.
+
+## Tools
+- The following tool scripts have been added:
+  - `generate-block-palette-spec.php` - generates a JSON file with a readable overview of blocks, their state properties, and their possible values
+  - `generate-blockstate-upgrade-schema.php` - generates JSON blockstate upgrade schemas like those found in [BedrockBlockUpgradeSchema](https://github.com/pmmp/BedrockBlockUpgradeSchema)
+  - `generate-item-upgrade-schema.php` - generates JSON item ID/meta upgrade schemas like those found in [BedrockItemUpgradeSchema](https://github.com/pmmp/BedrockItemUpgradeSchema)
+
+## Gameplay
+### Blocks
+- Added the following new blocks:
+  - Amethyst Block
+  - Ancient Debris
+  - Basalt
+  - Blackstone blocks, slabs, stairs, and walls
+  - Calcite
+  - Chiseled Deepslate
+  - Chiseled Nether Bricks
+  - Chiseled Polished Blackstone
+  - Cobbled Deepslate blocks, slabs, stairs, and walls
+  - Copper Ore
+  - Cracked Deepslate Bricks
+  - Crached Deepslate Tiles
+  - Cracked Nether Bricks
+  - Cracked Polished Blackstone Bricks
+  - Crimson buttons, doors, fences, fence gates, hyphae, planks, pressure plates, signs, slabs, stairs, stems, and trapdoors
+  - Deepslate
+  - Deepslate Bricks blocks, slabs, stairs, and walls
+  - Deepslate Ores (coal, copper, diamond, emerald, gold, iron, lapis lazuli, redstone)
+  - Deepslate Tiles blocks, slabs, stairs, and walls
+  - Honeycomb Block
+  - Light Block
+  - Mangrove buttons, doors, fences, fence gates, logs, planks, pressure plates, signs, slabs, stairs, trapdoors, and wood
+  - Mud Bricks blocks, slabs, stairs, and walls
+  - Nether Gold Ore
+  - Polished Basalt
+  - Polished Blackstone blocks, buttons, pressure plates, slabs, stairs, and walls
+  - Polished Blackstone Bricks blocks, slabs, stairs, and walls
+  - Polished Deepslate blocks, slabs, stairs, and walls
+  - Quartz Bricks
+  - Shroomlight
+  - Smooth Basalt
+  - Soul Fire
+  - Soul Lantern
+  - Soul Soil
+  - Soul Torch
+  - Tuff
+  - Warped buttons, doors, fences, fence gates, hyphae, planks, pressure plates, signs, slabs, stairs, stems, and trapdoors
+- Added support for basalt generators
+- Iron Ore and Gold Ore now drop Raw Iron and Raw Gold respectively, instead of the ore blocks.
+- Item frames can now be placed on the top and bottom of blocks.
+- All-sided logs ("wood", for want of a better name) can now be placed in X, Y, and Z orientations.
+- Walls now connect when placed, following the pre-1.16 logic. (1.16 logic is planned to be implemented, but currently low priority.)
+- Stripping logs by right-clicking them with an axe is now supported.
+
+### Items
+- Added the following new items:
+  - Amethyst Shard
+  - Copper Ingot
+  - Disc Fragment (5)
+  - Echo Shard
+  - Glow Ink Sac
+  - Honeycomb
+  - Phantom Membrane
+  - Raw Copper
+  - Raw Gold
+  - Raw Iron
+  - Spyglass
+
+## API
+### General
+- Protected and public properties now use native property types wherever possible.
+- Parameter and return typehints have been applied in many places where it wasn't previously possible.
+
+### `pocketmine\block`
+#### Runtime block representation
+- Blocks no longer use internal Minecraft IDs and metadata to identify themselves. All APIs associated with legacy IDs and meta have been removed.
+- A new set of runtime IDs generated from `VanillaBlocks` is used to identify block types. These IDs are defined in `BlockTypeIds`.
+  - These new IDs are used for runtime representation of blocks on chunks, and for type comparison purposes.
+  - Block type IDs are used at **runtime only**. They should **NOT** be stored in configs or databases, as they are subject to change without warning.
+- Block state properties (e.g. facing, colour, etc.) are now represented by PM-specific state data instead of legacy metadata. The state data consists of:
+  - Dynamic type data - this is retained by items when the block is broken (colour, wet/dry, coral type, etc.) - handled by `Block->decodeType()` and `Block->encodeType()`
+  - State data - this is discarded when the block is broken (facing direction, lit/unlit, powered/unpowered, etc.) - handled by `Block->decodeState()` and `Block->encodeState()`
+
+**Block type IDs, and state/type data, are intended for use at RUNTIME only. The values of type IDs and state data may change without warning. They should NOT be saved in configs or databases.**
+
+#### Implementing new blocks
+To register a new block, the following changes are now required:
+
+- Add a new type ID to `BlockTypeIds`
+- Register the block in `BlockFactory`
+- Amend `VanillaBlocks` to include the new block
+- Amend `BlockStateToBlockObjectDeserializer` to deserialize the block from disk
+- Amend `BlockObjectToBlockStateSerializer` to serialize the block for disk
+- Optionally, amend `StringToItemParser` to add string alias(es) for the block, so that it can be given via `/give`
+
+This is admittedly rather more of a hassle than in the old days, but that's the price of abstraction. Research is underway for ways to improve this without spaghettifying the code again.
+
+#### Change list
+- The following classes have been removed:
+  - `BlockIdentifierFlattened`
+  - `BlockLegacyIds`
+  - `BlockLegacyMetadata`
+  - `utils\ColorInMetadataTrait` - `utils\ColoredTrait` now implements colour type data serialization uniformly
+  - `utils\InvalidBlockStateException` - this has been superseded by `pocketmine\data\runtime\InvalidSerializedRuntimeDataException`
+  - `utils\NormalHorizontalFacingInMetadataTrait` - `utils\HorizontalFacingTrait` now implements facing type data serialization uniformly
+  - `utils\PillarRotationInMetadataTrait` - `utils\PillarRotationTrait` now implements rotation type data serialization uniformly
+  - `utils\BlockDataSerializer`
+- The following classes have been added:
+  - `BaseFire`
+  - `SoulFire`
+  - `BlockTypeIds`
+    - This is a generated enum of PocketMine-MP-specific block type IDs
+    - There is one for every entry in `VanillaBlocks`
+    - Do NOT save these IDs in a config or database, as they may change without warning
+    - Block type IDs are intended for comparison purposes only
+    - Block type IDs cannot be negative
+  - `CopperOre`
+  - `GoldOre`
+  - `IronOre`
+  - `Light`
+  - `NetherGoldOre`
+  - `utils\WallConnectionType` - enum of all possible wall connection types
+  - `utils\WoodType` - enum of all possible wood types, used for wood material blocks like planks and logs
+  - `utils\WoodTypeTrait`
+- The following API methods have been removed:
+  - `Block->getId()` - for type comparisons, use `Block->getTypeId()` instead
+  - `Block->getMeta()` - for state comparisons, use `Block->getStateId()` instead
+  - `Block->readStateFromData()`
+  - `Block->writeStateToMeta()`
+  - `Block->writeStateToItemMeta()`
+  - `Block->getStateBitmask()`
+  - `BlockFactory->get()`
+    - To get a block at runtime, e.g. stone, use `VanillaBlocks::STONE()`
+    - To load a block from old config or database data:
+      1. Use `GlobalBlockStateHandlers::getUpgrader()->upgradeIntIdMeta()` to convert it to modern data
+      2. Pass the data to `GlobalBlockStateHandlers::getDeserializer()` to get a blockstate ID
+      3. Pass the blockstate ID to `BlockFactory::fromStateId()` to get a `Block` instance
+  - `BlockIdentifier->getBlockId()`
+  - `BlockIdentifier->getAllBlockIds()`
+  - `BlockIdentifier->getVariant()`
+  - `BlockIdentifier->getItemId()`
+  - `Door->isPowered()`
+  - `Door->setPowered()`
+  - `Skull->isNoDrops()`
+  - `Skull->setNoDrops()`
+  - `VanillaBlocks::*_GLAZED_TERRACOTTA()` - use `VanillaBlocks::GLAZED_TERRACOTTA()->setColor(DyeColor::WHATEVER())` instead
+  - `utils\FallableTrait->getId()` is no longer required
+  - `utils\FallableTrait->getMeta()` is no longer required
+- The following constants have been renamed:
+  - `Block::INTERNAL_METADATA_BITS` -> `Block::INTERNAL_STATE_DATA_BITS`
+  - `Block::INTERNAL_METADATA_MASK` -> `Block::INTERNAL_STATE_DATA_MASK`
+- The following API methods have been renamed:
+  - `Block->getFullId()` -> `Block->getStateId()`
+- The following API methods have signature changes:
+  - `BlockIdentifier->__construct()` now accepts `int $blockTypeId`, and no longer accepts `int $blockId, int $variant, ?int $itemId`
+  - `ItemFrame->getFacing()` may now return `Facing::UP` and `Facing::DOWN`
+  - `ItemFrame->setFacing()` now accepts `Facing::UP` and `Facing::DOWN`
+- The following API methods have been added:
+  - `protected Block->decodeState()` - encodes the block's state properties, e.g. facing, powered/unpowered, etc.
+  - `protected Block->decodeType()` - encodes the block's type properties, e.g. colour, wet/dry, coral type, etc.
+  - `public Block->getRequiredStateDataBits()` - returns the number of bits required to encode the block's state data
+  - `public Block->getRequiredTypeDataBits()` - returns the number of bits required to encode the block's type data
+  - `public BlockIdentifier->getBlockTypeId()` - returns the block's type ID according to `BlockTypeIds`
+  - `public GlazedTerracotta->getColor()` (from `ColoredTrait`) - this was previously unsupported due to legacy limitations
+  - `public GlazedTerracotta->setColor()` (from `ColoredTrait`) - this was previously unsupported due to legacy limitations
+  - `public Wall->getConnections()` - returns the wall's connections and their types (see `utils\WallConnectionType`)
+  - `public Wall->setConnections()` - sets the wall's connections and their types (see `utils\WallConnectionType`)
+  - `public Wall->getConnection()`
+  - `public Wall->setConnection()`
+  - `public Wall->isPost()`
+  - `public Wall->setPost()`
+  - `public Wood->isStripped()`
+  - `public Wood->setStripped()`
+- The following classes now use new traits, adding API methods and/or properties:
+  - `FenceGate` uses `utils\WoodTypeTrait`
+  - `GlazedTerracotta` uses `utils\ColoredTrait`
+  - `Planks` uses `utils\WoodTypeTrait`
+  - `Wood` uses `utils\WoodTypeTrait`
+  - `WoodenButton` uses `utils\WoodTypeTrait`
+  - `WoodenDoor` uses `utils\WoodTypeTrait`
+  - `WoodenFence` uses `utils\WoodTypeTrait`
+  - `WoodenPressurePlate` uses `utils\WoodTypeTrait`
+  - `WoodenSlab` uses `utils\WoodTypeTrait`
+  - `WoodenStairs` uses `utils\WoodTypeTrait`
+  - `WoodenTrapdoor` uses `utils\WoodTypeTrait`
+
+### `pocketmine\crafting`
+- The following classes have been added:
+  - `RecipeIngredient` interface
+  - `ExactRecipeIngredient` - matches an exact item
+  - `MetaWildcardRecipeIngredient` - matches an item with the given legacy Minecraft ID, but any metadata value
+- The following API methods have signature changes:
+  - `FurnaceRecipe->__construct()` now accepts `RecipeIngredient` instead of `Item`
+  - `FurnaceRecipe->getInput()` now returns `RecipeIngredient` instead of `Item`
+  - `PotionContainerChangeRecipe->__construct()` now accepts `string, RecipeIngredient, string` (using Minecraft string IDs instead of legacy integers).
+  - `PotionContainerChangeRecipe->getIngredient()` now returns `RecipeIngredient` instead of `Item`.
+  - `PotionContainerChangeRecipe->getInputItemId()` now returns `string` (using Minecraft string IDs instead of legacy integers).
+  - `PotionContainerChangeRecipe->getOutputItemId()` now returns `string` (using Minecraft string IDs instead of legacy integers).
+  - `PotionTypeRecipe->__construct()` now accepts `RecipeIngredient` instead of `Item`
+  - `PotionTypeRecipe->getIngredient()` now returns `RecipeIngredient` instead of `Item`
+  - `PotionTypeRecipe->getInput()` now returns `RecipeIngredient` instead of `Item`
+  - `ShapedRecipe->__construct()` now accepts `RecipeIngredient` instead of `Item`
+  - `ShapedRecipe->getIngredient()` now returns `?RecipeIngredient` instead of `?Item`
+  - `ShapedRecipe->getIngredientList()` now returns `RecipeIngredient[]` instead of `Item[]`
+  - `ShapedRecipe->getIngredientMap()` now returns `RecipeIngredient[][]` instead of `Item[][]`
+  - `ShapelessRecipe->__construct()` now accepts `RecipeIngredient` instead of `Item`
+  - `ShapelessRecipe->getIngredientList()` now returns `RecipeIngredient[]` instead of `Item[]`
+
+### `pocketmine\entity`
+- `Entity` now declares new abstract methods which must be implemented by subclasses:
+  - `public Entity->getInitialDragMultiplier()`
+  - `public Entity->getInitialGravity()`
+
+### `pocketmine\item`
+#### Runtime item representation
+- Items no longer use internal Minecraft string IDs and metadata to identify themselves. All APIs associated with legacy IDs and/or meta have been removed.
+- A new set of runtime item IDs generated from `VanillaItems` is now used to identify item types. These IDs are defined in `ItemTypeIds`.
+  - These new IDs are primarily intended for type comparison purposes.
+  - Item type IDs are used at **runtime only**. They should **NOT** be stored in configs or databases, as they are not guaranteed to remain the same between versions.
+- In some cases, items may have additional "type data" which provides extra type information about an item. This replaces item metadata in some cases.
+  - Type data may be used to store dynamic type information such as dye colour, potion type, etc.
+  - Items must have the same type ID **and** type data in order to be stackable.
+- Blocks, when represented as items:
+  - retain their block type data, but not state data (for example, different colours of concrete don't stack, but things like facing don't affect stackability)
+  - use the negative of their block type ID (e.g. a block with type ID `1` will have an item type ID of `-1`).
+- Durable items (e.g. tools, armour) now use NBT `Damage` tag to store durability (like Minecraft 1.13+), instead of legacy meta values.
+
+**Item type IDs and type data are intended for RUNTIME use only. The values of type IDs and/or type data may change without warning. They should NOT be saved in configs or databases.**
+
+#### Implementing new items
+To register a new item, the following changes are now required:
+
+- Add a new ID to `ItemTypeIds`
+- Register the item in `ItemFactory`
+- Amend `VanillaItems` to add the item
+- Amend `ItemDeserializer` to add a deserializer for loading the item from disk
+- Amend `ItemSerializer` to add a serializer for saving the item to disk
+- Optionally, amend `StringToItemParser` to add string alias(es) for the item, so it can be given via `/give`
+
+Again, it's acknowledged this is rather more cumbersome than it should be, but this is an ongoing process.
+
+#### Change list
+- `Item` is no longer `json_encode()`-able.
+  - The original purpose of this was to allow items to be serialized to JSON for crafting data generated from `CraftingDataPacket`. Due to changes in the generation methodology, bypassing `Item`s entirely, this is no longer necessary.
+  - `jsonSerialize()` requires the item to know about the method by which it will be serialized, creating a cyclic dependency between the `Item` implementation and its serialization method.
+  - It's relatively easy to write a replacement method to encode items to JSON as you desire.
+- The following classes have been removed:
+  - `ItemIds`
+  - `Skull`
+  - `Bed`
+- The following classes have been added:
+  - `CoralFan`
+  - `Spyglass`
+- The following API methods have been added:
+  - `public Dye->setColor()`
+  - `public ItemIdentifer->getTypeId()`
+  - `public static ItemIdentifier::fromBlock()`
+  - `public Potion->setType()`
+  - `public SplashPotion->setType()`
+- The following API methods have been removed:
+  - `Item->getId()` - for type comparisons, use `Item->getTypeId()` instead
+  - `Item->getMeta()` - use the item's specific API methods to compare information such as colour, potion type etc.
+  - `Item->hasAnyDamageValue()` - for meta wildcard recipe ingredients, use `pocketmine\crafting\MetaWildcardRecipeIngredient` instead
+  - `ItemFactory->get()`
+    - To get an item at runtime, e.g. iron ingot, use `VanillaItems::IRON_INGOT()`
+    - To get a block as an item, e.g. stone, use `VanillaBlocks::STONE()->asItem()`
+    - To load an item from legacy ID and meta:
+      1. Use `GlobalItemDataHandlers::getUpgrader()->upgradeItemTypeDataInt()` to convert the legacy ID and meta to `ItemStackData`
+      2. Pass the itemstack data to `GlobalItemDataHandlers::getDeserializer()` to get an `Item` instance
+  - `ItemFactory->remap()`
+  - `ItemIdentifier->getId()`
+  - `ItemIdentifier->getMeta()`
+- The following API methods have been renamed:
+  - `Item::jsonDeserialize()` -> `Item::legacyJsonDeserialize()`
+  - `ItemFactory->getAllRegistered()` -> `ItemFactory->getAllKnownTypes()`
+- The following API methods have signature changes:
+  - `ItemFactory->isRegistered()` no longer accepts a `$variant` parameter, and now expects an item type ID for the ID parameter
+  - `ItemIdentifier->__construct()` no longer accepts a `$variant` parameter, and now expects an item type ID for the ID parameter
+  - `LegacyStringToItemParser->addMapping()` now accepts a string for ID, instead of an integer
+
+### `pocketmine\world`
+- The following classes have been added:
+  - `pocketmine\world\format\io\GlobalBlockStateHandlers`
+  - `pocketmine\world\format\io\GlobalItemDataHandlers`
+
+# 5.0.0-ALPHA2
+Released 14th July 2022.
+
+## Core
+- Reduced memory usage of the server on startup.
+- Fixed error spam when loading item frames without items in them.
+
+## Gameplay
+### Blocks
+- Added the following new blocks:
+  - Cakes with Candle & Dyed Candle
+  - Candle & Dyed Candle
+  - Cartography Table (not currently usable due to maps not being implemented)
+  - Copper block (random oxidation not yet implemented)
+  - Cut Copper block, stairs and slabs (random oxidation not yet implemented)
+  - Crying Obsidian
+  - Gilded Blackstone
+  - Glow Item Frame
+  - Hanging Roots
+  - Lightning Rod
+  - Netherite Block
+  - Smithing Table
+  - Tinted Glass
+  - Warped Wart Block
+  - Wither Rose
+
+### Items
+- Added the following new items:
+  - Honey Bottle
+  - Netherite Axe
+  - Netherite Boots
+  - Netherite Chestplate
+  - Netherite Helmet
+  - Netherite Ingot
+  - Netherite Leggings
+  - Netherite Pickaxe
+  - Netherite Scrap
+  - Netherite Shovel
+  - Netherite Sword
+
+## API
+### `pocketmine\block`
+- Dependency between `BlockFactory` and `VanillaBlocks` has been inverted.
+  - Now, blocks are defined in `VanillaBlocks`, and automatically registered in `BlockFactory`.
+  - Manual registration in `BlockFactory` is still required for custom blocks.
+  - `BlockFactory` now has only one purpose, which is to map internal blockstate IDs to `Block` objects when reading blocks from chunks.
+- The following new API methods have been added:
+  - `public Block->isFireProofAsItem()`
+  - `public Block->onProjectileHit()`
+  - `public ItemFrame->isGlowing()`
+  - `public ItemFrame->setGlowing()`
+- The following new classes have been added:
+  - `BaseCake`
+  - `CakeWithCandle`
+  - `CakeWithDyedCandle`
+  - `Candle`
+  - `CartographyTable`
+  - `CopperSlab`
+  - `CopperStairs`
+  - `Copper`
+  - `DyedCandle`
+  - `GildedBlackstone`
+  - `HangingRoots`
+  - `LightningRod`
+  - `SmithingTable`
+  - `WitherRose`
+  - `utils\CandleTrait`
+  - `utils\CopperOxidation`
+  - `utils\CopperTrait`
+
+### `pocketmine\crafting`
+- JSON models have been updated to reflect updated crafting data format.
+- The following enum classes have new members:
+  - `ShapelessRecipeType` has new members `CARTOGRAPHY` and `SMITHING`
+
+### `pocketmine\data`
+- `LegacyToStringBidirectionalIdMap` has been reduced to `LegacyToStringIdMap`.
+  - Since we never map from string ID to legacy ID, bidirectional mapping is no longer necessary.
+  - This affects the following subclasses:
+    - `LegacyBiomeIdToStringIdMap`
+    - `LegacyBlockIdToStringIdMap`
+    - `LegacyEntityIdToStringIdMap`
+    - `LegacyItemIdToStringIdMap`
+- The following internal API methods have been added:
+  - `public LegacyToStringIdMap->add(string $string, int $legacy) : void` - adds a mapping from a custom legacy ID to custom string ID, needed for upgrading old saved data
+  - `public LegacyBlockStateMapper->addMapping(string $stringId, int $intId, int $meta, BlockStateData $stateData) : void` - adds a mapping from legacy block data to a modern blockstate, needed for upgrading old saved data
+  - `public BlockStateData->getState(string $name) : ?Tag`
+- The following internal API methods have signature changes:
+  - `BlockStateData->__construct()` now accepts `array<string, Tag`> for `$states` instead of `CompoundTag`
+  - `BlockStateData->getStates()` now returns `array<string, Tag>` instead of `CompoundTag` (allows reducing memory usage)
+- The following classes have been added:
+  - `UnsupportedItemTypeException`
+
+### `pocketmine\item`
+- `ItemFactory` has been removed.
+  - Vanilla item registration is now done via `VanillaItems`.
+  - The procedure for registering a custom item is the same as in ALPHA1, minus the `ItemFactory` step.
+- The following API methods have been added:
+  - `public ArmorTypeInfo->getToughness() : int`
+  - `public ArmorTypeInfo->isFireProof() : bool`
+  - `public Item->isFireProof() : bool`
+- The following API methods have signature changes:
+  - `ArmorTypeInfo->__construct()` now accepts optional parameters `int $toughness` and `bool $fireProof`
+- The following classes have been added:
+  - `HoneyBottle`
+- The following enums have new members:
+  - `ToolTier` has new member `NETHERITE`
+
+### `pocketmine\world`
+- The following API methods have signature changes:
+  - `SubChunk->__construct()` parameter `$blocks` has been renamed to `$blockLayers`.
+- The following classes have been added:
+  - `CopperWaxApplySound`
+  - `CopperWaxRemoveSound`
+
+# 5.0.0-ALPHA3
+Released 14th August 2022.
+
+## Core
+- Support for Bedrock 1.19.20.
+- Dropped support for Bedrock versions older than 1.19.20.
+- Improved performance of dropping block inventory contents when the block is destroyed.
+
+## Fixes
+- Fixed errors when loading air itemstacks from PM4 worlds. These weren't supposed to exist (vanilla doesn't save them), but they were present in older PM worlds due to a bug in older versions.
+- Fixed server crash when discovering unknown blocks in non-leveldb worlds during conversion.
+- Fixed crimson / warped planks being usable as furnace fuel.
+
+## Gameplay
+### Blocks
+- Added the following new blocks:
+  - Cauldron
+  - Chorus Flower
+  - Chorus Plant
+  - Froglight (pearlescent, verdant, ochre)
+  - Mangrove Roots
+  - Muddy Mangrove Roots
+  - Rooted Dirt
+  - Spore Blossom
+- Fixed lava setting entities on fire for an incorrect duration (Java vs Bedrock inconsistency).
+
+### Items
+- Glass bottles can now be filled with water by clicking on a water source block.
+
+## API
+### `pocketmine\block`
+#### Highlights
+- Introduced "type tags" concept, which allows marking certain blocks as having certain behaviours.
+  - The idea for this system was borrowed from the Minecraft Java tags system.
+  - It's still in very early concept stage, but is currently used for deciding which types of blocks plants can be placed on without needing to enumerate every single ID in every class, eliminating a bunch of boilerplate code and improving consistency.
+- All `Block` descendents now accept `BlockTypeInfo` in the constructor, instead of `BlockBreakInfo`.
+  - This allows for future additions without needing to change dozens of overridden constructors.
+- Dynamic type and state property serialization now each use a single, unified method (`describeType` and `describeState` respectively) which accept `RuntimeDataReader|RuntimeDataWriter`, instead of separate decode/encode methods.
+  - This simplifies implementing new blocks and avoids duplication of information.
+- `&$returnedItems` reference parameter is now used in some places to enable actions to return items to players without caring about whether they are in creative or anything else.
+  - This eliminates boilerplate code of deciding whether to set the player's held item or not, as well as automatically dropping any overflow items that don't fit into the inventory.
+  - This is currently used when filling/emptying cauldrons using buckets or glass bottles.
+- `BlockTypeIds` now exposes `newId()` static method to ease addition of custom blocks.
+
+#### Changes
+- The following API methods have signature changes:
+  - `Block->onInteract()` now accepts `array<Item> &$returnedItems` reference parameter.
+  - `Block->onBreak()` now accepts `array<Item> &$returnedItems` reference parameter.
+  - `Block->readStateFromWorld()` now returns `Block`.
+    - This allows blocks to replace themselves with a different block entirely based on world conditions.
+- The following new classes have been added:
+  - `BlockTypeInfo`
+  - `BlockTypeTags`
+- The following new API methods have been added:
+  - `protected Block->describeState(RuntimeDataReader|RuntimeDataWriter $w) : void` - describes to a runtime data reader/writer how to read/write the block's state properties
+  - `protected Block->describeType(RuntimeDataReader|RuntimeDataWriter $w) : void` - describes to a runtime data reader/writer how to read/write the block's dynamic type properties
+  - `public Block->getTypeTags() : array<string>`
+  - `public Block->hasTypeTag(string $tag) : bool`
+  - `public Spawnable->getRenderUpdateBugWorkaroundStateProperties(Block $block) : array<string, Tag>` - allows spawnable tiles to spoof block state properties to work around client-side rendering bugs without actually changing the block server-side
+  - `public static BlockBreakInfo::axe(float $hardness, ?ToolTier $toolTier = null, ?float $blastResistance = null) : BlockBreakInfo`
+  - `public static BlockBreakInfo::pickaxe(float $hardness, ?ToolTier $toolTier = null, ?float $blastResistance = null) : BlockBreakInfo`
+  - `public static BlockBreakInfo::shovel(float $hardness, ?ToolTier $toolTier = null, ?float $blastResistance = null) : BlockBreakInfo`
+  - `public static BlockBreakInfo::tier(float $hardness, int $toolType, ToolTier $toolTier, ?float $blastResistance = null) : BlockBreakInfo`
+  - `public static BlockTypeIds::newId() : int` - returns a new dynamic block type ID for use by custom blocks
+
+### `pocketmine\data`
+- The following classes have been renamed:
+  - `LegacyBlockStateMapper` -> `BlockIdMetaUpgrader`
+- The following API methods have been added:
+  - `public BlockDataUpgrader->getIdMetaUpgrader() : BlockIdMetaUpgrader`
+  - `public BlockIdMetaUpgrader->addIdMetaToStateMapping(string $stringId, int $meta, BlockStateData $stateData) : void`
+  - `public BlockIdMetaUpgrader->addIntIdToStringIdMapping(int $intId, string $stringId) : void`
+- The following API methods have been removed:
+  - `BlockIdMetaUpgrader->addMapping()` - use `addIdMetaToStateMapping()` (and `addIntIdToStringIdMapping()` if necessary) instead
+- `LegacyToStringMap` no longer throws exceptions when adding the same mapping twice if the addition would have no effect.
+
+### `pocketmine\item`
+#### Highlights
+- `&$returnedItems` reference parameter is now used in some places to enable actions to return items to players without caring about whether they are in creative or anything else.
+  - This eliminates boilerplate code of deciding whether to set the player's held item or not, as well as automatically dropping any overflow items that don't fit into the inventory.
+  - This is used for things like filling/emptying buckets and bottles, and equipping armor.
+
+#### Changes
+- The following new API methods have been added:
+  - `public Armor->clearCustomColor() : $this` - clears the custom color of an armor item
+  - `public static ItemTypeIds::newId() : int` - returns a new dynamic item type ID for use by custom items
+- The following API methods have signature changes:
+  - `Item->onAttackEntity()` now accepts `array<Item> &$returnedItems` reference parameter.
+  - `Item->onClickAir()` now accepts `array<Item> &$returnedItems` reference parameter.
+  - `Item->onDestroyBlock()` now accepts `array<Item> &$returnedItems` reference parameter.
+  - `Item->onInteractBlock()` now accepts `array<Item> &$returnedItems` reference parameter.
+  - `Item->onReleaseUsing()` now accepts `array<Item> &$returnedItems` reference parameter.
+
+# 5.0.0-ALPHA4
+Released 24th September 2022.
+
+## Core
+- Now targeting Minecraft: Bedrock 1.19.30.
+- All tests and static analysis are now being run on PHP 8.1 as well as PHP 8.0.
+- Silenced warning about Xdebug when it's loaded but disabled by `xdebug.mode` configuration.
+- A new `console.enable-input` option has been added to `pocketmine.yml`, which allows disabling the console reader in environments where it's not needed (e.g. a Docker container). This can be useful to save processor and memory resources.
+- Console reader polling is now done on the main thread. Since the console reader communication is now done via sockets, there's no longer any reason for it to have its own thread.
+- Crashdumps now include JIT mode information for use by the Crash Archive.
+- Improved handling of "UI" inventories in network `InventoryManager`. Their contents are now synced correctly.
+- Fixed cartography table recipes pretending to be smithing table recipes in `CraftingDataPacket`.
+- Fixed incorrect key being used for saving entity type IDs in save data.
+
+## API
+### General
+- Plugin dependents are now always disabled before their dependencies on shutdown, to ensure that the dependents can finish what they are doing correctly.
+
+### `pocketmine\block`
+- The following new API methods have been added:
+  - `public SignText->isGlowing() : bool`
+  - `public SignText->getBaseColor() : pocketmine\color\Color`
+- The following API methods have signature changes:
+  - `SignText::fromBlob()` now accepts two new optional parameters: `?Color $baseColor` and `bool $glowing`
+  - `SignText::__construct()` now accepts two new optional parameters: `?Color $baseColor` and `bool $glowing`
+- The following API methods have been removed:
+  - `TreeType::fromMagicNumber()`
+  - `TreeType->getMagicNumber()`
+
+### `pocketmine\command`
+- Command permissions are now always checked by the server when running a command.
+  - This only affects commands implemented by extending `Command`. Plugins using `PluginBase->onCommand()` are not affected by this change, since they already had permissions checked by the server anyway.
+  - Previously, direct inheritors of `Command` were responsible for checking permissions, which required developers to duplicate the same code in every command, and opened lots of potential for security vulnerabilities.
+  - If you want to do something on permission denied (e.g. sending a special message, or audit logging), you can do so by overriding `Command->testPermission()`, instead of baking the code directly into `Command->execute()`.
+  - If you don't want to use permissions at all, just create a permission with a default of `true` (or belonging to `pocketmine.group.user`) and assign that.
+
+### `pocketmine\data`
+#### Highlights
+- Introduced an experimental, mostly unified item (de)serializer registrar, `ItemSerializerDeserializerRegistrar`.
+  - This class includes helper methods to register symmetric serializer and deserializer callbacks into an `ItemSerializer` and `ItemDeserializer`.
+  - This halves the amount of code needed to register new items in the vast majority of cases.
+  - This is currently used to register all currently implemented items.
+
+#### Other changes
+- The following classes have been renamed:
+  - `BlockObjectToBlockStateSerializer` -> `BlockObjectToStateSerializer`
+  - `BlockStateToBlockObjectDeserializer` -> `BlockStateToObjectDeserializer`
+- The following classes have been removed:
+  - `CachingBlockStateDeserializer`
+  - `CachingBlockStateSerializer`
+  - `DelegatingBlockStateDeserializer`
+  - `DelegatingBlockStateSerializer`
+- The following new API methods have been added:
+  - `public BlockStateToObjectDeserializer->mapSimple(string $stringId, \Closure() : Block $getBlock) : void` - for symmetry with the serializer
+
+### `pocketmine\event`
+- `BlockFormEvent` now includes information about the block which caused the event.
+  - Added `public BlockFormEvent->getCausingBlock() : Block`
+
+### `pocketmine\inventory`
+- Introduced a new `TransactionBuilder` class, which considerably simplifies the process of constructing an `InventoryTransaction` from generic `setItem()` calls.
+  - This is currently used to build server-side transactions for evicting the contents of the crafting grid when closing the main inventory.
+  - This is planned for use with the new Minecraft Bedrock item stack request system.
+- Improved PHPStan type information available for `Inventory` and `BaseInventory`.
+
+### `pocketmine\item`
+- The following API methods have been changed:
+  - `Item->encodeType(RuntimeDataWriter $w) : void` -> `Item->describeType(RuntimeDataReader|RuntimeDataWriter $w) : void`
+- The following new classes have been added:
+  - `SuspiciousStew`
+  - `SuspiciousStewType`
+
+### `pocketmine\utils`
+- The following new API methods have been added:
+  - `public static Utils::getOpcacheJitMode() : int`
+
+### `pocketmine\world`
+- The following new classes have been added:
+  - `sound\DyeUseSound`
+  - `sound\InkSacUseSound`
+- The following API methods have changed signatures:
+  - `GlobalBlockStateHandlers::getSerializer()` now returns `BlockObjectToStateSerializer` directly instead of `BlockStateSerializer`.
+  - `GlobalBlockStateHandlers::getDeserializer()` now returns `BlockStateToObjectDeserializer` directly instead of `BlockStateDeserializer`.
+
+## Gameplay
+### General
+- Spectator players are no longer able to acquire blocks by block picking that they don't already have in their inventories. The behaviour is now the same as survival mode.
+
+### Blocks
+- Coral and coral fans now behave correctly when placed out of water (they no longer immediately die).
+- Added support for dyeing sign text and making it glow.
+- Fixed dead bush being able to be placed on some invalid blocks (e.g. stone).
+- TNT can now be ignited by fire charges.
+- Vines can now only be placed on the side of full-cube blocks.
+- Fixed sugarcane not being able to be placed on some blocks.
+
+### Items
+- Added the following new items:
+  - Fire Charge
+  - Suspicious Stew
+
+### Effects
+- Updated damage modifier amounts for Instant Damage to be more in line with vanilla.
+- Updated duration modifier amounts for Regeneration to be more like vanilla.
+
+# 5.0.0-ALPHA5
+Released 13th November 2022.
+
+**This release includes changes from [4.11.0-BETA2](https://github.com/pmmp/PocketMine-MP/releases/4.11.0-BETA2) and earlier, which may not be listed here.**
+
+## General
+- Added support for Minecraft: Bedrock 1.19.40.
+- Removed support for earlier versions.
+
+## API
+### `pocketmine\block`
+- `FallableTrait` now includes a default implementation of `tickFalling()`.
+
+### `pocketmine\event`
+- The following API methods have been removed:
+  - `PlayerCommandPreprocessEvent`
+- The following API methods have been added:
+  - `public DataPacketSendEvent->setPackets(list<ClientboundPacket> $packets) : void`
+
+## Gameplay
+### General
+- Fixed dyeing leather armour in cauldrons.
+
+### Blocks
+- Copper blocks now play the correct scrape sound when using an axe on them.
+
+## Internals
+- Moved command timings to `Timings`.
+
+# 5.0.0-ALPHA6
+Released 19th December 2022.
+
+**This release includes changes from the following releases, which may not be mentioned:**
+- [4.10.2](https://github.com/pmmp/PocketMine-MP/releases/tag/4.10.2)
+- [4.11.0](https://github.com/pmmp/PocketMine-MP/releases/tag/4.11.0)
+- [4.12.0](https://github.com/pmmp/PocketMine-MP/releases/tag/4.12.0)
+- [4.12.1](https://github.com/pmmp/PocketMine-MP/releases/tag/4.12.1)
+- [4.12.2](https://github.com/pmmp/PocketMine-MP/releases/tag/4.12.2)
+
+## General
+- Fixed the Bedrock client asking to upgrade worlds exported from PocketMine-MP to Bedrock (missing level.dat fields).
+- Added support for 1.19.40 and newer Bedrock worlds.
+- Commands are now enabled by default in worlds exported from PocketMine-MP to Bedrock.
+
+## Gameplay
+### Blocks
+- Added the following new blocks:
+  - Twisting Vines
+  - Weeping Vines
+- Anvils are now damaged when they hit the ground after falling.
+- Added missing sounds for anvils hitting the ground after falling.
+- Fixed missing sounds when a projectile strikes an amethyst block.
+- Fixed some blocks being incorrectly able to be placed on top of a candle cake.
+
+### Items
+- Added the following new items:
+  - Music Disc (5)
+  - Music Disc (Otherside)
+  - Music Disc (Pigstep)
+- Implemented Swift Sneak enchantment.
+- Armour durability is now only reduced when the wearer receives a type of damage that the armour can protect against.
+
+## API
+### General
+- Union and mixed native parameter, return and property types are now used where appropriate.
+
+### `pocketmine\block`
+- The following new API methods have been added:
+  - `public Furnace->getType() : utils\FurnaceType`
+- The following interfaces have new requirements:
+  - `utils\Fallable` now requires `onHitGround()` to be implemented (although filled by default implementation in `FallableTrait`).
+  - `utils\Fallable` now requires `getLandSound()` to be implemented (although filled by default implementation in `FallableTrait`).
+- The following new API constants have been added:
+  - `public BlockTypeTags::FIRE` - used by fire and soul fire
+
+### `pocketmine\crafting`
+- The `$type` parameter of `ShapelessRecipe->__construct()` is now mandatory.
+
+### `pocketmine\entity`
+- The following new API methods have been added:
+  - `public Living->getDisplayName() : string`
+- The following API methods have changed signatures:
+  - `EntityFactory->register()` no longer accepts a `$legacyMcpeSaveId` parameter (now handled by internal conversions instead).
+
+### `pocketmine\event`
+- The following classes have been renamed:
+  - `entity\ExplosionPrimeEvent` -> `entity\EntityPreExplodeEvent`
+- The following new classes have been added:
+  - `world\WorldParticleEvent` - called when a particle is spawned in a world
+  - `world\WorldSoundEvent` - called when a sound is played in a world
+- The following API methods have changed signatures:
+  - `entity\EntityPreExplodeEvent->__construct()` has the `$force` parameter renamed to `$radius`
+  - `entity\EntityPreExplodeEvent->getForce() : float` -> `entity\EntityPreExplodeEvent->getRadius() : float`
+  - `entity\EntityPreExplodeEvent->setForce(float $force) : void` -> `entity\EntityPreExplodeEvent->setRadius(float $radius) : void`
+
+### `pocketmine\item`
+- The following new API methods have been added:
+  - `public Item->keepOnDeath() : bool` - returns whether this item will be retained when a player carrying it dies
+  - `public Item->onInteractEntity(Player $player, Entity $entity, Vector3 $clickPos) : bool` - called when a player interacts with an entity with this item in their hand
+  - `public Item->setKeepOnDeath(bool $keepOnDeath) : void` - sets whether this item will be retained when a player carrying it dies
+  - `public StringToItemParser->lookupAliases(Item $item) : list<string>` - returns a list of all registered aliases for the given item
+  - `public StringToItemParser->lookupBlockAliases(Block $block) : list<string>` - returns a list of all registered aliases for the given block
+
+### `pocketmine\resourcepacks`
+- The following new API methods have been added:
+  - `public ResourcePackManager->setPackEncryptionKey(string $id, ?string $key) : void` - sets the encryption key to be used for the resource pack identified by the given UUID
+  - `public ResourcePackManager->setResourceStack(list<ResourcePack> $resourceStack) : void` - sets the resource stack to be used by the server
+
+### `pocketmine\world`
+- The following API methods have changed signatures:
+  - `Explosion->__construct()` has the `$size` parameter renamed to `$radius`
+- The following public properties have been renamed:
+  - `Explosion->size` -> `Explosion->radius`
+
+## Internals
+- `EntityLegacyIds` has been removed. Legacy entity IDs found during world loading are now converted via `LegacyEntityIdToStringIdMap`.
+- All usages of NBT keys now use class constants instead of hardcoded strings (except for an occasional overlooked one).
+- All members of `BlockTypeTags` now have a `pocketmine:` prefix on the value. This does not affect constant usages.
+
+# 5.0.0-ALPHA7
+Released 18th January 2023.
+
+**This release includes changes from the following releases, which may not be mentioned:**
+- [4.12.3](https://github.com/pmmp/PocketMine-MP/releases/tag/4.12.3)
+- [4.12.4](https://github.com/pmmp/PocketMine-MP/releases/tag/4.12.4)
+- [4.12.5](https://github.com/pmmp/PocketMine-MP/releases/tag/4.12.5)
+- [4.12.6](https://github.com/pmmp/PocketMine-MP/releases/tag/4.12.6)
+- [4.12.7](https://github.com/pmmp/PocketMine-MP/releases/tag/4.12.7)
+- [4.12.8](https://github.com/pmmp/PocketMine-MP/releases/tag/4.12.8)
+- [4.12.9](https://github.com/pmmp/PocketMine-MP/releases/tag/4.12.9)
+- [4.12.10](https://github.com/pmmp/PocketMine-MP/releases/tag/4.12.10)
+- [4.13.0-BETA1](https://github.com/pmmp/PocketMine-MP/releases/tag/4.13.0-BETA1)
+
+## Fixes
+- Fixed glowing item frame placement creating the wrong tile, causing invisible items.
+
+## Localization
+- Localized disconnect messages are now used in the following cases:
+  - Server full
+  - Player not on the server whitelist
+  - Player on the server ban list
+  - Invalid skin
+  - Invalid username
+  - Kicked using `/kick`
+  - Banned using `/ban`
+  - Failure to find a safe spawn position
+- Session open, session close and session player name discovery messages are now localized.
+- All permissions now have localized descriptions. These are not currently used by PocketMine-MP, but may be useful for plugins.
+
+## Gameplay
+### Worlds
+- Added support for 3D biomes. This isn't used by PocketMine-MP yet, but is necessary to be able to fully load 1.18 worlds.
+
+### Blocks
+- Added the following new blocks:
+  - Chain
+  - Sculk
+
+### Items
+- Added the following new items:
+  - Eye Drops (from Education Edition)
+  - Antidote (from Education Edition)
+  - Elixir (from Education Edition)
+  - Tonic (from Education Edition)
+
+## API
+### Overview
+- Biome-related APIs have changed to accommodate 3D biomes.
+- Disconnect-related APIs have changed to accommodate localized disconnect messages.
+- New, more powerful chat formatting API introduced to `PlayerChatEvent`.
+- Glowing item frames moved to a separate block type instead of being a property of regular item frames (due to technical limitations).
+
+### `pocketmine\block`
+- The following API methods have been removed:
+  - `ItemFrame->isGlowing() : bool`
+  - `ItemFrame->setGlowing(bool $glowing) : void`
+- The following new API methods have been added:
+  - `public static VanillaBlocks::GLOWING_ITEM_FRAME() : ItemFrame`
+- The following constants have been added:
+  - `BlockTypeIds::GLOWING_ITEM_FRAME`
+  - `BlockTypeIds::CHAIN`
+  - `BlockTypeIds::SCULK`
+- The following new classes have been added:
+  - `Chain`
+  - `Sculk`
+
+### `pocketmine\event\player`
+- The following API methods have changed signatures:
+  - `PlayerDuplicateLoginEvent->getDisconnectMessage()` now returns `Translatable|string` instead of `string`
+  - `PlayerDuplicateLoginEvent->setDisconnectMessage()` now accepts `Translatable|string` instead of `string`
+  - `PlayerKickEvent->getReason()` now returns `Translatable|string` instead of `string`
+  - `PlayerKickEvent->setReason()` now accepts `Translatable|string` instead of `string`
+  - `PlayerLoginEvent->getKickMessage()` now returns `Translatable|string` instead of `string`
+  - `PlayerLoginEvent->setKickMessage()` now accepts `Translatable|string` instead of `string`
+  - `PlayerPreLoginEvent->getFinalKickMessage()` now returns `Translatable|string` instead of `string`
+  - `PlayerPreLoginEvent->getKickMessage()` now returns `Translatable|string|null` instead of `string|null`
+  - `PlayerPreLoginEvent->setKickReason()` now accepts `Translatable|string` for the `$message` parameter instead of `string`
+  - `PlayerQuitEvent->getQuitReason()` now returns `Translatable|string` instead of `string`
+- The following API methods have been removed:
+  - `PlayerChatEvent->getFormat()` (use `PlayerChatEvent->getChatFormatter()` instead)
+  - `PlayerChatEvent->setFormat()` (use `PlayerChatEvent->setChatFormatter()` instead)
+- The following new API methods have been added:
+  - `public PlayerChatEvent->setChatFormatter(\pocketmine\player\chat\ChatFormatter $formatter) : void` - sets the chat formatter to be used for this event
+  - `public PlayerChatEvent->getChatFormatter() : \pocketmine\player\chat\ChatFormatter` - returns the chat formatter to be used for this event
+
+### `pocketmine\item`
+- The following new classes have been added:
+  - `Medicine`
+  - `MedicineType`
+- The following new class constants have been added:
+  - `ItemTypeIds::MEDICINE`
+
+### `pocketmine\network\query`
+- The following API methods have changed signatures:
+  - `QueryInfo->getPlayerList()` now returns `list<string>` instead of `list<Player>`
+  - `QueryInfo->setPlayerList()` now accepts `list<string>` instead of `list<Player>`
+
+### `pocketmine\player`
+- The following API methods have changed signatures:
+  - `Player->kick()` now accepts `Translatable|string` for `$reason` instead of `string` (to allow localized kick messages)
+  - `Player->disconnect()` now accepts `Translatable|string` for `$reason` instead of `string` (to allow localized disconnect messages)
+  - `Player->sendJukeboxPopup()` now accepts `Translatable|string` instead of `string, string[]`
+
+#### `pocketmine\player\chat`
+- The following new classes have been added:
+  - `ChatFormatter` - interface implemented by chat formatters
+  - `StandardChatFormatter` - formats chat messages in the vanilla Minecraft style
+  - `LegacyRawChatFormatter` - implements the same behaviour previously used by `PlayerChatEvent->setFormat()`
+
+### `pocketmine\world`
+- The following API methods have changed signatures:
+  - `World->getBiome()` now accepts `int $x, int $y, int $z` instead of `int $x, int $z`
+  - `World->getBiomeId()` now accepts `int $x, int $y, int $z` instead of `int $x, int $z`
+  - `World->setBiomeId()` now accepts `int $x, int $y, int $z` instead of `int $x, int $z`
+
+#### `pocketmine\world\format`
+- The following new API methods have been added:
+  - `public SubChunk->getBiomeArray() : PalettedBlockArray`
+- The following API methods have changed signatures:
+  - `Chunk->getBiomeId()` now accepts `int $x, int $y, int $z` instead of `int $x, int $z`
+  - `Chunk->setBiomeId()` now accepts `int $x, int $y, int $z` instead of `int $x, int $z`
+  - `Chunk->__construct()` no longer accepts `BiomeArray` as a parameter (contained in each subchunk instead)
+  - `SubChunk->__construct()` now accepts `int $emptyBlockId, list<PalettedBlockArray> $blocks, PalettedBlockArray $biomes, ?LightArray $blockLight, ?LightArray $skyLight` instead of `int, list<PalettedBlockArray>, ?LightArray, ?LightArray` 
+- The following classes have been removed
+  - `BiomeArray`
+
+## Internals
+- Built-in commands now declare their names inside the class constructor, rather than accepting them as parameters. This improves code consistency.
+- `NetworkSession` disconnect APIs now accept `Translatable|string` instead of `string` to allow localized disconnect messages.
+- All external usages of `KnownTranslationKeys` are now removed. All localized messages are now sent using `Translatable` objects (usually from `KnownTranslationFactory`).
+
+# 5.0.0-ALPHA8
+Released 23rd January 2023.
+
+## Core
+- Updated `ext-pthreads` requirement to `^5.1.0`. This version improves performance, memory usage, includes BC-breaking API changes, and removes a lot of confusing behaviour.
+  - See [`ext-pthreads` 5.0.0 release](https://github.com/pmmp/pthreads/releases/tag/5.0.0) for more information.
+  - For the most part, plugins will be unaffected, unless using `Threaded` objects directly, or directly interacting with other pthreads APIs.
+
+## API
+### Overview
+- It's now possible to specify a different disconnect reason and disconnection screen message. This is useful if you want to display a fancy disconnect screen, but don't want to spam the server log with useless information.
+
+### `pocketmine\event\player`
+- The following API methods have been removed:
+  - `PlayerKickEvent->getReason()` - replaced by `getDisconnectReason()` and `getDisconnectScreenMessage()`
+  - `PlayerKickEvent->setReason()` - replaced by `setDisconnectReason()` and `setDisconnectScreenMessage()`
+  - `PlayerDuplicateLoginEvent->getDisconnectMessage()` - replaced by `getDisconnectReason()` and `getDisconnectScreenMessage()`
+  - `PlayerDuplicateLoginEvent->setDisconnectMessage()` - replaced by `setDisconnectReason()` and `setDisconnectScreenMessage()`
+- The following new API methods have been added:
+  - `public PlayerKickEvent->getDisconnectReason() : Translatable|string` - returns the reason for the disconnection displayed in the console and server log
+  - `public PlayerKickEvent->setDisconnectReason(Translatable|string $disconnectReason) : void` - sets the reason for the disconnection displayed in the console and server log
+  - `public PlayerKickEvent->getDisconnectScreenMessage() : Translatable|string|null` - returns the message to be displayed on the disconnect screen (the message in `getDisconnectReason()` is used if null is returned)
+  - `public PlayerKickEvent->setDisconnectScreenMessage(Translatable|string|null $disconnectScreenMessage) : void` - sets the message to be displayed on the disconnect screen (the message in `setDisconnectReason()` is used if null is passed)
+  - `public PlayerDuplicateLoginEvent->getDisconnectReason() : Translatable|string` - returns the reason for the disconnection displayed in the console and server log
+  - `public PlayerDuplicateLoginEvent->setDisconnectReason(Translatable|string $disconnectReason) : void` - sets the reason for the disconnection displayed in the console and server log
+  - `public PlayerDuplicateLoginEvent->getDisconnectScreenMessage() : Translatable|string|null` - returns the message to be displayed on the disconnect screen (the message in `getDisconnectReason()` is used if null is returned)
+  - `public PlayerDuplicateLoginEvent->setDisconnectScreenMessage(Translatable|string|null $disconnectScreenMessage) : void` - sets the message to be displayed on the disconnect screen (the message in `setDisconnectReason()` is used if null is passed)
+
+### `pocketmine\network`
+- The following API methods have changed signatures:
+  - `NetworkSessionManager->close()` now accepts an additional `Translatable|string|null $disconnectScreenMessage` parameter.
+
+### `pocketmine\player`
+- The following API methods have changed signatures:
+  - `Player->kick()` now accepts an additional `Translatable|string|null $disconnectScreenMessage` parameter, which is the message to be displayed on the disconnect screen (the message in `$reason` is used if null is passed)
+  - `Player->disconnect()` now accepts an additional `Translatable|string|null $disconnectScreenMessage` parameter, which is the message to be displayed on the disconnect screen (the message in `$reason` is used if null is passed)
+
+## Internals
+- `NetworkSession` disconnect methods have been altered to allow specifying a different disconnect reason and disconnection screen message.
+
+# 5.0.0-ALPHA9
+Released 21st February 2023.
+
+## Core
+- Introduced timings for individual packet encoding.
+- Network timings now cover more parts of the network system which weren't previously accounted for.
+
+## API
+### `pocketmine\block`
+- Blocks are no longer required to explicitly specify how many type or state data bits they require. This is now automatically calculated using `RuntimeDataSizeCalculator`.
+- The following API methods have changed signatures:
+  - `Block->describeState()` now accepts `RuntimeDataDescriber` instead of `RuntimeDataReader|RuntimeDataWriter`
+  - `Block->describeType()` now accepts `RuntimeDataDescriber` instead of `RuntimeDataReader|RuntimeDataWriter`
+  - `Block->getRequiredStateDataBits()` is now `final`.
+  - `Block->getRequiredTypeDataBits()` is now `final`.
+  - `Leaves->__construct()` now `LeavesType $leavesType` instead of `TreeType $treeType`
+- The following API methods have been added:
+  - `public Leaves->getLeavesType() : LeavesType` - returns the type of leaves
+- The following classes have been added:
+  - `LeavesType` - an enum of all the different types of leaves
+- The following classes have been renamed:
+  - `BlockFactory` -> `RuntimeBlockStateRegistry` - this more accurately describes the purpose of the class
+- The following API methods have changed behaviour:
+  - `RuntimeBlockStateRegistry->register()` now throws a `LogicException` if a block does not properly reject invalid state data.
+
+### `pocketmine\command`
+- `SimpleCommandMap` now requires all commands to have a permission set when registered.
+  - If you actually want to allow everyone to use your command (not advised), you can add a new permission to the `pocketmine.group.user` group, or use `default: true` for `plugin.yml` permissions.
+- The following API methods have changed behaviour:
+  - `Command->testPermissionSilent()` now returns `false` if there are no permissions associated with the command. This is to prevent commands with no permissions being usable by everyone, which has previously been a source of security issues.
+- The following API methods have been added:
+  - `public Command->getPermissions() : list<string>` - returns a list of permissions which grant usage access to this command. A user with one or more of these permissions will be able to invoke the command's `execute()` method
+  - `public Command->setPermissions(list<string> $permissions) : void` - sets the permissions which grant usage access to this command. This should be used instead of `setPermission()` with `;` separators (which is now deprecated)
+
+### `pocketmine\data\bedrock\block`
+- The following API methods have been added:
+  - `public static BlockStateData::current(string $name, array<string, Tag> $states) : BlockStateData` - creates a new `BlockStateData` instance with the current blockstate version
+
+### `pocketmine\data\bedrock\block\upgrade`
+- Blockstate upgrade schemas are now indexed by schema ID instead of Minecraft version. This is because the Minecraft blockstate version isn't consistently bumped when changes are made.
+- `BlockStateUpgrader` now requires that every schema added must have a unique schema ID.
+- The following API methods have been removed:
+  - `BlockStateUpgradeSchema->getPriority()`
+- The following API methods have been added:
+  - `public BlockStateUpgradeSchema->getSchemaId() : int` - returns the schema ID of this upgrade schema, usually the number at the start of the JSON filename
+- The following API methods have changed signatures:
+  - `BlockStateUpgradeSchemaUtils::fromJsonModel()` now accepts `int $schemaId` instead of `int $priority`
+  - `BlockStateUpgradeSchemaUtils::loadSchemaFromString()` now accepts `int $schemaId` instead of `int $priority`
+  - `BlockStateUpgradeSchemaUtils::loadSchemas()` now accepts `int $maxSchemaId` instead of `int $currentVersion`
+
+### `pocketmine\data\bedrock\item\upgrade`
+- The following API methods have changed signatures:
+  - `ItemUpgradeSchemaUtils::loadSchemas()` now accepts `int $maxSchemaId`
+- The following API methods have been renamed:
+  - `ItemIdMetaUpgradeSchema->getPriority()` -> `ItemIdMetaUpgradeSchema->getSchemaId()`
+- The following classes have been added:
+  - `ItemIdMetaUpgrader` - encapsulates handling for upgrading item string IDs and meta to newer versions
+- The following API methods have been moved:
+  - `ItemDataUpgrader->addIdMetaUpgradeSchema()` -> `ItemIdMetaUpgrader->addSchema()`
+  - `ItemDataUpgrader->upgradeItemStringIdMeta()` -> `ItemIdMetaUpgrader->upgrade()`
+
+### `pocketmine\data\runtime`
+- The following interfaces have been added:
+  - `RuntimeDataDescriber` - contract for symmetric APIs exposed by `RuntimeDataReader`, `RuntimeDataWriter` and `RuntimeDataSizeCalculator`
+
+### `pocketmine\event\player`
+- `PlayerPreLoginEvent` now supports setting separate log reasons (disconnect reason) and disconnect screen messages.
+- The following classes have inheritance changes:
+  - `PlayerPreLoginEvent` no longer implements `Cancellable`. This caused unexpected behaviour for most plugin devs due to default-ignoring cancelled events, forcing people to usually have to use `@handleCancelled` to handle the event when they wanted to use it.
+- The following API methods have been added:
+  - `public PlayerPreLoginEvent->getDisconnectScreenMessage(int $flag) : Translatable|string|null` - returns the message to be displayed on the disconnect screen for the specified kick flag, if set
+  - `public PlayerPreLoginEvent->getFinalDisconnectScreenMessage() : Translatable|string|null` - returns the message to be displayed on the disconnect screen, taking into account the kick flags set
+- The following API constants have been renamed:
+  - `PlayerPreLoginEvent::KICK_REASON_BANNED` -> `PlayerPreLoginEvent::KICK_FLAG_BANNED`
+  - `PlayerPreLoginEvent::KICK_REASON_PLUGIN` -> `PlayerPreLoginEvent::KICK_FLAG_PLUGIN`
+  - `PlayerPreLoginEvent::KICK_REASON_PRIORITY` -> `PlayerPreLoginEvent::KICK_FLAG_PRIORITY`
+  - `PlayerPreLoginEvent::KICK_REASON_SERVER_FULL` -> `PlayerPreLoginEvent::KICK_FLAG_SERVER_FULL`
+  - `PlayerPreLoginEvent::KICK_REASON_SERVER_WHITELISTED` -> `PlayerPreLoginEvent::KICK_FLAG_SERVER_WHITELISTED`
+- The following API methods have been renamed:
+  - `PlayerPreLoginEvent->clearAllKickReasons()` -> `PlayerPreLoginEvent->clearAllKickFlags()`
+  - `PlayerPreLoginEvent->clearKickReason()` -> `PlayerPreLoginEvent->clearKickFlag()`
+  - `PlayerPreLoginEvent->getFinalKickMessage()` -> `PlayerPreLoginEvent->getFinalDisconnectReason()` (now used for logs only, if a disconnect screen message is set for the highest priority flag)
+  - `PlayerPreLoginEvent->getKickMessage()` -> `PlayerPreLoginEvent->getDisconnectReason()` (now used for logs only, if a disconnect screen message is set for the flag)
+  - `PlayerPreLoginEvent->getKickReasons()` -> `PlayerPreLoginEvent->getKickFlags()`
+  - `PlayerPreLoginEvent->isKickReasonSet()` -> `PlayerPreLoginEvent->isKickFlagSet()`
+  - `PlayerPreLoginEvent->setKickReason()` -> `PlayerPreLoginEvent->setKickFlag()`
+- The following API methods have changed signatures:
+  - `PlayerPreLoginEvent->setKickFlag()` (previously `setKickReason()`) now accepts `Translatable|string $disconnectReason, Translatable|string|null $disconnectScreenMessage = null` instead of `Translatable|string $message`
+
+### `pocketmine\event\block`
+- The following classes have inheritance changes:
+  - `BlockPlaceEvent` no longer extends `BlockEvent`, and therefore no longer has `getBlock()`.
+- The following API methods have been removed:
+  - `BlockPlaceEvent->getBlockReplaced()` - this information is now provided in the `BlockTransaction` object returned by `BlockPlaceEvent->getTransaction()`
+- The following API methods have been added:
+  - `public BlockPlaceEvent->getTransaction() : BlockTransaction` - returns the transaction containing a list of changed block positions and the blockstates they will be changed to
+- The following API methods have changed signatures:
+  - `BlockPlaceEvent->__construct()` now accepts `BlockTransaction $transaction` instead of `Block $blockPlace, Block $blockReplace`
+
+### `pocketmine\item`
+- The following API methods have signature changes:
+  - `Item->describeType()` now accepts `RuntimeDataDescriber` instead of `RuntimeDataReader|RuntimeDataWriter`
+
+### `pocketmine\world\format`
+- The following API methods have been renamed:
+  - `Chunk->getFullBlock()` -> `Chunk->getBlockStateId()`
+  - `Chunk->setFullBlock()` -> `Chunk->setBlockStateId()`
+  - `SubChunk->getFullBlock()` -> `SubChunk->getBlockStateId()`
+  - `SubChunk->setFullBlock()` -> `SubChunk->setBlockStateId()`
+
+## Gameplay
+### Blocks
+- The following new blocks have been added:
+  - Mangrove Leaves
+  - Azalea Leaves
+  - Flowering Azalea Leaves
+  - Reinforced Deepslate
+- Fixed incorrect drops of deepslate when mined without a Silk Touch tool.
+- Bells now ring when hit by a projectile.
+
+## Internals
+- `build/generate-runtime-enum-serializers.php` now generates the following additional classes:
+  - `interface RuntimeEnumDescriber`
+  - `trait RuntimeEnumSizeCalculatorTrait`
+- Block type/state data required bits are now calculated from `Block->describeType()` using `RuntimeDataSizeCalculator`.
+- Commands now use an array for permissions internally, instead of a string separated by `;`.
\ No newline at end of file
diff --git a/changelogs/5.0-beta.md b/changelogs/5.0-beta.md
new file mode 100644
index 0000000000..c100cfefc9
--- /dev/null
+++ b/changelogs/5.0-beta.md
@@ -0,0 +1,215 @@
+**For Minecraft: Bedrock Edition 1.19.62**
+
+5.0.0 is a major update to PocketMine-MP, including many new features and API changes. It is **not** compatible with plugins written for previous versions of PocketMine-MP.
+
+**During the beta phase, no new features will be added.**
+
+This stage of development is focused on stability and cleaning up any major issues introduced during the alpha stage.
+
+## WARNING
+**This is a BETA release.** This means that it may be unstable, and is not yet ready for production use.
+
+Since this version has undergone substantial changes compared to 4.x, plugins written for 4.x will need to be updated to work on this version.
+
+Breaking API changes may still occur during the beta phase, but only if they are strictly necessary to fix a problem prior to full release.
+
+**BACK UP your data before testing this.** This version will work with worlds and player data from 4.x,
+BUT any world or player data loaded in 5.0.0 will not work in 4.x due to backwards-incompatible storage format changes.
+
+# 5.0.0-BETA1
+Released 7th March 2023.
+
+**This release includes changes from the following releases:**
+- [All 5.0.0 alpha releases](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA1/changelogs/5.0-alpha.md)
+- [4.15.2](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA1/changelogs/4.15.md#4152)
+- [4.15.3](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA1/changelogs/4.15.md#4153)
+- [4.16.0](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA1/changelogs/4.16.md#4160)
+
+## API
+### `pocketmine\block`
+- Improved documentation for the following methods:
+  - `Block->getTypeId()`
+  - `Block->getStateId()`
+  - `Block->describeType()`
+  - `Block->describeState()`
+
+### `pocketmine\command`
+- The following API methods have been renamed:
+  - `Command->getPermission()` -> `Command->getPermissions()`
+
+## Internals
+- The following methods have been renamed:
+  - `Block->computeStateData()` -> `Block->computeTypeAndStateData()`
+  - `Block->decodeStateData()` -> `Block->decodeTypeAndStateData()`
+- Wall state data now packs connections into 7 bits instead of 8.
+
+# 5.0.0-BETA2
+Released 11th April 2023.
+
+**This release includes changes from the following releases:**
+- [4.17.0](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA2/changelogs/4.17.md#4170)
+- [4.17.1](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA2/changelogs/4.17.md#4171)
+- [4.17.2](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA2/changelogs/4.17.md#4172)
+- [4.18.0](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA2/changelogs/4.18.md#4180)
+- [4.18.1](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA2/changelogs/4.18.md#4181)
+- [4.18.2](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA2/changelogs/4.18.md#4182)
+- [4.18.3](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA2/changelogs/4.18.md#4183)
+- [4.18.4](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA2/changelogs/4.18.md#4184)
+- [4.19.0](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA2/changelogs/4.19.md#4190)
+
+## Tools
+- Added script `tools/generate-bedrock-data-from-packets.php`. This tool accepts a txt file containing base64-encoded packet dumps.
+  - This script has been used to generate data for [BedrockData](https://github.com/pmmp/BedrockData) for several years, but has only now been open-sourced.
+  - It's used to generate data such as crafting recipes, creative inventory data, and various other blobs of data needed to support the current version of Minecraft: Bedrock Edition.
+
+## Gameplay
+- Anvils now damage entities when they fall on top of them.
+
+## API
+### `pocketmine\block\utils`
+- The following API interface requirements have been added (BC breaking):
+  - `public Fallable->getFallDamagePerBlock() : float` (default implementation provided by `FallableTrait`)
+  - `public Fallable->getMaxFallDamage() : float` (default implementation provided by `FallableTrait`)
+
+### `pocketmine\data\bedrock\block`
+- The following new API methods have been added:
+  - `public BlockStateData->getVersionAsString() : string`
+
+#### `pocketmine\data\bedrock\block\upgrade\model`
+- `BlockStateUpgradeSchemaModelBlockRemap` now accepts `null` for `oldState` and `newState`. This makes it easier to generate portable schemas for other languages to read.
+
+### `pocketmine\event\entity`
+- The following new API constants have been added:
+  - `EntityDamageEvent::CAUSE_FALLING_BLOCK`
+  - `EntityDamageEvent::MODIFIER_ARMOR_HELMET`
+
+### `pocketmine\item`
+- The following API methods have signature changes:
+  - `ItemTypeIds::toBlockTypeId()` may now return `null` if the item type ID is not a block.
+
+### `pocketmine\player`
+- The following classes have been removed:
+  - `PlayerChunkLoader` - deprecated in 4.19.0 (this was technically internal, but never marked as such)
+
+## Internals
+- Make use of `Item->canStackWith()` instead of `Item->equals()` wherever possible, to make the code more readable.
+
+# 5.0.0-BETA3
+Released 17th May 2023.
+
+**This release includes changes from the following releases:**
+- [4.19.1](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA3/changelogs/4.19.md#4191)
+- [4.19.2](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA3/changelogs/4.19.md#4192)
+- [4.19.3](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA3/changelogs/4.19.md#4193)
+- [4.20.0](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA3/changelogs/4.20.md#4200)
+- [4.20.1](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA3/changelogs/4.20.md#4201)
+- [4.20.2](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA3/changelogs/4.20.md#4202)
+- [4.20.3](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA3/changelogs/4.20.md#4203)
+- [4.20.4](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA3/changelogs/4.20.md#4204)
+- [4.21.0](https://github.com/pmmp/PocketMine-MP/blob/5.0.0-BETA3/changelogs/4.21.md#4210)
+
+## General
+- Improved light propagation performance by 10-15%.
+
+## Fixes
+- Fixed late initialization of coral type in `BaseCoral`.
+
+## Tools
+- `tools/generate-blockstate-upgrade-schema.php` has the following improvements:
+  - Now generates better errors when inconsistent blockstate versions are encountered.
+  - Now generates more stable outputs when re-run on the same input.
+  - Output now uses `copiedState` in `remappedStates` where possible. This significantly reduces the size of the output for blocks with partially flattened states.
+
+## Gameplay
+- The following blocks have been added:
+  - Cave Vines
+- The following items have been added:
+  - Glow Berries
+  - Mangrove Boat (incomplete)
+- Fixed flower pots being able to be placed inside flower pots.
+
+## API
+### `pocketmine\block`
+- The following API methods have been renamed:
+  - `Block->isSameType()` -> `Block->hasSameTypeId()`
+  - `Block->describeType()` -> `Block->describeBlockItemState()`
+  - `Block->describeState()` -> `Block->describeBlockOnlyState()`
+- The following API methods have been removed:
+  - `Block->getRequiredTypeDataBits()`
+  - `Block->getRequiredStateDataBits()`
+- The following API methods have been added:
+  - `public Block->generateStatePermutations() : \Generator<int, Block, void, void>` - yields all possible states this block type can be in (used for `RuntimeBlockStateRegistry`)
+- The following API methods have signature changes:
+  - `Sapling::__construct()` now accepts `SaplingType $saplingType` instead of `TreeType $treeType`
+  - `RuntimeBlockStateRegistry->register()` no longer accepts an `$override` parameter.
+- The following classes have been added:
+  - `utils\SaplingType` - enum of all sapling types
+- `utils\TreeType` has been moved to `pocketmine\world\generator\object` namespace.
+
+### `pocketmine\data\bedrock\item\upgrade`
+- The following API methods have been added:
+  - `public ItemIdMetaUpgrader->getSchemas() : array<int, BlockStateUpgradeSchema>` - returns a list of loaded schemas indexed by schema ID
+  - `public ItemIdMetaUpgradeSchema->getRenamedIds() : array<string, string>` - returns a map of old ID -> new ID
+  - `public ItemIdMetaUpgradeSchema->getRemappedMetas() : array<string, array<int, string>>` - returns a map of old ID -> list of old meta -> new ID
+
+### `pocketmine\event\block`
+- The following API methods have been added:
+  - `public BlockGrowEvent->getPlayer() : ?Player` - returns the player that triggered the block growth, or `null` if it was not triggered by a player
+- The following API methods have signature changes:
+  - `BlockGrowEvent::__construct()` now accepts an optional `?Player $player` parameter.
+
+### `pocketmine\event\world`
+- The following classes have been added:
+  - `WorldDisplayNameChangeEvent` - called when a world's display name is changed
+
+### `pocketmine\item`
+- `Boat` now uses a new `BoatType` enum instead of `TreeType`. This is because not all tree types have an associated boat type, and some boat types are not made from tree materials (e.g. bamboo raft).
+  - The following API methods have been removed:
+    - `Boat->getWoodType()`
+  - The following API methods have been added:
+    - `public Boat->getType() : BoatType`
+    - `public Item->getStateId() : int` - returns an encoded ID containing the item type ID and encoded item state
+  - The following API methods have been renamed:
+    - `Item->describeType()` -> `Item->describeState()`
+  - The following classes have been added:
+    - `BoatType` - enum of all boat types
+  - The following API methods have signature changes:
+    - `BoatType::__construct()` now accepts `BoatType $boatType` instead of `TreeType $woodType`.
+
+### `pocketmine\world`
+- The following API methods have been added:
+  - `public World->setDisplayName(string $name) : void`
+
+### `pocketmine\world\format`
+- Fixed outdated documentation for various methods of `Chunk`.
+
+### `pocketmine\world\format\io\data`
+- The following API interface requirements have been added:
+  - `public WorldData->setDisplayName(string $value) : void`
+
+## Internals
+- Reduced global usage in world providers. In the future, we want to have blockstate deserializers etc. injected rather than being global singletons.
+- `BlockStateUpgrader` now always updates the blockstate version, even if no changes were made. PM itself doesn't require this, but it's useful for tools to know whether to upgrade the data again (e.g. in testing scenarios).
+- `BlockStateDictionary` memory usage is now reduced from 9 MB to 3.5 MB using various techniques, including string reuse and binary-encoded states.
+- `RuntimeBlockMapping` has been renamed to `BlockTranslator`.
+- Singletons in the `pocketmine\network\mcpe\convert` package have been centralized under `TypeConverter`. In the future, this will be injected where needed, allowing different converters to be used for different sessions (useful for multiversion).
+- Overriding of serializers and deserializers of items and blocks is now consistently disallowed. Due to the lack of a good reason to allow overriding built-in blocks and items, this is no longer allowed.
+
+# 5.0.0-BETA4
+Released 23rd May 2023.
+
+## General
+- [`ext-pmmpthread` version 6.0.0](https://github.com/pmmp/ext-pmmpthread/releases/6.0.0) (renamed from `ext-pthreads`) is now required. This version has API changes compared to pthreads v5. Please read the linked changelog for details.
+- [`pocketmine/snooze` version 0.5.0](https://github.com/pmmp/Snooze/releases/0.5.0) is now required.
+- `pocketmine/classloader` and `pocketmine/log-pthreads` packages have been removed. The relevant classes from these packages are now included in-house in the `pocketmine/thread` namespace.
+  - `BaseClassLoader` is replaced with `pocketmine\thread\ThreadSafeClassLoader`
+  - `ThreadedLogger` is replaced by `pocketmine\thread\ThreadSafeLogger`
+  - `AttachableThreadedLogger` is replaced by `pocketmine\thread\AttachableThreadSafeLogger`
+  - `ThreadedLoggerAttachment` is replaced by `pocketmine\thread\ThreadSafeLoggerAttachment`
+
+## Fixes
+- Fixed crash on unknown blocks due to late initialization of properties in `UnknownBlock`.
+
+## API changes
+### `pocketmine\scheduler`
+- `AsyncTask->setResult()` now works with thread-safe objects. This was previously not possible due to limitations in the `pthreads` extension.
diff --git a/changelogs/5.0.md b/changelogs/5.0.md
new file mode 100644
index 0000000000..957e4cb95f
--- /dev/null
+++ b/changelogs/5.0.md
@@ -0,0 +1,791 @@
+# 5.0.0
+Released 1st June 2023.
+
+**For Minecraft: Bedrock Edition 1.19.80**
+
+5.0.0 is a major feature update to PocketMine-MP, including support for Bedrock worlds from 1.13 onwards, a large array of new blocks and items, and various changes to the plugin API.
+
+It is **not** compatible with plugins written for 4.x.y, and plugins may require code changes to work with it.
+
+**As this changelog is quite large, its accuracy and completeness cannot be guaranteed.**
+Make sure you're looking at the [latest revision](https://github.com/pmmp/PocketMine-MP/blob/stable/changelogs/5.0.md), as it may be amended after release.
+
+## Core
+- Worlds are now saved according to the Bedrock 1.19.80 format.
+- Worlds generated by Bedrock from 1.13.0 and up are now supported (previously, only worlds up to 1.12 were supported).
+- `/particle` now accepts strings for particle data instead of integers.
+- `/particle` no longer accepts integers for block or item IDs.
+- The usage of `blockcrack`, `iconcrack` and `blockdust` particle types in `/particle` now follows the same pattern as
+  other particle types, with the data for each being passed in the `data` parameter instead of being baked into the
+  particle name.
+- Commands are now enabled by default in worlds exported from PocketMine-MP to Bedrock.
+
+## Build system
+- `build/generate-block-serializer-consts.php` has been added to generate `BlockTypeNames`, `BlockStateNames` and `BlockStateStringValues` in the `pocketmine\data\bedrock\block` package.
+- `build/generate-item-type-names.php` has been added to generate `ItemTypeNames` in the `pocketmine\data\bedrock\item` package.
+- `build/generate-runtime-enum-serializers.php` has been added to generate `RuntimeEnumSerializer`, `RuntimeEnumSerializerTrait`, and `RuntimeEnumSizeCalculatorTrait` in `pocketmine\data\runtime` package.
+
+## Localization
+- Localized disconnect messages are now used in the following cases:
+  - Server full
+  - Player not on the server whitelist
+  - Player on the server ban list
+  - Invalid skin
+  - Invalid username
+  - Kicked using `/kick`
+  - Banned using `/ban`
+  - Failure to find a safe spawn position
+- Session open, session close and session player name discovery messages are now localized.
+- All permissions now have localized descriptions. These are not currently used by PocketMine-MP, but may be useful for plugins.
+
+## Performance
+- Improved performance of dropping block inventory contents when the block is destroyed.
+- Improved light propagation performance by 10-15%.
+- [`ext-pmmpthread` version 6.0.0](https://github.com/pmmp/ext-pmmpthread/releases/tag/6.0.0) is now used, featuring significant performance improvements for thread-safe objects and various threading use-cases.
+
+## Tools
+- The following tool scripts have been added:
+  - `generate-block-palette-spec.php` - generates a JSON file with a readable overview of blocks, their state
+    properties, and their possible values
+  - `generate-blockstate-upgrade-schema.php` - generates JSON blockstate upgrade schemas like those found
+    in [BedrockBlockUpgradeSchema](https://github.com/pmmp/BedrockBlockUpgradeSchema)
+  - `generate-item-upgrade-schema.php` - generates JSON item ID/meta upgrade schemas like those found
+    in [BedrockItemUpgradeSchema](https://github.com/pmmp/BedrockItemUpgradeSchema)
+  - `generate-bedrock-data-from-packets.php` - generates various files for [BedrockData](https://github.com/pmmp/BedrockData)
+    - This script accepts a txt file containing base64-encoded packet dumps.
+    - This script has been in use for several years, but has only now been open-sourced.
+    - It's used to generate data such as crafting recipes, creative inventory data, and various other blobs of data needed to support the current version of Minecraft: Bedrock Edition.
+
+## Gameplay
+### Blocks
+- Added the following new blocks:
+  - Amethyst Block
+  - Ancient Debris
+  - Azalea Leaves
+  - Basalt
+  - Blackstone blocks, slabs, stairs, and walls
+  - Cakes with Candle & Dyed Candle
+  - Calcite
+  - Candle & Dyed Candle
+  - Cartography Table (not currently usable due to maps not being implemented)
+  - Cauldron
+  - Cave Vines
+  - Chain
+  - Chiseled Deepslate
+  - Chiseled Nether Bricks
+  - Chiseled Polished Blackstone
+  - Chorus Flower
+  - Chorus Plant
+  - Cobbled Deepslate blocks, slabs, stairs, and walls
+  - Copper Ore
+  - Copper block (random oxidation not yet implemented)
+  - Crached Deepslate Tiles
+  - Cracked Deepslate Bricks
+  - Cracked Nether Bricks
+  - Cracked Polished Blackstone Bricks
+  - Crimson buttons, doors, fences, fence gates, hyphae, planks, pressure plates, signs, slabs, stairs, stems, and trapdoors
+  - Crying Obsidian
+  - Cut Copper block, stairs and slabs (random oxidation not yet implemented)
+  - Deepslate
+  - Deepslate Bricks blocks, slabs, stairs, and walls
+  - Deepslate Ores (coal, copper, diamond, emerald, gold, iron, lapis lazuli, redstone)
+  - Deepslate Tiles blocks, slabs, stairs, and walls
+  - Flowering Azalea Leaves
+  - Froglight (pearlescent, verdant, ochre)
+  - Gilded Blackstone
+  - Glow Item Frame
+  - Hanging Roots
+  - Honeycomb Block
+  - Light Block
+  - Lightning Rod
+  - Mangrove Leaves
+  - Mangrove Roots
+  - Mangrove buttons, doors, fences, fence gates, logs, planks, pressure plates, signs, slabs, stairs, trapdoors, and wood
+  - Mud Bricks blocks, slabs, stairs, and walls
+  - Muddy Mangrove Roots
+  - Nether Gold Ore
+  - Netherite Block
+  - Polished Basalt
+  - Polished Blackstone Bricks blocks, slabs, stairs, and walls
+  - Polished Blackstone blocks, buttons, pressure plates, slabs, stairs, and walls
+  - Polished Deepslate blocks, slabs, stairs, and walls
+  - Quartz Bricks
+  - Reinforced Deepslate
+  - Rooted Dirt
+  - Sculk
+  - Shroomlight
+  - Smithing Table
+  - Smooth Basalt
+  - Soul Fire
+  - Soul Lantern
+  - Soul Soil
+  - Soul Torch
+  - Spore Blossom
+  - Tinted Glass
+  - Tuff
+  - Twisting Vines
+  - Warped Wart Block
+  - Warped buttons, doors, fences, fence gates, hyphae, planks, pressure plates, signs, slabs, stairs, stems, and trapdoors
+  - Weeping Vines
+  - Wither Rose
+- Added support for basalt generators
+- Added support for dyeing sign text and making it glow.
+- All-sided logs ("wood", for want of a better name) can now be placed in X, Y, and Z orientations.
+- Coral and coral fans now behave correctly when placed out of water (they no longer immediately die).
+- Fixed dead bush being able to be placed on some invalid blocks (e.g. stone).
+- Fixed lava setting entities on fire for an incorrect duration (Java vs Bedrock inconsistency).
+- Fixed sugarcane not being able to be placed on some blocks.
+- Iron Ore and Gold Ore now drop Raw Iron and Raw Gold respectively, instead of the ore blocks.
+- Item frames can now be placed on the top and bottom of blocks.
+- Stripping logs by right-clicking them with an axe is now supported.
+- TNT can now be ignited by fire charges.
+- Vines can now only be placed on the side of full-cube blocks.
+- Walls now connect when placed, following the pre-1.16 logic. (1.16 logic is planned to be implemented, but currently low priority.)
+- Anvils are now damaged when they hit the ground after falling.
+- Added missing sounds for anvils hitting the ground after falling.
+- Anvils now damage entities when they fall on top of them.
+
+### Items
+- Added the following new items:
+  - Amethyst Shard
+  - Antidote (from Education Edition)
+  - Copper Ingot
+  - Disc Fragment (5)
+  - Echo Shard
+  - Elixir (from Education Edition)
+  - Eye Drops (from Education Edition)
+  - Fire Charge
+  - Glow Berries
+  - Glow Ink Sac
+  - Honey Bottle
+  - Honeycomb
+  - Mangrove Boat (incomplete)
+  - Music Disc (5)
+  - Music Disc (Otherside)
+  - Music Disc (Pigstep)
+  - Netherite Axe
+  - Netherite Boots
+  - Netherite Chestplate
+  - Netherite Helmet
+  - Netherite Ingot
+  - Netherite Leggings
+  - Netherite Pickaxe
+  - Netherite Scrap
+  - Netherite Shovel
+  - Netherite Sword
+  - Phantom Membrane
+  - Raw Copper
+  - Raw Gold
+  - Raw Iron
+  - Spyglass
+  - Suspicious Stew
+  - Tonic (from Education Edition)
+- Glass bottles can now be filled with water by clicking on a water source block.
+- Implemented Swift Sneak enchantment.
+- Armour durability is now only reduced when the wearer receives a type of damage that the armour can protect against.
+- Bells now ring when hit by a projectile.
+
+### Worlds
+- World height of -64 to 319 is now supported.
+- Added support for 3D biomes. This isn't used by PocketMine-MP yet, but is necessary to be able to fully load 1.18 worlds.
+
+## API
+### General
+- Union and mixed native parameter, return and property types are now used where appropriate.
+- Protected and public properties now use native property types wherever possible.
+- Parameter and return typehints have been applied in many places where it wasn't previously possible.
+
+### Dependencies
+- [`ext-pmmpthread` version 6.0.0](https://github.com/pmmp/ext-pmmpthread/releases/6.0.0) (renamed from `ext-pthreads`) is now required. This version features major API changes and improvements. Please read the [upgrading guide](https://github.com/pmmp/ext-pmmpthread/blob/fork/docs/UPGRADING_4.x_to_6.0.md) for details.
+- [`pocketmine/snooze` version 0.5.0](https://github.com/pmmp/Snooze/releases/0.5.0) is now required.
+- [`pocketmine/raklib` version 0.15.0](https://github.com/pmmp/RakLib/releases/0.15.0) is now required.
+- [`pocketmine/raklib-ipc` version 0.2.0](https://github.com/pmmp/RakLibIpc/releases/0.2.0) is now required.
+- `pocketmine/classloader` and `pocketmine/log-pthreads` packages have been removed. The relevant classes from these packages are now included in-house in the `pocketmine/thread` namespace.
+  - `BaseClassLoader` is replaced with `pocketmine\thread\ThreadSafeClassLoader`
+  - `ThreadedLogger` is replaced by `pocketmine\thread\ThreadSafeLogger`
+  - `AttachableThreadedLogger` is replaced by `pocketmine\thread\AttachableThreadSafeLogger`
+  - `ThreadedLoggerAttachment` is replaced by `pocketmine\thread\ThreadSafeLoggerAttachment`
+- `webmozart/path-util` has been removed (replaced by [`symfony/filesystem`](https://github.com/symfony/filesystem)).
+
+### `pocketmine\block`
+#### Highlights
+- Blocks no longer use internal Minecraft IDs and metadata to identify themselves. All APIs associated with legacy IDs
+  and meta have been removed.
+- A new set of runtime IDs generated from `VanillaBlocks` is used to identify block types. These IDs are defined
+  in `BlockTypeIds`.
+  - These new IDs are used for runtime representation of blocks on chunks, and for type comparison purposes.
+  - Block type IDs are used at **runtime only**. **Do not store them in configs or databases**, as they are subject to
+    change without warning.
+  - Block type IDs are **specific to PocketMine-MP** and have no relation to the IDs used by Minecraft.
+  - Block type IDs cannot be negative
+  - Block type IDs must not be reused, even if overriding an already defined block
+- Block state properties (e.g. facing, colour, etc.) are now represented by PM-specific state data instead of legacy
+  metadata. The state data consists of:
+  - Block-item state properties - retained by items when the block is broken (colour, wet/dry, coral type, etc.) - handled by `Block->describeBlockItemState()`
+  - Block-only state data - discarded when the block is broken (facing direction, lit/unlit, powered/unpowered, etc.) - handled by `Block->describeBlockOnlyState()`
+- Chunks now store dynamic state ID derived from the runtime type ID and runtime (PocketMine-MP defined) state data.
+- Introduced "type tags" concept, which allows marking certain blocks as having certain behaviours.
+  - The idea for this system was borrowed from the Minecraft Java tags system.
+  - It's still in very early concept stage, but is currently used for deciding which types of blocks plants can be placed on without needing to enumerate every single ID in every class, eliminating a bunch of boilerplate code and improving consistency.
+- All `Block` descendents now accept `BlockTypeInfo` in the constructor, instead of `BlockBreakInfo`. This allows for future additions without needing to change dozens of overridden constructors.
+- `&$returnedItems` reference parameter is now used in some places such as `Block->onInteract()` to enable actions to return items to players without caring about whether they are in creative or anything else.
+  - This eliminates boilerplate code of deciding whether to set the player's held item or not, as well as automatically dropping any overflow items that don't fit into the inventory.
+  - This is currently used when filling/emptying cauldrons using buckets or glass bottles.
+- Dependency between `RuntimeBlockStateRegistry` (previously `BlockFactory`) and `VanillaBlocks` has been inverted.
+  - Now, blocks types are defined in `VanillaBlocks`
+  - `RuntimeBlockStateRegistry` automatically registers states for blocks defined in `VanillaBlocks`.
+  - Manual registration in `RuntimeBlockStateRegistry` is still required for custom blocks (see section below about registering new blocks).
+- `RuntimeBlockStateRegistry` now has only one purpose - to map internal blockstate IDs to `Block` objects when reading blocks from chunks. It should not be used by plugins unless registering new blocks.
+  - To get a block at runtime, e.g. stone, use `VanillaBlocks::STONE()`
+  - To load a block from **old** config or database data:
+    1. Use `GlobalBlockStateHandlers::getUpgrader()->upgradeIntIdMeta()` to convert it to modern data
+    2. Pass the data to `GlobalBlockStateHandlers::getDeserializer()` to get a blockstate ID
+    3. Pass the blockstate ID to `RuntimeBlockStateRegistry::fromStateId()` to get a `Block` instance
+  - Prefer using `StringToItemParser` wherever possible for configs and databases (see `lookupAliases()` and `lookupBlockAliases()`).
+
+#### Registering new blocks
+##### In a plugin
+To add a vanilla block in a plugin which isn't yet supported by PocketMine-MP, do the following:
+
+1. Get a new type ID using `BlockTypeIds::newId()` - _you'll want to keep this in a property somewhere if you want to
+   compare using `getTypeId()` later_
+2. Set up the block type somewhere - _this can be anywhere you like, e.g. a plugin main class property, but using
+   a `RegistryTrait` class is recommended - you'll need this later to create new instances of the block_
+3. Register the block in `RuntimeBlockStateRegistry` - _this informs the server of all the block's possible states so
+   that it can be read from chunks at runtime_
+4. Register a deserializer for the block's Minecraft ID in `BlockStateToObjectDeserializer` - _needed for the block to
+   be recognized when loaded from disk_
+5. Register a serializer for the block in `BlockObjectToStateSerializer` - _needed for the block to be saved to disk,
+   and to be sent over the network_
+6. Optionally, register a string alias for the block in `StringToItemParser` - _so that it can be given via `/give`_
+
+To see a demo of how to do this in a plugin, see [this example plugin](https://github.com/pmmp/RegisterBlocksDemoPM5).
+
+Registering custom blocks follows a similar process, but requires additional steps to modify `BlockStateDictionary`
+which won't be covered here.
+Since this is not currently officially supported by PocketMine-MP, this won't be covered here.
+
+This is admittedly rather more of a hassle than in PM4, but this system offers significantly more flexibility than the
+old system.
+
+##### As a PocketMine-MP core contribution
+To register a new vanilla block into the core, the process is slightly different:
+
+1. Instead of using `BlockTypeIds::newId()`, add a new constant for the block to `BlockTypeIds`
+2. Register the new block in `VanillaBlocks` - `RuntimeBlockStateRegistry` will automagically take notice of all blocks
+   defined in `VanillaBlocks`
+3. Follow steps 4 onwards above
+
+#### Change list
+- The following classes have been removed:
+  - `BlockIdentifierFlattened`
+  - `BlockLegacyIdHelper`
+  - `BlockLegacyIds`
+  - `BlockLegacyMetadata`
+  - `utils\BlockDataSerializer`
+  - `utils\ColorInMetadataTrait` - `utils\ColoredTrait` now implements colour type data serialization uniformly
+  - `utils\InvalidBlockStateException` - this has been superseded by `pocketmine\data\runtime\InvalidSerializedRuntimeDataException`
+  - `utils\NormalHorizontalFacingInMetadataTrait` - `utils\HorizontalFacingTrait` now implements facing type data serialization uniformly
+  - `utils\PillarRotationInMetadataTrait` - `utils\PillarRotationTrait` now implements rotation type data serialization uniformly
+- The following classes have been renamed:
+  - `BlockFactory` -> `RuntimeBlockStateRegistry` - this class is now exclusively used for mapping state IDs to block instances for runtime chunk block reading
+  - `Skull` -> `MobHead`
+  - `utils\SkullType` -> `utils\MobHeadType`
+  - `utils\TreeType` -> `pocketmine\world\generator\object\TreeType`
+- The following classes have been added:
+  - `BaseCake`
+  - `BaseFire`
+  - `BlockTypeIds` - list of type IDs, one for each entry in `VanillaBlocks`
+  - `BlockTypeInfo`
+  - `BlockTypeTags`
+  - `CakeWithCandle`
+  - `CakeWithDyedCandle`
+  - `Candle`
+  - `CartographyTable`
+  - `Chain`
+  - `CopperOre`
+  - `CopperSlab`
+  - `CopperStairs`
+  - `Copper`
+  - `DyedCandle`
+  - `GildedBlackstone`
+  - `GoldOre`
+  - `HangingRoots`
+  - `IronOre`
+  - `Light`
+  - `LightningRod`
+  - `NetherGoldOre`
+  - `Sculk`
+  - `SmithingTable`
+  - `SoulFire`
+  - `WitherRose`
+  - `utils\CandleTrait`
+  - `utils\CopperOxidation`
+  - `utils\CopperTrait`
+  - `utils\SaplingType` - enum of all sapling types
+  - `utils\WallConnectionType` - enum of all possible wall connection types
+  - `utils\WoodTypeTrait`
+  - `utils\WoodType` - enum of all possible wood types, used for wood material blocks like planks and logs
+- The following API methods have been removed:
+  - `Block->getId()` - for type comparisons, use `Block->getTypeId()` instead
+  - `Block->getMeta()` - for state comparisons, use `Block->getStateId()` instead
+  - `Block->getStateBitmask()`
+  - `Block->readStateFromData()`
+  - `Block->writeStateToItemMeta()`
+  - `Block->writeStateToMeta()`
+  - `BlockFactory->get()` - see notes above about `RuntimeBlockStateRegistry`
+  - `BlockIdentifier->getAllBlockIds()`
+  - `BlockIdentifier->getBlockId()`
+  - `BlockIdentifier->getItemId()`
+  - `BlockIdentifier->getVariant()`
+  - `Door->isPowered()`
+  - `Door->setPowered()`
+  - `MobHead->isNoDrops()` (previously `Skull->isNoDrops()`)
+  - `MobHead->setNoDrops()` (previously `Skull->setNoDrops()`)
+  - `VanillaBlocks::*_GLAZED_TERRACOTTA()` - use `VanillaBlocks::GLAZED_TERRACOTTA()->setColor(DyeColor::WHATEVER())` instead
+  - `utils\FallableTrait->getId()` is no longer required
+  - `utils\FallableTrait->getMeta()` is no longer required
+  - `utils\MobHeadType->getMagicNumber()` (previously `utils\SkullType->getMagicNumber()`)
+  - `utils\MobHeadType::fromMagicNumber()` (previously `utils\SkullType::fromMagicNumber()`)
+- The following constants have been removed:
+  - `Block::INTERNAL_METADATA_BITS`
+  - `Block::INTERNAL_METADATA_MASK`
+- The following API methods have been renamed:
+  - `Block->getFullId()` -> `Block->getStateId()`
+  - `Block->isSameType()` -> `Block->hasSameTypeId()`
+  - `MobHead->getSkullType()` -> `MobHead->getMobHeadType()` (previously `Skull->getSkullType()`)
+  - `MobHead->setSkullType()` -> `MobHead->setMobHeadType()` (previously `Skull->setSkullType()`)
+- The following API methods have signature changes:
+  - `Block->onBreak()` now accepts `array<Item> &$returnedItems` reference parameter.
+  - `Block->onInteract()` now accepts `array<Item> &$returnedItems` reference parameter.
+  - `Block->readStateFromWorld()` now returns `Block` - this allows blocks to replace themselves with a different block entirely based on world conditions.
+  - `BlockIdentifier->__construct()` now accepts `int $blockTypeId`, and no longer accepts `int $blockId, int $variant, ?int $itemId`
+  - `ItemFrame->getFacing()` may now return `Facing::UP` and `Facing::DOWN`
+  - `ItemFrame->setFacing()` now accepts `Facing::UP` and `Facing::DOWN`
+  - `Leaves->__construct()` now accepts `LeavesType $leavesType` instead of `TreeType $treeType`
+  - `RuntimeBlockStateRegistry->register()` no longer accepts an `$override` parameter.
+  - `Sapling::__construct()` now accepts `SaplingType $saplingType` instead of `TreeType $treeType`
+  - `utils\SignText::__construct()` now accepts two new optional parameters: `?Color $baseColor` and `bool $glowing`
+  - `utils\SignText::fromBlob()` now accepts two new optional parameters: `?Color $baseColor` and `bool $glowing`
+- The following API methods have been added:
+  - `protected Block->describeBlockOnlyState(RuntimeDataDescriber $w) : void` - describes state properties which are discarded when the block is broken or block-picked, such as facing, powered, etc.
+  - `public Block->describeBlockItemState(RuntimeDataDescriber $w) : void` - describes state properties which are kept by the item when the block is broken or block-picked, such as dye color
+  - `public Block->generateStatePermutations() : \Generator<int, Block, void, void>` - yields all possible states this block type can be in (used for `RuntimeBlockStateRegistry`)
+  - `public Block->getTypeTags() : array<string>`
+  - `public Block->hasTypeTag(string $tag) : bool`
+  - `public Block->isFireProofAsItem() : bool`
+  - `public Block->onProjectileHit(Projectile $projectile, RayTraceResult $hitResult) : void`
+  - `public BlockIdentifier->getBlockTypeId() : int` - returns the block's type ID according to `BlockTypeIds`
+  - `public Furnace->getFurnaceType() : utils\FurnaceType`
+  - `public GlazedTerracotta->getColor() : utils\DyeColor` (from `ColoredTrait`) - this was previously unsupported due to legacy limitations
+  - `public GlazedTerracotta->setColor(utils\DyeColor $color) : $this` (from `ColoredTrait`) - this was previously unsupported due to legacy limitations
+  - `public Leaves->getLeavesType() : utils\LeavesType` - returns the type of leaves
+  - `public Wall->getConnection(int $face) : utils\WallConnectionType`
+  - `public Wall->getConnections() : array<int, utils\WallConnectionType>` - returns the wall's connections and their types (see `utils\WallConnectionType`)
+  - `public Wall->isPost() : bool`
+  - `public Wall->setConnection(int $face, ?utils\WallConnectionType $type) : $this`
+  - `public Wall->setConnections()` - sets the wall's connections and their types (see `utils\WallConnectionType`)
+  - `public Wall->setPost(bool $post) : $this`
+  - `public Wood->isStripped() : bool`
+  - `public Wood->setStripped(bool $stripped) : $this`
+  - `public static BlockBreakInfo::axe(float $hardness, ?ToolTier $toolTier = null, ?float $blastResistance = null) : BlockBreakInfo`
+  - `public static BlockBreakInfo::pickaxe(float $hardness, ?ToolTier $toolTier = null, ?float $blastResistance = null) : BlockBreakInfo`
+  - `public static BlockBreakInfo::shovel(float $hardness, ?ToolTier $toolTier = null, ?float $blastResistance = null) : BlockBreakInfo`
+  - `public static BlockBreakInfo::tier(float $hardness, int $toolType, ToolTier $toolTier, ?float $blastResistance = null) : BlockBreakInfo`
+  - `public tile\Spawnable->getRenderUpdateBugWorkaroundStateProperties(Block $block) : array<string, Tag>` - allows spawnable tiles to spoof block state properties to work around client-side rendering bugs without actually changing the block server-side
+  - `public utils\SignText->getBaseColor() : \pocketmine\color\Color`
+  - `public utils\SignText->isGlowing() : bool`
+- The following classes now use new traits, adding API methods and/or properties:
+  - `FenceGate` uses `utils\WoodTypeTrait`
+  - `GlazedTerracotta` uses `utils\ColoredTrait`
+  - `Planks` uses `utils\WoodTypeTrait`
+  - `Wood` uses `utils\WoodTypeTrait`
+  - `WoodenButton` uses `utils\WoodTypeTrait`
+  - `WoodenDoor` uses `utils\WoodTypeTrait`
+  - `WoodenFence` uses `utils\WoodTypeTrait`
+  - `WoodenPressurePlate` uses `utils\WoodTypeTrait`
+  - `WoodenSlab` uses `utils\WoodTypeTrait`
+  - `WoodenStairs` uses `utils\WoodTypeTrait`
+  - `WoodenTrapdoor` uses `utils\WoodTypeTrait`
+- The following API interface requirements have been added (BC breaking):
+  - `public utils\Fallable->getFallDamagePerBlock() : float` (default implementation provided by `utils\FallableTrait`)
+  - `public utils\Fallable->getLandSound() : ?Sound` (default implementation provided by `utils\FallableTrait`)
+  - `public utils\Fallable->getMaxFallDamage() : float` (default implementation provided by `utils\FallableTrait`)
+  - `public utils\Fallable->onHitGround(FallingBlock $blockEntity) : bool` (default implementation provided by `utils\FallableTrait`)
+
+### `pocketmine\command`
+- Command permissions are now always checked by the server when running a command.
+  - This only affects commands implemented by extending `Command`. Plugins using `PluginBase->onCommand()` are not affected by this change, since they already had permissions checked by the server anyway.
+  - Previously, direct inheritors of `Command` were responsible for checking permissions, which required developers to duplicate the same code in every command, and opened lots of potential for security vulnerabilities.
+  - If you want to do something on permission denied (e.g. sending a special message, or audit logging), you can do so by overriding `Command->testPermission()`, instead of baking the code directly into `Command->execute()`.
+  - If you don't want to use permissions at all, just create a permission with a default of `true` (or belonging to `pocketmine.group.user`) and assign that.
+- `SimpleCommandMap` now requires all commands to have a permission set when registered.
+  - If you actually want to allow everyone to use your command (not advised), you can add a new permission to the `pocketmine.group.user` group, or use `default: true` for `plugin.yml` permissions.
+- The following API methods have changed behaviour:
+  - `Command->testPermissionSilent()` now returns `false` if there are no permissions associated with the command. This is to prevent commands with no permissions being usable by everyone, which has previously been a source of security issues.
+- The following API methods have been added:
+  - `public Command->getPermissions() : list<string>` - returns a list of permissions which grant usage access to this command. A user with one or more of these permissions will be able to invoke the command's `execute()` method
+  - `public Command->setPermissions(list<string> $permissions) : void` - sets the permissions which grant usage access to this command. This should be used instead of `setPermission()` with `;` separators (which is now deprecated)
+
+### `pocketmine\crafting`
+- JSON models have been updated to reflect updated crafting data format.
+- The following enum classes have new members:
+  - `ShapelessRecipeType` has new members `CARTOGRAPHY` and `SMITHING`
+- The following classes have been added:
+  - `ExactRecipeIngredient` - matches an exact item
+  - `MetaWildcardRecipeIngredient` - matches an item with the given legacy Minecraft ID, but any metadata value
+  - `RecipeIngredient` interface
+  - `TagWildcardRecipeIngredient` - matches an item based on its Minecraft tags, e.g. `minecraft:wooden_tier`
+- The following API methods have signature changes:
+  - `FurnaceRecipe->__construct()` now accepts `RecipeIngredient` instead of `Item`
+  - `FurnaceRecipe->getInput()` now returns `RecipeIngredient` instead of `Item`
+  - `PotionContainerChangeRecipe->__construct()` now accepts `string, RecipeIngredient, string` (using Minecraft string IDs instead of legacy integers).
+  - `PotionContainerChangeRecipe->getIngredient()` now returns `RecipeIngredient` instead of `Item`.
+  - `PotionContainerChangeRecipe->getInputItemId()` now returns `string` (using Minecraft string IDs instead of legacy integers).
+  - `PotionContainerChangeRecipe->getOutputItemId()` now returns `string` (using Minecraft string IDs instead of legacy integers).
+  - `PotionTypeRecipe->__construct()` now accepts `RecipeIngredient` instead of `Item`
+  - `PotionTypeRecipe->getIngredient()` now returns `RecipeIngredient` instead of `Item`
+  - `PotionTypeRecipe->getInput()` now returns `RecipeIngredient` instead of `Item`
+  - `ShapedRecipe->__construct()` now accepts `RecipeIngredient` instead of `Item`
+  - `ShapedRecipe->getIngredient()` now returns `?RecipeIngredient` instead of `?Item`
+  - `ShapedRecipe->getIngredientList()` now returns `RecipeIngredient[]` instead of `Item[]`
+  - `ShapedRecipe->getIngredientMap()` now returns `RecipeIngredient[][]` instead of `Item[][]`
+  - `ShapelessRecipe->__construct()` `$type` parameter is now mandatory.
+  - `ShapelessRecipe->__construct()` now accepts `RecipeIngredient` instead of `Item`
+  - `ShapelessRecipe->getIngredientList()` now returns `RecipeIngredient[]` instead of `Item[]`
+
+### `pocketmine\data`
+- New packages `bedrock\block` and `bedrock\item` have been added. These packages contain all the necessary code for loading and saving Bedrock blocks and items from disk.
+- New package `runtime` has been added. This package contains code for serializing runtime data for blocks and items.
+- `LegacyToStringBidirectionalIdMap` has been reduced to `LegacyToStringIdMap`.
+  - Since we never map from string ID to legacy ID, bidirectional mapping is no longer necessary.
+  - This affects the following subclasses:
+    - `LegacyBiomeIdToStringIdMap`
+    - `LegacyBlockIdToStringIdMap`
+    - `LegacyEntityIdToStringIdMap`
+    - `LegacyItemIdToStringIdMap`
+- The following internal API methods have been added:
+  - `public LegacyToStringIdMap->add(string $string, int $legacy) : void` - adds a mapping from a custom legacy ID to custom string ID, needed for upgrading old saved data
+
+### `pocketmine\entity`
+- `Entity` now declares new abstract methods which must be implemented by subclasses:
+  - `public Entity->getInitialDragMultiplier() : float`
+  - `public Entity->getInitialGravity() : float`
+- The following new API methods have been added:
+  - `public Living->getDisplayName() : string`
+- The following API methods have changed signatures:
+  - `EntityFactory->register()` no longer accepts a `$legacyMcpeSaveId` parameter (now handled by internal conversions instead).
+- The following API methods have been renamed:
+  - `Entity->isImmobile()` -> `Entity->hasNoClientPredictions()`
+  - `Entity->setImmobile()` -> `Entity->setNoClientPredictions()`
+- The following internal fields have been renamed:
+  - `Entity->immobile` -> `Entity->noClientPredictions`
+- The following classes have been removed:
+  - `EntityLegacyIds`
+
+### `pocketmine\event`
+- The following classes have inheritance changes:
+  - `block\BlockPlaceEvent` no longer extends `BlockEvent`, and therefore no longer has `getBlock()`. Use `getTransaction()` instead (may contain multiple blocks).
+- `BlockFormEvent` now includes information about the block which caused the event.
+
+- The following new classes have been added:
+  - `world\WorldDisplayNameChangeEvent` - called when a world's display name is changed
+- The following classes have been renamed:
+  - `entity\ExplosionPrimeEvent` -> `entity\EntityPreExplodeEvent`
+- The following API methods have been added:
+  - `public block\BlockFormEvent->getCausingBlock() : Block`
+  - `public block\BlockGrowEvent->getPlayer() : ?Player` - returns the player that triggered the block growth, or `null` if it was not triggered by a player
+  - `public block\BlockPlaceEvent->getTransaction() : BlockTransaction` - returns the transaction containing a list of changed block positions and the blockstates they will be changed to
+  - `public server\DataPacketSendEvent->setPackets(list<ClientboundPacket> $packets) : void`
+- The following API methods have changed signatures:
+  - `block\BlockPlaceEvent->__construct()` now accepts `BlockTransaction $transaction` instead of `Block $blockPlace, Block $blockReplace`
+  - `entity\EntityPreExplodeEvent->__construct()` has the `$force` parameter renamed to `$radius`
+  - `entity\EntityPreExplodeEvent->getForce() : float` -> `entity\EntityPreExplodeEvent->getRadius() : float`
+  - `entity\EntityPreExplodeEvent->setForce(float $force) : void` -> `entity\EntityPreExplodeEvent->setRadius(float $radius) : void`
+- The following API methods have been removed:
+  - `block\BlockPlaceEvent->getBlockReplaced()` - this information is now provided in the `BlockTransaction` object returned by `BlockPlaceEvent->getTransaction()`
+- The following new API constants have been added:
+  - `entity\EntityDamageEvent::CAUSE_FALLING_BLOCK`
+  - `entity\EntityDamageEvent::MODIFIER_ARMOR_HELMET`
+
+### `pocketmine\event\player`
+- `PlayerPreLoginEvent`, `PlayerDuplicateLoginEvent` and `PlayerKickEvent` now supports setting separate log reasons (disconnect reason) and disconnect screen messages.
+- The following classes have been removed:
+  - `PlayerCommandPreprocessEvent`
+- The following API methods have changed signatures:
+  - `PlayerDuplicateLoginEvent->getDisconnectMessage()` now returns `Translatable|string` instead of `string`
+  - `PlayerDuplicateLoginEvent->setDisconnectMessage()` now accepts `Translatable|string` instead of `string`
+  - `PlayerKickEvent->getReason()` now returns `Translatable|string` instead of `string`
+  - `PlayerKickEvent->setReason()` now accepts `Translatable|string` instead of `string`
+  - `PlayerLoginEvent->getKickMessage()` now returns `Translatable|string` instead of `string`
+  - `PlayerLoginEvent->setKickMessage()` now accepts `Translatable|string` instead of `string`
+  - `PlayerPreLoginEvent->getFinalKickMessage()` now returns `Translatable|string` instead of `string`
+  - `PlayerPreLoginEvent->getKickMessage()` now returns `Translatable|string|null` instead of `string|null`
+  - `PlayerPreLoginEvent->setKickFlag()` (previously `setKickReason()`) now accepts `Translatable|string $disconnectReason, Translatable|string|null $disconnectScreenMessage = null` instead of `Translatable|string $message`
+  - `PlayerPreLoginEvent->setKickReason()` now accepts `Translatable|string` for the `$message` parameter instead of `string`
+  - `PlayerQuitEvent->getQuitReason()` now returns `Translatable|string` instead of `string`
+- The following API methods have been removed:
+  - `PlayerChatEvent->getFormat()` (use `PlayerChatEvent->getChatFormatter()` instead)
+  - `PlayerChatEvent->setFormat()` (use `PlayerChatEvent->setChatFormatter()` instead)
+  - `PlayerDuplicateLoginEvent->getDisconnectMessage()` - replaced by `getDisconnectReason()` and `getDisconnectScreenMessage()`
+  - `PlayerDuplicateLoginEvent->setDisconnectMessage()` - replaced by `setDisconnectReason()` and `setDisconnectScreenMessage()`
+  - `PlayerKickEvent->getReason()` - replaced by `getDisconnectReason()` and `getDisconnectScreenMessage()`
+  - `PlayerKickEvent->setReason()` - replaced by `setDisconnectReason()` and `setDisconnectScreenMessage()`
+- The following new API methods have been added:
+  - `public PlayerChatEvent->getChatFormatter() : \pocketmine\player\chat\ChatFormatter` - returns the chat formatter to be used for this event
+  - `public PlayerChatEvent->setChatFormatter(\pocketmine\player\chat\ChatFormatter $formatter) : void` - sets the chat formatter to be used for this event
+  - `public PlayerDeathEvent->getDeathScreenMessage() : Translatable|string` - returns the message to be displayed on the death screen
+  - `public PlayerDeathEvent->setDeathScreenMessage(Translatable|string $deathScreenMessage) : void` - sets the message to be displayed on the death screen
+  - `public PlayerDuplicateLoginEvent->getDisconnectReason() : Translatable|string` - returns the reason for the disconnection displayed in the console and server log
+  - `public PlayerDuplicateLoginEvent->getDisconnectScreenMessage() : Translatable|string|null` - returns the message to be displayed on the disconnect screen (the message in `getDisconnectReason()` is used if null is returned)
+  - `public PlayerDuplicateLoginEvent->setDisconnectReason(Translatable|string $disconnectReason) : void` - sets the reason for the disconnection displayed in the console and server log
+  - `public PlayerDuplicateLoginEvent->setDisconnectScreenMessage(Translatable|string|null $disconnectScreenMessage) : void` - sets the message to be displayed on the disconnect screen (the message in `setDisconnectReason()` is used if null is passed)
+  - `public PlayerKickEvent->getDisconnectReason() : Translatable|string` - returns the reason for the disconnection displayed in the console and server log
+  - `public PlayerKickEvent->getDisconnectScreenMessage() : Translatable|string|null` - returns the message to be displayed on the disconnect screen (the message in `getDisconnectReason()` is used if null is returned)
+  - `public PlayerKickEvent->setDisconnectReason(Translatable|string $disconnectReason) : void` - sets the reason for the disconnection displayed in the console and server log
+  - `public PlayerKickEvent->setDisconnectScreenMessage(Translatable|string|null $disconnectScreenMessage) : void` - sets the message to be displayed on the disconnect screen (the message in `setDisconnectReason()` is used if null is passed)
+  - `public PlayerPreLoginEvent->getDisconnectScreenMessage(int $flag) : Translatable|string|null` - returns the message to be displayed on the disconnect screen for the specified kick flag, if set
+  - `public PlayerPreLoginEvent->getFinalDisconnectScreenMessage() : Translatable|string|null` - returns the message to be displayed on the disconnect screen, taking into account the kick flags set
+- The following classes have inheritance changes:
+  - `PlayerPreLoginEvent` no longer implements `Cancellable`. This caused unexpected behaviour for most plugin devs due to default-ignoring cancelled events, forcing people to usually have to use `@handleCancelled` to handle the event when they wanted to use it.
+- The following API constants have been renamed:
+  - `PlayerPreLoginEvent::KICK_REASON_BANNED` -> `PlayerPreLoginEvent::KICK_FLAG_BANNED`
+  - `PlayerPreLoginEvent::KICK_REASON_PLUGIN` -> `PlayerPreLoginEvent::KICK_FLAG_PLUGIN`
+  - `PlayerPreLoginEvent::KICK_REASON_PRIORITY` -> `PlayerPreLoginEvent::KICK_FLAG_PRIORITY`
+  - `PlayerPreLoginEvent::KICK_REASON_SERVER_FULL` -> `PlayerPreLoginEvent::KICK_FLAG_SERVER_FULL`
+  - `PlayerPreLoginEvent::KICK_REASON_SERVER_WHITELISTED` -> `PlayerPreLoginEvent::KICK_FLAG_SERVER_WHITELISTED`
+- The following API methods have been renamed:
+  - `PlayerPreLoginEvent->clearAllKickReasons()` -> `PlayerPreLoginEvent->clearAllKickFlags()`
+  - `PlayerPreLoginEvent->clearKickReason()` -> `PlayerPreLoginEvent->clearKickFlag()`
+  - `PlayerPreLoginEvent->getFinalKickMessage()` -> `PlayerPreLoginEvent->getFinalDisconnectReason()` (now used for logs only, if a disconnect screen message is set for the highest priority flag)
+  - `PlayerPreLoginEvent->getKickMessage()` -> `PlayerPreLoginEvent->getDisconnectReason()` (now used for logs only, if a disconnect screen message is set for the flag)
+  - `PlayerPreLoginEvent->getKickReasons()` -> `PlayerPreLoginEvent->getKickFlags()`
+  - `PlayerPreLoginEvent->isKickReasonSet()` -> `PlayerPreLoginEvent->isKickFlagSet()`
+  - `PlayerPreLoginEvent->setKickReason()` -> `PlayerPreLoginEvent->setKickFlag()`
+
+### `pocketmine\item`
+#### Highlights
+- `ItemFactory` has been removed. Vanilla item registration is now done via `VanillaItems`.
+  - To get an item at runtime, e.g. iron ingot, use `VanillaItems::IRON_INGOT()`
+  - To get a block as an item, e.g. stone, use `VanillaBlocks::STONE()->asItem()`
+  - To load an item from legacy ID and meta:
+    1. Use `GlobalItemDataHandlers::getUpgrader()->upgradeItemTypeDataInt()` to convert the legacy ID and meta to `SavedItemStackData`
+    2. Pass the itemstack data to `GlobalItemDataHandlers::getDeserializer()` to get an `Item` instance
+- Items no longer use internal Minecraft string IDs and metadata to identify themselves. All APIs associated with legacy
+  IDs and/or meta have been removed.
+- A new set of runtime item IDs generated from `VanillaItems` is now used to identify item types. These IDs are defined
+  in `ItemTypeIds`.
+  - These new IDs are primarily intended for type comparison purposes.
+  - Item type IDs are used at **runtime only**. They should **NOT** be stored in configs or databases, as they are not
+    guaranteed to remain the same between versions.
+- In some cases, items may have additional "type data" which provides extra type information about an item. This
+  replaces item metadata in some cases.
+  - Type data may be used to store dynamic type information such as dye colour, potion type, etc.
+  - Items must have the same type ID **and** type data in order to be stackable.
+- Blocks, when represented as items:
+  - retain their block type data, but not state data (for example, different colours of concrete don't stack, but things
+    like facing don't affect stackability)
+  - use the negative of their block type ID (e.g. a block with type ID `1` will have an item type ID of `-1`).
+- Durable items (e.g. tools, armour) now use NBT `Damage` tag to store durability (like Minecraft 1.13+), instead of
+  legacy meta values.
+- `&$returnedItems` reference parameter is now used in some places (e.g. `onInteractBlock()`) to enable actions to return items to players without caring about whether they are in creative or anything else.
+  - This eliminates boilerplate code of deciding whether to set the player's held item or not, as well as automatically dropping any overflow items that don't fit into the inventory.
+  - This is used for things like filling/emptying buckets and bottles, and equipping armor.
+- Blocks which previously had separate items, such as mob heads and beds, no longer do. Their item form can be acquired using `Block->asItem()` in the same way as every other block. This is facilitated by the new serializer system.
+
+#### Implementing new items
+##### In a plugin
+This follows a similar process to registering blocks.
+
+1. Get a new type ID using `ItemTypeIds::newId()` - _you'll want to keep this in a property somewhere if you want to
+   compare using `getTypeId()` later_
+2. Set up the item type somewhere - _this can be anywhere you like, e.g. a plugin main class property, but using
+   a `RegistryTrait` class is recommended - you'll need this later to create new instances of the item_
+3. Register a deserializer in `ItemDeserializer` - _needed for the item to be recognized when loaded from disk_
+4. Register a serializer in `ItemSerializer` - _needed for the item to be saved to disk, and to be sent over the
+   network_
+5. Optionally, register a string alias for the item in `StringToItemParser` - _so that it can be given via `/give`_
+
+To see a demo of how to do this in a plugin, see [this example plugin](https://github.com/pmmp/RegisterBlocksDemoPM5).
+
+Again, it's acknowledged this is rather more cumbersome than it should be, but this is an ongoing process.
+
+##### As a PocketMine-MP core contribution
+
+To register a new vanilla item into the core, the process is slightly different:
+
+1. Instead of using `ItemTypeIds::newId()`, add a new constant for the block to `ItemTypeIds`
+2. Register the new item in `VanillaItems`
+3. Follow steps 3 onwards from the plugin instructions above
+
+#### Change list
+- `Item` is no longer `json_encode()`-able.
+  - The original purpose of this was to allow items to be serialized to JSON for crafting data generated from `CraftingDataPacket`. Due to changes in the generation methodology, bypassing `Item`s entirely, this is no longer necessary.
+  - In addition, `jsonSerialize()` required the item to know about the method by which it will be serialized (since there is no way to inject context), creating a cyclic dependency between the `Item` implementation and its serialization method.
+  - It's relatively easy to write a replacement method to encode items to JSON as you desire.
+  - `Item::legacyJsonDeserialize()` (previously `Item::jsonDeserialize()`) is retained to allow loading legacy data, although it may be removed in the future.
+- The following classes have been removed:
+  - `Bed`
+  - `ItemFactory`
+  - `ItemIds`
+  - `Skull`
+- The following classes have been added:
+  - `BoatType` - enum of all boat types
+  - `CoralFan`
+  - `HoneyBottle`
+  - `MedicineType`
+  - `Medicine`
+  - `Spyglass`
+  - `SuspiciousStewType`
+  - `SuspiciousStew`
+- The following API methods have been added:
+  - `protected Item->describeState(RuntimeDataDescriber $w) : void` 
+  - `public Armor->clearCustomColor() : $this` - clears the custom color of an armor item
+  - `public ArmorTypeInfo->getToughness() : int`
+  - `public ArmorTypeInfo->isFireProof() : bool`
+  - `public Boat->getType() : BoatType`
+  - `public Dye->setColor(\pocketmine\block\utils\DyeColor $color) : $this`
+  - `public Item->getStateId() : int` - returns a runtime numeric state ID for comparisons including information such as coral type, dye color, etc. - DO NOT save this to disk or databases
+  - `public Item->getTypeId() : int` - returns a runtime numeric type ID for comparisons - DO NOT save this to disk or databases
+  - `public Item->isFireProof() : bool`
+  - `public ItemIdentifer->getTypeId() : int`
+  - `public Potion->setType(PotionType $type) : $this`
+  - `public SplashPotion->setType(PotionType $type) : $this`
+  - `public StringToItemParser->lookupAliases(Item $item) : list<string>` - returns a list of all registered aliases for the given item
+  - `public StringToItemParser->lookupBlockAliases(Block $block) : list<string>` - returns a list of all registered aliases for the given block
+  - `public static ItemIdentifier::fromBlock(Block $block) : self`
+- The following API methods have been removed:
+  - `Boat->getWoodType()`
+  - `Item->getId()` - for type comparisons, use `Item->getTypeId()` instead
+  - `Item->getMeta()` - use the item's specific API methods to compare information such as colour, potion type etc.
+  - `Item->hasAnyDamageValue()` - for meta wildcard recipe ingredients, use `pocketmine\crafting\MetaWildcardRecipeIngredient` instead
+  - `ItemIdentifier->getId()`
+  - `ItemIdentifier->getMeta()`
+- The following API methods have been renamed:
+  - `Item::jsonDeserialize()` -> `Item::legacyJsonDeserialize()`
+- The following API methods have signature changes:
+  - `ArmorTypeInfo->__construct()` now accepts optional parameters `int $toughness` and `bool $fireProof`
+  - `BoatType::__construct()` now accepts `BoatType $boatType` instead of `TreeType $woodType`.
+  - `Item->onAttackEntity()` now accepts `array<Item> &$returnedItems` reference parameter.
+  - `Item->onClickAir()` now accepts `array<Item> &$returnedItems` reference parameter.
+  - `Item->onDestroyBlock()` now accepts `array<Item> &$returnedItems` reference parameter.
+  - `Item->onInteractBlock()` now accepts `array<Item> &$returnedItems` reference parameter.
+  - `Item->onReleaseUsing()` now accepts `array<Item> &$returnedItems` reference parameter.
+  - `ItemIdentifier->__construct()` no longer accepts a `$variant` parameter, and now expects an item type ID for the ID parameter
+  - `LegacyStringToItemParser->addMapping()` now accepts a string for ID, instead of an integer
+- The following API methods have behaviour changes:
+  - `Item->equals()`'s `$checkDamage` parameter is now ignored, as tool damage is now stored as an NBT tag. This parameter wasn't removed due to being followed by a second `bool` parameter, which would potentially end up in the wrong place and silently cause bugs in updated plugins.
+  - `Item->equals()`'s `$checkTags` parameter will now cause tool and armor damage to be checked if true.
+- The following enums have new members:
+  - `ToolTier` has new member `NETHERITE`
+
+### `pocketmine\network`
+- The following API methods have changed signatures:
+  - `NetworkSessionManager->close()` now accepts an additional `Translatable|string|null $disconnectScreenMessage` parameter.
+- The following API methods have changed signatures:
+  - `query\QueryInfo->getPlayerList()` now returns `list<string>` instead of `list<Player>`
+  - `query\QueryInfo->setPlayerList()` now accepts `list<string>` instead of `list<Player>`
+
+### `pocketmine\player`
+- The following API methods have changed signatures:
+  - `Player->disconnect()` now accepts `Translatable|string` for `$reason` instead of `string` (to allow localized disconnect messages)
+  - `Player->disconnect()` now accepts an additional `Translatable|string|null $disconnectScreenMessage` parameter, which is the message to be displayed on the disconnect screen (the message in `$reason` is used if null is passed)
+  - `Player->kick()` now accepts `Translatable|string` for `$reason` instead of `string` (to allow localized kick messages)
+  - `Player->kick()` now accepts an additional `Translatable|string|null $disconnectScreenMessage` parameter, which is the message to be displayed on the disconnect screen (the message in `$reason` is used if null is passed)
+  - `Player->sendJukeboxPopup()` now accepts `Translatable|string` instead of `string, string[]`
+- The following classes have been removed:
+  - `PlayerChunkLoader` - deprecated in 4.19.0 (this was technically internal, but never marked as such)
+
+### `pocketmine\player\chat`
+- The following new classes have been added:
+  - `ChatFormatter` - interface implemented by chat formatters - this is far more powerful than the old API
+  - `LegacyRawChatFormatter` - implements the same behaviour previously used by `PlayerChatEvent->setFormat()`
+  - `StandardChatFormatter` - formats chat messages in the vanilla Minecraft style
+
+### `pocketmine\scheduler`
+- `AsyncTask->setResult()` now works with thread-safe objects. This was previously not possible due to limitations in the `pthreads` extension.
+
+### `pocketmine\world`
+- The following API methods have been added:
+  - `public World->setDisplayName(string $name) : void`
+- The following API methods have changed signatures:
+  - `Explosion->__construct()` has the `$size` parameter renamed to `$radius`
+- The following public properties have been renamed:
+  - `Explosion->size` -> `Explosion->radius`
+
+### `pocketmine\world\format`
+- Chunks are now considered dirty (modified) by default, unless loaded from a `WorldProvider` by `World`. Previously, chunks were considered unmodified by default, which allowed several pathways to bugs.
+- The following classes have been added:
+  - `io\GlobalBlockStateHandlers` - gives access to block data serializer, deserializer, and upgraders
+  - `io\GlobalItemDataHandlers` - gives access to item data serializer, deserializer, and upgraders
+  - `io\LoadedChunkData` - represents a chunk loaded from disk, along with information such as whether the chunk was upgraded and what fixes it requires
+- The following new API methods have been added:
+  - `public SubChunk->getBiomeArray() : PalettedBlockArray`
+- The following classes have been removed:
+  - `BiomeArray` - `PalettedBlockArray` is now used for 3D biome data
+- The following API methods have changed signatures:
+  - `Chunk->getBiomeId()` now accepts `int $x, int $y, int $z` instead of `int $x, int $z`
+  - `Chunk->setBiomeId()` now accepts `int $x, int $y, int $z` instead of `int $x, int $z`
+  - `Chunk->__construct()` no longer accepts `BiomeArray` as a parameter (contained in each subchunk instead)
+  - `SubChunk->__construct()` now accepts `int $emptyBlockId, list<PalettedBlockArray> $blockLayers, PalettedBlockArray $biomes, ?LightArray $blockLight, ?LightArray $skyLight` instead of `int, list<PalettedBlockArray>, ?LightArray, ?LightArray`
+  - `io\WorldProvider->loadChunk()` now returns `LoadedChunkData` instead of `ChunkData`
+  - `io\WorldProvider->getAllChunks()` now yields `LoadedChunkData` instead of `ChunkData`
+  - `io\ChunkData->__construct()` now accepts `array<int, SubChunk>, bool $populated` instead of `Chunk $chunk`
+- The following API methods have been renamed:
+  - `Chunk->getFullBlock()` -> `Chunk->getBlockStateId()`
+  - `Chunk->setFullBlock()` -> `Chunk->setBlockStateId()`
+  - `SubChunk->getFullBlock()` -> `SubChunk->getBlockStateId()`
+  - `SubChunk->setFullBlock()` -> `SubChunk->setBlockStateId()`
+- The following API interface requirements have been added:
+  - `public io\data\WorldData->setDisplayName(string $value) : void`
+
+### `pocketmine\world\generator\object`
+- The following API methods have been removed:
+  - `TreeType::fromMagicNumber()`
+  - `TreeType->getMagicNumber()`
+
+### `pocketmine\world\sound`
+- The following classes have been added:
+  - `CopperWaxApplySound`
+  - `CopperWaxRemoveSound`
+  - `DyeUseSound`
+  - `InkSacUseSound`
+- The following enums have new members:
+  - `NoteInstrument` has new members `BELL`, `FLUTE`, `CHIME`, `XYLOPHONE`, `IRON_XYLOPHONE`, `COW_BELL`, `DIDGERIDOO`, `BIT`, `BANJO`, `PLING`
+- The following API methods have been removed:
+  - `NoteInstrument::fromMagicNumber()`
+  - `NoteInstrument->getMagicNumber()`
+
+## Internals
+- All external usages of `KnownTranslationKeys` are now removed. All localized messages are now sent using `Translatable` objects (usually from `KnownTranslationFactory`).
+- All usages of NBT keys now use class constants instead of hardcoded strings (except for an occasional overlooked one).
+- Built-in commands now declare their names inside the class constructor, rather than accepting them as parameters. This improves code consistency.
+- Commands now use an array for permissions internally, instead of a string separated by `;`.
+- Make use of `Item->canStackWith()` instead of `Item->equals()` wherever possible, to make the code more readable.
+- Moved command timings to `Timings`.
+- Overriding of serializers and deserializers of items and blocks is now consistently disallowed. Since overriding stuff is non-cooperative, it doesn't make any sense in plugins, which must coexist with other plugins. If you want to modify the functionality of built-in stuff, you have several alternative options:
+    - Use existing API (e.g. events, API methods) - most uses of overrides in PM4 and earlier were abuses that could have been done with events
+    - Submit feature proposals or pull requests for new API to be added (e.g. new events)
+    - Register completely custom items, and reuse behaviour from the item you want to mimic
+    - Fork PocketMine-MP and alter the code directly - this way your plugins aren't pretending to be cooperative with other plugins
+- `level.dat`, block, item, entity, tile and chunk data are now tagged with a version ID as per `VersionInfo::WORLD_DATA_VERSION`. This allows the server to apply fixes to older worlds if necessary.
+- Protocol creative inventory entries are now cached in `CreativeInventoryCache` to improve performance of initial join and game mode changes.
+- Singletons in the `pocketmine\network\mcpe\convert` package have been centralized under `TypeConverter`. In the future, this will be injected where needed, allowing different converters to be used for different sessions (useful for multiversion).
+- `BlockStateDictionary` memory usage is now reduced from 9 MB to 3.5 MB using various techniques, including string reuse and binary-encoded states.
+- `NetworkSession` disconnect APIs now accept `Translatable|string` instead of `string` to allow localized disconnect messages.
+- `NetworkSession` disconnect methods have been altered to allow specifying a different disconnect reason and disconnection screen message.
+- `RuntimeBlockMapping` has been renamed to `BlockTranslator`.
+
+# 5.0.1
+Released 3rd June 2023.
+
+## Changes
+- [`ext-pmmpthread` version 6.0.1](https://github.com/pmmp/ext-pmmpthread/releases/tag/6.0.1) is now required (for bug fixes).
+
+## Fixes
+- Fixed server crash when breaking blocks placed in the same session (mishandled default block states).
+- Fixed spore blossoms not dropping when broken.
+- Fixed jukebox music not stopping when destroyed by an explosion.
+
+## Documentation
+- Added documentation for `BlockSpreadEvent->__construct()` parameters.
diff --git a/changelogs/5.1.md b/changelogs/5.1.md
new file mode 100644
index 0000000000..9ef8e7b9b8
--- /dev/null
+++ b/changelogs/5.1.md
@@ -0,0 +1,52 @@
+# 5.1.0
+Released 7th June 2023.
+
+**For Minecraft: Bedrock Edition 1.20.0**
+
+This is a support release for Minecraft: Bedrock Edition 1.20.0.
+
+**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` 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.20.0.
+- Removed support for older versions.
+
+# 5.1.1
+Released 7th June 2023.
+
+## Fixes
+- Fixed blockstates being saved with the wrong version ID for 1.20.0.
+
+# 5.1.2
+Released 9th June 2023.
+
+**This release includes changes from the following releases:**
+- [4.22.1](https://github.com/pmmp/PocketMine-MP/blob/4.22.1/changelogs/4.22.md#4221) - Teleportation client bug workarounds
+
+This release contains no other changes.
+
+# 5.1.3
+Released 1st July 2023.
+
+**This release includes changes from the following releases:**
+- [4.22.2](https://github.com/pmmp/PocketMine-MP/blob/4.22.2/changelogs/4.22.md#4222) - Authentication time bomb fix
+
+## General
+- Updated logos to new RGB-style logo. Thanks to @MrCakeSlayer and @HBIDamian for their efforts.
+- Improved error messages generated by the world system when some version tags are missing from `level.dat` in Bedrock worlds.
+- Outsourced Composer dependencies now only receive patch updates automatically (pinned using the `~` constraint).
+  - Minor and major updates now require manually updating `composer.json`, to ensure that the plugin API is not broken by libraries getting randomly updated from one patch release to the next.
+
+## Documentation
+- Updated doc comment for `Player->setGamemode()` to remove outdated information.
+- Added documentation for the `$clickVector` parameter of `Block->onInteract()` to specify that it is relative to the block's position.
+- Added missing `@required` tag for `BlockStateUpgradeSchemaModelBlockRemap->newState`.
+
+## Fixes
+- Fixed blue candles not appearing in the creative inventory.
+- Fixed server crash when block-picking candle cakes.
+- `World->useItemOn()` now ensures that the `$clickVector` components are always in the range of 0-1. Previously, any invalid values were accepted, potentially leading to a crash.
diff --git a/changelogs/5.10.md b/changelogs/5.10.md
new file mode 100644
index 0000000000..551bc40ede
--- /dev/null
+++ b/changelogs/5.10.md
@@ -0,0 +1,46 @@
+# 5.10.0
+Released 14th December 2023.
+
+**For Minecraft: Bedrock Edition 1.20.50**
+
+This is a minor feature release, including new gameplay features and minor performance improvements.
+
+**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
+- PHP 8.2 is now used by default. PHP 8.1 is still supported, but will be removed in a future 5.x release.
+- Improved timings reports by removing `Breakdown` timings group. This group serves no purpose with tree timings and made for confusing reading.
+
+## Performance
+- Improved performance of `Block::encodeFullState()` in most conditions. This in turn improves performance of `World::setBlock()` and `World::setBlockAt()`.
+- Improved network compression performance by avoiding unnecessary object allocations.
+- Timings now report time spent in individual `Snooze` handlers, making it easier to debug performance issues.
+
+## Gameplay
+### Blocks
+- Implemented crop growth speed modifiers.
+  - The following things now positively affect crop growth speed:
+    - Being planted on or being adjacent to farmland (hydrated farmland offers a larger benefit than dry farmland)
+    - Potential light level of at least 9
+    - Being planted in rows with space between them (or a different type of crop)
+  - The following things now negatively affect crop growth speed:
+    - Improper arrangement (e.g. the same crop on all sides)
+    - Insufficient light level (below 9)
+  - Poorly arranged crops will grow slower in this version. Past versions behaved as if crops were always planted in ideal conditions.
+  - Crops planted in ideal conditions will grow at the same speed as before.
+
+### Items
+- Added the following new items:
+  - All types of Smithing Template
+- Pitcher Pod is now correctly registered. In previous versions, it was mapped to the Pitcher Crop block, causing incorrect name display in commands.
+
+## Internals
+- Cleaned up various getter usages where direct property access is possible.
+- Avoided unnecessary repeated getter calls in some loops.
+- `NetworkSession` may now track `string` instead of `CompressBatchPromise` when a batch was synchronously compressed. This significantly reduces object allocations and improves performance.
+- `NetworkSession` now sends less information to clients on login validation failure. This avoids leaking potentially sensitive error information to clients.
+  - Clients can correlate their disconnects with server-side logs using the `Error ID` shown on the disconnect screen.
diff --git a/changelogs/5.11.md b/changelogs/5.11.md
new file mode 100644
index 0000000000..e993dceec1
--- /dev/null
+++ b/changelogs/5.11.md
@@ -0,0 +1,45 @@
+# 5.11.0
+Released 7th February 2024.
+
+**For Minecraft: Bedrock Edition 1.20.60**
+
+This is a support release for Minecraft: Bedrock Edition 1.20.60.
+
+**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.20.60.
+- Removed support for earlier versions.
+
+## Fixes
+- Fixed `tools/generate-item-upgrade-schema.php` not correctly handling items whose IDs were changed multiple times.
+- Fixed `ServerKiller` not working correctly in some cases (incorrectly handled wake-up conditions).
+- `ItemBlock`s of `Air` blocks are now always considered as "null" items regardless of count, and don't occupy inventory slots.
+
+## Internals
+- Restructured GitHub Actions CI workflows to make them easier to maintain (no need to update PHP versions in multiple places anymore).
+- GitHub Actions CodeStyle workflow now uses php-cs-fixer 3.49.x.
+- Dependabot updates are now processed weekly instead of daily.
+
+# 5.11.1
+Released 23rd February 2024.
+
+## Fixes
+- Fixed subchunk count calculation in `ChunkSerializer` for non-overworld dimension (useful for dimension plugins).
+- Harden options used for processing JSON data, particularly on the network, to close security issues.
+
+## Documentation
+- Fixed PHPStan signature for `Utils::cloneObjectArray()`.
+
+## Internals
+- Updated GitHub Actions versions to get rid of deprecation warnings.
+
+# 5.11.2
+Released 26th February 2024.
+
+## Fixes
+- Added extra checks for `BookEditPacket` handling.
diff --git a/changelogs/5.12.md b/changelogs/5.12.md
new file mode 100644
index 0000000000..a23f83e56d
--- /dev/null
+++ b/changelogs/5.12.md
@@ -0,0 +1,63 @@
+# 5.12.0
+Released 28th February 2024
+
+**For Minecraft: Bedrock Edition 1.20.60**
+
+This is a minor feature release, with a few new features and improvements.
+
+**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 a `--version` command-line option to display the server version and exit.
+
+## Tools
+- Added `tools/generate-biome-ids.php` to generate `pocketmine\data\bedrock\BiomeIds`.
+- Fixed ordering of property values generated by `tools/generate-block-palette-spec.php`.
+
+## API
+### `pocketmine\block`
+- The following new classes have been added:
+  - `utils\LightableTrait` - used by blocks with `getLit()` and `setLit()` methods
+- The following methods have been deprecated:
+  - `Block->isSolid()` - this method returns confusing results which don't match expectations and no one really knows what it actually means
+- `CocoaBlock` now extends `Flowable` to match vanilla Minecraft behaviour.
+
+### `pocketmine\plugin`
+- `PluginManager->registerEvent()` now throws an exception when given a generator function for the event handler.
+- `PluginManager->registerEvents()` now throws an exception if any of the detected event handlers are generator functions. Use `@notHandler` to have the function ignored if intended.
+
+### `pocketmine\promise`
+- The following methods have been added:
+  - `public static Promise::all(list<Promise> $promises) : Promise` - returns a promise that is resolved once all given promises are resolved, or is rejected if any of the promises are rejected.
+
+### `pocketmine\scheduler`
+- The following methods have been deprecated:
+  - `AsyncWorker->getFromThreadStore()` - use class static properties for thread-local storage
+  - `AsyncWorker->removeFromThreadStore()`
+  - `AsyncWorker->saveToThreadStore()`
+
+## Documentation
+- Improved documentation of various methods in `Block`.
+
+## Gameplay
+- The following new items have been added:
+  - Name Tag
+
+## Internals
+- Removed specialization of shutdown logic for `Thread` vs `Worker` (no specialization is required).
+- Authentication system no longer accepts logins signed with the old Mojang root public key.
+- ID to enum mappings in `pocketmine\data` now use a new `match` convention to allow static analysis to ensure that all enum cases are handled.
+- Updated version of `pocketmine/bedrock-protocol` allows avoiding decoding of some itemstack data from the client in most cases, improving performance.
+
+# 5.12.1
+Released 13th March 2024.
+
+## Fixes
+- Fixed `Player Network Receive - Decompression` timings not being stopped correctly when receiving an uncompressed packet.
+
+## Internals
+- Removed hardcoded batch packet size limit. This was already covered by other limits anyway.
diff --git a/changelogs/5.13.md b/changelogs/5.13.md
new file mode 100644
index 0000000000..1a38fce928
--- /dev/null
+++ b/changelogs/5.13.md
@@ -0,0 +1,16 @@
+# 5.13.0
+Released 13th March 2024.
+
+**For Minecraft: Bedrock Edition 1.20.70**
+
+This is a support release for Minecraft: Bedrock Edition 1.20.70.
+
+**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.20.70.
+- Removed support for earlier versions.
diff --git a/changelogs/5.14.md b/changelogs/5.14.md
new file mode 100644
index 0000000000..7b9b003f69
--- /dev/null
+++ b/changelogs/5.14.md
@@ -0,0 +1,94 @@
+# 5.14.0
+Released 5th April 2024.
+
+**For Minecraft: Bedrock Edition 1.20.70**
+
+This is a minor feature release, including performance improvements, minor gameplay features, new API features, and various internal improvements.
+
+**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 a `--no-log-file` command-line option, which disables the creation of a `server.log` file.
+  - **Use this with caution.** If you don't have another mechanism for collecting logs (e.g. Docker), this may make debugging harder.
+- Added support for automatic `server.log` rotation. When the `server.log` exceeds 32 MB, it will be renamed and moved to the `log_archive` folder in the server's data directory.
+  - Files in the `log_archive` folder can be safely modified or deleted without stopping the server.
+  - We suggest a cron job or similar to manage old log files (e.g. deleting or compressing them).
+- Added a new cache mechanism for `PocketMine-MP.phar`. This has several advantages:
+  - Caches are now reused by all threads - this significantly reduces `/tmp` usage (previously every thread generated its own cache, wasting lots of space)
+  - Dead cache files are automatically cleaned up by new servers - this means that a server crash loop won't flood `/tmp` anymore
+- `/status` now reports a more accurate number of threads on Windows.
+- Large resource packs are now able to be properly downloaded from the server.
+- Larger player skin sizes are now accepted by the server.
+- Improved logging from world providers to reduce spam when chunks contain invalid data.
+- Added more error logging for Anvil, PMAnvil and MCRegion worlds.
+- PHP deprecation warnings no longer cause the server to crash. This should make it easier for server owners to update to newer PHP versions.
+
+## Performance
+- Improved world loading performance. This was achieved through a combination of changes:
+  - Improvements to `BlockStateUpgrader` to avoid unnecessary work
+  - Improvements to `BlockStateUpgradeSchema` to clean up stupid code
+  - Improvements to `BlockStateReader` unused state handling
+  - Optimizations to `RegistryTrait` (see below)
+- Improved performance of `RegistryTrait::__callStatic()` accessor by introducing a fast-path optimization. Ensure that you access registries with the correct function name case to benefit from this.
+  - This improves the performance of `VanillaBlocks::WHATEVER()`, `VanillaItems`, etc.
+
+## Tools
+- `tools/generate-blockstate-upgrade-schema.php` now supports generating schemas using `flattenedValueRemaps` (described in [BlockStateUpgradeSchema](https://github.com/pmmp/BedrockBlockUpgradeSchema/releases/tag/4.0.0)).
+
+## Gameplay
+- Added sounds for armour equipping and unequipping.
+- Added sound for picking berries from a sweet berry bush.
+
+## API
+### `pocketmine\block\utils`
+- The following enum cases have been added:
+  - `BannerPatternType::GLOBE`
+  - `BannerPatternType::PIGLIN`
+
+### `pocketmine\event\player`
+- The following classes have been added:
+  - `PlayerResourcePackOfferEvent` - called before the server tells a connecting client which resource packs are available to download - allows customizing the pack list and other options
+
+### `pocketmine\item`
+- The following API methods have been added:
+  - `public ArmorMaterial->getEquipSound() : ?\pocketmine\world\Sound` - returns the sound to play when this armour is equipped or unequipped
+- The following API methods have signature changes:
+  - `ArmorMaterial->__construct()` now accepts an optional `?Sound $equipSound` parameter
+
+### `pocketmine\utils`
+- The following API methods have signature changes:
+  - `MainLogger->__construct()` now accepts `null` for the `$logFile` parameter - this disables the creation of a logger thread and log file
+  - `MainLogger->__construct()` now accepts an optional `?string $logArchiveDir` parameter. If set, this enables log archiving in the specified directory when the current log file exceeds 32 MB.
+
+## Dependencies
+- Now uses [`pocketmine/bedrock-block-upgrade-schema` version 4.0.0](https://github.com/pmmp/BedrockBlockUpgradeSchema/releases/tag/4.0.0).
+- Now uses [`pmmp/ext-pmmpthread` version 6.1.0](https://github.com/pmmp/ext-pmmpthread/releases/tag/6.1.0).
+- Now uses [`pocketmine/errorhandler` version 0.7.0](https://github.com/pmmp/ErrorHandler/releases/tag/0.7.0).
+- Now uses [`pocketmine/raklib` version 1.1.0](https://github.com/pmmp/RakLib/releases/tag/1.1.0).
+- Now uses [`pocketmine/raklib-ipc` version 1.0.0](https://github.com/pmmp/RakLibIpc/releases/tag/1.0.0).
+
+## Internals
+- (Re)Added support for RakLib packet ACK receipts. This was used to throttle resource pack sending and prevent network overloading.
+  - Added `NetworkSession->sendDataPacketWithReceipt()` to make use of this feature.
+  - `PacketSender` now requires an additional `?int $receiptId` parameter.
+- `ResourcePackPacketHandler` now uses `sendDataPacketWithReceipt()` to send resource packs, and delays sending the next chunk until the current one is acknowledged.
+- `ResourcePackPacketHandler` now accepts resource pack info directly in the constructor, instead of `ResourcePackManager`. This eases the implementation of `PlayerResourcePackOfferEvent`.
+- Increased `ZlibCompressor::DEFAULT_MAX_DECOMPRESSION_SIZE` to 8 MB (previously 2 MB). While this weakens server security, it appears to be necessary to deal with extremely bloated Persona skins.
+- Increased max split packet parts accepted by `RakLib` to 512 (previously 128). Again, this is necessary to deal with extremely bloated Persona skins.
+- Added a new cache mechanism for `PocketMine-MP.phar`.
+  - `ext-phar`'s default mechanism is extremely wasteful (generating a separate cache file per thread), and doesn't clean up after itself.
+  - The new cache mechanism is shared between all threads, and automatically cleans up stale caches.
+  - The phar stub (`build/server-phar-stub.php`) now converts the phar contents into a `.tar`, and decompresses all the files into `$TMPDIR/PocketMine-MP-phar-cache.<random>/`.
+  - `phar://` URIs still work with this system, but `new Phar(__FILE__)` must be replaced by `new PharData(__FILE__)` within PocketMine-MP core code.
+  - Backtraces from a `phar`'d server will now point to a location in the extracted phar cache, rather than the phar itself.
+- `block_factory_consistency_check` test (actually for `RuntimeBlockStateRegistry`) now stores less data, and is no longer affected by changes to internal state ID construction.
+
+# 5.14.1
+Released 5th April 2024.
+
+## Fixes
+- Fixed incorrect `pmmpthread` version check in server bootstrap.
diff --git a/changelogs/5.15.md b/changelogs/5.15.md
new file mode 100644
index 0000000000..536411ec59
--- /dev/null
+++ b/changelogs/5.15.md
@@ -0,0 +1,16 @@
+# 5.15.0
+Released 25th April 2024.
+
+**For Minecraft: Bedrock Edition 1.20.80**
+
+This is a support release for Minecraft: Bedrock Edition 1.20.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.20.80.
+- Removed support for earlier versions.
diff --git a/changelogs/5.16.md b/changelogs/5.16.md
new file mode 100644
index 0000000000..8b4251d76d
--- /dev/null
+++ b/changelogs/5.16.md
@@ -0,0 +1,26 @@
+# 5.16.0
+Released 13th June 2024.
+
+**For Minecraft: Bedrock Edition 1.21.0**
+
+This is a support release for Minecraft: Bedrock Edition 1.21.0.
+
+**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.0.
+- Removed support for earlier versions.
+- Generated permission docs are now included with every release.
+- Crash throttle message (which appears when the server crashed after being up for less than 120 seconds) now shows the server uptime as well as the wait time. This should make it clearer how the wait time is decided.
+
+## Tools
+- Added `install-local-protocol.sh` script. This allows installing local copies of protocol dependencies without needing to create releases. Useful for integration testing when doing protocol updates.
+
+## Fixes
+- Attacking an entity with a higher damage weapon while it's on attack cooldown from a lower damage weapon (switching) no longer causes additional knockback to the victim.
+- Wooden stairs can now be used as fuel in furnaces.
+- Fixed incorrect description of the permission `pocketmine.command.save.perform`.
diff --git a/changelogs/5.17.md b/changelogs/5.17.md
new file mode 100644
index 0000000000..b26f38b8a0
--- /dev/null
+++ b/changelogs/5.17.md
@@ -0,0 +1,38 @@
+# 5.17.0
+Released 10th July 2024.
+
+**For Minecraft: Bedrock Edition 1.21.2**
+
+This is a support release for Minecraft: Bedrock Edition 1.21.2.
+
+**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.2.
+- Removed support for earlier versions.
+
+## API
+### `pocketmine\player`
+- The following methods have been added:
+  - `public function closeAllForms() : void` - closes the current viewing form and forms in queue.
+
+## Fixes
+- Bowl can now be used as fuel.
+- Bells always drops themselves even when using an incompatible tool.
+
+# 5.17.1
+Released 13th August 2024.
+
+## Documentation
+- Added a note about `BlockStateData::CURRENT_VERSION`.
+
+## Fixes
+- Fixed anvil placement rotation to match vanilla.
+- Fixed outdated `BedrockWorldData` version, this was preventing use newer worlds.
+
+## Internals
+- Dependabot: PHPStan and patch updates are now grouped into a single PR.
diff --git a/changelogs/5.18.md b/changelogs/5.18.md
new file mode 100644
index 0000000000..35aa237afe
--- /dev/null
+++ b/changelogs/5.18.md
@@ -0,0 +1,30 @@
+# 5.18.0
+Released 16th August 2024.
+
+**For Minecraft: Bedrock Edition 1.21.20**
+
+This is a support release for Minecraft: Bedrock Edition 1.21.20.
+
+**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.20.
+- Removed support for earlier versions.
+
+## Fixes
+- Use `VISIBLE_MOB_EFFECTS` actor metadata property to send effect bubbles, this fixes effect bubbles not showing
+
+# 5.18.1
+Released 3rd September 2024.
+
+## Fixes
+- Fixed shift-crafting.
+- Blue Ice block no longer emits light & it's now dropped when mined with a tool with silk touch enchantment.
+
+## Internals
+- Pull Requests from team members now get an approval automatically. This means that if a team member makes a PR, only one other approval should be needed.
+- Added [ShellCheck](https://github.com/koalaman/shellcheck) to the CI tests.
diff --git a/changelogs/5.19.md b/changelogs/5.19.md
new file mode 100644
index 0000000000..6768c38e5d
--- /dev/null
+++ b/changelogs/5.19.md
@@ -0,0 +1,16 @@
+# 5.19.0
+Released 21st September 2024.
+
+**For Minecraft: Bedrock Edition 1.21.30**
+
+This is a support release for Minecraft: Bedrock Edition 1.21.30.
+
+**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.30.
+- Removed support for earlier versions.
diff --git a/changelogs/5.2.md b/changelogs/5.2.md
new file mode 100644
index 0000000000..75f31a076a
--- /dev/null
+++ b/changelogs/5.2.md
@@ -0,0 +1,79 @@
+# 5.2.0
+Released 4th July 2023.
+
+**For Minecraft: Bedrock Edition 1.20.0**
+
+This is a minor technical update, including changes to AsyncTask error handling and support for BedrockBlockUpgradeSchema version 3.0.0.
+
+**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.
+
+## Core
+- [BedrockBlockUpgradeSchema version 3.0.0](https://github.com/pmmp/BedrockBlockUpgradeSchema/releases/tag/3.0.0) is now supported.
+- [`ext-pmmpthread` version 6.0.4](https://github.com/pmmp/ext-pmmpthread/releases/tag/6.0.4) is now required (bug fixes required to support technical changes in this release).
+
+## Performance
+- Improved performance of `AsyncPool->submitTask()` and `AsyncPool->submitTaskToWorker()`.
+- Added new timings for `AsyncTask->onProgressUpdate()` and `AsyncTask->onCompletion()`.
+
+## Gameplay
+### Blocks
+- Added the following new blocks:
+  - Cherry Button
+  - Cherry Door
+  - Cherry Fence
+  - Cherry Fence Gate
+  - Cherry Leaves
+  - Cherry Log
+  - Cherry Planks
+  - Cherry Pressure Plate
+  - Cherry Sign
+  - Cherry Slab
+  - Cherry Stairs
+  - Cherry Trapdoor
+  - Cherry Wood
+  - Glow Lichen
+  - Piglin Head
+
+## Tools
+- `generate-block-upgrade-schema.php` now supports generating schemas a la BedrockBlockUpgradeSchema version 3.0.0, using `newFlattenedName` to reduce schema size.
+- Improved property remapping detection in `generate-block-upgrade-schema.php`. It now detects related properties with more confidence (even when multiple properties were change), and no longer considers unrelated properties as mapped (e.g. `mapped_type` and `deprecated` in 1.9->1.10).
+
+## API
+### `pocketmine\data\bedrock\block`
+- The following new API methods have been added:
+  - `public BlockStateData->toVanillaNbt() : CompoundTag` - returns the NBT for the blockstate without any PMMP extra metadata (`toNbt()` will normally include a `PMMPDataVersion` tag).
+
+### `pocketmine\data\runtime`
+- The following new API methods have been added:
+  - `public RuntimeDataDescriber->facingFlags(list<int> $faces) : void`
+
+### `pocketmine\scheduler`
+- `AsyncTask->onRun()` no longer tolerates uncaught exceptions.
+  - This means that any uncaught exceptions thrown from `AsyncTask->onRun()` will now crash the worker thread, and by extension, the server.
+  - This change makes it easier to debug errors by detecting them earlier.
+- The following API methods have been deprecated:
+  - `AsyncTask->onError()`
+
+## Internals
+- `AsyncTask->progressUpdates` is now lazily initialized when a task publishes a progress update.
+  - This was previously not possible due to technical limitations of the `ext-pmmpthread` extension.
+  - This change improves performance of `AsyncPool->submitTask()` and `AsyncPool->submitTaskToWorker()`, as well as reducing the amount of work needed to check for progress updates on tick.
+- Errors in `AsyncWorker` now cascade and crash the whole server.
+  - This makes it easier to debug errors by detecting them earlier.
+  - This includes all types of unexpected errors, such as OOM, uncaught exceptions, etc.
+  - This change is not expected to affect normal server operation, as worker threads are not expected to crash under normal circumstances.
+- `AsyncTask::$threadLocalStorage` now uses a plain `array` instead of `ArrayObject`. The `ArrayObject` was a workaround for `ext-pthreads` to prevent thread-locals getting copied to the worker thread, and is no longer necessary.
+- Regenerated `pocketmine\data\bedrock\item\ItemTypeNames` for Bedrock 1.20 (BC breaking, some item names have changed).
+- Fixed `build/generate-item-type-names.php` not including some newer blockitems, such as doors and hanging signs.
+
+# 5.2.1
+Released 11th July 2023.
+
+**This release includes changes from the following releases:**
+- [4.22.3](https://github.com/pmmp/PocketMine-MP/blob/4.22.3/changelogs/4.22.md#4223) - Fixes for some crash issues
+
+This release contains no other changes.
diff --git a/changelogs/5.20.md b/changelogs/5.20.md
new file mode 100644
index 0000000000..b0da701d67
--- /dev/null
+++ b/changelogs/5.20.md
@@ -0,0 +1,25 @@
+# 5.20.0
+Released 26th October 2024.
+
+**For Minecraft: Bedrock Edition 1.21.40**
+
+This is a support release for Minecraft: Bedrock Edition 1.21.40.
+
+**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.40.
+- Removed support for earlier versions.
+
+## Fixes
+- Fixed a bug in `tools/generate-blockstate-upgrade-schema.php` that caused it to fail on 1.21.40 with the new mushroom block changes.
+
+# 5.20.1
+Released 31st October 2024.
+
+## Fixes
+- Workaround old mob heads in world saves not being upgraded correctly and causing crashes.
diff --git a/changelogs/5.21.md b/changelogs/5.21.md
new file mode 100644
index 0000000000..9b3c2f89ad
--- /dev/null
+++ b/changelogs/5.21.md
@@ -0,0 +1,112 @@
+# 5.21.0
+Released 3rd November 2024.
+
+This is a minor feature release, including gameplay features and minor internals improvements.
+
+**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.
+
+## Gameplay
+- Added the following new blocks:
+  - Campfire
+  - Chiseled Copper
+  - Chiseled Tuff
+  - Chiseled Tuff Bricks
+  - Copper Bulb
+  - Copper Door
+  - Copper Grate
+  - Copper Trapdoor
+  - Polished Tuff, Slabs, Stairs and Walls
+  - Soul Campfire
+  - Tuff Bricks, Slabs, Stairs and Walls
+  - Tuff Slab, Stairs and Walls
+- Added the following new types of painting:
+  - backyard
+  - baroque
+  - bouquet
+  - cavebird
+  - changing
+  - cotan
+  - endboss
+  - fern
+  - finding
+  - humble
+  - lowmist
+  - meditative
+  - orb
+  - owlemons
+  - passage
+  - pond
+  - prairie_ride
+  - sunflowers
+  - tides
+  - unpacked
+- Armor slots are now properly restricted (on the server side) to only contain the appropriate type of armor or headwear.
+- Implemented Aqua Affinity enchantment. Since the server doesn't currently enforce any movement restrictions in water, this enchantment works based on client-side behaviour only.
+
+## API
+### `pocketmine\block`
+- The following new API methods have been added:
+  - `public ChiseledBookshelf->getLastInteractedSlot() : ?ChiseledBookshelfSlot`
+  - `public ChiseledBookshelf->setLastInteractedSlot(?ChiseledBookshelfSlot $lastInteractedSlot) : $this`
+- The following new classes have been added: 
+  - `utils\CopperMaterial` - interface implemented by all copper-like blocks with oxidation and waxed properties
+  - `CopperBulb`
+  - `CopperDoor`
+  - `CopperGrate`
+  - `CopperTrapdoor`
+  - `SoulCampfire`
+  - `Campfire`
+- The following enums have new cases:
+  - `utils\BannerPatternType` has new cases `FLOW` and `GUSTER`
+
+### `pocketmine\crafting`
+- The following enums have new cases:
+  - `FurnaceType` has new cases `CAMPFIRE` and `SOUL_CAMPFIRE`
+
+### `pocketmine\event`
+- The following new classes have been added:
+  - `block\CampfireCookEvent` - called when a campfire finishes cooking an item
+
+### `pocketmine\inventory`
+- Added support for slot validators, which permit restricting the types of items a player can put into an inventory slot.
+  - The following new classes have been added:
+    - `transaction\action\SlotValidator` - interface
+    - `transaction\action\CallbackSlotValidator` - class allowing a closure to be used for slot content validation
+    - `SlotValidatedInventory` - implemented by inventories which support the use of slot validators
+
+### `pocketmine\item`
+- The following new API methods have been added:
+  - `public Item->getCooldownTag() : ?string` - returns the cooldown group this item belongs to, used for ensuring that, for example, different types of goat horns all respect a general horn cooldown
+- The following new classes have been added:
+  - `ItemCooldownTags` - list of cooldown group tags used by PocketMine-MP
+
+### `pocketmine\world\sound`
+- The following new classes have been added
+  - `CampfireSound` - sound made by campfires while lit
+
+## Tools
+- `tools/blockstate-upgrade-schema-utils.php` (formerly `generate-blockstate-upgrade-schema.php`) has several improvements:
+  - Support for generating `flattenedProperties` rules as per [BedrockBlockUpgradeSchema 5.0.0](https://github.com/pmmp/BedrockBlockUpgradeSchema/releases/tag/5.0.0)
+  - Improved criteria for flattened property selection to minimize the amount of rules required
+  - Several subcommands are now available:
+    - `generate` - generates a schema from provided data
+    - `update` - regenerates an existing schema in a newer format
+    - `update-all` - regenerates a folder of existing schemas in a newer format (useful for updating `BedrockBlockUpgradeSchema` en masse)
+    - `test` - verifies that a schema produces the results expected by provided data
+
+## Internals
+- Fixed incorrect visibility of `createEntity` in spawn eggs.
+- Added support for newer `BedrockBlockUpgradeSchema` in `BlockStateUpgrader`.
+
+# 5.21.1
+Released 12th November 2024.
+
+## Fixes
+- Fixed server crash when applying a cooldown to an item with 1 count.
+- Fixed garbage collector cycle count increase on player disconnect.
+- Fixed weakness effect being applied to all attack types, causing damage splash potions to become weaker.
+- Fixed Enchanted Golden Apple regeneration effect amplifier to match vanilla.
diff --git a/changelogs/5.3.md b/changelogs/5.3.md
new file mode 100644
index 0000000000..7d789165d6
--- /dev/null
+++ b/changelogs/5.3.md
@@ -0,0 +1,81 @@
+# 5.3.0
+Released 12th July 2023.
+
+**For Minecraft: Bedrock Edition 1.20.10**
+
+This is a support release for Minecraft: Bedrock Edition 1.20.10.
+
+**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.
+
+## Interim releases
+If you're upgrading directly from 5.1.x to 5.3.x, please also read the following changelogs, as the interim releases contain important changes:
+- [5.2.0](https://github.com/pmmp/PocketMine-MP/blob/5.2.0/changelogs/5.2.md#520)
+
+## Included releases
+**This release includes changes from the following releases:**
+- [4.23.0](https://github.com/pmmp/PocketMine-MP/blob/4.23.0/changelogs/4.23.md#4230) - Support for Minecraft: Bedrock Edition 1.20.10
+
+## Internals
+- `BlockTypeNames`, `BlockStateNames`, `BlockStateStringValues` and `ItemTypeNames` in the `pocketmine\data\bedrock` package have BC-breaking changes to accommodate Bedrock 1.20.10.
+
+# 5.3.1
+Released 14th July 2023.
+
+## Included releases
+**This release includes changes from the following releases:**
+- [4.23.1](https://github.com/pmmp/PocketMine-MP/blob/4.23.1/changelogs/4.23.md#4231) - Security fixes
+
+## General
+- Updated `build/php` submodule to pmmp/PHP-Binaries@e0c918d1379465964acefd562d9e48f87cfc2c9e.
+
+# 5.3.2
+Released 18th July 2023.
+
+## Included releases
+**This release includes changes from the following releases:**
+- [4.23.2](https://github.com/pmmp/PocketMine-MP/blob/4.23.2/changelogs/4.23.md#4232) - Fix for `sandboxId`-related login errors
+
+## Documentation
+- Fixed documentation error in `StringToTParser`.
+
+## Fixes
+- Fixed turtle helmet not being able to be unequipped.
+
+## Internals
+- Armor pieces are no longer set back into the armor inventory if no change was made. This reduces the number of slot updates sent to clients, as well as avoiding unnecessary updates for armor pieces which have Unbreaking enchantments.
+
+# 5.3.3
+Released 24th July 2023.
+
+## Included releases
+**This release includes changes from the following releases:**
+- [4.23.3](https://github.com/pmmp/PocketMine-MP/blob/4.23.3/changelogs/4.23.md#4233) - Various bug fixes
+
+## Fixes
+- Added a workaround for PM4 worlds with chunks corrupted by [Refaltor77/CustomItemAPI](https://github.com/Refaltor77/CustomItemAPI).
+  - While this was not the fault of PocketMine-MP itself, a significant number of users were affected by this problem.
+  - This error was not detected by PM4 due to missing validation of certain data which should not have existed in 1.12.
+  - An error will now be logged when this corruption is detected, but the affected chunks should otherwise load normally.
+- Relaxed validation of expected 3D biome array counts per chunk in LevelDB worlds.
+  - Vanilla Bedrock currently saves 24 palettes (and only 24 are required), but it saved 25, 32, or 64 biome palettes per chunk in older versions.
+  - Core validation for these padding biomes was very strict, enforcing exact compliance with vanilla.
+  - Since only 24 palettes are actually required, the remaining palettes may now be omitted irrespective of the chunk version.
+  - An error will still be logged when this mistake is detected, but the affected chunks will otherwise load normally.
+- Fixed `/kill` not working on players who had (re)spawned in the 3 seconds immediately after (re)spawning (due to `noDamageTicks`).
+- Fixed `/kill` not working correctly for players with high levels of Health Boost or other health-altering effects.
+- Fixed netherite items being destroyed by lava.
+- Fireproof entities no longer display the burning animation when in fire or lava. This does not apply to creative players, who are immortal rather than being fireproof.
+- Fixed frosted ice melting in certain conditions which didn't match vanilla Bedrock.
+
+# 5.3.4
+Released 1st August 2023.
+
+## Included releases
+This release includes changes from the following releases:
+- [4.23.4](https://github.com/pmmp/PocketMine-MP/blob/4.23.4/changelogs/4.23.md#4234) - Item entity lag fix
+
+This release contains no other significant changes.
diff --git a/changelogs/5.4.md b/changelogs/5.4.md
new file mode 100644
index 0000000000..43f6096207
--- /dev/null
+++ b/changelogs/5.4.md
@@ -0,0 +1,133 @@
+# 5.4.0
+Released 1st August 2023.
+
+**For Minecraft: Bedrock Edition 1.20.10**
+
+This is a minor feature update, including a handful of new gameplay features, new plugin APIs and improvements to error reporting.
+
+**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
+- Improved error reporting for async task and thread crashes.
+- Players may now have different creative inventories.
+
+## Gameplay
+### General
+- Added support for 1.5-block height sneaking.
+- Fixed missing player arm swing and sounds when punching the air.
+
+### Blocks
+- Implemented the following new blocks:
+  - Big Dripleaf Head
+  - Big Dripleaf Stem
+  - Small Dripleaf
+- Acacia saplings now grow into acacia trees.
+- Fixed melon and pumpkin stems not attaching to the correct block when growing.
+- Various blocks now drop more items when mined with a compatible tool enchanted with Fortune.
+
+### Items
+- Implemented Strong Slowness potion.
+- Implemented Fortune enchantment.
+
+## API
+### `pocketmine\block`
+- The following new classes have been added:
+  - `utils\FortuneDropHelper` - utility methods for calculating the drop counts for Fortune-affected blocks
+- The following new API methods have been added:
+  - `protected Block->getAdjacentSupportType(int $facing) : utils\SupportType` - returns the type of support provided by the block in the given direction on the adjacent face
+
+### `pocketmine\entity`
+- The following new API constants have been added:
+  - `Living::DEFAULT_KNOCKBACK_FORCE`
+  - `Living::DEFAULT_KNOCKBACK_VERTICAL_LIMIT`
+
+### `pocketmine\entity\animation`
+- `ConsumingItemAnimation` now accepts `Living` instances instead of just `Human`.
+
+### `pocketmine\event`
+- The following new classes have been added:
+  - `PlayerMissSwingEvent` - called when the player attempts the attack action (left click on desktop) without any target
+    - This is possible thanks to the introduction of new flags in `PlayerAuthInputPacket` in Bedrock 1.20.10
+- The following new API methods have been added:
+  - `public EntityDamageByEntityEvent->getVerticalKnockBackLimit() : float`
+  - `public EntityDamageByEntityEvent->setVerticalKnockBackLimit(float $verticalKnockBackLimit) : void` - sets the max vertical velocity that can result from the victim being knocked back
+
+### `pocketmine\player`
+- The following new API methods have been added:
+  - `public Player->getCreativeInventory() : pocketmine\inventory\CreativeInventory`
+  - `public Player->setCreativeInventory(pocketmine\inventory\CreativeInventory $inventory) : void`
+  - `public Player->missSwing() : void` - performs actions associated with the attack action when there is no target (see `PlayerMissSwingEvent`)
+
+### `pocketmine\scheduler`
+- Cancellation functionality has been removed from `AsyncTask`, as it didn't make any sense and wasn't used by anything for what it was intended for.
+  - It broke sequential task execution - later tasks might depend on state from earlier tasks
+  - It didn't actually cancel the task anyway - at best, it prevented it from running, but couldn't interrupt it (though interrupting a task does not make sense either)
+- The following API methods have been deprecated, and their functionality has been removed:
+  - `AsyncTask->hasCancelledRun()`
+  - `AsyncTask->cancelRun()`
+
+## Internals
+- Uncaught exceptions and fatal errors in `AsyncTask`, threads extending `pocketmine\thread\Thread`, and `pocketmine\thread\Worker` are now recorded in crashdumps, making it significantly easier to debug errors in these areas.
+- JWT signature DER <-> raw conversions are now handled in-house using code in `JwtUtils`
+  - Due to the simplicity of the conversion and only requiring a tiny subset of the ASN.1 spec, it didn't make much sense to introduce another dependency.
+  - `fgrosse/phpasn1` is no longer required. This package was abandoned by its author and only used by PocketMine-MP for this one purpose.
+- Various usages of `Closure::fromCallable()` have been replaced by PHP 8.1 first-class callable syntax.
+- Blocks requiring support shifted to a "can be supported at" model, rather than "can be supported by".
+  - This model reduces repeated logic when placing and performing nearby block updates (no need to hardcode facing everywhere).
+  - In addition, this change facilitates the use of the newly introduced `Block->getAdjacentSupportType()` API method, reducing boilerplate support-type checking code.
+- Bell block code has been simplified and cleaned up.
+- `TallGrass` and `DoubleTallGrass` now use a shared `TallGrassTrait` to reduce code duplication.
+
+# 5.4.1
+Released 8th August 2023.
+
+## General
+- Updated translation data to [pmmp/Language 2.19.6](https://github.com/pmmp/Language/releases/tag/2.19.6).
+- [`ext-pmmpthread` 6.0.7](https://github.com/pmmp/ext-pmmpthread/releases/tag/6.0.7) is now required (needed for bug fixes).
+
+## Fixes
+- Fixed Podzol not dropping itself when mined with Silk Touch.
+- Fixed `World->getSafeSpawn()` not accepting positions below `y=0` (world height limit change).
+- Fixed `pocketmine\thread\Thread` and `pocketmine\thread\Worker` instances not logging any information when they crash.
+- Fixed `CraftItemEvent` not cloning returned items.
+
+## Internals
+- Foreach by-reference is now disallowed via a custom PHPStan rule.
+
+# 5.4.2
+Released 9th August 2023.
+
+## Included releases
+- [4.23.5](https://github.com/pmmp/PocketMine-MP/blob/4.23.5/changelogs/4.23.md#4235) - Minor bug fixes
+
+## Fixes
+- Fixed cake accepting candle placement when slices have already been eaten.
+- Fixed fire charges not lighting candles.
+
+# 5.4.3
+Released 21st August 2023.
+
+## Included releases
+- [4.23.6](https://github.com/pmmp/PocketMine-MP/blob/4.23.6/changelogs/4.23.md#4236) - Armor inventory client bug workaround
+
+## Fixes
+- Fixed crashdumps not generating correctly on fatal errors.
+- Fixed `PotionCauldron::setPotionItem()` not validating the item type.
+- Fixed chorus fruit not considering teleport destinations below y=0.
+- Fixed cake dropping itself when mined.
+
+# 5.4.4
+Released 6th September 2023.
+
+## General
+- Crashdumps caused by non-phar plugins are now submitted to the Crash Archive, the same as other plugins. Previously, non-phar plugin crashes would not be submitted, causing maintainers to potentially miss important issues.
+
+## Fixes
+- Fixed player Y coordinates sometimes being slightly below the top of the block they were standing on (floating point error due to subtracting eye height).
+- Fixed template slot of smithing tables not accepting any items.
+- `tools/generate-bedrock-data-from-packets.php` is now significantly less spammy when warning about duplicated recipes.
+- Fixed empty stack traces in `lastError` data of crashdumps.
diff --git a/changelogs/5.5-beta.md b/changelogs/5.5-beta.md
new file mode 100644
index 0000000000..84153c2796
--- /dev/null
+++ b/changelogs/5.5-beta.md
@@ -0,0 +1,156 @@
+# 5.5.0-BETA1
+Released 23rd August 2023.
+
+**For Minecraft: Bedrock Edition 1.20.10**
+
+This is a minor feature release, including performance improvements, new API methods, and new gameplay features.
+
+**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.
+
+## Dependencies
+- Updated `pocketmine/math` dependency to [`1.0.0`](https://github.com/pmmp/Math/releases/tag/1.0.0).
+- Updated `pocketmine/nbt` dependency to [`1.0.0`](https://github.com/pmmp/NBT/releases/tag/1.0.0).
+
+## Performance
+- Some events are now no longer fired if no handlers are registered.
+  - This improves performance by avoiding unnecessary object allocations and function calls.
+  - Events such as `DataPacketReceiveEvent`, `DataPacketSendEvent` and `PlayerMoveEvent` are optimized away almost completely by this change, offering some much-needed performance gains.
+- Significantly improved performance of small moving entities, such as dropped items.
+  - This was achieved by a combination of changes, which together improved observed performance with 2000 item entities moving in water by 30-40%.
+  - The benefit of this will be most noticeable in SkyBlock servers, where large cactus farms can generate thousands of dropped items.
+- `World->getCollisionBoxes()` now uses an improved search method, which reduces the work done by the function by almost 90% for small entities.
+  - This improves performance of collision detection for small entities, such as dropped items.
+
+## Gameplay
+### General
+- Implemented enchanting using an enchanting table (yes, finally!)
+  - Thanks to [@S3v3Nice](https://github.com/S3v3Nice) for investing lots of time and effort into developing this.
+  - Since this feature is quite complex, it's possible there may be bugs. Please be vigilant and report any issues you find.
+
+### Blocks
+- The following new blocks have been implemented:
+  - Pink Petals
+- Pressure plates are now functional, in the sense that they react when entities stand on them and perform the correct logic.
+  - Note that since redstone is not yet implemented, pressure plates do not activate any redstone devices, similar to buttons and levers.
+- Signs can now be edited by right-clicking them.
+- Signs can now be waxed using a honeycomb, which prevents them from being edited.
+
+### Items
+- The following new items have been implemented:
+  - Enchanted Book
+
+## API
+### `pocketmine\block`
+- The following new API methods have been added:
+  - `public Block->getEnchantmentTags() : list<string>` returns a list of strings indicating which types of enchantment can be applied to the block when in item form
+  - `public BlockTypeInfo->getEnchantmentTags() : list<string>`
+  - `protected PressurePlate->getActivationBox() : AxisAlignedBB` - returns the AABB entities must intersect with in order to activate the pressure plate (not the same as the visual shape)
+  - `protected PressurePlate->hasOutputSignal() : bool` - returns whether the pressure plate has an output signal - this should be implemented by subclasses
+  - `protected PressurePlate->calculatePlateState() : array{Block, ?bool}` - returns the state the pressure plate will change to if the given list of entities are standing on it, and a bool indicating whether the plate activated or deactivated this tick
+  - `protected PressurePlate->filterIrrelevantEntities(list<Entity> $entities) : list<Entity>` - returns the given list filtered of entities that don't affect the plate's state (e.g. dropped items don't affect stone pressure plates)
+  - `public BaseSign->isWaxed() : bool`
+  - `public BaseSign->setWaxed(bool $waxed) : $this`
+  - `public inventory\EnchantInventory->getInput() : Item`
+  - `public inventory\EnchantInventory->getLapis() : Item`
+  - `public inventory\EnchantInventory->getOutput(int $optionId) : ?Item` - returns the item that would be produced if the input item was enchanted with the selected option, or `null` if the option is invalid
+  - `public inventory\EnchantInventory->getOption(int $optionId) : EnchantOption` - returns the enchanting option at the given index
+- The following API methods have signature changes:
+  - `BlockTypeInfo->__construct()` now accepts an optional `list<string> $enchantmentTags` parameter
+  - `PressurePlate->__construct()` now accepts an optional `int $deactivationDelayTicks` parameter
+  - `WeightedPressurePlate->__construct()` now accepts optional `int $deactivationDelayTicks` and `float $signalStrengthFactor` parameters
+  - `SimplePressurePlate->__construct()` now accepts an optional `int $deactivationDelayTicks` parameter
+- The following new classes have been added:
+  - `PinkPetals`
+  - `utils\BlockEventHelper` - provides helper methods for calling block-related events
+- The following classes have been deprecated:
+  - `WeightedPressurePlateLight`
+  - `WeightedPressurePlateHeavy`
+
+### `pocketmine\entity`
+- The following new API methods have been added:
+  - `public Human->getEnchantmentSeed() : int` - returns the current seed used to randomize options shown on the enchanting table for this human
+  - `public Human->setEnchantmentSeed(int $seed) : void`
+  - `public Human->regenerateEnchantmentSeed() : void` - returns a new randomly generated seed which can be set with `setEnchantmentSeed()`
+
+### `pocketmine\event`
+- The following new classes have been added:
+  - `block\FarmlandHydrationChangeEvent` - called when farmland is hydrated or dehydrated
+  - `block\PressurePlateUpdateEvent` - called when a pressure plate is activated or changes its power output
+  - `player\PlayerEnchantingOptionsRequestEvent` - called when a player puts an item to be enchanted into an enchanting table, to allow plugins to modify the enchanting options shown
+  - `player\PlayerItemEnchantEvent` - called when a player enchants an item in an enchanting table
+  - `world\WorldDifficultyChangeEvent` - called when a world's difficulty is changed
+- The following new API methods have been added:
+  - `public static Event::hasHandlers() : bool` - returns whether the event class has any registered handlers - used like `SomeEvent::hasHandlers()`
+  - `public HandlerListManager->getHandlersFor(class-string<? extends Event> $event) : list<RegisteredListener>` - returns a list of all registered listeners for the given event class, using cache if available
+
+### `pocketmine\inventory\transaction`
+- The following new classes have been added:
+  - `EnchantingTransaction` - used when a player enchants an item in an enchanting table
+
+### `pocketmine\item`
+- The following new API methods have been added:
+  - `public Armor->getMaterial() : ArmorMaterial` - returns an object containing properties shared by all items of the same armor material
+  - `public ArmorTypeInfo->getMaterial() : ArmorMaterial`
+  - `public Item->getEnchantability() : int` - returns the enchantability value of the item - higher values increase the chance of more powerful enchantments being offered by an enchanting table
+  - `public Item->getEnchantmentTags() : list<string>` - returns a list of strings indicating which types of enchantment can be applied to the item
+  - `public ToolTier->getEnchantability() : int`
+- The following API methods have signature changes:
+  - `Item->__construct()` now accepts an optional `list<string> $enchantmentTags` parameter
+  - `ArmorTypeInfo->__construct()` now accepts an optional `?ArmorMaterial $material` parameter
+- The following new classes have been added:
+  - `ArmorMaterial` - container for shared armor properties
+  - `VanillaArmorMaterials` - all vanilla armor materials
+  - `EnchantedBook` - represents an enchanted book item
+
+### `pocketmine\item\enchantment`
+- The following new classes have been added:
+  - `AvailableEnchantmentRegistry` - enchantments to be displayed on the enchanting table are selected from here - custom enchantments may be added
+  - `EnchantingHelper` - static class containing various helper methods for enchanting tables
+  - `EnchantingOption` - represents an option on the enchanting table menu
+  - `IncompatibleEnchantmentGroups` - list of constants naming groups of enchantments that are incompatible with each other - custom enchantments may be added using these group names to make them incompatible with existing enchantments in the same group
+  - `IncompatibleEnchantmentRegistry` - manages which enchantments are considered incompatible with each other - custom enchantments may be added using existing group names to make them incompatible with existing enchantments in the same group, or to entirely new groups
+  - `ItemEnchantmentTagRegistry` - manages item enchantment compatibility tags and which tags include which other tags
+  - `ItemEnchantmentTags` - list of constants naming item types for enchantment compatibility checks
+- The following classes have been deprecated
+  - `ItemFlags`
+- The following API methods have been added:
+  - `public Enchantment->isCompatibleWith(Enchantment $other) : bool`
+  - `public Enchantment->getMinEnchantingPower()` - returns the minimum enchanting power (derived from enchantability and number of bookshelves) needed to allow this enchantment to show on the enchanting table with a given level
+  - `public Enchantment->getMaxEnchantingPower()` - upper limit of enchanting power for this enchantment to be offered on the enchanting table with a given level
+- The following API methods have signature changes:
+  - `Enchantment->__construct()` now accepts optional `(\Closure(int $level) : int)|null $minEnchantingPower` and `int $enchantingPowerRange` parameters
+  - `Enchantment->__construct()` parameters `$primaryItemFlags` and `$secondaryItemFlags` are now deprecated and no longer used
+  - `ProtectionEnchantment->__construct()` has extra parameters to reflect `Enchantment->__construct()` changes
+- The following API methods have been deprecated:
+  - `Enchantment->getPrimaryItemFlags()` - use API methods provided by `AvailableEnchantmentRegistry` instead
+  - `Enchantment->getSecondaryItemFlags()` - use API methods provided by `AvailableEnchantmentRegistry` instead
+  - `Enchantment->hasPrimaryItemType()`
+  - `Enchantment->hasSecondaryItemType()`
+
+### `pocketmine\plugin`
+- The following new API methods have been added:
+  - `public PluginBase->getResourcePath(string $filename) : string` - returns a URI to an embedded resource file that can be used with `file_get_contents()` and similar functions
+  - `public PluginBase->getResourceFolder() : string` - returns a URI to the plugin's folder of embedded resources
+- The following API methods have been deprecated:
+  - `PluginBase->getResource()` - prefer using `getResourcePath()` with `file_get_contents()` or other PHP built-in functions instead
+
+### `pocketmine\resourcepacks`
+- The following new API methods have been added:
+  - `public ResourcePackManager->setResourcePacksRequired(bool $value) : void` - sets whether players must accept resource packs in order to join
+
+### `pocketmine\world\generator`
+- The following new API methods have been added:
+  - `public GeneratorManager->addAlias(string $name, string $alias) : void` - allows registering a generator alias without copying the generator registration parameters
+
+### `pocketmine\world\sound`
+- The following new classes have been added:
+- `PressurePlateActivateSound`
+- `PressurePlateDeactivateSound`
+
+### `pocketmine\utils`
+- The following new API methods have been added:
+  - `public StringToTParser->registerAlias(string $existing, string $alias) : void` - allows registering a string alias without copying registration parameters
diff --git a/changelogs/5.5.md b/changelogs/5.5.md
new file mode 100644
index 0000000000..750e211290
--- /dev/null
+++ b/changelogs/5.5.md
@@ -0,0 +1,162 @@
+# 5.5.0
+Released 6th September 2023.
+
+**For Minecraft: Bedrock Edition 1.20.10**
+
+This is a minor feature release, including performance improvements, new API methods, and new gameplay features.
+
+**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.
+
+## Dependencies
+- Updated `pocketmine/math` dependency to [`1.0.0`](https://github.com/pmmp/Math/releases/tag/1.0.0).
+- Updated `pocketmine/nbt` dependency to [`1.0.0`](https://github.com/pmmp/NBT/releases/tag/1.0.0).
+
+## Performance
+- Some events are now no longer fired if no handlers are registered.
+  - This improves performance by avoiding unnecessary object allocations and function calls.
+  - Events such as `DataPacketReceiveEvent`, `DataPacketSendEvent` and `PlayerMoveEvent` are optimized away almost completely by this change, offering some much-needed performance gains.
+- Significantly improved performance of small moving entities, such as dropped items.
+  - This was achieved by a combination of changes, which together improved observed performance with 2000 item entities moving in water by 30-40%.
+  - The benefit of this will be most noticeable in SkyBlock servers, where large cactus farms can generate thousands of dropped items.
+- `World->getCollisionBoxes()` now uses an improved search method, which reduces the work done by the function by almost 90% for small entities.
+  - This improves performance of collision detection for small entities, such as dropped items.
+
+## Gameplay
+### General
+- Implemented enchanting using an enchanting table (yes, finally!)
+  - Thanks to [@S3v3Nice](https://github.com/S3v3Nice) for investing lots of time and effort into developing this.
+  - Since this feature is quite complex, it's possible there may be bugs. Please be vigilant and report any issues you find.
+
+### Blocks
+- The following new blocks have been implemented:
+  - Pink Petals
+- Pressure plates are now functional, in the sense that they react when entities stand on them and perform the correct logic.
+  - Note that since redstone is not yet implemented, pressure plates do not activate any redstone devices, similar to buttons and levers.
+- Signs can now be edited by right-clicking them.
+- Signs can now be waxed using a honeycomb, which prevents them from being edited.
+
+### Items
+- The following new items have been implemented:
+  - Enchanted Book
+
+## API
+### `pocketmine\block`
+- The following new API methods have been added:
+  - `public Block->getEnchantmentTags() : list<string>` returns a list of strings indicating which types of enchantment can be applied to the block when in item form
+  - `public BlockTypeInfo->getEnchantmentTags() : list<string>`
+  - `protected PressurePlate->getActivationBox() : AxisAlignedBB` - returns the AABB entities must intersect with in order to activate the pressure plate (not the same as the visual shape)
+  - `protected PressurePlate->hasOutputSignal() : bool` - returns whether the pressure plate has an output signal - this should be implemented by subclasses
+  - `protected PressurePlate->calculatePlateState() : array{Block, ?bool}` - returns the state the pressure plate will change to if the given list of entities are standing on it, and a bool indicating whether the plate activated or deactivated this tick
+  - `protected PressurePlate->filterIrrelevantEntities(list<Entity> $entities) : list<Entity>` - returns the given list filtered of entities that don't affect the plate's state (e.g. dropped items don't affect stone pressure plates)
+  - `public BaseSign->isWaxed() : bool`
+  - `public BaseSign->setWaxed(bool $waxed) : $this`
+  - `public inventory\EnchantInventory->getInput() : Item`
+  - `public inventory\EnchantInventory->getLapis() : Item`
+  - `public inventory\EnchantInventory->getOutput(int $optionId) : ?Item` - returns the item that would be produced if the input item was enchanted with the selected option, or `null` if the option is invalid
+  - `public inventory\EnchantInventory->getOption(int $optionId) : EnchantOption` - returns the enchanting option at the given index
+- The following API methods have signature changes:
+  - `BlockTypeInfo->__construct()` now accepts an optional `list<string> $enchantmentTags` parameter
+  - `PressurePlate->__construct()` now accepts an optional `int $deactivationDelayTicks` parameter
+  - `WeightedPressurePlate->__construct()` now accepts optional `int $deactivationDelayTicks` and `float $signalStrengthFactor` parameters
+  - `SimplePressurePlate->__construct()` now accepts an optional `int $deactivationDelayTicks` parameter
+- The following new classes have been added:
+  - `PinkPetals`
+  - `utils\BlockEventHelper` - provides helper methods for calling block-related events
+- The following classes have been deprecated:
+  - `WeightedPressurePlateLight`
+  - `WeightedPressurePlateHeavy`
+
+### `pocketmine\entity`
+- The following new API methods have been added:
+  - `public Human->getEnchantmentSeed() : int` - returns the current seed used to randomize options shown on the enchanting table for this human
+  - `public Human->setEnchantmentSeed(int $seed) : void`
+  - `public Human->regenerateEnchantmentSeed() : void` - returns a new randomly generated seed which can be set with `setEnchantmentSeed()`
+
+### `pocketmine\event`
+- The following new classes have been added:
+  - `block\FarmlandHydrationChangeEvent` - called when farmland is hydrated or dehydrated
+  - `block\PressurePlateUpdateEvent` - called when a pressure plate is activated or changes its power output
+  - `player\PlayerEnchantingOptionsRequestEvent` - called when a player puts an item to be enchanted into an enchanting table, to allow plugins to modify the enchanting options shown
+  - `player\PlayerItemEnchantEvent` - called when a player enchants an item in an enchanting table
+  - `world\WorldDifficultyChangeEvent` - called when a world's difficulty is changed
+- The following new API methods have been added:
+  - `public static Event::hasHandlers() : bool` - returns whether the event class has any registered handlers - used like `SomeEvent::hasHandlers()`
+  - `public HandlerListManager->getHandlersFor(class-string<? extends Event> $event) : list<RegisteredListener>` - returns a list of all registered listeners for the given event class, using cache if available
+
+### `pocketmine\inventory\transaction`
+- The following new classes have been added:
+  - `EnchantingTransaction` - used when a player enchants an item in an enchanting table
+
+### `pocketmine\item`
+- The following new API methods have been added:
+  - `public Armor->getMaterial() : ArmorMaterial` - returns an object containing properties shared by all items of the same armor material
+  - `public ArmorTypeInfo->getMaterial() : ArmorMaterial`
+  - `public Item->getEnchantability() : int` - returns the enchantability value of the item - higher values increase the chance of more powerful enchantments being offered by an enchanting table
+  - `public Item->getEnchantmentTags() : list<string>` - returns a list of strings indicating which types of enchantment can be applied to the item
+  - `public ToolTier->getEnchantability() : int`
+- The following API methods have signature changes:
+  - `Item->__construct()` now accepts an optional `list<string> $enchantmentTags` parameter
+  - `ArmorTypeInfo->__construct()` now accepts an optional `?ArmorMaterial $material` parameter
+- The following new classes have been added:
+  - `ArmorMaterial` - container for shared armor properties
+  - `VanillaArmorMaterials` - all vanilla armor materials
+  - `EnchantedBook` - represents an enchanted book item
+
+### `pocketmine\item\enchantment`
+- The following new classes have been added:
+  - `AvailableEnchantmentRegistry` - enchantments to be displayed on the enchanting table are selected from here - custom enchantments may be added
+  - `EnchantingHelper` - static class containing various helper methods for enchanting tables
+  - `EnchantingOption` - represents an option on the enchanting table menu
+  - `IncompatibleEnchantmentGroups` - list of constants naming groups of enchantments that are incompatible with each other - custom enchantments may be added using these group names to make them incompatible with existing enchantments in the same group
+  - `IncompatibleEnchantmentRegistry` - manages which enchantments are considered incompatible with each other - custom enchantments may be added using existing group names to make them incompatible with existing enchantments in the same group, or to entirely new groups
+  - `ItemEnchantmentTagRegistry` - manages item enchantment compatibility tags and which tags include which other tags
+  - `ItemEnchantmentTags` - list of constants naming item types for enchantment compatibility checks
+- The following classes have been deprecated
+  - `ItemFlags`
+- The following API methods have been added:
+  - `public Enchantment->isCompatibleWith(Enchantment $other) : bool`
+  - `public Enchantment->getMinEnchantingPower()` - returns the minimum enchanting power (derived from enchantability and number of bookshelves) needed to allow this enchantment to show on the enchanting table with a given level
+  - `public Enchantment->getMaxEnchantingPower()` - upper limit of enchanting power for this enchantment to be offered on the enchanting table with a given level
+- The following API methods have signature changes:
+  - `Enchantment->__construct()` now accepts optional `(\Closure(int $level) : int)|null $minEnchantingPower` and `int $enchantingPowerRange` parameters
+  - `Enchantment->__construct()` parameters `$primaryItemFlags` and `$secondaryItemFlags` are now deprecated and no longer used
+  - `ProtectionEnchantment->__construct()` has extra parameters to reflect `Enchantment->__construct()` changes
+- The following API methods have been deprecated:
+  - `Enchantment->getPrimaryItemFlags()` - use API methods provided by `AvailableEnchantmentRegistry` instead
+  - `Enchantment->getSecondaryItemFlags()` - use API methods provided by `AvailableEnchantmentRegistry` instead
+  - `Enchantment->hasPrimaryItemType()`
+  - `Enchantment->hasSecondaryItemType()`
+
+### `pocketmine\plugin`
+- The following new API methods have been added:
+  - `public PluginBase->getResourcePath(string $filename) : string` - returns a URI to an embedded resource file that can be used with `file_get_contents()` and similar functions
+  - `public PluginBase->getResourceFolder() : string` - returns a URI to the plugin's folder of embedded resources
+- The following API methods have been deprecated:
+  - `PluginBase->getResource()` - prefer using `getResourcePath()` with `file_get_contents()` or other PHP built-in functions instead
+
+### `pocketmine\resourcepacks`
+- The following new API methods have been added:
+  - `public ResourcePackManager->setResourcePacksRequired(bool $value) : void` - sets whether players must accept resource packs in order to join
+
+### `pocketmine\world\generator`
+- The following new API methods have been added:
+  - `public GeneratorManager->addAlias(string $name, string $alias) : void` - allows registering a generator alias without copying the generator registration parameters
+
+### `pocketmine\world\sound`
+- The following new classes have been added:
+- `PressurePlateActivateSound`
+- `PressurePlateDeactivateSound`
+
+### `pocketmine\utils`
+- The following new API methods have been added:
+  - `public StringToTParser->registerAlias(string $existing, string $alias) : void` - allows registering a string alias without copying registration parameters
+
+## Internals
+- Various `TypeIdMap` classes in the `pocketmine\data\bedrock` package now use the new `IntSaveIdMapTrait` to reduce code duplication.
+- Added a new `ServerProperties` class containing constants for all known `server.properties` keys.
+- Added a new `YmlServerProperties` class containing generated constants for all known `pocketmine.yml` keys. These keys can be used with `Config->getNested()`.
+
diff --git a/changelogs/5.6.md b/changelogs/5.6.md
new file mode 100644
index 0000000000..257289a4a8
--- /dev/null
+++ b/changelogs/5.6.md
@@ -0,0 +1,34 @@
+# 5.6.0
+Released 20th September 2023.
+
+**For Minecraft: Bedrock Edition 1.20.30**
+
+This is a support release for Minecraft: Bedrock Edition 1.20.30.
+
+**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.20.30.
+- Removed support for older versions.
+
+## Fixes
+- Fixed support conditions for hanging roots, cave vines and dead bushes.
+- Fixed connection conditions for fences, glass panes, iron bars, and walls.
+
+# 5.6.1
+Released 20th October 2023.
+
+## Performance
+- Improved performance of cactus growth by disabling neighbour updates when only the age property was updated. While this isn't a perfect solution, it provides significant performance gains for servers with large cactus farms.
+
+## Fixes
+- Fixed `tools/generate-bedrock-data-from-packets.php` incorrectly interpreting network meta as blockstates in some cases (broken crafting recipes).
+- Fixed crafting recipes involving beds, skulls and some other items not working correctly (incorrectly interpreted data).
+- Fixed crashes when flower pot or cauldron blockentities exist in places where they shouldn't (leftovers from upgraded PM3 worlds).
+- Fixed `Entity->broadcastSound()` not firing `WorldSoundEvent` (bypassing internal sound system).
+- Fixed wooden signs, buttons and doors not being able to be used as furnace fuel.
+- Fixed bone meal and tools only working when used on the top side of dirt and grass. Bone meal now works from any side, and tools work on any side except the bottom.
diff --git a/changelogs/5.7.md b/changelogs/5.7.md
new file mode 100644
index 0000000000..9134f299e2
--- /dev/null
+++ b/changelogs/5.7.md
@@ -0,0 +1,27 @@
+# 5.7.0
+Released 26th October 2023.
+
+**For Minecraft: Bedrock Edition 1.20.40**
+
+This is a support release for Minecraft: Bedrock Edition 1.20.40.
+
+**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.20.40.
+- Removed support for older versions.
+
+## Fixes
+- Fixed `cartography_table`, `smithing_table`, `stripped_cherry_log` and `stripped_cherry_wood` not working in `StringToItemParser`.
+- Fixed `Promise<null>::onCompletion()` always calling the reject handler if the promise was already completed.
+
+# 5.7.1
+Released 1st November 2023.
+
+## Fixes
+- Fixed non-reentrant-safe code in `PermissionManager` and various other subscriber subsystems.
+  - These issues caused server crashes when deleting a subscriber indirectly triggered the deletion of other subscribers (e.g. due to the GC activating in `unset()`).
diff --git a/changelogs/5.8.md b/changelogs/5.8.md
new file mode 100644
index 0000000000..7ae64742c8
--- /dev/null
+++ b/changelogs/5.8.md
@@ -0,0 +1,138 @@
+# 5.8.0
+Released 1st November 2023.
+
+**Borked release, forgot to merge branches.**
+
+# 5.8.1
+Released 1st November 2023.
+
+**For Minecraft: Bedrock Edition 1.20.40**
+
+This is a minor feature release, including new gameplay features, various performance improvements to internal `World` and `Block` systems, and changes to the API.
+
+**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
+- Neighbour block updates now have a separate timer for timings. Previously, these were counted under `Scheduled Block Updates`, which was misleading.
+
+## Performance
+- `LightUpdate` now avoids attempting to propagate back in the same direction the light came from. This produces a small performance improvement of around 6% in light propagation.
+- Improved worst-case (non-cached) performance of `World::getCollisionBlocks()` (and its successor `World::getBlockCollisionBlocks()`).
+  - While 5.5.0 introduced caching at the `World` level for AABBs, the cache was rarely useful due to entity and player movement being too unpredictable. This meant that most users saw a performance degradation with lots of moving entities, except in specific situations.
+  - Performance for fetching non-cached AABBs for a cell is now improved by 2x. Overall performance benefit to a server depends on the number of entities and players.
+- Added cache for hydrated farmland blocks to remember the last known location of nearby water.
+  - If nearby water sources are not changed, this cache allows hydrated farmland to completely avoid checking up to 161 nearby blocks for water after the first check.
+  - Tests with large wheat farms showed a 25% performance improvement in overall server performance compared to previous 5.x versions.
+- Migrated various internal enums to native PHP 8.1 enums. Bypassing magic `__callStatic()` accessors improved performance in many areas, although it's hard to quantify the exact benefit.
+- Made use of `Facing::OFFSET` constant in various places to avoid unnecessary `Vector3` and `Position` object allocations. Many pathways benefit from this, including neighbour block updates (due to faster `Block::getSide()` and less useless objects).
+- Avoided clearing block AABB caches except when strictly necessary. Previously, the cache was wiped every time blocks were read from the world, making them mostly useless.
+- Avoided random updates on blocks which have reached their final state, such as fully-grown crops. This produces a minimal performance improvement.
+- Removed useless checks in some `World` hot paths.
+
+## API
+### General
+- All enums have been migrated to native PHP 8.1 enums.
+  - For now, the old APIs and accessors are still usable (via `LegacyEnumShimTrait`), but these will be removed in the next major release.
+  - `EnumTrait` has been deprecated, and will be removed in the next major release.
+  - Migration for most plugin developers will simply involve deleting `()` from the end of enum case usages, which is a trivial change and also improves performance.
+  - Plugin usages of `EnumTrait` are encouraged to move to native enums, optionally using `LegacyEnumShimTrait` to provide backwards compatibility.
+    - See [this code](https://github.com/pmmp/PocketMine-MP/blob/9832fe899f13a8ea47cc9d73de7088f7775a12f5/src/block/utils/DyeColor.php#L85-L107) for an example of how to associate properties with enum cases (since native enums don't support this directly).
+  - Thanks to improvements in `RuntimeDataDescriber`, any native enum can now be used as a custom block's state property.
+
+### `pocketmine\block`
+- The following classes have been added:
+  - `utils\AgeableTrait` - used by blocks which have an age property, such as crops
+  - `utils\StaticSupportTrait` - used by blocks which have the same support requirements regardless of their state, such as crops
+
+### `pocketmine\data\runtime`
+- The following API methods have been added:
+  - `public RuntimeDataDescriber->boundedIntAuto(int $min, int $max, int &$value) : void` - similar to `boundedInt()`, but automatically calculates the needed number of bits based on the given min/max
+  - `public RuntimeDataDescriber->enum(T extends \UnitEnum &$case) : void` - describes any native PHP 8.1 enum case
+  - `public RuntimeDataDescriber->enumSet(array<int, T extends \UnitEnum> &$set, array<int, T extends \UnitEnum> $allCases) : void` - describes a set of enum cases (similar to bitflags)
+- The following API methods have been deprecated:
+  - `RuntimeDataDescriber->bellAttachmentType()` - use `enum()` instead
+  - `RuntimeDataDescriber->boundedInt()` - use `boundedIntAuto()` instead
+  - `RuntimeDataDescriber->brewingStandSlots()` - use `enumSet()` instead
+  - `RuntimeDataDescriber->copperOxidation()` - use `enum()` instead
+  - `RuntimeDataDescriber->coralType()` - use `enum()` instead
+  - `RuntimeDataDescriber->dirtType()` - use `enum()` instead
+  - `RuntimeDataDescriber->dripleafState()` - use `enum()` instead
+  - `RuntimeDataDescriber->dyeColor()` - use `enum()` instead
+  - `RuntimeDataDescriber->froglightType()` - use `enum()` instead
+  - `RuntimeDataDescriber->leverFacing()` - use `enum()` instead
+  - `RuntimeDataDescriber->medicineType()` - use `enum()` instead
+  - `RuntimeDataDescriber->mobHeadType()` - use `enum()` instead
+  - `RuntimeDataDescriber->mushroomBlockType()` - use `enum()` instead
+  - `RuntimeDataDescriber->potionType()` - use `enum()` instead
+  - `RuntimeDataDescriber->slabType()` - use `enum()` instead
+  - `RuntimeDataDescriber->suspiciousStewType()` - use `enum()` instead
+
+### `pocketmine\player`
+- `TitleID` is now included in `PlayerInfo` metadata for plugin consumption.
+
+### `pocketmine\world`
+- The following API methods have been added:
+  - `public World->getBlockCollisionBoxes(AxisAlignedBB $bb) : list<AxisAlignedBB>` - similar to `getCollisionBoxes` but exclusively for blocks, avoiding the need for conditionally useless parameters
+- The following API methods have been deprecated:
+  - `World->getCollisionBoxes()` - use `getBlockCollisionBoxes()` instead (alongside `getCollidingEntities()` if entity collision boxes are also required)
+
+### `pocketmine\utils`
+- The following classes have been deprecated:
+  - `EnumTrait` - use native PHP 8.1 enums instead
+- The following classes have been added:
+  - `LegacyEnumShimTrait` - can be `use`d by native PHP 8.1 enums to provide the same API as `EnumTrait`
+
+## Gameplay
+### Blocks
+- Implemented the following blocks:
+  - Amethyst
+  - Amethyst Cluster
+  - Chiseled Bookshelf
+  - Crimson Roots
+  - Pitcher Crop
+  - Pitcher Plant
+  - Torchflower
+  - Torchflower Crop
+  - Warped Roots
+
+### Items
+- Implemented the following items:
+  - Pitcher Pod
+  - Torchflower Seeds
+
+## Internals
+- `Farmland` block now has an extra property (`waterPositionIndex`) stored in its blockstate ID to track the position of nearby water. This property is not saved to disk, and is only used for caching.
+- The format of internal blockstate ID has been updated.
+  - The lower `11` bits are now reserved for state data (previously `8` bits). This increase facilitates the new cache for `Farmland` blocks.
+  - The state data bits are now XOR'd with the `xxh3` of the block's type ID, instead of being directly XOR'd with the type ID.
+    - This XOR improves the distribution of the lower bits of the blockstate ID, which is important for hashtable indexing to minimize collisions.
+    - Previously, the lower bits were XOR'd with the type ID directly, but the effectiveness of this reduced as more state data bits were added.
+    - `xxh3` produces consistently good results for this purpose regardless of the number of state data bits allocated.
+    - Hash collisions with blockstate IDs are reduced by 50% with this change, which is a happy side effect.
+  - This is backwards-incompatible, so anyone saving internal blockstate IDs on disk or in a DB will be burned by this change (though they shouldn't have been doing that anyway).
+- Removed code generation step for `RuntimeDataDescriber` enum serialization. All described enums now use PHP 8.1 native enums, which can be described without codegen using `RuntimeDataDescriber->enum()`.
+- Added `DeprecatedLegacyEnumAccessRule` custom PHPStan rule to flag legacy `EnumTrait` case accessors.
+- Cleaned up remaining hardcoded `Config` keys in `SetupWizard`. These usages now use auto-generated constants like the rest of the codebase.
+
+# 5.8.2
+Released 9th November 2023.
+
+## Performance
+- Improved performance of small packet zero-compression (unintended use of slow zlib compressor instead of fast libdeflate one).
+  - This affected the majority of outbound packets, as most packets are below the 256-byte threshold for compression.
+  - This faster method is over 20x faster than the old method, producing noticeable performance gains for large servers.
+
+## Fixes
+- Fixed melons and pumpkins not growing.
+- Fixed melon and pumpkin stems not attaching to the grown melon/pumpkin.
+- Fixed iron and gold ores not being affected by the Fortune enchantment.
+- Fixed ancient debris burning in lava.
+- Fixed sign (front) text loading from vanilla world saves (back text is not yet supported).
+
+## Internals
+- Removed bogus optimization from `tools/generate-blockstate-upgrade-schema.php` that could cause incorrect `remappedStates` generation when some of the states stayed under the old ID.
+- Fixed possible crash in `BlockStateUpgrader` name flattening rule handling with invalid blockstate NBT data.
diff --git a/changelogs/5.9.md b/changelogs/5.9.md
new file mode 100644
index 0000000000..2467be638e
--- /dev/null
+++ b/changelogs/5.9.md
@@ -0,0 +1,30 @@
+# 5.9.0
+Released 6th December 2023.
+
+**For Minecraft: Bedrock Edition 1.20.50**
+
+This is a support release for Minecraft: Bedrock Edition 1.20.50.
+
+**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.20.50.
+- Removed support for older versions.
+
+## Fixes
+- Fixed `pitcher_plant` and `pitcher_pod` not being accepted by `StringToItemParser` (and therefore not being usable in commands).
+- Rotation of items in item frames in worlds from newer versions of Bedrock is now correctly loaded.
+- Fixed possible crash in block update sending if a chunk was unloaded during a previous chunk's block update syncing.
+- Fixed `AsyncTask::fetchLocal()` throwing an exception if `null` was stored in the local storage.
+
+## Documentation
+- `Server::prepareBatch()` is now correctly marked as `@internal`.
+- Updated documentation for `Server::prepareBatch()` to accurately reflect its behaviour.
+- Fixed incorrect path in doc comments of `EnumTrait` and `RegistryTrait`.
+
+## Internals
+- Added PHP 8.3 to the test matrix. This has not been thoroughly tested yet, so it should only be used for testing purposes.
diff --git a/composer.json b/composer.json
index 7a9779a008..9747cb5678 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
    "homepage": "https://pmmp.io",
    "license": "LGPL-3.0",
    "require": {
-      "php": "^8.0",
+      "php": "^8.1",
       "php-64bit": "*",
       "ext-chunkutils2": "^0.3.1",
       "ext-crypto": "^0.3.1",
@@ -22,7 +22,7 @@
       "ext-openssl": "*",
       "ext-pcre": "*",
       "ext-phar": "*",
-      "ext-pthreads": "^4.0",
+      "ext-pmmpthread": "^6.1.0",
       "ext-reflection": "*",
       "ext-simplexml": "*",
       "ext-sockets": "*",
@@ -31,33 +31,31 @@
       "ext-zip": "*",
       "ext-zlib": ">=1.2.11",
       "composer-runtime-api": "^2.0",
-      "adhocore/json-comment": "^1.1",
-      "fgrosse/phpasn1": "^2.3",
-      "netresearch/jsonmapper": "^4.0",
-      "pocketmine/bedrock-data": "~1.13.0+bedrock-1.19.50",
-      "pocketmine/bedrock-protocol": "~18.0.0+bedrock-1.19.50",
+      "adhocore/json-comment": "~1.2.0",
+      "pocketmine/netresearch-jsonmapper": "~v4.4.999",
+      "pocketmine/bedrock-block-upgrade-schema": "~5.0.0+bedrock-1.21.40",
+      "pocketmine/bedrock-data": "~2.14.0+bedrock-1.21.40",
+      "pocketmine/bedrock-item-upgrade-schema": "~1.13.0+bedrock-1.21.40",
+      "pocketmine/bedrock-protocol": "~35.0.0+bedrock-1.21.40",
       "pocketmine/binaryutils": "^0.2.1",
       "pocketmine/callback-validator": "^1.0.2",
-      "pocketmine/classloader": "^0.2.0",
       "pocketmine/color": "^0.3.0",
-      "pocketmine/errorhandler": "^0.6.0",
-      "pocketmine/locale-data": "~2.17.0",
+      "pocketmine/errorhandler": "^0.7.0",
+      "pocketmine/locale-data": "~2.21.0",
       "pocketmine/log": "^0.4.0",
-      "pocketmine/log-pthreads": "^0.4.0",
-      "pocketmine/math": "^0.4.0",
-      "pocketmine/nbt": "^0.3.2",
-      "pocketmine/raklib": "^0.14.2",
-      "pocketmine/raklib-ipc": "^0.1.0",
-      "pocketmine/snooze": "^0.3.0",
-      "ramsey/uuid": "^4.1",
-      "symfony/filesystem": "^5.4",
-      "webmozart/path-util": "^2.3"
+      "pocketmine/math": "~1.0.0",
+      "pocketmine/nbt": "~1.0.0",
+      "pocketmine/raklib": "~1.1.0",
+      "pocketmine/raklib-ipc": "~1.0.0",
+      "pocketmine/snooze": "^0.5.0",
+      "ramsey/uuid": "~4.7.0",
+      "symfony/filesystem": "~6.4.0"
    },
    "require-dev": {
-      "phpstan/phpstan": "1.9.11",
+      "phpstan/phpstan": "1.11.11",
       "phpstan/phpstan-phpunit": "^1.1.0",
       "phpstan/phpstan-strict-rules": "^1.2.0",
-      "phpunit/phpunit": "^9.2"
+      "phpunit/phpunit": "^10.5.24"
    },
    "autoload": {
       "psr-4": {
@@ -75,7 +73,7 @@
    },
    "config": {
       "platform": {
-         "php": "8.0.0"
+         "php": "8.1.0"
       },
       "sort-packages": true
    },
@@ -85,11 +83,14 @@
          "@composer install --no-dev --classmap-authoritative --ignore-platform-reqs",
          "@php -dphar.readonly=0 build/server-phar.php"
       ],
-      "update-registry-annotations": [
+      "update-codegen": [
+         "@php build/generate-bedrockdata-path-consts.php",
+         "@php build/generate-biome-ids.php",
+         "@php build/generate-block-serializer-consts.php vendor/pocketmine/bedrock-data/canonical_block_states.nbt",
+         "@php build/generate-item-type-names.php vendor/pocketmine/bedrock-data/required_item_list.json",
+         "@php build/generate-known-translation-apis.php",
+         "@php build/generate-pocketmine-yml-property-consts.php",
          "@php build/generate-registry-annotations.php src"
-      ],
-      "update-translation-apis": [
-         "@php build/generate-known-translation-apis.php"
       ]
    }
 }
diff --git a/composer.lock b/composer.lock
index 60611b0ebe..c1a0b0073a 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": "b96f3344335da3824bd4640210c9499e",
+    "content-hash": "476374fb3d22e26a97c1dea8c6736faf",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -67,26 +67,25 @@
         },
         {
             "name": "brick/math",
-            "version": "0.10.2",
+            "version": "0.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f"
+                "reference": "f510c0a40911935b77b86859eb5223d58d660df1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/459f2781e1a08d52ee56b0b1444086e038561e3f",
-                "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f",
+                "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1",
+                "reference": "f510c0a40911935b77b86859eb5223d58d660df1",
                 "shasum": ""
             },
             "require": {
-                "ext-json": "*",
-                "php": "^7.4 || ^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.2",
-                "phpunit/phpunit": "^9.0",
-                "vimeo/psalm": "4.25.0"
+                "phpunit/phpunit": "^10.1",
+                "vimeo/psalm": "5.16.0"
             },
             "type": "library",
             "autoload": {
@@ -106,12 +105,17 @@
                 "arithmetic",
                 "bigdecimal",
                 "bignum",
+                "bignumber",
                 "brick",
-                "math"
+                "decimal",
+                "integer",
+                "math",
+                "mathematics",
+                "rational"
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.10.2"
+                "source": "https://github.com/brick/math/tree/0.12.1"
             },
             "funding": [
                 {
@@ -119,147 +123,46 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-08-10T22:54:19+00:00"
+            "time": "2023-11-29T23:19:16+00:00"
         },
         {
-            "name": "fgrosse/phpasn1",
-            "version": "v2.5.0",
+            "name": "pocketmine/bedrock-block-upgrade-schema",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/fgrosse/PHPASN1.git",
-                "reference": "42060ed45344789fb9f21f9f1864fc47b9e3507b"
+                "url": "https://github.com/pmmp/BedrockBlockUpgradeSchema.git",
+                "reference": "20dd5c11e9915bacea4fe2cf649e1d23697a6e52"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/42060ed45344789fb9f21f9f1864fc47b9e3507b",
-                "reference": "42060ed45344789fb9f21f9f1864fc47b9e3507b",
+                "url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/20dd5c11e9915bacea4fe2cf649e1d23697a6e52",
+                "reference": "20dd5c11e9915bacea4fe2cf649e1d23697a6e52",
                 "shasum": ""
             },
-            "require": {
-                "php": "^7.1 || ^8.0"
-            },
-            "require-dev": {
-                "php-coveralls/php-coveralls": "~2.0",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
-            },
-            "suggest": {
-                "ext-bcmath": "BCmath is the fallback extension for big integer calculations",
-                "ext-curl": "For loading OID information from the web if they have not bee defined statically",
-                "ext-gmp": "GMP is the preferred extension for big integer calculations",
-                "phpseclib/bcmath_compat": "BCmath polyfill for servers where neither GMP nor BCmath is available"
-            },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "FG\\": "lib/"
-                }
-            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Friedrich Große",
-                    "email": "friedrich.grosse@gmail.com",
-                    "homepage": "https://github.com/FGrosse",
-                    "role": "Author"
-                },
-                {
-                    "name": "All contributors",
-                    "homepage": "https://github.com/FGrosse/PHPASN1/contributors"
-                }
-            ],
-            "description": "A PHP Framework that allows you to encode and decode arbitrary ASN.1 structures using the ITU-T X.690 Encoding Rules.",
-            "homepage": "https://github.com/FGrosse/PHPASN1",
-            "keywords": [
-                "DER",
-                "asn.1",
-                "asn1",
-                "ber",
-                "binary",
-                "decoding",
-                "encoding",
-                "x.509",
-                "x.690",
-                "x509",
-                "x690"
+                "CC0-1.0"
             ],
+            "description": "Schemas describing how to upgrade saved block data in older Minecraft: Bedrock Edition world saves",
             "support": {
-                "issues": "https://github.com/fgrosse/PHPASN1/issues",
-                "source": "https://github.com/fgrosse/PHPASN1/tree/v2.5.0"
+                "issues": "https://github.com/pmmp/BedrockBlockUpgradeSchema/issues",
+                "source": "https://github.com/pmmp/BedrockBlockUpgradeSchema/tree/5.0.0"
             },
-            "abandoned": true,
-            "time": "2022-12-19T11:08:26+00:00"
-        },
-        {
-            "name": "netresearch/jsonmapper",
-            "version": "v4.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/cweiske/jsonmapper.git",
-                "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/cfa81ea1d35294d64adb9c68aa4cb9e92400e53f",
-                "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0",
-                "squizlabs/php_codesniffer": "~3.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "JsonMapper": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "OSL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Weiske",
-                    "email": "cweiske@cweiske.de",
-                    "homepage": "http://github.com/cweiske/jsonmapper/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Map nested JSON structures onto PHP classes",
-            "support": {
-                "email": "cweiske@cweiske.de",
-                "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/cweiske/jsonmapper/tree/v4.1.0"
-            },
-            "time": "2022-12-08T20:46:14+00:00"
+            "time": "2024-11-03T14:13:50+00:00"
         },
         {
             "name": "pocketmine/bedrock-data",
-            "version": "1.13.0+bedrock-1.19.50",
+            "version": "2.14.1+bedrock-1.21.40",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/BedrockData.git",
-                "reference": "57337ddc9433a0e245a1ce48c51af05f0573d58d"
+                "reference": "4a41864ed09613ecec6791e2ae076a8ec7089cc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/57337ddc9433a0e245a1ce48c51af05f0573d58d",
-                "reference": "57337ddc9433a0e245a1ce48c51af05f0573d58d",
+                "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/4a41864ed09613ecec6791e2ae076a8ec7089cc4",
+                "reference": "4a41864ed09613ecec6791e2ae076a8ec7089cc4",
                 "shasum": ""
             },
             "type": "library",
@@ -270,39 +173,64 @@
             "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.19.50"
+                "source": "https://github.com/pmmp/BedrockData/tree/2.14.1+bedrock-1.21.40"
             },
-            "time": "2022-11-30T16:19:59+00:00"
+            "time": "2024-11-12T21:36:20+00:00"
         },
         {
-            "name": "pocketmine/bedrock-protocol",
-            "version": "18.0.0+bedrock-1.19.50",
+            "name": "pocketmine/bedrock-item-upgrade-schema",
+            "version": "1.13.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/pmmp/BedrockProtocol.git",
-                "reference": "b558ec883bd967dd3339f513cba62d2fbcd63349"
+                "url": "https://github.com/pmmp/BedrockItemUpgradeSchema.git",
+                "reference": "1cf81305f2ffcf7dde9577c4f16a55c765192b03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/b558ec883bd967dd3339f513cba62d2fbcd63349",
-                "reference": "b558ec883bd967dd3339f513cba62d2fbcd63349",
+                "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/1cf81305f2ffcf7dde9577c4f16a55c765192b03",
+                "reference": "1cf81305f2ffcf7dde9577c4f16a55c765192b03",
+                "shasum": ""
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "CC0-1.0"
+            ],
+            "description": "JSON schemas for upgrading items found in older Minecraft: Bedrock world saves",
+            "support": {
+                "issues": "https://github.com/pmmp/BedrockItemUpgradeSchema/issues",
+                "source": "https://github.com/pmmp/BedrockItemUpgradeSchema/tree/1.13.1"
+            },
+            "time": "2024-11-12T21:33:17+00:00"
+        },
+        {
+            "name": "pocketmine/bedrock-protocol",
+            "version": "35.0.0+bedrock-1.21.40",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/BedrockProtocol.git",
+                "reference": "6aa7cbeb4a7ec6fa58f9024aeaddad7c5c65a459"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/6aa7cbeb4a7ec6fa58f9024aeaddad7c5c65a459",
+                "reference": "6aa7cbeb4a7ec6fa58f9024aeaddad7c5c65a459",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "netresearch/jsonmapper": "^4.0",
-                "php": "^8.0",
+                "php": "^8.1",
                 "pocketmine/binaryutils": "^0.2.0",
                 "pocketmine/color": "^0.2.0 || ^0.3.0",
-                "pocketmine/math": "^0.3.0 || ^0.4.0",
-                "pocketmine/nbt": "^0.3.0",
+                "pocketmine/math": "^0.3.0 || ^0.4.0 || ^1.0.0",
+                "pocketmine/nbt": "^1.0.0",
                 "ramsey/uuid": "^4.1"
             },
             "require-dev": {
-                "phpstan/phpstan": "1.9.4",
+                "phpstan/phpstan": "1.11.9",
                 "phpstan/phpstan-phpunit": "^1.0.0",
                 "phpstan/phpstan-strict-rules": "^1.0.0",
-                "phpunit/phpunit": "^9.5"
+                "phpunit/phpunit": "^9.5 || ^10.0"
             },
             "type": "library",
             "autoload": {
@@ -317,22 +245,22 @@
             "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/18.0.0+bedrock-1.19.50"
+                "source": "https://github.com/pmmp/BedrockProtocol/tree/35.0.0+bedrock-1.21.40"
             },
-            "time": "2023-01-06T21:47:35+00:00"
+            "time": "2024-10-24T15:45:43+00:00"
         },
         {
             "name": "pocketmine/binaryutils",
-            "version": "0.2.4",
+            "version": "0.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/BinaryUtils.git",
-                "reference": "5ac7eea91afbad8dc498f5ce34ce6297d5e6ea9a"
+                "reference": "ccfc1899b859d45814ea3592e20ebec4cb731c84"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/5ac7eea91afbad8dc498f5ce34ce6297d5e6ea9a",
-                "reference": "5ac7eea91afbad8dc498f5ce34ce6297d5e6ea9a",
+                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/ccfc1899b859d45814ea3592e20ebec4cb731c84",
+                "reference": "ccfc1899b859d45814ea3592e20ebec4cb731c84",
                 "shasum": ""
             },
             "require": {
@@ -341,10 +269,10 @@
             },
             "require-dev": {
                 "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "1.3.0",
+                "phpstan/phpstan": "~1.10.3",
                 "phpstan/phpstan-phpunit": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.0.0",
-                "phpunit/phpunit": "^9.5"
+                "phpunit/phpunit": "^9.5 || ^10.0 || ^11.0"
             },
             "type": "library",
             "autoload": {
@@ -359,9 +287,9 @@
             "description": "Classes and methods for conveniently handling binary data",
             "support": {
                 "issues": "https://github.com/pmmp/BinaryUtils/issues",
-                "source": "https://github.com/pmmp/BinaryUtils/tree/0.2.4"
+                "source": "https://github.com/pmmp/BinaryUtils/tree/0.2.6"
             },
-            "time": "2022-01-12T18:06:33+00:00"
+            "time": "2024-03-04T15:04:17+00:00"
         },
         {
             "name": "pocketmine/callback-validator",
@@ -413,70 +341,25 @@
             },
             "time": "2020-12-11T01:45:37+00:00"
         },
-        {
-            "name": "pocketmine/classloader",
-            "version": "0.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pmmp/ClassLoader.git",
-                "reference": "49ea303993efdfb39cd302e2156d50aa78209e78"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/ClassLoader/zipball/49ea303993efdfb39cd302e2156d50aa78209e78",
-                "reference": "49ea303993efdfb39cd302e2156d50aa78209e78",
-                "shasum": ""
-            },
-            "require": {
-                "ext-pthreads": "~3.2.0 || ^4.0",
-                "ext-reflection": "*",
-                "php": "^8.0"
-            },
-            "conflict": {
-                "pocketmine/spl": "<0.4"
-            },
-            "require-dev": {
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "0.12.99",
-                "phpstan/phpstan-strict-rules": "^0.12.4",
-                "phpunit/phpunit": "^9.5"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "./src"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-3.0"
-            ],
-            "description": "Ad-hoc autoloading components used by PocketMine-MP",
-            "support": {
-                "issues": "https://github.com/pmmp/ClassLoader/issues",
-                "source": "https://github.com/pmmp/ClassLoader/tree/0.2.0"
-            },
-            "time": "2021-11-01T20:17:27+00:00"
-        },
         {
             "name": "pocketmine/color",
-            "version": "0.3.0",
+            "version": "0.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/Color.git",
-                "reference": "8cb346d0a21ad3287cc8d7175e4b643416607249"
+                "reference": "a0421f1e9e0b0c619300fb92d593283378f6a5e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/Color/zipball/8cb346d0a21ad3287cc8d7175e4b643416607249",
-                "reference": "8cb346d0a21ad3287cc8d7175e4b643416607249",
+                "url": "https://api.github.com/repos/pmmp/Color/zipball/a0421f1e9e0b0c619300fb92d593283378f6a5e1",
+                "reference": "a0421f1e9e0b0c619300fb92d593283378f6a5e1",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "1.9.4",
+                "phpstan/phpstan": "1.10.3",
                 "phpstan/phpstan-strict-rules": "^1.2.0"
             },
             "type": "library",
@@ -492,31 +375,31 @@
             "description": "Color handling library used by PocketMine-MP and related projects",
             "support": {
                 "issues": "https://github.com/pmmp/Color/issues",
-                "source": "https://github.com/pmmp/Color/tree/0.3.0"
+                "source": "https://github.com/pmmp/Color/tree/0.3.1"
             },
-            "time": "2022-12-18T19:49:21+00:00"
+            "time": "2023-04-10T11:38:05+00:00"
         },
         {
             "name": "pocketmine/errorhandler",
-            "version": "0.6.0",
+            "version": "0.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/ErrorHandler.git",
-                "reference": "dae214a04348b911e8219ebf125ff1c5589cc878"
+                "reference": "cae94884368a74ece5294b9ff7fef18732dcd921"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/ErrorHandler/zipball/dae214a04348b911e8219ebf125ff1c5589cc878",
-                "reference": "dae214a04348b911e8219ebf125ff1c5589cc878",
+                "url": "https://api.github.com/repos/pmmp/ErrorHandler/zipball/cae94884368a74ece5294b9ff7fef18732dcd921",
+                "reference": "cae94884368a74ece5294b9ff7fef18732dcd921",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "0.12.99",
-                "phpstan/phpstan-strict-rules": "^0.12.2",
-                "phpunit/phpunit": "^9.5"
+                "phpstan/phpstan": "~1.10.3",
+                "phpstan/phpstan-strict-rules": "^1.0",
+                "phpunit/phpunit": "^9.5 || ^10.0 || ^11.0"
             },
             "type": "library",
             "autoload": {
@@ -531,22 +414,22 @@
             "description": "Utilities to handle nasty PHP E_* errors in a usable way",
             "support": {
                 "issues": "https://github.com/pmmp/ErrorHandler/issues",
-                "source": "https://github.com/pmmp/ErrorHandler/tree/0.6.0"
+                "source": "https://github.com/pmmp/ErrorHandler/tree/0.7.0"
             },
-            "time": "2022-01-08T21:05:46+00:00"
+            "time": "2024-04-02T18:29:54+00:00"
         },
         {
             "name": "pocketmine/locale-data",
-            "version": "2.17.0",
+            "version": "2.21.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/Language.git",
-                "reference": "a2c7071117c98ccc0e333994271cab1072eb3c06"
+                "reference": "fdba0f764d6281f64e5968dca94fdab96bf4e167"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/Language/zipball/a2c7071117c98ccc0e333994271cab1072eb3c06",
-                "reference": "a2c7071117c98ccc0e333994271cab1072eb3c06",
+                "url": "https://api.github.com/repos/pmmp/Language/zipball/fdba0f764d6281f64e5968dca94fdab96bf4e167",
+                "reference": "fdba0f764d6281f64e5968dca94fdab96bf4e167",
                 "shasum": ""
             },
             "type": "library",
@@ -554,9 +437,9 @@
             "description": "Language resources used by PocketMine-MP",
             "support": {
                 "issues": "https://github.com/pmmp/Language/issues",
-                "source": "https://github.com/pmmp/Language/tree/2.17.0"
+                "source": "https://github.com/pmmp/Language/tree/2.21.1"
             },
-            "time": "2023-01-13T17:22:45+00:00"
+            "time": "2024-11-14T23:11:22+00:00"
         },
         {
             "name": "pocketmine/log",
@@ -599,62 +482,18 @@
             },
             "time": "2021-06-18T19:08:09+00:00"
         },
-        {
-            "name": "pocketmine/log-pthreads",
-            "version": "0.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pmmp/LogPthreads.git",
-                "reference": "61f709e8cf36bcc24e4efe02acded680a1ce23cd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/LogPthreads/zipball/61f709e8cf36bcc24e4efe02acded680a1ce23cd",
-                "reference": "61f709e8cf36bcc24e4efe02acded680a1ce23cd",
-                "shasum": ""
-            },
-            "require": {
-                "ext-pthreads": "~3.2.0 || ^4.0",
-                "php": "^7.4 || ^8.0",
-                "pocketmine/log": "^0.4.0"
-            },
-            "conflict": {
-                "pocketmine/spl": "<0.4"
-            },
-            "require-dev": {
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "0.12.88",
-                "phpstan/phpstan-strict-rules": "^0.12.4"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "./src"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-3.0"
-            ],
-            "description": "Logging components specialized for pthreads used by PocketMine-MP and related projects",
-            "support": {
-                "issues": "https://github.com/pmmp/LogPthreads/issues",
-                "source": "https://github.com/pmmp/LogPthreads/tree/0.4.0"
-            },
-            "time": "2021-11-01T21:42:09+00:00"
-        },
         {
             "name": "pocketmine/math",
-            "version": "0.4.3",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/Math.git",
-                "reference": "47a243d320b01c8099d65309967934c188111549"
+                "reference": "dc132d93595b32e9f210d78b3c8d43c662a5edbf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/Math/zipball/47a243d320b01c8099d65309967934c188111549",
-                "reference": "47a243d320b01c8099d65309967934c188111549",
+                "url": "https://api.github.com/repos/pmmp/Math/zipball/dc132d93595b32e9f210d78b3c8d43c662a5edbf",
+                "reference": "dc132d93595b32e9f210d78b3c8d43c662a5edbf",
                 "shasum": ""
             },
             "require": {
@@ -663,7 +502,7 @@
             },
             "require-dev": {
                 "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "1.8.2",
+                "phpstan/phpstan": "~1.10.3",
                 "phpstan/phpstan-strict-rules": "^1.0",
                 "phpunit/phpunit": "^8.5 || ^9.5"
             },
@@ -680,22 +519,22 @@
             "description": "PHP library containing math related code used in PocketMine-MP",
             "support": {
                 "issues": "https://github.com/pmmp/Math/issues",
-                "source": "https://github.com/pmmp/Math/tree/0.4.3"
+                "source": "https://github.com/pmmp/Math/tree/1.0.0"
             },
-            "time": "2022-08-25T18:43:37+00:00"
+            "time": "2023-08-03T12:56:33+00:00"
         },
         {
             "name": "pocketmine/nbt",
-            "version": "0.3.3",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/NBT.git",
-                "reference": "f4321be50df1a18b9f4e94d428a2e68a6e2ac2b4"
+                "reference": "20540271cb59e04672cb163dca73366f207974f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/NBT/zipball/f4321be50df1a18b9f4e94d428a2e68a6e2ac2b4",
-                "reference": "f4321be50df1a18b9f4e94d428a2e68a6e2ac2b4",
+                "url": "https://api.github.com/repos/pmmp/NBT/zipball/20540271cb59e04672cb163dca73366f207974f1",
+                "reference": "20540271cb59e04672cb163dca73366f207974f1",
                 "shasum": ""
             },
             "require": {
@@ -705,7 +544,7 @@
             },
             "require-dev": {
                 "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "1.7.7",
+                "phpstan/phpstan": "1.10.25",
                 "phpstan/phpstan-strict-rules": "^1.0",
                 "phpunit/phpunit": "^9.5"
             },
@@ -722,34 +561,88 @@
             "description": "PHP library for working with Named Binary Tags",
             "support": {
                 "issues": "https://github.com/pmmp/NBT/issues",
-                "source": "https://github.com/pmmp/NBT/tree/0.3.3"
+                "source": "https://github.com/pmmp/NBT/tree/1.0.0"
             },
-            "time": "2022-07-06T14:13:26+00:00"
+            "time": "2023-07-14T13:01:49+00:00"
         },
         {
-            "name": "pocketmine/raklib",
-            "version": "0.14.5",
+            "name": "pocketmine/netresearch-jsonmapper",
+            "version": "v4.4.999",
             "source": {
                 "type": "git",
-                "url": "https://github.com/pmmp/RakLib.git",
-                "reference": "85b4e5cb7117d37e010eeadb3ff53b21276c6f48"
+                "url": "https://github.com/pmmp/netresearch-jsonmapper.git",
+                "reference": "9a6610033d56e358e86a3e4fd5f87063c7318833"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/85b4e5cb7117d37e010eeadb3ff53b21276c6f48",
-                "reference": "85b4e5cb7117d37e010eeadb3ff53b21276c6f48",
+                "url": "https://api.github.com/repos/pmmp/netresearch-jsonmapper/zipball/9a6610033d56e358e86a3e4fd5f87063c7318833",
+                "reference": "9a6610033d56e358e86a3e4fd5f87063c7318833",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=7.1"
+            },
+            "replace": {
+                "netresearch/jsonmapper": "~4.2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0",
+                "squizlabs/php_codesniffer": "~3.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "JsonMapper": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "OSL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Weiske",
+                    "email": "cweiske@cweiske.de",
+                    "homepage": "http://github.com/cweiske/jsonmapper/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Fork of netresearch/jsonmapper with security fixes needed by pocketmine/pocketmine-mp",
+            "support": {
+                "email": "cweiske@cweiske.de",
+                "issues": "https://github.com/cweiske/jsonmapper/issues",
+                "source": "https://github.com/pmmp/netresearch-jsonmapper/tree/v4.4.999"
+            },
+            "time": "2024-02-23T13:17:01+00:00"
+        },
+        {
+            "name": "pocketmine/raklib",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/RakLib.git",
+                "reference": "be2783be516bf6e2872ff5c81fb9048596617b97"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/be2783be516bf6e2872ff5c81fb9048596617b97",
+                "reference": "be2783be516bf6e2872ff5c81fb9048596617b97",
                 "shasum": ""
             },
             "require": {
                 "ext-sockets": "*",
-                "php": "^8.0",
+                "php": "^8.1",
                 "php-64bit": "*",
                 "php-ipv6": "*",
                 "pocketmine/binaryutils": "^0.2.0",
                 "pocketmine/log": "^0.3.0 || ^0.4.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "1.7.7",
+                "phpstan/phpstan": "1.10.1",
                 "phpstan/phpstan-strict-rules": "^1.0"
             },
             "type": "library",
@@ -765,33 +658,33 @@
             "description": "A RakNet server implementation written in PHP",
             "support": {
                 "issues": "https://github.com/pmmp/RakLib/issues",
-                "source": "https://github.com/pmmp/RakLib/tree/0.14.5"
+                "source": "https://github.com/pmmp/RakLib/tree/1.1.1"
             },
-            "time": "2022-08-25T16:16:44+00:00"
+            "time": "2024-03-04T14:02:14+00:00"
         },
         {
             "name": "pocketmine/raklib-ipc",
-            "version": "0.1.1",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/RakLibIpc.git",
-                "reference": "922a6444b0c6c7daaa5aa5a832107e1ec4738aed"
+                "reference": "ce632ef2c6743e71eddb5dc329c49af6555f90bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/RakLibIpc/zipball/922a6444b0c6c7daaa5aa5a832107e1ec4738aed",
-                "reference": "922a6444b0c6c7daaa5aa5a832107e1ec4738aed",
+                "url": "https://api.github.com/repos/pmmp/RakLibIpc/zipball/ce632ef2c6743e71eddb5dc329c49af6555f90bc",
+                "reference": "ce632ef2c6743e71eddb5dc329c49af6555f90bc",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4 || ^8.0",
+                "php": "^8.0",
                 "php-64bit": "*",
                 "pocketmine/binaryutils": "^0.2.0",
-                "pocketmine/raklib": "^0.13.1 || ^0.14.0"
+                "pocketmine/raklib": "^0.15.0 || ^1.0.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "0.12.81",
-                "phpstan/phpstan-strict-rules": "^0.12.2"
+                "phpstan/phpstan": "1.10.1",
+                "phpstan/phpstan-strict-rules": "^1.0.0"
             },
             "type": "library",
             "autoload": {
@@ -806,32 +699,32 @@
             "description": "Channel-based protocols for inter-thread/inter-process communication with RakLib",
             "support": {
                 "issues": "https://github.com/pmmp/RakLibIpc/issues",
-                "source": "https://github.com/pmmp/RakLibIpc/tree/0.1.1"
+                "source": "https://github.com/pmmp/RakLibIpc/tree/1.0.1"
             },
-            "time": "2021-09-22T17:01:12+00:00"
+            "time": "2024-03-01T15:55:05+00:00"
         },
         {
             "name": "pocketmine/snooze",
-            "version": "0.3.1",
+            "version": "0.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/Snooze.git",
-                "reference": "0ac8fc2a781c419a1f64ebca4d5835028f59e29b"
+                "reference": "a86d9ee60ce44755d166d3c7ba4b8b8be8360915"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/Snooze/zipball/0ac8fc2a781c419a1f64ebca4d5835028f59e29b",
-                "reference": "0ac8fc2a781c419a1f64ebca4d5835028f59e29b",
+                "url": "https://api.github.com/repos/pmmp/Snooze/zipball/a86d9ee60ce44755d166d3c7ba4b8b8be8360915",
+                "reference": "a86d9ee60ce44755d166d3c7ba4b8b8be8360915",
                 "shasum": ""
             },
             "require": {
-                "ext-pthreads": "~3.2.0 || ^4.0",
-                "php-64bit": "^7.3 || ^8.0"
+                "ext-pmmpthread": "^6.0",
+                "php-64bit": "^8.1"
             },
             "require-dev": {
                 "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "0.12.99",
-                "phpstan/phpstan-strict-rules": "^0.12.4"
+                "phpstan/phpstan": "1.10.3",
+                "phpstan/phpstan-strict-rules": "^1.0"
             },
             "type": "library",
             "autoload": {
@@ -846,27 +739,26 @@
             "description": "Thread notification management library for code using the pthreads extension",
             "support": {
                 "issues": "https://github.com/pmmp/Snooze/issues",
-                "source": "https://github.com/pmmp/Snooze/tree/0.3.1"
+                "source": "https://github.com/pmmp/Snooze/tree/0.5.0"
             },
-            "time": "2021-11-01T20:50:08+00:00"
+            "time": "2023-05-22T23:43:01+00:00"
         },
         {
             "name": "ramsey/collection",
-            "version": "1.3.0",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/collection.git",
-                "reference": "ad7475d1c9e70b190ecffc58f2d989416af339b4"
+                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/collection/zipball/ad7475d1c9e70b190ecffc58f2d989416af339b4",
-                "reference": "ad7475d1c9e70b190ecffc58f2d989416af339b4",
+                "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
+                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4 || ^8.0",
-                "symfony/polyfill-php81": "^1.23"
+                "php": "^8.1"
             },
             "require-dev": {
                 "captainhook/plugin-composer": "^5.3",
@@ -926,7 +818,7 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/collection/issues",
-                "source": "https://github.com/ramsey/collection/tree/1.3.0"
+                "source": "https://github.com/ramsey/collection/tree/2.0.0"
             },
             "funding": [
                 {
@@ -938,24 +830,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-27T19:12:24+00:00"
+            "time": "2022-12-31T21:50:55+00:00"
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.7.3",
+            "version": "4.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "433b2014e3979047db08a17a205f410ba3869cf2"
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/433b2014e3979047db08a17a205f410ba3869cf2",
-                "reference": "433b2014e3979047db08a17a205f410ba3869cf2",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088",
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12",
                 "ext-json": "*",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
@@ -1018,7 +910,7 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.7.3"
+                "source": "https://github.com/ramsey/uuid/tree/4.7.6"
             },
             "funding": [
                 {
@@ -1030,27 +922,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-12T18:13:24+00:00"
+            "time": "2024-04-27T21:32:50+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.4.13",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "ac09569844a9109a5966b9438fc29113ce77cf51"
+                "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/ac09569844a9109a5966b9438fc29113ce77cf51",
-                "reference": "ac09569844a9109a5966b9438fc29113ce77cf51",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/4856c9cf585d5a0313d8d35afd681a526f038dd3",
+                "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.1",
                 "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.8",
-                "symfony/polyfill-php80": "^1.16"
+                "symfony/polyfill-mbstring": "~1.8"
+            },
+            "require-dev": {
+                "symfony/process": "^5.4|^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -1078,7 +972,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.4.13"
+                "source": "https://github.com/symfony/filesystem/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -1094,24 +988,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-09-21T19:53:16+00:00"
+            "time": "2024-10-25T15:07:50+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.27.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-ctype": "*"
@@ -1121,9 +1015,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -1160,7 +1051,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -1176,24 +1067,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.27.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-mbstring": "*"
@@ -1203,9 +1094,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -1243,7 +1131,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -1259,363 +1147,22 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.27.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
-                },
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.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": "2022-11-03T14:55:06+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php81",
-            "version": "v1.27.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a",
-                "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php81\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "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 backporting some PHP 8.1+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.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": "2022-11-03T14:55:06+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "php": "^7.2 || ^8.0"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<4.6.1 || 4.6.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.13"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.11.0"
-            },
-            "time": "2022-06-03T18:03:27+00:00"
-        },
-        {
-            "name": "webmozart/path-util",
-            "version": "2.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/path-util.git",
-                "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/path-util/zipball/d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
-                "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "webmozart/assert": "~1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\PathUtil\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.",
-            "support": {
-                "issues": "https://github.com/webmozart/path-util/issues",
-                "source": "https://github.com/webmozart/path-util/tree/2.3.0"
-            },
-            "abandoned": "symfony/filesystem",
-            "time": "2015-12-17T08:42:14+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         }
     ],
     "packages-dev": [
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
-                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1 || ^8.0"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^9 || ^11",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpbench/phpbench": "^0.16 || ^1",
-                "phpstan/phpstan": "^1.4",
-                "phpstan/phpstan-phpunit": "^1",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.30 || ^5.4"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "https://ocramius.github.io/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-12-30T00:15:36+00:00"
-        },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.0",
+            "version": "1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
+                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
+                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
                 "shasum": ""
             },
             "require": {
@@ -1623,11 +1170,12 @@
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
-                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
             },
             "require-dev": {
                 "doctrine/collections": "^1.6.8",
                 "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
                 "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
@@ -1653,7 +1201,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
             },
             "funding": [
                 {
@@ -1661,29 +1209,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-03T13:19:32+00:00"
+            "time": "2024-11-08T17:47:46+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.2",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
                 "shasum": ""
             },
             "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": ">=7.0"
+                "php": ">=7.4"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -1691,7 +1241,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.9-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -1715,26 +1265,27 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
             },
-            "time": "2022-11-12T15:38:23+00:00"
+            "time": "2024-10-08T18:51:32+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+                "reference": "54750ef60c58e43759730615a392c31c80e23176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-phar": "*",
                 "ext-xmlwriter": "*",
                 "phar-io/version": "^3.0.1",
@@ -1775,9 +1326,15 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
             },
-            "time": "2021-07-20T11:28:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:33:53+00:00"
         },
         {
             "name": "phar-io/version",
@@ -1832,16 +1389,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.9.11",
+            "version": "1.11.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "60f3d68481eef216199eae7a2603cd5fe124d464"
+                "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/60f3d68481eef216199eae7a2603cd5fe124d464",
-                "reference": "60f3d68481eef216199eae7a2603cd5fe124d464",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/707c2aed5d8d0075666e673a5e71440c1d01a5a3",
+                "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3",
                 "shasum": ""
             },
             "require": {
@@ -1870,8 +1427,11 @@
                 "static analysis"
             ],
             "support": {
+                "docs": "https://phpstan.org/user-guide/getting-started",
+                "forum": "https://github.com/phpstan/phpstan/discussions",
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.9.11"
+                "security": "https://github.com/phpstan/phpstan/security/policy",
+                "source": "https://github.com/phpstan/phpstan-src"
             },
             "funding": [
                 {
@@ -1881,31 +1441,27 @@
                 {
                     "url": "https://github.com/phpstan",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2023-01-12T14:04:13+00:00"
+            "time": "2024-08-19T14:37:29+00:00"
         },
         {
             "name": "phpstan/phpstan-phpunit",
-            "version": "1.3.3",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-phpunit.git",
-                "reference": "54a24bd23e9e80ee918cdc24f909d376c2e273f7"
+                "reference": "f3ea021866f4263f07ca3636bf22c64be9610c11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/54a24bd23e9e80ee918cdc24f909d376c2e273f7",
-                "reference": "54a24bd23e9e80ee918cdc24f909d376c2e273f7",
+                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/f3ea021866f4263f07ca3636bf22c64be9610c11",
+                "reference": "f3ea021866f4263f07ca3636bf22c64be9610c11",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0",
-                "phpstan/phpstan": "^1.9.3"
+                "phpstan/phpstan": "^1.11"
             },
             "conflict": {
                 "phpunit/phpunit": "<7.0"
@@ -1913,7 +1469,7 @@
             "require-dev": {
                 "nikic/php-parser": "^4.13.0",
                 "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpstan/phpstan-strict-rules": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.5.1",
                 "phpunit/phpunit": "^9.5"
             },
             "type": "phpstan-extension",
@@ -1937,31 +1493,32 @@
             "description": "PHPUnit extensions and rules for PHPStan",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-phpunit/issues",
-                "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.3"
+                "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.4.0"
             },
-            "time": "2022-12-21T15:25:00+00:00"
+            "time": "2024-04-20T06:39:00+00:00"
         },
         {
             "name": "phpstan/phpstan-strict-rules",
-            "version": "1.4.5",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-strict-rules.git",
-                "reference": "361f75b06066f3fdaba87c1f57bdb1ffc28d6f1d"
+                "reference": "363f921dd8441777d4fc137deb99beb486c77df1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/361f75b06066f3fdaba87c1f57bdb1ffc28d6f1d",
-                "reference": "361f75b06066f3fdaba87c1f57bdb1ffc28d6f1d",
+                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/363f921dd8441777d4fc137deb99beb486c77df1",
+                "reference": "363f921dd8441777d4fc137deb99beb486c77df1",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0",
-                "phpstan/phpstan": "^1.9.7"
+                "phpstan/phpstan": "^1.11"
             },
             "require-dev": {
                 "nikic/php-parser": "^4.13.0",
                 "php-parallel-lint/php-parallel-lint": "^1.2",
+                "phpstan/phpstan-deprecation-rules": "^1.1",
                 "phpstan/phpstan-phpunit": "^1.0",
                 "phpunit/phpunit": "^9.5"
             },
@@ -1985,50 +1542,50 @@
             "description": "Extra strict and opinionated rules for PHPStan",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
-                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.4.5"
+                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.6.0"
             },
-            "time": "2023-01-11T14:16:29+00:00"
+            "time": "2024-04-20T06:37:51+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.23",
+            "version": "10.1.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c"
+                "reference": "7e308268858ed6baedc8704a304727d20bc07c77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
-                "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7e308268858ed6baedc8704a304727d20bc07c77",
+                "reference": "7e308268858ed6baedc8704a304727d20bc07c77",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.14",
-                "php": ">=7.3",
-                "phpunit/php-file-iterator": "^3.0.3",
-                "phpunit/php-text-template": "^2.0.2",
-                "sebastian/code-unit-reverse-lookup": "^2.0.2",
-                "sebastian/complexity": "^2.0",
-                "sebastian/environment": "^5.1.2",
-                "sebastian/lines-of-code": "^1.0.3",
-                "sebastian/version": "^3.0.1",
-                "theseer/tokenizer": "^1.2.0"
+                "nikic/php-parser": "^4.19.1 || ^5.1.0",
+                "php": ">=8.1",
+                "phpunit/php-file-iterator": "^4.1.0",
+                "phpunit/php-text-template": "^3.0.1",
+                "sebastian/code-unit-reverse-lookup": "^3.0.0",
+                "sebastian/complexity": "^3.2.0",
+                "sebastian/environment": "^6.1.0",
+                "sebastian/lines-of-code": "^2.0.2",
+                "sebastian/version": "^4.0.1",
+                "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.1"
             },
             "suggest": {
-                "ext-pcov": "*",
-                "ext-xdebug": "*"
+                "ext-pcov": "PHP extension that provides line coverage",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.2-dev"
+                    "dev-main": "10.1.x-dev"
                 }
             },
             "autoload": {
@@ -2056,7 +1613,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23"
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.16"
             },
             "funding": [
                 {
@@ -2064,32 +1622,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-12-28T12:41:10+00:00"
+            "time": "2024-08-22T04:31:57+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.6",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c",
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -2116,7 +1674,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
+                "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0"
             },
             "funding": [
                 {
@@ -2124,28 +1683,28 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-02T12:48:52+00:00"
+            "time": "2023-08-31T06:24:48+00:00"
         },
         {
             "name": "phpunit/php-invoker",
-            "version": "3.1.1",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
+                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
-                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
+                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
                 "ext-pcntl": "*",
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "suggest": {
                 "ext-pcntl": "*"
@@ -2153,7 +1712,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -2179,7 +1738,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
-                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0"
             },
             "funding": [
                 {
@@ -2187,32 +1746,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:58:55+00:00"
+            "time": "2023-02-03T06:56:09+00:00"
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "2.0.4",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
-                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2238,7 +1797,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
+                "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
             },
             "funding": [
                 {
@@ -2246,32 +1806,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T05:33:50+00:00"
+            "time": "2023-08-31T14:07:24+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "5.0.3",
+            "version": "6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
-                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -2297,7 +1857,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0"
             },
             "funding": [
                 {
@@ -2305,54 +1865,52 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:16:10+00:00"
+            "time": "2023-02-03T06:57:52+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.28",
+            "version": "10.5.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e"
+                "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e",
-                "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a86773b9e887a67bc53efa9da9ad6e3f2498c132",
+                "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.3",
-                "phar-io/version": "^3.0.2",
-                "php": ">=7.3",
-                "phpunit/php-code-coverage": "^9.2.13",
-                "phpunit/php-file-iterator": "^3.0.5",
-                "phpunit/php-invoker": "^3.1.1",
-                "phpunit/php-text-template": "^2.0.3",
-                "phpunit/php-timer": "^5.0.2",
-                "sebastian/cli-parser": "^1.0.1",
-                "sebastian/code-unit": "^1.0.6",
-                "sebastian/comparator": "^4.0.8",
-                "sebastian/diff": "^4.0.3",
-                "sebastian/environment": "^5.1.3",
-                "sebastian/exporter": "^4.0.5",
-                "sebastian/global-state": "^5.0.1",
-                "sebastian/object-enumerator": "^4.0.3",
-                "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.2",
-                "sebastian/version": "^3.0.2"
+                "myclabs/deep-copy": "^1.12.0",
+                "phar-io/manifest": "^2.0.4",
+                "phar-io/version": "^3.2.1",
+                "php": ">=8.1",
+                "phpunit/php-code-coverage": "^10.1.16",
+                "phpunit/php-file-iterator": "^4.1.0",
+                "phpunit/php-invoker": "^4.0.0",
+                "phpunit/php-text-template": "^3.0.1",
+                "phpunit/php-timer": "^6.0.0",
+                "sebastian/cli-parser": "^2.0.1",
+                "sebastian/code-unit": "^2.0.0",
+                "sebastian/comparator": "^5.0.3",
+                "sebastian/diff": "^5.1.1",
+                "sebastian/environment": "^6.1.0",
+                "sebastian/exporter": "^5.1.2",
+                "sebastian/global-state": "^6.0.2",
+                "sebastian/object-enumerator": "^5.0.0",
+                "sebastian/recursion-context": "^5.0.0",
+                "sebastian/type": "^4.0.0",
+                "sebastian/version": "^4.0.1"
             },
             "suggest": {
-                "ext-soap": "*",
-                "ext-xdebug": "*"
+                "ext-soap": "To be able to generate mocks based on WSDL files"
             },
             "bin": [
                 "phpunit"
@@ -2360,7 +1918,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.5-dev"
+                    "dev-main": "10.5-dev"
                 }
             },
             "autoload": {
@@ -2391,7 +1949,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28"
+                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.38"
             },
             "funding": [
                 {
@@ -2407,32 +1966,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-14T12:32:24+00:00"
+            "time": "2024-10-28T13:06:21+00:00"
         },
         {
             "name": "sebastian/cli-parser",
-            "version": "1.0.1",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084",
+                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "2.0-dev"
                 }
             },
             "autoload": {
@@ -2455,7 +2014,8 @@
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+                "security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1"
             },
             "funding": [
                 {
@@ -2463,32 +2023,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:08:49+00:00"
+            "time": "2024-03-02T07:12:49+00:00"
         },
         {
             "name": "sebastian/code-unit",
-            "version": "1.0.8",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
+                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
-                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503",
+                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "2.0-dev"
                 }
             },
             "autoload": {
@@ -2511,7 +2071,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0"
             },
             "funding": [
                 {
@@ -2519,32 +2079,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:08:54+00:00"
+            "time": "2023-02-03T06:58:43+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "2.0.3",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
+                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
-                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
+                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2566,7 +2126,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0"
             },
             "funding": [
                 {
@@ -2574,34 +2134,36 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:30:19+00:00"
+            "time": "2023-02-03T06:59:15+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.8",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
+                "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
-                "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
+                "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/diff": "^4.0",
-                "sebastian/exporter": "^4.0"
+                "ext-dom": "*",
+                "ext-mbstring": "*",
+                "php": ">=8.1",
+                "sebastian/diff": "^5.0",
+                "sebastian/exporter": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -2640,7 +2202,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
+                "security": "https://github.com/sebastianbergmann/comparator/security/policy",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3"
             },
             "funding": [
                 {
@@ -2648,33 +2211,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-14T12:41:17+00:00"
+            "time": "2024-10-18T14:56:07+00:00"
         },
         {
             "name": "sebastian/complexity",
-            "version": "2.0.2",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+                "reference": "68ff824baeae169ec9f2137158ee529584553799"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799",
+                "reference": "68ff824baeae169ec9f2137158ee529584553799",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.7",
-                "php": ">=7.3"
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "3.2-dev"
                 }
             },
             "autoload": {
@@ -2697,7 +2260,8 @@
             "homepage": "https://github.com/sebastianbergmann/complexity",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+                "security": "https://github.com/sebastianbergmann/complexity/security/policy",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0"
             },
             "funding": [
                 {
@@ -2705,33 +2269,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:52:27+00:00"
+            "time": "2023-12-21T08:37:17+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.4",
+            "version": "5.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e",
+                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3",
-                "symfony/process": "^4.2 || ^5"
+                "phpunit/phpunit": "^10.0",
+                "symfony/process": "^6.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -2763,7 +2327,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+                "security": "https://github.com/sebastianbergmann/diff/security/policy",
+                "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1"
             },
             "funding": [
                 {
@@ -2771,27 +2336,27 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:10:38+00:00"
+            "time": "2024-03-02T07:15:17+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.4",
+            "version": "6.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984",
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -2799,7 +2364,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.1-dev"
+                    "dev-main": "6.1-dev"
                 }
             },
             "autoload": {
@@ -2818,7 +2383,7 @@
                 }
             ],
             "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "homepage": "https://github.com/sebastianbergmann/environment",
             "keywords": [
                 "Xdebug",
                 "environment",
@@ -2826,7 +2391,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
+                "security": "https://github.com/sebastianbergmann/environment/security/policy",
+                "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0"
             },
             "funding": [
                 {
@@ -2834,34 +2400,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-04-03T09:37:03+00:00"
+            "time": "2024-03-23T08:47:14+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.5",
+            "version": "5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
+                "reference": "955288482d97c19a372d3f31006ab3f37da47adf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf",
+                "reference": "955288482d97c19a372d3f31006ab3f37da47adf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/recursion-context": "^4.0"
+                "ext-mbstring": "*",
+                "php": ">=8.1",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -2903,7 +2469,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
+                "security": "https://github.com/sebastianbergmann/exporter/security/policy",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2"
             },
             "funding": [
                 {
@@ -2911,38 +2478,35 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-14T06:03:37+00:00"
+            "time": "2024-03-02T07:17:12+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.5",
+            "version": "6.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
+                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
+                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
+                "php": ">=8.1",
+                "sebastian/object-reflector": "^3.0",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
                 "ext-dom": "*",
-                "phpunit/phpunit": "^9.3"
-            },
-            "suggest": {
-                "ext-uopz": "*"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -2961,13 +2525,14 @@
                 }
             ],
             "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "homepage": "https://www.github.com/sebastianbergmann/global-state",
             "keywords": [
                 "global state"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+                "security": "https://github.com/sebastianbergmann/global-state/security/policy",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2"
             },
             "funding": [
                 {
@@ -2975,33 +2540,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-14T08:28:10+00:00"
+            "time": "2024-03-02T07:19:19+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
-            "version": "1.0.3",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0",
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.6",
-                "php": ">=7.3"
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "2.0-dev"
                 }
             },
             "autoload": {
@@ -3024,7 +2589,8 @@
             "homepage": "https://github.com/sebastianbergmann/lines-of-code",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+                "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2"
             },
             "funding": [
                 {
@@ -3032,34 +2598,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-28T06:42:11+00:00"
+            "time": "2023-12-21T08:38:20+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "4.0.4",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
+                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
-                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906",
+                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
+                "php": ">=8.1",
+                "sebastian/object-reflector": "^3.0",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -3081,7 +2647,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0"
             },
             "funding": [
                 {
@@ -3089,32 +2655,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:12:34+00:00"
+            "time": "2023-02-03T07:08:32+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "2.0.4",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
+                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
-                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957",
+                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -3136,7 +2702,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0"
             },
             "funding": [
                 {
@@ -3144,32 +2710,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:14:26+00:00"
+            "time": "2023-02-03T07:06:18+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.4",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
+                "reference": "05909fb5bc7df4c52992396d0116aed689f93712"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712",
+                "reference": "05909fb5bc7df4c52992396d0116aed689f93712",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -3196,10 +2762,10 @@
                 }
             ],
             "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0"
             },
             "funding": [
                 {
@@ -3207,87 +2773,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:17:30+00:00"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-09-28T06:45:17+00:00"
+            "time": "2023-02-03T07:05:40+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "3.2.0",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
+                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf",
+                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.5"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -3310,7 +2821,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/4.0.0"
             },
             "funding": [
                 {
@@ -3318,29 +2829,29 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-12T14:47:03+00:00"
+            "time": "2023-02-03T07:10:45+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "3.0.2",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "c6c1022351a901512170118436c764e473f6de8c"
+                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
-                "reference": "c6c1022351a901512170118436c764e473f6de8c",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17",
+                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -3363,7 +2874,7 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
+                "source": "https://github.com/sebastianbergmann/version/tree/4.0.1"
             },
             "funding": [
                 {
@@ -3371,20 +2882,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:39:44+00:00"
+            "time": "2023-02-07T11:34:05+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.1",
+            "version": "1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
                 "shasum": ""
             },
             "require": {
@@ -3413,7 +2924,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
             },
             "funding": [
                 {
@@ -3421,7 +2932,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-28T10:34:58+00:00"
+            "time": "2024-03-03T12:36:25+00:00"
         }
     ],
     "aliases": [],
@@ -3430,7 +2941,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.0",
+        "php": "^8.1",
         "php-64bit": "*",
         "ext-chunkutils2": "^0.3.1",
         "ext-crypto": "^0.3.1",
@@ -3447,7 +2958,7 @@
         "ext-openssl": "*",
         "ext-pcre": "*",
         "ext-phar": "*",
-        "ext-pthreads": "^4.0",
+        "ext-pmmpthread": "^6.1.0",
         "ext-reflection": "*",
         "ext-simplexml": "*",
         "ext-sockets": "*",
@@ -3459,7 +2970,7 @@
     },
     "platform-dev": [],
     "platform-overrides": {
-        "php": "8.0.0"
+        "php": "8.1.0"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }
diff --git a/install-local-protocol.sh b/install-local-protocol.sh
new file mode 100644
index 0000000000..0f25a03900
--- /dev/null
+++ b/install-local-protocol.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+echo "--- Installing BedrockProtocol, BedrockData, BedrockBlockUpgradeSchema, BedrockItemUpgradeSchema dependencies from local repositories."
+echo "--- This allows you to perform integration tests using PocketMine-MP, without immediately publishing new versions of these libraries."
+
+cp composer.json composer-local-protocol.json
+cp composer.lock composer-local-protocol.lock
+
+export COMPOSER=composer-local-protocol.json
+composer config repositories.bedrock-protocol path ../deps/BedrockProtocol
+composer config repositories.bedrock-data path ../deps/BedrockData
+composer config repositories.bedrock-block-upgrade-schema path ../deps/BedrockBlockUpgradeSchema
+composer config repositories.bedrock-item-upgrade-schema path ../deps/BedrockItemUpgradeSchema
+
+composer require pocketmine/bedrock-protocol:*@dev pocketmine/bedrock-data:*@dev pocketmine/bedrock-block-upgrade-schema:*@dev pocketmine/bedrock-item-upgrade-schema:*@dev
+
+composer install
+
+echo "--- Local dependencies have been successfully installed."
+echo "--- This script does not modify composer.json. To go back to the original dependency versions, simply run 'composer install'."
+
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 6fc15b07a9..6e85786525 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -1,18 +1,18 @@
 includes:
 	- tests/phpstan/analyse-for-current-php-version.neon.php
 	- tests/phpstan/configs/actual-problems.neon
-	- tests/phpstan/configs/gc-hacks.neon
 	- tests/phpstan/configs/impossible-generics.neon
 	- tests/phpstan/configs/php-bugs.neon
 	- tests/phpstan/configs/phpstan-bugs.neon
-	- tests/phpstan/configs/runtime-type-checks.neon
 	- tests/phpstan/configs/spl-fixed-array-sucks.neon
 	- vendor/phpstan/phpstan-phpunit/extension.neon
 	- vendor/phpstan/phpstan-phpunit/rules.neon
 	- vendor/phpstan/phpstan-strict-rules/rules.neon
 
 rules:
+	- pocketmine\phpstan\rules\DeprecatedLegacyEnumAccessRule
 	- pocketmine\phpstan\rules\DisallowEnumComparisonRule
+	- pocketmine\phpstan\rules\DisallowForeachByReferenceRule
 	- pocketmine\phpstan\rules\UnsafeForeachArrayOfStringRule
 #	- pocketmine\phpstan\rules\ThreadedSupportedTypesRule
 
@@ -40,16 +40,14 @@ parameters:
 			- build/php
 	dynamicConstantNames:
 		- pocketmine\VersionInfo::IS_DEVELOPMENT_BUILD
+		- pocketmine\VersionInfo::BUILD_CHANNEL
 		- pocketmine\DEBUG
 		- pocketmine\IS_DEVELOPMENT_BUILD
 	stubFiles:
 		- tests/phpstan/stubs/JsonMapper.stub
 		- tests/phpstan/stubs/leveldb.stub
-		- tests/phpstan/stubs/phpasn1.stub
-		- tests/phpstan/stubs/pthreads.stub
+		- tests/phpstan/stubs/pmmpthread.stub
 	reportUnmatchedIgnoredErrors: false #no other way to silence platform-specific non-warnings
-	staticReflectionClassNamePatterns:
-		- "#^COM$#"
 	typeAliases:
 		#variadics don't work for this - mixed probably shouldn't work either, but for now it does
 		#what we actually need is something that accepts an infinite number of parameters, but in the absence of that,
diff --git a/resources/item_from_string_bc_map.json b/resources/item_from_string_bc_map.json
index c5c502e9a2..98699ee5be 100644
--- a/resources/item_from_string_bc_map.json
+++ b/resources/item_from_string_bc_map.json
@@ -1,1575 +1,1573 @@
 {
-    "-2": -2,
-    "-3": -3,
-    "-4": -4,
-    "-5": -5,
-    "-6": -6,
-    "-7": -7,
-    "-8": -8,
-    "-9": -9,
-    "-10": -10,
-    "-11": -11,
-    "-12": -12,
-    "-13": -13,
-    "-14": -14,
-    "-15": -15,
-    "-16": -16,
-    "-17": -17,
-    "-18": -18,
-    "-19": -19,
-    "-20": -20,
-    "-21": -21,
-    "-22": -22,
-    "-23": -23,
-    "-24": -24,
-    "-25": -25,
-    "-26": -26,
-    "-27": -27,
-    "-28": -28,
-    "-29": -29,
-    "-30": -30,
-    "-31": -31,
-    "-32": -32,
-    "-33": -33,
-    "-34": -34,
-    "-35": -35,
-    "-36": -36,
-    "-37": -37,
-    "-38": -38,
-    "-39": -39,
-    "-40": -40,
-    "-41": -41,
-    "-42": -42,
-    "-43": -43,
-    "-44": -44,
-    "-45": -45,
-    "-46": -46,
-    "-47": -47,
-    "-48": -48,
-    "-49": -49,
-    "-50": -50,
-    "-51": -51,
-    "-52": -52,
-    "-53": -53,
-    "-54": -54,
-    "-55": -55,
-    "-56": -56,
-    "-57": -57,
-    "-58": -58,
-    "-59": -59,
-    "-60": -60,
-    "-61": -61,
-    "-62": -62,
-    "-63": -63,
-    "-64": -64,
-    "-65": -65,
-    "-66": -66,
-    "-67": -67,
-    "-68": -68,
-    "-69": -69,
-    "-70": -70,
-    "-71": -71,
-    "-72": -72,
-    "-73": -73,
-    "-74": -74,
-    "-75": -75,
-    "-76": -76,
-    "-77": -77,
-    "-78": -78,
-    "-79": -79,
-    "-80": -80,
-    "-81": -81,
-    "-82": -82,
-    "-83": -83,
-    "-84": -84,
-    "-85": -85,
-    "-86": -86,
-    "-87": -87,
-    "-88": -88,
-    "-89": -89,
-    "-90": -90,
-    "-91": -91,
-    "-92": -92,
-    "-93": -93,
-    "-94": -94,
-    "-95": -95,
-    "-96": -96,
-    "-97": -97,
-    "-98": -98,
-    "-99": -99,
-    "-100": -100,
-    "-101": -101,
-    "-102": -102,
-    "-103": -103,
-    "-104": -104,
-    "-105": -105,
-    "-106": -106,
-    "-107": -107,
-    "-108": -108,
-    "-109": -109,
-    "-110": -110,
-    "-111": -111,
-    "-112": -112,
-    "-113": -113,
-    "-114": -114,
-    "-115": -115,
-    "-116": -116,
-    "-117": -117,
-    "-118": -118,
-    "-119": -119,
-    "-120": -120,
-    "-121": -121,
-    "-122": -122,
-    "-123": -123,
-    "-124": -124,
-    "-125": -125,
-    "-126": -126,
-    "-127": -127,
-    "-128": -128,
-    "-129": -129,
-    "-130": -130,
-    "-131": -131,
-    "-132": -132,
-    "-133": -133,
-    "-134": -134,
-    "-135": -135,
-    "-136": -136,
-    "-137": -137,
-    "-138": -138,
-    "-139": -139,
-    "-140": -140,
-    "-141": -141,
-    "-142": -142,
-    "-143": -143,
-    "-144": -144,
-    "-145": -145,
-    "-146": -146,
-    "-147": -147,
-    "-148": -148,
-    "-149": -149,
-    "-150": -150,
-    "-151": -151,
-    "-152": -152,
-    "-153": -153,
-    "-154": -154,
-    "-155": -155,
-    "-156": -156,
-    "-157": -157,
-    "-159": -159,
-    "-160": -160,
-    "-161": -161,
-    "-162": -162,
-    "-163": -163,
-    "-164": -164,
-    "-165": -165,
-    "-166": -166,
-    "-167": -167,
-    "-168": -168,
-    "-169": -169,
-    "-170": -170,
-    "-171": -171,
-    "-172": -172,
-    "-173": -173,
-    "-174": -174,
-    "-175": -175,
-    "-176": -176,
-    "-177": -177,
-    "-178": -178,
-    "-179": -179,
-    "-180": -180,
-    "-181": -181,
-    "-182": -182,
-    "-183": -183,
-    "-184": -184,
-    "-185": -185,
-    "-186": -186,
-    "-187": -187,
-    "-188": -188,
-    "-189": -189,
-    "-190": -190,
-    "-191": -191,
-    "-192": -192,
-    "-193": -193,
-    "-194": -194,
-    "-195": -195,
-    "-196": -196,
-    "-197": -197,
-    "-198": -198,
-    "-199": -199,
-    "-200": -200,
-    "-201": -201,
-    "-202": -202,
-    "-203": -203,
-    "-204": -204,
-    "-206": -206,
-    "-207": -207,
-    "-208": -208,
-    "-209": -209,
-    "-210": -210,
-    "-211": -211,
-    "-213": -213,
-    "-214": -214,
-    "0": 0,
-    "1": 1,
-    "2": 2,
-    "3": 3,
-    "4": 4,
-    "5": 5,
-    "6": 6,
-    "7": 7,
-    "8": 8,
-    "9": 9,
-    "10": 10,
-    "11": 11,
-    "12": 12,
-    "13": 13,
-    "14": 14,
-    "15": 15,
-    "16": 16,
-    "17": 17,
-    "18": 18,
-    "19": 19,
-    "20": 20,
-    "21": 21,
-    "22": 22,
-    "23": 23,
-    "24": 24,
-    "25": 25,
-    "26": 26,
-    "27": 27,
-    "28": 28,
-    "29": 29,
-    "30": 30,
-    "31": 31,
-    "32": 32,
-    "33": 33,
-    "34": 34,
-    "35": 35,
-    "36": 36,
-    "37": 37,
-    "38": 38,
-    "39": 39,
-    "40": 40,
-    "41": 41,
-    "42": 42,
-    "43": 43,
-    "44": 44,
-    "45": 45,
-    "46": 46,
-    "47": 47,
-    "48": 48,
-    "49": 49,
-    "50": 50,
-    "51": 51,
-    "52": 52,
-    "53": 53,
-    "54": 54,
-    "55": 55,
-    "56": 56,
-    "57": 57,
-    "58": 58,
-    "59": 59,
-    "60": 60,
-    "61": 61,
-    "62": 62,
-    "63": 63,
-    "64": 64,
-    "65": 65,
-    "66": 66,
-    "67": 67,
-    "68": 68,
-    "69": 69,
-    "70": 70,
-    "71": 71,
-    "72": 72,
-    "73": 73,
-    "74": 74,
-    "75": 75,
-    "76": 76,
-    "77": 77,
-    "78": 78,
-    "79": 79,
-    "80": 80,
-    "81": 81,
-    "82": 82,
-    "83": 83,
-    "84": 84,
-    "85": 85,
-    "86": 86,
-    "87": 87,
-    "88": 88,
-    "89": 89,
-    "90": 90,
-    "91": 91,
-    "92": 92,
-    "93": 93,
-    "94": 94,
-    "95": 95,
-    "96": 96,
-    "97": 97,
-    "98": 98,
-    "99": 99,
-    "100": 100,
-    "101": 101,
-    "102": 102,
-    "103": 103,
-    "104": 104,
-    "105": 105,
-    "106": 106,
-    "107": 107,
-    "108": 108,
-    "109": 109,
-    "110": 110,
-    "111": 111,
-    "112": 112,
-    "113": 113,
-    "114": 114,
-    "115": 115,
-    "116": 116,
-    "117": 117,
-    "118": 118,
-    "119": 119,
-    "120": 120,
-    "121": 121,
-    "122": 122,
-    "123": 123,
-    "124": 124,
-    "125": 125,
-    "126": 126,
-    "127": 127,
-    "128": 128,
-    "129": 129,
-    "130": 130,
-    "131": 131,
-    "132": 132,
-    "133": 133,
-    "134": 134,
-    "135": 135,
-    "136": 136,
-    "137": 137,
-    "138": 138,
-    "139": 139,
-    "140": 140,
-    "141": 141,
-    "142": 142,
-    "143": 143,
-    "144": 144,
-    "145": 145,
-    "146": 146,
-    "147": 147,
-    "148": 148,
-    "149": 149,
-    "150": 150,
-    "151": 151,
-    "152": 152,
-    "153": 153,
-    "154": 154,
-    "155": 155,
-    "156": 156,
-    "157": 157,
-    "158": 158,
-    "159": 159,
-    "160": 160,
-    "161": 161,
-    "162": 162,
-    "163": 163,
-    "164": 164,
-    "165": 165,
-    "166": 166,
-    "167": 167,
-    "168": 168,
-    "169": 169,
-    "170": 170,
-    "171": 171,
-    "172": 172,
-    "173": 173,
-    "174": 174,
-    "175": 175,
-    "176": 176,
-    "177": 177,
-    "178": 178,
-    "179": 179,
-    "180": 180,
-    "181": 181,
-    "182": 182,
-    "183": 183,
-    "184": 184,
-    "185": 185,
-    "186": 186,
-    "187": 187,
-    "188": 188,
-    "189": 189,
-    "190": 190,
-    "191": 191,
-    "192": 192,
-    "193": 193,
-    "194": 194,
-    "195": 195,
-    "196": 196,
-    "197": 197,
-    "198": 198,
-    "199": 199,
-    "200": 200,
-    "201": 201,
-    "202": 202,
-    "203": 203,
-    "204": 204,
-    "205": 205,
-    "206": 206,
-    "207": 207,
-    "208": 208,
-    "209": 209,
-    "213": 213,
-    "214": 214,
-    "215": 215,
-    "216": 216,
-    "218": 218,
-    "219": 219,
-    "220": 220,
-    "221": 221,
-    "222": 222,
-    "223": 223,
-    "224": 224,
-    "225": 225,
-    "226": 226,
-    "227": 227,
-    "228": 228,
-    "229": 229,
-    "231": 231,
-    "232": 232,
-    "233": 233,
-    "234": 234,
-    "235": 235,
-    "236": 236,
-    "237": 237,
-    "238": 238,
-    "239": 239,
-    "240": 240,
-    "241": 241,
-    "243": 243,
-    "244": 244,
-    "245": 245,
-    "246": 246,
-    "247": 247,
-    "248": 248,
-    "249": 249,
-    "250": 250,
-    "251": 251,
-    "252": 252,
-    "253": 253,
-    "254": 254,
-    "255": 255,
-    "256": 256,
-    "257": 257,
-    "258": 258,
-    "259": 259,
-    "260": 260,
-    "261": 261,
-    "262": 262,
-    "263": 263,
-    "264": 264,
-    "265": 265,
-    "266": 266,
-    "267": 267,
-    "268": 268,
-    "269": 269,
-    "270": 270,
-    "271": 271,
-    "272": 272,
-    "273": 273,
-    "274": 274,
-    "275": 275,
-    "276": 276,
-    "277": 277,
-    "278": 278,
-    "279": 279,
-    "280": 280,
-    "281": 281,
-    "282": 282,
-    "283": 283,
-    "284": 284,
-    "285": 285,
-    "286": 286,
-    "287": 287,
-    "288": 288,
-    "289": 289,
-    "290": 290,
-    "291": 291,
-    "292": 292,
-    "293": 293,
-    "294": 294,
-    "295": 295,
-    "296": 296,
-    "297": 297,
-    "298": 298,
-    "299": 299,
-    "300": 300,
-    "301": 301,
-    "302": 302,
-    "303": 303,
-    "304": 304,
-    "305": 305,
-    "306": 306,
-    "307": 307,
-    "308": 308,
-    "309": 309,
-    "310": 310,
-    "311": 311,
-    "312": 312,
-    "313": 313,
-    "314": 314,
-    "315": 315,
-    "316": 316,
-    "317": 317,
-    "318": 318,
-    "319": 319,
-    "320": 320,
-    "321": 321,
-    "322": 322,
-    "323": 323,
-    "324": 324,
-    "325": 325,
-    "328": 328,
-    "329": 329,
-    "330": 330,
-    "331": 331,
-    "332": 332,
-    "333": 333,
-    "334": 334,
-    "335": 335,
-    "336": 336,
-    "337": 337,
-    "338": 338,
-    "339": 339,
-    "340": 340,
-    "341": 341,
-    "342": 342,
-    "344": 344,
-    "345": 345,
-    "346": 346,
-    "347": 347,
-    "348": 348,
-    "349": 349,
-    "350": 350,
-    "351": 351,
-    "352": 352,
-    "353": 353,
-    "354": 354,
-    "355": 355,
-    "356": 356,
-    "357": 357,
-    "358": 358,
-    "359": 359,
-    "360": 360,
-    "361": 361,
-    "362": 362,
-    "363": 363,
-    "364": 364,
-    "365": 365,
-    "366": 366,
-    "367": 367,
-    "368": 368,
-    "369": 369,
-    "370": 370,
-    "371": 371,
-    "372": 372,
-    "373": 373,
-    "374": 374,
-    "375": 375,
-    "376": 376,
-    "377": 377,
-    "378": 378,
-    "379": 379,
-    "380": 380,
-    "381": 381,
-    "382": 382,
-    "383": 383,
-    "384": 384,
-    "385": 385,
-    "386": 386,
-    "387": 387,
-    "388": 388,
-    "389": 389,
-    "390": 390,
-    "391": 391,
-    "392": 392,
-    "393": 393,
-    "394": 394,
-    "395": 395,
-    "396": 396,
-    "397": 397,
-    "398": 398,
-    "399": 399,
-    "400": 400,
-    "401": 401,
-    "402": 402,
-    "403": 403,
-    "404": 404,
-    "405": 405,
-    "406": 406,
-    "407": 407,
-    "408": 408,
-    "409": 409,
-    "410": 410,
-    "411": 411,
-    "412": 412,
-    "413": 413,
-    "414": 414,
-    "415": 415,
-    "416": 416,
-    "417": 417,
-    "418": 418,
-    "419": 419,
-    "420": 420,
-    "421": 421,
-    "422": 422,
-    "423": 423,
-    "424": 424,
-    "425": 425,
-    "426": 426,
-    "427": 427,
-    "428": 428,
-    "429": 429,
-    "430": 430,
-    "431": 431,
-    "432": 432,
-    "433": 433,
-    "434": 434,
-    "437": 437,
-    "438": 438,
-    "441": 441,
-    "442": 442,
-    "443": 443,
-    "444": 444,
-    "445": 445,
-    "446": 446,
-    "447": 447,
-    "448": 448,
-    "449": 449,
-    "450": 450,
-    "451": 451,
-    "452": 452,
-    "453": 453,
-    "455": 455,
-    "457": 457,
-    "458": 458,
-    "459": 459,
-    "460": 460,
-    "461": 461,
-    "462": 462,
-    "463": 463,
-    "464": 464,
-    "465": 465,
-    "466": 466,
-    "467": 467,
-    "468": 468,
-    "469": 469,
-    "470": 470,
-    "471": 471,
-    "472": 472,
-    "473": 473,
-    "474": 474,
-    "475": 475,
-    "476": 476,
-    "477": 477,
-    "499": 499,
-    "500": 500,
-    "501": 501,
-    "502": 502,
-    "503": 503,
-    "504": 504,
-    "505": 505,
-    "506": 506,
-    "507": 507,
-    "508": 508,
-    "509": 509,
-    "510": 510,
-    "511": 511,
-    "513": 513,
-    "acacia_button": -140,
-    "acacia_door": 430,
-    "acacia_door_block": 196,
-    "acacia_fence_gate": 187,
-    "acacia_pressure_plate": -150,
-    "acacia_sign": 475,
-    "acacia_stairs": 163,
-    "acacia_standing_sign": -190,
-    "acacia_trapdoor": -145,
-    "acacia_wall_sign": -191,
-    "acacia_wood_stairs": 163,
-    "acacia_wooden_stairs": 163,
-    "activator_rail": 126,
-    "active_redstone_lamp": 124,
-    "air": 0,
-    "andesite_stairs": -171,
-    "anvil": 145,
-    "apple": 260,
-    "apple_enchanted": 466,
-    "appleenchanted": 466,
-    "armor_stand": 425,
-    "arrow": 262,
-    "ateupd_block": 249,
-    "baked_potato": 393,
-    "baked_potatoes": 393,
-    "balloon": 448,
-    "bamboo": -163,
-    "bamboo_sapling": -164,
-    "banner": 446,
-    "banner_pattern": 434,
-    "barrel": -203,
-    "barrier": -161,
-    "beacon": 138,
-    "bed": 355,
-    "bed_block": 26,
-    "bedrock": 7,
-    "beef": 363,
-    "beetroot": 457,
-    "beetroot_block": 244,
-    "beetroot_seed": 458,
-    "beetroot_seeds": 458,
-    "beetroot_soup": 459,
-    "bell": -206,
-    "birch_button": -141,
-    "birch_door": 428,
-    "birch_door_block": 194,
-    "birch_fence_gate": 184,
-    "birch_pressure_plate": -151,
-    "birch_sign": 473,
-    "birch_stairs": 135,
-    "birch_standing_sign": -186,
-    "birch_trapdoor": -146,
-    "birch_wall_sign": -187,
-    "birch_wood_stairs": 135,
-    "birch_wooden_stairs": 135,
-    "black_glazed_terracotta": 235,
-    "blast_furnace": -196,
-    "blaze_powder": 377,
-    "blaze_rod": 369,
-    "bleach": 451,
-    "block_moved_by_piston": 250,
-    "blue_glazed_terracotta": 231,
-    "blue_ice": -11,
-    "boat": 333,
-    "bone": 352,
-    "bone_block": 216,
-    "book": 340,
-    "bookshelf": 47,
-    "bottle_o_enchanting": 384,
-    "bow": 261,
-    "bowl": 281,
-    "bread": 297,
-    "brewing_stand": 379,
-    "brewing_stand_block": 117,
-    "brick": 336,
-    "brick_block": 45,
-    "brick_stairs": 108,
-    "bricks": 45,
-    "bricks_block": 45,
-    "brown_glazed_terracotta": 232,
-    "brown_mushroom": 39,
-    "brown_mushroom_block": 99,
-    "bubble_column": -160,
-    "bucket": 325,
-    "burning_furnace": 62,
-    "bush": 32,
-    "cactus": 81,
-    "cake": 354,
-    "cake_block": 92,
-    "campfire": -209,
-    "carpet": 171,
-    "carrot": 391,
-    "carrot_block": 141,
-    "carrot_on_a_stick": 398,
-    "carrotonastick": 398,
-    "carrots": 141,
-    "cartography_table": -200,
-    "carved_pumpkin": -155,
-    "cauldron": 380,
-    "cauldron_block": 118,
-    "chain_boots": 305,
-    "chain_chestplate": 303,
-    "chain_command_block": 189,
-    "chain_helmet": 302,
-    "chain_leggings": 304,
-    "chainmail_boots": 305,
-    "chainmail_chestplate": 303,
-    "chainmail_helmet": 302,
-    "chainmail_leggings": 304,
-    "chemical_heat": 192,
-    "chemistry_table": 238,
-    "chest": 54,
-    "chest_minecart": 342,
-    "chicken": 365,
-    "chorus_flower": 200,
-    "chorus_fruit": 432,
-    "chorus_fruit_popped": 433,
-    "chorus_plant": 240,
-    "clay": 337,
-    "clay_ball": 337,
-    "clay_block": 82,
-    "clock": 347,
-    "clown_fish": 461,
-    "clownfish": 461,
-    "coal": 263,
-    "coal_block": 173,
-    "coal_ore": 16,
-    "cobble": 4,
-    "cobble_stairs": 67,
-    "cobble_wall": 139,
-    "cobblestone": 4,
-    "cobblestone_stairs": 67,
-    "cobblestone_wall": 139,
-    "cobweb": 30,
-    "cocoa": 127,
-    "cocoa_block": 127,
-    "cocoa_pods": 127,
-    "colored_torch_bp": 204,
-    "colored_torch_rg": 202,
-    "command_block": 137,
-    "command_block_minecart": 443,
-    "comparator": 404,
-    "comparator_block": 149,
-    "compass": 345,
-    "composter": -213,
-    "compound": 499,
-    "concrete": 236,
-    "concrete_powder": 237,
-    "concretepowder": 237,
-    "conduit": -157,
-    "cooked_beef": 364,
-    "cooked_chicken": 366,
-    "cooked_fish": 350,
-    "cooked_mutton": 424,
-    "cooked_porkchop": 320,
-    "cooked_rabbit": 412,
-    "cooked_salmon": 463,
-    "cookie": 357,
-    "coral": -131,
-    "coral_block": -132,
-    "coral_fan": -133,
-    "coral_fan_dead": -134,
-    "coral_fan_hang": -135,
-    "coral_fan_hang2": -136,
-    "coral_fan_hang3": -137,
-    "crafting_table": 58,
-    "crossbow": 471,
-    "cyan_glazed_terracotta": 229,
-    "dandelion": 37,
-    "dark_oak_button": -142,
-    "dark_oak_door": 431,
-    "dark_oak_door_block": 197,
-    "dark_oak_fence_gate": 186,
-    "dark_oak_pressure_plate": -152,
-    "dark_oak_stairs": 164,
-    "dark_oak_trapdoor": -147,
-    "dark_oak_wood_stairs": 164,
-    "dark_oak_wooden_stairs": 164,
-    "dark_prismarine_stairs": -3,
-    "darkoak_sign": 476,
-    "darkoak_standing_sign": -192,
-    "darkoak_wall_sign": -193,
-    "daylight_detector": 151,
-    "daylight_detector_inverted": 178,
-    "daylight_sensor": 151,
-    "daylight_sensor_inverted": 178,
-    "dead_bush": 32,
-    "deadbush": 32,
-    "detector_rail": 28,
-    "diamond": 264,
-    "diamond_axe": 279,
-    "diamond_block": 57,
-    "diamond_boots": 313,
-    "diamond_chestplate": 311,
-    "diamond_helmet": 310,
-    "diamond_hoe": 293,
-    "diamond_horse_armor": 419,
-    "diamond_leggings": 312,
-    "diamond_ore": 56,
-    "diamond_pickaxe": 278,
-    "diamond_shovel": 277,
-    "diamond_sword": 276,
-    "diorite_stairs": -170,
-    "dirt": 3,
-    "dispenser": 23,
-    "door_block": 64,
-    "double_plant": 175,
-    "double_red_sandstone_slab": 181,
-    "double_slab": 43,
-    "double_slabs": 43,
-    "double_stone_slab": 43,
-    "double_stone_slab2": 181,
-    "double_stone_slab3": -167,
-    "double_stone_slab4": -168,
-    "double_wood_slab": 157,
-    "double_wood_slabs": 157,
-    "double_wooden_slab": 157,
-    "double_wooden_slabs": 157,
-    "dragon_breath": 437,
-    "dragon_egg": 122,
-    "dried_kelp": 464,
-    "dried_kelp_block": -139,
-    "dropper": 125,
-    "dye": 351,
-    "egg": 344,
-    "element_0": 36,
-    "element_1": -12,
-    "element_2": -13,
-    "element_3": -14,
-    "element_4": -15,
-    "element_5": -16,
-    "element_6": -17,
-    "element_7": -18,
-    "element_8": -19,
-    "element_9": -20,
-    "element_10": -21,
-    "element_11": -22,
-    "element_12": -23,
-    "element_13": -24,
-    "element_14": -25,
-    "element_15": -26,
-    "element_16": -27,
-    "element_17": -28,
-    "element_18": -29,
-    "element_19": -30,
-    "element_20": -31,
-    "element_21": -32,
-    "element_22": -33,
-    "element_23": -34,
-    "element_24": -35,
-    "element_25": -36,
-    "element_26": -37,
-    "element_27": -38,
-    "element_28": -39,
-    "element_29": -40,
-    "element_30": -41,
-    "element_31": -42,
-    "element_32": -43,
-    "element_33": -44,
-    "element_34": -45,
-    "element_35": -46,
-    "element_36": -47,
-    "element_37": -48,
-    "element_38": -49,
-    "element_39": -50,
-    "element_40": -51,
-    "element_41": -52,
-    "element_42": -53,
-    "element_43": -54,
-    "element_44": -55,
-    "element_45": -56,
-    "element_46": -57,
-    "element_47": -58,
-    "element_48": -59,
-    "element_49": -60,
-    "element_50": -61,
-    "element_51": -62,
-    "element_52": -63,
-    "element_53": -64,
-    "element_54": -65,
-    "element_55": -66,
-    "element_56": -67,
-    "element_57": -68,
-    "element_58": -69,
-    "element_59": -70,
-    "element_60": -71,
-    "element_61": -72,
-    "element_62": -73,
-    "element_63": -74,
-    "element_64": -75,
-    "element_65": -76,
-    "element_66": -77,
-    "element_67": -78,
-    "element_68": -79,
-    "element_69": -80,
-    "element_70": -81,
-    "element_71": -82,
-    "element_72": -83,
-    "element_73": -84,
-    "element_74": -85,
-    "element_75": -86,
-    "element_76": -87,
-    "element_77": -88,
-    "element_78": -89,
-    "element_79": -90,
-    "element_80": -91,
-    "element_81": -92,
-    "element_82": -93,
-    "element_83": -94,
-    "element_84": -95,
-    "element_85": -96,
-    "element_86": -97,
-    "element_87": -98,
-    "element_88": -99,
-    "element_89": -100,
-    "element_90": -101,
-    "element_91": -102,
-    "element_92": -103,
-    "element_93": -104,
-    "element_94": -105,
-    "element_95": -106,
-    "element_96": -107,
-    "element_97": -108,
-    "element_98": -109,
-    "element_99": -110,
-    "element_100": -111,
-    "element_101": -112,
-    "element_102": -113,
-    "element_103": -114,
-    "element_104": -115,
-    "element_105": -116,
-    "element_106": -117,
-    "element_107": -118,
-    "element_108": -119,
-    "element_109": -120,
-    "element_110": -121,
-    "element_111": -122,
-    "element_112": -123,
-    "element_113": -124,
-    "element_114": -125,
-    "element_115": -126,
-    "element_116": -127,
-    "element_117": -128,
-    "element_118": -129,
-    "elytra": 444,
-    "emerald": 388,
-    "emerald_block": 133,
-    "emerald_ore": 129,
-    "empty_map": 395,
-    "emptymap": 395,
-    "enchant_table": 116,
-    "enchanted_book": 403,
-    "enchanted_golden_apple": 466,
-    "enchanting_bottle": 384,
-    "enchanting_table": 116,
-    "enchantment_table": 116,
-    "end_brick_stairs": -178,
-    "end_bricks": 206,
-    "end_crystal": 426,
-    "end_gateway": 209,
-    "end_portal": 119,
-    "end_portal_frame": 120,
-    "end_rod": 208,
-    "end_stone": 121,
-    "ender_chest": 130,
-    "ender_eye": 381,
-    "ender_pearl": 368,
-    "experience_bottle": 384,
-    "farmland": 60,
-    "feather": 288,
-    "fence": 85,
-    "fence_gate": 107,
-    "fence_gate_acacia": 187,
-    "fence_gate_birch": 184,
-    "fence_gate_dark_oak": 186,
-    "fence_gate_jungle": 185,
-    "fence_gate_spruce": 183,
-    "fermented_spider_eye": 376,
-    "filled_map": 358,
-    "fire": 51,
-    "fire_charge": 385,
-    "fireball": 385,
-    "fireworks": 401,
-    "fireworks_charge": 402,
-    "fireworkscharge": 402,
-    "fish": 349,
-    "fishing_rod": 346,
-    "fletching_table": -201,
-    "flint": 318,
-    "flint_and_steel": 259,
-    "flint_steel": 259,
-    "flower_pot": 390,
-    "flower_pot_block": 140,
-    "flowing_lava": 10,
-    "flowing_water": 8,
-    "frame": 389,
-    "frame_block": 199,
-    "frosted_ice": 207,
-    "furnace": 61,
-    "ghast_tear": 370,
-    "glass": 20,
-    "glass_bottle": 374,
-    "glass_pane": 102,
-    "glass_panel": 102,
-    "glistering_melon": 382,
-    "glow_stick": 166,
-    "glowing_obsidian": 246,
-    "glowing_redstone_ore": 74,
-    "glowingobsidian": 246,
-    "glowstone": 89,
-    "glowstone_block": 89,
-    "glowstone_dust": 348,
-    "gold_axe": 286,
-    "gold_block": 41,
-    "gold_boots": 317,
-    "gold_chestplate": 315,
-    "gold_helmet": 314,
-    "gold_hoe": 294,
-    "gold_horse_armor": 418,
-    "gold_ingot": 266,
-    "gold_leggings": 316,
-    "gold_nugget": 371,
-    "gold_ore": 14,
-    "gold_pickaxe": 285,
-    "gold_pressure_plate": 147,
-    "gold_shovel": 284,
-    "gold_sword": 283,
-    "golden_apple": 322,
-    "golden_axe": 286,
-    "golden_boots": 317,
-    "golden_carrot": 396,
-    "golden_chestplate": 315,
-    "golden_helmet": 314,
-    "golden_hoe": 294,
-    "golden_horse_armor": 418,
-    "golden_leggings": 316,
-    "golden_nugget": 371,
-    "golden_pickaxe": 285,
-    "golden_rail": 27,
-    "golden_shovel": 284,
-    "golden_sword": 283,
-    "granite_stairs": -169,
-    "grass": 2,
-    "grass_path": 198,
-    "gravel": 13,
-    "gray_glazed_terracotta": 227,
-    "green_glazed_terracotta": 233,
-    "grindstone": -195,
-    "gunpowder": 289,
-    "hard_glass": 253,
-    "hard_glass_pane": 190,
-    "hard_stained_glass": 254,
-    "hard_stained_glass_pane": 191,
-    "hardened_clay": 172,
-    "hay_bale": 170,
-    "hay_block": 170,
-    "heart_of_the_sea": 467,
-    "heavy_weighted_pressure_plate": 148,
-    "hopper": 410,
-    "hopper_block": 154,
-    "hopper_minecart": 408,
-    "horse_armor_diamond": 419,
-    "horse_armor_gold": 418,
-    "horse_armor_iron": 417,
-    "horse_armor_leather": 416,
-    "horsearmordiamond": 419,
-    "horsearmorgold": 418,
-    "horsearmoriron": 417,
-    "horsearmorleather": 416,
-    "ice": 79,
-    "ice_bomb": 453,
-    "inactive_redstone_lamp": 123,
-    "info_reserved6": 255,
-    "info_update": 248,
-    "info_update2": 249,
-    "inverted_daylight_sensor": 178,
-    "invisible_bedrock": 95,
-    "invisiblebedrock": 95,
-    "iron_axe": 258,
-    "iron_bar": 101,
-    "iron_bars": 101,
-    "iron_block": 42,
-    "iron_boots": 309,
-    "iron_chestplate": 307,
-    "iron_door": 330,
-    "iron_door_block": 71,
-    "iron_helmet": 306,
-    "iron_hoe": 292,
-    "iron_horse_armor": 417,
-    "iron_ingot": 265,
-    "iron_leggings": 308,
-    "iron_nugget": 452,
-    "iron_ore": 15,
-    "iron_pickaxe": 257,
-    "iron_pressure_plate": 148,
-    "iron_shovel": 256,
-    "iron_sword": 267,
-    "iron_trapdoor": 167,
-    "item_frame": 389,
-    "item_frame_block": 199,
-    "jack_o_lantern": 91,
-    "jigsaw": -211,
-    "jukebox": 84,
-    "jungle_button": -143,
-    "jungle_door": 429,
-    "jungle_door_block": 195,
-    "jungle_fence_gate": 185,
-    "jungle_pressure_plate": -153,
-    "jungle_sign": 474,
-    "jungle_stairs": 136,
-    "jungle_standing_sign": -188,
-    "jungle_trapdoor": -148,
-    "jungle_wall_sign": -189,
-    "kelp": 335,
-    "kelp_block": -138,
-    "ladder": 65,
-    "lantern": -208,
-    "lapis_block": 22,
-    "lapis_ore": 21,
-    "lava": 11,
-    "lava_cauldron": -210,
-    "lead": 420,
-    "leash": 420,
-    "leather": 334,
-    "leather_boots": 301,
-    "leather_cap": 298,
-    "leather_chestplate": 299,
-    "leather_helmet": 298,
-    "leather_horse_armor": 416,
-    "leather_leggings": 300,
-    "leather_pants": 300,
-    "leather_tunic": 299,
-    "leave": 18,
-    "leave2": 161,
-    "leaves": 18,
-    "leaves2": 161,
-    "lectern": -194,
-    "lever": 69,
-    "light_blue_glazed_terracotta": 223,
-    "light_weighted_pressure_plate": 147,
-    "lily_pad": 111,
-    "lime_glazed_terracotta": 225,
-    "lingering_potion": 441,
-    "lit_blast_furnace": -214,
-    "lit_furnace": 62,
-    "lit_pumpkin": 91,
-    "lit_redstone_lamp": 124,
-    "lit_redstone_ore": 74,
-    "lit_redstone_torch": 76,
-    "lit_smoker": -199,
-    "log": 17,
-    "log2": 162,
-    "loom": -204,
-    "magenta_glazed_terracotta": 222,
-    "magma": 213,
-    "magma_cream": 378,
-    "map": 395,
-    "medicine": 447,
-    "melon": 360,
-    "melon_block": 103,
-    "melon_seeds": 362,
-    "melon_slice": 360,
-    "melon_stem": 105,
-    "minecart": 328,
-    "minecart_with_chest": 342,
-    "minecart_with_command_block": 443,
-    "minecart_with_hopper": 408,
-    "minecart_with_tnt": 407,
-    "mob_head": 397,
-    "mob_head_block": 144,
-    "mob_spawner": 52,
-    "monster_egg": 97,
-    "monster_egg_block": 97,
-    "monster_spawner": 52,
-    "moss_stone": 48,
-    "mossy_cobblestone": 48,
-    "mossy_cobblestone_stairs": -179,
-    "mossy_stone": 48,
-    "mossy_stone_brick_stairs": -175,
-    "moving_block": 250,
-    "movingblock": 250,
-    "mushroom_stew": 282,
-    "mutton": 423,
-    "mutton_cooked": 424,
-    "mutton_raw": 423,
-    "muttoncooked": 424,
-    "muttonraw": 423,
-    "mycelium": 110,
-    "name_tag": 421,
-    "nametag": 421,
-    "nautilus_shell": 465,
-    "nether_brick": 405,
-    "nether_brick_block": 112,
-    "nether_brick_fence": 113,
-    "nether_brick_stairs": 114,
-    "nether_bricks": 112,
-    "nether_bricks_stairs": 114,
-    "nether_quartz": 406,
-    "nether_quartz_ore": 153,
-    "nether_reactor": 247,
-    "nether_star": 399,
-    "nether_wart": 372,
-    "nether_wart_block": 214,
-    "nether_wart_plant": 115,
-    "netherbrick": 405,
-    "netherrack": 87,
-    "netherreactor": 247,
-    "netherstar": 399,
-    "normal_stone_stairs": -180,
-    "note_block": 25,
-    "noteblock": 25,
-    "oak_door": 324,
-    "oak_door_block": 64,
-    "oak_fence_gate": 107,
-    "oak_stairs": 53,
-    "oak_wood_stairs": 53,
-    "oak_wooden_stairs": 53,
-    "observer": 251,
-    "obsidian": 49,
-    "orange_glazed_terracotta": 221,
-    "packed_ice": 174,
-    "painting": 321,
-    "paper": 339,
-    "phantom_membrane": 470,
-    "pink_glazed_terracotta": 226,
-    "piston": 33,
-    "piston_arm_collision": 34,
-    "piston_head": 34,
-    "pistonarmcollision": 34,
-    "plank": 5,
-    "planks": 5,
-    "podzol": 243,
-    "poisonous_potato": 394,
-    "polished_andesite_stairs": -174,
-    "polished_diorite_stairs": -173,
-    "polished_granite_stairs": -172,
-    "poppy": 38,
-    "porkchop": 319,
-    "portal": 90,
-    "portal_block": 90,
-    "potato": 392,
-    "potato_block": 142,
-    "potatoes": 142,
-    "potion": 373,
-    "powered_comparator": 150,
-    "powered_comparator_block": 150,
-    "powered_rail": 27,
-    "powered_repeater": 94,
-    "powered_repeater_block": 94,
-    "prismarine": 168,
-    "prismarine_bricks_stairs": -4,
-    "prismarine_crystals": 422,
-    "prismarine_shard": 409,
-    "prismarine_stairs": -2,
-    "puffer_fish": 462,
-    "pufferfish": 462,
-    "pumpkin": 86,
-    "pumpkin_pie": 400,
-    "pumpkin_seeds": 361,
-    "pumpkin_stem": 104,
-    "purple_glazed_terracotta": 219,
-    "purpur_block": 201,
-    "purpur_stairs": 203,
-    "quartz": 406,
-    "quartz_block": 155,
-    "quartz_ore": 153,
-    "quartz_stairs": 156,
-    "rabbit": 411,
-    "rabbit_foot": 414,
-    "rabbit_hide": 415,
-    "rabbit_stew": 413,
-    "rail": 66,
-    "rapid_fertilizer": 449,
-    "raw_beef": 363,
-    "raw_chicken": 365,
-    "raw_fish": 349,
-    "raw_mutton": 423,
-    "raw_porkchop": 319,
-    "raw_rabbit": 411,
-    "raw_salmon": 460,
-    "record_11": 510,
-    "record_13": 500,
-    "record_blocks": 502,
-    "record_cat": 501,
-    "record_chirp": 503,
-    "record_far": 504,
-    "record_mall": 505,
-    "record_mellohi": 506,
-    "record_stal": 507,
-    "record_strad": 508,
-    "record_wait": 511,
-    "record_ward": 509,
-    "red_flower": 38,
-    "red_glazed_terracotta": 234,
-    "red_mushroom": 40,
-    "red_mushroom_block": 100,
-    "red_nether_brick": 215,
-    "red_nether_brick_stairs": -184,
-    "red_sandstone": 179,
-    "red_sandstone_slab": 182,
-    "red_sandstone_stairs": 180,
-    "redstone": 331,
-    "redstone_block": 152,
-    "redstone_dust": 331,
-    "redstone_lamp": 123,
-    "redstone_ore": 73,
-    "redstone_torch": 76,
-    "redstone_wire": 55,
-    "reeds": 338,
-    "reeds_block": 83,
-    "repeater": 356,
-    "repeater_block": 93,
-    "repeating_command_block": 188,
-    "reserved6": 255,
-    "rose": 38,
-    "rotten_flesh": 367,
-    "saddle": 329,
-    "salmon": 460,
-    "sand": 12,
-    "sandstone": 24,
-    "sandstone_stairs": 128,
-    "sapling": 6,
-    "scaffolding": -165,
-    "sea_lantern": 169,
-    "sea_pickle": -156,
-    "seagrass": -130,
-    "sealantern": 169,
-    "seeds": 295,
-    "shears": 359,
-    "shield": 513,
-    "shulker_box": 218,
-    "shulker_shell": 445,
-    "sign": 323,
-    "sign_post": 63,
-    "silver_glazed_terracotta": 228,
-    "skull": 397,
-    "skull_block": 144,
-    "slab": 44,
-    "slabs": 44,
-    "slime": 165,
-    "slime_ball": 341,
-    "slime_block": 165,
-    "slimeball": 341,
-    "smithing_table": -202,
-    "smoker": -198,
-    "smooth_quartz_stairs": -185,
-    "smooth_red_sandstone_stairs": -176,
-    "smooth_sandstone_stairs": -177,
-    "smooth_stone": -183,
-    "snow": 80,
-    "snow_block": 80,
-    "snow_layer": 78,
-    "snowball": 332,
-    "soul_sand": 88,
-    "sparkler": 442,
-    "spawn_egg": 383,
-    "speckled_melon": 382,
-    "spider_eye": 375,
-    "splash_potion": 438,
-    "sponge": 19,
-    "spruce_button": -144,
-    "spruce_door": 427,
-    "spruce_door_block": 193,
-    "spruce_fence_gate": 183,
-    "spruce_pressure_plate": -154,
-    "spruce_sign": 472,
-    "spruce_stairs": 134,
-    "spruce_standing_sign": -181,
-    "spruce_trapdoor": -149,
-    "spruce_wall_sign": -182,
-    "spruce_wood_stairs": 134,
-    "spruce_wooden_stairs": 134,
-    "stained_clay": 159,
-    "stained_glass": 241,
-    "stained_glass_pane": 160,
-    "stained_hardened_clay": 159,
-    "standing_banner": 176,
-    "standing_sign": 63,
-    "steak": 364,
-    "stick": 280,
-    "sticks": 280,
-    "sticky_piston": 29,
-    "still_lava": 11,
-    "still_water": 9,
-    "stone": 1,
-    "stone_axe": 275,
-    "stone_brick": 98,
-    "stone_brick_stairs": 109,
-    "stone_bricks": 98,
-    "stone_button": 77,
-    "stone_hoe": 291,
-    "stone_pickaxe": 274,
-    "stone_pressure_plate": 70,
-    "stone_shovel": 273,
-    "stone_slab": 44,
-    "stone_slab2": 182,
-    "stone_slab3": -162,
-    "stone_slab4": -166,
-    "stone_stairs": 67,
-    "stone_sword": 272,
-    "stone_wall": 139,
-    "stonebrick": 98,
-    "stonecutter": 245,
-    "stonecutter_block": -197,
-    "string": 287,
-    "stripped_acacia_log": -8,
-    "stripped_birch_log": -6,
-    "stripped_dark_oak_log": -9,
-    "stripped_jungle_log": -7,
-    "stripped_oak_log": -10,
-    "stripped_spruce_log": -5,
-    "structure_block": 252,
-    "sugar": 353,
-    "sugar_cane": 338,
-    "sugar_canes": 338,
-    "sugarcane": 338,
-    "sugarcane_block": 83,
-    "sweet_berries": 477,
-    "sweet_berry_bush": -207,
-    "tall_grass": 31,
-    "tallgrass": 31,
-    "terracotta": 159,
-    "tnt": 46,
-    "tnt_minecart": 407,
-    "torch": 50,
-    "totem": 450,
-    "trapdoor": 96,
-    "trapped_chest": 146,
-    "trident": 455,
-    "trip_wire": 132,
-    "tripwire": 132,
-    "tripwire_hook": 131,
-    "trunk": 5,
-    "trunk2": 162,
-    "turtle_egg": -159,
-    "turtle_helmet": 469,
-    "turtle_shell_piece": 468,
-    "underwater_torch": 239,
-    "undyed_shulker_box": 205,
-    "unlit_redstone_torch": 75,
-    "unpowered_comparator": 149,
-    "unpowered_comparator_block": 149,
-    "unpowered_repeater": 93,
-    "unpowered_repeater_block": 93,
-    "update_block": 248,
-    "vine": 106,
-    "vines": 106,
-    "wall_banner": 177,
-    "wall_sign": 68,
-    "water": 9,
-    "water_lily": 111,
-    "waterlily": 111,
-    "web": 30,
-    "weighted_pressure_plate_heavy": 148,
-    "weighted_pressure_plate_light": 147,
-    "wheat": 296,
-    "wheat_block": 59,
-    "wheat_seeds": 295,
-    "white_glazed_terracotta": 220,
-    "wood": 17,
-    "wood2": 162,
-    "wood_door_block": 64,
-    "wood_slab": 158,
-    "wood_slabs": 158,
-    "wood_stairs": 53,
-    "wooden_axe": 271,
-    "wooden_button": 143,
-    "wooden_door": 324,
-    "wooden_door_block": 64,
-    "wooden_hoe": 290,
-    "wooden_pickaxe": 270,
-    "wooden_plank": 5,
-    "wooden_planks": 5,
-    "wooden_pressure_plate": 72,
-    "wooden_shovel": 269,
-    "wooden_slab": 158,
-    "wooden_slabs": 158,
-    "wooden_stairs": 53,
-    "wooden_sword": 268,
-    "wooden_trapdoor": 96,
-    "wool": 35,
-    "workbench": 58,
-    "writable_book": 386,
-    "written_book": 387,
-    "yellow_flower": 37,
-    "yellow_glazed_terracotta": 224
+    "-2": "minecraft:prismarine_stairs",
+    "-3": "minecraft:dark_prismarine_stairs",
+    "-4": "minecraft:prismarine_bricks_stairs",
+    "-5": "minecraft:stripped_spruce_log",
+    "-6": "minecraft:stripped_birch_log",
+    "-7": "minecraft:stripped_jungle_log",
+    "-8": "minecraft:stripped_acacia_log",
+    "-9": "minecraft:stripped_dark_oak_log",
+    "-10": "minecraft:stripped_oak_log",
+    "-11": "minecraft:blue_ice",
+    "-12": "minecraft:element_1",
+    "-13": "minecraft:element_2",
+    "-14": "minecraft:element_3",
+    "-15": "minecraft:element_4",
+    "-16": "minecraft:element_5",
+    "-17": "minecraft:element_6",
+    "-18": "minecraft:element_7",
+    "-19": "minecraft:element_8",
+    "-20": "minecraft:element_9",
+    "-21": "minecraft:element_10",
+    "-22": "minecraft:element_11",
+    "-23": "minecraft:element_12",
+    "-24": "minecraft:element_13",
+    "-25": "minecraft:element_14",
+    "-26": "minecraft:element_15",
+    "-27": "minecraft:element_16",
+    "-28": "minecraft:element_17",
+    "-29": "minecraft:element_18",
+    "-30": "minecraft:element_19",
+    "-31": "minecraft:element_20",
+    "-32": "minecraft:element_21",
+    "-33": "minecraft:element_22",
+    "-34": "minecraft:element_23",
+    "-35": "minecraft:element_24",
+    "-36": "minecraft:element_25",
+    "-37": "minecraft:element_26",
+    "-38": "minecraft:element_27",
+    "-39": "minecraft:element_28",
+    "-40": "minecraft:element_29",
+    "-41": "minecraft:element_30",
+    "-42": "minecraft:element_31",
+    "-43": "minecraft:element_32",
+    "-44": "minecraft:element_33",
+    "-45": "minecraft:element_34",
+    "-46": "minecraft:element_35",
+    "-47": "minecraft:element_36",
+    "-48": "minecraft:element_37",
+    "-49": "minecraft:element_38",
+    "-50": "minecraft:element_39",
+    "-51": "minecraft:element_40",
+    "-52": "minecraft:element_41",
+    "-53": "minecraft:element_42",
+    "-54": "minecraft:element_43",
+    "-55": "minecraft:element_44",
+    "-56": "minecraft:element_45",
+    "-57": "minecraft:element_46",
+    "-58": "minecraft:element_47",
+    "-59": "minecraft:element_48",
+    "-60": "minecraft:element_49",
+    "-61": "minecraft:element_50",
+    "-62": "minecraft:element_51",
+    "-63": "minecraft:element_52",
+    "-64": "minecraft:element_53",
+    "-65": "minecraft:element_54",
+    "-66": "minecraft:element_55",
+    "-67": "minecraft:element_56",
+    "-68": "minecraft:element_57",
+    "-69": "minecraft:element_58",
+    "-70": "minecraft:element_59",
+    "-71": "minecraft:element_60",
+    "-72": "minecraft:element_61",
+    "-73": "minecraft:element_62",
+    "-74": "minecraft:element_63",
+    "-75": "minecraft:element_64",
+    "-76": "minecraft:element_65",
+    "-77": "minecraft:element_66",
+    "-78": "minecraft:element_67",
+    "-79": "minecraft:element_68",
+    "-80": "minecraft:element_69",
+    "-81": "minecraft:element_70",
+    "-82": "minecraft:element_71",
+    "-83": "minecraft:element_72",
+    "-84": "minecraft:element_73",
+    "-85": "minecraft:element_74",
+    "-86": "minecraft:element_75",
+    "-87": "minecraft:element_76",
+    "-88": "minecraft:element_77",
+    "-89": "minecraft:element_78",
+    "-90": "minecraft:element_79",
+    "-91": "minecraft:element_80",
+    "-92": "minecraft:element_81",
+    "-93": "minecraft:element_82",
+    "-94": "minecraft:element_83",
+    "-95": "minecraft:element_84",
+    "-96": "minecraft:element_85",
+    "-97": "minecraft:element_86",
+    "-98": "minecraft:element_87",
+    "-99": "minecraft:element_88",
+    "-100": "minecraft:element_89",
+    "-101": "minecraft:element_90",
+    "-102": "minecraft:element_91",
+    "-103": "minecraft:element_92",
+    "-104": "minecraft:element_93",
+    "-105": "minecraft:element_94",
+    "-106": "minecraft:element_95",
+    "-107": "minecraft:element_96",
+    "-108": "minecraft:element_97",
+    "-109": "minecraft:element_98",
+    "-110": "minecraft:element_99",
+    "-111": "minecraft:element_100",
+    "-112": "minecraft:element_101",
+    "-113": "minecraft:element_102",
+    "-114": "minecraft:element_103",
+    "-115": "minecraft:element_104",
+    "-116": "minecraft:element_105",
+    "-117": "minecraft:element_106",
+    "-118": "minecraft:element_107",
+    "-119": "minecraft:element_108",
+    "-120": "minecraft:element_109",
+    "-121": "minecraft:element_110",
+    "-122": "minecraft:element_111",
+    "-123": "minecraft:element_112",
+    "-124": "minecraft:element_113",
+    "-125": "minecraft:element_114",
+    "-126": "minecraft:element_115",
+    "-127": "minecraft:element_116",
+    "-128": "minecraft:element_117",
+    "-129": "minecraft:element_118",
+    "-130": "minecraft:seagrass",
+    "-131": "minecraft:coral",
+    "-132": "minecraft:coral_block",
+    "-133": "minecraft:coral_fan",
+    "-134": "minecraft:coral_fan_dead",
+    "-135": "minecraft:coral_fan_hang",
+    "-136": "minecraft:coral_fan_hang2",
+    "-137": "minecraft:coral_fan_hang3",
+    "-138": "minecraft:item.kelp",
+    "-139": "minecraft:dried_kelp_block",
+    "-140": "minecraft:acacia_button",
+    "-141": "minecraft:birch_button",
+    "-142": "minecraft:dark_oak_button",
+    "-143": "minecraft:jungle_button",
+    "-144": "minecraft:spruce_button",
+    "-145": "minecraft:acacia_trapdoor",
+    "-146": "minecraft:birch_trapdoor",
+    "-147": "minecraft:dark_oak_trapdoor",
+    "-148": "minecraft:jungle_trapdoor",
+    "-149": "minecraft:spruce_trapdoor",
+    "-150": "minecraft:acacia_pressure_plate",
+    "-151": "minecraft:birch_pressure_plate",
+    "-152": "minecraft:dark_oak_pressure_plate",
+    "-153": "minecraft:jungle_pressure_plate",
+    "-154": "minecraft:spruce_pressure_plate",
+    "-155": "minecraft:carved_pumpkin",
+    "-156": "minecraft:sea_pickle",
+    "-157": "minecraft:conduit",
+    "-159": "minecraft:turtle_egg",
+    "-160": "minecraft:bubble_column",
+    "-161": "minecraft:barrier",
+    "-162": "minecraft:double_stone_slab3",
+    "-163": "minecraft:bamboo",
+    "-164": "minecraft:bamboo_sapling",
+    "-165": "minecraft:scaffolding",
+    "-166": "minecraft:double_stone_slab4",
+    "-167": "minecraft:real_double_stone_slab3",
+    "-168": "minecraft:real_double_stone_slab4",
+    "-169": "minecraft:granite_stairs",
+    "-170": "minecraft:diorite_stairs",
+    "-171": "minecraft:andesite_stairs",
+    "-172": "minecraft:polished_granite_stairs",
+    "-173": "minecraft:polished_diorite_stairs",
+    "-174": "minecraft:polished_andesite_stairs",
+    "-175": "minecraft:mossy_stone_brick_stairs",
+    "-176": "minecraft:smooth_red_sandstone_stairs",
+    "-177": "minecraft:smooth_sandstone_stairs",
+    "-178": "minecraft:end_brick_stairs",
+    "-179": "minecraft:mossy_cobblestone_stairs",
+    "-180": "minecraft:normal_stone_stairs",
+    "-181": "minecraft:spruce_standing_sign",
+    "-182": "minecraft:spruce_wall_sign",
+    "-183": "minecraft:smooth_stone",
+    "-184": "minecraft:red_nether_brick_stairs",
+    "-185": "minecraft:smooth_quartz_stairs",
+    "-186": "minecraft:birch_standing_sign",
+    "-187": "minecraft:birch_wall_sign",
+    "-188": "minecraft:jungle_standing_sign",
+    "-189": "minecraft:jungle_wall_sign",
+    "-190": "minecraft:acacia_standing_sign",
+    "-191": "minecraft:acacia_wall_sign",
+    "-192": "minecraft:darkoak_standing_sign",
+    "-193": "minecraft:darkoak_wall_sign",
+    "-194": "minecraft:lectern",
+    "-195": "minecraft:grindstone",
+    "-196": "minecraft:blast_furnace",
+    "-197": "minecraft:stonecutter_block",
+    "-198": "minecraft:smoker",
+    "-199": "minecraft:lit_smoker",
+    "-200": "minecraft:cartography_table",
+    "-201": "minecraft:fletching_table",
+    "-202": "minecraft:smithing_table",
+    "-203": "minecraft:barrel",
+    "-204": "minecraft:loom",
+    "-206": "minecraft:bell",
+    "-207": "minecraft:sweet_berry_bush",
+    "-208": "minecraft:lantern",
+    "-209": "minecraft:item.campfire",
+    "-210": "minecraft:lava_cauldron",
+    "-211": "minecraft:jigsaw",
+    "-213": "minecraft:composter",
+    "-214": "minecraft:lit_blast_furnace",
+    "1": "minecraft:stone",
+    "2": "minecraft:grass",
+    "3": "minecraft:dirt",
+    "4": "minecraft:cobblestone",
+    "5": "minecraft:planks",
+    "6": "minecraft:sapling",
+    "7": "minecraft:bedrock",
+    "8": "minecraft:flowing_water",
+    "9": "minecraft:water",
+    "10": "minecraft:flowing_lava",
+    "11": "minecraft:lava",
+    "12": "minecraft:sand",
+    "13": "minecraft:gravel",
+    "14": "minecraft:gold_ore",
+    "15": "minecraft:iron_ore",
+    "16": "minecraft:coal_ore",
+    "17": "minecraft:log",
+    "18": "minecraft:leaves",
+    "19": "minecraft:sponge",
+    "20": "minecraft:glass",
+    "21": "minecraft:lapis_ore",
+    "22": "minecraft:lapis_block",
+    "23": "minecraft:dispenser",
+    "24": "minecraft:sandstone",
+    "25": "minecraft:noteblock",
+    "26": "minecraft:item.bed",
+    "27": "minecraft:golden_rail",
+    "28": "minecraft:detector_rail",
+    "29": "minecraft:sticky_piston",
+    "30": "minecraft:web",
+    "31": "minecraft:tallgrass",
+    "32": "minecraft:deadbush",
+    "33": "minecraft:piston",
+    "34": "minecraft:pistonarmcollision",
+    "35": "minecraft:wool",
+    "36": "minecraft:element_0",
+    "37": "minecraft:yellow_flower",
+    "38": "minecraft:red_flower",
+    "39": "minecraft:brown_mushroom",
+    "40": "minecraft:red_mushroom",
+    "41": "minecraft:gold_block",
+    "42": "minecraft:iron_block",
+    "43": "minecraft:real_double_stone_slab",
+    "44": "minecraft:double_stone_slab",
+    "45": "minecraft:brick_block",
+    "46": "minecraft:tnt",
+    "47": "minecraft:bookshelf",
+    "48": "minecraft:mossy_cobblestone",
+    "49": "minecraft:obsidian",
+    "50": "minecraft:torch",
+    "51": "minecraft:fire",
+    "52": "minecraft:mob_spawner",
+    "53": "minecraft:oak_stairs",
+    "54": "minecraft:chest",
+    "55": "minecraft:redstone_wire",
+    "56": "minecraft:diamond_ore",
+    "57": "minecraft:diamond_block",
+    "58": "minecraft:crafting_table",
+    "59": "minecraft:item.wheat",
+    "60": "minecraft:farmland",
+    "61": "minecraft:furnace",
+    "62": "minecraft:lit_furnace",
+    "63": "minecraft:standing_sign",
+    "64": "minecraft:item.wooden_door",
+    "65": "minecraft:ladder",
+    "66": "minecraft:rail",
+    "67": "minecraft:stone_stairs",
+    "68": "minecraft:wall_sign",
+    "69": "minecraft:lever",
+    "70": "minecraft:stone_pressure_plate",
+    "71": "minecraft:item.iron_door",
+    "72": "minecraft:wooden_pressure_plate",
+    "73": "minecraft:redstone_ore",
+    "74": "minecraft:lit_redstone_ore",
+    "75": "minecraft:unlit_redstone_torch",
+    "76": "minecraft:redstone_torch",
+    "77": "minecraft:stone_button",
+    "78": "minecraft:snow_layer",
+    "79": "minecraft:ice",
+    "80": "minecraft:snow",
+    "81": "minecraft:cactus",
+    "82": "minecraft:clay",
+    "83": "minecraft:item.reeds",
+    "84": "minecraft:jukebox",
+    "85": "minecraft:fence",
+    "86": "minecraft:pumpkin",
+    "87": "minecraft:netherrack",
+    "88": "minecraft:soul_sand",
+    "89": "minecraft:glowstone",
+    "90": "minecraft:portal",
+    "91": "minecraft:lit_pumpkin",
+    "92": "minecraft:item.cake",
+    "93": "minecraft:unpowered_repeater",
+    "94": "minecraft:powered_repeater",
+    "95": "minecraft:invisiblebedrock",
+    "96": "minecraft:trapdoor",
+    "97": "minecraft:monster_egg",
+    "98": "minecraft:stonebrick",
+    "99": "minecraft:brown_mushroom_block",
+    "100": "minecraft:red_mushroom_block",
+    "101": "minecraft:iron_bars",
+    "102": "minecraft:glass_pane",
+    "103": "minecraft:melon_block",
+    "104": "minecraft:pumpkin_stem",
+    "105": "minecraft:melon_stem",
+    "106": "minecraft:vine",
+    "107": "minecraft:fence_gate",
+    "108": "minecraft:brick_stairs",
+    "109": "minecraft:stone_brick_stairs",
+    "110": "minecraft:mycelium",
+    "111": "minecraft:waterlily",
+    "112": "minecraft:nether_brick",
+    "113": "minecraft:nether_brick_fence",
+    "114": "minecraft:nether_brick_stairs",
+    "115": "minecraft:item.nether_wart",
+    "116": "minecraft:enchanting_table",
+    "117": "minecraft:brewingstandblock",
+    "118": "minecraft:item.cauldron",
+    "119": "minecraft:end_portal",
+    "120": "minecraft:end_portal_frame",
+    "121": "minecraft:end_stone",
+    "122": "minecraft:dragon_egg",
+    "123": "minecraft:redstone_lamp",
+    "124": "minecraft:lit_redstone_lamp",
+    "125": "minecraft:dropper",
+    "126": "minecraft:activator_rail",
+    "127": "minecraft:cocoa",
+    "128": "minecraft:sandstone_stairs",
+    "129": "minecraft:emerald_ore",
+    "130": "minecraft:ender_chest",
+    "131": "minecraft:tripwire_hook",
+    "132": "minecraft:tripwire",
+    "133": "minecraft:emerald_block",
+    "134": "minecraft:spruce_stairs",
+    "135": "minecraft:birch_stairs",
+    "136": "minecraft:jungle_stairs",
+    "137": "minecraft:command_block",
+    "138": "minecraft:beacon",
+    "139": "minecraft:cobblestone_wall",
+    "140": "minecraft:item.flower_pot",
+    "141": "minecraft:carrots",
+    "142": "minecraft:potatoes",
+    "143": "minecraft:wooden_button",
+    "144": "minecraft:item.skull",
+    "145": "minecraft:anvil",
+    "146": "minecraft:trapped_chest",
+    "147": "minecraft:light_weighted_pressure_plate",
+    "148": "minecraft:heavy_weighted_pressure_plate",
+    "149": "minecraft:unpowered_comparator",
+    "150": "minecraft:powered_comparator",
+    "151": "minecraft:daylight_detector",
+    "152": "minecraft:redstone_block",
+    "153": "minecraft:quartz_ore",
+    "154": "minecraft:item.hopper",
+    "155": "minecraft:quartz_block",
+    "156": "minecraft:quartz_stairs",
+    "157": "minecraft:double_wooden_slab",
+    "158": "minecraft:wooden_slab",
+    "159": "minecraft:stained_hardened_clay",
+    "160": "minecraft:stained_glass_pane",
+    "161": "minecraft:leaves2",
+    "162": "minecraft:log2",
+    "163": "minecraft:acacia_stairs",
+    "164": "minecraft:dark_oak_stairs",
+    "165": "minecraft:slime",
+    "166": "minecraft:glow_stick",
+    "167": "minecraft:iron_trapdoor",
+    "168": "minecraft:prismarine",
+    "169": "minecraft:sealantern",
+    "170": "minecraft:hay_block",
+    "171": "minecraft:carpet",
+    "172": "minecraft:hardened_clay",
+    "173": "minecraft:coal_block",
+    "174": "minecraft:packed_ice",
+    "175": "minecraft:double_plant",
+    "176": "minecraft:standing_banner",
+    "177": "minecraft:wall_banner",
+    "178": "minecraft:daylight_detector_inverted",
+    "179": "minecraft:red_sandstone",
+    "180": "minecraft:red_sandstone_stairs",
+    "181": "minecraft:real_double_stone_slab2",
+    "182": "minecraft:double_stone_slab2",
+    "183": "minecraft:spruce_fence_gate",
+    "184": "minecraft:birch_fence_gate",
+    "185": "minecraft:jungle_fence_gate",
+    "186": "minecraft:dark_oak_fence_gate",
+    "187": "minecraft:acacia_fence_gate",
+    "188": "minecraft:repeating_command_block",
+    "189": "minecraft:chain_command_block",
+    "190": "minecraft:hard_glass_pane",
+    "191": "minecraft:hard_stained_glass_pane",
+    "192": "minecraft:chemical_heat",
+    "193": "minecraft:item.spruce_door",
+    "194": "minecraft:item.birch_door",
+    "195": "minecraft:item.jungle_door",
+    "196": "minecraft:item.acacia_door",
+    "197": "minecraft:item.dark_oak_door",
+    "198": "minecraft:grass_path",
+    "199": "minecraft:item.frame",
+    "200": "minecraft:chorus_flower",
+    "201": "minecraft:purpur_block",
+    "202": "minecraft:colored_torch_rg",
+    "203": "minecraft:purpur_stairs",
+    "204": "minecraft:colored_torch_bp",
+    "205": "minecraft:undyed_shulker_box",
+    "206": "minecraft:end_bricks",
+    "207": "minecraft:frosted_ice",
+    "208": "minecraft:end_rod",
+    "209": "minecraft:end_gateway",
+    "213": "minecraft:magma",
+    "214": "minecraft:nether_wart_block",
+    "215": "minecraft:red_nether_brick",
+    "216": "minecraft:bone_block",
+    "218": "minecraft:shulker_box",
+    "219": "minecraft:purple_glazed_terracotta",
+    "220": "minecraft:white_glazed_terracotta",
+    "221": "minecraft:orange_glazed_terracotta",
+    "222": "minecraft:magenta_glazed_terracotta",
+    "223": "minecraft:light_blue_glazed_terracotta",
+    "224": "minecraft:yellow_glazed_terracotta",
+    "225": "minecraft:lime_glazed_terracotta",
+    "226": "minecraft:pink_glazed_terracotta",
+    "227": "minecraft:gray_glazed_terracotta",
+    "228": "minecraft:silver_glazed_terracotta",
+    "229": "minecraft:cyan_glazed_terracotta",
+    "231": "minecraft:blue_glazed_terracotta",
+    "232": "minecraft:brown_glazed_terracotta",
+    "233": "minecraft:green_glazed_terracotta",
+    "234": "minecraft:red_glazed_terracotta",
+    "235": "minecraft:black_glazed_terracotta",
+    "236": "minecraft:concrete",
+    "237": "minecraft:concrete_powder",
+    "238": "minecraft:chemistry_table",
+    "239": "minecraft:underwater_torch",
+    "240": "minecraft:chorus_plant",
+    "241": "minecraft:stained_glass",
+    "243": "minecraft:podzol",
+    "244": "minecraft:item.beetroot",
+    "245": "minecraft:stonecutter",
+    "246": "minecraft:glowingobsidian",
+    "247": "minecraft:netherreactor",
+    "248": "minecraft:info_update",
+    "249": "minecraft:info_update2",
+    "250": "minecraft:movingblock",
+    "251": "minecraft:observer",
+    "252": "minecraft:structure_block",
+    "253": "minecraft:hard_glass",
+    "254": "minecraft:hard_stained_glass",
+    "255": "minecraft:reserved6",
+    "256": "minecraft:iron_shovel",
+    "257": "minecraft:iron_pickaxe",
+    "258": "minecraft:iron_axe",
+    "259": "minecraft:flint_and_steel",
+    "260": "minecraft:apple",
+    "261": "minecraft:bow",
+    "262": "minecraft:arrow",
+    "263": "minecraft:coal",
+    "264": "minecraft:diamond",
+    "265": "minecraft:iron_ingot",
+    "266": "minecraft:gold_ingot",
+    "267": "minecraft:iron_sword",
+    "268": "minecraft:wooden_sword",
+    "269": "minecraft:wooden_shovel",
+    "270": "minecraft:wooden_pickaxe",
+    "271": "minecraft:wooden_axe",
+    "272": "minecraft:stone_sword",
+    "273": "minecraft:stone_shovel",
+    "274": "minecraft:stone_pickaxe",
+    "275": "minecraft:stone_axe",
+    "276": "minecraft:diamond_sword",
+    "277": "minecraft:diamond_shovel",
+    "278": "minecraft:diamond_pickaxe",
+    "279": "minecraft:diamond_axe",
+    "280": "minecraft:stick",
+    "281": "minecraft:bowl",
+    "282": "minecraft:mushroom_stew",
+    "283": "minecraft:golden_sword",
+    "284": "minecraft:golden_shovel",
+    "285": "minecraft:golden_pickaxe",
+    "286": "minecraft:golden_axe",
+    "287": "minecraft:string",
+    "288": "minecraft:feather",
+    "289": "minecraft:gunpowder",
+    "290": "minecraft:wooden_hoe",
+    "291": "minecraft:stone_hoe",
+    "292": "minecraft:iron_hoe",
+    "293": "minecraft:diamond_hoe",
+    "294": "minecraft:golden_hoe",
+    "295": "minecraft:wheat_seeds",
+    "296": "minecraft:wheat",
+    "297": "minecraft:bread",
+    "298": "minecraft:leather_helmet",
+    "299": "minecraft:leather_chestplate",
+    "300": "minecraft:leather_leggings",
+    "301": "minecraft:leather_boots",
+    "302": "minecraft:chainmail_helmet",
+    "303": "minecraft:chainmail_chestplate",
+    "304": "minecraft:chainmail_leggings",
+    "305": "minecraft:chainmail_boots",
+    "306": "minecraft:iron_helmet",
+    "307": "minecraft:iron_chestplate",
+    "308": "minecraft:iron_leggings",
+    "309": "minecraft:iron_boots",
+    "310": "minecraft:diamond_helmet",
+    "311": "minecraft:diamond_chestplate",
+    "312": "minecraft:diamond_leggings",
+    "313": "minecraft:diamond_boots",
+    "314": "minecraft:golden_helmet",
+    "315": "minecraft:golden_chestplate",
+    "316": "minecraft:golden_leggings",
+    "317": "minecraft:golden_boots",
+    "318": "minecraft:flint",
+    "319": "minecraft:porkchop",
+    "320": "minecraft:cooked_porkchop",
+    "321": "minecraft:painting",
+    "322": "minecraft:golden_apple",
+    "323": "minecraft:sign",
+    "324": "minecraft:wooden_door",
+    "325": "minecraft:bucket",
+    "328": "minecraft:minecart",
+    "329": "minecraft:saddle",
+    "330": "minecraft:iron_door",
+    "331": "minecraft:redstone",
+    "332": "minecraft:snowball",
+    "333": "minecraft:boat",
+    "334": "minecraft:leather",
+    "335": "minecraft:kelp",
+    "336": "minecraft:brick",
+    "337": "minecraft:clay_ball",
+    "338": "minecraft:reeds",
+    "339": "minecraft:paper",
+    "340": "minecraft:book",
+    "341": "minecraft:slime_ball",
+    "342": "minecraft:chest_minecart",
+    "344": "minecraft:egg",
+    "345": "minecraft:compass",
+    "346": "minecraft:fishing_rod",
+    "347": "minecraft:clock",
+    "348": "minecraft:glowstone_dust",
+    "349": "minecraft:fish",
+    "350": "minecraft:cooked_fish",
+    "351": "minecraft:dye",
+    "352": "minecraft:bone",
+    "353": "minecraft:sugar",
+    "354": "minecraft:cake",
+    "355": "minecraft:bed",
+    "356": "minecraft:repeater",
+    "357": "minecraft:cookie",
+    "358": "minecraft:map",
+    "359": "minecraft:shears",
+    "360": "minecraft:melon",
+    "361": "minecraft:pumpkin_seeds",
+    "362": "minecraft:melon_seeds",
+    "363": "minecraft:beef",
+    "364": "minecraft:cooked_beef",
+    "365": "minecraft:chicken",
+    "366": "minecraft:cooked_chicken",
+    "367": "minecraft:rotten_flesh",
+    "368": "minecraft:ender_pearl",
+    "369": "minecraft:blaze_rod",
+    "370": "minecraft:ghast_tear",
+    "371": "minecraft:gold_nugget",
+    "372": "minecraft:nether_wart",
+    "373": "minecraft:potion",
+    "374": "minecraft:glass_bottle",
+    "375": "minecraft:spider_eye",
+    "376": "minecraft:fermented_spider_eye",
+    "377": "minecraft:blaze_powder",
+    "378": "minecraft:magma_cream",
+    "379": "minecraft:brewing_stand",
+    "380": "minecraft:cauldron",
+    "381": "minecraft:ender_eye",
+    "382": "minecraft:speckled_melon",
+    "383": "minecraft:spawn_egg",
+    "384": "minecraft:experience_bottle",
+    "385": "minecraft:fireball",
+    "386": "minecraft:writable_book",
+    "387": "minecraft:written_book",
+    "388": "minecraft:emerald",
+    "389": "minecraft:frame",
+    "390": "minecraft:flower_pot",
+    "391": "minecraft:carrot",
+    "392": "minecraft:potato",
+    "393": "minecraft:baked_potato",
+    "394": "minecraft:poisonous_potato",
+    "395": "minecraft:emptymap",
+    "396": "minecraft:golden_carrot",
+    "397": "minecraft:skull",
+    "398": "minecraft:carrotonastick",
+    "399": "minecraft:netherstar",
+    "400": "minecraft:pumpkin_pie",
+    "401": "minecraft:fireworks",
+    "402": "minecraft:fireworkscharge",
+    "403": "minecraft:enchanted_book",
+    "404": "minecraft:comparator",
+    "405": "minecraft:netherbrick",
+    "406": "minecraft:quartz",
+    "407": "minecraft:tnt_minecart",
+    "408": "minecraft:hopper_minecart",
+    "409": "minecraft:prismarine_shard",
+    "410": "minecraft:hopper",
+    "411": "minecraft:rabbit",
+    "412": "minecraft:cooked_rabbit",
+    "413": "minecraft:rabbit_stew",
+    "414": "minecraft:rabbit_foot",
+    "415": "minecraft:rabbit_hide",
+    "416": "minecraft:horsearmorleather",
+    "417": "minecraft:horsearmoriron",
+    "418": "minecraft:horsearmorgold",
+    "419": "minecraft:horsearmordiamond",
+    "420": "minecraft:lead",
+    "421": "minecraft:name_tag",
+    "422": "minecraft:prismarine_crystals",
+    "423": "minecraft:muttonraw",
+    "424": "minecraft:muttoncooked",
+    "425": "minecraft:armor_stand",
+    "426": "minecraft:end_crystal",
+    "427": "minecraft:spruce_door",
+    "428": "minecraft:birch_door",
+    "429": "minecraft:jungle_door",
+    "430": "minecraft:acacia_door",
+    "431": "minecraft:dark_oak_door",
+    "432": "minecraft:chorus_fruit",
+    "433": "minecraft:chorus_fruit_popped",
+    "434": "minecraft:banner_pattern",
+    "437": "minecraft:dragon_breath",
+    "438": "minecraft:splash_potion",
+    "441": "minecraft:lingering_potion",
+    "442": "minecraft:sparkler",
+    "443": "minecraft:command_block_minecart",
+    "444": "minecraft:elytra",
+    "445": "minecraft:shulker_shell",
+    "446": "minecraft:banner",
+    "447": "minecraft:medicine",
+    "448": "minecraft:balloon",
+    "449": "minecraft:rapid_fertilizer",
+    "450": "minecraft:totem",
+    "451": "minecraft:bleach",
+    "452": "minecraft:iron_nugget",
+    "453": "minecraft:ice_bomb",
+    "455": "minecraft:trident",
+    "457": "minecraft:beetroot",
+    "458": "minecraft:beetroot_seeds",
+    "459": "minecraft:beetroot_soup",
+    "460": "minecraft:salmon",
+    "461": "minecraft:clownfish",
+    "462": "minecraft:pufferfish",
+    "463": "minecraft:cooked_salmon",
+    "464": "minecraft:dried_kelp",
+    "465": "minecraft:nautilus_shell",
+    "466": "minecraft:appleenchanted",
+    "467": "minecraft:heart_of_the_sea",
+    "468": "minecraft:turtle_shell_piece",
+    "469": "minecraft:turtle_helmet",
+    "470": "minecraft:phantom_membrane",
+    "471": "minecraft:crossbow",
+    "472": "minecraft:spruce_sign",
+    "473": "minecraft:birch_sign",
+    "474": "minecraft:jungle_sign",
+    "475": "minecraft:acacia_sign",
+    "476": "minecraft:darkoak_sign",
+    "477": "minecraft:sweet_berries",
+    "499": "minecraft:compound",
+    "500": "minecraft:record_13",
+    "501": "minecraft:record_cat",
+    "502": "minecraft:record_blocks",
+    "503": "minecraft:record_chirp",
+    "504": "minecraft:record_far",
+    "505": "minecraft:record_mall",
+    "506": "minecraft:record_mellohi",
+    "507": "minecraft:record_stal",
+    "508": "minecraft:record_strad",
+    "509": "minecraft:record_ward",
+    "510": "minecraft:record_11",
+    "511": "minecraft:record_wait",
+    "513": "minecraft:shield",
+    "acacia_button": "minecraft:acacia_button",
+    "acacia_door": "minecraft:acacia_door",
+    "acacia_door_block": "minecraft:item.acacia_door",
+    "acacia_fence_gate": "minecraft:acacia_fence_gate",
+    "acacia_pressure_plate": "minecraft:acacia_pressure_plate",
+    "acacia_sign": "minecraft:acacia_sign",
+    "acacia_stairs": "minecraft:acacia_stairs",
+    "acacia_standing_sign": "minecraft:acacia_standing_sign",
+    "acacia_trapdoor": "minecraft:acacia_trapdoor",
+    "acacia_wall_sign": "minecraft:acacia_wall_sign",
+    "acacia_wood_stairs": "minecraft:acacia_stairs",
+    "acacia_wooden_stairs": "minecraft:acacia_stairs",
+    "activator_rail": "minecraft:activator_rail",
+    "active_redstone_lamp": "minecraft:lit_redstone_lamp",
+    "andesite_stairs": "minecraft:andesite_stairs",
+    "anvil": "minecraft:anvil",
+    "apple": "minecraft:apple",
+    "apple_enchanted": "minecraft:appleenchanted",
+    "appleenchanted": "minecraft:appleenchanted",
+    "armor_stand": "minecraft:armor_stand",
+    "arrow": "minecraft:arrow",
+    "ateupd_block": "minecraft:info_update2",
+    "baked_potato": "minecraft:baked_potato",
+    "baked_potatoes": "minecraft:baked_potato",
+    "balloon": "minecraft:balloon",
+    "bamboo": "minecraft:bamboo",
+    "bamboo_sapling": "minecraft:bamboo_sapling",
+    "banner": "minecraft:banner",
+    "banner_pattern": "minecraft:banner_pattern",
+    "barrel": "minecraft:barrel",
+    "barrier": "minecraft:barrier",
+    "beacon": "minecraft:beacon",
+    "bed": "minecraft:bed",
+    "bed_block": "minecraft:item.bed",
+    "bedrock": "minecraft:bedrock",
+    "beef": "minecraft:beef",
+    "beetroot": "minecraft:beetroot",
+    "beetroot_block": "minecraft:item.beetroot",
+    "beetroot_seed": "minecraft:beetroot_seeds",
+    "beetroot_seeds": "minecraft:beetroot_seeds",
+    "beetroot_soup": "minecraft:beetroot_soup",
+    "bell": "minecraft:bell",
+    "birch_button": "minecraft:birch_button",
+    "birch_door": "minecraft:birch_door",
+    "birch_door_block": "minecraft:item.birch_door",
+    "birch_fence_gate": "minecraft:birch_fence_gate",
+    "birch_pressure_plate": "minecraft:birch_pressure_plate",
+    "birch_sign": "minecraft:birch_sign",
+    "birch_stairs": "minecraft:birch_stairs",
+    "birch_standing_sign": "minecraft:birch_standing_sign",
+    "birch_trapdoor": "minecraft:birch_trapdoor",
+    "birch_wall_sign": "minecraft:birch_wall_sign",
+    "birch_wood_stairs": "minecraft:birch_stairs",
+    "birch_wooden_stairs": "minecraft:birch_stairs",
+    "black_glazed_terracotta": "minecraft:black_glazed_terracotta",
+    "blast_furnace": "minecraft:blast_furnace",
+    "blaze_powder": "minecraft:blaze_powder",
+    "blaze_rod": "minecraft:blaze_rod",
+    "bleach": "minecraft:bleach",
+    "block_moved_by_piston": "minecraft:movingblock",
+    "blue_glazed_terracotta": "minecraft:blue_glazed_terracotta",
+    "blue_ice": "minecraft:blue_ice",
+    "boat": "minecraft:boat",
+    "bone": "minecraft:bone",
+    "bone_block": "minecraft:bone_block",
+    "book": "minecraft:book",
+    "bookshelf": "minecraft:bookshelf",
+    "bottle_o_enchanting": "minecraft:experience_bottle",
+    "bow": "minecraft:bow",
+    "bowl": "minecraft:bowl",
+    "bread": "minecraft:bread",
+    "brewing_stand": "minecraft:brewing_stand",
+    "brewing_stand_block": "minecraft:brewingstandblock",
+    "brick": "minecraft:brick",
+    "brick_block": "minecraft:brick_block",
+    "brick_stairs": "minecraft:brick_stairs",
+    "bricks": "minecraft:brick_block",
+    "bricks_block": "minecraft:brick_block",
+    "brown_glazed_terracotta": "minecraft:brown_glazed_terracotta",
+    "brown_mushroom": "minecraft:brown_mushroom",
+    "brown_mushroom_block": "minecraft:brown_mushroom_block",
+    "bubble_column": "minecraft:bubble_column",
+    "bucket": "minecraft:bucket",
+    "burning_furnace": "minecraft:lit_furnace",
+    "bush": "minecraft:deadbush",
+    "cactus": "minecraft:cactus",
+    "cake": "minecraft:cake",
+    "cake_block": "minecraft:item.cake",
+    "campfire": "minecraft:item.campfire",
+    "carpet": "minecraft:carpet",
+    "carrot": "minecraft:carrot",
+    "carrot_block": "minecraft:carrots",
+    "carrot_on_a_stick": "minecraft:carrotonastick",
+    "carrotonastick": "minecraft:carrotonastick",
+    "carrots": "minecraft:carrots",
+    "cartography_table": "minecraft:cartography_table",
+    "carved_pumpkin": "minecraft:carved_pumpkin",
+    "cauldron": "minecraft:cauldron",
+    "cauldron_block": "minecraft:item.cauldron",
+    "chain_boots": "minecraft:chainmail_boots",
+    "chain_chestplate": "minecraft:chainmail_chestplate",
+    "chain_command_block": "minecraft:chain_command_block",
+    "chain_helmet": "minecraft:chainmail_helmet",
+    "chain_leggings": "minecraft:chainmail_leggings",
+    "chainmail_boots": "minecraft:chainmail_boots",
+    "chainmail_chestplate": "minecraft:chainmail_chestplate",
+    "chainmail_helmet": "minecraft:chainmail_helmet",
+    "chainmail_leggings": "minecraft:chainmail_leggings",
+    "chemical_heat": "minecraft:chemical_heat",
+    "chemistry_table": "minecraft:chemistry_table",
+    "chest": "minecraft:chest",
+    "chest_minecart": "minecraft:chest_minecart",
+    "chicken": "minecraft:chicken",
+    "chorus_flower": "minecraft:chorus_flower",
+    "chorus_fruit": "minecraft:chorus_fruit",
+    "chorus_fruit_popped": "minecraft:chorus_fruit_popped",
+    "chorus_plant": "minecraft:chorus_plant",
+    "clay": "minecraft:clay_ball",
+    "clay_ball": "minecraft:clay_ball",
+    "clay_block": "minecraft:clay",
+    "clock": "minecraft:clock",
+    "clown_fish": "minecraft:clownfish",
+    "clownfish": "minecraft:clownfish",
+    "coal": "minecraft:coal",
+    "coal_block": "minecraft:coal_block",
+    "coal_ore": "minecraft:coal_ore",
+    "cobble": "minecraft:cobblestone",
+    "cobble_stairs": "minecraft:stone_stairs",
+    "cobble_wall": "minecraft:cobblestone_wall",
+    "cobblestone": "minecraft:cobblestone",
+    "cobblestone_stairs": "minecraft:stone_stairs",
+    "cobblestone_wall": "minecraft:cobblestone_wall",
+    "cobweb": "minecraft:web",
+    "cocoa": "minecraft:cocoa",
+    "cocoa_block": "minecraft:cocoa",
+    "cocoa_pods": "minecraft:cocoa",
+    "colored_torch_bp": "minecraft:colored_torch_bp",
+    "colored_torch_rg": "minecraft:colored_torch_rg",
+    "command_block": "minecraft:command_block",
+    "command_block_minecart": "minecraft:command_block_minecart",
+    "comparator": "minecraft:comparator",
+    "comparator_block": "minecraft:unpowered_comparator",
+    "compass": "minecraft:compass",
+    "composter": "minecraft:composter",
+    "compound": "minecraft:compound",
+    "concrete": "minecraft:concrete",
+    "concrete_powder": "minecraft:concrete_powder",
+    "concretepowder": "minecraft:concrete_powder",
+    "conduit": "minecraft:conduit",
+    "cooked_beef": "minecraft:cooked_beef",
+    "cooked_chicken": "minecraft:cooked_chicken",
+    "cooked_fish": "minecraft:cooked_fish",
+    "cooked_mutton": "minecraft:muttoncooked",
+    "cooked_porkchop": "minecraft:cooked_porkchop",
+    "cooked_rabbit": "minecraft:cooked_rabbit",
+    "cooked_salmon": "minecraft:cooked_salmon",
+    "cookie": "minecraft:cookie",
+    "coral": "minecraft:coral",
+    "coral_block": "minecraft:coral_block",
+    "coral_fan": "minecraft:coral_fan",
+    "coral_fan_dead": "minecraft:coral_fan_dead",
+    "coral_fan_hang": "minecraft:coral_fan_hang",
+    "coral_fan_hang2": "minecraft:coral_fan_hang2",
+    "coral_fan_hang3": "minecraft:coral_fan_hang3",
+    "crafting_table": "minecraft:crafting_table",
+    "crossbow": "minecraft:crossbow",
+    "cyan_glazed_terracotta": "minecraft:cyan_glazed_terracotta",
+    "dandelion": "minecraft:yellow_flower",
+    "dark_oak_button": "minecraft:dark_oak_button",
+    "dark_oak_door": "minecraft:dark_oak_door",
+    "dark_oak_door_block": "minecraft:item.dark_oak_door",
+    "dark_oak_fence_gate": "minecraft:dark_oak_fence_gate",
+    "dark_oak_pressure_plate": "minecraft:dark_oak_pressure_plate",
+    "dark_oak_stairs": "minecraft:dark_oak_stairs",
+    "dark_oak_trapdoor": "minecraft:dark_oak_trapdoor",
+    "dark_oak_wood_stairs": "minecraft:dark_oak_stairs",
+    "dark_oak_wooden_stairs": "minecraft:dark_oak_stairs",
+    "dark_prismarine_stairs": "minecraft:dark_prismarine_stairs",
+    "darkoak_sign": "minecraft:darkoak_sign",
+    "darkoak_standing_sign": "minecraft:darkoak_standing_sign",
+    "darkoak_wall_sign": "minecraft:darkoak_wall_sign",
+    "daylight_detector": "minecraft:daylight_detector",
+    "daylight_detector_inverted": "minecraft:daylight_detector_inverted",
+    "daylight_sensor": "minecraft:daylight_detector",
+    "daylight_sensor_inverted": "minecraft:daylight_detector_inverted",
+    "dead_bush": "minecraft:deadbush",
+    "deadbush": "minecraft:deadbush",
+    "detector_rail": "minecraft:detector_rail",
+    "diamond": "minecraft:diamond",
+    "diamond_axe": "minecraft:diamond_axe",
+    "diamond_block": "minecraft:diamond_block",
+    "diamond_boots": "minecraft:diamond_boots",
+    "diamond_chestplate": "minecraft:diamond_chestplate",
+    "diamond_helmet": "minecraft:diamond_helmet",
+    "diamond_hoe": "minecraft:diamond_hoe",
+    "diamond_horse_armor": "minecraft:horsearmordiamond",
+    "diamond_leggings": "minecraft:diamond_leggings",
+    "diamond_ore": "minecraft:diamond_ore",
+    "diamond_pickaxe": "minecraft:diamond_pickaxe",
+    "diamond_shovel": "minecraft:diamond_shovel",
+    "diamond_sword": "minecraft:diamond_sword",
+    "diorite_stairs": "minecraft:diorite_stairs",
+    "dirt": "minecraft:dirt",
+    "dispenser": "minecraft:dispenser",
+    "door_block": "minecraft:item.wooden_door",
+    "double_plant": "minecraft:double_plant",
+    "double_red_sandstone_slab": "minecraft:real_double_stone_slab2",
+    "double_slab": "minecraft:real_double_stone_slab",
+    "double_slabs": "minecraft:real_double_stone_slab",
+    "double_stone_slab": "minecraft:real_double_stone_slab",
+    "double_stone_slab2": "minecraft:real_double_stone_slab2",
+    "double_stone_slab3": "minecraft:real_double_stone_slab3",
+    "double_stone_slab4": "minecraft:real_double_stone_slab4",
+    "double_wood_slab": "minecraft:double_wooden_slab",
+    "double_wood_slabs": "minecraft:double_wooden_slab",
+    "double_wooden_slab": "minecraft:double_wooden_slab",
+    "double_wooden_slabs": "minecraft:double_wooden_slab",
+    "dragon_breath": "minecraft:dragon_breath",
+    "dragon_egg": "minecraft:dragon_egg",
+    "dried_kelp": "minecraft:dried_kelp",
+    "dried_kelp_block": "minecraft:dried_kelp_block",
+    "dropper": "minecraft:dropper",
+    "dye": "minecraft:dye",
+    "egg": "minecraft:egg",
+    "element_0": "minecraft:element_0",
+    "element_1": "minecraft:element_1",
+    "element_2": "minecraft:element_2",
+    "element_3": "minecraft:element_3",
+    "element_4": "minecraft:element_4",
+    "element_5": "minecraft:element_5",
+    "element_6": "minecraft:element_6",
+    "element_7": "minecraft:element_7",
+    "element_8": "minecraft:element_8",
+    "element_9": "minecraft:element_9",
+    "element_10": "minecraft:element_10",
+    "element_11": "minecraft:element_11",
+    "element_12": "minecraft:element_12",
+    "element_13": "minecraft:element_13",
+    "element_14": "minecraft:element_14",
+    "element_15": "minecraft:element_15",
+    "element_16": "minecraft:element_16",
+    "element_17": "minecraft:element_17",
+    "element_18": "minecraft:element_18",
+    "element_19": "minecraft:element_19",
+    "element_20": "minecraft:element_20",
+    "element_21": "minecraft:element_21",
+    "element_22": "minecraft:element_22",
+    "element_23": "minecraft:element_23",
+    "element_24": "minecraft:element_24",
+    "element_25": "minecraft:element_25",
+    "element_26": "minecraft:element_26",
+    "element_27": "minecraft:element_27",
+    "element_28": "minecraft:element_28",
+    "element_29": "minecraft:element_29",
+    "element_30": "minecraft:element_30",
+    "element_31": "minecraft:element_31",
+    "element_32": "minecraft:element_32",
+    "element_33": "minecraft:element_33",
+    "element_34": "minecraft:element_34",
+    "element_35": "minecraft:element_35",
+    "element_36": "minecraft:element_36",
+    "element_37": "minecraft:element_37",
+    "element_38": "minecraft:element_38",
+    "element_39": "minecraft:element_39",
+    "element_40": "minecraft:element_40",
+    "element_41": "minecraft:element_41",
+    "element_42": "minecraft:element_42",
+    "element_43": "minecraft:element_43",
+    "element_44": "minecraft:element_44",
+    "element_45": "minecraft:element_45",
+    "element_46": "minecraft:element_46",
+    "element_47": "minecraft:element_47",
+    "element_48": "minecraft:element_48",
+    "element_49": "minecraft:element_49",
+    "element_50": "minecraft:element_50",
+    "element_51": "minecraft:element_51",
+    "element_52": "minecraft:element_52",
+    "element_53": "minecraft:element_53",
+    "element_54": "minecraft:element_54",
+    "element_55": "minecraft:element_55",
+    "element_56": "minecraft:element_56",
+    "element_57": "minecraft:element_57",
+    "element_58": "minecraft:element_58",
+    "element_59": "minecraft:element_59",
+    "element_60": "minecraft:element_60",
+    "element_61": "minecraft:element_61",
+    "element_62": "minecraft:element_62",
+    "element_63": "minecraft:element_63",
+    "element_64": "minecraft:element_64",
+    "element_65": "minecraft:element_65",
+    "element_66": "minecraft:element_66",
+    "element_67": "minecraft:element_67",
+    "element_68": "minecraft:element_68",
+    "element_69": "minecraft:element_69",
+    "element_70": "minecraft:element_70",
+    "element_71": "minecraft:element_71",
+    "element_72": "minecraft:element_72",
+    "element_73": "minecraft:element_73",
+    "element_74": "minecraft:element_74",
+    "element_75": "minecraft:element_75",
+    "element_76": "minecraft:element_76",
+    "element_77": "minecraft:element_77",
+    "element_78": "minecraft:element_78",
+    "element_79": "minecraft:element_79",
+    "element_80": "minecraft:element_80",
+    "element_81": "minecraft:element_81",
+    "element_82": "minecraft:element_82",
+    "element_83": "minecraft:element_83",
+    "element_84": "minecraft:element_84",
+    "element_85": "minecraft:element_85",
+    "element_86": "minecraft:element_86",
+    "element_87": "minecraft:element_87",
+    "element_88": "minecraft:element_88",
+    "element_89": "minecraft:element_89",
+    "element_90": "minecraft:element_90",
+    "element_91": "minecraft:element_91",
+    "element_92": "minecraft:element_92",
+    "element_93": "minecraft:element_93",
+    "element_94": "minecraft:element_94",
+    "element_95": "minecraft:element_95",
+    "element_96": "minecraft:element_96",
+    "element_97": "minecraft:element_97",
+    "element_98": "minecraft:element_98",
+    "element_99": "minecraft:element_99",
+    "element_100": "minecraft:element_100",
+    "element_101": "minecraft:element_101",
+    "element_102": "minecraft:element_102",
+    "element_103": "minecraft:element_103",
+    "element_104": "minecraft:element_104",
+    "element_105": "minecraft:element_105",
+    "element_106": "minecraft:element_106",
+    "element_107": "minecraft:element_107",
+    "element_108": "minecraft:element_108",
+    "element_109": "minecraft:element_109",
+    "element_110": "minecraft:element_110",
+    "element_111": "minecraft:element_111",
+    "element_112": "minecraft:element_112",
+    "element_113": "minecraft:element_113",
+    "element_114": "minecraft:element_114",
+    "element_115": "minecraft:element_115",
+    "element_116": "minecraft:element_116",
+    "element_117": "minecraft:element_117",
+    "element_118": "minecraft:element_118",
+    "elytra": "minecraft:elytra",
+    "emerald": "minecraft:emerald",
+    "emerald_block": "minecraft:emerald_block",
+    "emerald_ore": "minecraft:emerald_ore",
+    "empty_map": "minecraft:emptymap",
+    "emptymap": "minecraft:emptymap",
+    "enchant_table": "minecraft:enchanting_table",
+    "enchanted_book": "minecraft:enchanted_book",
+    "enchanted_golden_apple": "minecraft:appleenchanted",
+    "enchanting_bottle": "minecraft:experience_bottle",
+    "enchanting_table": "minecraft:enchanting_table",
+    "enchantment_table": "minecraft:enchanting_table",
+    "end_brick_stairs": "minecraft:end_brick_stairs",
+    "end_bricks": "minecraft:end_bricks",
+    "end_crystal": "minecraft:end_crystal",
+    "end_gateway": "minecraft:end_gateway",
+    "end_portal": "minecraft:end_portal",
+    "end_portal_frame": "minecraft:end_portal_frame",
+    "end_rod": "minecraft:end_rod",
+    "end_stone": "minecraft:end_stone",
+    "ender_chest": "minecraft:ender_chest",
+    "ender_eye": "minecraft:ender_eye",
+    "ender_pearl": "minecraft:ender_pearl",
+    "experience_bottle": "minecraft:experience_bottle",
+    "farmland": "minecraft:farmland",
+    "feather": "minecraft:feather",
+    "fence": "minecraft:fence",
+    "fence_gate": "minecraft:fence_gate",
+    "fence_gate_acacia": "minecraft:acacia_fence_gate",
+    "fence_gate_birch": "minecraft:birch_fence_gate",
+    "fence_gate_dark_oak": "minecraft:dark_oak_fence_gate",
+    "fence_gate_jungle": "minecraft:jungle_fence_gate",
+    "fence_gate_spruce": "minecraft:spruce_fence_gate",
+    "fermented_spider_eye": "minecraft:fermented_spider_eye",
+    "filled_map": "minecraft:map",
+    "fire": "minecraft:fire",
+    "fire_charge": "minecraft:fireball",
+    "fireball": "minecraft:fireball",
+    "fireworks": "minecraft:fireworks",
+    "fireworks_charge": "minecraft:fireworkscharge",
+    "fireworkscharge": "minecraft:fireworkscharge",
+    "fish": "minecraft:fish",
+    "fishing_rod": "minecraft:fishing_rod",
+    "fletching_table": "minecraft:fletching_table",
+    "flint": "minecraft:flint",
+    "flint_and_steel": "minecraft:flint_and_steel",
+    "flint_steel": "minecraft:flint_and_steel",
+    "flower_pot": "minecraft:flower_pot",
+    "flower_pot_block": "minecraft:item.flower_pot",
+    "flowing_lava": "minecraft:flowing_lava",
+    "flowing_water": "minecraft:flowing_water",
+    "frame": "minecraft:frame",
+    "frame_block": "minecraft:item.frame",
+    "frosted_ice": "minecraft:frosted_ice",
+    "furnace": "minecraft:furnace",
+    "ghast_tear": "minecraft:ghast_tear",
+    "glass": "minecraft:glass",
+    "glass_bottle": "minecraft:glass_bottle",
+    "glass_pane": "minecraft:glass_pane",
+    "glass_panel": "minecraft:glass_pane",
+    "glistering_melon": "minecraft:speckled_melon",
+    "glow_stick": "minecraft:glow_stick",
+    "glowing_obsidian": "minecraft:glowingobsidian",
+    "glowing_redstone_ore": "minecraft:lit_redstone_ore",
+    "glowingobsidian": "minecraft:glowingobsidian",
+    "glowstone": "minecraft:glowstone",
+    "glowstone_block": "minecraft:glowstone",
+    "glowstone_dust": "minecraft:glowstone_dust",
+    "gold_axe": "minecraft:golden_axe",
+    "gold_block": "minecraft:gold_block",
+    "gold_boots": "minecraft:golden_boots",
+    "gold_chestplate": "minecraft:golden_chestplate",
+    "gold_helmet": "minecraft:golden_helmet",
+    "gold_hoe": "minecraft:golden_hoe",
+    "gold_horse_armor": "minecraft:horsearmorgold",
+    "gold_ingot": "minecraft:gold_ingot",
+    "gold_leggings": "minecraft:golden_leggings",
+    "gold_nugget": "minecraft:gold_nugget",
+    "gold_ore": "minecraft:gold_ore",
+    "gold_pickaxe": "minecraft:golden_pickaxe",
+    "gold_pressure_plate": "minecraft:light_weighted_pressure_plate",
+    "gold_shovel": "minecraft:golden_shovel",
+    "gold_sword": "minecraft:golden_sword",
+    "golden_apple": "minecraft:golden_apple",
+    "golden_axe": "minecraft:golden_axe",
+    "golden_boots": "minecraft:golden_boots",
+    "golden_carrot": "minecraft:golden_carrot",
+    "golden_chestplate": "minecraft:golden_chestplate",
+    "golden_helmet": "minecraft:golden_helmet",
+    "golden_hoe": "minecraft:golden_hoe",
+    "golden_horse_armor": "minecraft:horsearmorgold",
+    "golden_leggings": "minecraft:golden_leggings",
+    "golden_nugget": "minecraft:gold_nugget",
+    "golden_pickaxe": "minecraft:golden_pickaxe",
+    "golden_rail": "minecraft:golden_rail",
+    "golden_shovel": "minecraft:golden_shovel",
+    "golden_sword": "minecraft:golden_sword",
+    "granite_stairs": "minecraft:granite_stairs",
+    "grass": "minecraft:grass",
+    "grass_path": "minecraft:grass_path",
+    "gravel": "minecraft:gravel",
+    "gray_glazed_terracotta": "minecraft:gray_glazed_terracotta",
+    "green_glazed_terracotta": "minecraft:green_glazed_terracotta",
+    "grindstone": "minecraft:grindstone",
+    "gunpowder": "minecraft:gunpowder",
+    "hard_glass": "minecraft:hard_glass",
+    "hard_glass_pane": "minecraft:hard_glass_pane",
+    "hard_stained_glass": "minecraft:hard_stained_glass",
+    "hard_stained_glass_pane": "minecraft:hard_stained_glass_pane",
+    "hardened_clay": "minecraft:hardened_clay",
+    "hay_bale": "minecraft:hay_block",
+    "hay_block": "minecraft:hay_block",
+    "heart_of_the_sea": "minecraft:heart_of_the_sea",
+    "heavy_weighted_pressure_plate": "minecraft:heavy_weighted_pressure_plate",
+    "hopper": "minecraft:hopper",
+    "hopper_block": "minecraft:item.hopper",
+    "hopper_minecart": "minecraft:hopper_minecart",
+    "horse_armor_diamond": "minecraft:horsearmordiamond",
+    "horse_armor_gold": "minecraft:horsearmorgold",
+    "horse_armor_iron": "minecraft:horsearmoriron",
+    "horse_armor_leather": "minecraft:horsearmorleather",
+    "horsearmordiamond": "minecraft:horsearmordiamond",
+    "horsearmorgold": "minecraft:horsearmorgold",
+    "horsearmoriron": "minecraft:horsearmoriron",
+    "horsearmorleather": "minecraft:horsearmorleather",
+    "ice": "minecraft:ice",
+    "ice_bomb": "minecraft:ice_bomb",
+    "inactive_redstone_lamp": "minecraft:redstone_lamp",
+    "info_reserved6": "minecraft:reserved6",
+    "info_update": "minecraft:info_update",
+    "info_update2": "minecraft:info_update2",
+    "inverted_daylight_sensor": "minecraft:daylight_detector_inverted",
+    "invisible_bedrock": "minecraft:invisiblebedrock",
+    "invisiblebedrock": "minecraft:invisiblebedrock",
+    "iron_axe": "minecraft:iron_axe",
+    "iron_bar": "minecraft:iron_bars",
+    "iron_bars": "minecraft:iron_bars",
+    "iron_block": "minecraft:iron_block",
+    "iron_boots": "minecraft:iron_boots",
+    "iron_chestplate": "minecraft:iron_chestplate",
+    "iron_door": "minecraft:iron_door",
+    "iron_door_block": "minecraft:item.iron_door",
+    "iron_helmet": "minecraft:iron_helmet",
+    "iron_hoe": "minecraft:iron_hoe",
+    "iron_horse_armor": "minecraft:horsearmoriron",
+    "iron_ingot": "minecraft:iron_ingot",
+    "iron_leggings": "minecraft:iron_leggings",
+    "iron_nugget": "minecraft:iron_nugget",
+    "iron_ore": "minecraft:iron_ore",
+    "iron_pickaxe": "minecraft:iron_pickaxe",
+    "iron_pressure_plate": "minecraft:heavy_weighted_pressure_plate",
+    "iron_shovel": "minecraft:iron_shovel",
+    "iron_sword": "minecraft:iron_sword",
+    "iron_trapdoor": "minecraft:iron_trapdoor",
+    "item_frame": "minecraft:frame",
+    "item_frame_block": "minecraft:item.frame",
+    "jack_o_lantern": "minecraft:lit_pumpkin",
+    "jigsaw": "minecraft:jigsaw",
+    "jukebox": "minecraft:jukebox",
+    "jungle_button": "minecraft:jungle_button",
+    "jungle_door": "minecraft:jungle_door",
+    "jungle_door_block": "minecraft:item.jungle_door",
+    "jungle_fence_gate": "minecraft:jungle_fence_gate",
+    "jungle_pressure_plate": "minecraft:jungle_pressure_plate",
+    "jungle_sign": "minecraft:jungle_sign",
+    "jungle_stairs": "minecraft:jungle_stairs",
+    "jungle_standing_sign": "minecraft:jungle_standing_sign",
+    "jungle_trapdoor": "minecraft:jungle_trapdoor",
+    "jungle_wall_sign": "minecraft:jungle_wall_sign",
+    "kelp": "minecraft:kelp",
+    "kelp_block": "minecraft:item.kelp",
+    "ladder": "minecraft:ladder",
+    "lantern": "minecraft:lantern",
+    "lapis_block": "minecraft:lapis_block",
+    "lapis_ore": "minecraft:lapis_ore",
+    "lava": "minecraft:lava",
+    "lava_cauldron": "minecraft:lava_cauldron",
+    "lead": "minecraft:lead",
+    "leash": "minecraft:lead",
+    "leather": "minecraft:leather",
+    "leather_boots": "minecraft:leather_boots",
+    "leather_cap": "minecraft:leather_helmet",
+    "leather_chestplate": "minecraft:leather_chestplate",
+    "leather_helmet": "minecraft:leather_helmet",
+    "leather_horse_armor": "minecraft:horsearmorleather",
+    "leather_leggings": "minecraft:leather_leggings",
+    "leather_pants": "minecraft:leather_leggings",
+    "leather_tunic": "minecraft:leather_chestplate",
+    "leave": "minecraft:leaves",
+    "leave2": "minecraft:leaves2",
+    "leaves": "minecraft:leaves",
+    "leaves2": "minecraft:leaves2",
+    "lectern": "minecraft:lectern",
+    "lever": "minecraft:lever",
+    "light_blue_glazed_terracotta": "minecraft:light_blue_glazed_terracotta",
+    "light_weighted_pressure_plate": "minecraft:light_weighted_pressure_plate",
+    "lily_pad": "minecraft:waterlily",
+    "lime_glazed_terracotta": "minecraft:lime_glazed_terracotta",
+    "lingering_potion": "minecraft:lingering_potion",
+    "lit_blast_furnace": "minecraft:lit_blast_furnace",
+    "lit_furnace": "minecraft:lit_furnace",
+    "lit_pumpkin": "minecraft:lit_pumpkin",
+    "lit_redstone_lamp": "minecraft:lit_redstone_lamp",
+    "lit_redstone_ore": "minecraft:lit_redstone_ore",
+    "lit_redstone_torch": "minecraft:redstone_torch",
+    "lit_smoker": "minecraft:lit_smoker",
+    "log": "minecraft:log",
+    "log2": "minecraft:log2",
+    "loom": "minecraft:loom",
+    "magenta_glazed_terracotta": "minecraft:magenta_glazed_terracotta",
+    "magma": "minecraft:magma",
+    "magma_cream": "minecraft:magma_cream",
+    "map": "minecraft:emptymap",
+    "medicine": "minecraft:medicine",
+    "melon": "minecraft:melon",
+    "melon_block": "minecraft:melon_block",
+    "melon_seeds": "minecraft:melon_seeds",
+    "melon_slice": "minecraft:melon",
+    "melon_stem": "minecraft:melon_stem",
+    "minecart": "minecraft:minecart",
+    "minecart_with_chest": "minecraft:chest_minecart",
+    "minecart_with_command_block": "minecraft:command_block_minecart",
+    "minecart_with_hopper": "minecraft:hopper_minecart",
+    "minecart_with_tnt": "minecraft:tnt_minecart",
+    "mob_head": "minecraft:skull",
+    "mob_head_block": "minecraft:item.skull",
+    "mob_spawner": "minecraft:mob_spawner",
+    "monster_egg": "minecraft:monster_egg",
+    "monster_egg_block": "minecraft:monster_egg",
+    "monster_spawner": "minecraft:mob_spawner",
+    "moss_stone": "minecraft:mossy_cobblestone",
+    "mossy_cobblestone": "minecraft:mossy_cobblestone",
+    "mossy_cobblestone_stairs": "minecraft:mossy_cobblestone_stairs",
+    "mossy_stone": "minecraft:mossy_cobblestone",
+    "mossy_stone_brick_stairs": "minecraft:mossy_stone_brick_stairs",
+    "moving_block": "minecraft:movingblock",
+    "movingblock": "minecraft:movingblock",
+    "mushroom_stew": "minecraft:mushroom_stew",
+    "mutton": "minecraft:muttonraw",
+    "mutton_cooked": "minecraft:muttoncooked",
+    "mutton_raw": "minecraft:muttonraw",
+    "muttoncooked": "minecraft:muttoncooked",
+    "muttonraw": "minecraft:muttonraw",
+    "mycelium": "minecraft:mycelium",
+    "name_tag": "minecraft:name_tag",
+    "nametag": "minecraft:name_tag",
+    "nautilus_shell": "minecraft:nautilus_shell",
+    "nether_brick": "minecraft:netherbrick",
+    "nether_brick_block": "minecraft:nether_brick",
+    "nether_brick_fence": "minecraft:nether_brick_fence",
+    "nether_brick_stairs": "minecraft:nether_brick_stairs",
+    "nether_bricks": "minecraft:nether_brick",
+    "nether_bricks_stairs": "minecraft:nether_brick_stairs",
+    "nether_quartz": "minecraft:quartz",
+    "nether_quartz_ore": "minecraft:quartz_ore",
+    "nether_reactor": "minecraft:netherreactor",
+    "nether_star": "minecraft:netherstar",
+    "nether_wart": "minecraft:nether_wart",
+    "nether_wart_block": "minecraft:nether_wart_block",
+    "nether_wart_plant": "minecraft:item.nether_wart",
+    "netherbrick": "minecraft:netherbrick",
+    "netherrack": "minecraft:netherrack",
+    "netherreactor": "minecraft:netherreactor",
+    "netherstar": "minecraft:netherstar",
+    "normal_stone_stairs": "minecraft:normal_stone_stairs",
+    "note_block": "minecraft:noteblock",
+    "noteblock": "minecraft:noteblock",
+    "oak_door": "minecraft:wooden_door",
+    "oak_door_block": "minecraft:item.wooden_door",
+    "oak_fence_gate": "minecraft:fence_gate",
+    "oak_stairs": "minecraft:oak_stairs",
+    "oak_wood_stairs": "minecraft:oak_stairs",
+    "oak_wooden_stairs": "minecraft:oak_stairs",
+    "observer": "minecraft:observer",
+    "obsidian": "minecraft:obsidian",
+    "orange_glazed_terracotta": "minecraft:orange_glazed_terracotta",
+    "packed_ice": "minecraft:packed_ice",
+    "painting": "minecraft:painting",
+    "paper": "minecraft:paper",
+    "phantom_membrane": "minecraft:phantom_membrane",
+    "pink_glazed_terracotta": "minecraft:pink_glazed_terracotta",
+    "piston": "minecraft:piston",
+    "piston_arm_collision": "minecraft:pistonarmcollision",
+    "piston_head": "minecraft:pistonarmcollision",
+    "pistonarmcollision": "minecraft:pistonarmcollision",
+    "plank": "minecraft:planks",
+    "planks": "minecraft:planks",
+    "podzol": "minecraft:podzol",
+    "poisonous_potato": "minecraft:poisonous_potato",
+    "polished_andesite_stairs": "minecraft:polished_andesite_stairs",
+    "polished_diorite_stairs": "minecraft:polished_diorite_stairs",
+    "polished_granite_stairs": "minecraft:polished_granite_stairs",
+    "poppy": "minecraft:red_flower",
+    "porkchop": "minecraft:porkchop",
+    "portal": "minecraft:portal",
+    "portal_block": "minecraft:portal",
+    "potato": "minecraft:potato",
+    "potato_block": "minecraft:potatoes",
+    "potatoes": "minecraft:potatoes",
+    "potion": "minecraft:potion",
+    "powered_comparator": "minecraft:powered_comparator",
+    "powered_comparator_block": "minecraft:powered_comparator",
+    "powered_rail": "minecraft:golden_rail",
+    "powered_repeater": "minecraft:powered_repeater",
+    "powered_repeater_block": "minecraft:powered_repeater",
+    "prismarine": "minecraft:prismarine",
+    "prismarine_bricks_stairs": "minecraft:prismarine_bricks_stairs",
+    "prismarine_crystals": "minecraft:prismarine_crystals",
+    "prismarine_shard": "minecraft:prismarine_shard",
+    "prismarine_stairs": "minecraft:prismarine_stairs",
+    "puffer_fish": "minecraft:pufferfish",
+    "pufferfish": "minecraft:pufferfish",
+    "pumpkin": "minecraft:pumpkin",
+    "pumpkin_pie": "minecraft:pumpkin_pie",
+    "pumpkin_seeds": "minecraft:pumpkin_seeds",
+    "pumpkin_stem": "minecraft:pumpkin_stem",
+    "purple_glazed_terracotta": "minecraft:purple_glazed_terracotta",
+    "purpur_block": "minecraft:purpur_block",
+    "purpur_stairs": "minecraft:purpur_stairs",
+    "quartz": "minecraft:quartz",
+    "quartz_block": "minecraft:quartz_block",
+    "quartz_ore": "minecraft:quartz_ore",
+    "quartz_stairs": "minecraft:quartz_stairs",
+    "rabbit": "minecraft:rabbit",
+    "rabbit_foot": "minecraft:rabbit_foot",
+    "rabbit_hide": "minecraft:rabbit_hide",
+    "rabbit_stew": "minecraft:rabbit_stew",
+    "rail": "minecraft:rail",
+    "rapid_fertilizer": "minecraft:rapid_fertilizer",
+    "raw_beef": "minecraft:beef",
+    "raw_chicken": "minecraft:chicken",
+    "raw_fish": "minecraft:fish",
+    "raw_mutton": "minecraft:muttonraw",
+    "raw_porkchop": "minecraft:porkchop",
+    "raw_rabbit": "minecraft:rabbit",
+    "raw_salmon": "minecraft:salmon",
+    "record_11": "minecraft:record_11",
+    "record_13": "minecraft:record_13",
+    "record_blocks": "minecraft:record_blocks",
+    "record_cat": "minecraft:record_cat",
+    "record_chirp": "minecraft:record_chirp",
+    "record_far": "minecraft:record_far",
+    "record_mall": "minecraft:record_mall",
+    "record_mellohi": "minecraft:record_mellohi",
+    "record_stal": "minecraft:record_stal",
+    "record_strad": "minecraft:record_strad",
+    "record_wait": "minecraft:record_wait",
+    "record_ward": "minecraft:record_ward",
+    "red_flower": "minecraft:red_flower",
+    "red_glazed_terracotta": "minecraft:red_glazed_terracotta",
+    "red_mushroom": "minecraft:red_mushroom",
+    "red_mushroom_block": "minecraft:red_mushroom_block",
+    "red_nether_brick": "minecraft:red_nether_brick",
+    "red_nether_brick_stairs": "minecraft:red_nether_brick_stairs",
+    "red_sandstone": "minecraft:red_sandstone",
+    "red_sandstone_slab": "minecraft:double_stone_slab2",
+    "red_sandstone_stairs": "minecraft:red_sandstone_stairs",
+    "redstone": "minecraft:redstone",
+    "redstone_block": "minecraft:redstone_block",
+    "redstone_dust": "minecraft:redstone",
+    "redstone_lamp": "minecraft:redstone_lamp",
+    "redstone_ore": "minecraft:redstone_ore",
+    "redstone_torch": "minecraft:redstone_torch",
+    "redstone_wire": "minecraft:redstone_wire",
+    "reeds": "minecraft:reeds",
+    "reeds_block": "minecraft:item.reeds",
+    "repeater": "minecraft:repeater",
+    "repeater_block": "minecraft:unpowered_repeater",
+    "repeating_command_block": "minecraft:repeating_command_block",
+    "reserved6": "minecraft:reserved6",
+    "rose": "minecraft:red_flower",
+    "rotten_flesh": "minecraft:rotten_flesh",
+    "saddle": "minecraft:saddle",
+    "salmon": "minecraft:salmon",
+    "sand": "minecraft:sand",
+    "sandstone": "minecraft:sandstone",
+    "sandstone_stairs": "minecraft:sandstone_stairs",
+    "sapling": "minecraft:sapling",
+    "scaffolding": "minecraft:scaffolding",
+    "sea_lantern": "minecraft:sealantern",
+    "sea_pickle": "minecraft:sea_pickle",
+    "seagrass": "minecraft:seagrass",
+    "sealantern": "minecraft:sealantern",
+    "seeds": "minecraft:wheat_seeds",
+    "shears": "minecraft:shears",
+    "shield": "minecraft:shield",
+    "shulker_box": "minecraft:shulker_box",
+    "shulker_shell": "minecraft:shulker_shell",
+    "sign": "minecraft:sign",
+    "sign_post": "minecraft:standing_sign",
+    "silver_glazed_terracotta": "minecraft:silver_glazed_terracotta",
+    "skull": "minecraft:skull",
+    "skull_block": "minecraft:item.skull",
+    "slab": "minecraft:double_stone_slab",
+    "slabs": "minecraft:double_stone_slab",
+    "slime": "minecraft:slime",
+    "slime_ball": "minecraft:slime_ball",
+    "slime_block": "minecraft:slime",
+    "slimeball": "minecraft:slime_ball",
+    "smithing_table": "minecraft:smithing_table",
+    "smoker": "minecraft:smoker",
+    "smooth_quartz_stairs": "minecraft:smooth_quartz_stairs",
+    "smooth_red_sandstone_stairs": "minecraft:smooth_red_sandstone_stairs",
+    "smooth_sandstone_stairs": "minecraft:smooth_sandstone_stairs",
+    "smooth_stone": "minecraft:smooth_stone",
+    "snow": "minecraft:snow",
+    "snow_block": "minecraft:snow",
+    "snow_layer": "minecraft:snow_layer",
+    "snowball": "minecraft:snowball",
+    "soul_sand": "minecraft:soul_sand",
+    "sparkler": "minecraft:sparkler",
+    "spawn_egg": "minecraft:spawn_egg",
+    "speckled_melon": "minecraft:speckled_melon",
+    "spider_eye": "minecraft:spider_eye",
+    "splash_potion": "minecraft:splash_potion",
+    "sponge": "minecraft:sponge",
+    "spruce_button": "minecraft:spruce_button",
+    "spruce_door": "minecraft:spruce_door",
+    "spruce_door_block": "minecraft:item.spruce_door",
+    "spruce_fence_gate": "minecraft:spruce_fence_gate",
+    "spruce_pressure_plate": "minecraft:spruce_pressure_plate",
+    "spruce_sign": "minecraft:spruce_sign",
+    "spruce_stairs": "minecraft:spruce_stairs",
+    "spruce_standing_sign": "minecraft:spruce_standing_sign",
+    "spruce_trapdoor": "minecraft:spruce_trapdoor",
+    "spruce_wall_sign": "minecraft:spruce_wall_sign",
+    "spruce_wood_stairs": "minecraft:spruce_stairs",
+    "spruce_wooden_stairs": "minecraft:spruce_stairs",
+    "stained_clay": "minecraft:stained_hardened_clay",
+    "stained_glass": "minecraft:stained_glass",
+    "stained_glass_pane": "minecraft:stained_glass_pane",
+    "stained_hardened_clay": "minecraft:stained_hardened_clay",
+    "standing_banner": "minecraft:standing_banner",
+    "standing_sign": "minecraft:standing_sign",
+    "steak": "minecraft:cooked_beef",
+    "stick": "minecraft:stick",
+    "sticks": "minecraft:stick",
+    "sticky_piston": "minecraft:sticky_piston",
+    "still_lava": "minecraft:lava",
+    "still_water": "minecraft:water",
+    "stone": "minecraft:stone",
+    "stone_axe": "minecraft:stone_axe",
+    "stone_brick": "minecraft:stonebrick",
+    "stone_brick_stairs": "minecraft:stone_brick_stairs",
+    "stone_bricks": "minecraft:stonebrick",
+    "stone_button": "minecraft:stone_button",
+    "stone_hoe": "minecraft:stone_hoe",
+    "stone_pickaxe": "minecraft:stone_pickaxe",
+    "stone_pressure_plate": "minecraft:stone_pressure_plate",
+    "stone_shovel": "minecraft:stone_shovel",
+    "stone_slab": "minecraft:double_stone_slab",
+    "stone_slab2": "minecraft:double_stone_slab2",
+    "stone_slab3": "minecraft:double_stone_slab3",
+    "stone_slab4": "minecraft:double_stone_slab4",
+    "stone_stairs": "minecraft:stone_stairs",
+    "stone_sword": "minecraft:stone_sword",
+    "stone_wall": "minecraft:cobblestone_wall",
+    "stonebrick": "minecraft:stonebrick",
+    "stonecutter": "minecraft:stonecutter",
+    "stonecutter_block": "minecraft:stonecutter_block",
+    "string": "minecraft:string",
+    "stripped_acacia_log": "minecraft:stripped_acacia_log",
+    "stripped_birch_log": "minecraft:stripped_birch_log",
+    "stripped_dark_oak_log": "minecraft:stripped_dark_oak_log",
+    "stripped_jungle_log": "minecraft:stripped_jungle_log",
+    "stripped_oak_log": "minecraft:stripped_oak_log",
+    "stripped_spruce_log": "minecraft:stripped_spruce_log",
+    "structure_block": "minecraft:structure_block",
+    "sugar": "minecraft:sugar",
+    "sugar_cane": "minecraft:reeds",
+    "sugar_canes": "minecraft:reeds",
+    "sugarcane": "minecraft:reeds",
+    "sugarcane_block": "minecraft:item.reeds",
+    "sweet_berries": "minecraft:sweet_berries",
+    "sweet_berry_bush": "minecraft:sweet_berry_bush",
+    "tall_grass": "minecraft:tallgrass",
+    "tallgrass": "minecraft:tallgrass",
+    "terracotta": "minecraft:stained_hardened_clay",
+    "tnt": "minecraft:tnt",
+    "tnt_minecart": "minecraft:tnt_minecart",
+    "torch": "minecraft:torch",
+    "totem": "minecraft:totem",
+    "trapdoor": "minecraft:trapdoor",
+    "trapped_chest": "minecraft:trapped_chest",
+    "trident": "minecraft:trident",
+    "trip_wire": "minecraft:tripwire",
+    "tripwire": "minecraft:tripwire",
+    "tripwire_hook": "minecraft:tripwire_hook",
+    "trunk": "minecraft:planks",
+    "trunk2": "minecraft:log2",
+    "turtle_egg": "minecraft:turtle_egg",
+    "turtle_helmet": "minecraft:turtle_helmet",
+    "turtle_shell_piece": "minecraft:turtle_shell_piece",
+    "underwater_torch": "minecraft:underwater_torch",
+    "undyed_shulker_box": "minecraft:undyed_shulker_box",
+    "unlit_redstone_torch": "minecraft:unlit_redstone_torch",
+    "unpowered_comparator": "minecraft:unpowered_comparator",
+    "unpowered_comparator_block": "minecraft:unpowered_comparator",
+    "unpowered_repeater": "minecraft:unpowered_repeater",
+    "unpowered_repeater_block": "minecraft:unpowered_repeater",
+    "update_block": "minecraft:info_update",
+    "vine": "minecraft:vine",
+    "vines": "minecraft:vine",
+    "wall_banner": "minecraft:wall_banner",
+    "wall_sign": "minecraft:wall_sign",
+    "water": "minecraft:water",
+    "water_lily": "minecraft:waterlily",
+    "waterlily": "minecraft:waterlily",
+    "web": "minecraft:web",
+    "weighted_pressure_plate_heavy": "minecraft:heavy_weighted_pressure_plate",
+    "weighted_pressure_plate_light": "minecraft:light_weighted_pressure_plate",
+    "wheat": "minecraft:wheat",
+    "wheat_block": "minecraft:item.wheat",
+    "wheat_seeds": "minecraft:wheat_seeds",
+    "white_glazed_terracotta": "minecraft:white_glazed_terracotta",
+    "wood": "minecraft:log",
+    "wood2": "minecraft:log2",
+    "wood_door_block": "minecraft:item.wooden_door",
+    "wood_slab": "minecraft:wooden_slab",
+    "wood_slabs": "minecraft:wooden_slab",
+    "wood_stairs": "minecraft:oak_stairs",
+    "wooden_axe": "minecraft:wooden_axe",
+    "wooden_button": "minecraft:wooden_button",
+    "wooden_door": "minecraft:wooden_door",
+    "wooden_door_block": "minecraft:item.wooden_door",
+    "wooden_hoe": "minecraft:wooden_hoe",
+    "wooden_pickaxe": "minecraft:wooden_pickaxe",
+    "wooden_plank": "minecraft:planks",
+    "wooden_planks": "minecraft:planks",
+    "wooden_pressure_plate": "minecraft:wooden_pressure_plate",
+    "wooden_shovel": "minecraft:wooden_shovel",
+    "wooden_slab": "minecraft:wooden_slab",
+    "wooden_slabs": "minecraft:wooden_slab",
+    "wooden_stairs": "minecraft:oak_stairs",
+    "wooden_sword": "minecraft:wooden_sword",
+    "wooden_trapdoor": "minecraft:trapdoor",
+    "wool": "minecraft:wool",
+    "workbench": "minecraft:crafting_table",
+    "writable_book": "minecraft:writable_book",
+    "written_book": "minecraft:written_book",
+    "yellow_flower": "minecraft:yellow_flower",
+    "yellow_glazed_terracotta": "minecraft:yellow_glazed_terracotta"
 }
diff --git a/resources/pocketmine.yml b/resources/pocketmine.yml
index ac60afe53f..408b5b95b3 100644
--- a/resources/pocketmine.yml
+++ b/resources/pocketmine.yml
@@ -85,8 +85,11 @@ network:
   batch-threshold: 256
   #Compression level used when sending batched packets. Higher = more CPU, less bandwidth usage
   compression-level: 6
-  #Use AsyncTasks for compression. Adds half/one tick delay, less CPU load on main thread
+  #Use AsyncTasks for compression during the main game session. Increases latency, but may reduce main thread load
   async-compression: false
+  #Threshold for async compression, in bytes. Only packets larger than this will be compressed asynchronously
+  #Due to large overhead of AsyncTask, async compression isn't worth it except for large packets
+  async-compression-threshold: 10000
   #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
diff --git a/src/BootstrapOptions.php b/src/BootstrapOptions.php
new file mode 100644
index 0000000000..6a14696252
--- /dev/null
+++ b/src/BootstrapOptions.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine;
+
+/**
+ * Constants for all the command-line options that PocketMine-MP supports.
+ * Other options not listed here can be used to override server.properties and pocketmine.yml values temporarily.
+ *
+ * @internal
+ */
+final class BootstrapOptions{
+
+	private function __construct(){
+		//NOOP
+	}
+
+	/** Disables the setup wizard on first startup */
+	public const NO_WIZARD = "no-wizard";
+	/** Force-disables console text colour and formatting */
+	public const DISABLE_ANSI = "disable-ansi";
+	/** Force-enables console text colour and formatting */
+	public const ENABLE_ANSI = "enable-ansi";
+	/** Path to look in for plugins */
+	public const PLUGINS = "plugins";
+	/** Path to store and load server data */
+	public const DATA = "data";
+	/** Shows basic server version information and exits */
+	public const VERSION = "version";
+	/** Disables writing logs to server.log */
+	public const NO_LOG_FILE = "no-log-file";
+}
diff --git a/src/CoreConstants.php b/src/CoreConstants.php
index 7b0345b1c2..c184862377 100644
--- a/src/CoreConstants.php
+++ b/src/CoreConstants.php
@@ -37,4 +37,6 @@ define('pocketmine\PATH', dirname(__DIR__) . '/');
 define('pocketmine\RESOURCE_PATH', dirname(__DIR__) . '/resources/');
 define('pocketmine\BEDROCK_DATA_PATH', dirname(__DIR__) . '/vendor/pocketmine/bedrock-data/');
 define('pocketmine\LOCALE_DATA_PATH', dirname(__DIR__) . '/vendor/pocketmine/locale-data/');
+define('pocketmine\BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH', dirname(__DIR__) . '/vendor/pocketmine/bedrock-block-upgrade-schema/');
+define('pocketmine\BEDROCK_ITEM_UPGRADE_SCHEMA_PATH', dirname(__DIR__) . '/vendor/pocketmine/bedrock-item-upgrade-schema/');
 define('pocketmine\COMPOSER_AUTOLOADER_PATH', dirname(__DIR__) . '/vendor/autoload.php');
diff --git a/src/MemoryManager.php b/src/MemoryManager.php
index 0162f0be0e..4308167d37 100644
--- a/src/MemoryManager.php
+++ b/src/MemoryManager.php
@@ -30,6 +30,7 @@ use pocketmine\scheduler\GarbageCollectionTask;
 use pocketmine\timings\Timings;
 use pocketmine\utils\Process;
 use pocketmine\utils\Utils;
+use pocketmine\YmlServerProperties as Yml;
 use Symfony\Component\Filesystem\Path;
 use function arsort;
 use function count;
@@ -49,6 +50,7 @@ use function ini_get;
 use function ini_set;
 use function intdiv;
 use function is_array;
+use function is_float;
 use function is_object;
 use function is_resource;
 use function is_string;
@@ -71,7 +73,7 @@ use const SORT_NUMERIC;
 class MemoryManager{
 	private const DEFAULT_CHECK_RATE = Server::TARGET_TICKS_PER_SECOND;
 	private const DEFAULT_CONTINUOUS_TRIGGER_RATE = Server::TARGET_TICKS_PER_SECOND * 2;
-	private const DEEFAULT_TICKS_PER_GC = 30 * 60 * Server::TARGET_TICKS_PER_SECOND;
+	private const DEFAULT_TICKS_PER_GC = 30 * 60 * Server::TARGET_TICKS_PER_SECOND;
 
 	private int $memoryLimit;
 	private int $globalMemoryLimit;
@@ -108,7 +110,7 @@ class MemoryManager{
 	}
 
 	private function init(ServerConfigGroup $config) : void{
-		$this->memoryLimit = $config->getPropertyInt("memory.main-limit", 0) * 1024 * 1024;
+		$this->memoryLimit = $config->getPropertyInt(Yml::MEMORY_MAIN_LIMIT, 0) * 1024 * 1024;
 
 		$defaultMemory = 1024;
 
@@ -126,7 +128,7 @@ class MemoryManager{
 			}
 		}
 
-		$hardLimit = $config->getPropertyInt("memory.main-hard-limit", $defaultMemory);
+		$hardLimit = $config->getPropertyInt(Yml::MEMORY_MAIN_HARD_LIMIT, $defaultMemory);
 
 		if($hardLimit <= 0){
 			ini_set("memory_limit", '-1');
@@ -134,22 +136,22 @@ class MemoryManager{
 			ini_set("memory_limit", $hardLimit . "M");
 		}
 
-		$this->globalMemoryLimit = $config->getPropertyInt("memory.global-limit", 0) * 1024 * 1024;
-		$this->checkRate = $config->getPropertyInt("memory.check-rate", self::DEFAULT_CHECK_RATE);
-		$this->continuousTrigger = $config->getPropertyBool("memory.continuous-trigger", true);
-		$this->continuousTriggerRate = $config->getPropertyInt("memory.continuous-trigger-rate", self::DEFAULT_CONTINUOUS_TRIGGER_RATE);
+		$this->globalMemoryLimit = $config->getPropertyInt(Yml::MEMORY_GLOBAL_LIMIT, 0) * 1024 * 1024;
+		$this->checkRate = $config->getPropertyInt(Yml::MEMORY_CHECK_RATE, self::DEFAULT_CHECK_RATE);
+		$this->continuousTrigger = $config->getPropertyBool(Yml::MEMORY_CONTINUOUS_TRIGGER, true);
+		$this->continuousTriggerRate = $config->getPropertyInt(Yml::MEMORY_CONTINUOUS_TRIGGER_RATE, self::DEFAULT_CONTINUOUS_TRIGGER_RATE);
 
-		$this->garbageCollectionPeriod = $config->getPropertyInt("memory.garbage-collection.period", self::DEEFAULT_TICKS_PER_GC);
-		$this->garbageCollectionTrigger = $config->getPropertyBool("memory.garbage-collection.low-memory-trigger", true);
-		$this->garbageCollectionAsync = $config->getPropertyBool("memory.garbage-collection.collect-async-worker", true);
+		$this->garbageCollectionPeriod = $config->getPropertyInt(Yml::MEMORY_GARBAGE_COLLECTION_PERIOD, self::DEFAULT_TICKS_PER_GC);
+		$this->garbageCollectionTrigger = $config->getPropertyBool(Yml::MEMORY_GARBAGE_COLLECTION_LOW_MEMORY_TRIGGER, true);
+		$this->garbageCollectionAsync = $config->getPropertyBool(Yml::MEMORY_GARBAGE_COLLECTION_COLLECT_ASYNC_WORKER, true);
 
-		$this->lowMemChunkRadiusOverride = $config->getPropertyInt("memory.max-chunks.chunk-radius", 4);
-		$this->lowMemChunkGC = $config->getPropertyBool("memory.max-chunks.trigger-chunk-collect", true);
+		$this->lowMemChunkRadiusOverride = $config->getPropertyInt(Yml::MEMORY_MAX_CHUNKS_CHUNK_RADIUS, 4);
+		$this->lowMemChunkGC = $config->getPropertyBool(Yml::MEMORY_MAX_CHUNKS_TRIGGER_CHUNK_COLLECT, true);
 
-		$this->lowMemDisableChunkCache = $config->getPropertyBool("memory.world-caches.disable-chunk-cache", true);
-		$this->lowMemClearWorldCache = $config->getPropertyBool("memory.world-caches.low-memory-trigger", true);
+		$this->lowMemDisableChunkCache = $config->getPropertyBool(Yml::MEMORY_WORLD_CACHES_DISABLE_CHUNK_CACHE, true);
+		$this->lowMemClearWorldCache = $config->getPropertyBool(Yml::MEMORY_WORLD_CACHES_LOW_MEMORY_TRIGGER, true);
 
-		$this->dumpWorkers = $config->getPropertyBool("memory.memory-dump.dump-async-worker", true);
+		$this->dumpWorkers = $config->getPropertyBool(Yml::MEMORY_MEMORY_DUMP_DUMP_ASYNC_WORKER, true);
 		gc_enable();
 	}
 
@@ -281,10 +283,8 @@ class MemoryManager{
 
 	/**
 	 * Static memory dumper accessible from any thread.
-	 *
-	 * @param mixed $startingObject
 	 */
-	public static function dumpMemory($startingObject, string $outputFolder, int $maxNesting, int $maxStringSize, \Logger $logger) : void{
+	public static function dumpMemory(mixed $startingObject, string $outputFolder, int $maxNesting, int $maxStringSize, \Logger $logger) : void{
 		$hardLimit = Utils::assumeNotFalse(ini_get('memory_limit'), "memory_limit INI directive should always exist");
 		ini_set('memory_limit', '-1');
 		gc_disable();
@@ -315,9 +315,6 @@ class MemoryManager{
 					continue;
 				}
 
-				if(!$property->isPublic()){
-					$property->setAccessible(true);
-				}
 				if(!$property->isInitialized()){
 					continue;
 				}
@@ -335,7 +332,7 @@ class MemoryManager{
 					continue;
 				}
 				$methodStatics = [];
-				foreach($method->getStaticVariables() as $name => $variable){
+				foreach(Utils::promoteKeys($method->getStaticVariables()) as $name => $variable){
 					$methodStatics[$name] = self::continueDump($variable, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
 				}
 				if(count($methodStatics) > 0){
@@ -363,7 +360,7 @@ class MemoryManager{
 			'_SESSION' => true
 		];
 
-		foreach(Utils::stringifyKeys($GLOBALS) as $varName => $value){
+		foreach(Utils::promoteKeys($GLOBALS) as $varName => $value){
 			if(isset($ignoredGlobals[$varName])){
 				continue;
 			}
@@ -379,7 +376,7 @@ class MemoryManager{
 			$reflect = new \ReflectionFunction($function);
 
 			$vars = [];
-			foreach($reflect->getStaticVariables() as $varName => $variable){
+			foreach(Utils::promoteKeys($reflect->getStaticVariables()) as $varName => $variable){
 				$vars[$varName] = self::continueDump($variable, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
 			}
 			if(count($vars) > 0){
@@ -419,7 +416,7 @@ class MemoryManager{
 						$info["this"] = self::continueDump($closureThis, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
 					}
 
-					foreach($reflect->getStaticVariables() as $name => $variable){
+					foreach(Utils::promoteKeys($reflect->getStaticVariables()) as $name => $variable){
 						$info["referencedVars"][$name] = self::continueDump($variable, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
 					}
 				}else{
@@ -441,9 +438,6 @@ class MemoryManager{
 									continue;
 								}
 							}
-							if(!$property->isPublic()){
-								$property->setAccessible(true);
-							}
 							if(!$property->isInitialized($object)){
 								continue;
 							}
@@ -475,7 +469,6 @@ class MemoryManager{
 	}
 
 	/**
-	 * @param mixed    $from
 	 * @param object[] $objects   reference parameter
 	 * @param int[]    $refCounts reference parameter
 	 *
@@ -483,10 +476,8 @@ class MemoryManager{
 	 * @phpstan-param array<string, int> $refCounts
 	 * @phpstan-param-out array<string, object> $objects
 	 * @phpstan-param-out array<string, int> $refCounts
-	 *
-	 * @return mixed
 	 */
-	private static function continueDump($from, array &$objects, array &$refCounts, int $recursion, int $maxNesting, int $maxStringSize){
+	private static function continueDump(mixed $from, array &$objects, array &$refCounts, int $recursion, int $maxNesting, int $maxStringSize) : mixed{
 		if($maxNesting <= 0){
 			return "(error) NESTING LIMIT REACHED";
 		}
@@ -508,7 +499,7 @@ class MemoryManager{
 			}
 			$data = [];
 			$numeric = 0;
-			foreach($from as $key => $value){
+			foreach(Utils::promoteKeys($from) as $key => $value){
 				$data[$numeric] = [
 					"k" => self::continueDump($key, $objects, $refCounts, $recursion + 1, $maxNesting, $maxStringSize),
 					"v" => self::continueDump($value, $objects, $refCounts, $recursion + 1, $maxNesting, $maxStringSize),
@@ -519,6 +510,8 @@ class MemoryManager{
 			$data = "(string) len(" . strlen($from) . ") " . substr(Utils::printable($from), 0, $maxStringSize);
 		}elseif(is_resource($from)){
 			$data = "(resource) " . print_r($from, true);
+		}elseif(is_float($from)){
+			$data = "(float) $from";
 		}else{
 			$data = $from;
 		}
diff --git a/src/PocketMine.php b/src/PocketMine.php
index f491158263..b2e1cd0469 100644
--- a/src/PocketMine.php
+++ b/src/PocketMine.php
@@ -25,7 +25,9 @@ namespace pocketmine {
 
 	use Composer\InstalledVersions;
 	use pocketmine\errorhandler\ErrorToExceptionHandler;
+	use pocketmine\network\mcpe\protocol\ProtocolInfo;
 	use pocketmine\thread\ThreadManager;
+	use pocketmine\thread\ThreadSafeClassLoader;
 	use pocketmine\utils\Filesystem;
 	use pocketmine\utils\MainLogger;
 	use pocketmine\utils\Process;
@@ -39,18 +41,21 @@ namespace pocketmine {
 	use function extension_loaded;
 	use function function_exists;
 	use function getcwd;
+	use function getopt;
 	use function is_dir;
 	use function mkdir;
 	use function phpversion;
 	use function preg_match;
 	use function preg_quote;
+	use function printf;
 	use function realpath;
 	use function version_compare;
 	use const DIRECTORY_SEPARATOR;
+	use const PHP_EOL;
 
 	require_once __DIR__ . '/VersionInfo.php';
 
-	const MIN_PHP_VERSION = "8.0.0";
+	const MIN_PHP_VERSION = "8.1.0";
 
 	/**
 	 * @param string $message
@@ -103,7 +108,7 @@ namespace pocketmine {
 			"openssl" => "OpenSSL",
 			"pcre" => "PCRE",
 			"phar" => "Phar",
-			"pthreads" => "pthreads",
+			"pmmpthread" => "pmmpthread",
 			"reflection" => "Reflection",
 			"sockets" => "Sockets",
 			"spl" => "SPL",
@@ -118,12 +123,9 @@ namespace pocketmine {
 			}
 		}
 
-		if(($pthreads_version = phpversion("pthreads")) !== false){
-			if(substr_count($pthreads_version, ".") < 2){
-				$pthreads_version = "0.$pthreads_version";
-			}
-			if(version_compare($pthreads_version, "4.0.0") < 0 || version_compare($pthreads_version, "5.0.0") > 0){
-				$messages[] = "pthreads ^4.0.0 is required, while you have $pthreads_version.";
+		if(($pmmpthread_version = phpversion("pmmpthread")) !== false){
+			if(version_compare($pmmpthread_version, "6.1.0") < 0 || version_compare($pmmpthread_version, "7.0.0") >= 0){
+				$messages[] = "pmmpthread ^6.1.0 is required, while you have $pmmpthread_version.";
 			}
 		}
 
@@ -146,6 +148,13 @@ namespace pocketmine {
 			$messages[] = "chunkutils2 ^$wantedVersionMin is required, while you have $chunkutils2_version.";
 		}
 
+		if(($libdeflate_version = phpversion("libdeflate")) !== false){
+			//make sure level 0 compression is available
+			if(version_compare($libdeflate_version, "0.2.0") < 0 || version_compare($libdeflate_version, "0.3.0") >= 0){
+				$messages[] = "php-libdeflate ^0.2.0 is required, while you have $libdeflate_version.";
+			}
+		}
+
 		if(extension_loaded("pocketmine")){
 			$messages[] = "The native PocketMine extension is no longer supported.";
 		}
@@ -161,7 +170,7 @@ namespace pocketmine {
 	 * @return void
 	 */
 	function emit_performance_warnings(\Logger $logger){
-		if(PHP_DEBUG !== 0){
+		if(ZEND_DEBUG_BUILD){
 			$logger->warning("This PHP binary was compiled in debug mode. This has a major impact on performance.");
 		}
 		if(extension_loaded("xdebug") && (!function_exists('xdebug_info') || count(xdebug_info('mode')) !== 0)){
@@ -265,15 +274,17 @@ JIT_WARNING
 				exit(1);
 			}
 		}
-		if(extension_loaded('parallel')){
-			\parallel\bootstrap(\pocketmine\COMPOSER_AUTOLOADER_PATH);
-		}
 
 		ErrorToExceptionHandler::set();
 
+		if(count(getopt("", [BootstrapOptions::VERSION])) > 0){
+			printf("%s %s (git hash %s) for Minecraft: Bedrock Edition %s\n", VersionInfo::NAME, VersionInfo::VERSION()->getFullVersion(true), VersionInfo::GIT_HASH(), ProtocolInfo::MINECRAFT_VERSION);
+			exit(0);
+		}
+
 		$cwd = Utils::assumeNotFalse(realpath(Utils::assumeNotFalse(getcwd())));
-		$dataPath = getopt_string("data") ?? $cwd;
-		$pluginPath = getopt_string("plugins") ?? $cwd . DIRECTORY_SEPARATOR . "plugins";
+		$dataPath = getopt_string(BootstrapOptions::DATA) ?? $cwd;
+		$pluginPath = getopt_string(BootstrapOptions::PLUGINS) ?? $cwd . DIRECTORY_SEPARATOR . "plugins";
 		Filesystem::addCleanedPath($pluginPath, Filesystem::CLEAN_PATH_PLUGINS_PREFIX);
 
 		if(!@mkdir($dataPath, 0777, true) && !is_dir($dataPath)){
@@ -306,23 +317,28 @@ JIT_WARNING
 		//Logger has a dependency on timezone
 		Timezone::init();
 
-		$opts = getopt("", ["no-wizard", "enable-ansi", "disable-ansi"]);
-		if(isset($opts["enable-ansi"])){
+		$opts = getopt("", [BootstrapOptions::NO_WIZARD, BootstrapOptions::ENABLE_ANSI, BootstrapOptions::DISABLE_ANSI, BootstrapOptions::NO_LOG_FILE]);
+		if(isset($opts[BootstrapOptions::ENABLE_ANSI])){
 			Terminal::init(true);
-		}elseif(isset($opts["disable-ansi"])){
+		}elseif(isset($opts[BootstrapOptions::DISABLE_ANSI])){
 			Terminal::init(false);
 		}else{
 			Terminal::init();
 		}
+		$logFile = isset($opts[BootstrapOptions::NO_LOG_FILE]) ? null : Path::join($dataPath, "server.log");
+
+		$logger = new MainLogger($logFile, Terminal::hasFormattingCodes(), "Server", new \DateTimeZone(Timezone::get()), false, Path::join($dataPath, "log_archive"));
+		if($logFile === null){
+			$logger->notice("Logging to file disabled. Ensure logs are collected by other means (e.g. Docker logs).");
+		}
 
-		$logger = new MainLogger(Path::join($dataPath, "server.log"), Terminal::hasFormattingCodes(), "Server", new \DateTimeZone(Timezone::get()));
 		\GlobalLogger::set($logger);
 
 		emit_performance_warnings($logger);
 
 		$exitCode = 0;
 		do{
-			if(!file_exists(Path::join($dataPath, "server.properties")) && !isset($opts["no-wizard"])){
+			if(!file_exists(Path::join($dataPath, "server.properties")) && !isset($opts[BootstrapOptions::NO_WIZARD])){
 				$installer = new SetupWizard($dataPath);
 				if(!$installer->run()){
 					$exitCode = -1;
@@ -333,7 +349,7 @@ JIT_WARNING
 			/*
 			 * We now use the Composer autoloader, but this autoloader is still for loading plugins.
 			 */
-			$autoloader = new \BaseClassLoader();
+			$autoloader = new ThreadSafeClassLoader();
 			$autoloader->register(false);
 
 			new Server($autoloader, $logger, $dataPath, $pluginPath);
@@ -341,12 +357,12 @@ JIT_WARNING
 			$logger->info("Stopping other threads");
 
 			$killer = new ServerKiller(8);
-			$killer->start(PTHREADS_INHERIT_NONE);
+			$killer->start();
 			usleep(10000); //Fixes ServerKiller not being able to start on single-core machines
 
 			if(ThreadManager::getInstance()->stopAll() > 0){
 				$logger->debug("Some threads could not be stopped, performing a force-kill");
-				Process::kill(Process::pid(), true);
+				Process::kill(Process::pid());
 			}
 		}while(false);
 
diff --git a/src/Server.php b/src/Server.php
index 71e43b1556..074088068b 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -43,7 +43,6 @@ use pocketmine\event\player\PlayerCreationEvent;
 use pocketmine\event\player\PlayerDataSaveEvent;
 use pocketmine\event\player\PlayerLoginEvent;
 use pocketmine\event\server\CommandEvent;
-use pocketmine\event\server\DataPacketSendEvent;
 use pocketmine\event\server\QueryRegenerateEvent;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\lang\Language;
@@ -54,13 +53,16 @@ use pocketmine\network\mcpe\compression\CompressBatchPromise;
 use pocketmine\network\mcpe\compression\CompressBatchTask;
 use pocketmine\network\mcpe\compression\Compressor;
 use pocketmine\network\mcpe\compression\ZlibCompressor;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\encryption\EncryptionContext;
+use pocketmine\network\mcpe\EntityEventBroadcaster;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\PacketBroadcaster;
-use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\network\mcpe\protocol\ProtocolInfo;
-use pocketmine\network\mcpe\protocol\serializer\PacketBatch;
+use pocketmine\network\mcpe\protocol\types\CompressionAlgorithm;
 use pocketmine\network\mcpe\raklib\RakLibInterface;
+use pocketmine\network\mcpe\StandardEntityEventBroadcaster;
+use pocketmine\network\mcpe\StandardPacketBroadcaster;
 use pocketmine\network\Network;
 use pocketmine\network\NetworkInterfaceStartException;
 use pocketmine\network\query\DedicatedQueryNetworkInterface;
@@ -78,7 +80,6 @@ use pocketmine\player\PlayerDataProvider;
 use pocketmine\player\PlayerDataSaveException;
 use pocketmine\player\PlayerInfo;
 use pocketmine\plugin\PharPluginLoader;
-use pocketmine\plugin\Plugin;
 use pocketmine\plugin\PluginEnableOrder;
 use pocketmine\plugin\PluginGraylist;
 use pocketmine\plugin\PluginManager;
@@ -90,6 +91,9 @@ use pocketmine\resourcepacks\ResourcePackManager;
 use pocketmine\scheduler\AsyncPool;
 use pocketmine\snooze\SleeperHandler;
 use pocketmine\stats\SendUsageTask;
+use pocketmine\thread\log\AttachableThreadSafeLogger;
+use pocketmine\thread\ThreadCrashException;
+use pocketmine\thread\ThreadSafeClassLoader;
 use pocketmine\timings\Timings;
 use pocketmine\timings\TimingsHandler;
 use pocketmine\updater\UpdateChecker;
@@ -115,11 +119,13 @@ use pocketmine\world\Position;
 use pocketmine\world\World;
 use pocketmine\world\WorldCreationOptions;
 use pocketmine\world\WorldManager;
+use pocketmine\YmlServerProperties as Yml;
 use Ramsey\Uuid\UuidInterface;
 use Symfony\Component\Filesystem\Path;
 use function array_fill;
 use function array_sum;
 use function base64_encode;
+use function chr;
 use function cli_set_process_title;
 use function copy;
 use function count;
@@ -203,6 +209,8 @@ class Server{
 	private const TICKS_PER_TPS_OVERLOAD_WARNING = 5 * self::TARGET_TICKS_PER_SECOND;
 	private const TICKS_PER_STATS_REPORT = 300 * self::TARGET_TICKS_PER_SECOND;
 
+	private const DEFAULT_ASYNC_COMPRESSION_THRESHOLD = 10_000;
+
 	private static ?Server $instance = null;
 
 	private TimeTrackingSleeperHandler $tickSleeper;
@@ -261,6 +269,7 @@ class Server{
 
 	private Network $network;
 	private bool $networkCompressionAsync = true;
+	private int $networkCompressionAsyncThreshold = self::DEFAULT_ASYNC_COMPRESSION_THRESHOLD;
 
 	private Language $language;
 	private bool $forceLanguage = false;
@@ -349,15 +358,15 @@ class Server{
 	}
 
 	public function getPort() : int{
-		return $this->configGroup->getConfigInt("server-port", self::DEFAULT_PORT_IPV4);
+		return $this->configGroup->getConfigInt(ServerProperties::SERVER_PORT_IPV4, self::DEFAULT_PORT_IPV4);
 	}
 
 	public function getPortV6() : int{
-		return $this->configGroup->getConfigInt("server-portv6", self::DEFAULT_PORT_IPV6);
+		return $this->configGroup->getConfigInt(ServerProperties::SERVER_PORT_IPV6, self::DEFAULT_PORT_IPV6);
 	}
 
 	public function getViewDistance() : int{
-		return max(2, $this->configGroup->getConfigInt("view-distance", self::DEFAULT_MAX_VIEW_DISTANCE));
+		return max(2, $this->configGroup->getConfigInt(ServerProperties::VIEW_DISTANCE, self::DEFAULT_MAX_VIEW_DISTANCE));
 	}
 
 	/**
@@ -368,12 +377,12 @@ class Server{
 	}
 
 	public function getIp() : string{
-		$str = $this->configGroup->getConfigString("server-ip");
+		$str = $this->configGroup->getConfigString(ServerProperties::SERVER_IPV4);
 		return $str !== "" ? $str : "0.0.0.0";
 	}
 
 	public function getIpV6() : string{
-		$str = $this->configGroup->getConfigString("server-ipv6");
+		$str = $this->configGroup->getConfigString(ServerProperties::SERVER_IPV6);
 		return $str !== "" ? $str : "::";
 	}
 
@@ -382,37 +391,37 @@ class Server{
 	}
 
 	public function getGamemode() : GameMode{
-		return GameMode::fromString($this->configGroup->getConfigString("gamemode", GameMode::SURVIVAL()->name())) ?? GameMode::SURVIVAL();
+		return GameMode::fromString($this->configGroup->getConfigString(ServerProperties::GAME_MODE)) ?? GameMode::SURVIVAL;
 	}
 
 	public function getForceGamemode() : bool{
-		return $this->configGroup->getConfigBool("force-gamemode", false);
+		return $this->configGroup->getConfigBool(ServerProperties::FORCE_GAME_MODE, false);
 	}
 
 	/**
 	 * Returns Server global difficulty. Note that this may be overridden in individual worlds.
 	 */
 	public function getDifficulty() : int{
-		return $this->configGroup->getConfigInt("difficulty", World::DIFFICULTY_NORMAL);
+		return $this->configGroup->getConfigInt(ServerProperties::DIFFICULTY, World::DIFFICULTY_NORMAL);
 	}
 
 	public function hasWhitelist() : bool{
-		return $this->configGroup->getConfigBool("white-list", false);
+		return $this->configGroup->getConfigBool(ServerProperties::WHITELIST, false);
 	}
 
 	public function isHardcore() : bool{
-		return $this->configGroup->getConfigBool("hardcore", false);
+		return $this->configGroup->getConfigBool(ServerProperties::HARDCORE, false);
 	}
 
 	public function getMotd() : string{
-		return $this->configGroup->getConfigString("motd", self::DEFAULT_SERVER_NAME);
+		return $this->configGroup->getConfigString(ServerProperties::MOTD, self::DEFAULT_SERVER_NAME);
 	}
 
-	public function getLoader() : \DynamicClassLoader{
+	public function getLoader() : ThreadSafeClassLoader{
 		return $this->autoloader;
 	}
 
-	public function getLogger() : \AttachableThreadedLogger{
+	public function getLogger() : AttachableThreadSafeLogger{
 		return $this->logger;
 	}
 
@@ -488,13 +497,10 @@ class Server{
 	}
 
 	public function shouldSavePlayerData() : bool{
-		return $this->configGroup->getPropertyBool("player.save-player-data", true);
+		return $this->configGroup->getPropertyBool(Yml::PLAYER_SAVE_PLAYER_DATA, true);
 	}
 
-	/**
-	 * @return OfflinePlayer|Player
-	 */
-	public function getOfflinePlayer(string $name){
+	public function getOfflinePlayer(string $name) : Player|OfflinePlayer|null{
 		$name = strtolower($name);
 		$result = $this->getPlayerExact($name);
 
@@ -518,7 +524,7 @@ class Server{
 				return $this->playerDataProvider->loadData($name);
 			}catch(PlayerDataLoadException $e){
 				$this->logger->debug("Failed to load player data for $name: " . $e->getMessage());
-				$this->logger->error($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_data_playerCorrupted($name)));
+				$this->logger->error($this->language->translate(KnownTranslationFactory::pocketmine_data_playerCorrupted($name)));
 				return null;
 			}
 		});
@@ -537,7 +543,7 @@ class Server{
 				try{
 					$this->playerDataProvider->saveData($name, $ev->getSaveData());
 				}catch(PlayerDataSaveException $e){
-					$this->logger->critical($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_data_saveError($name, $e->getMessage())));
+					$this->logger->critical($this->language->translate(KnownTranslationFactory::pocketmine_data_saveError($name, $e->getMessage())));
 					$this->logger->logException($e);
 				}
 			});
@@ -565,6 +571,7 @@ class Server{
 		$playerPromiseResolver = new PromiseResolver();
 
 		$createPlayer = function(Location $location) use ($playerPromiseResolver, $class, $session, $playerInfo, $authenticated, $offlinePlayerData) : void{
+			/** @see Player::__construct() */
 			$player = new $class($this, $session, $playerInfo, $authenticated, $location, $offlinePlayerData);
 			if(!$player->hasPlayedBefore()){
 				$player->onGround = true; //TODO: this hack is needed for new players in-air ticks - they don't get detected as on-ground until they move
@@ -583,8 +590,7 @@ class Server{
 				},
 				function() use ($playerPromiseResolver, $session) : void{
 					if($session->isConnected()){
-						//TODO: this needs to be localized - this might be reached if the spawn world was unloaded while the player was logging in
-						$session->disconnect("Failed to find a safe spawn location");
+						$session->disconnectWithError(KnownTranslationFactory::pocketmine_disconnect_error_respawn());
 					}
 					$playerPromiseResolver->reject();
 				}
@@ -730,12 +736,15 @@ class Server{
 
 	/**
 	 * @return string[][]
+	 * @phpstan-return array<string, list<string>>
 	 */
 	public function getCommandAliases() : array{
-		$section = $this->configGroup->getProperty("aliases");
+		$section = $this->configGroup->getProperty(Yml::ALIASES);
 		$result = [];
 		if(is_array($section)){
-			foreach($section as $key => $value){
+			foreach(Utils::promoteKeys($section) as $key => $value){
+				//TODO: more validation needed here
+				//key might not be a string, value might not be list<string>
 				$commands = [];
 				if(is_array($value)){
 					$commands = $value;
@@ -743,7 +752,7 @@ class Server{
 					$commands[] = (string) $value;
 				}
 
-				$result[$key] = $commands;
+				$result[(string) $key] = $commands;
 			}
 		}
 
@@ -758,8 +767,8 @@ class Server{
 	}
 
 	public function __construct(
-		private \DynamicClassLoader $autoloader,
-		private \AttachableThreadedLogger $logger,
+		private ThreadSafeClassLoader $autoloader,
+		private AttachableThreadSafeLogger $logger,
 		string $dataPath,
 		string $pluginPath
 	){
@@ -807,36 +816,36 @@ class Server{
 			$this->configGroup = new ServerConfigGroup(
 				new Config($pocketmineYmlPath, Config::YAML, []),
 				new Config(Path::join($this->dataPath, "server.properties"), Config::PROPERTIES, [
-					"motd" => self::DEFAULT_SERVER_NAME,
-					"server-port" => self::DEFAULT_PORT_IPV4,
-					"server-portv6" => self::DEFAULT_PORT_IPV6,
-					"enable-ipv6" => true,
-					"white-list" => false,
-					"max-players" => self::DEFAULT_MAX_PLAYERS,
-					"gamemode" => GameMode::SURVIVAL()->name(),
-					"force-gamemode" => false,
-					"hardcore" => false,
-					"pvp" => true,
-					"difficulty" => World::DIFFICULTY_NORMAL,
-					"generator-settings" => "",
-					"level-name" => "world",
-					"level-seed" => "",
-					"level-type" => "DEFAULT",
-					"enable-query" => true,
-					"auto-save" => true,
-					"view-distance" => self::DEFAULT_MAX_VIEW_DISTANCE,
-					"xbox-auth" => true,
-					"language" => "eng"
+					ServerProperties::MOTD => self::DEFAULT_SERVER_NAME,
+					ServerProperties::SERVER_PORT_IPV4 => self::DEFAULT_PORT_IPV4,
+					ServerProperties::SERVER_PORT_IPV6 => self::DEFAULT_PORT_IPV6,
+					ServerProperties::ENABLE_IPV6 => true,
+					ServerProperties::WHITELIST => false,
+					ServerProperties::MAX_PLAYERS => self::DEFAULT_MAX_PLAYERS,
+					ServerProperties::GAME_MODE => GameMode::SURVIVAL->name, //TODO: this probably shouldn't use the enum name directly
+					ServerProperties::FORCE_GAME_MODE => false,
+					ServerProperties::HARDCORE => false,
+					ServerProperties::PVP => true,
+					ServerProperties::DIFFICULTY => World::DIFFICULTY_NORMAL,
+					ServerProperties::DEFAULT_WORLD_GENERATOR_SETTINGS => "",
+					ServerProperties::DEFAULT_WORLD_NAME => "world",
+					ServerProperties::DEFAULT_WORLD_SEED => "",
+					ServerProperties::DEFAULT_WORLD_GENERATOR => "DEFAULT",
+					ServerProperties::ENABLE_QUERY => true,
+					ServerProperties::AUTO_SAVE => true,
+					ServerProperties::VIEW_DISTANCE => self::DEFAULT_MAX_VIEW_DISTANCE,
+					ServerProperties::XBOX_AUTH => true,
+					ServerProperties::LANGUAGE => "eng"
 				])
 			);
 
-			$debugLogLevel = $this->configGroup->getPropertyInt("debug.level", 1);
+			$debugLogLevel = $this->configGroup->getPropertyInt(Yml::DEBUG_LEVEL, 1);
 			if($this->logger instanceof MainLogger){
 				$this->logger->setLogDebug($debugLogLevel > 1);
 			}
 
-			$this->forceLanguage = $this->configGroup->getPropertyBool("settings.force-language", false);
-			$selectedLang = $this->configGroup->getConfigString("language", $this->configGroup->getPropertyString("settings.language", Language::FALLBACK_LANGUAGE));
+			$this->forceLanguage = $this->configGroup->getPropertyBool(Yml::SETTINGS_FORCE_LANGUAGE, false);
+			$selectedLang = $this->configGroup->getConfigString(ServerProperties::LANGUAGE, $this->configGroup->getPropertyString("settings.language", Language::FALLBACK_LANGUAGE));
 			try{
 				$this->language = new Language($selectedLang);
 			}catch(LanguageNotFoundException $e){
@@ -849,14 +858,14 @@ class Server{
 				}
 			}
 
-			$this->logger->info($this->getLanguage()->translate(KnownTranslationFactory::language_selected($this->getLanguage()->getName(), $this->getLanguage()->getLang())));
+			$this->logger->info($this->language->translate(KnownTranslationFactory::language_selected($this->language->getName(), $this->language->getLang())));
 
 			if(VersionInfo::IS_DEVELOPMENT_BUILD){
-				if(!$this->configGroup->getPropertyBool("settings.enable-dev-builds", false)){
+				if(!$this->configGroup->getPropertyBool(Yml::SETTINGS_ENABLE_DEV_BUILDS, false)){
 					$this->logger->emergency($this->language->translate(KnownTranslationFactory::pocketmine_server_devBuild_error1(VersionInfo::NAME)));
 					$this->logger->emergency($this->language->translate(KnownTranslationFactory::pocketmine_server_devBuild_error2()));
 					$this->logger->emergency($this->language->translate(KnownTranslationFactory::pocketmine_server_devBuild_error3()));
-					$this->logger->emergency($this->language->translate(KnownTranslationFactory::pocketmine_server_devBuild_error4("settings.enable-dev-builds")));
+					$this->logger->emergency($this->language->translate(KnownTranslationFactory::pocketmine_server_devBuild_error4(Yml::SETTINGS_ENABLE_DEV_BUILDS)));
 					$this->logger->emergency($this->language->translate(KnownTranslationFactory::pocketmine_server_devBuild_error5("https://github.com/pmmp/PocketMine-MP/releases")));
 					$this->forceShutdownExit();
 
@@ -872,9 +881,9 @@ class Server{
 
 			$this->memoryManager = new MemoryManager($this);
 
-			$this->logger->info($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_server_start(TextFormat::AQUA . $this->getVersion() . TextFormat::RESET)));
+			$this->logger->info($this->language->translate(KnownTranslationFactory::pocketmine_server_start(TextFormat::AQUA . $this->getVersion() . TextFormat::RESET)));
 
-			if(($poolSize = $this->configGroup->getPropertyString("settings.async-workers", "auto")) === "auto"){
+			if(($poolSize = $this->configGroup->getPropertyString(Yml::SETTINGS_ASYNC_WORKERS, "auto")) === "auto"){
 				$poolSize = 2;
 				$processors = Utils::getCoreCount() - 2;
 
@@ -885,25 +894,32 @@ class Server{
 				$poolSize = max(1, (int) $poolSize);
 			}
 
-			$this->asyncPool = new AsyncPool($poolSize, max(-1, $this->configGroup->getPropertyInt("memory.async-worker-hard-limit", 256)), $this->autoloader, $this->logger, $this->tickSleeper);
+			$this->asyncPool = new AsyncPool($poolSize, max(-1, $this->configGroup->getPropertyInt(Yml::MEMORY_ASYNC_WORKER_HARD_LIMIT, 256)), $this->autoloader, $this->logger, $this->tickSleeper);
 
 			$netCompressionThreshold = -1;
-			if($this->configGroup->getPropertyInt("network.batch-threshold", 256) >= 0){
-				$netCompressionThreshold = $this->configGroup->getPropertyInt("network.batch-threshold", 256);
+			if($this->configGroup->getPropertyInt(Yml::NETWORK_BATCH_THRESHOLD, 256) >= 0){
+				$netCompressionThreshold = $this->configGroup->getPropertyInt(Yml::NETWORK_BATCH_THRESHOLD, 256);
+			}
+			if($netCompressionThreshold < 0){
+				$netCompressionThreshold = null;
 			}
 
-			$netCompressionLevel = $this->configGroup->getPropertyInt("network.compression-level", 6);
+			$netCompressionLevel = $this->configGroup->getPropertyInt(Yml::NETWORK_COMPRESSION_LEVEL, 6);
 			if($netCompressionLevel < 1 || $netCompressionLevel > 9){
 				$this->logger->warning("Invalid network compression level $netCompressionLevel set, setting to default 6");
 				$netCompressionLevel = 6;
 			}
 			ZlibCompressor::setInstance(new ZlibCompressor($netCompressionLevel, $netCompressionThreshold, ZlibCompressor::DEFAULT_MAX_DECOMPRESSION_SIZE));
 
-			$this->networkCompressionAsync = $this->configGroup->getPropertyBool("network.async-compression", true);
+			$this->networkCompressionAsync = $this->configGroup->getPropertyBool(Yml::NETWORK_ASYNC_COMPRESSION, true);
+			$this->networkCompressionAsyncThreshold = max(
+				$this->configGroup->getPropertyInt(Yml::NETWORK_ASYNC_COMPRESSION_THRESHOLD, self::DEFAULT_ASYNC_COMPRESSION_THRESHOLD),
+				$netCompressionThreshold ?? self::DEFAULT_ASYNC_COMPRESSION_THRESHOLD
+			);
 
-			EncryptionContext::$ENABLED = $this->configGroup->getPropertyBool("network.enable-encryption", true);
+			EncryptionContext::$ENABLED = $this->configGroup->getPropertyBool(Yml::NETWORK_ENABLE_ENCRYPTION, true);
 
-			$this->doTitleTick = $this->configGroup->getPropertyBool("console.title-tick", true) && Terminal::hasFormattingCodes();
+			$this->doTitleTick = $this->configGroup->getPropertyBool(Yml::CONSOLE_TITLE_TICK, true) && Terminal::hasFormattingCodes();
 
 			$this->operators = new Config(Path::join($this->dataPath, "ops.txt"), Config::ENUM);
 			$this->whitelist = new Config(Path::join($this->dataPath, "white-list.txt"), Config::ENUM);
@@ -921,47 +937,47 @@ class Server{
 			$this->banByIP = new BanList($bannedIpsTxt);
 			$this->banByIP->load();
 
-			$this->maxPlayers = $this->configGroup->getConfigInt("max-players", self::DEFAULT_MAX_PLAYERS);
+			$this->maxPlayers = $this->configGroup->getConfigInt(ServerProperties::MAX_PLAYERS, self::DEFAULT_MAX_PLAYERS);
 
-			$this->onlineMode = $this->configGroup->getConfigBool("xbox-auth", true);
+			$this->onlineMode = $this->configGroup->getConfigBool(ServerProperties::XBOX_AUTH, true);
 			if($this->onlineMode){
-				$this->logger->info($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_server_auth_enabled()));
+				$this->logger->info($this->language->translate(KnownTranslationFactory::pocketmine_server_auth_enabled()));
 			}else{
-				$this->logger->warning($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_server_auth_disabled()));
-				$this->logger->warning($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_server_authWarning()));
-				$this->logger->warning($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_server_authProperty_disabled()));
+				$this->logger->warning($this->language->translate(KnownTranslationFactory::pocketmine_server_auth_disabled()));
+				$this->logger->warning($this->language->translate(KnownTranslationFactory::pocketmine_server_authWarning()));
+				$this->logger->warning($this->language->translate(KnownTranslationFactory::pocketmine_server_authProperty_disabled()));
 			}
 
-			if($this->configGroup->getConfigBool("hardcore", false) && $this->getDifficulty() < World::DIFFICULTY_HARD){
-				$this->configGroup->setConfigInt("difficulty", World::DIFFICULTY_HARD);
+			if($this->configGroup->getConfigBool(ServerProperties::HARDCORE, false) && $this->getDifficulty() < World::DIFFICULTY_HARD){
+				$this->configGroup->setConfigInt(ServerProperties::DIFFICULTY, World::DIFFICULTY_HARD);
 			}
 
 			@cli_set_process_title($this->getName() . " " . $this->getPocketMineVersion());
 
 			$this->serverID = Utils::getMachineUniqueId($this->getIp() . $this->getPort());
 
-			$this->getLogger()->debug("Server unique id: " . $this->getServerUniqueId());
-			$this->getLogger()->debug("Machine unique id: " . Utils::getMachineUniqueId());
+			$this->logger->debug("Server unique id: " . $this->getServerUniqueId());
+			$this->logger->debug("Machine unique id: " . Utils::getMachineUniqueId());
 
 			$this->network = new Network($this->logger);
 			$this->network->setName($this->getMotd());
 
-			$this->logger->info($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_server_info(
+			$this->logger->info($this->language->translate(KnownTranslationFactory::pocketmine_server_info(
 				$this->getName(),
 				(VersionInfo::IS_DEVELOPMENT_BUILD ? TextFormat::YELLOW : "") . $this->getPocketMineVersion() . TextFormat::RESET
 			)));
-			$this->logger->info($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_server_license($this->getName())));
+			$this->logger->info($this->language->translate(KnownTranslationFactory::pocketmine_server_license($this->getName())));
 
-			TimingsHandler::setEnabled($this->configGroup->getPropertyBool("settings.enable-profiling", false));
-			$this->profilingTickRate = $this->configGroup->getPropertyInt("settings.profile-report-trigger", self::TARGET_TICKS_PER_SECOND);
+			TimingsHandler::setEnabled($this->configGroup->getPropertyBool(Yml::SETTINGS_ENABLE_PROFILING, false));
+			$this->profilingTickRate = $this->configGroup->getPropertyInt(Yml::SETTINGS_PROFILE_REPORT_TRIGGER, self::TARGET_TICKS_PER_SECOND);
 
 			DefaultPermissions::registerCorePermissions();
 
 			$this->commandMap = new SimpleCommandMap($this);
 
-			$this->craftingManager = CraftingManagerFromDataHelper::make(Path::join(\pocketmine\BEDROCK_DATA_PATH, "recipes.json"));
+			$this->craftingManager = CraftingManagerFromDataHelper::make(Path::join(\pocketmine\BEDROCK_DATA_PATH, "recipes"));
 
-			$this->resourceManager = new ResourcePackManager(Path::join($this->getDataPath(), "resource_packs"), $this->logger);
+			$this->resourceManager = new ResourcePackManager(Path::join($this->dataPath, "resource_packs"), $this->logger);
 
 			$pluginGraylist = null;
 			$graylistFile = Path::join($this->dataPath, "plugin_list.yml");
@@ -975,13 +991,13 @@ class Server{
 				$this->forceShutdownExit();
 				return;
 			}
-			$this->pluginManager = new PluginManager($this, $this->configGroup->getPropertyBool("plugins.legacy-data-dir", true) ? null : Path::join($this->getDataPath(), "plugin_data"), $pluginGraylist);
+			$this->pluginManager = new PluginManager($this, $this->configGroup->getPropertyBool(Yml::PLUGINS_LEGACY_DATA_DIR, true) ? null : Path::join($this->dataPath, "plugin_data"), $pluginGraylist);
 			$this->pluginManager->registerInterface(new PharPluginLoader($this->autoloader));
 			$this->pluginManager->registerInterface(new ScriptPluginLoader());
 
 			$providerManager = new WorldProviderManager();
 			if(
-				($format = $providerManager->getProviderByName($formatName = $this->configGroup->getPropertyString("level-settings.default-format", ""))) !== null &&
+				($format = $providerManager->getProviderByName($formatName = $this->configGroup->getPropertyString(Yml::LEVEL_SETTINGS_DEFAULT_FORMAT, ""))) !== null &&
 				$format instanceof WritableWorldProviderManagerEntry
 			){
 				$providerManager->setDefault($format);
@@ -990,16 +1006,16 @@ class Server{
 			}
 
 			$this->worldManager = new WorldManager($this, Path::join($this->dataPath, "worlds"), $providerManager);
-			$this->worldManager->setAutoSave($this->configGroup->getConfigBool("auto-save", $this->worldManager->getAutoSave()));
-			$this->worldManager->setAutoSaveInterval($this->configGroup->getPropertyInt("ticks-per.autosave", $this->worldManager->getAutoSaveInterval()));
+			$this->worldManager->setAutoSave($this->configGroup->getConfigBool(ServerProperties::AUTO_SAVE, $this->worldManager->getAutoSave()));
+			$this->worldManager->setAutoSaveInterval($this->configGroup->getPropertyInt(Yml::TICKS_PER_AUTOSAVE, $this->worldManager->getAutoSaveInterval()));
 
-			$this->updater = new UpdateChecker($this, $this->configGroup->getPropertyString("auto-updater.host", "update.pmmp.io"));
+			$this->updater = new UpdateChecker($this, $this->configGroup->getPropertyString(Yml::AUTO_UPDATER_HOST, "update.pmmp.io"));
 
 			$this->queryInfo = new QueryInfo($this);
 
 			$this->playerDataProvider = new DatFilePlayerDataProvider(Path::join($this->dataPath, "players"));
 
-			register_shutdown_function([$this, "crashDump"]);
+			register_shutdown_function($this->crashDump(...));
 
 			$loadErrorCount = 0;
 			$this->pluginManager->loadPlugins($this->pluginPath, $loadErrorCount);
@@ -1008,7 +1024,7 @@ class Server{
 				$this->forceShutdownExit();
 				return;
 			}
-			if(!$this->enablePlugins(PluginEnableOrder::STARTUP())){
+			if(!$this->enablePlugins(PluginEnableOrder::STARTUP)){
 				$this->logger->emergency($this->language->translate(KnownTranslationFactory::pocketmine_plugin_someEnableErrors()));
 				$this->forceShutdownExit();
 				return;
@@ -1019,7 +1035,7 @@ class Server{
 				return;
 			}
 
-			if(!$this->enablePlugins(PluginEnableOrder::POSTWORLD())){
+			if(!$this->enablePlugins(PluginEnableOrder::POSTWORLD)){
 				$this->logger->emergency($this->language->translate(KnownTranslationFactory::pocketmine_plugin_someEnableErrors()));
 				$this->forceShutdownExit();
 				return;
@@ -1030,23 +1046,23 @@ class Server{
 				return;
 			}
 
-			if($this->configGroup->getPropertyBool("anonymous-statistics.enabled", true)){
+			if($this->configGroup->getPropertyBool(Yml::ANONYMOUS_STATISTICS_ENABLED, true)){
 				$this->sendUsageTicker = self::TICKS_PER_STATS_REPORT;
 				$this->sendUsage(SendUsageTask::TYPE_OPEN);
 			}
 
 			$this->configGroup->save();
 
-			$this->logger->info($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_server_defaultGameMode($this->getGamemode()->getTranslatableName())));
-			$this->logger->info($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_server_donate(TextFormat::AQUA . "https://patreon.com/pocketminemp" . TextFormat::RESET)));
-			$this->logger->info($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_server_startFinished(strval(round(microtime(true) - $this->startTime, 3)))));
+			$this->logger->info($this->language->translate(KnownTranslationFactory::pocketmine_server_defaultGameMode($this->getGamemode()->getTranslatableName())));
+			$this->logger->info($this->language->translate(KnownTranslationFactory::pocketmine_server_donate(TextFormat::AQUA . "https://patreon.com/pocketminemp" . TextFormat::RESET)));
+			$this->logger->info($this->language->translate(KnownTranslationFactory::pocketmine_server_startFinished(strval(round(microtime(true) - $this->startTime, 3)))));
 
 			$forwarder = new BroadcastLoggerForwarder($this, $this->logger, $this->language);
 			$this->subscribeToBroadcastChannel(self::BROADCAST_CHANNEL_ADMINISTRATIVE, $forwarder);
 			$this->subscribeToBroadcastChannel(self::BROADCAST_CHANNEL_USERS, $forwarder);
 
 			//TODO: move console parts to a separate component
-			if($this->configGroup->getPropertyBool("console.enable-input", true)){
+			if($this->configGroup->getPropertyBool(Yml::CONSOLE_ENABLE_INPUT, true)){
 				$this->console = new ConsoleReaderChildProcessDaemon($this->logger);
 			}
 
@@ -1081,7 +1097,11 @@ class Server{
 
 		$anyWorldFailedToLoad = false;
 
-		foreach((array) $this->configGroup->getProperty("worlds", []) as $name => $options){
+		foreach(Utils::promoteKeys((array) $this->configGroup->getProperty(Yml::WORLDS, [])) as $name => $options){
+			if(!is_string($name)){
+				//TODO: this probably should be an error
+				continue;
+			}
 			if($options === null){
 				$options = [];
 			}elseif(!is_array($options)){
@@ -1125,30 +1145,30 @@ class Server{
 		}
 
 		if($this->worldManager->getDefaultWorld() === null){
-			$default = $this->configGroup->getConfigString("level-name", "world");
+			$default = $this->configGroup->getConfigString(ServerProperties::DEFAULT_WORLD_NAME, "world");
 			if(trim($default) == ""){
-				$this->getLogger()->warning("level-name cannot be null, using default");
+				$this->logger->warning("level-name cannot be null, using default");
 				$default = "world";
-				$this->configGroup->setConfigString("level-name", "world");
+				$this->configGroup->setConfigString(ServerProperties::DEFAULT_WORLD_NAME, "world");
 			}
 			if(!$this->worldManager->loadWorld($default, true)){
 				if($this->worldManager->isWorldGenerated($default)){
-					$this->getLogger()->emergency($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_level_defaultError()));
+					$this->logger->emergency($this->language->translate(KnownTranslationFactory::pocketmine_level_defaultError()));
 
 					return false;
 				}
-				$generatorName = $this->configGroup->getConfigString("level-type");
-				$generatorOptions = $this->configGroup->getConfigString("generator-settings");
+				$generatorName = $this->configGroup->getConfigString(ServerProperties::DEFAULT_WORLD_GENERATOR);
+				$generatorOptions = $this->configGroup->getConfigString(ServerProperties::DEFAULT_WORLD_GENERATOR_SETTINGS);
 				$generatorClass = $getGenerator($generatorName, $generatorOptions, $default);
 
 				if($generatorClass === null){
-					$this->getLogger()->emergency($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_level_defaultError()));
+					$this->logger->emergency($this->language->translate(KnownTranslationFactory::pocketmine_level_defaultError()));
 					return false;
 				}
 				$creationOptions = WorldCreationOptions::create()
 					->setGeneratorClass($generatorClass)
 					->setGeneratorOptions($generatorOptions);
-				$convertedSeed = Generator::convertSeed($this->configGroup->getConfigString("level-seed"));
+				$convertedSeed = Generator::convertSeed($this->configGroup->getConfigString(ServerProperties::DEFAULT_WORLD_SEED));
 				if($convertedSeed !== null){
 					$creationOptions->setSeed($convertedSeed);
 				}
@@ -1166,10 +1186,18 @@ class Server{
 		return !$anyWorldFailedToLoad;
 	}
 
-	private function startupPrepareConnectableNetworkInterfaces(string $ip, int $port, bool $ipV6, bool $useQuery) : bool{
+	private function startupPrepareConnectableNetworkInterfaces(
+		string $ip,
+		int $port,
+		bool $ipV6,
+		bool $useQuery,
+		PacketBroadcaster $packetBroadcaster,
+		EntityEventBroadcaster $entityEventBroadcaster,
+		TypeConverter $typeConverter
+	) : bool{
 		$prettyIp = $ipV6 ? "[$ip]" : $ip;
 		try{
-			$rakLibRegistered = $this->network->registerInterface(new RakLibInterface($this, $ip, $port, $ipV6));
+			$rakLibRegistered = $this->network->registerInterface(new RakLibInterface($this, $ip, $port, $ipV6, $packetBroadcaster, $entityEventBroadcaster, $typeConverter));
 		}catch(NetworkInterfaceStartException $e){
 			$this->logger->emergency($this->language->translate(KnownTranslationFactory::pocketmine_server_networkStartFailed(
 				$ip,
@@ -1179,7 +1207,7 @@ class Server{
 			return false;
 		}
 		if($rakLibRegistered){
-			$this->logger->info($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_server_networkStart($prettyIp, (string) $port)));
+			$this->logger->info($this->language->translate(KnownTranslationFactory::pocketmine_server_networkStart($prettyIp, (string) $port)));
 		}
 		if($useQuery){
 			if(!$rakLibRegistered){
@@ -1187,19 +1215,23 @@ class Server{
 				//if it's not registered we need to make sure Query still works
 				$this->network->registerInterface(new DedicatedQueryNetworkInterface($ip, $port, $ipV6, new \PrefixedLogger($this->logger, "Dedicated Query Interface")));
 			}
-			$this->logger->info($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_server_query_running($prettyIp, (string) $port)));
+			$this->logger->info($this->language->translate(KnownTranslationFactory::pocketmine_server_query_running($prettyIp, (string) $port)));
 		}
 		return true;
 	}
 
 	private function startupPrepareNetworkInterfaces() : bool{
-		$useQuery = $this->configGroup->getConfigBool("enable-query", true);
+		$useQuery = $this->configGroup->getConfigBool(ServerProperties::ENABLE_QUERY, true);
+
+		$typeConverter = TypeConverter::getInstance();
+		$packetBroadcaster = new StandardPacketBroadcaster($this);
+		$entityEventBroadcaster = new StandardEntityEventBroadcaster($packetBroadcaster, $typeConverter);
 
 		if(
-			!$this->startupPrepareConnectableNetworkInterfaces($this->getIp(), $this->getPort(), false, $useQuery) ||
+			!$this->startupPrepareConnectableNetworkInterfaces($this->getIp(), $this->getPort(), false, $useQuery, $packetBroadcaster, $entityEventBroadcaster, $typeConverter) ||
 			(
-				$this->configGroup->getConfigBool("enable-ipv6", true) &&
-				!$this->startupPrepareConnectableNetworkInterfaces($this->getIpV6(), $this->getPortV6(), true, $useQuery)
+				$this->configGroup->getConfigBool(ServerProperties::ENABLE_IPV6, true) &&
+				!$this->startupPrepareConnectableNetworkInterfaces($this->getIpV6(), $this->getPortV6(), true, $useQuery, $packetBroadcaster, $entityEventBroadcaster, $typeConverter)
 			)
 		){
 			return false;
@@ -1213,7 +1245,7 @@ class Server{
 			$this->network->blockAddress($entry->getName(), -1);
 		}
 
-		if($this->configGroup->getPropertyBool("network.upnp-forwarding", false)){
+		if($this->configGroup->getPropertyBool(Yml::NETWORK_UPNP_FORWARDING, false)){
 			$this->network->registerInterface(new UPnPNetworkInterface($this->logger, Internet::getInternalIP(), $this->getPort()));
 		}
 
@@ -1233,9 +1265,10 @@ class Server{
 	 */
 	public function unsubscribeFromBroadcastChannel(string $channelId, CommandSender $subscriber) : void{
 		if(isset($this->broadcastSubscribers[$channelId][spl_object_id($subscriber)])){
-			unset($this->broadcastSubscribers[$channelId][spl_object_id($subscriber)]);
-			if(count($this->broadcastSubscribers[$channelId]) === 0){
+			if(count($this->broadcastSubscribers[$channelId]) === 1){
 				unset($this->broadcastSubscribers[$channelId]);
+			}else{
+				unset($this->broadcastSubscribers[$channelId][spl_object_id($subscriber)]);
 			}
 		}
 	}
@@ -1329,90 +1362,59 @@ class Server{
 	}
 
 	/**
-	 * @param Player[]            $players
-	 * @param ClientboundPacket[] $packets
-	 */
-	public function broadcastPackets(array $players, array $packets) : bool{
-		if(count($packets) === 0){
-			throw new \InvalidArgumentException("Cannot broadcast empty list of packets");
-		}
-
-		return Timings::$broadcastPackets->time(function() use ($players, $packets) : bool{
-			/** @var NetworkSession[] $recipients */
-			$recipients = [];
-			foreach($players as $player){
-				if($player->isConnected()){
-					$recipients[] = $player->getNetworkSession();
-				}
-			}
-			if(count($recipients) === 0){
-				return false;
-			}
-
-			$ev = new DataPacketSendEvent($recipients, $packets);
-			$ev->call();
-			if($ev->isCancelled()){
-				return false;
-			}
-			$recipients = $ev->getTargets();
-
-			/** @var PacketBroadcaster[] $broadcasters */
-			$broadcasters = [];
-			/** @var NetworkSession[][] $broadcasterTargets */
-			$broadcasterTargets = [];
-			foreach($recipients as $recipient){
-				$broadcaster = $recipient->getBroadcaster();
-				$broadcasters[spl_object_id($broadcaster)] = $broadcaster;
-				$broadcasterTargets[spl_object_id($broadcaster)][] = $recipient;
-			}
-			foreach($broadcasters as $broadcaster){
-				$broadcaster->broadcastPackets($broadcasterTargets[spl_object_id($broadcaster)], $packets);
-			}
-
-			return true;
-		});
-	}
-
-	/**
-	 * Broadcasts a list of packets in a batch to a list of players
+	 * @internal
+	 * Promises to compress the given batch buffer using the selected compressor, optionally on a separate thread.
+	 *
+	 * If the buffer is smaller than the batch-threshold (usually 256), the buffer will be compressed at level 0 if supported
+	 * by the compressor. This means that the payload will be wrapped with the appropriate header and footer, but not
+	 * actually compressed.
+	 *
+	 * If the buffer is larger than the async-compression-threshold (usually 10,000), the buffer may be compressed in
+	 * a separate thread (if available).
 	 *
 	 * @param bool|null $sync Compression on the main thread (true) or workers (false). Default is automatic (null).
 	 */
-	public function prepareBatch(PacketBatch $stream, Compressor $compressor, ?bool $sync = null) : CompressBatchPromise{
+	public function prepareBatch(string $buffer, Compressor $compressor, ?bool $sync = null, ?TimingsHandler $timings = null) : CompressBatchPromise|string{
+		$timings ??= Timings::$playerNetworkSendCompress;
 		try{
-			Timings::$playerNetworkSendCompress->startTiming();
+			$timings->startTiming();
 
-			$buffer = $stream->getBuffer();
+			$threshold = $compressor->getCompressionThreshold();
+			if($threshold === null || strlen($buffer) < $compressor->getCompressionThreshold()){
+				$compressionType = CompressionAlgorithm::NONE;
+				$compressed = $buffer;
 
-			if($sync === null){
-				$sync = !($this->networkCompressionAsync && $compressor->willCompress($buffer));
-			}
-
-			$promise = new CompressBatchPromise();
-			if(!$sync){
-				$task = new CompressBatchTask($buffer, $promise, $compressor);
-				$this->asyncPool->submitTask($task);
 			}else{
-				$promise->resolve($compressor->compress($buffer));
+				$sync ??= !$this->networkCompressionAsync;
+
+				if(!$sync && strlen($buffer) >= $this->networkCompressionAsyncThreshold){
+					$promise = new CompressBatchPromise();
+					$task = new CompressBatchTask($buffer, $promise, $compressor);
+					$this->asyncPool->submitTask($task);
+					return $promise;
+				}
+
+				$compressionType = $compressor->getNetworkId();
+				$compressed = $compressor->compress($buffer);
 			}
 
-			return $promise;
+			return chr($compressionType) . $compressed;
 		}finally{
-			Timings::$playerNetworkSendCompress->stopTiming();
+			$timings->stopTiming();
 		}
 	}
 
 	public function enablePlugins(PluginEnableOrder $type) : bool{
 		$allSuccess = true;
 		foreach($this->pluginManager->getPlugins() as $plugin){
-			if(!$plugin->isEnabled() && $plugin->getDescription()->getOrder()->equals($type)){
+			if(!$plugin->isEnabled() && $plugin->getDescription()->getOrder() === $type){
 				if(!$this->pluginManager->enablePlugin($plugin)){
 					$allSuccess = false;
 				}
 			}
 		}
 
-		if($type->equals(PluginEnableOrder::POSTWORLD())){
+		if($type === PluginEnableOrder::POSTWORLD){
 			$this->commandMap->registerServerAliases();
 		}
 
@@ -1448,7 +1450,7 @@ class Server{
 
 	private function forceShutdownExit() : void{
 		$this->forceShutdown();
-		Process::kill(Process::pid(), true);
+		Process::kill(Process::pid());
 	}
 
 	public function forceShutdown() : void{
@@ -1473,50 +1475,50 @@ class Server{
 			$this->shutdown();
 
 			if(isset($this->pluginManager)){
-				$this->getLogger()->debug("Disabling all plugins");
+				$this->logger->debug("Disabling all plugins");
 				$this->pluginManager->disablePlugins();
 			}
 
 			if(isset($this->network)){
-				$this->network->getSessionManager()->close($this->configGroup->getPropertyString("settings.shutdown-message", "Server closed"));
+				$this->network->getSessionManager()->close($this->configGroup->getPropertyString(Yml::SETTINGS_SHUTDOWN_MESSAGE, "Server closed"));
 			}
 
 			if(isset($this->worldManager)){
-				$this->getLogger()->debug("Unloading all worlds");
+				$this->logger->debug("Unloading all worlds");
 				foreach($this->worldManager->getWorlds() as $world){
 					$this->worldManager->unloadWorld($world, true);
 				}
 			}
 
-			$this->getLogger()->debug("Removing event handlers");
+			$this->logger->debug("Removing event handlers");
 			HandlerListManager::global()->unregisterAll();
 
 			if(isset($this->asyncPool)){
-				$this->getLogger()->debug("Shutting down async task worker pool");
+				$this->logger->debug("Shutting down async task worker pool");
 				$this->asyncPool->shutdown();
 			}
 
 			if(isset($this->configGroup)){
-				$this->getLogger()->debug("Saving properties");
+				$this->logger->debug("Saving properties");
 				$this->configGroup->save();
 			}
 
 			if($this->console !== null){
-				$this->getLogger()->debug("Closing console");
+				$this->logger->debug("Closing console");
 				$this->console->quit();
 			}
 
 			if(isset($this->network)){
-				$this->getLogger()->debug("Stopping network interfaces");
+				$this->logger->debug("Stopping network interfaces");
 				foreach($this->network->getInterfaces() as $interface){
-					$this->getLogger()->debug("Stopping network interface " . get_class($interface));
+					$this->logger->debug("Stopping network interface " . get_class($interface));
 					$this->network->unregisterInterface($interface);
 				}
 			}
 		}catch(\Throwable $e){
 			$this->logger->logException($e);
 			$this->logger->emergency("Crashed while crashing, killing process");
-			@Process::kill(Process::pid(), true);
+			@Process::kill(Process::pid());
 		}
 
 	}
@@ -1529,7 +1531,7 @@ class Server{
 	 * @param mixed[][]|null $trace
 	 * @phpstan-param list<array<string, mixed>>|null $trace
 	 */
-	public function exceptionHandler(\Throwable $e, $trace = null) : void{
+	public function exceptionHandler(\Throwable $e, ?array $trace = null) : void{
 		while(@ob_end_flush()){}
 		global $lastError;
 
@@ -1537,23 +1539,38 @@ class Server{
 			$trace = $e->getTrace();
 		}
 
-		$errstr = $e->getMessage();
-		$errfile = $e->getFile();
-		$errline = $e->getLine();
+		//If this is a thread crash, this logs where the exception came from on the main thread, as opposed to the
+		//crashed thread. This is intentional, and might be useful for debugging
+		//Assume that the thread already logged the original exception with the correct stack trace
+		$this->logger->logException($e, $trace);
+
+		if($e instanceof ThreadCrashException){
+			$info = $e->getCrashInfo();
+			$type = $info->getType();
+			$errstr = $info->getMessage();
+			$errfile = $info->getFile();
+			$errline = $info->getLine();
+			$printableTrace = $info->getTrace();
+			$thread = $info->getThreadName();
+		}else{
+			$type = get_class($e);
+			$errstr = $e->getMessage();
+			$errfile = $e->getFile();
+			$errline = $e->getLine();
+			$printableTrace = Utils::printableTraceWithMetadata($trace);
+			$thread = "Main";
+		}
 
 		$errstr = preg_replace('/\s+/', ' ', trim($errstr));
 
-		$errfile = Filesystem::cleanPath($errfile);
-
-		$this->logger->logException($e, $trace);
-
 		$lastError = [
-			"type" => get_class($e),
+			"type" => $type,
 			"message" => $errstr,
-			"fullFile" => $e->getFile(),
-			"file" => $errfile,
+			"fullFile" => $errfile,
+			"file" => Filesystem::cleanPath($errfile),
 			"line" => $errline,
-			"trace" => $trace
+			"trace" => $printableTrace,
+			"thread" => $thread
 		];
 
 		global $lastExceptionError, $lastError;
@@ -1562,7 +1579,7 @@ class Server{
 	}
 
 	private function writeCrashDumpFile(CrashDump $dump) : string{
-		$crashFolder = Path::join($this->getDataPath(), "crashdumps");
+		$crashFolder = Path::join($this->dataPath, "crashdumps");
 		if(!is_dir($crashFolder)){
 			mkdir($crashFolder);
 		}
@@ -1593,17 +1610,17 @@ class Server{
 		ini_set("error_reporting", '0');
 		ini_set("memory_limit", '-1'); //Fix error dump not dumped on memory problems
 		try{
-			$this->logger->emergency($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_crash_create()));
+			$this->logger->emergency($this->language->translate(KnownTranslationFactory::pocketmine_crash_create()));
 			$dump = new CrashDump($this, $this->pluginManager ?? null);
 
 			$crashDumpPath = $this->writeCrashDumpFile($dump);
 
-			$this->logger->emergency($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_crash_submit($crashDumpPath)));
+			$this->logger->emergency($this->language->translate(KnownTranslationFactory::pocketmine_crash_submit($crashDumpPath)));
 
-			if($this->configGroup->getPropertyBool("auto-report.enabled", true)){
+			if($this->configGroup->getPropertyBool(Yml::AUTO_REPORT_ENABLED, true)){
 				$report = true;
 
-				$stamp = Path::join($this->getDataPath(), "crashdumps", ".last_crash");
+				$stamp = Path::join($this->dataPath, "crashdumps", ".last_crash");
 				$crashInterval = 120; //2 minutes
 				if(($lastReportTime = @filemtime($stamp)) !== false && $lastReportTime + $crashInterval >= time()){
 					$report = false;
@@ -1611,15 +1628,6 @@ class Server{
 				}
 				@touch($stamp); //update file timestamp
 
-				$plugin = $dump->getData()->plugin;
-				if($plugin !== ""){
-					$p = $this->pluginManager->getPlugin($plugin);
-					if($p instanceof Plugin && !($p->getPluginLoader() instanceof PharPluginLoader)){
-						$this->logger->debug("Not sending crashdump due to caused by non-phar plugin");
-						$report = false;
-					}
-				}
-
 				if($dump->getData()->error["type"] === \ParseError::class){
 					$report = false;
 				}
@@ -1630,7 +1638,7 @@ class Server{
 				}
 
 				if($report){
-					$url = ($this->configGroup->getPropertyBool("auto-report.use-https", true) ? "https" : "http") . "://" . $this->configGroup->getPropertyString("auto-report.host", "crash.pmmp.io") . "/submit/api";
+					$url = ($this->configGroup->getPropertyBool(Yml::AUTO_REPORT_USE_HTTPS, true) ? "https" : "http") . "://" . $this->configGroup->getPropertyString(Yml::AUTO_REPORT_HOST, "crash.pmmp.io") . "/submit/api";
 					$postUrlError = "Unknown error";
 					$reply = Internet::postURL($url, [
 						"report" => "yes",
@@ -1643,7 +1651,7 @@ class Server{
 						if(isset($data->crashId) && is_int($data->crashId) && isset($data->crashUrl) && is_string($data->crashUrl)){
 							$reportId = $data->crashId;
 							$reportUrl = $data->crashUrl;
-							$this->logger->emergency($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_crash_archive($reportUrl, (string) $reportId)));
+							$this->logger->emergency($this->language->translate(KnownTranslationFactory::pocketmine_crash_archive($reportUrl, (string) $reportId)));
 						}elseif(isset($data->error) && is_string($data->error)){
 							$this->logger->emergency("Automatic crash report submission failed: $data->error");
 						}else{
@@ -1657,7 +1665,7 @@ class Server{
 		}catch(\Throwable $e){
 			$this->logger->logException($e);
 			try{
-				$this->logger->critical($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_crash_error($e->getMessage())));
+				$this->logger->critical($this->language->translate(KnownTranslationFactory::pocketmine_crash_error($e->getMessage())));
 			}catch(\Throwable $e){}
 		}
 
@@ -1665,12 +1673,14 @@ class Server{
 		$this->isRunning = false;
 
 		//Force minimum uptime to be >= 120 seconds, to reduce the impact of spammy crash loops
-		$spacing = ((int) $this->startTime) - time() + 120;
+		$uptime = time() - ((int) $this->startTime);
+		$minUptime = 120;
+		$spacing = $minUptime - $uptime;
 		if($spacing > 0){
-			echo "--- Waiting $spacing seconds to throttle automatic restart (you can kill the process safely now) ---" . PHP_EOL;
+			echo "--- Uptime {$uptime}s - waiting {$spacing}s to throttle automatic restart (you can kill the process safely now) ---" . PHP_EOL;
 			sleep($spacing);
 		}
-		@Process::kill(Process::pid(), true);
+		@Process::kill(Process::pid());
 		exit(1);
 	}
 
@@ -1741,7 +1751,7 @@ class Server{
 	}
 
 	public function sendUsage(int $type = SendUsageTask::TYPE_STATUS) : void{
-		if($this->configGroup->getPropertyBool("anonymous-statistics.enabled", true)){
+		if($this->configGroup->getPropertyBool(Yml::ANONYMOUS_STATISTICS_ENABLED, true)){
 			$this->asyncPool->submitTask(new SendUsageTask($this, $type, $this->uniquePlayers));
 		}
 		$this->uniquePlayers = [];
@@ -1775,7 +1785,7 @@ class Server{
 
 		echo "\x1b]0;" . $this->getName() . " " .
 			$this->getPocketMineVersion() .
-			" | Online $online/" . $this->getMaxPlayers() .
+			" | Online $online/" . $this->maxPlayers .
 			($connecting > 0 ? " (+$connecting connecting)" : "") .
 			" | Memory " . $usage .
 			" | U " . round($bandwidthStats->getSend()->getAverageBytes() / 1024, 2) .
@@ -1840,10 +1850,10 @@ class Server{
 		}
 
 		if(($this->tickCounter % self::TICKS_PER_TPS_OVERLOAD_WARNING) === 0 && $this->getTicksPerSecondAverage() < self::TPS_OVERLOAD_WARNING_THRESHOLD){
-			$this->logger->warning($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_server_tickOverload()));
+			$this->logger->warning($this->language->translate(KnownTranslationFactory::pocketmine_server_tickOverload()));
 		}
 
-		$this->getMemoryManager()->check();
+		$this->memoryManager->check();
 
 		if($this->console !== null){
 			Timings::$serverCommand->startTiming();
diff --git a/src/ServerConfigGroup.php b/src/ServerConfigGroup.php
index bf82f534ad..b4a3a90871 100644
--- a/src/ServerConfigGroup.php
+++ b/src/ServerConfigGroup.php
@@ -43,12 +43,7 @@ final class ServerConfigGroup{
 		private Config $serverProperties
 	){}
 
-	/**
-	 * @param mixed $defaultValue
-	 *
-	 * @return mixed
-	 */
-	public function getProperty(string $variable, $defaultValue = null){
+	public function getProperty(string $variable, mixed $defaultValue = null) : mixed{
 		if(!array_key_exists($variable, $this->propertyCache)){
 			$v = getopt("", ["$variable::"]);
 			if(isset($v[$variable])){
diff --git a/src/ServerProperties.php b/src/ServerProperties.php
new file mode 100644
index 0000000000..ddbbd81340
--- /dev/null
+++ b/src/ServerProperties.php
@@ -0,0 +1,58 @@
+<?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;
+
+/**
+ * @internal
+ * Constants for all properties available in server.properties.
+ */
+final class ServerProperties{
+
+	private function __construct(){
+		//NOOP
+	}
+
+	public const AUTO_SAVE = "auto-save";
+	public const DEFAULT_WORLD_GENERATOR = "level-type";
+	public const DEFAULT_WORLD_GENERATOR_SETTINGS = "generator-settings";
+	public const DEFAULT_WORLD_NAME = "level-name";
+	public const DEFAULT_WORLD_SEED = "level-seed";
+	public const DIFFICULTY = "difficulty";
+	public const ENABLE_IPV6 = "enable-ipv6";
+	public const ENABLE_QUERY = "enable-query";
+	public const FORCE_GAME_MODE = "force-gamemode";
+	public const GAME_MODE = "gamemode";
+	public const HARDCORE = "hardcore";
+	public const LANGUAGE = "language";
+	public const MAX_PLAYERS = "max-players";
+	public const MOTD = "motd";
+	public const PVP = "pvp";
+	public const SERVER_IPV4 = "server-ip";
+	public const SERVER_IPV6 = "server-ipv6";
+	public const SERVER_PORT_IPV4 = "server-port";
+	public const SERVER_PORT_IPV6 = "server-portv6";
+	public const VIEW_DISTANCE = "view-distance";
+	public const WHITELIST = "white-list";
+	public const XBOX_AUTH = "xbox-auth";
+}
diff --git a/src/TimeTrackingSleeperHandler.php b/src/TimeTrackingSleeperHandler.php
index 970d85ce08..827ad370eb 100644
--- a/src/TimeTrackingSleeperHandler.php
+++ b/src/TimeTrackingSleeperHandler.php
@@ -24,7 +24,9 @@ declare(strict_types=1);
 namespace pocketmine;
 
 use pocketmine\snooze\SleeperHandler;
+use pocketmine\snooze\SleeperHandlerEntry;
 use pocketmine\timings\TimingsHandler;
+use pocketmine\utils\Utils;
 use function hrtime;
 
 /**
@@ -35,12 +37,29 @@ final class TimeTrackingSleeperHandler extends SleeperHandler{
 
 	private int $notificationProcessingTimeNs = 0;
 
+	/**
+	 * @var TimingsHandler[]
+	 * @phpstan-var array<string, TimingsHandler>
+	 */
+	private static array $handlerTimings = [];
+
 	public function __construct(
 		private TimingsHandler $timings
 	){
 		parent::__construct();
 	}
 
+	public function addNotifier(\Closure $handler) : SleeperHandlerEntry{
+		$name = Utils::getNiceClosureName($handler);
+		$timings = self::$handlerTimings[$name] ??= new TimingsHandler("Snooze Handler: " . $name, $this->timings);
+
+		return parent::addNotifier(function() use ($timings, $handler) : void{
+			$timings->startTiming();
+			$handler();
+			$timings->stopTiming();
+		});
+	}
+
 	/**
 	 * Returns the time in nanoseconds spent processing notifications since the last reset.
 	 */
diff --git a/src/VersionInfo.php b/src/VersionInfo.php
index 9bbff9b63d..bc1b24c62d 100644
--- a/src/VersionInfo.php
+++ b/src/VersionInfo.php
@@ -31,10 +31,25 @@ use function str_repeat;
 
 final class VersionInfo{
 	public const NAME = "PocketMine-MP";
-	public const BASE_VERSION = "4.12.10";
+	public const BASE_VERSION = "5.21.2";
 	public const IS_DEVELOPMENT_BUILD = true;
 	public const BUILD_CHANNEL = "stable";
 
+	/**
+	 * PocketMine-MP-specific version ID for world data. Used to determine what fixes need to be applied to old world
+	 * data (e.g. stuff saved wrongly by past versions).
+	 * This version supplements the Minecraft vanilla world version.
+	 *
+	 * This should be bumped if any **non-Mojang** BC-breaking change or bug fix is made to world save data of any kind
+	 * (entities, tiles, blocks, biomes etc.). For example, if PM accidentally saved a block with its facing value
+	 * swapped, we would bump this, but not if Mojang did the same change.
+	 */
+	public const WORLD_DATA_VERSION = 1;
+	/**
+	 * Name of the NBT tag used to store the world data version.
+	 */
+	public const TAG_WORLD_DATA_VERSION = "PMMPDataVersion"; //TAG_Long
+
 	private function __construct(){
 		//NOOP
 	}
@@ -48,7 +63,8 @@ final class VersionInfo{
 			if(\Phar::running(true) === ""){
 				$gitHash = Git::getRepositoryStatePretty(\pocketmine\PATH);
 			}else{
-				$phar = new \Phar(\Phar::running(false));
+				$pharPath = \Phar::running(false);
+				$phar = \Phar::isValidPharFilename($pharPath) ? new \Phar($pharPath) : new \PharData($pharPath);
 				$meta = $phar->getMetadata();
 				if(isset($meta["git"])){
 					$gitHash = $meta["git"];
@@ -67,7 +83,8 @@ final class VersionInfo{
 		if(self::$buildNumber === null){
 			self::$buildNumber = 0;
 			if(\Phar::running(true) !== ""){
-				$phar = new \Phar(\Phar::running(false));
+				$pharPath = \Phar::running(false);
+				$phar = \Phar::isValidPharFilename($pharPath) ? new \Phar($pharPath) : new \PharData($pharPath);
 				$meta = $phar->getMetadata();
 				if(is_array($meta) && isset($meta["build"]) && is_int($meta["build"])){
 					self::$buildNumber = $meta["build"];
diff --git a/src/YmlServerProperties.php b/src/YmlServerProperties.php
new file mode 100644
index 0000000000..9bd203eef8
--- /dev/null
+++ b/src/YmlServerProperties.php
@@ -0,0 +1,118 @@
+<?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;
+
+/**
+ * @internal
+ * Constants for all properties available in pocketmine.yml.
+ * This is generated by build/generate-pocketmine-yml-property-consts.php.
+ * Do not edit this file manually.
+ */
+final class YmlServerProperties{
+
+	private function __construct(){
+		//NOOP
+	}
+
+	public const ALIASES = 'aliases';
+	public const ANONYMOUS_STATISTICS = 'anonymous-statistics';
+	public const ANONYMOUS_STATISTICS_ENABLED = 'anonymous-statistics.enabled';
+	public const ANONYMOUS_STATISTICS_HOST = 'anonymous-statistics.host';
+	public const AUTO_REPORT = 'auto-report';
+	public const AUTO_REPORT_ENABLED = 'auto-report.enabled';
+	public const AUTO_REPORT_HOST = 'auto-report.host';
+	public const AUTO_REPORT_SEND_CODE = 'auto-report.send-code';
+	public const AUTO_REPORT_SEND_PHPINFO = 'auto-report.send-phpinfo';
+	public const AUTO_REPORT_SEND_SETTINGS = 'auto-report.send-settings';
+	public const AUTO_REPORT_USE_HTTPS = 'auto-report.use-https';
+	public const AUTO_UPDATER = 'auto-updater';
+	public const AUTO_UPDATER_ENABLED = 'auto-updater.enabled';
+	public const AUTO_UPDATER_HOST = 'auto-updater.host';
+	public const AUTO_UPDATER_ON_UPDATE = 'auto-updater.on-update';
+	public const AUTO_UPDATER_ON_UPDATE_WARN_CONSOLE = 'auto-updater.on-update.warn-console';
+	public const AUTO_UPDATER_PREFERRED_CHANNEL = 'auto-updater.preferred-channel';
+	public const AUTO_UPDATER_SUGGEST_CHANNELS = 'auto-updater.suggest-channels';
+	public const CHUNK_GENERATION = 'chunk-generation';
+	public const CHUNK_GENERATION_POPULATION_QUEUE_SIZE = 'chunk-generation.population-queue-size';
+	public const CHUNK_SENDING = 'chunk-sending';
+	public const CHUNK_SENDING_PER_TICK = 'chunk-sending.per-tick';
+	public const CHUNK_SENDING_SPAWN_RADIUS = 'chunk-sending.spawn-radius';
+	public const CHUNK_TICKING = 'chunk-ticking';
+	public const CHUNK_TICKING_BLOCKS_PER_SUBCHUNK_PER_TICK = 'chunk-ticking.blocks-per-subchunk-per-tick';
+	public const CHUNK_TICKING_DISABLE_BLOCK_TICKING = 'chunk-ticking.disable-block-ticking';
+	public const CHUNK_TICKING_TICK_RADIUS = 'chunk-ticking.tick-radius';
+	public const CONSOLE = 'console';
+	public const CONSOLE_ENABLE_INPUT = 'console.enable-input';
+	public const CONSOLE_TITLE_TICK = 'console.title-tick';
+	public const DEBUG = 'debug';
+	public const DEBUG_LEVEL = 'debug.level';
+	public const LEVEL_SETTINGS = 'level-settings';
+	public const LEVEL_SETTINGS_DEFAULT_FORMAT = 'level-settings.default-format';
+	public const MEMORY = 'memory';
+	public const MEMORY_ASYNC_WORKER_HARD_LIMIT = 'memory.async-worker-hard-limit';
+	public const MEMORY_CHECK_RATE = 'memory.check-rate';
+	public const MEMORY_CONTINUOUS_TRIGGER = 'memory.continuous-trigger';
+	public const MEMORY_CONTINUOUS_TRIGGER_RATE = 'memory.continuous-trigger-rate';
+	public const MEMORY_GARBAGE_COLLECTION = 'memory.garbage-collection';
+	public const MEMORY_GARBAGE_COLLECTION_COLLECT_ASYNC_WORKER = 'memory.garbage-collection.collect-async-worker';
+	public const MEMORY_GARBAGE_COLLECTION_LOW_MEMORY_TRIGGER = 'memory.garbage-collection.low-memory-trigger';
+	public const MEMORY_GARBAGE_COLLECTION_PERIOD = 'memory.garbage-collection.period';
+	public const MEMORY_GLOBAL_LIMIT = 'memory.global-limit';
+	public const MEMORY_MAIN_HARD_LIMIT = 'memory.main-hard-limit';
+	public const MEMORY_MAIN_LIMIT = 'memory.main-limit';
+	public const MEMORY_MAX_CHUNKS = 'memory.max-chunks';
+	public const MEMORY_MAX_CHUNKS_CHUNK_RADIUS = 'memory.max-chunks.chunk-radius';
+	public const MEMORY_MAX_CHUNKS_TRIGGER_CHUNK_COLLECT = 'memory.max-chunks.trigger-chunk-collect';
+	public const MEMORY_MEMORY_DUMP = 'memory.memory-dump';
+	public const MEMORY_MEMORY_DUMP_DUMP_ASYNC_WORKER = 'memory.memory-dump.dump-async-worker';
+	public const MEMORY_WORLD_CACHES = 'memory.world-caches';
+	public const MEMORY_WORLD_CACHES_DISABLE_CHUNK_CACHE = 'memory.world-caches.disable-chunk-cache';
+	public const MEMORY_WORLD_CACHES_LOW_MEMORY_TRIGGER = 'memory.world-caches.low-memory-trigger';
+	public const NETWORK = 'network';
+	public const NETWORK_ASYNC_COMPRESSION = 'network.async-compression';
+	public const NETWORK_ASYNC_COMPRESSION_THRESHOLD = 'network.async-compression-threshold';
+	public const NETWORK_BATCH_THRESHOLD = 'network.batch-threshold';
+	public const NETWORK_COMPRESSION_LEVEL = 'network.compression-level';
+	public const NETWORK_ENABLE_ENCRYPTION = 'network.enable-encryption';
+	public const NETWORK_MAX_MTU_SIZE = 'network.max-mtu-size';
+	public const NETWORK_UPNP_FORWARDING = 'network.upnp-forwarding';
+	public const PLAYER = 'player';
+	public const PLAYER_SAVE_PLAYER_DATA = 'player.save-player-data';
+	public const PLAYER_VERIFY_XUID = 'player.verify-xuid';
+	public const PLUGINS = 'plugins';
+	public const PLUGINS_LEGACY_DATA_DIR = 'plugins.legacy-data-dir';
+	public const SETTINGS = 'settings';
+	public const SETTINGS_ASYNC_WORKERS = 'settings.async-workers';
+	public const SETTINGS_ENABLE_DEV_BUILDS = 'settings.enable-dev-builds';
+	public const SETTINGS_ENABLE_PROFILING = 'settings.enable-profiling';
+	public const SETTINGS_FORCE_LANGUAGE = 'settings.force-language';
+	public const SETTINGS_PROFILE_REPORT_TRIGGER = 'settings.profile-report-trigger';
+	public const SETTINGS_QUERY_PLUGINS = 'settings.query-plugins';
+	public const SETTINGS_SHUTDOWN_MESSAGE = 'settings.shutdown-message';
+	public const TICKS_PER = 'ticks-per';
+	public const TICKS_PER_AUTOSAVE = 'ticks-per.autosave';
+	public const TIMINGS = 'timings';
+	public const TIMINGS_HOST = 'timings.host';
+	public const WORLDS = 'worlds';
+}
diff --git a/src/block/AmethystCluster.php b/src/block/AmethystCluster.php
new file mode 100644
index 0000000000..639490456a
--- /dev/null
+++ b/src/block/AmethystCluster.php
@@ -0,0 +1,133 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\AmethystTrait;
+use pocketmine\block\utils\AnyFacingTrait;
+use pocketmine\block\utils\FortuneDropHelper;
+use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+use pocketmine\math\Axis;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\world\BlockTransaction;
+
+final class AmethystCluster extends Transparent{
+	use AmethystTrait;
+	use AnyFacingTrait;
+
+	public const STAGE_SMALL_BUD = 0;
+	public const STAGE_MEDIUM_BUD = 1;
+	public const STAGE_LARGE_BUD = 2;
+	public const STAGE_CLUSTER = 3;
+
+	private int $stage = self::STAGE_CLUSTER;
+
+	public function describeBlockItemState(RuntimeDataDescriber $w) : void{
+		$w->boundedIntAuto(self::STAGE_SMALL_BUD, self::STAGE_CLUSTER, $this->stage);
+	}
+
+	public function getStage() : int{ return $this->stage; }
+
+	public function setStage(int $stage) : self{
+		if($stage < self::STAGE_SMALL_BUD || $stage > self::STAGE_CLUSTER){
+			throw new \InvalidArgumentException("Size must be in range " . self::STAGE_SMALL_BUD . " ... " . self::STAGE_CLUSTER);
+		}
+		$this->stage = $stage;
+		return $this;
+	}
+
+	public function getLightLevel() : int{
+		return match($this->stage){
+			self::STAGE_SMALL_BUD => 1,
+			self::STAGE_MEDIUM_BUD => 2,
+			self::STAGE_LARGE_BUD => 4,
+			self::STAGE_CLUSTER => 5,
+			default => throw new AssumptionFailedError("Invalid stage $this->stage"),
+		};
+	}
+
+	protected function recalculateCollisionBoxes() : array{
+		$myAxis = Facing::axis($this->facing);
+
+		$box = AxisAlignedBB::one();
+		foreach([Axis::Y, Axis::Z, Axis::X] as $axis){
+			if($axis === $myAxis){
+				continue;
+			}
+			$box->squash($axis, $this->stage === self::STAGE_SMALL_BUD ? 4 / 16 : 3 / 16);
+		}
+		$box->trim($this->facing, 1 - ($this->stage === self::STAGE_CLUSTER ? 7 / 16 : ($this->stage + 3) / 16));
+
+		return [$box];
+	}
+
+	private function canBeSupportedAt(Block $block, int $facing) : bool{
+		return $block->getAdjacentSupportType($facing) === SupportType::FULL;
+	}
+
+	public function getSupportType(int $facing) : SupportType{
+		return SupportType::NONE;
+	}
+
+	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+		if(!$this->canBeSupportedAt($blockReplace, Facing::opposite($face))){
+			return false;
+		}
+
+		$this->facing = $face;
+		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+	}
+
+	public function onNearbyBlockChange() : void{
+		if(!$this->canBeSupportedAt($this, Facing::opposite($this->facing))){
+			$this->position->getWorld()->useBreakOn($this->position);
+		}
+	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return true;
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		if($this->stage === self::STAGE_CLUSTER){
+			return [VanillaItems::AMETHYST_SHARD()->setCount(FortuneDropHelper::weighted($item, min: 4, maxBase: 4))];
+		}
+
+		return [];
+	}
+
+	public function getDropsForIncompatibleTool(Item $item) : array{
+		if($this->stage === self::STAGE_CLUSTER){
+			return [VanillaItems::AMETHYST_SHARD()->setCount(FortuneDropHelper::weighted($item, min: 2, maxBase: 2))];
+		}
+
+		return [];
+	}
+}
diff --git a/src/block/Anvil.php b/src/block/Anvil.php
index 785d59afdd..0a1a470700 100644
--- a/src/block/Anvil.php
+++ b/src/block/Anvil.php
@@ -24,17 +24,22 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\inventory\AnvilInventory;
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\Fallable;
 use pocketmine\block\utils\FallableTrait;
 use pocketmine\block\utils\HorizontalFacingTrait;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\entity\object\FallingBlock;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
+use pocketmine\utils\Utils;
 use pocketmine\world\BlockTransaction;
+use pocketmine\world\sound\AnvilFallSound;
+use pocketmine\world\sound\Sound;
+use function round;
 
 class Anvil extends Transparent implements Fallable{
 	use FallableTrait;
@@ -46,21 +51,12 @@ class Anvil extends Transparent implements Fallable{
 
 	private int $damage = self::UNDAMAGED;
 
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::writeLegacyHorizontalFacing($this->facing) | ($this->damage << 2);
+	public function describeBlockItemState(RuntimeDataDescriber $w) : void{
+		$w->boundedIntAuto(self::UNDAMAGED, self::VERY_DAMAGED, $this->damage);
 	}
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::readLegacyHorizontalFacing($stateMeta & 0x3);
-		$this->damage = BlockDataSerializer::readBoundedInt("damage", $stateMeta >> 2, self::UNDAMAGED, self::VERY_DAMAGED);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
-	protected function writeStateToItemMeta() : int{
-		return $this->damage << 2;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
 	}
 
 	public function getDamage() : int{ return $this->damage; }
@@ -82,10 +78,10 @@ class Anvil extends Transparent implements Fallable{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($player instanceof Player){
 			$player->setCurrentWindow(new AnvilInventory($this->position));
 		}
@@ -95,12 +91,31 @@ class Anvil extends Transparent implements Fallable{
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
 		if($player !== null){
-			$this->facing = Facing::rotateY($player->getHorizontalFacing(), true);
+			$this->facing = Facing::rotateY($player->getHorizontalFacing(), false);
 		}
 		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 	}
 
-	public function tickFalling() : ?Block{
-		return null;
+	public function onHitGround(FallingBlock $blockEntity) : bool{
+		if(Utils::getRandomFloat() < 0.05 + (round($blockEntity->getFallDistance()) - 1) * 0.05){
+			if($this->damage !== self::VERY_DAMAGED){
+				$this->damage = $this->damage + 1;
+			}else{
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public function getFallDamagePerBlock() : float{
+		return 2.0;
+	}
+
+	public function getMaxFallDamage() : float{
+		return 40.0;
+	}
+
+	public function getLandSound() : ?Sound{
+		return new AnvilFallSound();
 	}
 }
diff --git a/src/block/Bamboo.php b/src/block/Bamboo.php
index e330228247..9f605bca69 100644
--- a/src/block/Bamboo.php
+++ b/src/block/Bamboo.php
@@ -23,12 +23,14 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\event\block\StructureGrowEvent;
 use pocketmine\item\Bamboo as ItemBamboo;
 use pocketmine\item\Fertilizer;
 use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
@@ -45,6 +47,7 @@ use function mt_rand;
 use const PHP_INT_MAX;
 
 class Bamboo extends Transparent{
+	use StaticSupportTrait;
 
 	public const NO_LEAVES = 0;
 	public const SMALL_LEAVES = 1;
@@ -54,18 +57,10 @@ class Bamboo extends Transparent{
 	protected bool $ready = false;
 	protected int $leafSize = self::NO_LEAVES;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->thick = ($stateMeta & BlockLegacyMetadata::BAMBOO_FLAG_THICK) !== 0;
-		$this->leafSize = BlockDataSerializer::readBoundedInt("leafSize", ($stateMeta >> BlockLegacyMetadata::BAMBOO_LEAF_SIZE_SHIFT) & BlockLegacyMetadata::BAMBOO_LEAF_SIZE_MASK, self::NO_LEAVES, self::LARGE_LEAVES);
-		$this->ready = ($stateMeta & BlockLegacyMetadata::BAMBOO_FLAG_READY) !== 0;
-	}
-
-	public function writeStateToMeta() : int{
-		return ($this->thick ? BlockLegacyMetadata::BAMBOO_FLAG_THICK : 0) | ($this->leafSize << BlockLegacyMetadata::BAMBOO_LEAF_SIZE_SHIFT) | ($this->ready ? BlockLegacyMetadata::BAMBOO_FLAG_READY : 0);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->boundedIntAuto(self::NO_LEAVES, self::LARGE_LEAVES, $this->leafSize);
+		$w->bool($this->thick);
+		$w->bool($this->ready);
 	}
 
 	public function isThick() : bool{ return $this->thick; }
@@ -102,7 +97,7 @@ class Bamboo extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	private static function getOffsetSeed(int $x, int $y, int $z) : int{
@@ -127,27 +122,26 @@ class Bamboo extends Transparent{
 		return new Vector3($retX, 0, $retZ);
 	}
 
-	private function canBeSupportedBy(Block $block) : bool{
-		//TODO: tags would be better for this
+	private function canBeSupportedAt(Block $block) : bool{
+		$supportBlock = $block->getSide(Facing::DOWN);
 		return
-			$block instanceof Dirt ||
-			$block instanceof Grass ||
-			$block instanceof Gravel ||
-			$block instanceof Sand ||
-			$block instanceof Mycelium ||
-			$block instanceof Podzol;
+			$supportBlock->hasSameTypeId($this) ||
+			$supportBlock->getTypeId() === BlockTypeIds::GRAVEL ||
+			$supportBlock->hasTypeTag(BlockTypeTags::DIRT) ||
+			$supportBlock->hasTypeTag(BlockTypeTags::MUD) ||
+			$supportBlock->hasTypeTag(BlockTypeTags::SAND);
 	}
 
 	private function seekToTop() : Bamboo{
 		$world = $this->position->getWorld();
 		$top = $this;
-		while(($next = $world->getBlock($top->position->up())) instanceof Bamboo && $next->isSameType($this)){
+		while(($next = $world->getBlock($top->position->up())) instanceof Bamboo && $next->hasSameTypeId($this)){
 			$top = $next;
 		}
 		return $top;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($item instanceof Fertilizer){
 			$top = $this->seekToTop();
 			if($top->grow(self::getMaxHeight($top->position->getFloorX(), $top->position->getFloorZ()), mt_rand(1, 2), $player)){
@@ -163,14 +157,6 @@ class Bamboo extends Transparent{
 		return false;
 	}
 
-	public function onNearbyBlockChange() : void{
-		$world = $this->position->getWorld();
-		$below = $world->getBlock($this->position->down());
-		if(!$this->canBeSupportedBy($below) && !$below->isSameType($this)){
-			$world->useBreakOn($this->position);
-		}
-	}
-
 	private function grow(int $maxHeight, int $growAmount, ?Player $player) : bool{
 		$world = $this->position->getWorld();
 		if(!$world->getBlock($this->position->up())->canBeReplaced()){
@@ -178,7 +164,7 @@ class Bamboo extends Transparent{
 		}
 
 		$height = 1;
-		while($world->getBlock($this->position->subtract(0, $height, 0))->isSameType($this)){
+		while($world->getBlock($this->position->subtract(0, $height, 0))->hasSameTypeId($this)){
 			if(++$height >= $maxHeight){
 				return false;
 			}
@@ -187,7 +173,7 @@ class Bamboo extends Transparent{
 		$newHeight = $height + $growAmount;
 
 		$stemBlock = (clone $this)->setReady(false)->setLeafSize(self::NO_LEAVES);
-		if($newHeight >= 4 && !$stemBlock->isThick()){ //don't change it to false if height is less, because it might have been chopped
+		if($newHeight >= 4 && !$stemBlock->thick){ //don't change it to false if height is less, because it might have been chopped
 			$stemBlock = $stemBlock->setThick(true);
 		}
 		$smallLeavesBlock = (clone $stemBlock)->setLeafSize(self::SMALL_LEAVES);
@@ -243,4 +229,8 @@ class Bamboo extends Transparent{
 			$world->setBlock($this->position, $this);
 		}
 	}
+
+	public function asItem() : Item{
+		return VanillaItems::BAMBOO();
+	}
 }
diff --git a/src/block/BambooSapling.php b/src/block/BambooSapling.php
index af3e653649..67c8a24e0b 100644
--- a/src/block/BambooSapling.php
+++ b/src/block/BambooSapling.php
@@ -23,28 +23,27 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\event\block\StructureGrowEvent;
 use pocketmine\item\Bamboo as ItemBamboo;
 use pocketmine\item\Fertilizer;
 use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
 use pocketmine\world\BlockTransaction;
 
 final class BambooSapling extends Flowable{
+	use StaticSupportTrait;
 
 	private bool $ready = false;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->ready = ($stateMeta & BlockLegacyMetadata::BAMBOO_SAPLING_FLAG_READY) !== 0;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->bool($this->ready);
 	}
 
-	protected function writeStateToMeta() : int{
-		return $this->ready ? BlockLegacyMetadata::BAMBOO_SAPLING_FLAG_READY : 0;
-	}
-
-	public function getStateBitmask() : int{ return 0b1; }
-
 	public function isReady() : bool{ return $this->ready; }
 
 	/** @return $this */
@@ -53,25 +52,16 @@ final class BambooSapling extends Flowable{
 		return $this;
 	}
 
-	private function canBeSupportedBy(Block $block) : bool{
-		//TODO: tags would be better for this
+	private function canBeSupportedAt(Block $block) : bool{
+		$supportBlock = $block->getSide(Facing::DOWN);
 		return
-			$block instanceof Dirt ||
-			$block instanceof Grass ||
-			$block instanceof Gravel ||
-			$block instanceof Sand ||
-			$block instanceof Mycelium ||
-			$block instanceof Podzol;
+			$supportBlock->getTypeId() === BlockTypeIds::GRAVEL ||
+			$supportBlock->hasTypeTag(BlockTypeTags::DIRT) ||
+			$supportBlock->hasTypeTag(BlockTypeTags::MUD) ||
+			$supportBlock->hasTypeTag(BlockTypeTags::SAND);
 	}
 
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if(!$this->canBeSupportedBy($blockReplace->position->getWorld()->getBlock($blockReplace->position->down()))){
-			return false;
-		}
-		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-	}
-
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($item instanceof Fertilizer || $item instanceof ItemBamboo){
 			if($this->grow($player)){
 				$item->pop();
@@ -81,13 +71,6 @@ final class BambooSapling extends Flowable{
 		return false;
 	}
 
-	public function onNearbyBlockChange() : void{
-		$world = $this->position->getWorld();
-		if(!$this->canBeSupportedBy($world->getBlock($this->position->down()))){
-			$world->useBreakOn($this->position);
-		}
-	}
-
 	private function grow(?Player $player) : bool{
 		$world = $this->position->getWorld();
 		if(!$world->getBlock($this->position->up())->canBeReplaced()){
@@ -126,6 +109,6 @@ final class BambooSapling extends Flowable{
 	}
 
 	public function asItem() : Item{
-		return VanillaBlocks::BAMBOO()->asItem();
+		return VanillaItems::BAMBOO();
 	}
 }
diff --git a/src/block/Barrel.php b/src/block/Barrel.php
index bcd8621ad2..0f0499ab93 100644
--- a/src/block/Barrel.php
+++ b/src/block/Barrel.php
@@ -25,7 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\block\tile\Barrel as TileBarrel;
 use pocketmine\block\utils\AnyFacingTrait;
-use pocketmine\block\utils\BlockDataSerializer;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
@@ -38,17 +38,9 @@ class Barrel extends Opaque{
 
 	protected bool $open = false;
 
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::writeFacing($this->facing) | ($this->open ? BlockLegacyMetadata::BARREL_FLAG_OPEN : 0);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::readFacing($stateMeta & 0x07);
-		$this->open = ($stateMeta & BlockLegacyMetadata::BARREL_FLAG_OPEN) === BlockLegacyMetadata::BARREL_FLAG_OPEN;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->facing($this->facing);
+		$w->bool($this->open);
 	}
 
 	public function isOpen() : bool{
@@ -63,12 +55,12 @@ class Barrel extends Opaque{
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
 		if($player !== null){
-			if(abs($player->getPosition()->getX() - $this->position->getX()) < 2 && abs($player->getPosition()->getZ() - $this->position->getZ()) < 2){
-				$y = $player->getEyePos()->getY();
+			if(abs($player->getPosition()->x - $this->position->x) < 2 && abs($player->getPosition()->z - $this->position->z) < 2){
+				$y = $player->getEyePos()->y;
 
-				if($y - $this->position->getY() > 2){
+				if($y - $this->position->y > 2){
 					$this->facing = Facing::UP;
-				}elseif($this->position->getY() - $y > 0){
+				}elseif($this->position->y - $y > 0){
 					$this->facing = Facing::DOWN;
 				}else{
 					$this->facing = Facing::opposite($player->getHorizontalFacing());
@@ -81,7 +73,7 @@ class Barrel extends Opaque{
 		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($player instanceof Player){
 			$barrel = $this->position->getWorld()->getTile($this->position);
 			if($barrel instanceof TileBarrel){
diff --git a/src/block/BaseBanner.php b/src/block/BaseBanner.php
index 400b8a78ed..6b9e493d19 100644
--- a/src/block/BaseBanner.php
+++ b/src/block/BaseBanner.php
@@ -26,16 +26,14 @@ namespace pocketmine\block;
 use pocketmine\block\tile\Banner as TileBanner;
 use pocketmine\block\utils\BannerPatternLayer;
 use pocketmine\block\utils\ColoredTrait;
-use pocketmine\block\utils\DyeColor;
 use pocketmine\block\utils\SupportType;
-use pocketmine\data\bedrock\DyeColorIdMap;
 use pocketmine\item\Banner as ItemBanner;
 use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
 use pocketmine\world\BlockTransaction;
-use function array_filter;
 use function assert;
 use function count;
 
@@ -48,18 +46,15 @@ abstract class BaseBanner extends Transparent{
 	 */
 	protected array $patterns = [];
 
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->color = DyeColor::BLACK();
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
-
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 		$tile = $this->position->getWorld()->getTile($this->position);
 		if($tile instanceof TileBanner){
 			$this->color = $tile->getBaseColor();
 			$this->setPatterns($tile->getPatterns());
 		}
+
+		return $this;
 	}
 
 	public function writeStateToWorld() : void{
@@ -93,11 +88,12 @@ abstract class BaseBanner extends Transparent{
 	 * @return $this
 	 */
 	public function setPatterns(array $patterns) : self{
-		$checked = array_filter($patterns, fn($v) => $v instanceof BannerPatternLayer);
-		if(count($checked) !== count($patterns)){
-			throw new \TypeError("Deque must only contain " . BannerPatternLayer::class . " objects");
+		foreach($patterns as $pattern){
+			if(!$pattern instanceof BannerPatternLayer){
+				throw new \TypeError("Array must only contain " . BannerPatternLayer::class . " objects");
+			}
 		}
-		$this->patterns = $checked;
+		$this->patterns = $patterns;
 		return $this;
 	}
 
@@ -109,7 +105,7 @@ abstract class BaseBanner extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	private function canBeSupportedBy(Block $block) : bool{
@@ -136,10 +132,6 @@ abstract class BaseBanner extends Transparent{
 		}
 	}
 
-	protected function writeStateToItemMeta() : int{
-		return DyeColorIdMap::getInstance()->toInvertedId($this->color);
-	}
-
 	public function getDropsForCompatibleTool(Item $item) : array{
 		$drop = $this->asItem();
 		if($drop instanceof ItemBanner && count($this->patterns) > 0){
@@ -156,4 +148,8 @@ abstract class BaseBanner extends Transparent{
 		}
 		return $result;
 	}
+
+	public function asItem() : Item{
+		return VanillaItems::BANNER()->setColor($this->color);
+	}
 }
diff --git a/src/block/BaseBigDripleaf.php b/src/block/BaseBigDripleaf.php
new file mode 100644
index 0000000000..f0ff59cf08
--- /dev/null
+++ b/src/block/BaseBigDripleaf.php
@@ -0,0 +1,136 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\HorizontalFacingTrait;
+use pocketmine\block\utils\SupportType;
+use pocketmine\event\block\StructureGrowEvent;
+use pocketmine\item\Fertilizer;
+use pocketmine\item\Item;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\BlockTransaction;
+
+abstract class BaseBigDripleaf extends Transparent{
+	use HorizontalFacingTrait;
+
+	abstract protected function isHead() : bool;
+
+	private function canBeSupportedBy(Block $block, bool $head) : bool{
+		//TODO: Moss block
+		return
+			($block instanceof BaseBigDripleaf && $block->isHead() === $head) ||
+			$block->getTypeId() === BlockTypeIds::CLAY ||
+			$block->hasTypeTag(BlockTypeTags::DIRT) ||
+			$block->hasTypeTag(BlockTypeTags::MUD);
+	}
+
+	public function onNearbyBlockChange() : void{
+		if(
+			(!$this->isHead() && !$this->getSide(Facing::UP) instanceof BaseBigDripleaf) ||
+			!$this->canBeSupportedBy($this->getSide(Facing::DOWN), false)
+		){
+			$this->position->getWorld()->useBreakOn($this->position);
+		}
+	}
+
+	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+		$block = $blockReplace->getSide(Facing::DOWN);
+		if(!$this->canBeSupportedBy($block, true)){
+			return false;
+		}
+		if($player !== null){
+			$this->facing = Facing::opposite($player->getHorizontalFacing());
+		}
+		if($block instanceof BaseBigDripleaf){
+			$this->facing = $block->facing;
+			$tx->addBlock($block->position, VanillaBlocks::BIG_DRIPLEAF_STEM()->setFacing($this->facing));
+		}
+		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($item instanceof Fertilizer && $this->grow($player)){
+			$item->pop();
+			return true;
+		}
+		return false;
+	}
+
+	private function seekToHead() : ?BaseBigDripleaf{
+		if($this->isHead()){
+			return $this;
+		}
+		$step = 1;
+		while(($next = $this->getSide(Facing::UP, $step)) instanceof BaseBigDripleaf){
+			if($next->isHead()){
+				return $next;
+			}
+			$step++;
+		}
+		return null;
+	}
+
+	private function grow(?Player $player) : bool{
+		$head = $this->seekToHead();
+		if($head === null){
+			return false;
+		}
+		$pos = $head->position;
+		$up = $pos->up();
+		$world = $pos->getWorld();
+		if(
+			!$world->isInWorld($up->getFloorX(), $up->getFloorY(), $up->getFloorZ()) ||
+			$world->getBlock($up)->getTypeId() !== BlockTypeIds::AIR
+		){
+			return false;
+		}
+
+		$tx = new BlockTransaction($world);
+
+		$tx->addBlock($pos, VanillaBlocks::BIG_DRIPLEAF_STEM()->setFacing($head->facing));
+		$tx->addBlock($up, VanillaBlocks::BIG_DRIPLEAF_HEAD()->setFacing($head->facing));
+
+		$ev = new StructureGrowEvent($head, $tx, $player);
+		$ev->call();
+
+		if(!$ev->isCancelled()){
+			return $tx->apply();
+		}
+		return false;
+	}
+
+	public function getFlameEncouragement() : int{
+		return 15;
+	}
+
+	public function getFlammability() : int{
+		return 100;
+	}
+
+	public function getSupportType(int $facing) : SupportType{
+		return SupportType::NONE;
+	}
+}
diff --git a/src/block/BaseCake.php b/src/block/BaseCake.php
new file mode 100644
index 0000000000..4b39038402
--- /dev/null
+++ b/src/block/BaseCake.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\block\utils\SupportType;
+use pocketmine\entity\effect\EffectInstance;
+use pocketmine\entity\FoodSource;
+use pocketmine\entity\Living;
+use pocketmine\item\Item;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+
+abstract class BaseCake extends Transparent implements FoodSource{
+	use StaticSupportTrait;
+
+	public function getSupportType(int $facing) : SupportType{
+		return SupportType::NONE;
+	}
+
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getSide(Facing::DOWN)->getTypeId() !== BlockTypeIds::AIR;
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($player !== null){
+			return $player->consumeObject($this);
+		}
+
+		return false;
+	}
+
+	public function getFoodRestore() : int{
+		return 2;
+	}
+
+	public function getSaturationRestore() : float{
+		return 0.4;
+	}
+
+	public function requiresHunger() : bool{
+		return true;
+	}
+
+	/**
+	 * @return EffectInstance[]
+	 */
+	public function getAdditionalEffects() : array{
+		return [];
+	}
+
+	abstract public function getResidue() : Block;
+
+	public function onConsume(Living $consumer) : void{
+		$this->position->getWorld()->setBlock($this->position, $this->getResidue());
+	}
+}
diff --git a/src/block/BaseCoral.php b/src/block/BaseCoral.php
index 0912a85bae..b9c595a97d 100644
--- a/src/block/BaseCoral.php
+++ b/src/block/BaseCoral.php
@@ -23,40 +23,24 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\CoralType;
+use pocketmine\block\utils\BlockEventHelper;
 use pocketmine\block\utils\CoralTypeTrait;
 use pocketmine\block\utils\SupportType;
-use pocketmine\event\block\BlockDeathEvent;
 use pocketmine\item\Item;
+use function mt_rand;
 
 abstract class BaseCoral extends Transparent{
 	use CoralTypeTrait;
 
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		parent::__construct($idInfo, $name, $breakInfo);
-		$this->coralType = CoralType::TUBE();
-	}
-
 	public function onNearbyBlockChange() : void{
 		if(!$this->dead){
-			$world = $this->position->getWorld();
+			$this->position->getWorld()->scheduleDelayedBlockUpdate($this->position, mt_rand(40, 200));
+		}
+	}
 
-			$hasWater = false;
-			foreach($this->position->sides() as $vector3){
-				if($world->getBlock($vector3) instanceof Water){
-					$hasWater = true;
-					break;
-				}
-			}
-
-			//TODO: check water inside the block itself (not supported on the API yet)
-			if(!$hasWater){
-				$ev = new BlockDeathEvent($this, $this->setDead(true));
-				$ev->call();
-				if(!$ev->isCancelled()){
-					$world->setBlock($this->position, $ev->getNewState());
-				}
-			}
+	public function onScheduledUpdate() : void{
+		if(!$this->dead && !$this->isCoveredWithWater()){
+			BlockEventHelper::die($this, (clone $this)->setDead(true));
 		}
 	}
 
@@ -70,9 +54,24 @@ abstract class BaseCoral extends Transparent{
 
 	public function isSolid() : bool{ return false; }
 
+	protected function isCoveredWithWater() : bool{
+		$world = $this->position->getWorld();
+
+		$hasWater = false;
+		foreach($this->position->sides() as $vector3){
+			if($world->getBlock($vector3) instanceof Water){
+				$hasWater = true;
+				break;
+			}
+		}
+
+		//TODO: check water inside the block itself (not supported on the API yet)
+		return $hasWater;
+	}
+
 	protected function recalculateCollisionBoxes() : array{ return []; }
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 }
diff --git a/src/block/BaseFire.php b/src/block/BaseFire.php
new file mode 100644
index 0000000000..2f95ca1a0f
--- /dev/null
+++ b/src/block/BaseFire.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\entity\Entity;
+use pocketmine\entity\projectile\Arrow;
+use pocketmine\event\entity\EntityCombustByBlockEvent;
+use pocketmine\event\entity\EntityDamageByBlockEvent;
+use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\item\Item;
+
+abstract class BaseFire extends Flowable{
+
+	public function hasEntityCollision() : bool{
+		return true;
+	}
+
+	public function canBeReplaced() : bool{
+		return true;
+	}
+
+	public function onEntityInside(Entity $entity) : bool{
+		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, $this->getFireDamage());
+		$entity->attack($ev);
+
+		$ev = new EntityCombustByBlockEvent($this, $entity, 8);
+		if($entity instanceof Arrow){
+			$ev->cancel();
+		}
+		$ev->call();
+		if(!$ev->isCancelled()){
+			$entity->setOnFire($ev->getDuration());
+		}
+		return true;
+	}
+
+	abstract protected function getFireDamage() : int;
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [];
+	}
+}
diff --git a/src/block/BaseRail.php b/src/block/BaseRail.php
index 971beffac7..0bcb2f340b 100644
--- a/src/block/BaseRail.php
+++ b/src/block/BaseRail.php
@@ -38,7 +38,7 @@ use function in_array;
 abstract class BaseRail extends Flowable{
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($blockReplace->getSide(Facing::DOWN)->getSupportType(Facing::UP)->hasEdgeSupport()){
+		if($blockReplace->getAdjacentSupportType(Facing::DOWN)->hasEdgeSupport()){
 			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 		}
 
@@ -222,7 +222,7 @@ abstract class BaseRail extends Flowable{
 
 	public function onNearbyBlockChange() : void{
 		$world = $this->position->getWorld();
-		if(!$this->getSide(Facing::DOWN)->getSupportType(Facing::UP)->hasEdgeSupport()){
+		if(!$this->getAdjacentSupportType(Facing::DOWN)->hasEdgeSupport()){
 			$world->useBreakOn($this->position);
 		}else{
 			foreach($this->getCurrentShapeConnections() as $connection){
diff --git a/src/block/BaseSign.php b/src/block/BaseSign.php
index fec71e58d2..5a905f8b86 100644
--- a/src/block/BaseSign.php
+++ b/src/block/BaseSign.php
@@ -24,35 +24,58 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\tile\Sign as TileSign;
+use pocketmine\block\utils\DyeColor;
 use pocketmine\block\utils\SignText;
 use pocketmine\block\utils\SupportType;
+use pocketmine\block\utils\WoodType;
+use pocketmine\block\utils\WoodTypeTrait;
+use pocketmine\color\Color;
 use pocketmine\event\block\SignChangeEvent;
+use pocketmine\item\Dye;
 use pocketmine\item\Item;
+use pocketmine\item\ItemTypeIds;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
 use pocketmine\utils\TextFormat;
 use pocketmine\world\BlockTransaction;
+use pocketmine\world\sound\DyeUseSound;
+use pocketmine\world\sound\InkSacUseSound;
 use function array_map;
 use function assert;
 use function strlen;
 
 abstract class BaseSign extends Transparent{
+	use WoodTypeTrait;
+
 	protected SignText $text;
+	private bool $waxed = false;
+
 	protected ?int $editorEntityRuntimeId = null;
 
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		parent::__construct($idInfo, $name, $breakInfo);
+	/** @var \Closure() : Item */
+	private \Closure $asItemCallback;
+
+	/**
+	 * @param \Closure() : Item $asItemCallback
+	 */
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockTypeInfo $typeInfo, WoodType $woodType, \Closure $asItemCallback){
+		$this->woodType = $woodType;
+		parent::__construct($idInfo, $name, $typeInfo);
 		$this->text = new SignText();
+		$this->asItemCallback = $asItemCallback;
 	}
 
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 		$tile = $this->position->getWorld()->getTile($this->position);
 		if($tile instanceof TileSign){
 			$this->text = $tile->getText();
+			$this->waxed = $tile->isWaxed();
 			$this->editorEntityRuntimeId = $tile->getEditorEntityRuntimeId();
 		}
+
+		return $this;
 	}
 
 	public function writeStateToWorld() : void{
@@ -60,6 +83,7 @@ abstract class BaseSign extends Transparent{
 		$tile = $this->position->getWorld()->getTile($this->position);
 		assert($tile instanceof TileSign);
 		$tile->setText($this->text);
+		$tile->setWaxed($this->waxed);
 		$tile->setEditorEntityRuntimeId($this->editorEntityRuntimeId);
 	}
 
@@ -79,13 +103,13 @@ abstract class BaseSign extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	abstract protected function getSupportingFace() : int;
 
 	public function onNearbyBlockChange() : void{
-		if($this->getSide($this->getSupportingFace())->getId() === BlockLegacyIds::AIR){
+		if($this->getSide($this->getSupportingFace())->getTypeId() === BlockTypeIds::AIR){
 			$this->position->getWorld()->useBreakOn($this->position);
 		}
 	}
@@ -97,6 +121,85 @@ abstract class BaseSign extends Transparent{
 		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 	}
 
+	public function onPostPlace() : void{
+		$player = $this->editorEntityRuntimeId !== null ?
+			$this->position->getWorld()->getEntity($this->editorEntityRuntimeId) :
+			null;
+		if($player instanceof Player){
+			$player->openSignEditor($this->position);
+		}
+	}
+
+	private function doSignChange(SignText $newText, Player $player, Item $item) : bool{
+		$ev = new SignChangeEvent($this, $player, $newText);
+		$ev->call();
+		if(!$ev->isCancelled()){
+			$this->text = $ev->getNewText();
+			$this->position->getWorld()->setBlock($this->position, $this);
+			$item->pop();
+			return true;
+		}
+
+		return false;
+	}
+
+	private function changeSignGlowingState(bool $glowing, Player $player, Item $item) : bool{
+		if($this->text->isGlowing() !== $glowing && $this->doSignChange(new SignText($this->text->getLines(), $this->text->getBaseColor(), $glowing), $player, $item)){
+			$this->position->getWorld()->addSound($this->position, new InkSacUseSound());
+			return true;
+		}
+		return false;
+	}
+
+	private function wax(Player $player, Item $item) : bool{
+		if($this->waxed){
+			return false;
+		}
+
+		$this->waxed = true;
+		$this->position->getWorld()->setBlock($this->position, $this);
+		$item->pop();
+
+		return true;
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($player === null){
+			return false;
+		}
+		if($this->waxed){
+			return true;
+		}
+
+		$dyeColor = $item instanceof Dye ? $item->getColor() : match($item->getTypeId()){
+			ItemTypeIds::BONE_MEAL => DyeColor::WHITE,
+			ItemTypeIds::LAPIS_LAZULI => DyeColor::BLUE,
+			ItemTypeIds::COCOA_BEANS => DyeColor::BROWN,
+			default => null
+		};
+		if($dyeColor !== null){
+			$color = $dyeColor === DyeColor::BLACK ? new Color(0, 0, 0) : $dyeColor->getRgbValue();
+			if(
+				$color->toARGB() !== $this->text->getBaseColor()->toARGB() &&
+				$this->doSignChange(new SignText($this->text->getLines(), $color, $this->text->isGlowing()), $player, $item)
+			){
+				$this->position->getWorld()->addSound($this->position, new DyeUseSound());
+				return true;
+			}
+		}elseif(match($item->getTypeId()){
+			ItemTypeIds::INK_SAC => $this->changeSignGlowingState(false, $player, $item),
+			ItemTypeIds::GLOW_INK_SAC => $this->changeSignGlowingState(true, $player, $item),
+			ItemTypeIds::HONEYCOMB => $this->wax($player, $item),
+			default => false
+		}){
+			return true;
+		}
+
+		$player->openSignEditor($this->position);
+
+		return true;
+	}
+
 	/**
 	 * Returns an object containing information about the sign text.
 	 */
@@ -110,6 +213,30 @@ abstract class BaseSign extends Transparent{
 		return $this;
 	}
 
+	/**
+	 * Returns whether the sign has been waxed using a honeycomb. If true, the sign cannot be edited by a player.
+	 */
+	public function isWaxed() : bool{ return $this->waxed; }
+
+	/** @return $this */
+	public function setWaxed(bool $waxed) : self{
+		$this->waxed = $waxed;
+		return $this;
+	}
+
+	/**
+	 * Sets the runtime entity ID of the player editing this sign. Only this player will be able to edit the sign.
+	 * This is used to prevent multiple players from editing the same sign at the same time, and to prevent players
+	 * from editing signs they didn't place.
+	 */
+	public function getEditorEntityRuntimeId() : ?int{ return $this->editorEntityRuntimeId; }
+
+	/** @return $this */
+	public function setEditorEntityRuntimeId(?int $editorEntityRuntimeId) : self{
+		$this->editorEntityRuntimeId = $editorEntityRuntimeId;
+		return $this;
+	}
+
 	/**
 	 * Called by the player controller (network session) to update the sign text, firing events as appropriate.
 	 *
@@ -126,17 +253,26 @@ abstract class BaseSign extends Transparent{
 		}
 		$ev = new SignChangeEvent($this, $author, new SignText(array_map(function(string $line) : string{
 			return TextFormat::clean($line, false);
-		}, $text->getLines())));
-		if($this->editorEntityRuntimeId === null || $this->editorEntityRuntimeId !== $author->getId()){
+		}, $text->getLines()), $this->text->getBaseColor(), $this->text->isGlowing()));
+		if($this->waxed || $this->editorEntityRuntimeId !== $author->getId()){
 			$ev->cancel();
 		}
 		$ev->call();
 		if(!$ev->isCancelled()){
 			$this->setText($ev->getNewText());
+			$this->setEditorEntityRuntimeId(null);
 			$this->position->getWorld()->setBlock($this->position, $this);
 			return true;
 		}
 
 		return false;
 	}
+
+	public function asItem() : Item{
+		return ($this->asItemCallback)();
+	}
+
+	public function getFuelTime() : int{
+		return $this->woodType->isFlammable() ? 200 : 0;
+	}
 }
diff --git a/src/block/Bed.php b/src/block/Bed.php
index 7ce2fa70ba..8efbdfe017 100644
--- a/src/block/Bed.php
+++ b/src/block/Bed.php
@@ -24,12 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\tile\Bed as TileBed;
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\ColoredTrait;
 use pocketmine\block\utils\DyeColor;
 use pocketmine\block\utils\HorizontalFacingTrait;
 use pocketmine\block\utils\SupportType;
-use pocketmine\data\bedrock\DyeColorIdMap;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
 use pocketmine\item\Item;
@@ -49,34 +48,23 @@ class Bed extends Transparent{
 	protected bool $occupied = false;
 	protected bool $head = false;
 
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->color = DyeColor::RED();
-		parent::__construct($idInfo, $name, $breakInfo);
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+		$w->bool($this->occupied);
+		$w->bool($this->head);
 	}
 
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::writeLegacyHorizontalFacing($this->facing) |
-			($this->occupied ? BlockLegacyMetadata::BED_FLAG_OCCUPIED : 0) |
-			($this->head ? BlockLegacyMetadata::BED_FLAG_HEAD : 0);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::readLegacyHorizontalFacing($stateMeta & 0x03);
-		$this->occupied = ($stateMeta & BlockLegacyMetadata::BED_FLAG_OCCUPIED) !== 0;
-		$this->head = ($stateMeta & BlockLegacyMetadata::BED_FLAG_HEAD) !== 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 		//read extra state information from the tile - this is an ugly hack
 		$tile = $this->position->getWorld()->getTile($this->position);
 		if($tile instanceof TileBed){
 			$this->color = $tile->getColor();
+		}else{
+			$this->color = DyeColor::RED; //legacy pre-1.1 beds don't have tiles
 		}
+
+		return $this;
 	}
 
 	public function writeStateToWorld() : void{
@@ -96,7 +84,7 @@ class Bed extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	public function isHeadPart() : bool{
@@ -132,7 +120,7 @@ class Bed extends Transparent{
 		return null;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($player !== null){
 			$other = $this->getOtherHalf();
 			$playerPos = $player->getPosition();
@@ -157,7 +145,7 @@ class Bed extends Transparent{
 
 			$b = ($this->isHeadPart() ? $this : $other);
 
-			if($b->isOccupied()){
+			if($b->occupied){
 				$player->sendMessage(KnownTranslationFactory::tile_bed_occupied()->prefix(TextFormat::GRAY));
 
 				return true;
@@ -186,11 +174,11 @@ class Bed extends Transparent{
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($this->canBeSupportedBy($this->getSide(Facing::DOWN))){
+		if($this->canBeSupportedAt($blockReplace)){
 			$this->facing = $player !== null ? $player->getHorizontalFacing() : Facing::NORTH;
 
 			$next = $this->getSide($this->getOtherHalfSide());
-			if($next->canBeReplaced() && $this->canBeSupportedBy($next->getSide(Facing::DOWN))){
+			if($next->canBeReplaced() && $this->canBeSupportedAt($next)){
 				$nextState = clone $this;
 				$nextState->head = true;
 				$tx->addBlock($blockReplace->position, $this)->addBlock($next->position, $nextState);
@@ -209,10 +197,6 @@ class Bed extends Transparent{
 		return [];
 	}
 
-	protected function writeStateToItemMeta() : int{
-		return DyeColorIdMap::getInstance()->toId($this->color);
-	}
-
 	public function getAffectedBlocks() : array{
 		if(($other = $this->getOtherHalf()) !== null){
 			return [$this, $other];
@@ -221,7 +205,9 @@ class Bed extends Transparent{
 		return parent::getAffectedBlocks();
 	}
 
-	private function canBeSupportedBy(Block $block) : bool{
-		return !$block->getSupportType(Facing::UP)->equals(SupportType::NONE());
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getAdjacentSupportType(Facing::DOWN) !== SupportType::NONE;
 	}
+
+	public function getMaxStackSize() : int{ return 1; }
 }
diff --git a/src/block/Bedrock.php b/src/block/Bedrock.php
index 3bb42560f3..e568986914 100644
--- a/src/block/Bedrock.php
+++ b/src/block/Bedrock.php
@@ -23,20 +23,13 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-class Bedrock extends Opaque{
+use pocketmine\data\runtime\RuntimeDataDescriber;
 
+class Bedrock extends Opaque{
 	private bool $burnsForever = false;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->burnsForever = ($stateMeta & BlockLegacyMetadata::BEDROCK_FLAG_INFINIBURN) !== 0;
-	}
-
-	protected function writeStateToMeta() : int{
-		return $this->burnsForever ? BlockLegacyMetadata::BEDROCK_FLAG_INFINIBURN : 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->bool($this->burnsForever);
 	}
 
 	public function burnsForever() : bool{
diff --git a/src/block/Beetroot.php b/src/block/Beetroot.php
index 5afbe44125..cf92fdda20 100644
--- a/src/block/Beetroot.php
+++ b/src/block/Beetroot.php
@@ -23,9 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\FortuneDropHelper;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
-use function mt_rand;
 
 class Beetroot extends Crops{
 
@@ -33,7 +33,7 @@ class Beetroot extends Crops{
 		if($this->age >= self::MAX_AGE){
 			return [
 				VanillaItems::BEETROOT(),
-				VanillaItems::BEETROOT_SEEDS()->setCount(mt_rand(0, 3))
+				VanillaItems::BEETROOT_SEEDS()->setCount(FortuneDropHelper::binomial($item, 0))
 			];
 		}
 
@@ -42,7 +42,7 @@ class Beetroot extends Crops{
 		];
 	}
 
-	public function getPickedItem(bool $addUserData = false) : Item{
+	public function asItem() : Item{
 		return VanillaItems::BEETROOT_SEEDS();
 	}
 }
diff --git a/src/block/Bell.php b/src/block/Bell.php
index 00a53a9bea..53a6fc7fbb 100644
--- a/src/block/Bell.php
+++ b/src/block/Bell.php
@@ -25,68 +25,36 @@ namespace pocketmine\block;
 
 use pocketmine\block\tile\Bell as TileBell;
 use pocketmine\block\utils\BellAttachmentType;
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\HorizontalFacingTrait;
-use pocketmine\block\utils\InvalidBlockStateException;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\entity\projectile\Projectile;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
+use pocketmine\math\RayTraceResult;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
-use pocketmine\utils\AssumptionFailedError;
 use pocketmine\world\BlockTransaction;
 use pocketmine\world\sound\BellRingSound;
 
 final class Bell extends Transparent{
 	use HorizontalFacingTrait;
 
-	private BellAttachmentType $attachmentType;
+	private BellAttachmentType $attachmentType = BellAttachmentType::FLOOR;
 
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->attachmentType = BellAttachmentType::FLOOR();
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->setFacing(BlockDataSerializer::readLegacyHorizontalFacing($stateMeta & 0x03));
-
-		$attachmentType = [
-			BlockLegacyMetadata::BELL_ATTACHMENT_FLOOR => BellAttachmentType::FLOOR(),
-			BlockLegacyMetadata::BELL_ATTACHMENT_CEILING => BellAttachmentType::CEILING(),
-			BlockLegacyMetadata::BELL_ATTACHMENT_ONE_WALL => BellAttachmentType::ONE_WALL(),
-			BlockLegacyMetadata::BELL_ATTACHMENT_TWO_WALLS => BellAttachmentType::TWO_WALLS()
-		][($stateMeta >> 2) & 0b11] ?? null;
-		if($attachmentType === null){
-			throw new InvalidBlockStateException("No such attachment type");
-		}
-		$this->setAttachmentType($attachmentType);
-	}
-
-	public function writeStateToMeta() : int{
-		$attachmentTypeMeta = [
-			BellAttachmentType::FLOOR()->id() => BlockLegacyMetadata::BELL_ATTACHMENT_FLOOR,
-			BellAttachmentType::CEILING()->id() => BlockLegacyMetadata::BELL_ATTACHMENT_CEILING,
-			BellAttachmentType::ONE_WALL()->id() => BlockLegacyMetadata::BELL_ATTACHMENT_ONE_WALL,
-			BellAttachmentType::TWO_WALLS()->id() => BlockLegacyMetadata::BELL_ATTACHMENT_TWO_WALLS
-		][$this->getAttachmentType()->id()] ?? null;
-		if($attachmentTypeMeta === null){
-			throw new AssumptionFailedError("Mapping should cover all cases");
-		}
-		return BlockDataSerializer::writeLegacyHorizontalFacing($this->getFacing()) | ($attachmentTypeMeta << 2);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->attachmentType);
+		$w->horizontalFacing($this->facing);
 	}
 
 	protected function recalculateCollisionBoxes() : array{
-		if($this->attachmentType->equals(BellAttachmentType::FLOOR())){
+		if($this->attachmentType === BellAttachmentType::FLOOR){
 			return [
 				AxisAlignedBB::one()->squash(Facing::axis($this->facing), 1 / 4)->trim(Facing::UP, 3 / 16)
 			];
 		}
-		if($this->attachmentType->equals(BellAttachmentType::CEILING())){
+		if($this->attachmentType === BellAttachmentType::CEILING){
 			return [
 				AxisAlignedBB::one()->contract(1 / 4, 0, 1 / 4)->trim(Facing::DOWN, 1 / 4)
 			];
@@ -98,12 +66,12 @@ final class Bell extends Transparent{
 			->trim(Facing::DOWN, 1 / 4);
 
 		return [
-			$this->attachmentType->equals(BellAttachmentType::ONE_WALL()) ? $box->trim($this->facing, 3 / 16) : $box
+			$this->attachmentType === BellAttachmentType::ONE_WALL ? $box->trim($this->facing, 3 / 16) : $box
 		];
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	public function getAttachmentType() : BellAttachmentType{ return $this->attachmentType; }
@@ -114,60 +82,50 @@ final class Bell extends Transparent{
 		return $this;
 	}
 
-	private function canBeSupportedBy(Block $block, int $face) : bool{
-		return !$block->getSupportType($face)->equals(SupportType::NONE());
+	private function canBeSupportedAt(Block $block, int $face) : bool{
+		return $block->getAdjacentSupportType($face) !== SupportType::NONE;
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+		if(!$this->canBeSupportedAt($blockReplace, Facing::opposite($face))){
+			return false;
+		}
 		if($face === Facing::UP){
-			if(!$this->canBeSupportedBy($tx->fetchBlock($this->position->down()), Facing::UP)){
-				return false;
-			}
 			if($player !== null){
 				$this->setFacing(Facing::opposite($player->getHorizontalFacing()));
 			}
-			$this->setAttachmentType(BellAttachmentType::FLOOR());
+			$this->setAttachmentType(BellAttachmentType::FLOOR);
 		}elseif($face === Facing::DOWN){
-			if(!$this->canBeSupportedBy($tx->fetchBlock($this->position->up()), Facing::DOWN)){
-				return false;
-			}
-			$this->setAttachmentType(BellAttachmentType::CEILING());
+			$this->setAttachmentType(BellAttachmentType::CEILING);
 		}else{
 			$this->setFacing($face);
-			if($this->canBeSupportedBy($tx->fetchBlock($this->position->getSide(Facing::opposite($face))), $face)){
-				$this->setAttachmentType(BellAttachmentType::ONE_WALL());
-			}else{
-				return false;
-			}
-			if($this->canBeSupportedBy($tx->fetchBlock($this->position->getSide($face)), Facing::opposite($face))){
-				$this->setAttachmentType(BellAttachmentType::TWO_WALLS());
-			}
+			$this->setAttachmentType(
+				$this->canBeSupportedAt($blockReplace, $face) ?
+					BellAttachmentType::TWO_WALLS :
+					BellAttachmentType::ONE_WALL
+			);
 		}
 		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 	}
 
 	public function onNearbyBlockChange() : void{
-		if(
-			($this->attachmentType->equals(BellAttachmentType::CEILING()) && !$this->canBeSupportedBy($this->getSide(Facing::UP), Facing::DOWN)) ||
-			($this->attachmentType->equals(BellAttachmentType::FLOOR()) && !$this->canBeSupportedBy($this->getSide(Facing::DOWN), Facing::UP)) ||
-			($this->attachmentType->equals(BellAttachmentType::ONE_WALL()) && !$this->canBeSupportedBy($this->getSide(Facing::opposite($this->facing)), $this->facing)) ||
-			($this->attachmentType->equals(BellAttachmentType::TWO_WALLS()) && (!$this->canBeSupportedBy($this->getSide($this->facing), Facing::opposite($this->facing)) || !$this->canBeSupportedBy($this->getSide(Facing::opposite($this->facing)), $this->facing)))
-		){
-			$this->position->getWorld()->useBreakOn($this->position);
+		foreach(match($this->attachmentType){
+			BellAttachmentType::CEILING => [Facing::UP],
+			BellAttachmentType::FLOOR => [Facing::DOWN],
+			BellAttachmentType::ONE_WALL => [Facing::opposite($this->facing)],
+			BellAttachmentType::TWO_WALLS => [$this->facing, Facing::opposite($this->facing)]
+		} as $supportBlockDirection){
+			if(!$this->canBeSupportedAt($this, $supportBlockDirection)){
+				$this->position->getWorld()->useBreakOn($this->position);
+				break;
+			}
 		}
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($player !== null){
 			$faceHit = Facing::opposite($player->getHorizontalFacing());
-			if(
-				$this->attachmentType->equals(BellAttachmentType::CEILING()) ||
-				($this->attachmentType->equals(BellAttachmentType::FLOOR()) && Facing::axis($faceHit) === Facing::axis($this->facing)) ||
-				(
-					($this->attachmentType->equals(BellAttachmentType::ONE_WALL()) || $this->attachmentType->equals(BellAttachmentType::TWO_WALLS())) &&
-					($faceHit === Facing::rotateY($this->facing, false) || $faceHit === Facing::rotateY($this->facing, true))
-				)
-			){
+			if($this->isValidFaceToRing($faceHit)){
 				$this->ring($faceHit);
 				return true;
 			}
@@ -176,6 +134,13 @@ final class Bell extends Transparent{
 		return false;
 	}
 
+	public function onProjectileHit(Projectile $projectile, RayTraceResult $hitResult) : void{
+		$faceHit = Facing::opposite($projectile->getHorizontalFacing());
+		if($this->isValidFaceToRing($faceHit)){
+			$this->ring($faceHit);
+		}
+	}
+
 	public function ring(int $faceHit) : void{
 		$world = $this->position->getWorld();
 		$world->addSound($this->position, new BellRingSound());
@@ -184,4 +149,16 @@ final class Bell extends Transparent{
 			$world->broadcastPacketToViewers($this->position, $tile->createFakeUpdatePacket($faceHit));
 		}
 	}
+
+	public function getDropsForIncompatibleTool(Item $item) : array{
+		return [$this->asItem()];
+	}
+
+	private function isValidFaceToRing(int $faceHit) : bool{
+		return match($this->attachmentType){
+			BellAttachmentType::CEILING => true,
+			BellAttachmentType::FLOOR => Facing::axis($faceHit) === Facing::axis($this->facing),
+			BellAttachmentType::ONE_WALL, BellAttachmentType::TWO_WALLS => $faceHit === Facing::rotateY($this->facing, false) || $faceHit === Facing::rotateY($this->facing, true),
+		};
+	}
 }
diff --git a/src/block/BigDripleafHead.php b/src/block/BigDripleafHead.php
new file mode 100644
index 0000000000..a9b87bf7f7
--- /dev/null
+++ b/src/block/BigDripleafHead.php
@@ -0,0 +1,125 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\DripleafState;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\entity\Entity;
+use pocketmine\entity\projectile\Projectile;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
+use pocketmine\math\RayTraceResult;
+use pocketmine\world\sound\DripleafTiltDownSound;
+use pocketmine\world\sound\DripleafTiltUpSound;
+
+class BigDripleafHead extends BaseBigDripleaf{
+
+	protected DripleafState $leafState = DripleafState::STABLE;
+
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		parent::describeBlockOnlyState($w);
+		$w->enum($this->leafState);
+	}
+
+	protected function isHead() : bool{
+		return true;
+	}
+
+	public function getLeafState() : DripleafState{
+		return $this->leafState;
+	}
+
+	/** @return $this */
+	public function setLeafState(DripleafState $leafState) : self{
+		$this->leafState = $leafState;
+		return $this;
+	}
+
+	public function hasEntityCollision() : bool{
+		return true;
+	}
+
+	private function setTiltAndScheduleTick(DripleafState $tilt) : void{
+		$this->position->getWorld()->setBlock($this->position, $this->setLeafState($tilt));
+		$delay = $tilt->getScheduledUpdateDelayTicks();
+		if($delay !== null){
+			$this->position->getWorld()->scheduleDelayedBlockUpdate($this->position, $delay);
+		}
+	}
+
+	private function getLeafTopOffset() : float{
+		return match($this->leafState){
+			DripleafState::STABLE, DripleafState::UNSTABLE => 1 / 16,
+			DripleafState::PARTIAL_TILT => 3 / 16,
+			default => 0
+		};
+	}
+
+	public function onEntityInside(Entity $entity) : bool{
+		if(!$entity instanceof Projectile && $this->leafState === DripleafState::STABLE){
+			//the entity must be standing on top of the leaf - do not collapse if the entity is standing underneath
+			$intersection = AxisAlignedBB::one()
+				->offset($this->position->x, $this->position->y, $this->position->z)
+				->trim(Facing::DOWN, 1 - $this->getLeafTopOffset());
+			if($entity->getBoundingBox()->intersectsWith($intersection)){
+				$this->setTiltAndScheduleTick(DripleafState::UNSTABLE);
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public function onProjectileHit(Projectile $projectile, RayTraceResult $hitResult) : void{
+		if($this->leafState !== DripleafState::FULL_TILT){
+			$this->setTiltAndScheduleTick(DripleafState::FULL_TILT);
+			$this->position->getWorld()->addSound($this->position, new DripleafTiltDownSound());
+		}
+	}
+
+	public function onScheduledUpdate() : void{
+		if($this->leafState !== DripleafState::STABLE){
+			if($this->leafState === DripleafState::FULL_TILT){
+				$this->position->getWorld()->setBlock($this->position, $this->setLeafState(DripleafState::STABLE));
+				$this->position->getWorld()->addSound($this->position, new DripleafTiltUpSound());
+			}else{
+				$this->setTiltAndScheduleTick(match($this->leafState){
+					DripleafState::UNSTABLE => DripleafState::PARTIAL_TILT,
+					DripleafState::PARTIAL_TILT => DripleafState::FULL_TILT,
+				});
+				$this->position->getWorld()->addSound($this->position, new DripleafTiltDownSound());
+			}
+		}
+	}
+
+	protected function recalculateCollisionBoxes() : array{
+		if($this->leafState !== DripleafState::FULL_TILT){
+			return [
+				AxisAlignedBB::one()
+					->trim(Facing::DOWN, 11 / 16)
+					->trim(Facing::UP, $this->getLeafTopOffset())
+			];
+		}
+		return [];
+	}
+}
diff --git a/src/block/BigDripleafStem.php b/src/block/BigDripleafStem.php
new file mode 100644
index 0000000000..d44c47ccbe
--- /dev/null
+++ b/src/block/BigDripleafStem.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+
+class BigDripleafStem extends BaseBigDripleaf{
+
+	protected function isHead() : bool{
+		return false;
+	}
+
+	protected function recalculateCollisionBoxes() : array{
+		return [];
+	}
+
+	public function asItem() : Item{
+		return VanillaBlocks::BIG_DRIPLEAF_HEAD()->asItem();
+	}
+}
diff --git a/src/block/Block.php b/src/block/Block.php
index 625509be40..89fe392658 100644
--- a/src/block/Block.php
+++ b/src/block/Block.php
@@ -28,50 +28,101 @@ namespace pocketmine\block;
 
 use pocketmine\block\tile\Spawnable;
 use pocketmine\block\tile\Tile;
-use pocketmine\block\utils\InvalidBlockStateException;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\InvalidSerializedRuntimeDataException;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\data\runtime\RuntimeDataReader;
+use pocketmine\data\runtime\RuntimeDataSizeCalculator;
+use pocketmine\data\runtime\RuntimeDataWriter;
 use pocketmine\entity\Entity;
+use pocketmine\entity\projectile\Projectile;
+use pocketmine\item\enchantment\AvailableEnchantmentRegistry;
+use pocketmine\item\enchantment\ItemEnchantmentTagRegistry;
+use pocketmine\item\enchantment\ItemEnchantmentTags;
 use pocketmine\item\enchantment\VanillaEnchantments;
 use pocketmine\item\Item;
-use pocketmine\item\ItemFactory;
-use pocketmine\math\Axis;
+use pocketmine\item\ItemBlock;
 use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
 use pocketmine\math\RayTraceResult;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\player\Player;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Binary;
 use pocketmine\world\BlockTransaction;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\Position;
 use pocketmine\world\World;
-use function assert;
 use function count;
-use function dechex;
+use function get_class;
+use function hash;
 use const PHP_INT_MAX;
 
 class Block{
-	public const INTERNAL_METADATA_BITS = 4;
-	public const INTERNAL_METADATA_MASK = ~(~0 << self::INTERNAL_METADATA_BITS);
+	public const INTERNAL_STATE_DATA_BITS = 11;
+	public const INTERNAL_STATE_DATA_MASK = ~(~0 << self::INTERNAL_STATE_DATA_BITS);
+
+	/**
+	 * @internal
+	 * Hardcoded int is `Binary::readLong(hash('xxh3', Binary::writeLLong(BlockTypeIds::AIR), binary: true))`
+	 * TODO: it would be much easier if we could just make this 0 or some other easy value
+	 */
+	public const EMPTY_STATE_ID = (BlockTypeIds::AIR << self::INTERNAL_STATE_DATA_BITS) | (-7482769108513497636 & self::INTERNAL_STATE_DATA_MASK);
 
 	protected BlockIdentifier $idInfo;
 	protected string $fallbackName;
-	protected BlockBreakInfo $breakInfo;
+	protected BlockTypeInfo $typeInfo;
 	protected Position $position;
 
 	/** @var AxisAlignedBB[]|null */
 	protected ?array $collisionBoxes = null;
 
+	private int $requiredBlockItemStateDataBits;
+	private int $requiredBlockOnlyStateDataBits;
+
+	private Block $defaultState;
+
+	private int $stateIdXorMask;
+
+	/**
+	 * Computes the mask to be XOR'd with the state data.
+	 * This is to improve distribution of the state data bits, which occupy the least significant bits of the state ID.
+	 * Improved distribution improves PHP array performance when using the state ID as a key, as PHP arrays use some of
+	 * the lower bits of integer keys directly without hashing.
+	 *
+	 * The type ID is included in the XOR mask. This is not necessary to improve distribution, but it reduces the number
+	 * of operations required to compute the state ID (micro optimization).
+	 */
+	private static function computeStateIdXorMask(int $typeId) : int{
+		return
+			$typeId << self::INTERNAL_STATE_DATA_BITS |
+			(Binary::readLong(hash('xxh3', Binary::writeLLong($typeId), binary: true)) & self::INTERNAL_STATE_DATA_MASK);
+	}
+
 	/**
 	 * @param string $name English name of the block type (TODO: implement translations)
 	 */
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		if(($idInfo->getVariant() & $this->getStateBitmask()) !== 0){
-			throw new \InvalidArgumentException("Variant 0x" . dechex($idInfo->getVariant()) . " collides with state bitmask 0x" . dechex($this->getStateBitmask()));
-		}
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockTypeInfo $typeInfo){
 		$this->idInfo = $idInfo;
 		$this->fallbackName = $name;
-		$this->breakInfo = $breakInfo;
+		$this->typeInfo = $typeInfo;
 		$this->position = new Position(0, 0, 0, null);
+
+		$calculator = new RuntimeDataSizeCalculator();
+		$this->describeBlockItemState($calculator);
+		$this->requiredBlockItemStateDataBits = $calculator->getBitsUsed();
+
+		$calculator = new RuntimeDataSizeCalculator();
+		$this->describeBlockOnlyState($calculator);
+		$this->requiredBlockOnlyStateDataBits = $calculator->getBitsUsed();
+
+		$this->stateIdXorMask = self::computeStateIdXorMask($idInfo->getBlockTypeId());
+
+		//this must be done last, otherwise the defaultState could have uninitialized fields
+		$defaultState = clone $this;
+		$this->defaultState = $defaultState;
+		$defaultState->defaultState = $defaultState;
 	}
 
 	public function __clone(){
@@ -79,8 +130,8 @@ class Block{
 	}
 
 	/**
-	 * Returns an object containing information about how to identify and store this block type, such as its legacy
-	 * numeric ID(s), tile type (if any), and legacy variant metadata.
+	 * Returns an object containing information about how to identify and store this block type, such as type ID and
+	 * tile type (if any).
 	 */
 	public function getIdInfo() : BlockIdentifier{
 		return $this->idInfo;
@@ -94,12 +145,16 @@ class Block{
 	}
 
 	/**
-	 * @deprecated
+	 * Returns a type ID that identifies this type of block. This allows comparing basic block types, e.g. wool, stone,
+	 * glass, etc. Type ID will not change for a given block type.
 	 *
-	 * Returns the legacy numeric Minecraft block ID.
+	 * Information such as colour, powered, open/closed, etc. is **not** included in this ID.
+	 * If you want to get a state ID that includes this information, use {@link Block::getStateId()} instead.
+	 *
+	 * @see BlockTypeIds
 	 */
-	public function getId() : int{
-		return $this->idInfo->getBlockId();
+	public function getTypeId() : int{
+		return $this->idInfo->getBlockTypeId();
 	}
 
 	/**
@@ -108,68 +163,210 @@ class Block{
 	 * Returns the full blockstate ID of this block. This is a compact way of representing a blockstate used to store
 	 * blocks in chunks at runtime.
 	 *
-	 * This ID can be used to later obtain a copy of this block using {@link BlockFactory::get()}.
+	 * This usually encodes all properties of the block, such as facing, open/closed, powered/unpowered, colour, etc.
+	 * State ID may change depending on the properties of the block (e.g. a torch facing east will have a different
+	 * state ID to one facing west).
+	 *
+	 * Some blocks (such as signs and chests) may store additional properties in an associated "tile" if they
+	 * have too many possible values to be encoded into the state ID. These extra properties are **NOT** included in
+	 * this function's result.
+	 *
+	 * This ID can be used to later obtain a copy of the block with the same state properties by using
+	 * {@link RuntimeBlockStateRegistry::fromStateId()}.
 	 */
-	public function getFullId() : int{
-		return ($this->getId() << self::INTERNAL_METADATA_BITS) | $this->getMeta();
+	public function getStateId() : int{
+		return $this->encodeFullState() ^ $this->stateIdXorMask;
+	}
+
+	/**
+	 * Returns whether the given block has the same type ID as this one.
+	 */
+	public function hasSameTypeId(Block $other) : bool{
+		return $this->getTypeId() === $other->getTypeId();
+	}
+
+	/**
+	 * Returns whether the given block has the same type and properties as this block.
+	 *
+	 * Note: Tile data (e.g. sign text, chest contents) are not compared here.
+	 */
+	public function isSameState(Block $other) : bool{
+		return $this->getStateId() === $other->getStateId();
+	}
+
+	/**
+	 * @return string[]
+	 */
+	public function getTypeTags() : array{
+		return $this->typeInfo->getTypeTags();
+	}
+
+	/**
+	 * Returns whether this block type has the given type tag. Type tags are used as a dynamic way to tag blocks as
+	 * having certain properties, allowing type checks which are more dynamic than hardcoding a bunch of IDs or a bunch
+	 * of instanceof checks.
+	 *
+	 * For example, grass blocks, dirt, farmland, podzol and mycelium are all dirt-like blocks, and support the
+	 * placement of blocks like flowers, so they have a common tag which allows them to be identified as such.
+	 */
+	public function hasTypeTag(string $tag) : bool{
+		return $this->typeInfo->hasTypeTag($tag);
 	}
 
 	/**
 	 * Returns the block as an item.
-	 * State information such as facing, powered/unpowered, open/closed, etc., is discarded.
-	 * Type information such as colour, wood type, etc. is preserved.
+	 * Block-only state such as facing, powered/unpowered, open/closed, etc., is discarded.
+	 * Block-item state such as colour, wood type, etc. is preserved.
+	 * Complex state properties stored in the tile data (e.g. inventory) are discarded.
 	 */
 	public function asItem() : Item{
-		return ItemFactory::getInstance()->get(
-			$this->idInfo->getItemId(),
-			$this->idInfo->getVariant() | $this->writeStateToItemMeta()
-		);
+		$normalized = clone $this->defaultState;
+		$normalized->decodeBlockItemState($this->encodeBlockItemState());
+		return new ItemBlock($normalized);
+	}
+
+	private function decodeBlockItemState(int $data) : void{
+		$reader = new RuntimeDataReader($this->requiredBlockItemStateDataBits, $data);
+
+		$this->describeBlockItemState($reader);
+		$readBits = $reader->getOffset();
+		if($this->requiredBlockItemStateDataBits !== $readBits){
+			throw new \LogicException(get_class($this) . ": Exactly $this->requiredBlockItemStateDataBits bits of block-item state data were provided, but $readBits were read");
+		}
+	}
+
+	private function decodeBlockOnlyState(int $data) : void{
+		$reader = new RuntimeDataReader($this->requiredBlockOnlyStateDataBits, $data);
+
+		$this->describeBlockOnlyState($reader);
+		$readBits = $reader->getOffset();
+		if($this->requiredBlockOnlyStateDataBits !== $readBits){
+			throw new \LogicException(get_class($this) . ": Exactly $this->requiredBlockOnlyStateDataBits bits of block-only state data were provided, but $readBits were read");
+		}
+	}
+
+	private function encodeBlockItemState() : int{
+		$writer = new RuntimeDataWriter($this->requiredBlockItemStateDataBits);
+
+		$this->describeBlockItemState($writer);
+		$writtenBits = $writer->getOffset();
+		if($this->requiredBlockItemStateDataBits !== $writtenBits){
+			throw new \LogicException(get_class($this) . ": Exactly $this->requiredBlockItemStateDataBits bits of block-item state data were expected, but $writtenBits were written");
+		}
+
+		return $writer->getValue();
+	}
+
+	private function encodeBlockOnlyState() : int{
+		$writer = new RuntimeDataWriter($this->requiredBlockOnlyStateDataBits);
+
+		$this->describeBlockOnlyState($writer);
+		$writtenBits = $writer->getOffset();
+		if($this->requiredBlockOnlyStateDataBits !== $writtenBits){
+			throw new \LogicException(get_class($this) . ": Exactly $this->requiredBlockOnlyStateDataBits bits of block-only state data were expected, but $writtenBits were written");
+		}
+
+		return $writer->getValue();
+	}
+
+	private function encodeFullState() : int{
+		$blockItemBits = $this->requiredBlockItemStateDataBits;
+		$blockOnlyBits = $this->requiredBlockOnlyStateDataBits;
+
+		if($blockOnlyBits === 0 && $blockItemBits === 0){
+			return 0;
+		}
+
+		$result = 0;
+		if($blockItemBits > 0){
+			$result |= $this->encodeBlockItemState();
+		}
+		if($blockOnlyBits > 0){
+			$result |= $this->encodeBlockOnlyState() << $blockItemBits;
+		}
+
+		return $result;
 	}
 
 	/**
-	 * @deprecated
+	 * Describes properties of this block which apply to both the block and item form of the block.
+	 * Examples of suitable properties include colour, skull type, and any other information which **IS** kept when the
+	 * block is mined or block-picked.
 	 *
-	 * Returns the legacy Minecraft block meta value. This is a mixed-purpose value, which is used to store different
-	 * things for different blocks.
+	 * The method implementation must NOT use conditional logic to determine which properties are written. It must
+	 * always write the same properties in the same order, regardless of the current state of the block.
 	 */
-	public function getMeta() : int{
-		$stateMeta = $this->writeStateToMeta();
-		assert(($stateMeta & ~$this->getStateBitmask()) === 0);
-		return $this->idInfo->getVariant() | $stateMeta;
-	}
-
-	protected function writeStateToItemMeta() : int{
-		return 0;
-	}
-
-	/**
-	 * Returns a bitmask used to extract state bits from block metadata.
-	 * This is used to remove unwanted information from the legacy meta value when getting the block as an item.
-	 */
-	public function getStateBitmask() : int{
-		return 0;
-	}
-
-	protected function writeStateToMeta() : int{
-		return 0;
-	}
-
-	/**
-	 * @throws InvalidBlockStateException
-	 */
-	public function readStateFromData(int $id, int $stateMeta) : void{
+	public function describeBlockItemState(RuntimeDataDescriber $w) : void{
 		//NOOP
 	}
 
 	/**
-	 * Called when this block is created, set, or has a neighbouring block update, to re-detect dynamic properties which
-	 * are not saved on the world.
+	 * Describes properties of this block which apply only to the block form of the block.
+	 * Examples of suitable properties include facing, open/closed, powered/unpowered, on/off, and any other information
+	 * which **IS NOT** kept when the block is mined or block-picked.
 	 *
-	 * Clears any cached precomputed objects, such as bounding boxes. Remove any outdated precomputed things such as
-	 * AABBs and force recalculation.
+	 * The method implementation must NOT use conditional logic to determine which properties are written. It must
+	 * always write the same properties in the same order, regardless of the current state of the block.
 	 */
-	public function readStateFromWorld() : void{
-		$this->collisionBoxes = null;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		//NOOP
+	}
+
+	/**
+	 * Generates copies of this Block in all possible state permutations.
+	 * Every possible combination of known properties (e.g. facing, open/closed, powered/unpowered, on/off) will be
+	 * generated.
+	 *
+	 * @phpstan-return \Generator<int, Block, void, void>
+	 */
+	public function generateStatePermutations() : \Generator{
+		//TODO: this bruteforce approach to discovering all valid states is very inefficient for larger state data sizes
+		//at some point we'll need to find a better way to do this
+		$bits = $this->requiredBlockItemStateDataBits + $this->requiredBlockOnlyStateDataBits;
+		if($bits > Block::INTERNAL_STATE_DATA_BITS){
+			throw new \LogicException("Block state data cannot use more than " . Block::INTERNAL_STATE_DATA_BITS . " bits");
+		}
+		for($blockItemStateData = 0; $blockItemStateData < (1 << $this->requiredBlockItemStateDataBits); ++$blockItemStateData){
+			$withType = clone $this;
+			try{
+				$withType->decodeBlockItemState($blockItemStateData);
+				$encoded = $withType->encodeBlockItemState();
+				if($encoded !== $blockItemStateData){
+					throw new \LogicException(static::class . "::decodeBlockItemState() accepts invalid inputs (returned $encoded for input $blockItemStateData)");
+				}
+			}catch(InvalidSerializedRuntimeDataException){ //invalid property combination, leave it
+				continue;
+			}
+
+			for($blockOnlyStateData = 0; $blockOnlyStateData < (1 << $this->requiredBlockOnlyStateDataBits); ++$blockOnlyStateData){
+				$withState = clone $withType;
+				try{
+					$withState->decodeBlockOnlyState($blockOnlyStateData);
+					$encoded = $withState->encodeBlockOnlyState();
+					if($encoded !== $blockOnlyStateData){
+						throw new \LogicException(static::class . "::decodeBlockOnlyState() accepts invalid inputs (returned $encoded for input $blockOnlyStateData)");
+					}
+				}catch(InvalidSerializedRuntimeDataException){ //invalid property combination, leave it
+					continue;
+				}
+
+				yield $withState;
+			}
+		}
+	}
+
+	/**
+	 * Called when this block is created, set, or has a neighbouring block update, to re-detect dynamic properties which
+	 * are not saved in the blockstate ID.
+	 * If any such properties are updated, don't forget to clear things like AABB caches if necessary.
+	 *
+	 * A replacement block may be returned. This is useful if the block type changed due to reading of world data (e.g.
+	 * data from a block entity).
+	 *
+	 * @phpstan-impure
+	 */
+	public function readStateFromWorld() : Block{
+		return $this;
 	}
 
 	/**
@@ -180,7 +377,11 @@ class Block{
 	 */
 	public function writeStateToWorld() : void{
 		$world = $this->position->getWorld();
-		$world->getOrLoadChunkAtPosition($this->position)->setFullBlock($this->position->x & Chunk::COORD_MASK, $this->position->y, $this->position->z & Chunk::COORD_MASK, $this->getFullId());
+		$chunk = $world->getOrLoadChunkAtPosition($this->position);
+		if($chunk === null){
+			throw new AssumptionFailedError("World::setBlock() should have loaded the chunk before calling this method");
+		}
+		$chunk->setBlockStateId($this->position->x & Chunk::COORD_MASK, $this->position->y, $this->position->z & Chunk::COORD_MASK, $this->getStateId());
 
 		$tileType = $this->idInfo->getTileClass();
 		$oldTile = $world->getTile($this->position);
@@ -203,32 +404,7 @@ class Block{
 	}
 
 	/**
-	 * Returns a type ID that identifies this type of block. This does not include information like facing, open/closed,
-	 * powered/unpowered, etc.
-	 */
-	public function getTypeId() : int{
-		return ($this->idInfo->getBlockId() << Block::INTERNAL_METADATA_BITS) | $this->idInfo->getVariant();
-	}
-
-	/**
-	 * Returns whether the given block has an equivalent type to this one. This compares the type IDs.
-	 *
-	 * Note: This ignores additional IDs used to represent additional states. This means that, for example, a lit
-	 * furnace and unlit furnace are considered the same type.
-	 */
-	public function isSameType(Block $other) : bool{
-		return $this->getTypeId() === $other->getTypeId();
-	}
-
-	/**
-	 * Returns whether the given block has the same type and properties as this block.
-	 */
-	public function isSameState(Block $other) : bool{
-		return $this->getFullId() === $other->getFullId();
-	}
-
-	/**
-	 * AKA: Block->isPlaceable
+	 * Returns whether this block can be placed when obtained as an item.
 	 */
 	public function canBePlaced() : bool{
 		return true;
@@ -280,13 +456,28 @@ class Block{
 	 * Returns an object containing information about the destruction requirements of this block.
 	 */
 	public function getBreakInfo() : BlockBreakInfo{
-		return $this->breakInfo;
+		return $this->typeInfo->getBreakInfo();
+	}
+
+	/**
+	 * Returns tags that represent the type of item being enchanted and are used to determine
+	 * what enchantments can be applied to the item of this block during in-game enchanting (enchanting table, anvil, fishing, etc.).
+	 * @see ItemEnchantmentTags
+	 * @see ItemEnchantmentTagRegistry
+	 * @see AvailableEnchantmentRegistry
+	 *
+	 * @return string[]
+	 */
+	public function getEnchantmentTags() : array{
+		return $this->typeInfo->getEnchantmentTags();
 	}
 
 	/**
 	 * Do the actions needed so the block is broken with the Item
+	 *
+	 * @param Item[] &$returnedItems Items to be added to the target's inventory (or dropped, if full)
 	 */
-	public function onBreak(Item $item, ?Player $player = null) : bool{
+	public function onBreak(Item $item, ?Player $player = null, array &$returnedItems = []) : bool{
 		$world = $this->position->getWorld();
 		if(($t = $world->getTile($this->position)) !== null){
 			$t->onBlockDestroyed();
@@ -326,8 +517,11 @@ class Block{
 
 	/**
 	 * Do actions when interacted by Item. Returns if it has done anything
+	 *
+	 * @param Vector3 $clickVector    Exact position where the click occurred, relative to the block's integer position
+	 * @param Item[]  &$returnedItems Items to be added to the target's inventory (or dropped, if the inventory is full)
 	 */
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		return false;
 	}
 
@@ -380,16 +574,28 @@ class Block{
 		return $this->getLightFilter() > 0;
 	}
 
+	/**
+	 * Returns whether this block allows any light to pass through it.
+	 */
 	public function isTransparent() : bool{
 		return false;
 	}
 
+	/**
+	 * @deprecated TL;DR: Don't use this function. Its results are confusing and inconsistent.
+	 *
+	 * No one is sure what the meaning of this property actually is. It's borrowed from Minecraft Java Edition, and is
+	 * used by various blocks for support checks.
+	 *
+	 * Things like signs and banners are considered "solid" despite having no collision box, and things like skulls and
+	 * flower pots are considered non-solid despite obviously being "solid" in the conventional, real-world sense.
+	 */
 	public function isSolid() : bool{
 		return true;
 	}
 
 	/**
-	 * AKA: Block->isFlowable
+	 * Returns whether this block can be destroyed by liquid flowing into its cell.
 	 */
 	public function canBeFlowedInto() : bool{
 		return false;
@@ -411,6 +617,7 @@ class Block{
 	 */
 	final public function position(World $world, int $x, int $y, int $z) : void{
 		$this->position = new Position($x, $y, $z, $world);
+		$this->collisionBoxes = null;
 	}
 
 	/**
@@ -419,7 +626,7 @@ class Block{
 	 * @return Item[]
 	 */
 	public function getDrops(Item $item) : array{
-		if($this->breakInfo->isToolCompatible($item)){
+		if($this->getBreakInfo()->isToolCompatible($item)){
 			if($this->isAffectedBySilkTouch() && $item->hasEnchantment(VanillaEnchantments::SILK_TOUCH())){
 				return $this->getSilkTouchDrops($item);
 			}
@@ -461,7 +668,7 @@ class Block{
 	 * Returns how much XP will be dropped by breaking this block with the given item.
 	 */
 	public function getXpDropForTool(Item $item) : int{
-		if($item->hasEnchantment(VanillaEnchantments::SILK_TOUCH()) || !$this->breakInfo->isToolCompatible($item)){
+		if($item->hasEnchantment(VanillaEnchantments::SILK_TOUCH()) || !$this->getBreakInfo()->isToolCompatible($item)){
 			return 0;
 		}
 
@@ -515,6 +722,10 @@ class Block{
 		return 64;
 	}
 
+	public function isFireProofAsItem() : bool{
+		return false;
+	}
+
 	/**
 	 * Returns the chance that the block will catch fire from nearby fire sources. Higher values lead to faster catching
 	 * fire.
@@ -557,8 +768,14 @@ class Block{
 	 * @return Block
 	 */
 	public function getSide(int $side, int $step = 1){
-		if($this->position->isValid()){
-			return $this->position->getWorld()->getBlock($this->position->getSide($side, $step));
+		$position = $this->position;
+		if($position->isValid()){
+			[$dx, $dy, $dz] = Facing::OFFSET[$side] ?? [0, 0, 0];
+			return $position->getWorld()->getBlockAt(
+				$position->x + ($dx * $step),
+				$position->y + ($dy * $step),
+				$position->z + ($dz * $step)
+			);
 		}
 
 		throw new \LogicException("Block does not have a valid world");
@@ -572,8 +789,14 @@ class Block{
 	 */
 	public function getHorizontalSides() : \Generator{
 		$world = $this->position->getWorld();
-		foreach($this->position->sidesAroundAxis(Axis::Y) as $vector3){
-			yield $world->getBlock($vector3);
+		foreach(Facing::HORIZONTAL as $facing){
+			[$dx, $dy, $dz] = Facing::OFFSET[$facing];
+			//TODO: yield Facing as the key?
+			yield $world->getBlockAt(
+				$this->position->x + $dx,
+				$this->position->y + $dy,
+				$this->position->z + $dz
+			);
 		}
 	}
 
@@ -585,8 +808,13 @@ class Block{
 	 */
 	public function getAllSides() : \Generator{
 		$world = $this->position->getWorld();
-		foreach($this->position->sides() as $vector3){
-			yield $world->getBlock($vector3);
+		foreach(Facing::OFFSET as [$dx, $dy, $dz]){
+			//TODO: yield Facing as the key?
+			yield $world->getBlockAt(
+				$this->position->x + $dx,
+				$this->position->y + $dy,
+				$this->position->z + $dz
+			);
 		}
 	}
 
@@ -604,7 +832,7 @@ class Block{
 	 * @return string
 	 */
 	public function __toString(){
-		return "Block[" . $this->getName() . "] (" . $this->getId() . ":" . $this->getMeta() . ")";
+		return "Block[" . $this->getName() . "] (" . $this->getTypeId() . ":" . $this->encodeFullState() . ")";
 	}
 
 	/**
@@ -663,6 +891,13 @@ class Block{
 		return null;
 	}
 
+	/**
+	 * Called when a projectile collides with one of this block's collision boxes.
+	 */
+	public function onProjectileHit(Projectile $projectile, RayTraceResult $hitResult) : void{
+		//NOOP
+	}
+
 	/**
 	 * Returns an array of collision bounding boxes for this block.
 	 * These are used for:
@@ -706,7 +941,11 @@ class Block{
 	 * blocks placed on the given face can be supported by this block.
 	 */
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::FULL();
+		return SupportType::FULL;
+	}
+
+	protected function getAdjacentSupportType(int $facing) : SupportType{
+		return $this->getSide($facing)->getSupportType(Facing::opposite($facing));
 	}
 
 	public function isFullCube() : bool{
diff --git a/src/block/BlockBreakInfo.php b/src/block/BlockBreakInfo.php
index a2d43efbc3..b49cb6f13d 100644
--- a/src/block/BlockBreakInfo.php
+++ b/src/block/BlockBreakInfo.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ToolTier;
 use function get_class;
 
 class BlockBreakInfo{
@@ -52,6 +53,22 @@ class BlockBreakInfo{
 		$this->blastResistance = $blastResistance ?? $hardness * 5;
 	}
 
+	public static function tier(float $hardness, int $toolType, ToolTier $toolTier, ?float $blastResistance = null) : self{
+		return new self($hardness, $toolType, $toolTier->getHarvestLevel(), $blastResistance);
+	}
+
+	public static function pickaxe(float $hardness, ?ToolTier $toolTier = null, ?float $blastResistance = null) : self{
+		return new self($hardness, BlockToolType::PICKAXE, $toolTier?->getHarvestLevel() ?? 0, $blastResistance);
+	}
+
+	public static function shovel(float $hardness, ?ToolTier $toolTier = null, ?float $blastResistance = null) : self{
+		return new self($hardness, BlockToolType::SHOVEL, $toolTier?->getHarvestLevel() ?? 0, $blastResistance);
+	}
+
+	public static function axe(float $hardness, ?ToolTier $toolTier = null, ?float $blastResistance = null) : self{
+		return new self($hardness, BlockToolType::AXE, $toolTier?->getHarvestLevel() ?? 0, $blastResistance);
+	}
+
 	public static function instant(int $toolType = BlockToolType::NONE, int $toolHarvestLevel = 0) : self{
 		return new self(0.0, $toolType, $toolHarvestLevel, 0.0);
 	}
diff --git a/src/block/BlockFactory.php b/src/block/BlockFactory.php
deleted file mode 100644
index ec97df002a..0000000000
--- a/src/block/BlockFactory.php
+++ /dev/null
@@ -1,1090 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\block;
-
-use pocketmine\block\BlockBreakInfo as BreakInfo;
-use pocketmine\block\BlockIdentifier as BID;
-use pocketmine\block\BlockIdentifierFlattened as BIDFlattened;
-use pocketmine\block\BlockLegacyIds as Ids;
-use pocketmine\block\BlockLegacyMetadata as Meta;
-use pocketmine\block\BlockToolType as ToolType;
-use pocketmine\block\tile\Banner as TileBanner;
-use pocketmine\block\tile\Barrel as TileBarrel;
-use pocketmine\block\tile\Beacon as TileBeacon;
-use pocketmine\block\tile\Bed as TileBed;
-use pocketmine\block\tile\Bell as TileBell;
-use pocketmine\block\tile\BlastFurnace as TileBlastFurnace;
-use pocketmine\block\tile\BrewingStand as TileBrewingStand;
-use pocketmine\block\tile\Chest as TileChest;
-use pocketmine\block\tile\Comparator as TileComparator;
-use pocketmine\block\tile\DaylightSensor as TileDaylightSensor;
-use pocketmine\block\tile\EnchantTable as TileEnchantingTable;
-use pocketmine\block\tile\EnderChest as TileEnderChest;
-use pocketmine\block\tile\FlowerPot as TileFlowerPot;
-use pocketmine\block\tile\Hopper as TileHopper;
-use pocketmine\block\tile\ItemFrame as TileItemFrame;
-use pocketmine\block\tile\Jukebox as TileJukebox;
-use pocketmine\block\tile\Lectern as TileLectern;
-use pocketmine\block\tile\MonsterSpawner as TileMonsterSpawner;
-use pocketmine\block\tile\NormalFurnace as TileNormalFurnace;
-use pocketmine\block\tile\Note as TileNote;
-use pocketmine\block\tile\ShulkerBox as TileShulkerBox;
-use pocketmine\block\tile\Skull as TileSkull;
-use pocketmine\block\tile\Smoker as TileSmoker;
-use pocketmine\block\utils\DyeColor;
-use pocketmine\block\utils\InvalidBlockStateException;
-use pocketmine\block\utils\SlabType;
-use pocketmine\block\utils\TreeType;
-use pocketmine\item\Item;
-use pocketmine\item\ItemIds;
-use pocketmine\item\ToolTier;
-use pocketmine\utils\SingletonTrait;
-use function array_fill;
-use function array_filter;
-use function get_class;
-use function min;
-
-/**
- * Manages deserializing block types from their legacy blockIDs and metadata.
- * This is primarily needed for loading chunks from disk.
- */
-class BlockFactory{
-	use SingletonTrait;
-
-	/**
-	 * @var \SplFixedArray|Block[]
-	 * @phpstan-var \SplFixedArray<Block>
-	 */
-	private \SplFixedArray $fullList;
-
-	/**
-	 * @var \SplFixedArray|int[]
-	 * @phpstan-var \SplFixedArray<int>
-	 */
-	private \SplFixedArray $mappedStateIds;
-
-	/**
-	 * @var \SplFixedArray|int[]
-	 * @phpstan-var \SplFixedArray<int>
-	 */
-	public \SplFixedArray $light;
-	/**
-	 * @var \SplFixedArray|int[]
-	 * @phpstan-var \SplFixedArray<int>
-	 */
-	public \SplFixedArray $lightFilter;
-	/**
-	 * @var \SplFixedArray|bool[]
-	 * @phpstan-var \SplFixedArray<bool>
-	 */
-	public \SplFixedArray $blocksDirectSkyLight;
-	/**
-	 * @var \SplFixedArray|float[]
-	 * @phpstan-var \SplFixedArray<float>
-	 */
-	public \SplFixedArray $blastResistance;
-
-	public function __construct(){
-		$this->fullList = new \SplFixedArray(1024 << Block::INTERNAL_METADATA_BITS);
-		$this->mappedStateIds = new \SplFixedArray(1024 << Block::INTERNAL_METADATA_BITS);
-
-		$this->light = \SplFixedArray::fromArray(array_fill(0, 1024 << Block::INTERNAL_METADATA_BITS, 0));
-		$this->lightFilter = \SplFixedArray::fromArray(array_fill(0, 1024 << Block::INTERNAL_METADATA_BITS, 1));
-		$this->blocksDirectSkyLight = \SplFixedArray::fromArray(array_fill(0, 1024 << Block::INTERNAL_METADATA_BITS, false));
-		$this->blastResistance = \SplFixedArray::fromArray(array_fill(0, 1024 << Block::INTERNAL_METADATA_BITS, 0.0));
-
-		$railBreakInfo = new BreakInfo(0.7);
-		$this->registerAllMeta(new ActivatorRail(new BID(Ids::ACTIVATOR_RAIL, 0), "Activator Rail", $railBreakInfo));
-		$this->registerAllMeta(new Air(new BID(Ids::AIR, 0), "Air", BreakInfo::indestructible(-1.0)));
-		$this->registerAllMeta(new Anvil(new BID(Ids::ANVIL, 0), "Anvil", new BreakInfo(5.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 6000.0)));
-		$this->registerAllMeta(new Bamboo(new BID(Ids::BAMBOO, 0), "Bamboo", new class(2.0 /* 1.0 in PC */, ToolType::AXE) extends BreakInfo{
-			public function getBreakTime(Item $item) : float{
-				if($item->getBlockToolType() === ToolType::SWORD){
-					return 0.0;
-				}
-				return parent::getBreakTime($item);
-			}
-		}));
-		$this->registerAllMeta(new BambooSapling(new BID(Ids::BAMBOO_SAPLING, 0), "Bamboo Sapling", BreakInfo::instant()));
-
-		$bannerBreakInfo = new BreakInfo(1.0, ToolType::AXE);
-		$this->registerAllMeta(new FloorBanner(new BID(Ids::STANDING_BANNER, 0, ItemIds::BANNER, TileBanner::class), "Banner", $bannerBreakInfo));
-		$this->registerAllMeta(new WallBanner(new BID(Ids::WALL_BANNER, 0, ItemIds::BANNER, TileBanner::class), "Wall Banner", $bannerBreakInfo));
-		$this->registerAllMeta(new Barrel(new BID(Ids::BARREL, 0, null, TileBarrel::class), "Barrel", new BreakInfo(2.5, ToolType::AXE)));
-		$this->registerAllMeta(new Transparent(new BID(Ids::BARRIER, 0), "Barrier", BreakInfo::indestructible()));
-		$this->registerAllMeta(new Beacon(new BID(Ids::BEACON, 0, null, TileBeacon::class), "Beacon", new BreakInfo(3.0)));
-		$this->registerAllMeta(new Bed(new BID(Ids::BED_BLOCK, 0, ItemIds::BED, TileBed::class), "Bed Block", new BreakInfo(0.2)));
-		$this->registerAllMeta(new Bedrock(new BID(Ids::BEDROCK, 0), "Bedrock", BreakInfo::indestructible()));
-
-		$this->registerAllMeta(new Beetroot(new BID(Ids::BEETROOT_BLOCK, 0), "Beetroot Block", BreakInfo::instant()));
-		$this->registerAllMeta(new Bell(new BID(Ids::BELL, 0, null, TileBell::class), "Bell", new BreakInfo(5.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new BlueIce(new BID(Ids::BLUE_ICE, 0), "Blue Ice", new BreakInfo(2.8, ToolType::PICKAXE)));
-		$this->registerAllMeta(new BoneBlock(new BID(Ids::BONE_BLOCK, 0), "Bone Block", new BreakInfo(2.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new Bookshelf(new BID(Ids::BOOKSHELF, 0), "Bookshelf", new BreakInfo(1.5, ToolType::AXE)));
-		$this->registerAllMeta(new BrewingStand(new BID(Ids::BREWING_STAND_BLOCK, 0, ItemIds::BREWING_STAND, TileBrewingStand::class), "Brewing Stand", new BreakInfo(0.5, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-
-		$bricksBreakInfo = new BreakInfo(2.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 30.0);
-		$this->registerAllMeta(new Stair(new BID(Ids::BRICK_STAIRS, 0), "Brick Stairs", $bricksBreakInfo));
-		$this->registerAllMeta(new Opaque(new BID(Ids::BRICK_BLOCK, 0), "Bricks", $bricksBreakInfo));
-
-		$this->registerAllMeta(new BrownMushroom(new BID(Ids::BROWN_MUSHROOM, 0), "Brown Mushroom", BreakInfo::instant()));
-		$this->registerAllMeta(new Cactus(new BID(Ids::CACTUS, 0), "Cactus", new BreakInfo(0.4)));
-		$this->registerAllMeta(new Cake(new BID(Ids::CAKE_BLOCK, 0, ItemIds::CAKE), "Cake", new BreakInfo(0.5)));
-		$this->registerAllMeta(new Carrot(new BID(Ids::CARROTS, 0), "Carrot Block", BreakInfo::instant()));
-
-		$chestBreakInfo = new BreakInfo(2.5, ToolType::AXE);
-		$this->registerAllMeta(new Chest(new BID(Ids::CHEST, 0, null, TileChest::class), "Chest", $chestBreakInfo));
-		$this->registerAllMeta(new Clay(new BID(Ids::CLAY_BLOCK, 0), "Clay Block", new BreakInfo(0.6, ToolType::SHOVEL)));
-		$this->registerAllMeta(new Coal(new BID(Ids::COAL_BLOCK, 0), "Coal Block", new BreakInfo(5.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 30.0)));
-		$this->registerAllMeta(new CoalOre(new BID(Ids::COAL_ORE, 0), "Coal Ore", new BreakInfo(3.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-
-		$cobblestoneBreakInfo = new BreakInfo(2.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 30.0);
-		$this->registerAllMeta($cobblestone = new Opaque(new BID(Ids::COBBLESTONE, 0), "Cobblestone", $cobblestoneBreakInfo));
-		$this->registerAllMeta(new Opaque(new BID(Ids::MOSSY_COBBLESTONE, 0), "Mossy Cobblestone", $cobblestoneBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::COBBLESTONE_STAIRS, 0), "Cobblestone Stairs", $cobblestoneBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::MOSSY_COBBLESTONE_STAIRS, 0), "Mossy Cobblestone Stairs", $cobblestoneBreakInfo));
-
-		$this->registerAllMeta(new Cobweb(new BID(Ids::COBWEB, 0), "Cobweb", new BreakInfo(4.0, ToolType::SWORD | ToolType::SHEARS, 1)));
-		$this->registerAllMeta(new CocoaBlock(new BID(Ids::COCOA, 0), "Cocoa Block", new BreakInfo(0.2, ToolType::AXE, 0, 15.0)));
-		$this->registerAllMeta(new CoralBlock(new BID(Ids::CORAL_BLOCK, 0), "Coral Block", new BreakInfo(7.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new CraftingTable(new BID(Ids::CRAFTING_TABLE, 0), "Crafting Table", new BreakInfo(2.5, ToolType::AXE)));
-		$this->registerAllMeta(new DaylightSensor(new BIDFlattened(Ids::DAYLIGHT_DETECTOR, [Ids::DAYLIGHT_DETECTOR_INVERTED], 0, null, TileDaylightSensor::class), "Daylight Sensor", new BreakInfo(0.2, ToolType::AXE)));
-		$this->registerAllMeta(new DeadBush(new BID(Ids::DEADBUSH, 0), "Dead Bush", BreakInfo::instant(ToolType::SHEARS, 1)));
-		$this->registerAllMeta(new DetectorRail(new BID(Ids::DETECTOR_RAIL, 0), "Detector Rail", $railBreakInfo));
-
-		$this->registerAllMeta(new Opaque(new BID(Ids::DIAMOND_BLOCK, 0), "Diamond Block", new BreakInfo(5.0, ToolType::PICKAXE, ToolTier::IRON()->getHarvestLevel(), 30.0)));
-		$this->registerAllMeta(new DiamondOre(new BID(Ids::DIAMOND_ORE, 0), "Diamond Ore", new BreakInfo(3.0, ToolType::PICKAXE, ToolTier::IRON()->getHarvestLevel())));
-		$this->registerAllMeta(new Dirt(new BID(Ids::DIRT, 0), "Dirt", new BreakInfo(0.5, ToolType::SHOVEL)));
-		$this->registerAllMeta(
-			new DoublePlant(new BID(Ids::DOUBLE_PLANT, Meta::DOUBLE_PLANT_SUNFLOWER), "Sunflower", BreakInfo::instant()),
-			new DoublePlant(new BID(Ids::DOUBLE_PLANT, Meta::DOUBLE_PLANT_LILAC), "Lilac", BreakInfo::instant()),
-			new DoublePlant(new BID(Ids::DOUBLE_PLANT, Meta::DOUBLE_PLANT_ROSE_BUSH), "Rose Bush", BreakInfo::instant()),
-			new DoublePlant(new BID(Ids::DOUBLE_PLANT, Meta::DOUBLE_PLANT_PEONY), "Peony", BreakInfo::instant()),
-			new DoubleTallGrass(new BID(Ids::DOUBLE_PLANT, Meta::DOUBLE_PLANT_TALLGRASS), "Double Tallgrass", BreakInfo::instant(ToolType::SHEARS, 1)),
-			new DoubleTallGrass(new BID(Ids::DOUBLE_PLANT, Meta::DOUBLE_PLANT_LARGE_FERN), "Large Fern", BreakInfo::instant(ToolType::SHEARS, 1)),
-		);
-		$this->registerAllMeta(new DragonEgg(new BID(Ids::DRAGON_EGG, 0), "Dragon Egg", new BreakInfo(3.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new DriedKelp(new BID(Ids::DRIED_KELP_BLOCK, 0), "Dried Kelp Block", new BreakInfo(0.5, ToolType::NONE, 0, 12.5)));
-		$this->registerAllMeta(new Opaque(new BID(Ids::EMERALD_BLOCK, 0), "Emerald Block", new BreakInfo(5.0, ToolType::PICKAXE, ToolTier::IRON()->getHarvestLevel(), 30.0)));
-		$this->registerAllMeta(new EmeraldOre(new BID(Ids::EMERALD_ORE, 0), "Emerald Ore", new BreakInfo(3.0, ToolType::PICKAXE, ToolTier::IRON()->getHarvestLevel())));
-		$this->registerAllMeta(new EnchantingTable(new BID(Ids::ENCHANTING_TABLE, 0, null, TileEnchantingTable::class), "Enchanting Table", new BreakInfo(5.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 6000.0)));
-		$this->registerAllMeta(new EndPortalFrame(new BID(Ids::END_PORTAL_FRAME, 0), "End Portal Frame", BreakInfo::indestructible()));
-		$this->registerAllMeta(new EndRod(new BID(Ids::END_ROD, 0), "End Rod", BreakInfo::instant()));
-		$this->registerAllMeta(new Opaque(new BID(Ids::END_STONE, 0), "End Stone", new BreakInfo(3.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 45.0)));
-
-		$endBrickBreakInfo = new BreakInfo(0.8, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 4.0);
-		$this->registerAllMeta(new Opaque(new BID(Ids::END_BRICKS, 0), "End Stone Bricks", $endBrickBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::END_BRICK_STAIRS, 0), "End Stone Brick Stairs", $endBrickBreakInfo));
-
-		$this->registerAllMeta(new EnderChest(new BID(Ids::ENDER_CHEST, 0, null, TileEnderChest::class), "Ender Chest", new BreakInfo(22.5, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 3000.0)));
-		$this->registerAllMeta(new Farmland(new BID(Ids::FARMLAND, 0), "Farmland", new BreakInfo(0.6, ToolType::SHOVEL)));
-		$this->registerAllMeta(new Fire(new BID(Ids::FIRE, 0), "Fire Block", BreakInfo::instant()));
-		$this->registerAllMeta(new FletchingTable(new BID(Ids::FLETCHING_TABLE, 0), "Fletching Table", new BreakInfo(2.5, ToolType::AXE, 0, 2.5)));
-		$this->registerAllMeta(new Flower(new BID(Ids::DANDELION, 0), "Dandelion", BreakInfo::instant()));
-		$this->registerAllMeta(
-			new Flower(new BID(Ids::RED_FLOWER, Meta::FLOWER_POPPY), "Poppy", BreakInfo::instant()),
-			new Flower(new BID(Ids::RED_FLOWER, Meta::FLOWER_ALLIUM), "Allium", BreakInfo::instant()),
-			new Flower(new BID(Ids::RED_FLOWER, Meta::FLOWER_AZURE_BLUET), "Azure Bluet", BreakInfo::instant()),
-			new Flower(new BID(Ids::RED_FLOWER, Meta::FLOWER_BLUE_ORCHID), "Blue Orchid", BreakInfo::instant()),
-			new Flower(new BID(Ids::RED_FLOWER, Meta::FLOWER_CORNFLOWER), "Cornflower", BreakInfo::instant()),
-			new Flower(new BID(Ids::RED_FLOWER, Meta::FLOWER_LILY_OF_THE_VALLEY), "Lily of the Valley", BreakInfo::instant()),
-			new Flower(new BID(Ids::RED_FLOWER, Meta::FLOWER_ORANGE_TULIP), "Orange Tulip", BreakInfo::instant()),
-			new Flower(new BID(Ids::RED_FLOWER, Meta::FLOWER_OXEYE_DAISY), "Oxeye Daisy", BreakInfo::instant()),
-			new Flower(new BID(Ids::RED_FLOWER, Meta::FLOWER_PINK_TULIP), "Pink Tulip", BreakInfo::instant()),
-			new Flower(new BID(Ids::RED_FLOWER, Meta::FLOWER_RED_TULIP), "Red Tulip", BreakInfo::instant()),
-			new Flower(new BID(Ids::RED_FLOWER, Meta::FLOWER_WHITE_TULIP), "White Tulip", BreakInfo::instant()),
-		);
-		$this->registerAllMeta(new FlowerPot(new BID(Ids::FLOWER_POT_BLOCK, 0, ItemIds::FLOWER_POT, TileFlowerPot::class), "Flower Pot", BreakInfo::instant()));
-		$this->registerAllMeta(new FrostedIce(new BID(Ids::FROSTED_ICE, 0), "Frosted Ice", new BreakInfo(2.5, ToolType::PICKAXE)));
-		$this->registerAllMeta(new Furnace(new BIDFlattened(Ids::FURNACE, [Ids::LIT_FURNACE], 0, null, TileNormalFurnace::class), "Furnace", new BreakInfo(3.5, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new Furnace(new BIDFlattened(Ids::BLAST_FURNACE, [Ids::LIT_BLAST_FURNACE], 0, null, TileBlastFurnace::class), "Blast Furnace", new BreakInfo(3.5, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new Furnace(new BIDFlattened(Ids::SMOKER, [Ids::LIT_SMOKER], 0, null, TileSmoker::class), "Smoker", new BreakInfo(3.5, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-
-		$glassBreakInfo = new BreakInfo(0.3);
-		$this->registerAllMeta(new Glass(new BID(Ids::GLASS, 0), "Glass", $glassBreakInfo));
-		$this->registerAllMeta(new GlassPane(new BID(Ids::GLASS_PANE, 0), "Glass Pane", $glassBreakInfo));
-		$this->registerAllMeta(new GlowingObsidian(new BID(Ids::GLOWINGOBSIDIAN, 0), "Glowing Obsidian", new BreakInfo(10.0, ToolType::PICKAXE, ToolTier::DIAMOND()->getHarvestLevel(), 50.0)));
-		$this->registerAllMeta(new Glowstone(new BID(Ids::GLOWSTONE, 0), "Glowstone", new BreakInfo(0.3, ToolType::PICKAXE)));
-		$this->registerAllMeta(new Opaque(new BID(Ids::GOLD_BLOCK, 0), "Gold Block", new BreakInfo(3.0, ToolType::PICKAXE, ToolTier::IRON()->getHarvestLevel(), 30.0)));
-		$this->registerAllMeta(new Opaque(new BID(Ids::GOLD_ORE, 0), "Gold Ore", new BreakInfo(3.0, ToolType::PICKAXE, ToolTier::IRON()->getHarvestLevel())));
-
-		$grassBreakInfo = new BreakInfo(0.6, ToolType::SHOVEL);
-		$this->registerAllMeta(new Grass(new BID(Ids::GRASS, 0), "Grass", $grassBreakInfo));
-		$this->registerAllMeta(new GrassPath(new BID(Ids::GRASS_PATH, 0), "Grass Path", $grassBreakInfo));
-		$this->registerAllMeta(new Gravel(new BID(Ids::GRAVEL, 0), "Gravel", new BreakInfo(0.6, ToolType::SHOVEL)));
-
-		$hardenedClayBreakInfo = new BreakInfo(1.25, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 21.0);
-		$this->registerAllMeta(new HardenedClay(new BID(Ids::HARDENED_CLAY, 0), "Hardened Clay", $hardenedClayBreakInfo));
-
-		$hardenedGlassBreakInfo = new BreakInfo(10.0);
-		$this->registerAllMeta(new HardenedGlass(new BID(Ids::HARD_GLASS, 0), "Hardened Glass", $hardenedGlassBreakInfo));
-		$this->registerAllMeta(new HardenedGlassPane(new BID(Ids::HARD_GLASS_PANE, 0), "Hardened Glass Pane", $hardenedGlassBreakInfo));
-		$this->registerAllMeta(new HayBale(new BID(Ids::HAY_BALE, 0), "Hay Bale", new BreakInfo(0.5)));
-		$this->registerAllMeta(new Hopper(new BID(Ids::HOPPER_BLOCK, 0, ItemIds::HOPPER, TileHopper::class), "Hopper", new BreakInfo(3.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 15.0)));
-		$this->registerAllMeta(new Ice(new BID(Ids::ICE, 0), "Ice", new BreakInfo(0.5, ToolType::PICKAXE)));
-
-		$updateBlockBreakInfo = new BreakInfo(1.0);
-		$this->registerAllMeta(new Opaque(new BID(Ids::INFO_UPDATE, 0), "update!", $updateBlockBreakInfo));
-		$this->registerAllMeta(new Opaque(new BID(Ids::INFO_UPDATE2, 0), "ate!upd", $updateBlockBreakInfo));
-		$this->registerAllMeta(new Transparent(new BID(Ids::INVISIBLEBEDROCK, 0), "Invisible Bedrock", BreakInfo::indestructible()));
-
-		$ironBreakInfo = new BreakInfo(5.0, ToolType::PICKAXE, ToolTier::STONE()->getHarvestLevel(), 30.0);
-		$this->registerAllMeta(new Opaque(new BID(Ids::IRON_BLOCK, 0), "Iron Block", $ironBreakInfo));
-		$this->registerAllMeta(new Thin(new BID(Ids::IRON_BARS, 0), "Iron Bars", $ironBreakInfo));
-		$ironDoorBreakInfo = new BreakInfo(5.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 25.0);
-		$this->registerAllMeta(new Door(new BID(Ids::IRON_DOOR_BLOCK, 0, ItemIds::IRON_DOOR), "Iron Door", $ironDoorBreakInfo));
-		$this->registerAllMeta(new Trapdoor(new BID(Ids::IRON_TRAPDOOR, 0), "Iron Trapdoor", $ironDoorBreakInfo));
-		$this->registerAllMeta(new Opaque(new BID(Ids::IRON_ORE, 0), "Iron Ore", new BreakInfo(3.0, ToolType::PICKAXE, ToolTier::STONE()->getHarvestLevel())));
-		$this->registerAllMeta(new ItemFrame(new BID(Ids::FRAME_BLOCK, 0, ItemIds::FRAME, TileItemFrame::class), "Item Frame", new BreakInfo(0.25)));
-		$this->registerAllMeta(new Jukebox(new BID(Ids::JUKEBOX, 0, ItemIds::JUKEBOX, TileJukebox::class), "Jukebox", new BreakInfo(0.8, ToolType::AXE))); //TODO: in PC the hardness is 2.0, not 0.8, unsure if this is a MCPE bug or not
-		$this->registerAllMeta(new Ladder(new BID(Ids::LADDER, 0), "Ladder", new BreakInfo(0.4, ToolType::AXE)));
-		$this->registerAllMeta(new Lantern(new BID(Ids::LANTERN, 0), "Lantern", new BreakInfo(5.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new Opaque(new BID(Ids::LAPIS_BLOCK, 0), "Lapis Lazuli Block", new BreakInfo(3.0, ToolType::PICKAXE, ToolTier::STONE()->getHarvestLevel())));
-		$this->registerAllMeta(new LapisOre(new BID(Ids::LAPIS_ORE, 0), "Lapis Lazuli Ore", new BreakInfo(3.0, ToolType::PICKAXE, ToolTier::STONE()->getHarvestLevel())));
-		$this->registerAllMeta(new Lava(new BIDFlattened(Ids::FLOWING_LAVA, [Ids::STILL_LAVA], 0), "Lava", BreakInfo::indestructible(500.0)));
-		$this->registerAllMeta(new Lectern(new BID(Ids::LECTERN, 0, ItemIds::LECTERN, TileLectern::class), "Lectern", new BreakInfo(2.0, ToolType::AXE)));
-		$this->registerAllMeta(new Lever(new BID(Ids::LEVER, 0), "Lever", new BreakInfo(0.5)));
-		$this->registerAllMeta(new Loom(new BID(Ids::LOOM, 0), "Loom", new BreakInfo(2.5, ToolType::AXE)));
-		$this->registerAllMeta(new Magma(new BID(Ids::MAGMA, 0), "Magma Block", new BreakInfo(0.5, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new Melon(new BID(Ids::MELON_BLOCK, 0), "Melon Block", new BreakInfo(1.0, ToolType::AXE)));
-		$this->registerAllMeta(new MelonStem(new BID(Ids::MELON_STEM, 0, ItemIds::MELON_SEEDS), "Melon Stem", BreakInfo::instant()));
-		$this->registerAllMeta(new MonsterSpawner(new BID(Ids::MOB_SPAWNER, 0, null, TileMonsterSpawner::class), "Monster Spawner", new BreakInfo(5.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new Mycelium(new BID(Ids::MYCELIUM, 0), "Mycelium", new BreakInfo(0.6, ToolType::SHOVEL)));
-
-		$netherBrickBreakInfo = new BreakInfo(2.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 30.0);
-		$this->registerAllMeta(new Opaque(new BID(Ids::NETHER_BRICK_BLOCK, 0), "Nether Bricks", $netherBrickBreakInfo));
-		$this->registerAllMeta(new Opaque(new BID(Ids::RED_NETHER_BRICK, 0), "Red Nether Bricks", $netherBrickBreakInfo));
-		$this->registerAllMeta(new Fence(new BID(Ids::NETHER_BRICK_FENCE, 0), "Nether Brick Fence", $netherBrickBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::NETHER_BRICK_STAIRS, 0), "Nether Brick Stairs", $netherBrickBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::RED_NETHER_BRICK_STAIRS, 0), "Red Nether Brick Stairs", $netherBrickBreakInfo));
-		$this->registerAllMeta(new NetherPortal(new BID(Ids::PORTAL, 0), "Nether Portal", BreakInfo::indestructible(0.0)));
-		$this->registerAllMeta(new NetherQuartzOre(new BID(Ids::NETHER_QUARTZ_ORE, 0), "Nether Quartz Ore", new BreakInfo(3.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new NetherReactor(new BID(Ids::NETHERREACTOR, 0), "Nether Reactor Core", new BreakInfo(3.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new Opaque(new BID(Ids::NETHER_WART_BLOCK, 0), "Nether Wart Block", new BreakInfo(1.0, ToolType::HOE)));
-		$this->registerAllMeta(new NetherWartPlant(new BID(Ids::NETHER_WART_PLANT, 0, ItemIds::NETHER_WART), "Nether Wart", BreakInfo::instant()));
-		$this->registerAllMeta(new Netherrack(new BID(Ids::NETHERRACK, 0), "Netherrack", new BreakInfo(0.4, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new Note(new BID(Ids::NOTEBLOCK, 0, null, TileNote::class), "Note Block", new BreakInfo(0.8, ToolType::AXE)));
-		$this->registerAllMeta(new Opaque(new BID(Ids::OBSIDIAN, 0), "Obsidian", new BreakInfo(35.0 /* 50 in PC */, ToolType::PICKAXE, ToolTier::DIAMOND()->getHarvestLevel(), 6000.0)));
-		$this->registerAllMeta(new PackedIce(new BID(Ids::PACKED_ICE, 0), "Packed Ice", new BreakInfo(0.5, ToolType::PICKAXE)));
-		$this->registerAllMeta(new Podzol(new BID(Ids::PODZOL, 0), "Podzol", new BreakInfo(0.5, ToolType::SHOVEL)));
-		$this->registerAllMeta(new Potato(new BID(Ids::POTATOES, 0), "Potato Block", BreakInfo::instant()));
-		$this->registerAllMeta(new PoweredRail(new BID(Ids::GOLDEN_RAIL, 0), "Powered Rail", $railBreakInfo));
-
-		$prismarineBreakInfo = new BreakInfo(1.5, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 30.0);
-		$this->registerAllMeta(
-			new Opaque(new BID(Ids::PRISMARINE, Meta::PRISMARINE_NORMAL), "Prismarine", $prismarineBreakInfo),
-			new Opaque(new BID(Ids::PRISMARINE, Meta::PRISMARINE_DARK), "Dark Prismarine", $prismarineBreakInfo),
-			new Opaque(new BID(Ids::PRISMARINE, Meta::PRISMARINE_BRICKS), "Prismarine Bricks", $prismarineBreakInfo)
-		);
-		$this->registerAllMeta(new Stair(new BID(Ids::PRISMARINE_BRICKS_STAIRS, 0), "Prismarine Bricks Stairs", $prismarineBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::DARK_PRISMARINE_STAIRS, 0), "Dark Prismarine Stairs", $prismarineBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::PRISMARINE_STAIRS, 0), "Prismarine Stairs", $prismarineBreakInfo));
-
-		$pumpkinBreakInfo = new BreakInfo(1.0, ToolType::AXE);
-		$this->registerAllMeta(new Pumpkin(new BID(Ids::PUMPKIN, 0), "Pumpkin", $pumpkinBreakInfo));
-		$this->registerAllMeta(new CarvedPumpkin(new BID(Ids::CARVED_PUMPKIN, 0), "Carved Pumpkin", $pumpkinBreakInfo));
-		$this->registerAllMeta(new LitPumpkin(new BID(Ids::JACK_O_LANTERN, 0), "Jack o'Lantern", $pumpkinBreakInfo));
-
-		$this->registerAllMeta(new PumpkinStem(new BID(Ids::PUMPKIN_STEM, 0, ItemIds::PUMPKIN_SEEDS), "Pumpkin Stem", BreakInfo::instant()));
-
-		$purpurBreakInfo = new BreakInfo(1.5, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 30.0);
-		$this->registerAllMeta(
-			new Opaque(new BID(Ids::PURPUR_BLOCK, Meta::PURPUR_NORMAL), "Purpur Block", $purpurBreakInfo),
-			new SimplePillar(new BID(Ids::PURPUR_BLOCK, Meta::PURPUR_PILLAR), "Purpur Pillar", $purpurBreakInfo)
-		);
-		$this->registerAllMeta(new Stair(new BID(Ids::PURPUR_STAIRS, 0), "Purpur Stairs", $purpurBreakInfo));
-
-		$quartzBreakInfo = new BreakInfo(0.8, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel());
-		$this->registerAllMeta(
-			new Opaque(new BID(Ids::QUARTZ_BLOCK, Meta::QUARTZ_NORMAL), "Quartz Block", $quartzBreakInfo),
-			new SimplePillar(new BID(Ids::QUARTZ_BLOCK, Meta::QUARTZ_CHISELED), "Chiseled Quartz Block", $quartzBreakInfo),
-			new SimplePillar(new BID(Ids::QUARTZ_BLOCK, Meta::QUARTZ_PILLAR), "Quartz Pillar", $quartzBreakInfo),
-			new Opaque(new BID(Ids::QUARTZ_BLOCK, Meta::QUARTZ_SMOOTH), "Smooth Quartz Block", $quartzBreakInfo) //TODO: we may need to account for the fact this previously incorrectly had axis
-		);
-		$this->registerAllMeta(new Stair(new BID(Ids::QUARTZ_STAIRS, 0), "Quartz Stairs", $quartzBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::SMOOTH_QUARTZ_STAIRS, 0), "Smooth Quartz Stairs", $quartzBreakInfo));
-
-		$this->registerAllMeta(new Rail(new BID(Ids::RAIL, 0), "Rail", $railBreakInfo));
-		$this->registerAllMeta(new RedMushroom(new BID(Ids::RED_MUSHROOM, 0), "Red Mushroom", BreakInfo::instant()));
-		$this->registerAllMeta(new Redstone(new BID(Ids::REDSTONE_BLOCK, 0), "Redstone Block", new BreakInfo(5.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 30.0)));
-		$this->registerAllMeta(new RedstoneComparator(new BIDFlattened(Ids::UNPOWERED_COMPARATOR, [Ids::POWERED_COMPARATOR], 0, ItemIds::COMPARATOR, TileComparator::class), "Redstone Comparator", BreakInfo::instant()));
-		$this->registerAllMeta(new RedstoneLamp(new BIDFlattened(Ids::REDSTONE_LAMP, [Ids::LIT_REDSTONE_LAMP], 0), "Redstone Lamp", new BreakInfo(0.3)));
-		$this->registerAllMeta(new RedstoneOre(new BIDFlattened(Ids::REDSTONE_ORE, [Ids::LIT_REDSTONE_ORE], 0), "Redstone Ore", new BreakInfo(3.0, ToolType::PICKAXE, ToolTier::IRON()->getHarvestLevel())));
-		$this->registerAllMeta(new RedstoneRepeater(new BIDFlattened(Ids::UNPOWERED_REPEATER, [Ids::POWERED_REPEATER], 0, ItemIds::REPEATER), "Redstone Repeater", BreakInfo::instant()));
-		$this->registerAllMeta(new RedstoneTorch(new BIDFlattened(Ids::REDSTONE_TORCH, [Ids::UNLIT_REDSTONE_TORCH], 0), "Redstone Torch", BreakInfo::instant()));
-		$this->registerAllMeta(new RedstoneWire(new BID(Ids::REDSTONE_WIRE, 0, ItemIds::REDSTONE), "Redstone", BreakInfo::instant()));
-		$this->registerAllMeta(new Reserved6(new BID(Ids::RESERVED6, 0), "reserved6", BreakInfo::instant()));
-
-		$sandBreakInfo = new BreakInfo(0.5, ToolType::SHOVEL);
-		$this->registerAllMeta(
-			new Sand(new BID(Ids::SAND, 0), "Sand", $sandBreakInfo),
-			new Sand(new BID(Ids::SAND, 1), "Red Sand", $sandBreakInfo)
-		);
-		$this->registerAllMeta(new SeaLantern(new BID(Ids::SEALANTERN, 0), "Sea Lantern", new BreakInfo(0.3)));
-		$this->registerAllMeta(new SeaPickle(new BID(Ids::SEA_PICKLE, 0), "Sea Pickle", BreakInfo::instant()));
-		$this->registerAllMeta(new Skull(new BID(Ids::MOB_HEAD_BLOCK, 0, ItemIds::SKULL, TileSkull::class), "Mob Head", new BreakInfo(1.0)));
-		$this->registerAllMeta(new Slime(new BID(Ids::SLIME, 0), "Slime Block", BreakInfo::instant()));
-		$this->registerAllMeta(new Snow(new BID(Ids::SNOW, 0), "Snow Block", new BreakInfo(0.2, ToolType::SHOVEL, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new SnowLayer(new BID(Ids::SNOW_LAYER, 0), "Snow Layer", new BreakInfo(0.1, ToolType::SHOVEL, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new SoulSand(new BID(Ids::SOUL_SAND, 0), "Soul Sand", new BreakInfo(0.5, ToolType::SHOVEL)));
-		$this->registerAllMeta(new Sponge(new BID(Ids::SPONGE, 0), "Sponge", new BreakInfo(0.6, ToolType::HOE)));
-		$shulkerBoxBreakInfo = new BreakInfo(2, ToolType::PICKAXE);
-		$this->registerAllMeta(new ShulkerBox(new BID(Ids::UNDYED_SHULKER_BOX, 0, null, TileShulkerBox::class), "Shulker Box", $shulkerBoxBreakInfo));
-
-		$stoneBreakInfo = new BreakInfo(1.5, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 30.0);
-		$this->registerAllMeta(
-			$stone = new class(new BID(Ids::STONE, Meta::STONE_NORMAL), "Stone", $stoneBreakInfo) extends Opaque{
-				public function getDropsForCompatibleTool(Item $item) : array{
-					return [VanillaBlocks::COBBLESTONE()->asItem()];
-				}
-
-				public function isAffectedBySilkTouch() : bool{
-					return true;
-				}
-			},
-			new Opaque(new BID(Ids::STONE, Meta::STONE_ANDESITE), "Andesite", $stoneBreakInfo),
-			new Opaque(new BID(Ids::STONE, Meta::STONE_DIORITE), "Diorite", $stoneBreakInfo),
-			new Opaque(new BID(Ids::STONE, Meta::STONE_GRANITE), "Granite", $stoneBreakInfo),
-			new Opaque(new BID(Ids::STONE, Meta::STONE_POLISHED_ANDESITE), "Polished Andesite", $stoneBreakInfo),
-			new Opaque(new BID(Ids::STONE, Meta::STONE_POLISHED_DIORITE), "Polished Diorite", $stoneBreakInfo),
-			new Opaque(new BID(Ids::STONE, Meta::STONE_POLISHED_GRANITE), "Polished Granite", $stoneBreakInfo)
-		);
-		$this->registerAllMeta(
-			$stoneBrick = new Opaque(new BID(Ids::STONEBRICK, Meta::STONE_BRICK_NORMAL), "Stone Bricks", $stoneBreakInfo),
-			$mossyStoneBrick = new Opaque(new BID(Ids::STONEBRICK, Meta::STONE_BRICK_MOSSY), "Mossy Stone Bricks", $stoneBreakInfo),
-			$crackedStoneBrick = new Opaque(new BID(Ids::STONEBRICK, Meta::STONE_BRICK_CRACKED), "Cracked Stone Bricks", $stoneBreakInfo),
-			$chiseledStoneBrick = new Opaque(new BID(Ids::STONEBRICK, Meta::STONE_BRICK_CHISELED), "Chiseled Stone Bricks", $stoneBreakInfo)
-		);
-		$infestedStoneBreakInfo = new BreakInfo(0.75, ToolType::PICKAXE);
-		$this->registerAllMeta(
-			new InfestedStone(new BID(Ids::MONSTER_EGG, Meta::INFESTED_STONE), "Infested Stone", $infestedStoneBreakInfo, $stone),
-			new InfestedStone(new BID(Ids::MONSTER_EGG, Meta::INFESTED_STONE_BRICK), "Infested Stone Brick", $infestedStoneBreakInfo, $stoneBrick),
-			new InfestedStone(new BID(Ids::MONSTER_EGG, Meta::INFESTED_COBBLESTONE), "Infested Cobblestone", $infestedStoneBreakInfo, $cobblestone),
-			new InfestedStone(new BID(Ids::MONSTER_EGG, Meta::INFESTED_STONE_BRICK_MOSSY), "Infested Mossy Stone Brick", $infestedStoneBreakInfo, $mossyStoneBrick),
-			new InfestedStone(new BID(Ids::MONSTER_EGG, Meta::INFESTED_STONE_BRICK_CRACKED), "Infested Cracked Stone Brick", $infestedStoneBreakInfo, $crackedStoneBrick),
-			new InfestedStone(new BID(Ids::MONSTER_EGG, Meta::INFESTED_STONE_BRICK_CHISELED), "Infested Chiseled Stone Brick", $infestedStoneBreakInfo, $chiseledStoneBrick)
-		);
-		$this->registerAllMeta(new Stair(new BID(Ids::NORMAL_STONE_STAIRS, 0), "Stone Stairs", $stoneBreakInfo));
-		$this->registerAllMeta(new Opaque(new BID(Ids::SMOOTH_STONE, 0), "Smooth Stone", $stoneBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::ANDESITE_STAIRS, 0), "Andesite Stairs", $stoneBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::DIORITE_STAIRS, 0), "Diorite Stairs", $stoneBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::GRANITE_STAIRS, 0), "Granite Stairs", $stoneBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::POLISHED_ANDESITE_STAIRS, 0), "Polished Andesite Stairs", $stoneBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::POLISHED_DIORITE_STAIRS, 0), "Polished Diorite Stairs", $stoneBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::POLISHED_GRANITE_STAIRS, 0), "Polished Granite Stairs", $stoneBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::STONE_BRICK_STAIRS, 0), "Stone Brick Stairs", $stoneBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::MOSSY_STONE_BRICK_STAIRS, 0), "Mossy Stone Brick Stairs", $stoneBreakInfo));
-		$this->registerAllMeta(new StoneButton(new BID(Ids::STONE_BUTTON, 0), "Stone Button", new BreakInfo(0.5, ToolType::PICKAXE)));
-		$this->registerAllMeta(new Stonecutter(new BID(Ids::STONECUTTER_BLOCK, 0, ItemIds::STONECUTTER_BLOCK), "Stonecutter", new BreakInfo(3.5, ToolType::PICKAXE)));
-		$this->registerAllMeta(new StonePressurePlate(new BID(Ids::STONE_PRESSURE_PLATE, 0), "Stone Pressure Plate", new BreakInfo(0.5, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-
-		//TODO: in the future this won't be the same for all the types
-		$stoneSlabBreakInfo = new BreakInfo(2.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 30.0);
-
-		$getStoneSlabId = static fn(int $stoneSlabId, int $meta) => BlockLegacyIdHelper::getStoneSlabIdentifier($stoneSlabId, $meta);
-		foreach([
-			new Slab($getStoneSlabId(1, Meta::STONE_SLAB_BRICK), "Brick", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(1, Meta::STONE_SLAB_COBBLESTONE), "Cobblestone", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(1, Meta::STONE_SLAB_FAKE_WOODEN), "Fake Wooden", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(1, Meta::STONE_SLAB_NETHER_BRICK), "Nether Brick", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(1, Meta::STONE_SLAB_QUARTZ), "Quartz", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(1, Meta::STONE_SLAB_SANDSTONE), "Sandstone", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(1, Meta::STONE_SLAB_SMOOTH_STONE), "Smooth Stone", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(1, Meta::STONE_SLAB_STONE_BRICK), "Stone Brick", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(2, Meta::STONE_SLAB2_DARK_PRISMARINE), "Dark Prismarine", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(2, Meta::STONE_SLAB2_MOSSY_COBBLESTONE), "Mossy Cobblestone", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(2, Meta::STONE_SLAB2_PRISMARINE), "Prismarine", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(2, Meta::STONE_SLAB2_PRISMARINE_BRICKS), "Prismarine Bricks", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(2, Meta::STONE_SLAB2_PURPUR), "Purpur", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(2, Meta::STONE_SLAB2_RED_NETHER_BRICK), "Red Nether Brick", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(2, Meta::STONE_SLAB2_RED_SANDSTONE), "Red Sandstone", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(2, Meta::STONE_SLAB2_SMOOTH_SANDSTONE), "Smooth Sandstone", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(3, Meta::STONE_SLAB3_ANDESITE), "Andesite", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(3, Meta::STONE_SLAB3_DIORITE), "Diorite", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(3, Meta::STONE_SLAB3_END_STONE_BRICK), "End Stone Brick", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(3, Meta::STONE_SLAB3_GRANITE), "Granite", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(3, Meta::STONE_SLAB3_POLISHED_ANDESITE), "Polished Andesite", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(3, Meta::STONE_SLAB3_POLISHED_DIORITE), "Polished Diorite", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(3, Meta::STONE_SLAB3_POLISHED_GRANITE), "Polished Granite", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(3, Meta::STONE_SLAB3_SMOOTH_RED_SANDSTONE), "Smooth Red Sandstone", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(4, Meta::STONE_SLAB4_CUT_RED_SANDSTONE), "Cut Red Sandstone", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(4, Meta::STONE_SLAB4_CUT_SANDSTONE), "Cut Sandstone", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(4, Meta::STONE_SLAB4_MOSSY_STONE_BRICK), "Mossy Stone Brick", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(4, Meta::STONE_SLAB4_SMOOTH_QUARTZ), "Smooth Quartz", $stoneSlabBreakInfo),
-			new Slab($getStoneSlabId(4, Meta::STONE_SLAB4_STONE), "Stone", $stoneSlabBreakInfo),
-		] as $slabType){
-			$this->registerSlabWithDoubleHighBitsRemapping($slabType);
-		}
-
-		$this->registerAllMeta(new Opaque(new BID(Ids::STONECUTTER, 0), "Legacy Stonecutter", new BreakInfo(3.5, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new Sugarcane(new BID(Ids::REEDS_BLOCK, 0, ItemIds::REEDS), "Sugarcane", BreakInfo::instant()));
-		$this->registerAllMeta(new SweetBerryBush(new BID(Ids::SWEET_BERRY_BUSH, 0, ItemIds::SWEET_BERRIES), "Sweet Berry Bush", BreakInfo::instant()));
-		$this->registerAllMeta(new TNT(new BID(Ids::TNT, 0), "TNT", BreakInfo::instant()));
-		$this->registerAllMeta(
-			new TallGrass(new BID(Ids::TALLGRASS, Meta::TALLGRASS_FERN), "Fern", BreakInfo::instant(ToolType::SHEARS, 1)),
-			new TallGrass(new BID(Ids::TALLGRASS, Meta::TALLGRASS_NORMAL), "Tall Grass", BreakInfo::instant(ToolType::SHEARS, 1))
-		);
-		$this->registerAllMeta(
-			new Torch(new BID(Ids::COLORED_TORCH_BP, 0), "Blue Torch", BreakInfo::instant()),
-			new Torch(new BID(Ids::COLORED_TORCH_BP, 8), "Purple Torch", BreakInfo::instant())
-		);
-		$this->registerAllMeta(
-			new Torch(new BID(Ids::COLORED_TORCH_RG, 0), "Red Torch", BreakInfo::instant()),
-			new Torch(new BID(Ids::COLORED_TORCH_RG, 8), "Green Torch", BreakInfo::instant())
-		);
-		$this->registerAllMeta(new Torch(new BID(Ids::TORCH, 0), "Torch", BreakInfo::instant()));
-		$this->registerAllMeta(new TrappedChest(new BID(Ids::TRAPPED_CHEST, 0, null, TileChest::class), "Trapped Chest", $chestBreakInfo));
-		$this->registerAllMeta(new Tripwire(new BID(Ids::TRIPWIRE, 0, ItemIds::STRING), "Tripwire", BreakInfo::instant()));
-		$this->registerAllMeta(new TripwireHook(new BID(Ids::TRIPWIRE_HOOK, 0), "Tripwire Hook", BreakInfo::instant()));
-		$this->registerAllMeta(new UnderwaterTorch(new BID(Ids::UNDERWATER_TORCH, 0), "Underwater Torch", BreakInfo::instant()));
-		$this->registerAllMeta(new Vine(new BID(Ids::VINE, 0), "Vines", new BreakInfo(0.2, ToolType::AXE)));
-		$this->registerAllMeta(new Water(new BIDFlattened(Ids::FLOWING_WATER, [Ids::STILL_WATER], 0), "Water", BreakInfo::indestructible(500.0)));
-		$this->registerAllMeta(new WaterLily(new BID(Ids::LILY_PAD, 0), "Lily Pad", BreakInfo::instant()));
-
-		$weightedPressurePlateBreakInfo = new BreakInfo(0.5, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel());
-		$this->registerAllMeta(new WeightedPressurePlateHeavy(new BID(Ids::HEAVY_WEIGHTED_PRESSURE_PLATE, 0), "Weighted Pressure Plate Heavy", $weightedPressurePlateBreakInfo));
-		$this->registerAllMeta(new WeightedPressurePlateLight(new BID(Ids::LIGHT_WEIGHTED_PRESSURE_PLATE, 0), "Weighted Pressure Plate Light", $weightedPressurePlateBreakInfo));
-		$this->registerAllMeta(new Wheat(new BID(Ids::WHEAT_BLOCK, 0), "Wheat Block", BreakInfo::instant()));
-
-		$planksBreakInfo = new BreakInfo(2.0, ToolType::AXE, 0, 15.0);
-		$leavesBreakInfo = new class(0.2, ToolType::HOE) extends BreakInfo{
-			public function getBreakTime(Item $item) : float{
-				if($item->getBlockToolType() === ToolType::SHEARS){
-					return 0.0;
-				}
-				return parent::getBreakTime($item);
-			}
-		};
-		$signBreakInfo = new BreakInfo(1.0, ToolType::AXE);
-		$logBreakInfo = new BreakInfo(2.0, ToolType::AXE);
-		$woodenDoorBreakInfo = new BreakInfo(3.0, ToolType::AXE, 0, 15.0);
-		$woodenButtonBreakInfo = new BreakInfo(0.5, ToolType::AXE);
-		$woodenPressurePlateBreakInfo = new BreakInfo(0.5, ToolType::AXE);
-
-		$planks = [];
-		$saplings = [];
-		$fences = [];
-		$leaves = [];
-		$allSidedLogs = [];
-		foreach(TreeType::getAll() as $treeType){
-			$magicNumber = $treeType->getMagicNumber();
-			$name = $treeType->getDisplayName();
-			$planks[] = new Planks(new BID(Ids::PLANKS, $magicNumber), $name . " Planks", $planksBreakInfo);
-			$saplings[] = new Sapling(new BID(Ids::SAPLING, $magicNumber), $name . " Sapling", BreakInfo::instant(), $treeType);
-			$fences[] = new WoodenFence(new BID(Ids::FENCE, $magicNumber), $name . " Fence", $planksBreakInfo);
-			$this->registerSlabWithDoubleHighBitsRemapping(new WoodenSlab(new BIDFlattened(Ids::WOODEN_SLAB, [Ids::DOUBLE_WOODEN_SLAB], $magicNumber), $name, $planksBreakInfo));
-
-			//TODO: find a better way to deal with this split
-			$leaves[] = new Leaves(new BID($magicNumber >= 4 ? Ids::LEAVES2 : Ids::LEAVES, $magicNumber & 0x03), $name . " Leaves", $leavesBreakInfo, $treeType);
-
-			$this->register(new Log(new BID($magicNumber >= 4 ? Ids::LOG2 : Ids::LOG, $magicNumber & 0x03), $name . " Log", $logBreakInfo, $treeType, false));
-			$wood = new Wood(new BID(Ids::WOOD, $magicNumber), $name . " Wood", $logBreakInfo, $treeType, false);
-			$this->remap($magicNumber >= 4 ? Ids::LOG2 : Ids::LOG, ($magicNumber & 0x03) | 0b1100, $wood);
-
-			$allSidedLogs[] = $wood;
-			$allSidedLogs[] = new Wood(new BID(Ids::WOOD, $magicNumber | BlockLegacyMetadata::WOOD_FLAG_STRIPPED), "Stripped $name Wood", $logBreakInfo, $treeType, true);
-
-			$this->registerAllMeta(new Log(BlockLegacyIdHelper::getStrippedLogIdentifier($treeType), "Stripped " . $name . " Log", $logBreakInfo, $treeType, true));
-			$this->registerAllMeta(new FenceGate(BlockLegacyIdHelper::getWoodenFenceIdentifier($treeType), $name . " Fence Gate", $planksBreakInfo));
-			$this->registerAllMeta(new WoodenStairs(BlockLegacyIdHelper::getWoodenStairsIdentifier($treeType), $name . " Stairs", $planksBreakInfo));
-			$this->registerAllMeta(new WoodenDoor(BlockLegacyIdHelper::getWoodenDoorIdentifier($treeType), $name . " Door", $woodenDoorBreakInfo));
-
-			$this->registerAllMeta(new WoodenButton(BlockLegacyIdHelper::getWoodenButtonIdentifier($treeType), $name . " Button", $woodenButtonBreakInfo));
-			$this->registerAllMeta(new WoodenPressurePlate(BlockLegacyIdHelper::getWoodenPressurePlateIdentifier($treeType), $name . " Pressure Plate", $woodenPressurePlateBreakInfo));
-			$this->registerAllMeta(new WoodenTrapdoor(BlockLegacyIdHelper::getWoodenTrapdoorIdentifier($treeType), $name . " Trapdoor", $woodenDoorBreakInfo));
-
-			$this->registerAllMeta(new FloorSign(BlockLegacyIdHelper::getWoodenFloorSignIdentifier($treeType), $name . " Sign", $signBreakInfo));
-			$this->registerAllMeta(new WallSign(BlockLegacyIdHelper::getWoodenWallSignIdentifier($treeType), $name . " Wall Sign", $signBreakInfo));
-		}
-		$this->registerAllMeta(...$planks);
-		$this->registerAllMeta(...$saplings);
-		$this->registerAllMeta(...$fences);
-		$this->registerAllMeta(...$leaves);
-		$this->registerAllMeta(...$allSidedLogs);
-
-		$sandstoneBreakInfo = new BreakInfo(0.8, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel());
-		$this->registerAllMeta(new Stair(new BID(Ids::RED_SANDSTONE_STAIRS, 0), "Red Sandstone Stairs", $sandstoneBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::SMOOTH_RED_SANDSTONE_STAIRS, 0), "Smooth Red Sandstone Stairs", $sandstoneBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::SANDSTONE_STAIRS, 0), "Sandstone Stairs", $sandstoneBreakInfo));
-		$this->registerAllMeta(new Stair(new BID(Ids::SMOOTH_SANDSTONE_STAIRS, 0), "Smooth Sandstone Stairs", $sandstoneBreakInfo));
-		$sandstones = [];
-		$redSandstones = [];
-		foreach([
-			Meta::SANDSTONE_NORMAL => "",
-			Meta::SANDSTONE_CHISELED => "Chiseled ",
-			Meta::SANDSTONE_CUT => "Cut ",
-			Meta::SANDSTONE_SMOOTH => "Smooth "
-		] as $variant => $prefix){
-			$sandstones[] = new Opaque(new BID(Ids::SANDSTONE, $variant), $prefix . "Sandstone", $sandstoneBreakInfo);
-			$redSandstones[] = new Opaque(new BID(Ids::RED_SANDSTONE, $variant), $prefix . "Red Sandstone", $sandstoneBreakInfo);
-		}
-		$this->registerAllMeta(...$sandstones);
-		$this->registerAllMeta(...$redSandstones);
-
-		$glazedTerracottaBreakInfo = new BreakInfo(1.4, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel());
-		foreach(DyeColor::getAll() as $color){
-			$coloredName = function(string $name) use($color) : string{
-				return $color->getDisplayName() . " " . $name;
-			};
-			$this->registerAllMeta(new GlazedTerracotta(BlockLegacyIdHelper::getGlazedTerracottaIdentifier($color), $coloredName("Glazed Terracotta"), $glazedTerracottaBreakInfo));
-		}
-		$this->registerAllMeta(new DyedShulkerBox(new BID(Ids::SHULKER_BOX, 0, null, TileShulkerBox::class), "Dyed Shulker Box", $shulkerBoxBreakInfo));
-		$this->registerAllMeta(new StainedGlass(new BID(Ids::STAINED_GLASS, 0), "Stained Glass", $glassBreakInfo));
-		$this->registerAllMeta(new StainedGlassPane(new BID(Ids::STAINED_GLASS_PANE, 0), "Stained Glass Pane", $glassBreakInfo));
-		$this->registerAllMeta(new StainedHardenedClay(new BID(Ids::STAINED_CLAY, 0), "Stained Clay", $hardenedClayBreakInfo));
-		$this->registerAllMeta(new StainedHardenedGlass(new BID(Ids::HARD_STAINED_GLASS, 0), "Stained Hardened Glass", $hardenedGlassBreakInfo));
-		$this->registerAllMeta(new StainedHardenedGlassPane(new BID(Ids::HARD_STAINED_GLASS_PANE, 0), "Stained Hardened Glass Pane", $hardenedGlassBreakInfo));
-		$this->registerAllMeta(new Carpet(new BID(Ids::CARPET, 0), "Carpet", new BreakInfo(0.1)));
-		$this->registerAllMeta(new Concrete(new BID(Ids::CONCRETE, 0), "Concrete", new BreakInfo(1.8, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel())));
-		$this->registerAllMeta(new ConcretePowder(new BID(Ids::CONCRETE_POWDER, 0), "Concrete Powder", new BreakInfo(0.5, ToolType::SHOVEL)));
-		$this->registerAllMeta(new Wool(new BID(Ids::WOOL, 0), "Wool", new class(0.8, ToolType::SHEARS) extends BreakInfo{
-			public function getBreakTime(Item $item) : float{
-				$time = parent::getBreakTime($item);
-				if($item->getBlockToolType() === ToolType::SHEARS){
-					$time *= 3; //shears break compatible blocks 15x faster, but wool 5x
-				}
-
-				return $time;
-			}
-		}));
-
-		//TODO: in the future these won't all have the same hardness; they only do now because of the old metadata crap
-		$wallBreakInfo = new BreakInfo(2.0, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel(), 30.0);
-		$this->registerAllMeta(
-			new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_COBBLESTONE), "Cobblestone Wall", $wallBreakInfo),
-			new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_ANDESITE), "Andesite Wall", $wallBreakInfo),
-			new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_BRICK), "Brick Wall", $wallBreakInfo),
-			new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_DIORITE), "Diorite Wall", $wallBreakInfo),
-			new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_END_STONE_BRICK), "End Stone Brick Wall", $wallBreakInfo),
-			new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_GRANITE), "Granite Wall", $wallBreakInfo),
-			new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_MOSSY_STONE_BRICK), "Mossy Stone Brick Wall", $wallBreakInfo),
-			new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_MOSSY_COBBLESTONE), "Mossy Cobblestone Wall", $wallBreakInfo),
-			new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_NETHER_BRICK), "Nether Brick Wall", $wallBreakInfo),
-			new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_PRISMARINE), "Prismarine Wall", $wallBreakInfo),
-			new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_RED_NETHER_BRICK), "Red Nether Brick Wall", $wallBreakInfo),
-			new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_RED_SANDSTONE), "Red Sandstone Wall", $wallBreakInfo),
-			new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_SANDSTONE), "Sandstone Wall", $wallBreakInfo),
-			new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_STONE_BRICK), "Stone Brick Wall", $wallBreakInfo),
-		);
-
-		$this->registerElements();
-
-		$chemistryTableBreakInfo = new BreakInfo(2.5, ToolType::PICKAXE, ToolTier::WOOD()->getHarvestLevel());
-		$this->registerAllMeta(
-			new ChemistryTable(new BID(Ids::CHEMISTRY_TABLE, Meta::CHEMISTRY_COMPOUND_CREATOR), "Compound Creator", $chemistryTableBreakInfo),
-			new ChemistryTable(new BID(Ids::CHEMISTRY_TABLE, Meta::CHEMISTRY_ELEMENT_CONSTRUCTOR), "Element Constructor", $chemistryTableBreakInfo),
-			new ChemistryTable(new BID(Ids::CHEMISTRY_TABLE, Meta::CHEMISTRY_LAB_TABLE), "Lab Table", $chemistryTableBreakInfo),
-			new ChemistryTable(new BID(Ids::CHEMISTRY_TABLE, Meta::CHEMISTRY_MATERIAL_REDUCER), "Material Reducer", $chemistryTableBreakInfo)
-		);
-
-		$this->registerAllMeta(new ChemicalHeat(new BID(Ids::CHEMICAL_HEAT, 0), "Heat Block", $chemistryTableBreakInfo));
-
-		$this->registerMushroomBlocks();
-
-		$this->registerAllMeta(new Coral(
-			new BID(Ids::CORAL, 0),
-			"Coral",
-			BreakInfo::instant(),
-		));
-		$this->registerAllMeta(new FloorCoralFan(
-			new BlockIdentifierFlattened(Ids::CORAL_FAN, [Ids::CORAL_FAN_DEAD], 0, ItemIds::CORAL_FAN),
-			"Coral Fan",
-			BreakInfo::instant(),
-		));
-		$this->registerAllMeta(new WallCoralFan(
-			new BlockIdentifierFlattened(Ids::CORAL_FAN_HANG, [Ids::CORAL_FAN_HANG2, Ids::CORAL_FAN_HANG3], 0, ItemIds::CORAL_FAN),
-			"Wall Coral Fan",
-			BreakInfo::instant(),
-		));
-
-		//region --- auto-generated TODOs for bedrock-1.11.0 ---
-		//TODO: minecraft:bubble_column
-		//TODO: minecraft:campfire
-		//TODO: minecraft:cartography_table
-		//TODO: minecraft:cauldron
-		//TODO: minecraft:chain_command_block
-		//TODO: minecraft:chorus_flower
-		//TODO: minecraft:chorus_plant
-		//TODO: minecraft:command_block
-		//TODO: minecraft:composter
-		//TODO: minecraft:conduit
-		//TODO: minecraft:dispenser
-		//TODO: minecraft:dropper
-		//TODO: minecraft:end_gateway
-		//TODO: minecraft:end_portal
-		//TODO: minecraft:grindstone
-		//TODO: minecraft:jigsaw
-		//TODO: minecraft:kelp
-		//TODO: minecraft:lava_cauldron
-		//TODO: minecraft:movingBlock
-		//TODO: minecraft:observer
-		//TODO: minecraft:piston
-		//TODO: minecraft:pistonArmCollision
-		//TODO: minecraft:repeating_command_block
-		//TODO: minecraft:scaffolding
-		//TODO: minecraft:seagrass
-		//TODO: minecraft:smithing_table
-		//TODO: minecraft:sticky_piston
-		//TODO: minecraft:structure_block
-		//TODO: minecraft:turtle_egg
-		//endregion
-
-		//region --- auto-generated TODOs for bedrock-1.13.0 ---
-		//TODO: minecraft:camera
-		//TODO: minecraft:light_block
-		//TODO: minecraft:stickyPistonArmCollision
-		//TODO: minecraft:structure_void
-		//TODO: minecraft:wither_rose
-		//endregion
-
-		//region --- auto-generated TODOs for bedrock-1.14.0 ---
-		//TODO: minecraft:bee_nest
-		//TODO: minecraft:beehive
-		//TODO: minecraft:honey_block
-		//TODO: minecraft:honeycomb_block
-		//endregion
-
-		//region --- auto-generated TODOs for bedrock-1.16.0 ---
-		//TODO: minecraft:allow
-		//TODO: minecraft:ancient_debris
-		//TODO: minecraft:basalt
-		//TODO: minecraft:blackstone
-		//TODO: minecraft:blackstone_double_slab
-		//TODO: minecraft:blackstone_slab
-		//TODO: minecraft:blackstone_stairs
-		//TODO: minecraft:blackstone_wall
-		//TODO: minecraft:border_block
-		//TODO: minecraft:chain
-		//TODO: minecraft:chiseled_nether_bricks
-		//TODO: minecraft:chiseled_polished_blackstone
-		//TODO: minecraft:cracked_nether_bricks
-		//TODO: minecraft:cracked_polished_blackstone_bricks
-		//TODO: minecraft:crimson_button
-		//TODO: minecraft:crimson_door
-		//TODO: minecraft:crimson_double_slab
-		//TODO: minecraft:crimson_fence
-		//TODO: minecraft:crimson_fence_gate
-		//TODO: minecraft:crimson_fungus
-		//TODO: minecraft:crimson_hyphae
-		//TODO: minecraft:crimson_nylium
-		//TODO: minecraft:crimson_planks
-		//TODO: minecraft:crimson_pressure_plate
-		//TODO: minecraft:crimson_roots
-		//TODO: minecraft:crimson_slab
-		//TODO: minecraft:crimson_stairs
-		//TODO: minecraft:crimson_standing_sign
-		//TODO: minecraft:crimson_stem
-		//TODO: minecraft:crimson_trapdoor
-		//TODO: minecraft:crimson_wall_sign
-		//TODO: minecraft:crying_obsidian
-		//TODO: minecraft:deny
-		//TODO: minecraft:gilded_blackstone
-		//TODO: minecraft:lodestone
-		//TODO: minecraft:nether_gold_ore
-		//TODO: minecraft:nether_sprouts
-		//TODO: minecraft:netherite_block
-		//TODO: minecraft:polished_basalt
-		//TODO: minecraft:polished_blackstone
-		//TODO: minecraft:polished_blackstone_brick_double_slab
-		//TODO: minecraft:polished_blackstone_brick_slab
-		//TODO: minecraft:polished_blackstone_brick_stairs
-		//TODO: minecraft:polished_blackstone_brick_wall
-		//TODO: minecraft:polished_blackstone_bricks
-		//TODO: minecraft:polished_blackstone_button
-		//TODO: minecraft:polished_blackstone_double_slab
-		//TODO: minecraft:polished_blackstone_pressure_plate
-		//TODO: minecraft:polished_blackstone_slab
-		//TODO: minecraft:polished_blackstone_stairs
-		//TODO: minecraft:polished_blackstone_wall
-		//TODO: minecraft:quartz_bricks
-		//TODO: minecraft:respawn_anchor
-		//TODO: minecraft:shroomlight
-		//TODO: minecraft:soul_campfire
-		//TODO: minecraft:soul_fire
-		//TODO: minecraft:soul_lantern
-		//TODO: minecraft:soul_soil
-		//TODO: minecraft:soul_torch
-		//TODO: minecraft:stripped_crimson_hyphae
-		//TODO: minecraft:stripped_crimson_stem
-		//TODO: minecraft:stripped_warped_hyphae
-		//TODO: minecraft:stripped_warped_stem
-		//TODO: minecraft:target
-		//TODO: minecraft:twisting_vines
-		//TODO: minecraft:warped_button
-		//TODO: minecraft:warped_door
-		//TODO: minecraft:warped_double_slab
-		//TODO: minecraft:warped_fence
-		//TODO: minecraft:warped_fence_gate
-		//TODO: minecraft:warped_fungus
-		//TODO: minecraft:warped_hyphae
-		//TODO: minecraft:warped_nylium
-		//TODO: minecraft:warped_planks
-		//TODO: minecraft:warped_pressure_plate
-		//TODO: minecraft:warped_roots
-		//TODO: minecraft:warped_slab
-		//TODO: minecraft:warped_stairs
-		//TODO: minecraft:warped_standing_sign
-		//TODO: minecraft:warped_stem
-		//TODO: minecraft:warped_trapdoor
-		//TODO: minecraft:warped_wall_sign
-		//TODO: minecraft:warped_wart_block
-		//TODO: minecraft:weeping_vines
-		//endregion
-	}
-
-	private function registerMushroomBlocks() : void{
-		//shrooms have to be handled one by one because some metas are variants and others aren't, and they can't be
-		//separated by a bitmask
-
-		$mushroomBlockBreakInfo = new BreakInfo(0.2, ToolType::AXE);
-
-		$mushroomBlocks = [
-			new BrownMushroomBlock(new BID(Ids::BROWN_MUSHROOM_BLOCK, 0), "Brown Mushroom Block", $mushroomBlockBreakInfo),
-			new RedMushroomBlock(new BID(Ids::RED_MUSHROOM_BLOCK, 0), "Red Mushroom Block", $mushroomBlockBreakInfo)
-		];
-
-		//caps
-		foreach([
-			Meta::MUSHROOM_BLOCK_ALL_PORES,
-			Meta::MUSHROOM_BLOCK_CAP_NORTHWEST_CORNER,
-			Meta::MUSHROOM_BLOCK_CAP_NORTH_SIDE,
-			Meta::MUSHROOM_BLOCK_CAP_NORTHEAST_CORNER,
-			Meta::MUSHROOM_BLOCK_CAP_WEST_SIDE,
-			Meta::MUSHROOM_BLOCK_CAP_TOP_ONLY,
-			Meta::MUSHROOM_BLOCK_CAP_EAST_SIDE,
-			Meta::MUSHROOM_BLOCK_CAP_SOUTHWEST_CORNER,
-			Meta::MUSHROOM_BLOCK_CAP_SOUTH_SIDE,
-			Meta::MUSHROOM_BLOCK_CAP_SOUTHEAST_CORNER,
-			Meta::MUSHROOM_BLOCK_ALL_CAP,
-		] as $meta){
-			foreach($mushroomBlocks as $block){
-				$block->readStateFromData($block->getId(), $meta);
-				$this->remap($block->getId(), $meta, clone $block);
-			}
-		}
-
-		//and the invalid states
-		for($meta = 11; $meta <= 13; ++$meta){
-			foreach($mushroomBlocks as $block){
-				$this->remap($block->getId(), $meta, clone $block);
-			}
-		}
-
-		//finally, the stems
-		$mushroomStem = new MushroomStem(new BID(Ids::BROWN_MUSHROOM_BLOCK, Meta::MUSHROOM_BLOCK_STEM), "Mushroom Stem", $mushroomBlockBreakInfo);
-		$this->remap(Ids::BROWN_MUSHROOM_BLOCK, Meta::MUSHROOM_BLOCK_STEM, $mushroomStem);
-		$this->remap(Ids::RED_MUSHROOM_BLOCK, Meta::MUSHROOM_BLOCK_STEM, $mushroomStem);
-		$allSidedMushroomStem = new MushroomStem(new BID(Ids::BROWN_MUSHROOM_BLOCK, Meta::MUSHROOM_BLOCK_ALL_STEM), "All Sided Mushroom Stem", $mushroomBlockBreakInfo);
-		$this->remap(Ids::BROWN_MUSHROOM_BLOCK, Meta::MUSHROOM_BLOCK_ALL_STEM, $allSidedMushroomStem);
-		$this->remap(Ids::RED_MUSHROOM_BLOCK, Meta::MUSHROOM_BLOCK_ALL_STEM, $allSidedMushroomStem);
-	}
-
-	private function registerElements() : void{
-		$instaBreak = BreakInfo::instant();
-		$this->registerAllMeta(new Opaque(new BID(Ids::ELEMENT_0, 0), "???", $instaBreak));
-
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_1, 0), "Hydrogen", $instaBreak, "h", 1, 5));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_2, 0), "Helium", $instaBreak, "he", 2, 7));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_3, 0), "Lithium", $instaBreak, "li", 3, 0));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_4, 0), "Beryllium", $instaBreak, "be", 4, 1));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_5, 0), "Boron", $instaBreak, "b", 5, 4));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_6, 0), "Carbon", $instaBreak, "c", 6, 5));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_7, 0), "Nitrogen", $instaBreak, "n", 7, 5));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_8, 0), "Oxygen", $instaBreak, "o", 8, 5));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_9, 0), "Fluorine", $instaBreak, "f", 9, 6));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_10, 0), "Neon", $instaBreak, "ne", 10, 7));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_11, 0), "Sodium", $instaBreak, "na", 11, 0));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_12, 0), "Magnesium", $instaBreak, "mg", 12, 1));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_13, 0), "Aluminum", $instaBreak, "al", 13, 3));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_14, 0), "Silicon", $instaBreak, "si", 14, 4));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_15, 0), "Phosphorus", $instaBreak, "p", 15, 5));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_16, 0), "Sulfur", $instaBreak, "s", 16, 5));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_17, 0), "Chlorine", $instaBreak, "cl", 17, 6));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_18, 0), "Argon", $instaBreak, "ar", 18, 7));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_19, 0), "Potassium", $instaBreak, "k", 19, 0));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_20, 0), "Calcium", $instaBreak, "ca", 20, 1));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_21, 0), "Scandium", $instaBreak, "sc", 21, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_22, 0), "Titanium", $instaBreak, "ti", 22, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_23, 0), "Vanadium", $instaBreak, "v", 23, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_24, 0), "Chromium", $instaBreak, "cr", 24, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_25, 0), "Manganese", $instaBreak, "mn", 25, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_26, 0), "Iron", $instaBreak, "fe", 26, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_27, 0), "Cobalt", $instaBreak, "co", 27, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_28, 0), "Nickel", $instaBreak, "ni", 28, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_29, 0), "Copper", $instaBreak, "cu", 29, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_30, 0), "Zinc", $instaBreak, "zn", 30, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_31, 0), "Gallium", $instaBreak, "ga", 31, 3));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_32, 0), "Germanium", $instaBreak, "ge", 32, 4));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_33, 0), "Arsenic", $instaBreak, "as", 33, 4));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_34, 0), "Selenium", $instaBreak, "se", 34, 5));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_35, 0), "Bromine", $instaBreak, "br", 35, 6));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_36, 0), "Krypton", $instaBreak, "kr", 36, 7));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_37, 0), "Rubidium", $instaBreak, "rb", 37, 0));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_38, 0), "Strontium", $instaBreak, "sr", 38, 1));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_39, 0), "Yttrium", $instaBreak, "y", 39, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_40, 0), "Zirconium", $instaBreak, "zr", 40, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_41, 0), "Niobium", $instaBreak, "nb", 41, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_42, 0), "Molybdenum", $instaBreak, "mo", 42, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_43, 0), "Technetium", $instaBreak, "tc", 43, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_44, 0), "Ruthenium", $instaBreak, "ru", 44, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_45, 0), "Rhodium", $instaBreak, "rh", 45, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_46, 0), "Palladium", $instaBreak, "pd", 46, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_47, 0), "Silver", $instaBreak, "ag", 47, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_48, 0), "Cadmium", $instaBreak, "cd", 48, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_49, 0), "Indium", $instaBreak, "in", 49, 3));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_50, 0), "Tin", $instaBreak, "sn", 50, 3));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_51, 0), "Antimony", $instaBreak, "sb", 51, 4));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_52, 0), "Tellurium", $instaBreak, "te", 52, 4));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_53, 0), "Iodine", $instaBreak, "i", 53, 6));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_54, 0), "Xenon", $instaBreak, "xe", 54, 7));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_55, 0), "Cesium", $instaBreak, "cs", 55, 0));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_56, 0), "Barium", $instaBreak, "ba", 56, 1));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_57, 0), "Lanthanum", $instaBreak, "la", 57, 8));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_58, 0), "Cerium", $instaBreak, "ce", 58, 8));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_59, 0), "Praseodymium", $instaBreak, "pr", 59, 8));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_60, 0), "Neodymium", $instaBreak, "nd", 60, 8));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_61, 0), "Promethium", $instaBreak, "pm", 61, 8));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_62, 0), "Samarium", $instaBreak, "sm", 62, 8));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_63, 0), "Europium", $instaBreak, "eu", 63, 8));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_64, 0), "Gadolinium", $instaBreak, "gd", 64, 8));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_65, 0), "Terbium", $instaBreak, "tb", 65, 8));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_66, 0), "Dysprosium", $instaBreak, "dy", 66, 8));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_67, 0), "Holmium", $instaBreak, "ho", 67, 8));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_68, 0), "Erbium", $instaBreak, "er", 68, 8));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_69, 0), "Thulium", $instaBreak, "tm", 69, 8));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_70, 0), "Ytterbium", $instaBreak, "yb", 70, 8));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_71, 0), "Lutetium", $instaBreak, "lu", 71, 8));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_72, 0), "Hafnium", $instaBreak, "hf", 72, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_73, 0), "Tantalum", $instaBreak, "ta", 73, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_74, 0), "Tungsten", $instaBreak, "w", 74, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_75, 0), "Rhenium", $instaBreak, "re", 75, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_76, 0), "Osmium", $instaBreak, "os", 76, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_77, 0), "Iridium", $instaBreak, "ir", 77, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_78, 0), "Platinum", $instaBreak, "pt", 78, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_79, 0), "Gold", $instaBreak, "au", 79, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_80, 0), "Mercury", $instaBreak, "hg", 80, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_81, 0), "Thallium", $instaBreak, "tl", 81, 3));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_82, 0), "Lead", $instaBreak, "pb", 82, 3));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_83, 0), "Bismuth", $instaBreak, "bi", 83, 3));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_84, 0), "Polonium", $instaBreak, "po", 84, 4));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_85, 0), "Astatine", $instaBreak, "at", 85, 6));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_86, 0), "Radon", $instaBreak, "rn", 86, 7));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_87, 0), "Francium", $instaBreak, "fr", 87, 0));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_88, 0), "Radium", $instaBreak, "ra", 88, 1));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_89, 0), "Actinium", $instaBreak, "ac", 89, 9));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_90, 0), "Thorium", $instaBreak, "th", 90, 9));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_91, 0), "Protactinium", $instaBreak, "pa", 91, 9));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_92, 0), "Uranium", $instaBreak, "u", 92, 9));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_93, 0), "Neptunium", $instaBreak, "np", 93, 9));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_94, 0), "Plutonium", $instaBreak, "pu", 94, 9));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_95, 0), "Americium", $instaBreak, "am", 95, 9));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_96, 0), "Curium", $instaBreak, "cm", 96, 9));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_97, 0), "Berkelium", $instaBreak, "bk", 97, 9));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_98, 0), "Californium", $instaBreak, "cf", 98, 9));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_99, 0), "Einsteinium", $instaBreak, "es", 99, 9));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_100, 0), "Fermium", $instaBreak, "fm", 100, 9));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_101, 0), "Mendelevium", $instaBreak, "md", 101, 9));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_102, 0), "Nobelium", $instaBreak, "no", 102, 9));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_103, 0), "Lawrencium", $instaBreak, "lr", 103, 9));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_104, 0), "Rutherfordium", $instaBreak, "rf", 104, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_105, 0), "Dubnium", $instaBreak, "db", 105, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_106, 0), "Seaborgium", $instaBreak, "sg", 106, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_107, 0), "Bohrium", $instaBreak, "bh", 107, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_108, 0), "Hassium", $instaBreak, "hs", 108, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_109, 0), "Meitnerium", $instaBreak, "mt", 109, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_110, 0), "Darmstadtium", $instaBreak, "ds", 110, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_111, 0), "Roentgenium", $instaBreak, "rg", 111, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_112, 0), "Copernicium", $instaBreak, "cn", 112, 2));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_113, 0), "Nihonium", $instaBreak, "nh", 113, 3));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_114, 0), "Flerovium", $instaBreak, "fl", 114, 3));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_115, 0), "Moscovium", $instaBreak, "mc", 115, 3));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_116, 0), "Livermorium", $instaBreak, "lv", 116, 3));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_117, 0), "Tennessine", $instaBreak, "ts", 117, 6));
-		$this->registerAllMeta(new Element(new BID(Ids::ELEMENT_118, 0), "Oganesson", $instaBreak, "og", 118, 7));
-	}
-
-	/**
-	 * Claims the whole metadata range (0-15) for all IDs associated with this block. Any unregistered states will be
-	 * mapped to the default (provided) state.
-	 *
-	 * This should only be used when this block type has sole ownership of an ID. For IDs which contain multiple block
-	 * types (variants), the regular register() method should be used instead.
-	 */
-	private function registerAllMeta(Block $default, Block ...$additional) : void{
-		$ids = [];
-		$this->register($default);
-		foreach($default->getIdInfo()->getAllBlockIds() as $id){
-			$ids[$id] = $id;
-		}
-		foreach($additional as $block){
-			$this->register($block);
-			foreach($block->getIdInfo()->getAllBlockIds() as $id){
-				$ids[$id] = $id;
-			}
-		}
-
-		foreach($ids as $id){
-			for($meta = 0; $meta < 1 << Block::INTERNAL_METADATA_BITS; ++$meta){
-				if(!$this->isRegistered($id, $meta)){
-					$this->remap($id, $meta, $default);
-				}
-			}
-		}
-	}
-
-	private function registerSlabWithDoubleHighBitsRemapping(Slab $block) : void{
-		$this->register($block);
-		$identifierFlattened = $block->getIdInfo();
-		if($identifierFlattened instanceof BlockIdentifierFlattened){
-			$this->remap($identifierFlattened->getSecondId(), $identifierFlattened->getVariant() | 0x8, $block->setSlabType(SlabType::DOUBLE()));
-		}
-	}
-
-	/**
-	 * Maps a block type to its corresponding ID. This is necessary to ensure that the block is correctly loaded when
-	 * reading from disk storage.
-	 *
-	 * NOTE: If you are registering a new block type, you will need to add it to the creative inventory yourself - it
-	 * will not automatically appear there.
-	 *
-	 * @param bool $override Whether to override existing registrations
-	 *
-	 * @throws \RuntimeException if something attempted to override an already-registered block without specifying the
-	 * $override parameter.
-	 */
-	public function register(Block $block, bool $override = false) : void{
-		$variant = $block->getIdInfo()->getVariant();
-
-		$stateMask = $block->getStateBitmask();
-		if(($variant & $stateMask) !== 0){
-			throw new \InvalidArgumentException("Block variant collides with state bitmask");
-		}
-
-		foreach($block->getIdInfo()->getAllBlockIds() as $id){
-			if(!$override && $this->isRegistered($id, $variant)){
-				throw new \InvalidArgumentException("Block registration $id:$variant conflicts with an existing block");
-			}
-
-			for($m = $variant; $m <= ($variant | $stateMask); ++$m){
-				if(($m & ~$stateMask) !== $variant){
-					continue;
-				}
-
-				if(!$override && $this->isRegistered($id, $m)){
-					throw new \InvalidArgumentException("Block registration " . get_class($block) . " has states which conflict with other blocks");
-				}
-
-				$index = ($id << Block::INTERNAL_METADATA_BITS) | $m;
-
-				$v = clone $block;
-				try{
-					$v->readStateFromData($id, $m);
-					if($v->getFullId() !== $index){
-						//if the fullID comes back different, this is a broken state that we can't rely on; map it to default
-						throw new InvalidBlockStateException("Corrupted state");
-					}
-				}catch(InvalidBlockStateException $e){ //invalid property combination, fill the default state
-					$this->fillStaticArrays($index, $block);
-					continue;
-				}
-
-				$this->fillStaticArrays($index, $v);
-			}
-		}
-	}
-
-	public function remap(int $id, int $meta, Block $block) : void{
-		$index = ($id << Block::INTERNAL_METADATA_BITS) | $meta;
-		if($this->isRegistered($id, $meta)){
-			$existing = $this->fullList[$index];
-			if($existing !== null && $existing->getFullId() === $index){
-				throw new \InvalidArgumentException("$id:$meta is already mapped");
-			}else{
-				//if it's not a match, this was already remapped for some reason; remapping overwrites are OK
-			}
-		}
-		$this->fillStaticArrays(($id << Block::INTERNAL_METADATA_BITS) | $meta, $block);
-	}
-
-	private function fillStaticArrays(int $index, Block $block) : void{
-		$this->fullList[$index] = $block;
-		$this->mappedStateIds[$index] = $block->getFullId();
-		$this->light[$index] = $block->getLightLevel();
-		$this->lightFilter[$index] = min(15, $block->getLightFilter() + 1); //opacity plus 1 standard light filter
-		$this->blocksDirectSkyLight[$index] = $block->blocksDirectSkyLight();
-		$this->blastResistance[$index] = $block->getBreakInfo()->getBlastResistance();
-	}
-
-	/**
-	 * @deprecated This method should ONLY be used for deserializing data, e.g. from a config or database. For all other
-	 * purposes, use VanillaBlocks.
-	 * @see VanillaBlocks
-	 *
-	 * Deserializes a block from the provided legacy ID and legacy meta.
-	 */
-	public function get(int $id, int $meta) : Block{
-		if($meta < 0 || $meta >= (1 << Block::INTERNAL_METADATA_BITS)){
-			throw new \InvalidArgumentException("Block meta value $meta is out of bounds");
-		}
-
-		$index = ($id << Block::INTERNAL_METADATA_BITS) | $meta;
-		if($index < 0 || $index >= $this->fullList->getSize()){
-			throw new \InvalidArgumentException("Block ID $id is out of bounds");
-		}
-		if($this->fullList[$index] !== null){
-			$block = clone $this->fullList[$index];
-		}else{
-			$block = new UnknownBlock(new BID($id, $meta), BreakInfo::instant());
-		}
-
-		return $block;
-	}
-
-	public function fromFullBlock(int $fullState) : Block{
-		return $this->get($fullState >> Block::INTERNAL_METADATA_BITS, $fullState & Block::INTERNAL_METADATA_MASK);
-	}
-
-	/**
-	 * Returns whether a specified block state is already registered in the block factory.
-	 */
-	public function isRegistered(int $id, int $meta = 0) : bool{
-		$b = $this->fullList[($id << Block::INTERNAL_METADATA_BITS) | $meta];
-		return $b !== null && !($b instanceof UnknownBlock);
-	}
-
-	/**
-	 * @return Block[]
-	 */
-	public function getAllKnownStates() : array{
-		return array_filter($this->fullList->toArray(), function(?Block $v) : bool{ return $v !== null; });
-	}
-
-	/**
-	 * Returns the ID of the state mapped to the given state ID.
-	 * Used to correct invalid blockstates found in loaded chunks.
-	 */
-	public function getMappedStateId(int $fullState) : int{
-		return $this->mappedStateIds[$fullState] ?? $fullState;
-	}
-}
diff --git a/src/block/BlockIdentifier.php b/src/block/BlockIdentifier.php
index 664aab3d0a..847231682f 100644
--- a/src/block/BlockIdentifier.php
+++ b/src/block/BlockIdentifier.php
@@ -31,34 +31,18 @@ class BlockIdentifier{
 	 * @phpstan-param class-string<Tile>|null $tileClass
 	 */
 	public function __construct(
-		private int $blockId,
-		private int $variant,
-		private ?int $itemId = null,
+		private int $blockTypeId,
 		private ?string $tileClass = null
 	){
+		if($blockTypeId < 0){
+			throw new \InvalidArgumentException("Block type ID may not be negative");
+		}
 		if($tileClass !== null){
 			Utils::testValidInstance($tileClass, Tile::class);
 		}
 	}
 
-	public function getBlockId() : int{
-		return $this->blockId;
-	}
-
-	/**
-	 * @return int[]
-	 */
-	public function getAllBlockIds() : array{
-		return [$this->blockId];
-	}
-
-	public function getVariant() : int{
-		return $this->variant;
-	}
-
-	public function getItemId() : int{
-		return $this->itemId ?? ($this->blockId > 255 ? 255 - $this->blockId : $this->blockId);
-	}
+	public function getBlockTypeId() : int{ return $this->blockTypeId; }
 
 	/**
 	 * @phpstan-return class-string<Tile>|null
diff --git a/src/block/BlockIdentifierFlattened.php b/src/block/BlockIdentifierFlattened.php
deleted file mode 100644
index 3e390049e8..0000000000
--- a/src/block/BlockIdentifierFlattened.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\block;
-
-use function count;
-
-class BlockIdentifierFlattened extends BlockIdentifier{
-
-	/** @var int[] */
-	private array $additionalIds;
-
-	/**
-	 * @param int[] $additionalIds
-	 */
-	public function __construct(int $blockId, array $additionalIds, int $variant, ?int $itemId = null, ?string $tileClass = null){
-		if(count($additionalIds) === 0){
-			throw new \InvalidArgumentException("Expected at least 1 additional ID");
-		}
-		parent::__construct($blockId, $variant, $itemId, $tileClass);
-
-		$this->additionalIds = $additionalIds;
-	}
-
-	public function getAdditionalId(int $index) : int{
-		if(!isset($this->additionalIds[$index])){
-			throw new \InvalidArgumentException("No such ID at index $index");
-		}
-		return $this->additionalIds[$index];
-	}
-
-	public function getSecondId() : int{
-		return $this->getAdditionalId(0);
-	}
-
-	public function getAllBlockIds() : array{
-		return [$this->getBlockId(), ...$this->additionalIds];
-	}
-}
diff --git a/src/block/BlockLegacyIdHelper.php b/src/block/BlockLegacyIdHelper.php
deleted file mode 100644
index 50d6b86b4f..0000000000
--- a/src/block/BlockLegacyIdHelper.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\block;
-
-use pocketmine\block\BlockIdentifier as BID;
-use pocketmine\block\BlockLegacyIds as Ids;
-use pocketmine\block\tile\Sign as TileSign;
-use pocketmine\block\utils\DyeColor;
-use pocketmine\block\utils\TreeType;
-use pocketmine\item\ItemIds;
-use pocketmine\utils\AssumptionFailedError;
-
-final class BlockLegacyIdHelper{
-
-	public static function getWoodenFloorSignIdentifier(TreeType $treeType) : BID{
-		switch($treeType->id()){
-			case TreeType::OAK()->id():
-				return new BID(Ids::SIGN_POST, 0, ItemIds::SIGN, TileSign::class);
-			case TreeType::SPRUCE()->id():
-				return new BID(Ids::SPRUCE_STANDING_SIGN, 0, ItemIds::SPRUCE_SIGN, TileSign::class);
-			case TreeType::BIRCH()->id():
-				return new BID(Ids::BIRCH_STANDING_SIGN, 0, ItemIds::BIRCH_SIGN, TileSign::class);
-			case TreeType::JUNGLE()->id():
-				return new BID(Ids::JUNGLE_STANDING_SIGN, 0, ItemIds::JUNGLE_SIGN, TileSign::class);
-			case TreeType::ACACIA()->id():
-				return new BID(Ids::ACACIA_STANDING_SIGN,0, ItemIds::ACACIA_SIGN, TileSign::class);
-			case TreeType::DARK_OAK()->id():
-				return new BID(Ids::DARKOAK_STANDING_SIGN, 0, ItemIds::DARKOAK_SIGN, TileSign::class);
-		}
-		throw new AssumptionFailedError("Switch should cover all wood types");
-	}
-
-	public static function getWoodenWallSignIdentifier(TreeType $treeType) : BID{
-		switch($treeType->id()){
-			case TreeType::OAK()->id():
-				return new BID(Ids::WALL_SIGN, 0, ItemIds::SIGN, TileSign::class);
-			case TreeType::SPRUCE()->id():
-				return new BID(Ids::SPRUCE_WALL_SIGN, 0, ItemIds::SPRUCE_SIGN, TileSign::class);
-			case TreeType::BIRCH()->id():
-				return new BID(Ids::BIRCH_WALL_SIGN, 0, ItemIds::BIRCH_SIGN, TileSign::class);
-			case TreeType::JUNGLE()->id():
-				return new BID(Ids::JUNGLE_WALL_SIGN, 0, ItemIds::JUNGLE_SIGN, TileSign::class);
-			case TreeType::ACACIA()->id():
-				return new BID(Ids::ACACIA_WALL_SIGN, 0, ItemIds::ACACIA_SIGN, TileSign::class);
-			case TreeType::DARK_OAK()->id():
-				return new BID(Ids::DARKOAK_WALL_SIGN, 0, ItemIds::DARKOAK_SIGN, TileSign::class);
-		}
-		throw new AssumptionFailedError("Switch should cover all wood types");
-	}
-
-	public static function getWoodenTrapdoorIdentifier(TreeType $treeType) : BlockIdentifier{
-		switch($treeType->id()){
-			case TreeType::OAK()->id():
-				return new BlockIdentifier(Ids::WOODEN_TRAPDOOR, 0);
-			case TreeType::SPRUCE()->id():
-				return new BlockIdentifier(Ids::SPRUCE_TRAPDOOR, 0);
-			case TreeType::BIRCH()->id():
-				return new BlockIdentifier(Ids::BIRCH_TRAPDOOR, 0);
-			case TreeType::JUNGLE()->id():
-				return new BlockIdentifier(Ids::JUNGLE_TRAPDOOR, 0);
-			case TreeType::ACACIA()->id():
-				return new BlockIdentifier(Ids::ACACIA_TRAPDOOR, 0);
-			case TreeType::DARK_OAK()->id():
-				return new BlockIdentifier(Ids::DARK_OAK_TRAPDOOR, 0);
-		}
-		throw new AssumptionFailedError("Switch should cover all wood types");
-	}
-
-	public static function getWoodenButtonIdentifier(TreeType $treeType) : BlockIdentifier{
-		switch($treeType->id()){
-			case TreeType::OAK()->id():
-				return new BlockIdentifier(Ids::WOODEN_BUTTON, 0);
-			case TreeType::SPRUCE()->id():
-				return new BlockIdentifier(Ids::SPRUCE_BUTTON, 0);
-			case TreeType::BIRCH()->id():
-				return new BlockIdentifier(Ids::BIRCH_BUTTON, 0);
-			case TreeType::JUNGLE()->id():
-				return new BlockIdentifier(Ids::JUNGLE_BUTTON, 0);
-			case TreeType::ACACIA()->id():
-				return new BlockIdentifier(Ids::ACACIA_BUTTON, 0);
-			case TreeType::DARK_OAK()->id():
-				return new BlockIdentifier(Ids::DARK_OAK_BUTTON, 0);
-		}
-		throw new AssumptionFailedError("Switch should cover all wood types");
-	}
-
-	public static function getWoodenPressurePlateIdentifier(TreeType $treeType) : BlockIdentifier{
-		switch($treeType->id()){
-			case TreeType::OAK()->id():
-				return new BlockIdentifier(Ids::WOODEN_PRESSURE_PLATE, 0);
-			case TreeType::SPRUCE()->id():
-				return new BlockIdentifier(Ids::SPRUCE_PRESSURE_PLATE, 0);
-			case TreeType::BIRCH()->id():
-				return new BlockIdentifier(Ids::BIRCH_PRESSURE_PLATE, 0);
-			case TreeType::JUNGLE()->id():
-				return new BlockIdentifier(Ids::JUNGLE_PRESSURE_PLATE, 0);
-			case TreeType::ACACIA()->id():
-				return new BlockIdentifier(Ids::ACACIA_PRESSURE_PLATE, 0);
-			case TreeType::DARK_OAK()->id():
-				return new BlockIdentifier(Ids::DARK_OAK_PRESSURE_PLATE, 0);
-		}
-		throw new AssumptionFailedError("Switch should cover all wood types");
-	}
-
-	public static function getWoodenDoorIdentifier(TreeType $treeType) : BlockIdentifier{
-		switch($treeType->id()){
-			case TreeType::OAK()->id():
-				return new BID(Ids::OAK_DOOR_BLOCK, 0, ItemIds::OAK_DOOR);
-			case TreeType::SPRUCE()->id():
-				return new BID(Ids::SPRUCE_DOOR_BLOCK, 0, ItemIds::SPRUCE_DOOR);
-			case TreeType::BIRCH()->id():
-				return new BID(Ids::BIRCH_DOOR_BLOCK, 0, ItemIds::BIRCH_DOOR);
-			case TreeType::JUNGLE()->id():
-				return new BID(Ids::JUNGLE_DOOR_BLOCK, 0, ItemIds::JUNGLE_DOOR);
-			case TreeType::ACACIA()->id():
-				return new BID(Ids::ACACIA_DOOR_BLOCK, 0, ItemIds::ACACIA_DOOR);
-			case TreeType::DARK_OAK()->id():
-				return new BID(Ids::DARK_OAK_DOOR_BLOCK, 0, ItemIds::DARK_OAK_DOOR);
-		}
-		throw new AssumptionFailedError("Switch should cover all wood types");
-	}
-
-	public static function getWoodenFenceIdentifier(TreeType $treeType) : BlockIdentifier{
-		switch($treeType->id()){
-			case TreeType::OAK()->id():
-				return new BlockIdentifier(Ids::OAK_FENCE_GATE, 0);
-			case TreeType::SPRUCE()->id():
-				return new BlockIdentifier(Ids::SPRUCE_FENCE_GATE, 0);
-			case TreeType::BIRCH()->id():
-				return new BlockIdentifier(Ids::BIRCH_FENCE_GATE, 0);
-			case TreeType::JUNGLE()->id():
-				return new BlockIdentifier(Ids::JUNGLE_FENCE_GATE, 0);
-			case TreeType::ACACIA()->id():
-				return new BlockIdentifier(Ids::ACACIA_FENCE_GATE, 0);
-			case TreeType::DARK_OAK()->id():
-				return new BlockIdentifier(Ids::DARK_OAK_FENCE_GATE, 0);
-		}
-		throw new AssumptionFailedError("Switch should cover all wood types");
-	}
-
-	public static function getWoodenStairsIdentifier(TreeType $treeType) : BlockIdentifier{
-		switch($treeType->id()){
-			case TreeType::OAK()->id():
-				return new BlockIdentifier(Ids::OAK_STAIRS, 0);
-			case TreeType::SPRUCE()->id():
-				return new BlockIdentifier(Ids::SPRUCE_STAIRS, 0);
-			case TreeType::BIRCH()->id():
-				return new BlockIdentifier(Ids::BIRCH_STAIRS, 0);
-			case TreeType::JUNGLE()->id():
-				return new BlockIdentifier(Ids::JUNGLE_STAIRS, 0);
-			case TreeType::ACACIA()->id():
-				return new BlockIdentifier(Ids::ACACIA_STAIRS, 0);
-			case TreeType::DARK_OAK()->id():
-				return new BlockIdentifier(Ids::DARK_OAK_STAIRS, 0);
-		}
-		throw new AssumptionFailedError("Switch should cover all wood types");
-	}
-
-	public static function getStrippedLogIdentifier(TreeType $treeType) : BlockIdentifier{
-		switch($treeType->id()){
-			case TreeType::OAK()->id():
-				return new BlockIdentifier(Ids::STRIPPED_OAK_LOG, 0);
-			case TreeType::SPRUCE()->id():
-				return new BlockIdentifier(Ids::STRIPPED_SPRUCE_LOG, 0);
-			case TreeType::BIRCH()->id():
-				return new BlockIdentifier(Ids::STRIPPED_BIRCH_LOG, 0);
-			case TreeType::JUNGLE()->id():
-				return new BlockIdentifier(Ids::STRIPPED_JUNGLE_LOG, 0);
-			case TreeType::ACACIA()->id():
-				return new BlockIdentifier(Ids::STRIPPED_ACACIA_LOG, 0);
-			case TreeType::DARK_OAK()->id():
-				return new BlockIdentifier(Ids::STRIPPED_DARK_OAK_LOG, 0);
-		}
-		throw new AssumptionFailedError("Switch should cover all wood types");
-	}
-
-	public static function getGlazedTerracottaIdentifier(DyeColor $color) : BlockIdentifier{
-		switch($color->id()){
-			case DyeColor::WHITE()->id():
-				return new BlockIdentifier(Ids::WHITE_GLAZED_TERRACOTTA, 0);
-			case DyeColor::ORANGE()->id():
-				return new BlockIdentifier(Ids::ORANGE_GLAZED_TERRACOTTA, 0);
-			case DyeColor::MAGENTA()->id():
-				return new BlockIdentifier(Ids::MAGENTA_GLAZED_TERRACOTTA, 0);
-			case DyeColor::LIGHT_BLUE()->id():
-				return new BlockIdentifier(Ids::LIGHT_BLUE_GLAZED_TERRACOTTA, 0);
-			case DyeColor::YELLOW()->id():
-				return new BlockIdentifier(Ids::YELLOW_GLAZED_TERRACOTTA, 0);
-			case DyeColor::LIME()->id():
-				return new BlockIdentifier(Ids::LIME_GLAZED_TERRACOTTA, 0);
-			case DyeColor::PINK()->id():
-				return new BlockIdentifier(Ids::PINK_GLAZED_TERRACOTTA, 0);
-			case DyeColor::GRAY()->id():
-				return new BlockIdentifier(Ids::GRAY_GLAZED_TERRACOTTA, 0);
-			case DyeColor::LIGHT_GRAY()->id():
-				return new BlockIdentifier(Ids::SILVER_GLAZED_TERRACOTTA, 0);
-			case DyeColor::CYAN()->id():
-				return new BlockIdentifier(Ids::CYAN_GLAZED_TERRACOTTA, 0);
-			case DyeColor::PURPLE()->id():
-				return new BlockIdentifier(Ids::PURPLE_GLAZED_TERRACOTTA, 0);
-			case DyeColor::BLUE()->id():
-				return new BlockIdentifier(Ids::BLUE_GLAZED_TERRACOTTA, 0);
-			case DyeColor::BROWN()->id():
-				return new BlockIdentifier(Ids::BROWN_GLAZED_TERRACOTTA, 0);
-			case DyeColor::GREEN()->id():
-				return new BlockIdentifier(Ids::GREEN_GLAZED_TERRACOTTA, 0);
-			case DyeColor::RED()->id():
-				return new BlockIdentifier(Ids::RED_GLAZED_TERRACOTTA, 0);
-			case DyeColor::BLACK()->id():
-				return new BlockIdentifier(Ids::BLACK_GLAZED_TERRACOTTA, 0);
-		}
-		throw new AssumptionFailedError("Switch should cover all colours");
-	}
-
-	public static function getStoneSlabIdentifier(int $stoneSlabId, int $meta) : BlockIdentifierFlattened{
-		$id = [
-			1 => [Ids::STONE_SLAB, Ids::DOUBLE_STONE_SLAB],
-			2 => [Ids::STONE_SLAB2, Ids::DOUBLE_STONE_SLAB2],
-			3 => [Ids::STONE_SLAB3, Ids::DOUBLE_STONE_SLAB3],
-			4 => [Ids::STONE_SLAB4, Ids::DOUBLE_STONE_SLAB4]
-		][$stoneSlabId] ?? null;
-		if($id === null){
-			throw new \InvalidArgumentException("Stone slab type should be 1, 2, 3 or 4");
-		}
-		return new BlockIdentifierFlattened($id[0], [$id[1]], $meta);
-	}
-}
diff --git a/src/block/BlockLegacyIds.php b/src/block/BlockLegacyIds.php
deleted file mode 100644
index f4757e357c..0000000000
--- a/src/block/BlockLegacyIds.php
+++ /dev/null
@@ -1,501 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\block;
-
-final class BlockLegacyIds{
-
-	private function __construct(){
-		//NOOP
-	}
-
-	public const AIR = 0;
-	public const STONE = 1;
-	public const GRASS = 2;
-	public const DIRT = 3;
-	public const COBBLESTONE = 4;
-	public const PLANKS = 5, WOODEN_PLANKS = 5;
-	public const SAPLING = 6;
-	public const BEDROCK = 7;
-	public const FLOWING_WATER = 8;
-	public const STILL_WATER = 9, WATER = 9;
-	public const FLOWING_LAVA = 10;
-	public const LAVA = 11, STILL_LAVA = 11;
-	public const SAND = 12;
-	public const GRAVEL = 13;
-	public const GOLD_ORE = 14;
-	public const IRON_ORE = 15;
-	public const COAL_ORE = 16;
-	public const LOG = 17;
-	public const LEAVES = 18;
-	public const SPONGE = 19;
-	public const GLASS = 20;
-	public const LAPIS_ORE = 21;
-	public const LAPIS_BLOCK = 22;
-	public const DISPENSER = 23;
-	public const SANDSTONE = 24;
-	public const NOTEBLOCK = 25, NOTE_BLOCK = 25;
-	public const BED_BLOCK = 26;
-	public const GOLDEN_RAIL = 27, POWERED_RAIL = 27;
-	public const DETECTOR_RAIL = 28;
-	public const STICKY_PISTON = 29;
-	public const COBWEB = 30, WEB = 30;
-	public const TALLGRASS = 31, TALL_GRASS = 31;
-	public const DEADBUSH = 32, DEAD_BUSH = 32;
-	public const PISTON = 33;
-	public const PISTONARMCOLLISION = 34, PISTON_ARM_COLLISION = 34;
-	public const WOOL = 35;
-	public const ELEMENT_0 = 36;
-	public const DANDELION = 37, YELLOW_FLOWER = 37;
-	public const POPPY = 38, RED_FLOWER = 38;
-	public const BROWN_MUSHROOM = 39;
-	public const RED_MUSHROOM = 40;
-	public const GOLD_BLOCK = 41;
-	public const IRON_BLOCK = 42;
-	public const DOUBLE_STONE_SLAB = 43;
-	public const STONE_SLAB = 44;
-	public const BRICK_BLOCK = 45;
-	public const TNT = 46;
-	public const BOOKSHELF = 47;
-	public const MOSSY_COBBLESTONE = 48, MOSS_STONE = 48;
-	public const OBSIDIAN = 49;
-	public const TORCH = 50;
-	public const FIRE = 51;
-	public const MOB_SPAWNER = 52, MONSTER_SPAWNER = 52;
-	public const OAK_STAIRS = 53, WOODEN_STAIRS = 53;
-	public const CHEST = 54;
-	public const REDSTONE_WIRE = 55;
-	public const DIAMOND_ORE = 56;
-	public const DIAMOND_BLOCK = 57;
-	public const CRAFTING_TABLE = 58, WORKBENCH = 58;
-	public const WHEAT_BLOCK = 59;
-	public const FARMLAND = 60;
-	public const FURNACE = 61;
-	public const BURNING_FURNACE = 62, LIT_FURNACE = 62;
-	public const SIGN_POST = 63, STANDING_SIGN = 63;
-	public const OAK_DOOR_BLOCK = 64, WOODEN_DOOR_BLOCK = 64;
-	public const LADDER = 65;
-	public const RAIL = 66;
-	public const COBBLESTONE_STAIRS = 67, STONE_STAIRS = 67;
-	public const WALL_SIGN = 68;
-	public const LEVER = 69;
-	public const STONE_PRESSURE_PLATE = 70;
-	public const IRON_DOOR_BLOCK = 71;
-	public const WOODEN_PRESSURE_PLATE = 72;
-	public const REDSTONE_ORE = 73;
-	public const GLOWING_REDSTONE_ORE = 74, LIT_REDSTONE_ORE = 74;
-	public const UNLIT_REDSTONE_TORCH = 75;
-	public const LIT_REDSTONE_TORCH = 76, REDSTONE_TORCH = 76;
-	public const STONE_BUTTON = 77;
-	public const SNOW_LAYER = 78;
-	public const ICE = 79;
-	public const SNOW = 80, SNOW_BLOCK = 80;
-	public const CACTUS = 81;
-	public const CLAY_BLOCK = 82;
-	public const REEDS_BLOCK = 83, SUGARCANE_BLOCK = 83;
-	public const JUKEBOX = 84;
-	public const FENCE = 85;
-	public const PUMPKIN = 86;
-	public const NETHERRACK = 87;
-	public const SOUL_SAND = 88;
-	public const GLOWSTONE = 89;
-	public const PORTAL = 90;
-	public const JACK_O_LANTERN = 91, LIT_PUMPKIN = 91;
-	public const CAKE_BLOCK = 92;
-	public const REPEATER_BLOCK = 93, UNPOWERED_REPEATER = 93;
-	public const POWERED_REPEATER = 94;
-	public const INVISIBLEBEDROCK = 95, INVISIBLE_BEDROCK = 95;
-	public const TRAPDOOR = 96, WOODEN_TRAPDOOR = 96;
-	public const MONSTER_EGG = 97;
-	public const STONEBRICK = 98, STONE_BRICK = 98, STONE_BRICKS = 98;
-	public const BROWN_MUSHROOM_BLOCK = 99;
-	public const RED_MUSHROOM_BLOCK = 100;
-	public const IRON_BARS = 101;
-	public const GLASS_PANE = 102;
-	public const MELON_BLOCK = 103;
-	public const PUMPKIN_STEM = 104;
-	public const MELON_STEM = 105;
-	public const VINE = 106, VINES = 106;
-	public const FENCE_GATE = 107, OAK_FENCE_GATE = 107;
-	public const BRICK_STAIRS = 108;
-	public const STONE_BRICK_STAIRS = 109;
-	public const MYCELIUM = 110;
-	public const LILY_PAD = 111, WATERLILY = 111, WATER_LILY = 111;
-	public const NETHER_BRICK_BLOCK = 112;
-	public const NETHER_BRICK_FENCE = 113;
-	public const NETHER_BRICK_STAIRS = 114;
-	public const NETHER_WART_PLANT = 115;
-	public const ENCHANTING_TABLE = 116, ENCHANTMENT_TABLE = 116;
-	public const BREWING_STAND_BLOCK = 117;
-	public const CAULDRON_BLOCK = 118;
-	public const END_PORTAL = 119;
-	public const END_PORTAL_FRAME = 120;
-	public const END_STONE = 121;
-	public const DRAGON_EGG = 122;
-	public const REDSTONE_LAMP = 123;
-	public const LIT_REDSTONE_LAMP = 124;
-	public const DROPPER = 125;
-	public const ACTIVATOR_RAIL = 126;
-	public const COCOA = 127, COCOA_BLOCK = 127;
-	public const SANDSTONE_STAIRS = 128;
-	public const EMERALD_ORE = 129;
-	public const ENDER_CHEST = 130;
-	public const TRIPWIRE_HOOK = 131;
-	public const TRIPWIRE = 132, TRIP_WIRE = 132;
-	public const EMERALD_BLOCK = 133;
-	public const SPRUCE_STAIRS = 134;
-	public const BIRCH_STAIRS = 135;
-	public const JUNGLE_STAIRS = 136;
-	public const COMMAND_BLOCK = 137;
-	public const BEACON = 138;
-	public const COBBLESTONE_WALL = 139, STONE_WALL = 139;
-	public const FLOWER_POT_BLOCK = 140;
-	public const CARROTS = 141, CARROT_BLOCK = 141;
-	public const POTATOES = 142, POTATO_BLOCK = 142;
-	public const WOODEN_BUTTON = 143;
-	public const MOB_HEAD_BLOCK = 144, SKULL_BLOCK = 144;
-	public const ANVIL = 145;
-	public const TRAPPED_CHEST = 146;
-	public const LIGHT_WEIGHTED_PRESSURE_PLATE = 147;
-	public const HEAVY_WEIGHTED_PRESSURE_PLATE = 148;
-	public const COMPARATOR_BLOCK = 149, UNPOWERED_COMPARATOR = 149;
-	public const POWERED_COMPARATOR = 150;
-	public const DAYLIGHT_DETECTOR = 151, DAYLIGHT_SENSOR = 151;
-	public const REDSTONE_BLOCK = 152;
-	public const NETHER_QUARTZ_ORE = 153, QUARTZ_ORE = 153;
-	public const HOPPER_BLOCK = 154;
-	public const QUARTZ_BLOCK = 155;
-	public const QUARTZ_STAIRS = 156;
-	public const DOUBLE_WOODEN_SLAB = 157;
-	public const WOODEN_SLAB = 158;
-	public const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159, TERRACOTTA = 159;
-	public const STAINED_GLASS_PANE = 160;
-	public const LEAVES2 = 161;
-	public const LOG2 = 162;
-	public const ACACIA_STAIRS = 163;
-	public const DARK_OAK_STAIRS = 164;
-	public const SLIME = 165, SLIME_BLOCK = 165;
-	public const GLOW_STICK = 166;
-	public const IRON_TRAPDOOR = 167;
-	public const PRISMARINE = 168;
-	public const SEALANTERN = 169, SEA_LANTERN = 169;
-	public const HAY_BALE = 170, HAY_BLOCK = 170;
-	public const CARPET = 171;
-	public const HARDENED_CLAY = 172;
-	public const COAL_BLOCK = 173;
-	public const PACKED_ICE = 174;
-	public const DOUBLE_PLANT = 175;
-	public const STANDING_BANNER = 176;
-	public const WALL_BANNER = 177;
-	public const DAYLIGHT_DETECTOR_INVERTED = 178, DAYLIGHT_SENSOR_INVERTED = 178;
-	public const RED_SANDSTONE = 179;
-	public const RED_SANDSTONE_STAIRS = 180;
-	public const DOUBLE_STONE_SLAB2 = 181;
-	public const STONE_SLAB2 = 182;
-	public const SPRUCE_FENCE_GATE = 183;
-	public const BIRCH_FENCE_GATE = 184;
-	public const JUNGLE_FENCE_GATE = 185;
-	public const DARK_OAK_FENCE_GATE = 186;
-	public const ACACIA_FENCE_GATE = 187;
-	public const REPEATING_COMMAND_BLOCK = 188;
-	public const CHAIN_COMMAND_BLOCK = 189;
-	public const HARD_GLASS_PANE = 190;
-	public const HARD_STAINED_GLASS_PANE = 191;
-	public const CHEMICAL_HEAT = 192;
-	public const SPRUCE_DOOR_BLOCK = 193;
-	public const BIRCH_DOOR_BLOCK = 194;
-	public const JUNGLE_DOOR_BLOCK = 195;
-	public const ACACIA_DOOR_BLOCK = 196;
-	public const DARK_OAK_DOOR_BLOCK = 197;
-	public const GRASS_PATH = 198;
-	public const FRAME_BLOCK = 199, ITEM_FRAME_BLOCK = 199;
-	public const CHORUS_FLOWER = 200;
-	public const PURPUR_BLOCK = 201;
-	public const COLORED_TORCH_RG = 202;
-	public const PURPUR_STAIRS = 203;
-	public const COLORED_TORCH_BP = 204;
-	public const UNDYED_SHULKER_BOX = 205;
-	public const END_BRICKS = 206;
-	public const FROSTED_ICE = 207;
-	public const END_ROD = 208;
-	public const END_GATEWAY = 209;
-
-	public const MAGMA = 213;
-	public const NETHER_WART_BLOCK = 214;
-	public const RED_NETHER_BRICK = 215;
-	public const BONE_BLOCK = 216;
-
-	public const SHULKER_BOX = 218;
-	public const PURPLE_GLAZED_TERRACOTTA = 219;
-	public const WHITE_GLAZED_TERRACOTTA = 220;
-	public const ORANGE_GLAZED_TERRACOTTA = 221;
-	public const MAGENTA_GLAZED_TERRACOTTA = 222;
-	public const LIGHT_BLUE_GLAZED_TERRACOTTA = 223;
-	public const YELLOW_GLAZED_TERRACOTTA = 224;
-	public const LIME_GLAZED_TERRACOTTA = 225;
-	public const PINK_GLAZED_TERRACOTTA = 226;
-	public const GRAY_GLAZED_TERRACOTTA = 227;
-	public const SILVER_GLAZED_TERRACOTTA = 228;
-	public const CYAN_GLAZED_TERRACOTTA = 229;
-
-	public const BLUE_GLAZED_TERRACOTTA = 231;
-	public const BROWN_GLAZED_TERRACOTTA = 232;
-	public const GREEN_GLAZED_TERRACOTTA = 233;
-	public const RED_GLAZED_TERRACOTTA = 234;
-	public const BLACK_GLAZED_TERRACOTTA = 235;
-	public const CONCRETE = 236;
-	public const CONCRETEPOWDER = 237, CONCRETE_POWDER = 237;
-	public const CHEMISTRY_TABLE = 238;
-	public const UNDERWATER_TORCH = 239;
-	public const CHORUS_PLANT = 240;
-	public const STAINED_GLASS = 241;
-
-	public const PODZOL = 243;
-	public const BEETROOT_BLOCK = 244;
-	public const STONECUTTER = 245;
-	public const GLOWINGOBSIDIAN = 246, GLOWING_OBSIDIAN = 246;
-	public const NETHERREACTOR = 247, NETHER_REACTOR = 247;
-	public const INFO_UPDATE = 248;
-	public const INFO_UPDATE2 = 249;
-	public const MOVINGBLOCK = 250, MOVING_BLOCK = 250;
-	public const OBSERVER = 251;
-	public const STRUCTURE_BLOCK = 252;
-	public const HARD_GLASS = 253;
-	public const HARD_STAINED_GLASS = 254;
-	public const RESERVED6 = 255;
-
-	public const PRISMARINE_STAIRS = 257;
-	public const DARK_PRISMARINE_STAIRS = 258;
-	public const PRISMARINE_BRICKS_STAIRS = 259;
-	public const STRIPPED_SPRUCE_LOG = 260;
-	public const STRIPPED_BIRCH_LOG = 261;
-	public const STRIPPED_JUNGLE_LOG = 262;
-	public const STRIPPED_ACACIA_LOG = 263;
-	public const STRIPPED_DARK_OAK_LOG = 264;
-	public const STRIPPED_OAK_LOG = 265;
-	public const BLUE_ICE = 266;
-	public const ELEMENT_1 = 267;
-	public const ELEMENT_2 = 268;
-	public const ELEMENT_3 = 269;
-	public const ELEMENT_4 = 270;
-	public const ELEMENT_5 = 271;
-	public const ELEMENT_6 = 272;
-	public const ELEMENT_7 = 273;
-	public const ELEMENT_8 = 274;
-	public const ELEMENT_9 = 275;
-	public const ELEMENT_10 = 276;
-	public const ELEMENT_11 = 277;
-	public const ELEMENT_12 = 278;
-	public const ELEMENT_13 = 279;
-	public const ELEMENT_14 = 280;
-	public const ELEMENT_15 = 281;
-	public const ELEMENT_16 = 282;
-	public const ELEMENT_17 = 283;
-	public const ELEMENT_18 = 284;
-	public const ELEMENT_19 = 285;
-	public const ELEMENT_20 = 286;
-	public const ELEMENT_21 = 287;
-	public const ELEMENT_22 = 288;
-	public const ELEMENT_23 = 289;
-	public const ELEMENT_24 = 290;
-	public const ELEMENT_25 = 291;
-	public const ELEMENT_26 = 292;
-	public const ELEMENT_27 = 293;
-	public const ELEMENT_28 = 294;
-	public const ELEMENT_29 = 295;
-	public const ELEMENT_30 = 296;
-	public const ELEMENT_31 = 297;
-	public const ELEMENT_32 = 298;
-	public const ELEMENT_33 = 299;
-	public const ELEMENT_34 = 300;
-	public const ELEMENT_35 = 301;
-	public const ELEMENT_36 = 302;
-	public const ELEMENT_37 = 303;
-	public const ELEMENT_38 = 304;
-	public const ELEMENT_39 = 305;
-	public const ELEMENT_40 = 306;
-	public const ELEMENT_41 = 307;
-	public const ELEMENT_42 = 308;
-	public const ELEMENT_43 = 309;
-	public const ELEMENT_44 = 310;
-	public const ELEMENT_45 = 311;
-	public const ELEMENT_46 = 312;
-	public const ELEMENT_47 = 313;
-	public const ELEMENT_48 = 314;
-	public const ELEMENT_49 = 315;
-	public const ELEMENT_50 = 316;
-	public const ELEMENT_51 = 317;
-	public const ELEMENT_52 = 318;
-	public const ELEMENT_53 = 319;
-	public const ELEMENT_54 = 320;
-	public const ELEMENT_55 = 321;
-	public const ELEMENT_56 = 322;
-	public const ELEMENT_57 = 323;
-	public const ELEMENT_58 = 324;
-	public const ELEMENT_59 = 325;
-	public const ELEMENT_60 = 326;
-	public const ELEMENT_61 = 327;
-	public const ELEMENT_62 = 328;
-	public const ELEMENT_63 = 329;
-	public const ELEMENT_64 = 330;
-	public const ELEMENT_65 = 331;
-	public const ELEMENT_66 = 332;
-	public const ELEMENT_67 = 333;
-	public const ELEMENT_68 = 334;
-	public const ELEMENT_69 = 335;
-	public const ELEMENT_70 = 336;
-	public const ELEMENT_71 = 337;
-	public const ELEMENT_72 = 338;
-	public const ELEMENT_73 = 339;
-	public const ELEMENT_74 = 340;
-	public const ELEMENT_75 = 341;
-	public const ELEMENT_76 = 342;
-	public const ELEMENT_77 = 343;
-	public const ELEMENT_78 = 344;
-	public const ELEMENT_79 = 345;
-	public const ELEMENT_80 = 346;
-	public const ELEMENT_81 = 347;
-	public const ELEMENT_82 = 348;
-	public const ELEMENT_83 = 349;
-	public const ELEMENT_84 = 350;
-	public const ELEMENT_85 = 351;
-	public const ELEMENT_86 = 352;
-	public const ELEMENT_87 = 353;
-	public const ELEMENT_88 = 354;
-	public const ELEMENT_89 = 355;
-	public const ELEMENT_90 = 356;
-	public const ELEMENT_91 = 357;
-	public const ELEMENT_92 = 358;
-	public const ELEMENT_93 = 359;
-	public const ELEMENT_94 = 360;
-	public const ELEMENT_95 = 361;
-	public const ELEMENT_96 = 362;
-	public const ELEMENT_97 = 363;
-	public const ELEMENT_98 = 364;
-	public const ELEMENT_99 = 365;
-	public const ELEMENT_100 = 366;
-	public const ELEMENT_101 = 367;
-	public const ELEMENT_102 = 368;
-	public const ELEMENT_103 = 369;
-	public const ELEMENT_104 = 370;
-	public const ELEMENT_105 = 371;
-	public const ELEMENT_106 = 372;
-	public const ELEMENT_107 = 373;
-	public const ELEMENT_108 = 374;
-	public const ELEMENT_109 = 375;
-	public const ELEMENT_110 = 376;
-	public const ELEMENT_111 = 377;
-	public const ELEMENT_112 = 378;
-	public const ELEMENT_113 = 379;
-	public const ELEMENT_114 = 380;
-	public const ELEMENT_115 = 381;
-	public const ELEMENT_116 = 382;
-	public const ELEMENT_117 = 383;
-	public const ELEMENT_118 = 384;
-	public const SEAGRASS = 385;
-	public const CORAL = 386;
-	public const CORAL_BLOCK = 387;
-	public const CORAL_FAN = 388;
-	public const CORAL_FAN_DEAD = 389;
-	public const CORAL_FAN_HANG = 390;
-	public const CORAL_FAN_HANG2 = 391;
-	public const CORAL_FAN_HANG3 = 392;
-	public const KELP = 393;
-	public const DRIED_KELP_BLOCK = 394;
-	public const ACACIA_BUTTON = 395;
-	public const BIRCH_BUTTON = 396;
-	public const DARK_OAK_BUTTON = 397;
-	public const JUNGLE_BUTTON = 398;
-	public const SPRUCE_BUTTON = 399;
-	public const ACACIA_TRAPDOOR = 400;
-	public const BIRCH_TRAPDOOR = 401;
-	public const DARK_OAK_TRAPDOOR = 402;
-	public const JUNGLE_TRAPDOOR = 403;
-	public const SPRUCE_TRAPDOOR = 404;
-	public const ACACIA_PRESSURE_PLATE = 405;
-	public const BIRCH_PRESSURE_PLATE = 406;
-	public const DARK_OAK_PRESSURE_PLATE = 407;
-	public const JUNGLE_PRESSURE_PLATE = 408;
-	public const SPRUCE_PRESSURE_PLATE = 409;
-	public const CARVED_PUMPKIN = 410;
-	public const SEA_PICKLE = 411;
-	public const CONDUIT = 412;
-
-	public const TURTLE_EGG = 414;
-	public const BUBBLE_COLUMN = 415;
-	public const BARRIER = 416;
-	public const STONE_SLAB3 = 417;
-	public const BAMBOO = 418;
-	public const BAMBOO_SAPLING = 419;
-	public const SCAFFOLDING = 420;
-	public const STONE_SLAB4 = 421;
-	public const DOUBLE_STONE_SLAB3 = 422;
-	public const DOUBLE_STONE_SLAB4 = 423;
-	public const GRANITE_STAIRS = 424;
-	public const DIORITE_STAIRS = 425;
-	public const ANDESITE_STAIRS = 426;
-	public const POLISHED_GRANITE_STAIRS = 427;
-	public const POLISHED_DIORITE_STAIRS = 428;
-	public const POLISHED_ANDESITE_STAIRS = 429;
-	public const MOSSY_STONE_BRICK_STAIRS = 430;
-	public const SMOOTH_RED_SANDSTONE_STAIRS = 431;
-	public const SMOOTH_SANDSTONE_STAIRS = 432;
-	public const END_BRICK_STAIRS = 433;
-	public const MOSSY_COBBLESTONE_STAIRS = 434;
-	public const NORMAL_STONE_STAIRS = 435;
-	public const SPRUCE_STANDING_SIGN = 436;
-	public const SPRUCE_WALL_SIGN = 437;
-	public const SMOOTH_STONE = 438;
-	public const RED_NETHER_BRICK_STAIRS = 439;
-	public const SMOOTH_QUARTZ_STAIRS = 440;
-	public const BIRCH_STANDING_SIGN = 441;
-	public const BIRCH_WALL_SIGN = 442;
-	public const JUNGLE_STANDING_SIGN = 443;
-	public const JUNGLE_WALL_SIGN = 444;
-	public const ACACIA_STANDING_SIGN = 445;
-	public const ACACIA_WALL_SIGN = 446;
-	public const DARKOAK_STANDING_SIGN = 447;
-	public const DARKOAK_WALL_SIGN = 448;
-	public const LECTERN = 449;
-	public const GRINDSTONE = 450;
-	public const BLAST_FURNACE = 451;
-	public const STONECUTTER_BLOCK = 452;
-	public const SMOKER = 453;
-	public const LIT_SMOKER = 454;
-	public const CARTOGRAPHY_TABLE = 455;
-	public const FLETCHING_TABLE = 456;
-	public const SMITHING_TABLE = 457;
-	public const BARREL = 458;
-	public const LOOM = 459;
-
-	public const BELL = 461;
-	public const SWEET_BERRY_BUSH = 462;
-	public const LANTERN = 463;
-	public const CAMPFIRE = 464;
-	public const LAVA_CAULDRON = 465;
-	public const JIGSAW = 466;
-	public const WOOD = 467;
-	public const COMPOSTER = 468;
-	public const LIT_BLAST_FURNACE = 469;
-
-}
diff --git a/src/block/BlockLegacyMetadata.php b/src/block/BlockLegacyMetadata.php
deleted file mode 100644
index d192a3c945..0000000000
--- a/src/block/BlockLegacyMetadata.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\block;
-
-/**
- * Constants for legacy metadata for various blocks.
- */
-final class BlockLegacyMetadata{
-
-	private function __construct(){
-		//NOOP
-	}
-
-	public const ANVIL_NORMAL = 0;
-	public const ANVIL_SLIGHTLY_DAMAGED = 4;
-	public const ANVIL_VERY_DAMAGED = 8;
-
-	public const BAMBOO_FLAG_THICK = 0x01;
-	public const BAMBOO_FLAG_READY = 0x08;
-
-	public const BAMBOO_LEAF_SIZE_SHIFT = 1;
-	public const BAMBOO_LEAF_SIZE_MASK = 0x03;
-
-	public const BAMBOO_SAPLING_FLAG_READY = 0x01;
-
-	public const BARREL_FLAG_OPEN = 0x08;
-
-	public const BED_FLAG_HEAD = 0x08;
-	public const BED_FLAG_OCCUPIED = 0x04;
-
-	public const BEDROCK_FLAG_INFINIBURN = 0x01;
-
-	public const BELL_ATTACHMENT_FLOOR = 0;
-	public const BELL_ATTACHMENT_CEILING = 1;
-	public const BELL_ATTACHMENT_ONE_WALL = 2;
-	public const BELL_ATTACHMENT_TWO_WALLS = 3;
-
-	public const BREWING_STAND_FLAG_EAST = 0x01;
-	public const BREWING_STAND_FLAG_SOUTHWEST = 0x02;
-	public const BREWING_STAND_FLAG_NORTHWEST = 0x04;
-
-	public const BUTTON_FLAG_POWERED = 0x08;
-
-	public const CHEMISTRY_COMPOUND_CREATOR = 0;
-	public const CHEMISTRY_MATERIAL_REDUCER = 4;
-	public const CHEMISTRY_ELEMENT_CONSTRUCTOR = 8;
-	public const CHEMISTRY_LAB_TABLE = 12;
-
-	public const COLORED_TORCH_BP_BLUE = 0;
-	public const COLORED_TORCH_BP_PURPLE = 8;
-	public const COLORED_TORCH_RG_RED = 0;
-	public const COLORED_TORCH_RG_GREEN = 8;
-
-	public const CORAL_BLOCK_FLAG_DEAD = 0x8;
-
-	public const CORAL_FAN_EAST_WEST = 0;
-	public const CORAL_FAN_NORTH_SOUTH = 1;
-	public const CORAL_FAN_TYPE_MASK = 0x7;
-
-	public const CORAL_FAN_HANG_FLAG_DEAD = 0x2;
-
-	public const CORAL_FAN_HANG_TUBE = 0;
-	public const CORAL_FAN_HANG_BRAIN = 1;
-	public const CORAL_FAN_HANG2_BUBBLE = 0;
-	public const CORAL_FAN_HANG2_FIRE = 1;
-	public const CORAL_FAN_HANG3_HORN = 0;
-	public const CORAL_FAN_HANG_TYPE_MASK = 0x1;
-
-	public const CORAL_VARIANT_TUBE = 0;
-	public const CORAL_VARIANT_BRAIN = 1;
-	public const CORAL_VARIANT_BUBBLE = 2;
-	public const CORAL_VARIANT_FIRE = 3;
-	public const CORAL_VARIANT_HORN = 4;
-
-	public const DIRT_FLAG_COARSE = 0x1;
-
-	public const DOOR_FLAG_TOP = 0x08;
-	public const DOOR_BOTTOM_FLAG_OPEN = 0x04;
-	public const DOOR_TOP_FLAG_RIGHT = 0x01;
-	public const DOOR_TOP_FLAG_POWERED = 0x02;
-
-	public const DOUBLE_PLANT_SUNFLOWER = 0;
-	public const DOUBLE_PLANT_LILAC = 1;
-	public const DOUBLE_PLANT_TALLGRASS = 2;
-	public const DOUBLE_PLANT_LARGE_FERN = 3;
-	public const DOUBLE_PLANT_ROSE_BUSH = 4;
-	public const DOUBLE_PLANT_PEONY = 5;
-
-	public const DOUBLE_PLANT_FLAG_TOP = 0x08;
-
-	public const END_PORTAL_FRAME_FLAG_EYE = 0x04;
-
-	public const FENCE_GATE_FLAG_OPEN = 0x04;
-	public const FENCE_GATE_FLAG_IN_WALL = 0x08;
-
-	public const FLOWER_POPPY = 0;
-	public const FLOWER_BLUE_ORCHID = 1;
-	public const FLOWER_ALLIUM = 2;
-	public const FLOWER_AZURE_BLUET = 3;
-	public const FLOWER_RED_TULIP = 4;
-	public const FLOWER_ORANGE_TULIP = 5;
-	public const FLOWER_WHITE_TULIP = 6;
-	public const FLOWER_PINK_TULIP = 7;
-	public const FLOWER_OXEYE_DAISY = 8;
-	public const FLOWER_CORNFLOWER = 9;
-	public const FLOWER_LILY_OF_THE_VALLEY = 10;
-
-	public const FLOWER_POT_FLAG_OCCUPIED = 0x01;
-
-	public const HOPPER_FLAG_POWERED = 0x08;
-
-	public const INFESTED_STONE = 0;
-	public const INFESTED_COBBLESTONE = 1;
-	public const INFESTED_STONE_BRICK = 2;
-	public const INFESTED_STONE_BRICK_MOSSY = 3;
-	public const INFESTED_STONE_BRICK_CRACKED = 4;
-	public const INFESTED_STONE_BRICK_CHISELED = 5;
-
-	public const ITEM_FRAME_FLAG_HAS_MAP = 0x04;
-
-	public const LANTERN_FLAG_HANGING = 0x01;
-
-	public const LEAVES_FLAG_NO_DECAY = 0x04;
-	public const LEAVES_FLAG_CHECK_DECAY = 0x08;
-
-	public const LECTERN_FLAG_POWERED = 0x04;
-
-	public const LEVER_FLAG_POWERED = 0x08;
-
-	public const LIQUID_FLAG_FALLING = 0x08;
-
-	public const MUSHROOM_BLOCK_ALL_PORES = 0;
-	public const MUSHROOM_BLOCK_CAP_NORTHWEST_CORNER = 1;
-	public const MUSHROOM_BLOCK_CAP_NORTH_SIDE = 2;
-	public const MUSHROOM_BLOCK_CAP_NORTHEAST_CORNER = 3;
-	public const MUSHROOM_BLOCK_CAP_WEST_SIDE = 4;
-	public const MUSHROOM_BLOCK_CAP_TOP_ONLY = 5;
-	public const MUSHROOM_BLOCK_CAP_EAST_SIDE = 6;
-	public const MUSHROOM_BLOCK_CAP_SOUTHWEST_CORNER = 7;
-	public const MUSHROOM_BLOCK_CAP_SOUTH_SIDE = 8;
-	public const MUSHROOM_BLOCK_CAP_SOUTHEAST_CORNER = 9;
-	public const MUSHROOM_BLOCK_STEM = 10;
-	//11, 12 and 13 appear the same as 0
-	public const MUSHROOM_BLOCK_ALL_CAP = 14;
-	public const MUSHROOM_BLOCK_ALL_STEM = 15;
-
-	public const NETHER_PORTAL_AXIS_X = 1;
-	public const NETHER_PORTAL_AXIS_Z = 2;
-
-	public const NETHER_REACTOR_INACTIVE = 0;
-	public const NETHER_REACTOR_ACTIVE = 1;
-	public const NETHER_REACTOR_USED = 2;
-
-	public const PRESSURE_PLATE_FLAG_POWERED = 0x01;
-
-	public const PRISMARINE_NORMAL = 0;
-	public const PRISMARINE_DARK = 1;
-	public const PRISMARINE_BRICKS = 2;
-
-	public const PURPUR_NORMAL = 0;
-	public const PURPUR_PILLAR = 2;
-
-	public const QUARTZ_NORMAL = 0;
-	public const QUARTZ_CHISELED = 1;
-	public const QUARTZ_PILLAR = 2;
-	public const QUARTZ_SMOOTH = 3;
-
-	public const RAIL_STRAIGHT_NORTH_SOUTH = 0;
-	public const RAIL_STRAIGHT_EAST_WEST = 1;
-	public const RAIL_ASCENDING_EAST = 2;
-	public const RAIL_ASCENDING_WEST = 3;
-	public const RAIL_ASCENDING_NORTH = 4;
-	public const RAIL_ASCENDING_SOUTH = 5;
-	public const RAIL_CURVE_SOUTHEAST = 6;
-	public const RAIL_CURVE_SOUTHWEST = 7;
-	public const RAIL_CURVE_NORTHWEST = 8;
-	public const RAIL_CURVE_NORTHEAST = 9;
-
-	public const REDSTONE_COMPARATOR_FLAG_SUBTRACT = 0x04;
-	public const REDSTONE_COMPARATOR_FLAG_POWERED = 0x08;
-
-	public const REDSTONE_RAIL_FLAG_POWERED = 0x08;
-
-	public const SANDSTONE_NORMAL = 0;
-	public const SANDSTONE_CHISELED = 1;
-	public const SANDSTONE_CUT = 2;
-	public const SANDSTONE_SMOOTH = 3;
-
-	public const SAPLING_FLAG_READY = 0x08;
-
-	public const SEA_PICKLE_FLAG_NOT_UNDERWATER = 0x04;
-
-	public const SKULL_FLAG_NO_DROPS = 0x08;
-
-	public const SLAB_FLAG_UPPER = 0x08;
-
-	public const SPONGE_FLAG_WET = 0x01;
-
-	public const STAIR_FLAG_UPSIDE_DOWN = 0x04;
-
-	public const STONE_NORMAL = 0;
-	public const STONE_GRANITE = 1;
-	public const STONE_POLISHED_GRANITE = 2;
-	public const STONE_DIORITE = 3;
-	public const STONE_POLISHED_DIORITE = 4;
-	public const STONE_ANDESITE = 5;
-	public const STONE_POLISHED_ANDESITE = 6;
-
-	public const STONE_BRICK_NORMAL = 0;
-	public const STONE_BRICK_MOSSY = 1;
-	public const STONE_BRICK_CRACKED = 2;
-	public const STONE_BRICK_CHISELED = 3;
-
-	public const STONE_SLAB_SMOOTH_STONE = 0;
-	public const STONE_SLAB_SANDSTONE = 1;
-	public const STONE_SLAB_FAKE_WOODEN = 2;
-	public const STONE_SLAB_COBBLESTONE = 3;
-	public const STONE_SLAB_BRICK = 4;
-	public const STONE_SLAB_STONE_BRICK = 5;
-	public const STONE_SLAB_QUARTZ = 6;
-	public const STONE_SLAB_NETHER_BRICK = 7;
-	public const STONE_SLAB2_RED_SANDSTONE = 0;
-	public const STONE_SLAB2_PURPUR = 1;
-	public const STONE_SLAB2_PRISMARINE = 2;
-	public const STONE_SLAB2_DARK_PRISMARINE = 3;
-	public const STONE_SLAB2_PRISMARINE_BRICKS = 4;
-	public const STONE_SLAB2_MOSSY_COBBLESTONE = 5;
-	public const STONE_SLAB2_SMOOTH_SANDSTONE = 6;
-	public const STONE_SLAB2_RED_NETHER_BRICK = 7;
-	public const STONE_SLAB3_END_STONE_BRICK = 0;
-	public const STONE_SLAB3_SMOOTH_RED_SANDSTONE = 1;
-	public const STONE_SLAB3_POLISHED_ANDESITE = 2;
-	public const STONE_SLAB3_ANDESITE = 3;
-	public const STONE_SLAB3_DIORITE = 4;
-	public const STONE_SLAB3_POLISHED_DIORITE = 5;
-	public const STONE_SLAB3_GRANITE = 6;
-	public const STONE_SLAB3_POLISHED_GRANITE = 7;
-	public const STONE_SLAB4_MOSSY_STONE_BRICK = 0;
-	public const STONE_SLAB4_SMOOTH_QUARTZ = 1;
-	public const STONE_SLAB4_STONE = 2;
-	public const STONE_SLAB4_CUT_SANDSTONE = 3;
-	public const STONE_SLAB4_CUT_RED_SANDSTONE = 4;
-
-	public const TALLGRASS_NORMAL = 1;
-	public const TALLGRASS_FERN = 2;
-
-	public const TNT_FLAG_UNSTABLE = 0x01;
-	public const TNT_FLAG_UNDERWATER = 0x02;
-
-	public const TRAPDOOR_FLAG_UPPER = 0x04;
-	public const TRAPDOOR_FLAG_OPEN = 0x08;
-
-	public const TRIPWIRE_FLAG_TRIGGERED = 0x01;
-	public const TRIPWIRE_FLAG_SUSPENDED = 0x02;
-	public const TRIPWIRE_FLAG_CONNECTED = 0x04;
-	public const TRIPWIRE_FLAG_DISARMED = 0x08;
-
-	public const TRIPWIRE_HOOK_FLAG_CONNECTED = 0x04;
-	public const TRIPWIRE_HOOK_FLAG_POWERED = 0x08;
-
-	public const VINE_FLAG_SOUTH = 0x01;
-	public const VINE_FLAG_WEST = 0x02;
-	public const VINE_FLAG_NORTH = 0x04;
-	public const VINE_FLAG_EAST = 0x08;
-
-	public const WALL_COBBLESTONE = 0;
-	public const WALL_MOSSY_COBBLESTONE = 1;
-	public const WALL_GRANITE = 2;
-	public const WALL_DIORITE = 3;
-	public const WALL_ANDESITE = 4;
-	public const WALL_SANDSTONE = 5;
-	public const WALL_BRICK = 6;
-	public const WALL_STONE_BRICK = 7;
-	public const WALL_MOSSY_STONE_BRICK = 8;
-	public const WALL_NETHER_BRICK = 9;
-	public const WALL_END_STONE_BRICK = 10;
-	public const WALL_PRISMARINE = 11;
-	public const WALL_RED_SANDSTONE = 12;
-	public const WALL_RED_NETHER_BRICK = 13;
-
-	public const WOOD_FLAG_STRIPPED = 0x8;
-}
diff --git a/src/block/BlockTypeIds.php b/src/block/BlockTypeIds.php
new file mode 100644
index 0000000000..3914a4b74a
--- /dev/null
+++ b/src/block/BlockTypeIds.php
@@ -0,0 +1,779 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+/**
+ * Every block in {@link VanillaBlocks} has a corresponding constant in this class. These constants can be used to
+ * identify and compare block types efficiently using {@link Block::getTypeId()}.
+ *
+ * Type ID is also used internally as part of block state ID, which is used to store blocks and their simple properties
+ * in a memory-efficient way in chunks at runtime.
+ *
+ * WARNING: These are NOT a replacement for Minecraft legacy IDs. Do **NOT** hardcode their values, or store them in
+ * configs or databases. They will change without warning.
+ */
+final class BlockTypeIds{
+
+	private function __construct(){
+		//NOOP
+	}
+
+	public const AIR = 10000;
+
+	public const ACACIA_BUTTON = 10001;
+	public const ACACIA_DOOR = 10002;
+	public const ACACIA_FENCE = 10003;
+	public const ACACIA_FENCE_GATE = 10004;
+	public const ACACIA_LEAVES = 10005;
+	public const ACACIA_LOG = 10006;
+	public const ACACIA_PLANKS = 10007;
+	public const ACACIA_PRESSURE_PLATE = 10008;
+	public const ACACIA_SAPLING = 10009;
+	public const ACACIA_SIGN = 10010;
+	public const ACACIA_SLAB = 10011;
+	public const ACACIA_STAIRS = 10012;
+	public const ACACIA_TRAPDOOR = 10013;
+	public const ACACIA_WALL_SIGN = 10014;
+	public const ACACIA_WOOD = 10015;
+	public const ACTIVATOR_RAIL = 10016;
+	public const ALL_SIDED_MUSHROOM_STEM = 10017;
+	public const ALLIUM = 10018;
+	public const ANDESITE = 10019;
+	public const ANDESITE_SLAB = 10020;
+	public const ANDESITE_STAIRS = 10021;
+	public const ANDESITE_WALL = 10022;
+	public const ANVIL = 10023;
+	public const AZURE_BLUET = 10024;
+	public const BAMBOO = 10025;
+	public const BAMBOO_SAPLING = 10026;
+	public const BANNER = 10027;
+	public const BARREL = 10028;
+	public const BARRIER = 10029;
+	public const BEACON = 10030;
+	public const BED = 10031;
+	public const BEDROCK = 10032;
+	public const BEETROOTS = 10033;
+	public const BELL = 10034;
+	public const BIRCH_BUTTON = 10035;
+	public const BIRCH_DOOR = 10036;
+	public const BIRCH_FENCE = 10037;
+	public const BIRCH_FENCE_GATE = 10038;
+	public const BIRCH_LEAVES = 10039;
+	public const BIRCH_LOG = 10040;
+	public const BIRCH_PLANKS = 10041;
+	public const BIRCH_PRESSURE_PLATE = 10042;
+	public const BIRCH_SAPLING = 10043;
+	public const BIRCH_SIGN = 10044;
+	public const BIRCH_SLAB = 10045;
+	public const BIRCH_STAIRS = 10046;
+	public const BIRCH_TRAPDOOR = 10047;
+	public const BIRCH_WALL_SIGN = 10048;
+	public const BIRCH_WOOD = 10049;
+
+	public const BLAST_FURNACE = 10051;
+
+	public const BLUE_ICE = 10053;
+	public const BLUE_ORCHID = 10054;
+	public const BLUE_TORCH = 10055;
+	public const BONE_BLOCK = 10056;
+	public const BOOKSHELF = 10057;
+	public const BREWING_STAND = 10058;
+	public const BRICK_SLAB = 10059;
+	public const BRICK_STAIRS = 10060;
+	public const BRICK_WALL = 10061;
+	public const BRICKS = 10062;
+
+	public const BROWN_MUSHROOM = 10064;
+	public const BROWN_MUSHROOM_BLOCK = 10065;
+	public const CACTUS = 10066;
+	public const CAKE = 10067;
+	public const CARPET = 10068;
+	public const CARROTS = 10069;
+	public const CARVED_PUMPKIN = 10070;
+	public const CHEMICAL_HEAT = 10071;
+	public const CHEST = 10072;
+	public const CHISELED_QUARTZ = 10073;
+	public const CHISELED_RED_SANDSTONE = 10074;
+	public const CHISELED_SANDSTONE = 10075;
+	public const CHISELED_STONE_BRICKS = 10076;
+	public const CLAY = 10077;
+	public const COAL = 10078;
+	public const COAL_ORE = 10079;
+	public const COBBLESTONE = 10080;
+	public const COBBLESTONE_SLAB = 10081;
+	public const COBBLESTONE_STAIRS = 10082;
+	public const COBBLESTONE_WALL = 10083;
+	public const COBWEB = 10084;
+	public const COCOA_POD = 10085;
+	public const COMPOUND_CREATOR = 10086;
+	public const CONCRETE = 10087;
+	public const CONCRETE_POWDER = 10088;
+	public const CORAL = 10089;
+	public const CORAL_BLOCK = 10090;
+	public const CORAL_FAN = 10091;
+	public const CORNFLOWER = 10092;
+	public const CRACKED_STONE_BRICKS = 10093;
+	public const CRAFTING_TABLE = 10094;
+	public const CUT_RED_SANDSTONE = 10095;
+	public const CUT_RED_SANDSTONE_SLAB = 10096;
+	public const CUT_SANDSTONE = 10097;
+	public const CUT_SANDSTONE_SLAB = 10098;
+
+	public const DANDELION = 10100;
+	public const DARK_OAK_BUTTON = 10101;
+	public const DARK_OAK_DOOR = 10102;
+	public const DARK_OAK_FENCE = 10103;
+	public const DARK_OAK_FENCE_GATE = 10104;
+	public const DARK_OAK_LEAVES = 10105;
+	public const DARK_OAK_LOG = 10106;
+	public const DARK_OAK_PLANKS = 10107;
+	public const DARK_OAK_PRESSURE_PLATE = 10108;
+	public const DARK_OAK_SAPLING = 10109;
+	public const DARK_OAK_SIGN = 10110;
+	public const DARK_OAK_SLAB = 10111;
+	public const DARK_OAK_STAIRS = 10112;
+	public const DARK_OAK_TRAPDOOR = 10113;
+	public const DARK_OAK_WALL_SIGN = 10114;
+	public const DARK_OAK_WOOD = 10115;
+	public const DARK_PRISMARINE = 10116;
+	public const DARK_PRISMARINE_SLAB = 10117;
+	public const DARK_PRISMARINE_STAIRS = 10118;
+	public const DAYLIGHT_SENSOR = 10119;
+	public const DEAD_BUSH = 10120;
+	public const DETECTOR_RAIL = 10121;
+	public const DIAMOND = 10122;
+	public const DIAMOND_ORE = 10123;
+	public const DIORITE = 10124;
+	public const DIORITE_SLAB = 10125;
+	public const DIORITE_STAIRS = 10126;
+	public const DIORITE_WALL = 10127;
+	public const DIRT = 10128;
+	public const DOUBLE_TALLGRASS = 10129;
+	public const DRAGON_EGG = 10130;
+	public const DRIED_KELP = 10131;
+	public const DYED_SHULKER_BOX = 10132;
+	public const ELEMENT_ACTINIUM = 10133;
+	public const ELEMENT_ALUMINUM = 10134;
+	public const ELEMENT_AMERICIUM = 10135;
+	public const ELEMENT_ANTIMONY = 10136;
+	public const ELEMENT_ARGON = 10137;
+	public const ELEMENT_ARSENIC = 10138;
+	public const ELEMENT_ASTATINE = 10139;
+	public const ELEMENT_BARIUM = 10140;
+	public const ELEMENT_BERKELIUM = 10141;
+	public const ELEMENT_BERYLLIUM = 10142;
+	public const ELEMENT_BISMUTH = 10143;
+	public const ELEMENT_BOHRIUM = 10144;
+	public const ELEMENT_BORON = 10145;
+	public const ELEMENT_BROMINE = 10146;
+	public const ELEMENT_CADMIUM = 10147;
+	public const ELEMENT_CALCIUM = 10148;
+	public const ELEMENT_CALIFORNIUM = 10149;
+	public const ELEMENT_CARBON = 10150;
+	public const ELEMENT_CERIUM = 10151;
+	public const ELEMENT_CESIUM = 10152;
+	public const ELEMENT_CHLORINE = 10153;
+	public const ELEMENT_CHROMIUM = 10154;
+	public const ELEMENT_COBALT = 10155;
+	public const ELEMENT_CONSTRUCTOR = 10156;
+	public const ELEMENT_COPERNICIUM = 10157;
+	public const ELEMENT_COPPER = 10158;
+	public const ELEMENT_CURIUM = 10159;
+	public const ELEMENT_DARMSTADTIUM = 10160;
+	public const ELEMENT_DUBNIUM = 10161;
+	public const ELEMENT_DYSPROSIUM = 10162;
+	public const ELEMENT_EINSTEINIUM = 10163;
+	public const ELEMENT_ERBIUM = 10164;
+	public const ELEMENT_EUROPIUM = 10165;
+	public const ELEMENT_FERMIUM = 10166;
+	public const ELEMENT_FLEROVIUM = 10167;
+	public const ELEMENT_FLUORINE = 10168;
+	public const ELEMENT_FRANCIUM = 10169;
+	public const ELEMENT_GADOLINIUM = 10170;
+	public const ELEMENT_GALLIUM = 10171;
+	public const ELEMENT_GERMANIUM = 10172;
+	public const ELEMENT_GOLD = 10173;
+	public const ELEMENT_HAFNIUM = 10174;
+	public const ELEMENT_HASSIUM = 10175;
+	public const ELEMENT_HELIUM = 10176;
+	public const ELEMENT_HOLMIUM = 10177;
+	public const ELEMENT_HYDROGEN = 10178;
+	public const ELEMENT_INDIUM = 10179;
+	public const ELEMENT_IODINE = 10180;
+	public const ELEMENT_IRIDIUM = 10181;
+	public const ELEMENT_IRON = 10182;
+	public const ELEMENT_KRYPTON = 10183;
+	public const ELEMENT_LANTHANUM = 10184;
+	public const ELEMENT_LAWRENCIUM = 10185;
+	public const ELEMENT_LEAD = 10186;
+	public const ELEMENT_LITHIUM = 10187;
+	public const ELEMENT_LIVERMORIUM = 10188;
+	public const ELEMENT_LUTETIUM = 10189;
+	public const ELEMENT_MAGNESIUM = 10190;
+	public const ELEMENT_MANGANESE = 10191;
+	public const ELEMENT_MEITNERIUM = 10192;
+	public const ELEMENT_MENDELEVIUM = 10193;
+	public const ELEMENT_MERCURY = 10194;
+	public const ELEMENT_MOLYBDENUM = 10195;
+	public const ELEMENT_MOSCOVIUM = 10196;
+	public const ELEMENT_NEODYMIUM = 10197;
+	public const ELEMENT_NEON = 10198;
+	public const ELEMENT_NEPTUNIUM = 10199;
+	public const ELEMENT_NICKEL = 10200;
+	public const ELEMENT_NIHONIUM = 10201;
+	public const ELEMENT_NIOBIUM = 10202;
+	public const ELEMENT_NITROGEN = 10203;
+	public const ELEMENT_NOBELIUM = 10204;
+	public const ELEMENT_OGANESSON = 10205;
+	public const ELEMENT_OSMIUM = 10206;
+	public const ELEMENT_OXYGEN = 10207;
+	public const ELEMENT_PALLADIUM = 10208;
+	public const ELEMENT_PHOSPHORUS = 10209;
+	public const ELEMENT_PLATINUM = 10210;
+	public const ELEMENT_PLUTONIUM = 10211;
+	public const ELEMENT_POLONIUM = 10212;
+	public const ELEMENT_POTASSIUM = 10213;
+	public const ELEMENT_PRASEODYMIUM = 10214;
+	public const ELEMENT_PROMETHIUM = 10215;
+	public const ELEMENT_PROTACTINIUM = 10216;
+	public const ELEMENT_RADIUM = 10217;
+	public const ELEMENT_RADON = 10218;
+	public const ELEMENT_RHENIUM = 10219;
+	public const ELEMENT_RHODIUM = 10220;
+	public const ELEMENT_ROENTGENIUM = 10221;
+	public const ELEMENT_RUBIDIUM = 10222;
+	public const ELEMENT_RUTHENIUM = 10223;
+	public const ELEMENT_RUTHERFORDIUM = 10224;
+	public const ELEMENT_SAMARIUM = 10225;
+	public const ELEMENT_SCANDIUM = 10226;
+	public const ELEMENT_SEABORGIUM = 10227;
+	public const ELEMENT_SELENIUM = 10228;
+	public const ELEMENT_SILICON = 10229;
+	public const ELEMENT_SILVER = 10230;
+	public const ELEMENT_SODIUM = 10231;
+	public const ELEMENT_STRONTIUM = 10232;
+	public const ELEMENT_SULFUR = 10233;
+	public const ELEMENT_TANTALUM = 10234;
+	public const ELEMENT_TECHNETIUM = 10235;
+	public const ELEMENT_TELLURIUM = 10236;
+	public const ELEMENT_TENNESSINE = 10237;
+	public const ELEMENT_TERBIUM = 10238;
+	public const ELEMENT_THALLIUM = 10239;
+	public const ELEMENT_THORIUM = 10240;
+	public const ELEMENT_THULIUM = 10241;
+	public const ELEMENT_TIN = 10242;
+	public const ELEMENT_TITANIUM = 10243;
+	public const ELEMENT_TUNGSTEN = 10244;
+	public const ELEMENT_URANIUM = 10245;
+	public const ELEMENT_VANADIUM = 10246;
+	public const ELEMENT_XENON = 10247;
+	public const ELEMENT_YTTERBIUM = 10248;
+	public const ELEMENT_YTTRIUM = 10249;
+	public const ELEMENT_ZERO = 10250;
+	public const ELEMENT_ZINC = 10251;
+	public const ELEMENT_ZIRCONIUM = 10252;
+	public const EMERALD = 10253;
+	public const EMERALD_ORE = 10254;
+	public const ENCHANTING_TABLE = 10255;
+	public const END_PORTAL_FRAME = 10256;
+	public const END_ROD = 10257;
+	public const END_STONE = 10258;
+	public const END_STONE_BRICK_SLAB = 10259;
+	public const END_STONE_BRICK_STAIRS = 10260;
+	public const END_STONE_BRICK_WALL = 10261;
+	public const END_STONE_BRICKS = 10262;
+	public const ENDER_CHEST = 10263;
+	public const FAKE_WOODEN_SLAB = 10264;
+	public const FARMLAND = 10265;
+	public const FERN = 10266;
+	public const FIRE = 10267;
+	public const FLETCHING_TABLE = 10268;
+	public const FLOWER_POT = 10269;
+	public const FROSTED_ICE = 10270;
+	public const FURNACE = 10271;
+	public const GLASS = 10272;
+	public const GLASS_PANE = 10273;
+	public const GLOWING_OBSIDIAN = 10274;
+	public const GLOWSTONE = 10275;
+	public const GOLD = 10276;
+	public const GOLD_ORE = 10277;
+	public const GRANITE = 10278;
+	public const GRANITE_SLAB = 10279;
+	public const GRANITE_STAIRS = 10280;
+	public const GRANITE_WALL = 10281;
+	public const GRASS = 10282;
+	public const GRASS_PATH = 10283;
+	public const GRAVEL = 10284;
+
+	public const GREEN_TORCH = 10287;
+	public const HARDENED_CLAY = 10288;
+	public const HARDENED_GLASS = 10289;
+	public const HARDENED_GLASS_PANE = 10290;
+	public const HAY_BALE = 10291;
+	public const HOPPER = 10292;
+	public const ICE = 10293;
+	public const INFESTED_CHISELED_STONE_BRICK = 10294;
+	public const INFESTED_COBBLESTONE = 10295;
+	public const INFESTED_CRACKED_STONE_BRICK = 10296;
+	public const INFESTED_MOSSY_STONE_BRICK = 10297;
+	public const INFESTED_STONE = 10298;
+	public const INFESTED_STONE_BRICK = 10299;
+	public const INFO_UPDATE = 10300;
+	public const INFO_UPDATE2 = 10301;
+	public const INVISIBLE_BEDROCK = 10302;
+	public const IRON = 10303;
+	public const IRON_BARS = 10304;
+	public const IRON_DOOR = 10305;
+	public const IRON_ORE = 10306;
+	public const IRON_TRAPDOOR = 10307;
+	public const ITEM_FRAME = 10308;
+	public const JUKEBOX = 10309;
+	public const JUNGLE_BUTTON = 10310;
+	public const JUNGLE_DOOR = 10311;
+	public const JUNGLE_FENCE = 10312;
+	public const JUNGLE_FENCE_GATE = 10313;
+	public const JUNGLE_LEAVES = 10314;
+	public const JUNGLE_LOG = 10315;
+	public const JUNGLE_PLANKS = 10316;
+	public const JUNGLE_PRESSURE_PLATE = 10317;
+	public const JUNGLE_SAPLING = 10318;
+	public const JUNGLE_SIGN = 10319;
+	public const JUNGLE_SLAB = 10320;
+	public const JUNGLE_STAIRS = 10321;
+	public const JUNGLE_TRAPDOOR = 10322;
+	public const JUNGLE_WALL_SIGN = 10323;
+	public const JUNGLE_WOOD = 10324;
+	public const LAB_TABLE = 10325;
+	public const LADDER = 10326;
+	public const LANTERN = 10327;
+	public const LAPIS_LAZULI = 10328;
+	public const LAPIS_LAZULI_ORE = 10329;
+	public const LARGE_FERN = 10330;
+	public const LAVA = 10331;
+	public const LECTERN = 10332;
+	public const LEGACY_STONECUTTER = 10333;
+	public const LEVER = 10334;
+
+	public const LILAC = 10337;
+	public const LILY_OF_THE_VALLEY = 10338;
+	public const LILY_PAD = 10339;
+
+	public const LIT_PUMPKIN = 10341;
+	public const LOOM = 10342;
+
+	public const MAGMA = 10344;
+	public const MATERIAL_REDUCER = 10345;
+	public const MELON = 10346;
+	public const MELON_STEM = 10347;
+	public const MOB_HEAD = 10348;
+	public const MONSTER_SPAWNER = 10349;
+	public const MOSSY_COBBLESTONE = 10350;
+	public const MOSSY_COBBLESTONE_SLAB = 10351;
+	public const MOSSY_COBBLESTONE_STAIRS = 10352;
+	public const MOSSY_COBBLESTONE_WALL = 10353;
+	public const MOSSY_STONE_BRICK_SLAB = 10354;
+	public const MOSSY_STONE_BRICK_STAIRS = 10355;
+	public const MOSSY_STONE_BRICK_WALL = 10356;
+	public const MOSSY_STONE_BRICKS = 10357;
+	public const MUSHROOM_STEM = 10358;
+	public const MYCELIUM = 10359;
+	public const NETHER_BRICK_FENCE = 10360;
+	public const NETHER_BRICK_SLAB = 10361;
+	public const NETHER_BRICK_STAIRS = 10362;
+	public const NETHER_BRICK_WALL = 10363;
+	public const NETHER_BRICKS = 10364;
+	public const NETHER_PORTAL = 10365;
+	public const NETHER_QUARTZ_ORE = 10366;
+	public const NETHER_REACTOR_CORE = 10367;
+	public const NETHER_WART = 10368;
+	public const NETHER_WART_BLOCK = 10369;
+	public const NETHERRACK = 10370;
+	public const NOTE_BLOCK = 10371;
+	public const OAK_BUTTON = 10372;
+	public const OAK_DOOR = 10373;
+	public const OAK_FENCE = 10374;
+	public const OAK_FENCE_GATE = 10375;
+	public const OAK_LEAVES = 10376;
+	public const OAK_LOG = 10377;
+	public const OAK_PLANKS = 10378;
+	public const OAK_PRESSURE_PLATE = 10379;
+	public const OAK_SAPLING = 10380;
+	public const OAK_SIGN = 10381;
+	public const OAK_SLAB = 10382;
+	public const OAK_STAIRS = 10383;
+	public const OAK_TRAPDOOR = 10384;
+	public const OAK_WALL_SIGN = 10385;
+	public const OAK_WOOD = 10386;
+	public const OBSIDIAN = 10387;
+
+	public const ORANGE_TULIP = 10389;
+	public const OXEYE_DAISY = 10390;
+	public const PACKED_ICE = 10391;
+	public const PEONY = 10392;
+
+	public const PINK_TULIP = 10394;
+	public const PODZOL = 10395;
+	public const POLISHED_ANDESITE = 10396;
+	public const POLISHED_ANDESITE_SLAB = 10397;
+	public const POLISHED_ANDESITE_STAIRS = 10398;
+	public const POLISHED_DIORITE = 10399;
+	public const POLISHED_DIORITE_SLAB = 10400;
+	public const POLISHED_DIORITE_STAIRS = 10401;
+	public const POLISHED_GRANITE = 10402;
+	public const POLISHED_GRANITE_SLAB = 10403;
+	public const POLISHED_GRANITE_STAIRS = 10404;
+	public const POPPY = 10405;
+	public const POTATOES = 10406;
+	public const POWERED_RAIL = 10407;
+	public const PRISMARINE = 10408;
+	public const PRISMARINE_BRICKS = 10409;
+	public const PRISMARINE_BRICKS_SLAB = 10410;
+	public const PRISMARINE_BRICKS_STAIRS = 10411;
+	public const PRISMARINE_SLAB = 10412;
+	public const PRISMARINE_STAIRS = 10413;
+	public const PRISMARINE_WALL = 10414;
+	public const PUMPKIN = 10415;
+	public const PUMPKIN_STEM = 10416;
+
+	public const PURPLE_TORCH = 10418;
+	public const PURPUR = 10419;
+	public const PURPUR_PILLAR = 10420;
+	public const PURPUR_SLAB = 10421;
+	public const PURPUR_STAIRS = 10422;
+	public const QUARTZ = 10423;
+	public const QUARTZ_PILLAR = 10424;
+	public const QUARTZ_SLAB = 10425;
+	public const QUARTZ_STAIRS = 10426;
+	public const RAIL = 10427;
+
+	public const RED_MUSHROOM = 10429;
+	public const RED_MUSHROOM_BLOCK = 10430;
+	public const RED_NETHER_BRICK_SLAB = 10431;
+	public const RED_NETHER_BRICK_STAIRS = 10432;
+	public const RED_NETHER_BRICK_WALL = 10433;
+	public const RED_NETHER_BRICKS = 10434;
+	public const RED_SAND = 10435;
+	public const RED_SANDSTONE = 10436;
+	public const RED_SANDSTONE_SLAB = 10437;
+	public const RED_SANDSTONE_STAIRS = 10438;
+	public const RED_SANDSTONE_WALL = 10439;
+	public const RED_TORCH = 10440;
+	public const RED_TULIP = 10441;
+	public const REDSTONE = 10442;
+	public const REDSTONE_COMPARATOR = 10443;
+	public const REDSTONE_LAMP = 10444;
+	public const REDSTONE_ORE = 10445;
+	public const REDSTONE_REPEATER = 10446;
+	public const REDSTONE_TORCH = 10447;
+	public const REDSTONE_WIRE = 10448;
+	public const RESERVED6 = 10449;
+	public const ROSE_BUSH = 10450;
+	public const SAND = 10451;
+	public const SANDSTONE = 10452;
+	public const SANDSTONE_SLAB = 10453;
+	public const SANDSTONE_STAIRS = 10454;
+	public const SANDSTONE_WALL = 10455;
+	public const SEA_LANTERN = 10456;
+	public const SEA_PICKLE = 10457;
+	public const SHULKER_BOX = 10458;
+	public const SLIME = 10459;
+	public const SMOKER = 10460;
+	public const SMOOTH_QUARTZ = 10461;
+	public const SMOOTH_QUARTZ_SLAB = 10462;
+	public const SMOOTH_QUARTZ_STAIRS = 10463;
+	public const SMOOTH_RED_SANDSTONE = 10464;
+	public const SMOOTH_RED_SANDSTONE_SLAB = 10465;
+	public const SMOOTH_RED_SANDSTONE_STAIRS = 10466;
+	public const SMOOTH_SANDSTONE = 10467;
+	public const SMOOTH_SANDSTONE_SLAB = 10468;
+	public const SMOOTH_SANDSTONE_STAIRS = 10469;
+	public const SMOOTH_STONE = 10470;
+	public const SMOOTH_STONE_SLAB = 10471;
+	public const SNOW = 10472;
+	public const SNOW_LAYER = 10473;
+	public const SOUL_SAND = 10474;
+	public const SPONGE = 10475;
+	public const SPRUCE_BUTTON = 10476;
+	public const SPRUCE_DOOR = 10477;
+	public const SPRUCE_FENCE = 10478;
+	public const SPRUCE_FENCE_GATE = 10479;
+	public const SPRUCE_LEAVES = 10480;
+	public const SPRUCE_LOG = 10481;
+	public const SPRUCE_PLANKS = 10482;
+	public const SPRUCE_PRESSURE_PLATE = 10483;
+	public const SPRUCE_SAPLING = 10484;
+	public const SPRUCE_SIGN = 10485;
+	public const SPRUCE_SLAB = 10486;
+	public const SPRUCE_STAIRS = 10487;
+	public const SPRUCE_TRAPDOOR = 10488;
+	public const SPRUCE_WALL_SIGN = 10489;
+	public const SPRUCE_WOOD = 10490;
+	public const STAINED_CLAY = 10491;
+	public const STAINED_GLASS = 10492;
+	public const STAINED_GLASS_PANE = 10493;
+	public const STAINED_HARDENED_GLASS = 10494;
+	public const STAINED_HARDENED_GLASS_PANE = 10495;
+	public const STONE = 10496;
+	public const STONE_BRICK_SLAB = 10497;
+	public const STONE_BRICK_STAIRS = 10498;
+	public const STONE_BRICK_WALL = 10499;
+	public const STONE_BRICKS = 10500;
+	public const STONE_BUTTON = 10501;
+	public const STONE_PRESSURE_PLATE = 10502;
+	public const STONE_SLAB = 10503;
+	public const STONE_STAIRS = 10504;
+	public const STONECUTTER = 10505;
+
+	public const SUGARCANE = 10518;
+	public const SUNFLOWER = 10519;
+	public const SWEET_BERRY_BUSH = 10520;
+	public const TALL_GRASS = 10521;
+	public const TNT = 10522;
+	public const TORCH = 10523;
+	public const TRAPPED_CHEST = 10524;
+	public const TRIPWIRE = 10525;
+	public const TRIPWIRE_HOOK = 10526;
+	public const UNDERWATER_TORCH = 10527;
+	public const VINES = 10528;
+	public const WALL_BANNER = 10529;
+	public const WALL_CORAL_FAN = 10530;
+	public const WATER = 10531;
+	public const WEIGHTED_PRESSURE_PLATE_HEAVY = 10532;
+	public const WEIGHTED_PRESSURE_PLATE_LIGHT = 10533;
+	public const WHEAT = 10534;
+	public const BUDDING_AMETHYST = 10535;
+	public const WHITE_TULIP = 10536;
+	public const WOOL = 10537;
+	public const AMETHYST_CLUSTER = 10538;
+	public const GLAZED_TERRACOTTA = 10539;
+	public const AMETHYST = 10540;
+	public const ANCIENT_DEBRIS = 10541;
+	public const BASALT = 10542;
+	public const POLISHED_BASALT = 10543;
+	public const SMOOTH_BASALT = 10544;
+	public const BLACKSTONE = 10545;
+	public const BLACKSTONE_SLAB = 10546;
+	public const BLACKSTONE_STAIRS = 10547;
+	public const BLACKSTONE_WALL = 10548;
+	public const POLISHED_BLACKSTONE = 10549;
+	public const POLISHED_BLACKSTONE_BUTTON = 10550;
+	public const POLISHED_BLACKSTONE_PRESSURE_PLATE = 10551;
+	public const POLISHED_BLACKSTONE_SLAB = 10552;
+	public const POLISHED_BLACKSTONE_STAIRS = 10553;
+	public const POLISHED_BLACKSTONE_WALL = 10554;
+	public const CHISELED_POLISHED_BLACKSTONE = 10555;
+	public const POLISHED_BLACKSTONE_BRICKS = 10556;
+	public const POLISHED_BLACKSTONE_BRICK_SLAB = 10557;
+	public const POLISHED_BLACKSTONE_BRICK_STAIRS = 10558;
+	public const POLISHED_BLACKSTONE_BRICK_WALL = 10559;
+	public const CRACKED_POLISHED_BLACKSTONE_BRICKS = 10560;
+	public const LIGHT = 10561;
+	public const RAW_COPPER = 10562;
+	public const RAW_GOLD = 10563;
+	public const RAW_IRON = 10564;
+	public const CALCITE = 10565;
+	public const DEEPSLATE = 10566;
+	public const DEEPSLATE_BRICKS = 10567;
+	public const DEEPSLATE_BRICK_SLAB = 10568;
+	public const DEEPSLATE_BRICK_STAIRS = 10569;
+	public const DEEPSLATE_BRICK_WALL = 10570;
+	public const CRACKED_DEEPSLATE_BRICKS = 10571;
+	public const DEEPSLATE_TILES = 10572;
+	public const DEEPSLATE_TILE_SLAB = 10573;
+	public const DEEPSLATE_TILE_STAIRS = 10574;
+	public const DEEPSLATE_TILE_WALL = 10575;
+	public const CRACKED_DEEPSLATE_TILES = 10576;
+	public const COBBLED_DEEPSLATE = 10577;
+	public const COBBLED_DEEPSLATE_SLAB = 10578;
+	public const COBBLED_DEEPSLATE_STAIRS = 10579;
+	public const COBBLED_DEEPSLATE_WALL = 10580;
+	public const POLISHED_DEEPSLATE = 10581;
+	public const POLISHED_DEEPSLATE_SLAB = 10582;
+	public const POLISHED_DEEPSLATE_STAIRS = 10583;
+	public const POLISHED_DEEPSLATE_WALL = 10584;
+	public const QUARTZ_BRICKS = 10585;
+	public const CHISELED_DEEPSLATE = 10586;
+	public const CHISELED_NETHER_BRICKS = 10587;
+	public const CRACKED_NETHER_BRICKS = 10588;
+	public const TUFF = 10589;
+	public const SOUL_TORCH = 10590;
+	public const SOUL_LANTERN = 10591;
+	public const SOUL_SOIL = 10592;
+	public const SOUL_FIRE = 10593;
+	public const SHROOMLIGHT = 10594;
+	public const MANGROVE_PLANKS = 10595;
+	public const CRIMSON_PLANKS = 10596;
+	public const WARPED_PLANKS = 10597;
+	public const MANGROVE_FENCE = 10598;
+	public const CRIMSON_FENCE = 10599;
+	public const WARPED_FENCE = 10600;
+	public const MANGROVE_SLAB = 10601;
+	public const CRIMSON_SLAB = 10602;
+	public const WARPED_SLAB = 10603;
+	public const MANGROVE_LOG = 10604;
+	public const CRIMSON_STEM = 10605;
+	public const WARPED_STEM = 10606;
+	public const MANGROVE_WOOD = 10607;
+	public const CRIMSON_HYPHAE = 10608;
+	public const WARPED_HYPHAE = 10609;
+	public const MANGROVE_TRAPDOOR = 10610;
+	public const CRIMSON_TRAPDOOR = 10611;
+	public const WARPED_TRAPDOOR = 10612;
+	public const MANGROVE_BUTTON = 10613;
+	public const CRIMSON_BUTTON = 10614;
+	public const WARPED_BUTTON = 10615;
+	public const MANGROVE_PRESSURE_PLATE = 10616;
+	public const CRIMSON_PRESSURE_PLATE = 10617;
+	public const WARPED_PRESSURE_PLATE = 10618;
+	public const MANGROVE_DOOR = 10619;
+	public const CRIMSON_DOOR = 10620;
+	public const WARPED_DOOR = 10621;
+	public const MANGROVE_FENCE_GATE = 10622;
+	public const CRIMSON_FENCE_GATE = 10623;
+	public const WARPED_FENCE_GATE = 10624;
+	public const MANGROVE_STAIRS = 10625;
+	public const CRIMSON_STAIRS = 10626;
+	public const WARPED_STAIRS = 10627;
+	public const MANGROVE_SIGN = 10628;
+	public const CRIMSON_SIGN = 10629;
+	public const WARPED_SIGN = 10630;
+	public const MANGROVE_WALL_SIGN = 10631;
+	public const CRIMSON_WALL_SIGN = 10632;
+	public const WARPED_WALL_SIGN = 10633;
+	public const TINTED_GLASS = 10634;
+	public const HONEYCOMB = 10635;
+	public const DEEPSLATE_COAL_ORE = 10636;
+	public const DEEPSLATE_DIAMOND_ORE = 10637;
+	public const DEEPSLATE_EMERALD_ORE = 10638;
+	public const DEEPSLATE_LAPIS_LAZULI_ORE = 10639;
+	public const DEEPSLATE_REDSTONE_ORE = 10640;
+	public const DEEPSLATE_IRON_ORE = 10641;
+	public const DEEPSLATE_GOLD_ORE = 10642;
+	public const DEEPSLATE_COPPER_ORE = 10643;
+	public const COPPER_ORE = 10644;
+	public const NETHER_GOLD_ORE = 10645;
+	public const MUD = 10646;
+	public const MUD_BRICKS = 10647;
+	public const MUD_BRICK_SLAB = 10648;
+	public const MUD_BRICK_STAIRS = 10649;
+	public const MUD_BRICK_WALL = 10650;
+	public const PACKED_MUD = 10651;
+	public const WARPED_WART_BLOCK = 10652;
+	public const CRYING_OBSIDIAN = 10653;
+	public const GILDED_BLACKSTONE = 10654;
+	public const LIGHTNING_ROD = 10655;
+	public const COPPER = 10656;
+	public const CUT_COPPER = 10657;
+	public const CUT_COPPER_SLAB = 10658;
+	public const CUT_COPPER_STAIRS = 10659;
+	public const CANDLE = 10660;
+	public const DYED_CANDLE = 10661;
+	public const CAKE_WITH_CANDLE = 10662;
+	public const CAKE_WITH_DYED_CANDLE = 10663;
+	public const WITHER_ROSE = 10664;
+	public const HANGING_ROOTS = 10665;
+	public const CARTOGRAPHY_TABLE = 10666;
+	public const SMITHING_TABLE = 10667;
+	public const NETHERITE = 10668;
+	public const SPORE_BLOSSOM = 10669;
+	public const CAULDRON = 10670;
+	public const WATER_CAULDRON = 10671;
+	public const LAVA_CAULDRON = 10672;
+	public const POTION_CAULDRON = 10673;
+	public const POWDER_SNOW_CAULDRON = 10674;
+	public const CHORUS_FLOWER = 10675;
+	public const CHORUS_PLANT = 10676;
+	public const MANGROVE_ROOTS = 10677;
+	public const MUDDY_MANGROVE_ROOTS = 10678;
+	public const FROGLIGHT = 10679;
+	public const TWISTING_VINES = 10680;
+	public const WEEPING_VINES = 10681;
+	public const CHAIN = 10682;
+	public const SCULK = 10683;
+	public const GLOWING_ITEM_FRAME = 10684;
+	public const MANGROVE_LEAVES = 10685;
+	public const AZALEA_LEAVES = 10686;
+	public const FLOWERING_AZALEA_LEAVES = 10687;
+	public const REINFORCED_DEEPSLATE = 10688;
+	public const CAVE_VINES = 10689;
+	public const GLOW_LICHEN = 10690;
+	public const CHERRY_BUTTON = 10691;
+	public const CHERRY_DOOR = 10692;
+	public const CHERRY_FENCE = 10693;
+	public const CHERRY_FENCE_GATE = 10694;
+	public const CHERRY_LEAVES = 10695;
+	public const CHERRY_LOG = 10696;
+	public const CHERRY_PLANKS = 10697;
+	public const CHERRY_PRESSURE_PLATE = 10698;
+	public const CHERRY_SAPLING = 10699;
+	public const CHERRY_SIGN = 10700;
+	public const CHERRY_SLAB = 10701;
+	public const CHERRY_STAIRS = 10702;
+	public const CHERRY_TRAPDOOR = 10703;
+	public const CHERRY_WALL_SIGN = 10704;
+	public const CHERRY_WOOD = 10705;
+	public const SMALL_DRIPLEAF = 10706;
+	public const BIG_DRIPLEAF_HEAD = 10707;
+	public const BIG_DRIPLEAF_STEM = 10708;
+	public const PINK_PETALS = 10709;
+	public const CRIMSON_ROOTS = 10710;
+	public const WARPED_ROOTS = 10711;
+	public const CHISELED_BOOKSHELF = 10712;
+	public const TORCHFLOWER = 10713;
+	public const TORCHFLOWER_CROP = 10714;
+	public const PITCHER_PLANT = 10715;
+	public const PITCHER_CROP = 10716;
+	public const DOUBLE_PITCHER_CROP = 10717;
+	public const CAMPFIRE = 10718;
+	public const SOUL_CAMPFIRE = 10719;
+	public const TUFF_SLAB = 10720;
+	public const TUFF_STAIRS = 10721;
+	public const TUFF_WALL = 10722;
+	public const CHISELED_TUFF = 10723;
+	public const TUFF_BRICKS = 10724;
+	public const TUFF_BRICK_SLAB = 10725;
+	public const TUFF_BRICK_STAIRS = 10726;
+	public const TUFF_BRICK_WALL = 10727;
+	public const CHISELED_TUFF_BRICKS = 10728;
+	public const POLISHED_TUFF = 10729;
+	public const POLISHED_TUFF_SLAB = 10730;
+	public const POLISHED_TUFF_STAIRS = 10731;
+	public const POLISHED_TUFF_WALL = 10732;
+	public const COPPER_BULB = 10733;
+	public const COPPER_DOOR = 10734;
+	public const COPPER_TRAPDOOR = 10735;
+	public const CHISELED_COPPER = 10736;
+	public const COPPER_GRATE = 10737;
+
+	public const FIRST_UNUSED_BLOCK_ID = 10738;
+
+	private static int $nextDynamicId = self::FIRST_UNUSED_BLOCK_ID;
+
+	/**
+	 * Returns a new runtime block type ID, e.g. for use by a custom block.
+	 */
+	public static function newId() : int{
+		return self::$nextDynamicId++;
+	}
+}
diff --git a/src/block/BlockTypeInfo.php b/src/block/BlockTypeInfo.php
new file mode 100644
index 0000000000..a1424ef3cf
--- /dev/null
+++ b/src/block/BlockTypeInfo.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use function array_fill_keys;
+use function array_keys;
+
+final class BlockTypeInfo{
+	/**
+	 * @var true[]
+	 * @phpstan-var array<string, true>
+	 */
+	private array $typeTags;
+
+	/**
+	 * @param string[] $typeTags
+	 * @param string[] $enchantmentTags
+	 */
+	public function __construct(
+		private BlockBreakInfo $breakInfo,
+		array $typeTags = [],
+		private array $enchantmentTags = []
+	){
+		$this->typeTags = array_fill_keys($typeTags, true);
+	}
+
+	public function getBreakInfo() : BlockBreakInfo{ return $this->breakInfo; }
+
+	/** @return string[] */
+	public function getTypeTags() : array{ return array_keys($this->typeTags); }
+
+	public function hasTypeTag(string $tag) : bool{ return isset($this->typeTags[$tag]); }
+
+	/**
+	 * Returns tags that represent the type of item being enchanted and are used to determine
+	 * what enchantments can be applied to the item of this block during in-game enchanting (enchanting table, anvil, fishing, etc.).
+	 * @see ItemEnchantmentTags
+	 * @see ItemEnchantmentTagRegistry
+	 * @see AvailableEnchantmentRegistry
+	 *
+	 * @return string[]
+	 */
+	public function getEnchantmentTags() : array{
+		return $this->enchantmentTags;
+	}
+}
diff --git a/src/block/BlockTypeTags.php b/src/block/BlockTypeTags.php
new file mode 100644
index 0000000000..19a4825d96
--- /dev/null
+++ b/src/block/BlockTypeTags.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+final class BlockTypeTags{
+	private const PREFIX = "pocketmine:";
+
+	public const DIRT = self::PREFIX . "dirt";
+	public const MUD = self::PREFIX . "mud";
+	public const SAND = self::PREFIX . "sand";
+	public const POTTABLE_PLANTS = self::PREFIX . "pottable";
+	public const FIRE = self::PREFIX . "fire";
+}
diff --git a/src/block/BlueIce.php b/src/block/BlueIce.php
index f7e9a04046..11e3498dd1 100644
--- a/src/block/BlueIce.php
+++ b/src/block/BlueIce.php
@@ -27,10 +27,6 @@ use pocketmine\item\Item;
 
 class BlueIce extends Opaque{
 
-	public function getLightLevel() : int{
-		return 1;
-	}
-
 	public function getFrictionFactor() : float{
 		return 0.99;
 	}
@@ -38,4 +34,8 @@ class BlueIce extends Opaque{
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [];
 	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return true;
+	}
 }
diff --git a/src/block/BoneBlock.php b/src/block/BoneBlock.php
index 4c69e535f1..247bdb7486 100644
--- a/src/block/BoneBlock.php
+++ b/src/block/BoneBlock.php
@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\PillarRotationInMetadataTrait;
+use pocketmine\block\utils\PillarRotationTrait;
 
 class BoneBlock extends Opaque{
-	use PillarRotationInMetadataTrait;
+	use PillarRotationTrait;
 }
diff --git a/src/block/BrewingStand.php b/src/block/BrewingStand.php
index 19d239f82b..0396931649 100644
--- a/src/block/BrewingStand.php
+++ b/src/block/BrewingStand.php
@@ -26,6 +26,7 @@ namespace pocketmine\block;
 use pocketmine\block\tile\BrewingStand as TileBrewingStand;
 use pocketmine\block\utils\BrewingStandSlot;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\Axis;
 use pocketmine\math\AxisAlignedBB;
@@ -33,6 +34,7 @@ use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
 use function array_key_exists;
+use function spl_object_id;
 
 class BrewingStand extends Transparent{
 
@@ -42,33 +44,8 @@ class BrewingStand extends Transparent{
 	 */
 	protected array $slots = [];
 
-	protected function writeStateToMeta() : int{
-		$flags = 0;
-		foreach([
-			BlockLegacyMetadata::BREWING_STAND_FLAG_EAST => BrewingStandSlot::EAST(),
-			BlockLegacyMetadata::BREWING_STAND_FLAG_NORTHWEST => BrewingStandSlot::NORTHWEST(),
-			BlockLegacyMetadata::BREWING_STAND_FLAG_SOUTHWEST => BrewingStandSlot::SOUTHWEST(),
-		] as $flag => $slot){
-			$flags |= (array_key_exists($slot->id(), $this->slots) ? $flag : 0);
-		}
-		return $flags;
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->slots = [];
-		foreach([
-			BlockLegacyMetadata::BREWING_STAND_FLAG_EAST => BrewingStandSlot::EAST(),
-			BlockLegacyMetadata::BREWING_STAND_FLAG_NORTHWEST => BrewingStandSlot::NORTHWEST(),
-			BlockLegacyMetadata::BREWING_STAND_FLAG_SOUTHWEST => BrewingStandSlot::SOUTHWEST(),
-		] as $flag => $slot){
-			if(($stateMeta & $flag) !== 0){
-				$this->slots[$slot->id()] = $slot;
-			}
-		}
-	}
-
-	public function getStateBitmask() : int{
-		return 0b111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->enumSet($this->slots, BrewingStandSlot::cases());
 	}
 
 	protected function recalculateCollisionBoxes() : array{
@@ -85,18 +62,18 @@ class BrewingStand extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	public function hasSlot(BrewingStandSlot $slot) : bool{
-		return array_key_exists($slot->id(), $this->slots);
+		return array_key_exists(spl_object_id($slot), $this->slots);
 	}
 
 	public function setSlot(BrewingStandSlot $slot, bool $occupied) : self{
 		if($occupied){
-			$this->slots[$slot->id()] = $slot;
+			$this->slots[spl_object_id($slot)] = $slot;
 		}else{
-			unset($this->slots[$slot->id()]);
+			unset($this->slots[spl_object_id($slot)]);
 		}
 		return $this;
 	}
@@ -113,12 +90,12 @@ class BrewingStand extends Transparent{
 	public function setSlots(array $slots) : self{
 		$this->slots = [];
 		foreach($slots as $slot){
-			$this->slots[$slot->id()] = $slot;
+			$this->slots[spl_object_id($slot)] = $slot;
 		}
 		return $this;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($player instanceof Player){
 			$stand = $this->position->getWorld()->getTile($this->position);
 			if($stand instanceof TileBrewingStand && $stand->canOpenWith($item->getCustomName())){
@@ -138,7 +115,7 @@ class BrewingStand extends Transparent{
 			}
 
 			$changed = false;
-			foreach(BrewingStandSlot::getAll() as $slot){
+			foreach(BrewingStandSlot::cases() as $slot){
 				$occupied = !$brewing->getInventory()->isSlotEmpty($slot->getSlotNumber());
 				if($occupied !== $this->hasSlot($slot)){
 					$this->setSlot($slot, $occupied);
diff --git a/src/block/BuddingAmethyst.php b/src/block/BuddingAmethyst.php
new file mode 100644
index 0000000000..215a038f98
--- /dev/null
+++ b/src/block/BuddingAmethyst.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\AmethystTrait;
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\item\Item;
+use pocketmine\math\Facing;
+use function array_rand;
+use function mt_rand;
+
+final class BuddingAmethyst extends Opaque{
+	use AmethystTrait;
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
+		if(mt_rand(1, 5) === 1){
+			$face = Facing::ALL[array_rand(Facing::ALL)];
+
+			$adjacent = $this->getSide($face);
+			//TODO: amethyst buds can spawn in water - we need waterlogging support for this
+
+			$newStage = null;
+
+			if($adjacent->getTypeId() === BlockTypeIds::AIR){
+				$newStage = AmethystCluster::STAGE_SMALL_BUD;
+			}elseif(
+				$adjacent->getTypeId() === BlockTypeIds::AMETHYST_CLUSTER &&
+				$adjacent instanceof AmethystCluster &&
+				$adjacent->getStage() < AmethystCluster::STAGE_CLUSTER &&
+				$adjacent->getFacing() === $face
+			){
+				$newStage = $adjacent->getStage() + 1;
+			}
+			if($newStage !== null){
+				BlockEventHelper::grow($adjacent, VanillaBlocks::AMETHYST_CLUSTER()->setStage($newStage)->setFacing($face), null);
+			}
+		}
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [];
+	}
+}
diff --git a/src/block/Button.php b/src/block/Button.php
index f86d8a5791..73bd1d556b 100644
--- a/src/block/Button.php
+++ b/src/block/Button.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\AnyFacingTrait;
-use pocketmine\block\utils\BlockDataSerializer;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
@@ -38,18 +38,9 @@ abstract class Button extends Flowable{
 
 	protected bool $pressed = false;
 
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::writeFacing($this->facing) | ($this->pressed ? BlockLegacyMetadata::BUTTON_FLAG_POWERED : 0);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		//TODO: in PC it's (6 - facing) for every meta except 0 (down)
-		$this->facing = BlockDataSerializer::readFacing($stateMeta & 0x07);
-		$this->pressed = ($stateMeta & BlockLegacyMetadata::BUTTON_FLAG_POWERED) !== 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->facing($this->facing);
+		$w->bool($this->pressed);
 	}
 
 	public function isPressed() : bool{ return $this->pressed; }
@@ -61,7 +52,7 @@ abstract class Button extends Flowable{
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($this->canBeSupportedBy($blockReplace->getSide(Facing::opposite($face)), $face)){
+		if($this->canBeSupportedAt($blockReplace, $face)){
 			$this->facing = $face;
 			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 		}
@@ -70,7 +61,7 @@ abstract class Button extends Flowable{
 
 	abstract protected function getActivationTime() : int;
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if(!$this->pressed){
 			$this->pressed = true;
 			$world = $this->position->getWorld();
@@ -92,12 +83,12 @@ abstract class Button extends Flowable{
 	}
 
 	public function onNearbyBlockChange() : void{
-		if(!$this->canBeSupportedBy($this->getSide(Facing::opposite($this->facing)), $this->facing)){
+		if(!$this->canBeSupportedAt($this, $this->facing)){
 			$this->position->getWorld()->useBreakOn($this->position);
 		}
 	}
 
-	private function canBeSupportedBy(Block $support, int $face) : bool{
-		return $support->getSupportType($face)->hasCenterSupport();
+	private function canBeSupportedAt(Block $block, int $face) : bool{
+		return $block->getAdjacentSupportType(Facing::opposite($face))->hasCenterSupport();
 	}
 }
diff --git a/src/block/Cactus.php b/src/block/Cactus.php
index 15e5fdc994..6f2b04c8a3 100644
--- a/src/block/Cactus.php
+++ b/src/block/Cactus.php
@@ -23,47 +23,22 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
+use pocketmine\block\utils\AgeableTrait;
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\block\utils\SupportType;
 use pocketmine\entity\Entity;
-use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageEvent;
-use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
-use pocketmine\math\Vector3;
-use pocketmine\player\Player;
-use pocketmine\world\BlockTransaction;
 
 class Cactus extends Transparent{
+	use AgeableTrait;
+	use StaticSupportTrait;
+
 	public const MAX_AGE = 15;
 
-	protected int $age = 0;
-
-	protected function writeStateToMeta() : int{
-		return $this->age;
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->age = BlockDataSerializer::readBoundedInt("age", $stateMeta, 0, self::MAX_AGE);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
-	public function getAge() : int{ return $this->age; }
-
-	/** @return $this */
-	public function setAge(int $age) : self{
-		if($age < 0 || $age > self::MAX_AGE){
-			throw new \InvalidArgumentException("Age must be in range 0 ... " . self::MAX_AGE);
-		}
-		$this->age = $age;
-		return $this;
-	}
-
 	public function hasEntityCollision() : bool{
 		return true;
 	}
@@ -77,7 +52,7 @@ class Cactus extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	public function onEntityInside(Entity $entity) : bool{
@@ -86,20 +61,18 @@ class Cactus extends Transparent{
 		return true;
 	}
 
-	public function onNearbyBlockChange() : void{
-		$down = $this->getSide(Facing::DOWN);
-		$world = $this->position->getWorld();
-		if($down->getId() !== BlockLegacyIds::SAND && !$down->isSameType($this)){
-			$world->useBreakOn($this->position);
-		}else{
-			foreach(Facing::HORIZONTAL as $side){
-				$b = $this->getSide($side);
-				if($b->isSolid()){
-					$world->useBreakOn($this->position);
-					break;
-				}
+	private function canBeSupportedAt(Block $block) : bool{
+		$supportBlock = $block->getSide(Facing::DOWN);
+		if(!$supportBlock->hasSameTypeId($this) && !$supportBlock->hasTypeTag(BlockTypeTags::SAND)){
+			return false;
+		}
+		foreach(Facing::HORIZONTAL as $side){
+			if($block->getSide($side)->isSolid()){
+				return false;
 			}
 		}
+
+		return true;
 	}
 
 	public function ticksRandomly() : bool{
@@ -107,7 +80,7 @@ class Cactus extends Transparent{
 	}
 
 	public function onRandomTick() : void{
-		if(!$this->getSide(Facing::DOWN)->isSameType($this)){
+		if(!$this->getSide(Facing::DOWN)->hasSameTypeId($this)){
 			$world = $this->position->getWorld();
 			if($this->age === self::MAX_AGE){
 				for($y = 1; $y < 3; ++$y){
@@ -115,38 +88,18 @@ class Cactus extends Transparent{
 						break;
 					}
 					$b = $world->getBlockAt($this->position->x, $this->position->y + $y, $this->position->z);
-					if($b->getId() === BlockLegacyIds::AIR){
-						$ev = new BlockGrowEvent($b, VanillaBlocks::CACTUS());
-						$ev->call();
-						if($ev->isCancelled()){
-							break;
-						}
-						$world->setBlock($b->position, $ev->getNewState());
+					if($b->getTypeId() === BlockTypeIds::AIR){
+						BlockEventHelper::grow($b, VanillaBlocks::CACTUS(), null);
 					}else{
 						break;
 					}
 				}
 				$this->age = 0;
-				$world->setBlock($this->position, $this);
+				$world->setBlock($this->position, $this, update: false);
 			}else{
 				++$this->age;
-				$world->setBlock($this->position, $this);
+				$world->setBlock($this->position, $this, update: false);
 			}
 		}
 	}
-
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		$down = $this->getSide(Facing::DOWN);
-		if($down->getId() === BlockLegacyIds::SAND || $down->isSameType($this)){
-			foreach(Facing::HORIZONTAL as $side){
-				if($this->getSide($side)->isSolid()){
-					return false;
-				}
-			}
-
-			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-		}
-
-		return false;
-	}
 }
diff --git a/src/block/Cake.php b/src/block/Cake.php
index 803f431b2c..073fc62ac9 100644
--- a/src/block/Cake.php
+++ b/src/block/Cake.php
@@ -23,33 +23,21 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
-use pocketmine\block\utils\SupportType;
-use pocketmine\entity\effect\EffectInstance;
-use pocketmine\entity\FoodSource;
-use pocketmine\entity\Living;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
+use pocketmine\item\ItemBlock;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
-use pocketmine\world\BlockTransaction;
 
-class Cake extends Transparent implements FoodSource{
+class Cake extends BaseCake{
 	public const MAX_BITES = 6;
 
 	protected int $bites = 0;
 
-	protected function writeStateToMeta() : int{
-		return $this->bites;
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->bites = BlockDataSerializer::readBoundedInt("bites", $stateMeta, 0, self::MAX_BITES);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->boundedIntAuto(0, self::MAX_BITES, $this->bites);
 	}
 
 	/**
@@ -64,10 +52,6 @@ class Cake extends Transparent implements FoodSource{
 		];
 	}
 
-	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
-	}
-
 	public function getBites() : int{ return $this->bites; }
 
 	/** @return $this */
@@ -79,49 +63,31 @@ class Cake extends Transparent implements FoodSource{
 		return $this;
 	}
 
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		$down = $this->getSide(Facing::DOWN);
-		if($down->getId() !== BlockLegacyIds::AIR){
-			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($this->bites === 0 && $item instanceof ItemBlock){
+			$block = $item->getBlock();
+			$resultBlock = null;
+			if($block->getTypeId() === BlockTypeIds::CANDLE){
+				$resultBlock = VanillaBlocks::CAKE_WITH_CANDLE();
+			}elseif($block instanceof DyedCandle){
+				$resultBlock = VanillaBlocks::CAKE_WITH_DYED_CANDLE()->setColor($block->getColor());
+			}
+
+			if($resultBlock !== null){
+				$this->position->getWorld()->setBlock($this->position, $resultBlock);
+				$item->pop();
+				return true;
+			}
 		}
 
-		return false;
-	}
-
-	public function onNearbyBlockChange() : void{
-		if($this->getSide(Facing::DOWN)->getId() === BlockLegacyIds::AIR){ //Replace with common break method
-			$this->position->getWorld()->setBlock($this->position, VanillaBlocks::AIR());
-		}
+		return parent::onInteract($item, $face, $clickVector, $player, $returnedItems);
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [];
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($player !== null){
-			return $player->consumeObject($this);
-		}
-
-		return false;
-	}
-
-	public function getFoodRestore() : int{
-		return 2;
-	}
-
-	public function getSaturationRestore() : float{
-		return 0.4;
-	}
-
-	public function requiresHunger() : bool{
-		return true;
-	}
-
-	/**
-	 * @return Block
-	 */
-	public function getResidue(){
+	public function getResidue() : Block{
 		$clone = clone $this;
 		$clone->bites++;
 		if($clone->bites > self::MAX_BITES){
@@ -129,15 +95,4 @@ class Cake extends Transparent implements FoodSource{
 		}
 		return $clone;
 	}
-
-	/**
-	 * @return EffectInstance[]
-	 */
-	public function getAdditionalEffects() : array{
-		return [];
-	}
-
-	public function onConsume(Living $consumer) : void{
-		$this->position->getWorld()->setBlock($this->position, $this->getResidue());
-	}
 }
diff --git a/src/block/CakeWithCandle.php b/src/block/CakeWithCandle.php
new file mode 100644
index 0000000000..380d080c5d
--- /dev/null
+++ b/src/block/CakeWithCandle.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\CandleTrait;
+use pocketmine\entity\Living;
+use pocketmine\item\Item;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+
+class CakeWithCandle extends BaseCake{
+	use CandleTrait {
+		onInteract as onInteractCandle;
+	}
+
+	/**
+	 * @return AxisAlignedBB[]
+	 */
+	protected function recalculateCollisionBoxes() : array{
+		return [
+			AxisAlignedBB::one()
+				->contract(1 / 16, 0, 1 / 16)
+				->trim(Facing::UP, 0.5) //TODO: not sure if the candle affects height
+		];
+	}
+
+	public function getCandle() : Candle{
+		return VanillaBlocks::CANDLE();
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($this->lit && $face !== Facing::UP){
+			return true;
+		}
+		if($this->onInteractCandle($item, $face, $clickVector, $player, $returnedItems)){
+			return true;
+		}
+
+		return parent::onInteract($item, $face, $clickVector, $player, $returnedItems);
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [$this->getCandle()->asItem()];
+	}
+
+	public function getPickedItem(bool $addUserData = false) : Item{
+		return VanillaBlocks::CAKE()->asItem();
+	}
+
+	public function getResidue() : Block{
+		return VanillaBlocks::CAKE()->setBites(1);
+	}
+
+	public function onConsume(Living $consumer) : void{
+		parent::onConsume($consumer);
+		$this->position->getWorld()->dropItem($this->position->add(0.5, 0.5, 0.5), $this->getCandle()->asItem());
+	}
+}
diff --git a/src/block/CakeWithDyedCandle.php b/src/block/CakeWithDyedCandle.php
new file mode 100644
index 0000000000..0dff358e16
--- /dev/null
+++ b/src/block/CakeWithDyedCandle.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\ColoredTrait;
+use pocketmine\block\utils\DyeColor;
+
+class CakeWithDyedCandle extends CakeWithCandle{
+	use ColoredTrait;
+
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockTypeInfo $typeInfo){
+		$this->color = DyeColor::WHITE;
+		parent::__construct($idInfo, $name, $typeInfo);
+	}
+
+	public function getCandle() : Candle{
+		return VanillaBlocks::DYED_CANDLE()->setColor($this->color);
+	}
+}
diff --git a/src/block/Campfire.php b/src/block/Campfire.php
new file mode 100644
index 0000000000..ce759ee87f
--- /dev/null
+++ b/src/block/Campfire.php
@@ -0,0 +1,277 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\inventory\CampfireInventory;
+use pocketmine\block\tile\Campfire as TileCampfire;
+use pocketmine\block\utils\HorizontalFacingTrait;
+use pocketmine\block\utils\LightableTrait;
+use pocketmine\block\utils\SupportType;
+use pocketmine\crafting\FurnaceRecipe;
+use pocketmine\crafting\FurnaceType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\entity\Entity;
+use pocketmine\entity\Living;
+use pocketmine\entity\projectile\Projectile;
+use pocketmine\entity\projectile\SplashPotion;
+use pocketmine\event\block\CampfireCookEvent;
+use pocketmine\event\entity\EntityDamageByBlockEvent;
+use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\item\Durable;
+use pocketmine\item\enchantment\VanillaEnchantments;
+use pocketmine\item\Item;
+use pocketmine\item\ItemTypeIds;
+use pocketmine\item\PotionType;
+use pocketmine\item\Shovel;
+use pocketmine\item\VanillaItems;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
+use pocketmine\math\RayTraceResult;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\BlockTransaction;
+use pocketmine\world\sound\BlazeShootSound;
+use pocketmine\world\sound\FireExtinguishSound;
+use pocketmine\world\sound\FlintSteelSound;
+use pocketmine\world\sound\ItemFrameAddItemSound;
+use function count;
+use function min;
+use function mt_rand;
+
+class Campfire extends Transparent{
+	use HorizontalFacingTrait{
+		HorizontalFacingTrait::describeBlockOnlyState as encodeFacingState;
+	}
+	use LightableTrait{
+		LightableTrait::describeBlockOnlyState as encodeLitState;
+	}
+
+	private const UPDATE_INTERVAL_TICKS = 10;
+
+	protected CampfireInventory $inventory;
+
+	/**
+	 * @var int[] slot => ticks
+	 * @phpstan-var array<int, int>
+	 */
+	protected array $cookingTimes = [];
+
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$this->encodeFacingState($w);
+		$this->encodeLitState($w);
+	}
+
+	public function readStateFromWorld() : Block{
+		parent::readStateFromWorld();
+		$tile = $this->position->getWorld()->getTile($this->position);
+		if($tile instanceof TileCampfire){
+			$this->inventory = $tile->getInventory();
+			$this->cookingTimes = $tile->getCookingTimes();
+		}else{
+			$this->inventory = new CampfireInventory($this->position);
+		}
+
+		return $this;
+	}
+
+	public function writeStateToWorld() : void{
+		parent::writeStateToWorld();
+		$tile = $this->position->getWorld()->getTile($this->position);
+		if($tile instanceof TileCampfire){
+			$tile->setCookingTimes($this->cookingTimes);
+		}
+	}
+
+	public function hasEntityCollision() : bool{
+		return true;
+	}
+
+	public function getLightLevel() : int{
+		return $this->lit ? 15 : 0;
+	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return true;
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [
+			VanillaItems::CHARCOAL()->setCount(2)
+		];
+	}
+
+	public function getSupportType(int $facing) : SupportType{
+		return SupportType::NONE;
+	}
+
+	protected function recalculateCollisionBoxes() : array{
+		return [AxisAlignedBB::one()->trim(Facing::UP, 9 / 16)];
+	}
+
+	public function getInventory() : CampfireInventory{
+		return $this->inventory;
+	}
+
+	protected function getFurnaceType() : FurnaceType{
+		return FurnaceType::CAMPFIRE;
+	}
+
+	protected function getEntityCollisionDamage() : int{
+		return 1;
+	}
+
+	/**
+	 * Sets the number of ticks during the item in the given slot has been cooked.
+	 */
+	public function setCookingTime(int $slot, int $time) : void{
+		if($slot < 0 || $slot > 3){
+			throw new \InvalidArgumentException("Slot must be in range 0-3");
+		}
+		if($time < 0 || $time > $this->getFurnaceType()->getCookDurationTicks()){
+			throw new \InvalidArgumentException("CookingTime must be in range 0-" . $this->getFurnaceType()->getCookDurationTicks());
+		}
+		$this->cookingTimes[$slot] = $time;
+	}
+
+	/**
+	 * Returns the number of ticks during the item in the given slot has been cooked.
+	 */
+	public function getCookingTime(int $slot) : int{
+		return $this->cookingTimes[$slot] ?? 0;
+	}
+
+	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+		if($this->getSide(Facing::DOWN) instanceof Campfire){
+			return false;
+		}
+		if($player !== null){
+			$this->facing = $player->getHorizontalFacing();
+		}
+		$this->lit = true;
+		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if(!$this->lit){
+			if($item->getTypeId() === ItemTypeIds::FIRE_CHARGE){
+				$item->pop();
+				$this->ignite();
+				$this->position->getWorld()->addSound($this->position, new BlazeShootSound());
+				return true;
+			}elseif($item->getTypeId() === ItemTypeIds::FLINT_AND_STEEL || $item->hasEnchantment(VanillaEnchantments::FIRE_ASPECT())){
+				if($item instanceof Durable){
+					$item->applyDamage(1);
+				}
+				$this->ignite();
+				return true;
+			}
+		}elseif($item instanceof Shovel){
+			$item->applyDamage(1);
+			$this->extinguish();
+			return true;
+		}
+
+		if($this->position->getWorld()->getServer()->getCraftingManager()->getFurnaceRecipeManager($this->getFurnaceType())->match($item) !== null){
+			$ingredient = clone $item;
+			$ingredient->setCount(1);
+			if(count($this->inventory->addItem($ingredient)) === 0){
+				$item->pop();
+				$this->position->getWorld()->addSound($this->position, new ItemFrameAddItemSound());
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public function onNearbyBlockChange() : void{
+		if($this->lit && $this->getSide(Facing::UP)->getTypeId() === BlockTypeIds::WATER){
+			$this->extinguish();
+			//TODO: Waterlogging
+		}
+	}
+
+	public function onEntityInside(Entity $entity) : bool{
+		if(!$this->lit){
+			if($entity->isOnFire()){
+				$this->ignite();
+				return false;
+			}
+		}elseif($entity instanceof Living){
+			$entity->attack(new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, $this->getEntityCollisionDamage()));
+		}
+		return true;
+	}
+
+	public function onProjectileHit(Projectile $projectile, RayTraceResult $hitResult) : void{
+		if($this->lit && $projectile instanceof SplashPotion && $projectile->getPotionType() === PotionType::WATER){
+			$this->extinguish();
+		}
+	}
+
+	public function onScheduledUpdate() : void{
+		if($this->lit){
+			$items = $this->inventory->getContents();
+			$furnaceType = $this->getFurnaceType();
+			$maxCookDuration = $furnaceType->getCookDurationTicks();
+			foreach($items as $slot => $item){
+				$this->setCookingTime($slot, min($maxCookDuration, $this->getCookingTime($slot) + self::UPDATE_INTERVAL_TICKS));
+				if($this->getCookingTime($slot) >= $maxCookDuration){
+					$result =
+						($recipe = $this->position->getWorld()->getServer()->getCraftingManager()->getFurnaceRecipeManager($furnaceType)->match($item)) instanceof FurnaceRecipe ?
+							$recipe->getResult() :
+							VanillaItems::AIR();
+
+					$ev = new CampfireCookEvent($this, $slot, $item, $result);
+					$ev->call();
+
+					if ($ev->isCancelled()){
+						continue;
+					}
+
+					$this->inventory->setItem($slot, VanillaItems::AIR());
+					$this->setCookingTime($slot, 0);
+					$this->position->getWorld()->dropItem($this->position->add(0.5, 1, 0.5), $ev->getResult());
+				}
+			}
+			if(count($items) > 0){
+				$this->position->getWorld()->setBlock($this->position, $this);
+			}
+			if(mt_rand(1, 6) === 1){
+				$this->position->getWorld()->addSound($this->position, $furnaceType->getCookSound());
+			}
+			$this->position->getWorld()->scheduleDelayedBlockUpdate($this->position, self::UPDATE_INTERVAL_TICKS);
+		}
+	}
+
+	private function extinguish() : void{
+		$this->position->getWorld()->addSound($this->position, new FireExtinguishSound());
+		$this->position->getWorld()->setBlock($this->position, $this->setLit(false));
+	}
+
+	private function ignite() : void{
+		$this->position->getWorld()->addSound($this->position, new FlintSteelSound());
+		$this->position->getWorld()->setBlock($this->position, $this->setLit(true));
+		$this->position->getWorld()->scheduleDelayedBlockUpdate($this->position, self::UPDATE_INTERVAL_TICKS);
+	}
+}
diff --git a/src/block/Candle.php b/src/block/Candle.php
new file mode 100644
index 0000000000..7f22641e11
--- /dev/null
+++ b/src/block/Candle.php
@@ -0,0 +1,125 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\CandleTrait;
+use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\item\Item;
+use pocketmine\math\Axis;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\world\BlockTransaction;
+
+class Candle extends Transparent{
+	use CandleTrait {
+		describeBlockOnlyState as encodeLitState;
+		getLightLevel as getBaseLightLevel;
+	}
+
+	public const MIN_COUNT = 1;
+	public const MAX_COUNT = 4;
+
+	private int $count = self::MIN_COUNT;
+
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$this->encodeLitState($w);
+		$w->boundedIntAuto(self::MIN_COUNT, self::MAX_COUNT, $this->count);
+	}
+
+	public function getCount() : int{ return $this->count; }
+
+	/** @return $this */
+	public function setCount(int $count) : self{
+		if($count < self::MIN_COUNT || $count > self::MAX_COUNT){
+			throw new \InvalidArgumentException("Count must be in range " . self::MIN_COUNT . " ... " . self::MAX_COUNT);
+		}
+		$this->count = $count;
+		return $this;
+	}
+
+	public function getLightLevel() : int{
+		return $this->getBaseLightLevel() * $this->count;
+	}
+
+	protected function recalculateCollisionBoxes() : array{
+		return [
+			(match($this->count){
+				1 => AxisAlignedBB::one()
+					->squash(Axis::X, 7 / 16)
+					->squash(Axis::Z, 7 / 16),
+				2 => AxisAlignedBB::one()
+					->squash(Axis::X, 5 / 16)
+					->trim(Facing::NORTH, 7 / 16) //0.3 thick on the Z axis
+					->trim(Facing::SOUTH, 6 / 16),
+				3 => AxisAlignedBB::one()
+					->trim(Facing::WEST, 5 / 16)
+					->trim(Facing::EAST, 6 / 16)
+					->trim(Facing::NORTH, 6 / 16)
+					->trim(Facing::SOUTH, 5 / 16),
+				4 => AxisAlignedBB::one()
+					->squash(Axis::X, 5 / 16)
+					->trim(Facing::NORTH, 5 / 16)
+					->trim(Facing::SOUTH, 6 / 16),
+				default => throw new AssumptionFailedError("Unreachable")
+			})->trim(Facing::UP, 10 / 16)
+		];
+	}
+
+	public function getSupportType(int $facing) : SupportType{
+		return SupportType::NONE;
+	}
+
+	protected function getCandleIfCompatibleType(Block $block) : ?Candle{
+		return $block instanceof Candle && $block->hasSameTypeId($this) ? $block : null;
+	}
+
+	public function canBePlacedAt(Block $blockReplace, Vector3 $clickVector, int $face, bool $isClickedBlock) : bool{
+		$candle = $this->getCandleIfCompatibleType($blockReplace);
+		return $candle !== null ? $candle->count < self::MAX_COUNT : parent::canBePlacedAt($blockReplace, $clickVector, $face, $isClickedBlock);
+	}
+
+	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+		if(!$blockReplace->getAdjacentSupportType(Facing::DOWN)->hasCenterSupport()){
+			return false;
+		}
+		$existing = $this->getCandleIfCompatibleType($blockReplace);
+		if($existing !== null){
+			if($existing->count >= self::MAX_COUNT){
+				return false;
+			}
+
+			$this->count = $existing->count + 1;
+			$this->lit = $existing->lit;
+		}
+		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [$this->asItem()->setCount($this->count)];
+	}
+}
diff --git a/src/block/Carpet.php b/src/block/Carpet.php
index 4d90d4e16f..1ee7240c51 100644
--- a/src/block/Carpet.php
+++ b/src/block/Carpet.php
@@ -23,22 +23,14 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\ColorInMetadataTrait;
-use pocketmine\block\utils\DyeColor;
-use pocketmine\item\Item;
+use pocketmine\block\utils\ColoredTrait;
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
-use pocketmine\math\Vector3;
-use pocketmine\player\Player;
-use pocketmine\world\BlockTransaction;
 
 class Carpet extends Flowable{
-	use ColorInMetadataTrait;
-
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->color = DyeColor::WHITE();
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
+	use ColoredTrait;
+	use StaticSupportTrait;
 
 	public function isSolid() : bool{
 		return true;
@@ -51,19 +43,8 @@ class Carpet extends Flowable{
 		return [AxisAlignedBB::one()->trim(Facing::UP, 15 / 16)];
 	}
 
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		$down = $this->getSide(Facing::DOWN);
-		if($down->getId() !== BlockLegacyIds::AIR){
-			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-		}
-
-		return false;
-	}
-
-	public function onNearbyBlockChange() : void{
-		if($this->getSide(Facing::DOWN)->getId() === BlockLegacyIds::AIR){
-			$this->position->getWorld()->useBreakOn($this->position);
-		}
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getSide(Facing::DOWN)->getTypeId() !== BlockTypeIds::AIR;
 	}
 
 	public function getFlameEncouragement() : int{
diff --git a/src/block/Carrot.php b/src/block/Carrot.php
index c03d107378..7d8947afaf 100644
--- a/src/block/Carrot.php
+++ b/src/block/Carrot.php
@@ -23,19 +23,19 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\FortuneDropHelper;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
-use function mt_rand;
 
 class Carrot extends Crops{
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			VanillaItems::CARROT()->setCount($this->age >= self::MAX_AGE ? mt_rand(1, 4) : 1)
+			VanillaItems::CARROT()->setCount($this->age >= self::MAX_AGE ? FortuneDropHelper::binomial($item, 1) : 1)
 		];
 	}
 
-	public function getPickedItem(bool $addUserData = false) : Item{
+	public function asItem() : Item{
 		return VanillaItems::CARROT();
 	}
 }
diff --git a/src/block/CartographyTable.php b/src/block/CartographyTable.php
new file mode 100644
index 0000000000..67d950c5ac
--- /dev/null
+++ b/src/block/CartographyTable.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\inventory\CartographyTableInventory;
+use pocketmine\item\Item;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+
+final class CartographyTable extends Opaque{
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($player !== null){
+			$player->setCurrentWindow(new CartographyTableInventory($this->position));
+		}
+
+		return true;
+	}
+
+	public function getFuelTime() : int{
+		return 300;
+	}
+}
diff --git a/src/block/CarvedPumpkin.php b/src/block/CarvedPumpkin.php
index 7c99c1531b..98f3c2307a 100644
--- a/src/block/CarvedPumpkin.php
+++ b/src/block/CarvedPumpkin.php
@@ -23,23 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\FacesOppositePlacingPlayerTrait;
-use pocketmine\block\utils\HorizontalFacingTrait;
 
 class CarvedPumpkin extends Opaque{
 	use FacesOppositePlacingPlayerTrait;
-	use HorizontalFacingTrait;
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::readLegacyHorizontalFacing($stateMeta & 0x03);
-	}
-
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::writeLegacyHorizontalFacing($this->facing);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b11;
-	}
 }
diff --git a/src/block/Cauldron.php b/src/block/Cauldron.php
new file mode 100644
index 0000000000..772583a5af
--- /dev/null
+++ b/src/block/Cauldron.php
@@ -0,0 +1,104 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\tile\Cauldron as TileCauldron;
+use pocketmine\block\utils\SupportType;
+use pocketmine\item\Item;
+use pocketmine\item\ItemTypeIds;
+use pocketmine\item\Potion;
+use pocketmine\item\PotionType;
+use pocketmine\item\SplashPotion;
+use pocketmine\item\VanillaItems;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use function assert;
+
+final class Cauldron extends Transparent{
+
+	public function writeStateToWorld() : void{
+		parent::writeStateToWorld();
+		$tile = $this->position->getWorld()->getTile($this->position);
+		assert($tile instanceof TileCauldron);
+
+		//empty cauldrons don't use this information
+		$tile->setCustomWaterColor(null);
+		$tile->setPotionItem(null);
+	}
+
+	protected function recalculateCollisionBoxes() : array{
+		$result = [
+			AxisAlignedBB::one()->trim(Facing::UP, 11 / 16) //bottom of the cauldron
+		];
+
+		foreach(Facing::HORIZONTAL as $f){ //add the frame parts around the bowl
+			$result[] = AxisAlignedBB::one()->trim($f, 14 / 16);
+		}
+		return $result;
+	}
+
+	public function getSupportType(int $facing) : SupportType{
+		return $facing === Facing::UP ? SupportType::EDGE : SupportType::NONE;
+	}
+
+	/**
+	 * @param Item[] &$returnedItems
+	 */
+	private function fill(int $amount, FillableCauldron $result, Item $usedItem, Item $returnedItem, array &$returnedItems) : void{
+		$this->position->getWorld()->setBlock($this->position, $result->setFillLevel($amount));
+		$this->position->getWorld()->addSound($this->position->add(0.5, 0.5, 0.5), $result->getFillSound());
+
+		$usedItem->pop();
+		$returnedItems[] = $returnedItem;
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($item->getTypeId() === ItemTypeIds::WATER_BUCKET){
+			$this->fill(FillableCauldron::MAX_FILL_LEVEL, VanillaBlocks::WATER_CAULDRON(), $item, VanillaItems::BUCKET(), $returnedItems);
+		}elseif($item->getTypeId() === ItemTypeIds::LAVA_BUCKET){
+			$this->fill(FillableCauldron::MAX_FILL_LEVEL, VanillaBlocks::LAVA_CAULDRON(), $item, VanillaItems::BUCKET(), $returnedItems);
+		}elseif($item->getTypeId() === ItemTypeIds::POWDER_SNOW_BUCKET){
+			//TODO: powder snow cauldron
+		}elseif($item instanceof Potion || $item instanceof SplashPotion){ //TODO: lingering potion
+			if($item->getType() === PotionType::WATER){
+				$this->fill(WaterCauldron::WATER_BOTTLE_FILL_AMOUNT, VanillaBlocks::WATER_CAULDRON(), $item, VanillaItems::GLASS_BOTTLE(), $returnedItems);
+			}else{
+				$this->fill(PotionCauldron::POTION_FILL_AMOUNT, VanillaBlocks::POTION_CAULDRON()->setPotionItem($item), $item, VanillaItems::GLASS_BOTTLE(), $returnedItems);
+			}
+		}
+
+		return true;
+	}
+
+	public function onNearbyBlockChange() : void{
+		$world = $this->position->getWorld();
+		if($world->getBlock($this->position->up())->getTypeId() === BlockTypeIds::WATER){
+			$cauldron = VanillaBlocks::WATER_CAULDRON()->setFillLevel(FillableCauldron::MAX_FILL_LEVEL);
+			$world->setBlock($this->position, $cauldron);
+			$world->addSound($this->position->add(0.5, 0.5, 0.5), $cauldron->getFillSound());
+		}
+	}
+}
diff --git a/src/block/CaveVines.php b/src/block/CaveVines.php
new file mode 100644
index 0000000000..daa973507f
--- /dev/null
+++ b/src/block/CaveVines.php
@@ -0,0 +1,164 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\AgeableTrait;
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\entity\Entity;
+use pocketmine\item\Fertilizer;
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\BlockTransaction;
+use pocketmine\world\sound\GlowBerriesPickSound;
+use function mt_rand;
+
+class CaveVines extends Flowable{
+	use AgeableTrait;
+	use StaticSupportTrait;
+
+	public const MAX_AGE = 25;
+
+	protected bool $berries = false;
+	protected bool $head = false;
+
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->boundedIntAuto(0, self::MAX_AGE, $this->age);
+		$w->bool($this->berries);
+		$w->bool($this->head);
+	}
+
+	public function hasBerries() : bool{ return $this->berries; }
+
+	/** @return $this */
+	public function setBerries(bool $berries) : self{
+		$this->berries = $berries;
+		return $this;
+	}
+
+	public function isHead() : bool{ return $this->head; }
+
+	/** @return $this */
+	public function setHead(bool $head) : self{
+		$this->head = $head;
+		return $this;
+	}
+
+	public function canClimb() : bool{
+		return true;
+	}
+
+	public function getLightLevel() : int{
+		return $this->berries ? 14 : 0;
+	}
+
+	private function canBeSupportedAt(Block $block) : bool{
+		$supportBlock = $block->getSide(Facing::UP);
+		return $supportBlock->getSupportType(Facing::DOWN) === SupportType::FULL || $supportBlock->hasSameTypeId($this);
+	}
+
+	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+		$this->age = mt_rand(0, self::MAX_AGE);
+		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($this->berries){
+			$this->position->getWorld()->dropItem($this->position, $this->asItem());
+			$this->position->getWorld()->addSound($this->position, new GlowBerriesPickSound());
+
+			$this->position->getWorld()->setBlock($this->position, $this->setBerries(false));
+			return true;
+		}
+		if($item instanceof Fertilizer){
+			$newState = (clone $this)
+				->setBerries(true)
+				->setHead(!$this->getSide(Facing::DOWN)->hasSameTypeId($this));
+			if(BlockEventHelper::grow($this, $newState, $player)){
+				$item->pop();
+			}
+			return true;
+		}
+		return false;
+	}
+
+	public function onRandomTick() : void{
+		$head = !$this->getSide(Facing::DOWN)->hasSameTypeId($this);
+		if($head !== $this->head){
+			$this->position->getWorld()->setBlock($this->position, $this->setHead($head));
+		}
+
+		if($this->age < self::MAX_AGE && mt_rand(1, 10) === 1){
+			$growthPos = $this->position->getSide(Facing::DOWN);
+			$world = $growthPos->getWorld();
+			if($world->isInWorld($growthPos->getFloorX(), $growthPos->getFloorY(), $growthPos->getFloorZ())){
+				$block = $world->getBlock($growthPos);
+				if($block->getTypeId() === BlockTypeIds::AIR){
+					$newState = VanillaBlocks::CAVE_VINES()
+						->setAge($this->age + 1)
+						->setBerries(mt_rand(1, 9) === 1);
+					BlockEventHelper::grow($block, $newState, null);
+				}
+			}
+		}
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	protected function recalculateCollisionBoxes() : array{
+		return [];
+	}
+
+	public function hasEntityCollision() : bool{
+		return true;
+	}
+
+	public function onEntityInside(Entity $entity) : bool{
+		$entity->resetFallDistance();
+		return false;
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return $this->berries ? [$this->asItem()] : [];
+	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return true;
+	}
+
+	public function asItem() : Item{
+		return VanillaItems::GLOW_BERRIES();
+	}
+
+	public function getSupportType(int $facing) : SupportType{
+		return SupportType::NONE;
+	}
+}
diff --git a/src/block/Chain.php b/src/block/Chain.php
new file mode 100644
index 0000000000..e9cc2c9be8
--- /dev/null
+++ b/src/block/Chain.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\PillarRotationTrait;
+use pocketmine\block\utils\SupportType;
+use pocketmine\math\Axis;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
+
+final class Chain extends Transparent{
+	use PillarRotationTrait;
+
+	public function getSupportType(int $facing) : SupportType{
+		return $this->axis === Axis::Y && Facing::axis($facing) === Axis::Y ? SupportType::CENTER : SupportType::NONE;
+	}
+
+	protected function recalculateCollisionBoxes() : array{
+		$bb = AxisAlignedBB::one();
+		foreach([Axis::Y, Axis::Z, Axis::X] as $axis){
+			if($axis !== $this->axis){
+				$bb->squash($axis, 13 / 32);
+			}
+		}
+		return [$bb];
+	}
+}
diff --git a/src/block/ChemistryTable.php b/src/block/ChemistryTable.php
index fb2310dcdf..058e402883 100644
--- a/src/block/ChemistryTable.php
+++ b/src/block/ChemistryTable.php
@@ -23,31 +23,15 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\FacesOppositePlacingPlayerTrait;
-use pocketmine\block\utils\HorizontalFacingTrait;
 use pocketmine\item\Item;
-use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
 
 final class ChemistryTable extends Opaque{
 	use FacesOppositePlacingPlayerTrait;
-	use HorizontalFacingTrait;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = Facing::opposite(BlockDataSerializer::readLegacyHorizontalFacing($stateMeta & 0x3));
-	}
-
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::writeLegacyHorizontalFacing(Facing::opposite($this->facing));
-	}
-
-	public function getStateBitmask() : int{
-		return 0b0011;
-	}
-
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		//TODO
 		return false;
 	}
diff --git a/src/block/Chest.php b/src/block/Chest.php
index 9e012ee392..dca21576aa 100644
--- a/src/block/Chest.php
+++ b/src/block/Chest.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\block\tile\Chest as TileChest;
 use pocketmine\block\utils\FacesOppositePlacingPlayerTrait;
-use pocketmine\block\utils\NormalHorizontalFacingInMetadataTrait;
 use pocketmine\block\utils\SupportType;
 use pocketmine\event\block\ChestPairEvent;
 use pocketmine\item\Item;
@@ -36,7 +35,6 @@ use pocketmine\player\Player;
 
 class Chest extends Transparent{
 	use FacesOppositePlacingPlayerTrait;
-	use NormalHorizontalFacingInMetadataTrait;
 
 	/**
 	 * @return AxisAlignedBB[]
@@ -47,7 +45,7 @@ class Chest extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	public function onPostPlace() : void{
@@ -57,13 +55,13 @@ class Chest extends Transparent{
 			foreach([false, true] as $clockwise){
 				$side = Facing::rotateY($this->facing, $clockwise);
 				$c = $this->getSide($side);
-				if($c instanceof Chest && $c->isSameType($this) && $c->facing === $this->facing){
+				if($c instanceof Chest && $c->hasSameTypeId($this) && $c->facing === $this->facing){
 					$pair = $world->getTile($c->position);
 					if($pair instanceof TileChest && !$pair->isPaired()){
 						[$left, $right] = $clockwise ? [$c, $this] : [$this, $c];
 						$ev = new ChestPairEvent($left, $right);
 						$ev->call();
-						if(!$ev->isCancelled() && $world->getBlock($this->position)->isSameType($this) && $world->getBlock($c->position)->isSameType($c)){
+						if(!$ev->isCancelled() && $world->getBlock($this->position)->hasSameTypeId($this) && $world->getBlock($c->position)->hasSameTypeId($c)){
 							$pair->pairWith($tile);
 							$tile->pairWith($pair);
 							break;
@@ -74,7 +72,7 @@ class Chest extends Transparent{
 		}
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($player instanceof Player){
 
 			$chest = $this->position->getWorld()->getTile($this->position);
diff --git a/src/block/ChiseledBookshelf.php b/src/block/ChiseledBookshelf.php
new file mode 100644
index 0000000000..73c4861bf3
--- /dev/null
+++ b/src/block/ChiseledBookshelf.php
@@ -0,0 +1,174 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\tile\ChiseledBookshelf as TileChiseledBookshelf;
+use pocketmine\block\utils\ChiseledBookshelfSlot;
+use pocketmine\block\utils\FacesOppositePlacingPlayerTrait;
+use pocketmine\block\utils\HorizontalFacingTrait;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\item\Book;
+use pocketmine\item\EnchantedBook;
+use pocketmine\item\Item;
+use pocketmine\item\WritableBookBase;
+use pocketmine\math\Axis;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use function spl_object_id;
+
+class ChiseledBookshelf extends Opaque{
+	use HorizontalFacingTrait;
+	use FacesOppositePlacingPlayerTrait;
+
+	/**
+	 * @var ChiseledBookshelfSlot[]
+	 * @phpstan-var array<int, ChiseledBookshelfSlot>
+	 */
+	private array $slots = [];
+
+	private ?ChiseledBookshelfSlot $lastInteractedSlot = null;
+
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+		$w->enumSet($this->slots, ChiseledBookshelfSlot::cases());
+	}
+
+	public function readStateFromWorld() : Block{
+		$tile = $this->position->getWorld()->getTile($this->position);
+		if($tile instanceof TileChiseledBookshelf){
+			$this->lastInteractedSlot = $tile->getLastInteractedSlot();
+		}else{
+			$this->lastInteractedSlot = null;
+		}
+		return $this;
+	}
+
+	public function writeStateToWorld() : void{
+		parent::writeStateToWorld();
+
+		$tile = $this->position->getWorld()->getTile($this->position);
+		if($tile instanceof TileChiseledBookshelf){
+			$tile->setLastInteractedSlot($this->lastInteractedSlot);
+		}
+	}
+
+	/**
+	 * Returns whether the given slot is displayed as occupied.
+	 * This doesn't guarantee that there is or isn't a book in the bookshelf's inventory.
+	 */
+	public function hasSlot(ChiseledBookshelfSlot $slot) : bool{
+		return isset($this->slots[spl_object_id($slot)]);
+	}
+
+	/**
+	 * Sets whether the given slot is displayed as occupied.
+	 *
+	 * This doesn't modify the bookshelf's inventory, so you can use this to make invisible
+	 * books or display books that aren't actually in the bookshelf.
+	 *
+	 * To modify the contents of the bookshelf inventory, access the tile inventory.
+	 *
+	 * @return $this
+	 */
+	public function setSlot(ChiseledBookshelfSlot $slot, bool $occupied) : self{
+		if($occupied){
+			$this->slots[spl_object_id($slot)] = $slot;
+		}else{
+			unset($this->slots[spl_object_id($slot)]);
+		}
+		return $this;
+	}
+
+	/**
+	 * Returns which slots of the bookshelf are displayed as occupied.
+	 * As above, these values do not necessarily reflect the contents of the bookshelf inventory,
+	 * although they usually will unless modified by plugins.
+	 *
+	 * @return ChiseledBookshelfSlot[]
+	 * @phpstan-return array<int, ChiseledBookshelfSlot>
+	 */
+	public function getSlots() : array{
+		return $this->slots;
+	}
+
+	/**
+	 * Returns the last slot interacted by a player or null if no slot has been interacted with yet.
+	 */
+	public function getLastInteractedSlot() : ?ChiseledBookshelfSlot{
+		return $this->lastInteractedSlot;
+	}
+
+	/**
+	 * Sets the last slot interacted by a player.
+	 *
+	 * @return $this
+	 */
+	public function setLastInteractedSlot(?ChiseledBookshelfSlot $lastInteractedSlot) : self{
+		$this->lastInteractedSlot = $lastInteractedSlot;
+		return $this;
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($face !== $this->facing){
+			return false;
+		}
+
+		$x = Facing::axis($face) === Axis::X ? $clickVector->z : $clickVector->x;
+		$slot = ChiseledBookshelfSlot::fromBlockFaceCoordinates(
+			Facing::isPositive(Facing::rotateY($face, true)) ? 1 - $x : $x,
+			$clickVector->y
+		);
+		$tile = $this->position->getWorld()->getTile($this->position);
+		if(!$tile instanceof TileChiseledBookshelf){
+			return false;
+		}
+
+		$inventory = $tile->getInventory();
+		if(!$inventory->isSlotEmpty($slot->value)){
+			$returnedItems[] = $inventory->getItem($slot->value);
+			$inventory->clear($slot->value);
+			$this->setSlot($slot, false);
+			$this->lastInteractedSlot = $slot;
+		}elseif($item instanceof WritableBookBase || $item instanceof Book || $item instanceof EnchantedBook){
+			//TODO: type tags like blocks would be better for this
+			$inventory->setItem($slot->value, $item->pop());
+			$this->setSlot($slot, true);
+			$this->lastInteractedSlot = $slot;
+		}else{
+			return true;
+		}
+
+		$this->position->getWorld()->setBlock($this->position, $this);
+		return true;
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [];
+	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return true;
+	}
+}
diff --git a/src/block/ChorusFlower.php b/src/block/ChorusFlower.php
new file mode 100644
index 0000000000..cc3c606d92
--- /dev/null
+++ b/src/block/ChorusFlower.php
@@ -0,0 +1,206 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\AgeableTrait;
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\entity\projectile\Projectile;
+use pocketmine\event\block\StructureGrowEvent;
+use pocketmine\math\Axis;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
+use pocketmine\math\RayTraceResult;
+use pocketmine\math\Vector3;
+use pocketmine\world\BlockTransaction;
+use pocketmine\world\sound\ChorusFlowerDieSound;
+use pocketmine\world\sound\ChorusFlowerGrowSound;
+use pocketmine\world\World;
+use function array_rand;
+use function min;
+use function mt_rand;
+
+final class ChorusFlower extends Flowable{
+	use AgeableTrait;
+	use StaticSupportTrait;
+
+	public const MIN_AGE = 0;
+	public const MAX_AGE = 5;
+
+	private const MAX_STEM_HEIGHT = 5;
+
+	protected function recalculateCollisionBoxes() : array{
+		return [AxisAlignedBB::one()];
+	}
+
+	private function canBeSupportedAt(Block $block) : bool{
+		$position = $block->position;
+		$world = $position->getWorld();
+		$down = $world->getBlock($position->down());
+
+		if($down->getTypeId() === BlockTypeIds::END_STONE || $down->getTypeId() === BlockTypeIds::CHORUS_PLANT){
+			return true;
+		}
+
+		$plantAdjacent = false;
+		foreach($position->sidesAroundAxis(Axis::Y) as $sidePosition){
+			$block = $world->getBlock($sidePosition);
+
+			if($block->getTypeId() === BlockTypeIds::CHORUS_PLANT){
+				if($plantAdjacent){ //at most one plant may be horizontally adjacent
+					return false;
+				}
+				$plantAdjacent = true;
+			}elseif($block->getTypeId() !== BlockTypeIds::AIR){
+				return false;
+			}
+		}
+
+		return $plantAdjacent;
+	}
+
+	public function onProjectileHit(Projectile $projectile, RayTraceResult $hitResult) : void{
+		$this->position->getWorld()->useBreakOn($this->position);
+	}
+
+	/**
+	 * @phpstan-return array{int, bool}
+	 */
+	private function scanStem() : array{
+		$world = $this->position->getWorld();
+
+		$stemHeight = 0;
+		$endStoneBelow = false;
+		for($yOffset = 0; $yOffset < self::MAX_STEM_HEIGHT; $yOffset++, $stemHeight++){
+			$down = $world->getBlock($this->position->down($yOffset + 1));
+
+			if($down->getTypeId() !== BlockTypeIds::CHORUS_PLANT){
+				if($down->getTypeId() === BlockTypeIds::END_STONE){
+					$endStoneBelow = true;
+				}
+				break;
+			}
+		}
+
+		return [$stemHeight, $endStoneBelow];
+	}
+
+	private function allHorizontalBlocksEmpty(World $world, Vector3 $position, ?int $except) : bool{
+		foreach($position->sidesAroundAxis(Axis::Y) as $facing => $sidePosition){
+			if($facing === $except){
+				continue;
+			}
+			if($world->getBlock($sidePosition)->getTypeId() !== BlockTypeIds::AIR){
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	private function canGrowUpwards(int $stemHeight, bool $endStoneBelow) : bool{
+		$world = $this->position->getWorld();
+
+		$up = $this->position->up();
+		if(
+			//the space above must be empty and writable
+			!$world->isInWorld($up->x, $up->y, $up->z) ||
+			$world->getBlock($up)->getTypeId() !== BlockTypeIds::AIR ||
+			(
+				//the space above that must be empty, but doesn't need to be writable
+				$world->isInWorld($up->x, $up->y + 1, $up->z) &&
+				$world->getBlock($up->up())->getTypeId() !== BlockTypeIds::AIR
+			)
+		){
+			return false;
+		}
+
+		if($this->getSide(Facing::DOWN)->getTypeId() !== BlockTypeIds::AIR){
+			if($stemHeight >= self::MAX_STEM_HEIGHT){
+				return false;
+			}
+
+			if($stemHeight > 1 && $stemHeight > mt_rand(0, $endStoneBelow ? 4 : 3)){ //chance decreases for each added block of chorus plant
+				return false;
+			}
+		}
+
+		return $this->allHorizontalBlocksEmpty($world, $up, null);
+	}
+
+	private function grow(int $facing, int $ageChange, ?BlockTransaction $tx) : BlockTransaction{
+		if($tx === null){
+			$tx = new BlockTransaction($this->position->getWorld());
+		}
+		$tx->addBlock($this->position->getSide($facing), (clone $this)->setAge(min(self::MAX_AGE, $this->age + $ageChange)));
+
+		return $tx;
+	}
+
+	public function ticksRandomly() : bool{ return $this->age < self::MAX_AGE; }
+
+	public function onRandomTick() : void{
+		$world = $this->position->getWorld();
+
+		if($this->age >= self::MAX_AGE){
+			return;
+		}
+
+		$tx = null;
+
+		[$stemHeight, $endStoneBelow] = $this->scanStem();
+		if($this->canGrowUpwards($stemHeight, $endStoneBelow)){
+			$tx = $this->grow(Facing::UP, 0, $tx);
+		}else{
+			$facingVisited = [];
+			for($attempts = 0, $maxAttempts = mt_rand(0, $endStoneBelow ? 4 : 3); $attempts < $maxAttempts; $attempts++){
+				$facing = Facing::HORIZONTAL[array_rand(Facing::HORIZONTAL)];
+				if(isset($facingVisited[$facing])){
+					continue;
+				}
+				$facingVisited[$facing] = true;
+
+				$sidePosition = $this->position->getSide($facing);
+				if(
+					$world->getBlock($sidePosition)->getTypeId() === BlockTypeIds::AIR &&
+					$world->getBlock($sidePosition->down())->getTypeId() === BlockTypeIds::AIR &&
+					$this->allHorizontalBlocksEmpty($world, $sidePosition, Facing::opposite($facing))
+				){
+					$tx = $this->grow($facing, 1, $tx);
+				}
+			}
+		}
+
+		if($tx !== null){
+			$tx->addBlock($this->position, VanillaBlocks::CHORUS_PLANT());
+			$ev = new StructureGrowEvent($this, $tx, null);
+			$ev->call();
+			if(!$ev->isCancelled() && $tx->apply()){
+				$world->addSound($this->position->add(0.5, 0.5, 0.5), new ChorusFlowerGrowSound());
+			}
+		}else{
+			$world->addSound($this->position->add(0.5, 0.5, 0.5), new ChorusFlowerDieSound());
+			$this->position->getWorld()->setBlock($this->position, $this->setAge(self::MAX_AGE));
+		}
+	}
+}
diff --git a/src/block/ChorusPlant.php b/src/block/ChorusPlant.php
new file mode 100644
index 0000000000..9013f68256
--- /dev/null
+++ b/src/block/ChorusPlant.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+use pocketmine\math\Axis;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
+use function mt_rand;
+
+final class ChorusPlant extends Flowable{
+	use StaticSupportTrait;
+
+	protected function recalculateCollisionBoxes() : array{
+		$bb = AxisAlignedBB::one();
+		foreach($this->getAllSides() as $facing => $block){
+			$id = $block->getTypeId();
+			if($id !== BlockTypeIds::END_STONE && $id !== BlockTypeIds::CHORUS_FLOWER && !$block->hasSameTypeId($this)){
+				$bb->trim($facing, 2 / 16);
+			}
+		}
+
+		return [$bb];
+	}
+
+	private function canBeSupportedBy(Block $block) : bool{
+		return $block->hasSameTypeId($this) || $block->getTypeId() === BlockTypeIds::END_STONE;
+	}
+
+	private function canBeSupportedAt(Block $block) : bool{
+		$position = $block->position;
+		$world = $position->getWorld();
+
+		$down = $world->getBlock($position->down());
+		$verticalAir = $down->getTypeId() === BlockTypeIds::AIR || $world->getBlock($position->up())->getTypeId() === BlockTypeIds::AIR;
+
+		foreach($position->sidesAroundAxis(Axis::Y) as $sidePosition){
+			$block = $world->getBlock($sidePosition);
+
+			if($block->getTypeId() === BlockTypeIds::CHORUS_PLANT){
+				if(!$verticalAir){
+					return false;
+				}
+
+				if($this->canBeSupportedBy($block->getSide(Facing::DOWN))){
+					return true;
+				}
+			}
+		}
+
+		return $this->canBeSupportedBy($down);
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		if(mt_rand(0, 1) === 1){
+			return [VanillaItems::CHORUS_FRUIT()];
+		}
+
+		return [];
+	}
+}
diff --git a/src/block/CoalOre.php b/src/block/CoalOre.php
index 47a0e255d2..19032b011a 100644
--- a/src/block/CoalOre.php
+++ b/src/block/CoalOre.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\FortuneDropHelper;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
 use function mt_rand;
@@ -31,7 +32,7 @@ class CoalOre extends Opaque{
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			VanillaItems::COAL()
+			VanillaItems::COAL()->setCount(FortuneDropHelper::weighted($item, min: 1, maxBase: 1))
 		];
 	}
 
diff --git a/src/block/CocoaBlock.php b/src/block/CocoaBlock.php
index 8c01c29cc9..6d8ce1adc9 100644
--- a/src/block/CocoaBlock.php
+++ b/src/block/CocoaBlock.php
@@ -23,11 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
+use pocketmine\block\utils\AgeableTrait;
+use pocketmine\block\utils\BlockEventHelper;
 use pocketmine\block\utils\HorizontalFacingTrait;
-use pocketmine\block\utils\SupportType;
-use pocketmine\block\utils\TreeType;
-use pocketmine\event\block\BlockGrowEvent;
+use pocketmine\block\utils\WoodType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Fertilizer;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
@@ -39,35 +39,15 @@ use pocketmine\player\Player;
 use pocketmine\world\BlockTransaction;
 use function mt_rand;
 
-class CocoaBlock extends Transparent{
+class CocoaBlock extends Flowable{
 	use HorizontalFacingTrait;
+	use AgeableTrait;
 
 	public const MAX_AGE = 2;
 
-	protected int $age = 0;
-
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::writeLegacyHorizontalFacing(Facing::opposite($this->facing)) | ($this->age << 2);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = Facing::opposite(BlockDataSerializer::readLegacyHorizontalFacing($stateMeta & 0x03));
-		$this->age = BlockDataSerializer::readBoundedInt("age", $stateMeta >> 2, 0, self::MAX_AGE);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
-	public function getAge() : int{ return $this->age; }
-
-	/** @return $this */
-	public function setAge(int $age) : self{
-		if($age < 0 || $age > self::MAX_AGE){
-			throw new \InvalidArgumentException("Age must be in range 0 ... " . self::MAX_AGE);
-		}
-		$this->age = $age;
-		return $this;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+		$w->boundedIntAuto(0, self::MAX_AGE, $this->age);
 	}
 
 	/**
@@ -84,12 +64,8 @@ class CocoaBlock extends Transparent{
 		];
 	}
 
-	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
-	}
-
 	private function canAttachTo(Block $block) : bool{
-		return $block instanceof Wood && $block->getTreeType()->equals(TreeType::JUNGLE());
+		return $block instanceof Wood && $block->getWoodType() === WoodType::JUNGLE;
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
@@ -101,8 +77,8 @@ class CocoaBlock extends Transparent{
 		return false;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($item instanceof Fertilizer && $this->grow()){
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($item instanceof Fertilizer && $this->grow($player)){
 			$item->pop();
 
 			return true;
@@ -118,7 +94,7 @@ class CocoaBlock extends Transparent{
 	}
 
 	public function ticksRandomly() : bool{
-		return true;
+		return $this->age < self::MAX_AGE;
 	}
 
 	public function onRandomTick() : void{
@@ -127,16 +103,11 @@ class CocoaBlock extends Transparent{
 		}
 	}
 
-	private function grow() : bool{
+	private function grow(?Player $player = null) : bool{
 		if($this->age < self::MAX_AGE){
 			$block = clone $this;
 			$block->age++;
-			$ev = new BlockGrowEvent($this, $block);
-			$ev->call();
-			if(!$ev->isCancelled()){
-				$this->position->getWorld()->setBlock($this->position, $ev->getNewState());
-				return true;
-			}
+			return BlockEventHelper::grow($this, $block, $player);
 		}
 		return false;
 	}
@@ -147,7 +118,7 @@ class CocoaBlock extends Transparent{
 		];
 	}
 
-	public function getPickedItem(bool $addUserData = false) : Item{
+	public function asItem() : Item{
 		return VanillaItems::COCOA_BEANS();
 	}
 }
diff --git a/src/block/Concrete.php b/src/block/Concrete.php
index 7e16ee4f6d..fae6f8e2f8 100644
--- a/src/block/Concrete.php
+++ b/src/block/Concrete.php
@@ -23,14 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\ColorInMetadataTrait;
-use pocketmine\block\utils\DyeColor;
+use pocketmine\block\utils\ColoredTrait;
 
 class Concrete extends Opaque{
-	use ColorInMetadataTrait;
-
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->color = DyeColor::WHITE();
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
+	use ColoredTrait;
 }
diff --git a/src/block/ConcretePowder.php b/src/block/ConcretePowder.php
index 340c610b11..59f14bc722 100644
--- a/src/block/ConcretePowder.php
+++ b/src/block/ConcretePowder.php
@@ -23,47 +23,41 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\ColorInMetadataTrait;
-use pocketmine\block\utils\DyeColor;
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\block\utils\ColoredTrait;
 use pocketmine\block\utils\Fallable;
 use pocketmine\block\utils\FallableTrait;
-use pocketmine\event\block\BlockFormEvent;
 use pocketmine\math\Facing;
 
 class ConcretePowder extends Opaque implements Fallable{
-	use ColorInMetadataTrait;
+	use ColoredTrait;
 	use FallableTrait {
 		onNearbyBlockChange as protected startFalling;
 	}
 
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->color = DyeColor::WHITE();
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
-
 	public function onNearbyBlockChange() : void{
-		if(($block = $this->checkAdjacentWater()) !== null){
-			$ev = new BlockFormEvent($this, $block);
-			$ev->call();
-			if(!$ev->isCancelled()){
-				$this->position->getWorld()->setBlock($this->position, $ev->getNewState());
-			}
+		if(($water = $this->getAdjacentWater()) !== null){
+			BlockEventHelper::form($this, VanillaBlocks::CONCRETE()->setColor($this->color), $water);
 		}else{
 			$this->startFalling();
 		}
 	}
 
 	public function tickFalling() : ?Block{
-		return $this->checkAdjacentWater();
+		if($this->getAdjacentWater() === null){
+			return null;
+		}
+		return VanillaBlocks::CONCRETE()->setColor($this->color);
 	}
 
-	private function checkAdjacentWater() : ?Block{
+	private function getAdjacentWater() : ?Water{
 		foreach(Facing::ALL as $i){
 			if($i === Facing::DOWN){
 				continue;
 			}
-			if($this->getSide($i) instanceof Water){
-				return VanillaBlocks::CONCRETE()->setColor($this->color);
+			$block = $this->getSide($i);
+			if($block instanceof Water){
+				return $block;
 			}
 		}
 
diff --git a/src/block/Copper.php b/src/block/Copper.php
new file mode 100644
index 0000000000..d285e6ec0a
--- /dev/null
+++ b/src/block/Copper.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\CopperMaterial;
+use pocketmine\block\utils\CopperTrait;
+
+class Copper extends Opaque implements CopperMaterial{
+	use CopperTrait;
+}
diff --git a/src/block/CopperBulb.php b/src/block/CopperBulb.php
new file mode 100644
index 0000000000..97fc209fee
--- /dev/null
+++ b/src/block/CopperBulb.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\block;
+
+use pocketmine\block\utils\CopperMaterial;
+use pocketmine\block\utils\CopperOxidation;
+use pocketmine\block\utils\CopperTrait;
+use pocketmine\block\utils\LightableTrait;
+use pocketmine\block\utils\PoweredByRedstoneTrait;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+
+class CopperBulb extends Opaque implements CopperMaterial{
+	use CopperTrait;
+	use PoweredByRedstoneTrait;
+	use LightableTrait{
+		describeBlockOnlyState as encodeLitState;
+	}
+
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$this->encodeLitState($w);
+		$w->bool($this->powered);
+	}
+
+	/** @return $this */
+	public function togglePowered(bool $powered) : self{
+		if($powered === $this->powered){
+			return $this;
+		}
+		if ($powered) {
+			$this->setLit(!$this->lit);
+		}
+		$this->setPowered($powered);
+		return $this;
+	}
+
+	public function getLightLevel() : int{
+		if ($this->lit) {
+			return match($this->oxidation){
+				CopperOxidation::NONE => 15,
+				CopperOxidation::EXPOSED => 12,
+				CopperOxidation::WEATHERED => 8,
+				CopperOxidation::OXIDIZED => 4,
+			};
+		}
+
+		return 0;
+	}
+}
diff --git a/src/block/CopperDoor.php b/src/block/CopperDoor.php
new file mode 100644
index 0000000000..82a611206c
--- /dev/null
+++ b/src/block/CopperDoor.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\CopperMaterial;
+use pocketmine\block\utils\CopperTrait;
+use pocketmine\item\Item;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+
+class CopperDoor extends Door implements CopperMaterial{
+	use CopperTrait{
+		onInteract as onInteractCopper;
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if ($player !== null && $player->isSneaking() && $this->onInteractCopper($item, $face, $clickVector, $player, $returnedItems)) {
+			//copy copper properties to other half
+			$other = $this->getSide($this->top ? Facing::DOWN : Facing::UP);
+			$world = $this->position->getWorld();
+			if ($other instanceof CopperDoor) {
+				$other->setOxidation($this->oxidation);
+				$other->setWaxed($this->waxed);
+				$world->setBlock($other->position, $other);
+			}
+			return true;
+		}
+
+		return parent::onInteract($item, $face, $clickVector, $player, $returnedItems);
+	}
+}
diff --git a/src/block/CopperGrate.php b/src/block/CopperGrate.php
new file mode 100644
index 0000000000..d646d13334
--- /dev/null
+++ b/src/block/CopperGrate.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\CopperMaterial;
+use pocketmine\block\utils\CopperTrait;
+
+class CopperGrate extends Transparent implements CopperMaterial{
+	use CopperTrait;
+
+	//TODO: waterlogging!
+}
diff --git a/src/block/CopperOre.php b/src/block/CopperOre.php
new file mode 100644
index 0000000000..3b8ef12a02
--- /dev/null
+++ b/src/block/CopperOre.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\FortuneDropHelper;
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+
+final class CopperOre extends Opaque{
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [
+			VanillaItems::RAW_COPPER()->setCount(FortuneDropHelper::weighted($item, min: 2, maxBase: 5)),
+		];
+	}
+
+	public function isAffectedBySilkTouch() : bool{ return true; }
+}
diff --git a/src/block/CopperSlab.php b/src/block/CopperSlab.php
new file mode 100644
index 0000000000..cc1838e293
--- /dev/null
+++ b/src/block/CopperSlab.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\CopperMaterial;
+use pocketmine\block\utils\CopperTrait;
+
+class CopperSlab extends Slab implements CopperMaterial{
+	use CopperTrait;
+}
diff --git a/src/block/CopperStairs.php b/src/block/CopperStairs.php
new file mode 100644
index 0000000000..ecb2243195
--- /dev/null
+++ b/src/block/CopperStairs.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\CopperMaterial;
+use pocketmine\block\utils\CopperTrait;
+
+class CopperStairs extends Stair implements CopperMaterial{
+	use CopperTrait;
+}
diff --git a/src/block/CopperTrapdoor.php b/src/block/CopperTrapdoor.php
new file mode 100644
index 0000000000..e7d56fa0c4
--- /dev/null
+++ b/src/block/CopperTrapdoor.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\CopperMaterial;
+use pocketmine\block\utils\CopperTrait;
+use pocketmine\item\Item;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+
+class CopperTrapdoor extends Trapdoor implements CopperMaterial{
+	use CopperTrait{
+		onInteract as onInteractCopper;
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if ($player !== null && $player->isSneaking() && $this->onInteractCopper($item, $face, $clickVector, $player, $returnedItems)) {
+			return true;
+		}
+
+		return parent::onInteract($item, $face, $clickVector, $player, $returnedItems);
+	}
+}
diff --git a/src/block/Coral.php b/src/block/Coral.php
index 6bbd50b731..96c6d4fe0e 100644
--- a/src/block/Coral.php
+++ b/src/block/Coral.php
@@ -23,65 +23,13 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\InvalidBlockStateException;
-use pocketmine\data\bedrock\CoralTypeIdMap;
-use pocketmine\item\Item;
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\math\Facing;
-use pocketmine\math\Vector3;
-use pocketmine\player\Player;
-use pocketmine\world\BlockTransaction;
 
 final class Coral extends BaseCoral{
+	use StaticSupportTrait;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$coralType = CoralTypeIdMap::getInstance()->fromId($stateMeta);
-		if($coralType === null){
-			throw new InvalidBlockStateException("No such coral type");
-		}
-		$this->coralType = $coralType;
-	}
-
-	public function writeStateToMeta() : int{
-		return CoralTypeIdMap::getInstance()->toId($this->coralType);
-	}
-
-	protected function writeStateToItemMeta() : int{
-		return $this->writeStateToMeta();
-	}
-
-	public function getStateBitmask() : int{
-		return 0b0111;
-	}
-
-	public function readStateFromWorld() : void{
-		//TODO: this hack ensures correct state of coral plants, because they don't retain their dead flag in metadata
-		$world = $this->position->getWorld();
-		$this->dead = true;
-		foreach($this->position->sides() as $vector3){
-			if($world->getBlock($vector3) instanceof Water){
-				$this->dead = false;
-				break;
-			}
-		}
-	}
-
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if(!$this->canBeSupportedBy($tx->fetchBlock($blockReplace->getPosition()->down()))){
-			return false;
-		}
-		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-	}
-
-	public function onNearbyBlockChange() : void{
-		$world = $this->position->getWorld();
-		if(!$this->canBeSupportedBy($world->getBlock($this->position->down()))){
-			$world->useBreakOn($this->position);
-		}else{
-			parent::onNearbyBlockChange();
-		}
-	}
-
-	private function canBeSupportedBy(Block $block) : bool{
-		return $block->getSupportType(Facing::UP)->hasCenterSupport();
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getAdjacentSupportType(Facing::DOWN)->hasCenterSupport();
 	}
 }
diff --git a/src/block/CoralBlock.php b/src/block/CoralBlock.php
index 0718112eb9..3e7ca8224f 100644
--- a/src/block/CoralBlock.php
+++ b/src/block/CoralBlock.php
@@ -23,43 +23,14 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\CoralType;
+use pocketmine\block\utils\BlockEventHelper;
 use pocketmine\block\utils\CoralTypeTrait;
-use pocketmine\block\utils\InvalidBlockStateException;
-use pocketmine\data\bedrock\CoralTypeIdMap;
-use pocketmine\event\block\BlockDeathEvent;
 use pocketmine\item\Item;
 use function mt_rand;
 
 final class CoralBlock extends Opaque{
 	use CoralTypeTrait;
 
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->coralType = CoralType::TUBE();
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$coralType = CoralTypeIdMap::getInstance()->fromId($stateMeta & 0x7);
-		if($coralType === null){
-			throw new InvalidBlockStateException("No such coral type");
-		}
-		$this->coralType = $coralType;
-		$this->dead = ($stateMeta & BlockLegacyMetadata::CORAL_BLOCK_FLAG_DEAD) !== 0;
-	}
-
-	protected function writeStateToMeta() : int{
-		return ($this->dead ? BlockLegacyMetadata::CORAL_BLOCK_FLAG_DEAD : 0) | CoralTypeIdMap::getInstance()->toId($this->coralType);
-	}
-
-	protected function writeStateToItemMeta() : int{
-		return $this->writeStateToMeta();
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
 	public function onNearbyBlockChange() : void{
 		if(!$this->dead){
 			$this->position->getWorld()->scheduleDelayedBlockUpdate($this->position, mt_rand(40, 200));
@@ -78,17 +49,13 @@ final class CoralBlock extends Opaque{
 				}
 			}
 			if(!$hasWater){
-				$ev = new BlockDeathEvent($this, $this->setDead(true));
-				$ev->call();
-				if(!$ev->isCancelled()){
-					$world->setBlock($this->position, $ev->getNewState());
-				}
+				BlockEventHelper::die($this, (clone $this)->setDead(true));
 			}
 		}
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{
-		return [$this->setDead(true)->asItem()];
+		return [(clone $this)->setDead(true)->asItem()];
 	}
 
 	public function isAffectedBySilkTouch() : bool{
diff --git a/src/block/CraftingTable.php b/src/block/CraftingTable.php
index cc837d0034..dcd9edce2c 100644
--- a/src/block/CraftingTable.php
+++ b/src/block/CraftingTable.php
@@ -30,7 +30,7 @@ use pocketmine\player\Player;
 
 class CraftingTable extends Opaque{
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($player instanceof Player){
 			$player->setCurrentWindow(new CraftingTableInventory($this->position));
 		}
diff --git a/src/block/Crops.php b/src/block/Crops.php
index d9aa005eaf..e90ac62367 100644
--- a/src/block/Crops.php
+++ b/src/block/Crops.php
@@ -23,64 +23,36 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
-use pocketmine\event\block\BlockGrowEvent;
+use pocketmine\block\utils\AgeableTrait;
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\block\utils\CropGrowthHelper;
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\item\Fertilizer;
 use pocketmine\item\Item;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
-use pocketmine\world\BlockTransaction;
 use function mt_rand;
 
 abstract class Crops extends Flowable{
+	use AgeableTrait;
+	use StaticSupportTrait;
+
 	public const MAX_AGE = 7;
 
-	protected int $age = 0;
-
-	protected function writeStateToMeta() : int{
-		return $this->age;
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getSide(Facing::DOWN)->getTypeId() === BlockTypeIds::FARMLAND;
 	}
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->age = BlockDataSerializer::readBoundedInt("age", $stateMeta, 0, self::MAX_AGE);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b111;
-	}
-
-	public function getAge() : int{ return $this->age; }
-
-	/** @return $this */
-	public function setAge(int $age) : self{
-		if($age < 0 || $age > self::MAX_AGE){
-			throw new \InvalidArgumentException("Age must be in range 0 ... " . self::MAX_AGE);
-		}
-		$this->age = $age;
-		return $this;
-	}
-
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($blockReplace->getSide(Facing::DOWN)->getId() === BlockLegacyIds::FARMLAND){
-			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-		}
-
-		return false;
-	}
-
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($this->age < self::MAX_AGE && $item instanceof Fertilizer){
 			$block = clone $this;
-			$block->age += mt_rand(2, 5);
-			if($block->age > self::MAX_AGE){
-				$block->age = self::MAX_AGE;
+			$tempAge = $block->age + mt_rand(2, 5);
+			if($tempAge > self::MAX_AGE){
+				$tempAge = self::MAX_AGE;
 			}
-
-			$ev = new BlockGrowEvent($this, $block);
-			$ev->call();
-			if(!$ev->isCancelled()){
-				$this->position->getWorld()->setBlock($this->position, $ev->getNewState());
+			$block->age = $tempAge;
+			if(BlockEventHelper::grow($this, $block, $player)){
 				$item->pop();
 			}
 
@@ -90,25 +62,15 @@ abstract class Crops extends Flowable{
 		return false;
 	}
 
-	public function onNearbyBlockChange() : void{
-		if($this->getSide(Facing::DOWN)->getId() !== BlockLegacyIds::FARMLAND){
-			$this->position->getWorld()->useBreakOn($this->position);
-		}
-	}
-
 	public function ticksRandomly() : bool{
-		return true;
+		return $this->age < self::MAX_AGE;
 	}
 
 	public function onRandomTick() : void{
-		if($this->age < self::MAX_AGE && mt_rand(0, 2) === 1){
+		if($this->age < self::MAX_AGE && CropGrowthHelper::canGrow($this)){
 			$block = clone $this;
 			++$block->age;
-			$ev = new BlockGrowEvent($this, $block);
-			$ev->call();
-			if(!$ev->isCancelled()){
-				$this->position->getWorld()->setBlock($this->position, $ev->getNewState());
-			}
+			BlockEventHelper::grow($this, $block, null);
 		}
 	}
 }
diff --git a/src/block/DaylightSensor.php b/src/block/DaylightSensor.php
index b9e8a58f4e..4141a2b7ed 100644
--- a/src/block/DaylightSensor.php
+++ b/src/block/DaylightSensor.php
@@ -24,8 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\AnalogRedstoneSignalEmitterTrait;
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
@@ -39,30 +39,11 @@ use const M_PI;
 class DaylightSensor extends Transparent{
 	use AnalogRedstoneSignalEmitterTrait;
 
-	protected BlockIdentifierFlattened $idInfoFlattened;
-
 	protected bool $inverted = false;
 
-	public function __construct(BlockIdentifierFlattened $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->idInfoFlattened = $idInfo;
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
-
-	public function getId() : int{
-		return $this->inverted ? $this->idInfoFlattened->getSecondId() : parent::getId();
-	}
-
-	protected function writeStateToMeta() : int{
-		return $this->signalStrength;
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->signalStrength = BlockDataSerializer::readBoundedInt("signalStrength", $stateMeta, 0, 15);
-		$this->inverted = $id === $this->idInfoFlattened->getSecondId();
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->boundedIntAuto(0, 15, $this->signalStrength);
+		$w->bool($this->inverted);
 	}
 
 	public function isInverted() : bool{
@@ -89,10 +70,10 @@ class DaylightSensor extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		$this->inverted = !$this->inverted;
 		$this->signalStrength = $this->recalculateSignalStrength();
 		$this->position->getWorld()->setBlock($this->position, $this);
diff --git a/src/block/DeadBush.php b/src/block/DeadBush.php
index 72cbc0de56..0c089a6f38 100644
--- a/src/block/DeadBush.php
+++ b/src/block/DeadBush.php
@@ -23,29 +23,14 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
 use pocketmine\math\Facing;
-use pocketmine\math\Vector3;
-use pocketmine\player\Player;
-use pocketmine\world\BlockTransaction;
 use function mt_rand;
 
 class DeadBush extends Flowable{
-
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($this->canBeSupportedBy($this->getSide(Facing::DOWN))){
-			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-		}
-
-		return false;
-	}
-
-	public function onNearbyBlockChange() : void{
-		if(!$this->canBeSupportedBy($this->getSide(Facing::DOWN))){
-			$this->position->getWorld()->useBreakOn($this->position);
-		}
-	}
+	use StaticSupportTrait;
 
 	public function getDropsForIncompatibleTool(Item $item) : array{
 		return [
@@ -65,13 +50,21 @@ class DeadBush extends Flowable{
 		return 100;
 	}
 
-	private function canBeSupportedBy(Block $block) : bool{
-		$blockId = $block->getId();
-		return $blockId === BlockLegacyIds::SAND
-			|| $blockId === BlockLegacyIds::PODZOL
-			|| $blockId === BlockLegacyIds::MYCELIUM
-			|| $blockId === BlockLegacyIds::DIRT
-			|| $blockId === BlockLegacyIds::HARDENED_CLAY
-			|| $blockId === BlockLegacyIds::STAINED_HARDENED_CLAY;
+	private function canBeSupportedAt(Block $block) : bool{
+		$supportBlock = $block->getSide(Facing::DOWN);
+		return
+			$supportBlock->hasTypeTag(BlockTypeTags::SAND) ||
+			$supportBlock->hasTypeTag(BlockTypeTags::MUD) ||
+			match($supportBlock->getTypeId()){
+				//can't use DIRT tag here because it includes farmland
+				BlockTypeIds::PODZOL,
+				BlockTypeIds::MYCELIUM,
+				BlockTypeIds::DIRT,
+				BlockTypeIds::GRASS,
+				BlockTypeIds::HARDENED_CLAY,
+				BlockTypeIds::STAINED_CLAY => true,
+				//TODO: moss block
+				default => false,
+			};
 	}
 }
diff --git a/src/block/DetectorRail.php b/src/block/DetectorRail.php
index e3eb0a4862..3bd791d106 100644
--- a/src/block/DetectorRail.php
+++ b/src/block/DetectorRail.php
@@ -23,9 +23,16 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\data\runtime\RuntimeDataDescriber;
+
 class DetectorRail extends StraightOnlyRail{
 	protected bool $activated = false;
 
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		parent::describeBlockOnlyState($w);
+		$w->bool($this->activated);
+	}
+
 	public function isActivated() : bool{ return $this->activated; }
 
 	/** @return $this */
@@ -33,19 +40,5 @@ class DetectorRail extends StraightOnlyRail{
 		$this->activated = $activated;
 		return $this;
 	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		parent::readStateFromData($id, $stateMeta & ~BlockLegacyMetadata::REDSTONE_RAIL_FLAG_POWERED);
-		$this->activated = ($stateMeta & BlockLegacyMetadata::REDSTONE_RAIL_FLAG_POWERED) !== 0;
-	}
-
-	protected function writeStateToMeta() : int{
-		return parent::writeStateToMeta() | ($this->activated ? BlockLegacyMetadata::REDSTONE_RAIL_FLAG_POWERED : 0);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
 	//TODO
 }
diff --git a/src/block/DiamondOre.php b/src/block/DiamondOre.php
index 8407bdf15e..b0486dcfb4 100644
--- a/src/block/DiamondOre.php
+++ b/src/block/DiamondOre.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\FortuneDropHelper;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
 use function mt_rand;
@@ -31,7 +32,7 @@ class DiamondOre extends Opaque{
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			VanillaItems::DIAMOND()
+			VanillaItems::DIAMOND()->setCount(FortuneDropHelper::weighted($item, min: 1, maxBase: 1))
 		];
 	}
 
diff --git a/src/block/Dirt.php b/src/block/Dirt.php
index cca195a641..104080d318 100644
--- a/src/block/Dirt.php
+++ b/src/block/Dirt.php
@@ -23,50 +23,67 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\DirtType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\item\Fertilizer;
 use pocketmine\item\Hoe;
 use pocketmine\item\Item;
+use pocketmine\item\Potion;
+use pocketmine\item\PotionType;
+use pocketmine\item\SplashPotion;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
 use pocketmine\world\sound\ItemUseOnBlockSound;
+use pocketmine\world\sound\WaterSplashSound;
 
 class Dirt extends Opaque{
+	protected DirtType $dirtType = DirtType::NORMAL;
 
-	protected bool $coarse = false;
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->coarse = ($stateMeta & BlockLegacyMetadata::DIRT_FLAG_COARSE) !== 0;
+	public function describeBlockItemState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->dirtType);
 	}
 
-	protected function writeStateToMeta() : int{
-		return $this->coarse ? BlockLegacyMetadata::DIRT_FLAG_COARSE : 0;
-	}
-
-	protected function writeStateToItemMeta() : int{
-		return $this->writeStateToMeta();
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1;
-	}
-
-	public function isCoarse() : bool{ return $this->coarse; }
+	public function getDirtType() : DirtType{ return $this->dirtType; }
 
 	/** @return $this */
-	public function setCoarse(bool $coarse) : self{
-		$this->coarse = $coarse;
+	public function setDirtType(DirtType $dirtType) : self{
+		$this->dirtType = $dirtType;
 		return $this;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($face === Facing::UP && $item instanceof Hoe){
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		$world = $this->position->getWorld();
+		if($face !== Facing::DOWN && $item instanceof Hoe){
+			$up = $this->getSide(Facing::UP);
+			if($up->getTypeId() !== BlockTypeIds::AIR){
+				return true;
+			}
+
 			$item->applyDamage(1);
 
-			$newBlock = $this->coarse ? VanillaBlocks::DIRT() : VanillaBlocks::FARMLAND();
-			$world = $this->position->getWorld();
-			$world->addSound($this->position->add(0.5, 0.5, 0.5), new ItemUseOnBlockSound($newBlock));
+			$newBlock = $this->dirtType === DirtType::NORMAL ? VanillaBlocks::FARMLAND() : VanillaBlocks::DIRT();
+			$center = $this->position->add(0.5, 0.5, 0.5);
+			$world->addSound($center, new ItemUseOnBlockSound($newBlock));
 			$world->setBlock($this->position, $newBlock);
+			if($this->dirtType === DirtType::ROOTED){
+				$world->dropItem($center, VanillaBlocks::HANGING_ROOTS()->asItem());
+			}
 
+			return true;
+		}elseif($this->dirtType === DirtType::ROOTED && $item instanceof Fertilizer){
+			$down = $this->getSide(Facing::DOWN);
+			if($down->getTypeId() !== BlockTypeIds::AIR){
+				return true;
+			}
+
+			$item->pop();
+			$world->setBlock($down->position, VanillaBlocks::HANGING_ROOTS());
+			//TODO: bonemeal particles, growth sounds
+		}elseif(($item instanceof Potion || $item instanceof SplashPotion) && $item->getType() === PotionType::WATER){
+			$item->pop();
+			$world->setBlock($this->position, VanillaBlocks::MUD());
+			$world->addSound($this->position, new WaterSplashSound(0.5));
 			return true;
 		}
 
diff --git a/src/block/Door.php b/src/block/Door.php
index a0f2169b8b..82ddaab518 100644
--- a/src/block/Door.php
+++ b/src/block/Door.php
@@ -23,10 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\HorizontalFacingTrait;
-use pocketmine\block\utils\PoweredByRedstoneTrait;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
@@ -37,51 +36,35 @@ use pocketmine\world\sound\DoorSound;
 
 class Door extends Transparent{
 	use HorizontalFacingTrait;
-	use PoweredByRedstoneTrait;
 
 	protected bool $top = false;
 	protected bool $hingeRight = false;
 	protected bool $open = false;
 
-	protected function writeStateToMeta() : int{
-		if($this->top){
-			return BlockLegacyMetadata::DOOR_FLAG_TOP |
-				($this->hingeRight ? BlockLegacyMetadata::DOOR_TOP_FLAG_RIGHT : 0) |
-				($this->powered ? BlockLegacyMetadata::DOOR_TOP_FLAG_POWERED : 0);
-		}
-
-		return BlockDataSerializer::writeLegacyHorizontalFacing(Facing::rotateY($this->facing, true)) | ($this->open ? BlockLegacyMetadata::DOOR_BOTTOM_FLAG_OPEN : 0);
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+		$w->bool($this->top);
+		$w->bool($this->hingeRight);
+		$w->bool($this->open);
 	}
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->top = ($stateMeta & BlockLegacyMetadata::DOOR_FLAG_TOP) !== 0;
-		if($this->top){
-			$this->hingeRight = ($stateMeta & BlockLegacyMetadata::DOOR_TOP_FLAG_RIGHT) !== 0;
-			$this->powered = ($stateMeta & BlockLegacyMetadata::DOOR_TOP_FLAG_POWERED) !== 0;
-		}else{
-			$this->facing = Facing::rotateY(BlockDataSerializer::readLegacyHorizontalFacing($stateMeta & 0x03), false);
-			$this->open = ($stateMeta & BlockLegacyMetadata::DOOR_BOTTOM_FLAG_OPEN) !== 0;
-		}
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 
+		$this->collisionBoxes = null;
+
 		//copy door properties from other half
 		$other = $this->getSide($this->top ? Facing::DOWN : Facing::UP);
-		if($other instanceof Door && $other->isSameType($this)){
+		if($other instanceof Door && $other->hasSameTypeId($this)){
 			if($this->top){
 				$this->facing = $other->facing;
 				$this->open = $other->open;
 			}else{
 				$this->hingeRight = $other->hingeRight;
-				$this->powered = $other->powered;
 			}
 		}
+
+		return $this;
 	}
 
 	public function isTop() : bool{ return $this->top; }
@@ -121,11 +104,11 @@ class Door extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	public function onNearbyBlockChange() : void{
-		if(!$this->canBeSupportedBy($this->getSide(Facing::DOWN)) && !$this->getSide(Facing::DOWN) instanceof Door){ //Replace with common break method
+		if(!$this->canBeSupportedAt($this) && !$this->getSide(Facing::DOWN) instanceof Door){ //Replace with common break method
 			$this->position->getWorld()->useBreakOn($this->position); //this will delete both halves if they exist
 		}
 	}
@@ -133,8 +116,7 @@ class Door extends Transparent{
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
 		if($face === Facing::UP){
 			$blockUp = $this->getSide(Facing::UP);
-			$blockDown = $this->getSide(Facing::DOWN);
-			if(!$blockUp->canBeReplaced() || !$this->canBeSupportedBy($blockDown)){
+			if(!$blockUp->canBeReplaced() || !$this->canBeSupportedAt($blockReplace)){
 				return false;
 			}
 
@@ -145,7 +127,7 @@ class Door extends Transparent{
 			$next = $this->getSide(Facing::rotateY($this->facing, false));
 			$next2 = $this->getSide(Facing::rotateY($this->facing, true));
 
-			if($next->isSameType($this) || (!$next2->isTransparent() && $next->isTransparent())){ //Door hinge
+			if($next->hasSameTypeId($this) || (!$next2->isTransparent() && $next->isTransparent())){ //Door hinge
 				$this->hingeRight = true;
 			}
 
@@ -159,12 +141,12 @@ class Door extends Transparent{
 		return false;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		$this->open = !$this->open;
 
 		$other = $this->getSide($this->top ? Facing::DOWN : Facing::UP);
 		$world = $this->position->getWorld();
-		if($other instanceof Door && $other->isSameType($this)){
+		if($other instanceof Door && $other->hasSameTypeId($this)){
 			$other->open = $this->open;
 			$world->setBlock($other->position, $other);
 		}
@@ -185,13 +167,13 @@ class Door extends Transparent{
 
 	public function getAffectedBlocks() : array{
 		$other = $this->getSide($this->top ? Facing::DOWN : Facing::UP);
-		if($other->isSameType($this)){
+		if($other->hasSameTypeId($this)){
 			return [$this, $other];
 		}
 		return parent::getAffectedBlocks();
 	}
 
-	private function canBeSupportedBy(Block $block) : bool{
-		return $block->getSupportType(Facing::UP)->hasEdgeSupport();
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getAdjacentSupportType(Facing::DOWN)->hasEdgeSupport();
 	}
 }
diff --git a/src/block/DoublePitcherCrop.php b/src/block/DoublePitcherCrop.php
new file mode 100644
index 0000000000..1233ed05d7
--- /dev/null
+++ b/src/block/DoublePitcherCrop.php
@@ -0,0 +1,120 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\AgeableTrait;
+use pocketmine\block\utils\CropGrowthHelper;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\event\block\StructureGrowEvent;
+use pocketmine\item\Fertilizer;
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+use pocketmine\math\Axis;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\BlockTransaction;
+
+final class DoublePitcherCrop extends DoublePlant{
+	use AgeableTrait {
+		describeBlockOnlyState as describeAge;
+	}
+
+	public const MAX_AGE = 1;
+
+	public function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		parent::describeBlockOnlyState($w);
+		$this->describeAge($w);
+	}
+
+	protected function recalculateCollisionBoxes() : array{
+		if($this->top){
+			return [];
+		}
+
+		//the pod exists only in the bottom half of the plant
+		return [
+			AxisAlignedBB::one()
+			->trim(Facing::UP, 11 / 16)
+			->squash(Axis::X, 3 / 16)
+			->squash(Axis::Z, 3 / 16)
+			->extend(Facing::DOWN, 1 / 16) //presumably this is to correct for farmland being 15/16 of a block tall
+		];
+	}
+
+	private function grow(?Player $player) : bool{
+		if($this->age >= self::MAX_AGE){
+			return false;
+		}
+
+		$bottom = $this->top ? $this->getSide(Facing::DOWN) : $this;
+		$top = $this->top ? $this : $this->getSide(Facing::UP);
+		if($top->getTypeId() !== BlockTypeIds::AIR && !$top->hasSameTypeId($this)){
+			return false;
+		}
+
+		$newState = (clone $this)->setAge($this->age + 1);
+
+		$tx = new BlockTransaction($this->position->getWorld());
+		$tx->addBlock($bottom->position, (clone $newState)->setTop(false));
+		$tx->addBlock($top->position, (clone $newState)->setTop(true));
+
+		$ev = new StructureGrowEvent($bottom, $tx, $player);
+		$ev->call();
+
+		return !$ev->isCancelled() && $tx->apply();
+
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($item instanceof Fertilizer && $this->grow($player)){
+			$item->pop();
+			return true;
+		}
+
+		return false;
+	}
+
+	public function ticksRandomly() : bool{
+		return $this->age < self::MAX_AGE && !$this->top;
+	}
+
+	public function onRandomTick() : void{
+		//only the bottom half of the plant can grow randomly
+		if(CropGrowthHelper::canGrow($this) && !$this->top){
+			$this->grow(null);
+		}
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [
+			$this->age >= self::MAX_AGE ? VanillaBlocks::PITCHER_PLANT()->asItem() : VanillaItems::PITCHER_POD()
+		];
+	}
+
+	public function asItem() : Item{
+		return VanillaItems::PITCHER_POD();
+	}
+}
diff --git a/src/block/DoublePlant.php b/src/block/DoublePlant.php
index 5086891fcc..aab6d5b040 100644
--- a/src/block/DoublePlant.php
+++ b/src/block/DoublePlant.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
@@ -30,19 +31,10 @@ use pocketmine\player\Player;
 use pocketmine\world\BlockTransaction;
 
 class DoublePlant extends Flowable{
-
 	protected bool $top = false;
 
-	protected function writeStateToMeta() : int{
-		return ($this->top ? BlockLegacyMetadata::DOUBLE_PLANT_FLAG_TOP : 0);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->top = ($stateMeta & BlockLegacyMetadata::DOUBLE_PLANT_FLAG_TOP) !== 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1000;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->bool($this->top);
 	}
 
 	public function isTop() : bool{ return $this->top; }
@@ -54,8 +46,8 @@ class DoublePlant extends Flowable{
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		$id = $blockReplace->getSide(Facing::DOWN)->getId();
-		if(($id === BlockLegacyIds::GRASS || $id === BlockLegacyIds::DIRT) && $blockReplace->getSide(Facing::UP)->canBeReplaced()){
+		$down = $blockReplace->getSide(Facing::DOWN);
+		if($down->hasTypeTag(BlockTypeTags::DIRT) && $blockReplace->getSide(Facing::UP)->canBeReplaced()){
 			$top = clone $this;
 			$top->top = true;
 			$tx->addBlock($blockReplace->position, $this)->addBlock($blockReplace->position->getSide(Facing::UP), $top);
@@ -73,13 +65,14 @@ class DoublePlant extends Flowable{
 
 		return (
 			$other instanceof DoublePlant &&
-			$other->isSameType($this) &&
+			$other->hasSameTypeId($this) &&
 			$other->top !== $this->top
 		);
 	}
 
 	public function onNearbyBlockChange() : void{
-		if(!$this->isValidHalfPlant() || (!$this->top && $this->getSide(Facing::DOWN)->isTransparent())){
+		$down = $this->getSide(Facing::DOWN);
+		if(!$this->isValidHalfPlant() || (!$this->top && !$down->hasTypeTag(BlockTypeTags::DIRT) && !$down->hasTypeTag(BlockTypeTags::MUD))){
 			$this->position->getWorld()->useBreakOn($this->position);
 		}
 	}
diff --git a/src/block/DoubleTallGrass.php b/src/block/DoubleTallGrass.php
index fc37442f5e..42a6fb4dca 100644
--- a/src/block/DoubleTallGrass.php
+++ b/src/block/DoubleTallGrass.php
@@ -23,19 +23,21 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\TallGrassTrait;
 use pocketmine\item\Item;
-use pocketmine\item\VanillaItems;
-use function mt_rand;
 
 class DoubleTallGrass extends DoublePlant{
+	use TallGrassTrait {
+		getDropsForIncompatibleTool as traitGetDropsForIncompatibleTool;
+	}
 
 	public function canBeReplaced() : bool{
 		return true;
 	}
 
 	public function getDropsForIncompatibleTool(Item $item) : array{
-		if($this->top && mt_rand(0, 7) === 0){
-			return [VanillaItems::WHEAT_SEEDS()];
+		if($this->top){
+			return $this->traitGetDropsForIncompatibleTool($item);
 		}
 		return [];
 	}
diff --git a/src/block/DragonEgg.php b/src/block/DragonEgg.php
index 04b30dabe3..10fec63946 100644
--- a/src/block/DragonEgg.php
+++ b/src/block/DragonEgg.php
@@ -44,17 +44,13 @@ class DragonEgg extends Transparent implements Fallable{
 		return 1;
 	}
 
-	public function tickFalling() : ?Block{
-		return null;
-	}
-
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		$this->teleport();
 		return true;
 	}
 
 	public function onAttack(Item $item, int $face, ?Player $player = null) : bool{
-		if($player !== null && !$player->getGamemode()->equals(GameMode::CREATIVE())){
+		if($player !== null && $player->getGamemode() !== GameMode::CREATIVE){
 			$this->teleport();
 			return true;
 		}
@@ -86,6 +82,6 @@ class DragonEgg extends Transparent implements Fallable{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 }
diff --git a/src/block/DyedCandle.php b/src/block/DyedCandle.php
new file mode 100644
index 0000000000..a495e8d003
--- /dev/null
+++ b/src/block/DyedCandle.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\ColoredTrait;
+
+class DyedCandle extends Candle{
+	use ColoredTrait;
+
+	protected function getCandleIfCompatibleType(Block $block) : ?Candle{
+		$result = parent::getCandleIfCompatibleType($block);
+		//different coloured candles can't be combined in the same block
+		return $result instanceof DyedCandle && $result->color === $this->color ? $result : null;
+	}
+}
diff --git a/src/block/DyedShulkerBox.php b/src/block/DyedShulkerBox.php
index 1e950c7914..5eae9237e4 100644
--- a/src/block/DyedShulkerBox.php
+++ b/src/block/DyedShulkerBox.php
@@ -23,14 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\ColorInMetadataTrait;
-use pocketmine\block\utils\DyeColor;
+use pocketmine\block\utils\ColoredTrait;
 
 final class DyedShulkerBox extends ShulkerBox{
-	use ColorInMetadataTrait;
-
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->color = DyeColor::WHITE();
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
+	use ColoredTrait;
 }
diff --git a/src/block/Element.php b/src/block/Element.php
index 8d6fb79850..9c8a91621a 100644
--- a/src/block/Element.php
+++ b/src/block/Element.php
@@ -27,12 +27,12 @@ class Element extends Opaque{
 	public function __construct(
 		BlockIdentifier $idInfo,
 		string $name,
-		BlockBreakInfo $breakInfo,
+		BlockTypeInfo $typeInfo,
 		private string $symbol,
 		private int $atomicWeight,
 		private int $group
 	){
-		parent::__construct($idInfo, $name, $breakInfo);
+		parent::__construct($idInfo, $name, $typeInfo);
 	}
 
 	public function getAtomicWeight() : int{
diff --git a/src/block/EmeraldOre.php b/src/block/EmeraldOre.php
index 6e997223db..8e5d96191b 100644
--- a/src/block/EmeraldOre.php
+++ b/src/block/EmeraldOre.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\FortuneDropHelper;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
 use function mt_rand;
@@ -31,7 +32,7 @@ class EmeraldOre extends Opaque{
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			VanillaItems::EMERALD()
+			VanillaItems::EMERALD()->setCount(FortuneDropHelper::weighted($item, min: 1, maxBase: 1))
 		];
 	}
 
diff --git a/src/block/EnchantingTable.php b/src/block/EnchantingTable.php
index b76147840f..6a6c936b22 100644
--- a/src/block/EnchantingTable.php
+++ b/src/block/EnchantingTable.php
@@ -41,10 +41,10 @@ class EnchantingTable extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($player instanceof Player){
 			//TODO lock
 
diff --git a/src/block/EndPortalFrame.php b/src/block/EndPortalFrame.php
index 4f957da723..612cf3723c 100644
--- a/src/block/EndPortalFrame.php
+++ b/src/block/EndPortalFrame.php
@@ -23,29 +23,19 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\FacesOppositePlacingPlayerTrait;
-use pocketmine\block\utils\HorizontalFacingTrait;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
 
 class EndPortalFrame extends Opaque{
 	use FacesOppositePlacingPlayerTrait;
-	use HorizontalFacingTrait;
 
 	protected bool $eye = false;
 
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::writeLegacyHorizontalFacing($this->facing) | ($this->eye ? BlockLegacyMetadata::END_PORTAL_FRAME_FLAG_EYE : 0);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::readLegacyHorizontalFacing($stateMeta & 0x03);
-		$this->eye = ($stateMeta & BlockLegacyMetadata::END_PORTAL_FRAME_FLAG_EYE) !== 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+		$w->bool($this->eye);
 	}
 
 	public function hasEye() : bool{ return $this->eye; }
diff --git a/src/block/EndRod.php b/src/block/EndRod.php
index d980b63af8..f0b28c26de 100644
--- a/src/block/EndRod.php
+++ b/src/block/EndRod.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\AnyFacingTrait;
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\item\Item;
 use pocketmine\math\Axis;
 use pocketmine\math\AxisAlignedBB;
@@ -36,27 +35,6 @@ use pocketmine\world\BlockTransaction;
 class EndRod extends Flowable{
 	use AnyFacingTrait;
 
-	protected function writeStateToMeta() : int{
-		$result = BlockDataSerializer::writeFacing($this->facing);
-		if(Facing::axis($this->facing) !== Axis::Y){
-			$result ^= 1; //TODO: in PC this is always the same as facing, just PE is stupid
-		}
-
-		return $result;
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		if($stateMeta !== 0 && $stateMeta !== 1){
-			$stateMeta ^= 1;
-		}
-
-		$this->facing = BlockDataSerializer::readFacing($stateMeta);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b111;
-	}
-
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
 		$this->facing = $face;
 		if($blockClicked instanceof EndRod && $blockClicked->facing === $this->facing){
diff --git a/src/block/EnderChest.php b/src/block/EnderChest.php
index cf1ec00393..9004f7c79f 100644
--- a/src/block/EnderChest.php
+++ b/src/block/EnderChest.php
@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\block\inventory\EnderChestInventory;
 use pocketmine\block\tile\EnderChest as TileEnderChest;
 use pocketmine\block\utils\FacesOppositePlacingPlayerTrait;
-use pocketmine\block\utils\NormalHorizontalFacingInMetadataTrait;
 use pocketmine\block\utils\SupportType;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
@@ -36,7 +35,6 @@ use pocketmine\player\Player;
 
 class EnderChest extends Transparent{
 	use FacesOppositePlacingPlayerTrait;
-	use NormalHorizontalFacingInMetadataTrait;
 
 	public function getLightLevel() : int{
 		return 7;
@@ -51,10 +49,10 @@ class EnderChest extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($player instanceof Player){
 			$enderChest = $this->position->getWorld()->getTile($this->position);
 			if($enderChest instanceof TileEnderChest && $this->getSide(Facing::UP)->isTransparent()){
diff --git a/src/block/Farmland.php b/src/block/Farmland.php
index 57392300f9..b7a2500a8b 100644
--- a/src/block/Farmland.php
+++ b/src/block/Farmland.php
@@ -23,30 +23,48 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
+use pocketmine\event\block\FarmlandHydrationChangeEvent;
 use pocketmine\event\entity\EntityTrampleFarmlandEvent;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
-use function lcg_value;
+use pocketmine\utils\Utils;
+use function intdiv;
 
 class Farmland extends Transparent{
 	public const MAX_WETNESS = 7;
 
+	private const WATER_SEARCH_HORIZONTAL_LENGTH = 9;
+
+	private const WATER_SEARCH_VERTICAL_LENGTH = 2;
+
+	private const WATER_POSITION_INDEX_UNKNOWN = -1;
+	/** Total possible options for water X/Z indexes */
+	private const WATER_POSITION_INDICES_TOTAL = (self::WATER_SEARCH_HORIZONTAL_LENGTH ** 2) * 2;
+
 	protected int $wetness = 0; //"moisture" blockstate property in PC
 
-	protected function writeStateToMeta() : int{
-		return $this->wetness;
-	}
+	/**
+	 * Cached value indicating the relative coordinates of the most recently found water block.
+	 *
+	 * If this is set to a non-unknown value, the farmland block will check the relative coordinates indicated by
+	 * this value for water, before searching the entire 9x2x9 grid around the farmland. This significantly benefits
+	 * hydrating or fully hydrated farmland, avoiding the need for costly searches on every random tick.
+	 *
+	 * If the coordinates indicated don't contain water, the full 9x2x9 volume will be searched as before. A new index
+	 * will be recorded if water is found, otherwise it will be set to unknown and future searches will search the full
+	 * 9x2x9 volume again.
+	 *
+	 * This property is not exposed to the API or saved on disk. It is only used by PocketMine-MP at runtime as a cache.
+	 */
+	private int $waterPositionIndex = self::WATER_POSITION_INDEX_UNKNOWN;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->wetness = BlockDataSerializer::readBoundedInt("wetness", $stateMeta, 0, self::MAX_WETNESS);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->boundedIntAuto(0, self::MAX_WETNESS, $this->wetness);
+		$w->boundedIntAuto(-1, self::WATER_POSITION_INDICES_TOTAL - 1, $this->waterPositionIndex);
 	}
 
 	public function getWetness() : int{ return $this->wetness; }
@@ -60,11 +78,27 @@ class Farmland extends Transparent{
 		return $this;
 	}
 
+	/**
+	 * @internal
+	 */
+	public function getWaterPositionIndex() : int{ return $this->waterPositionIndex; }
+
+	/**
+	 * @internal
+	 */
+	public function setWaterPositionIndex(int $waterPositionIndex) : self{
+		if($waterPositionIndex < -1 || $waterPositionIndex >= self::WATER_POSITION_INDICES_TOTAL){
+			throw new \InvalidArgumentException("Water XZ index must be in range -1 ... " . (self::WATER_POSITION_INDICES_TOTAL - 1));
+		}
+		$this->waterPositionIndex = $waterPositionIndex;
+		return $this;
+	}
+
 	/**
 	 * @return AxisAlignedBB[]
 	 */
 	protected function recalculateCollisionBoxes() : array{
-		return [AxisAlignedBB::one()]; //TODO: this should be trimmed at the top by 1/16, but MCPE currently treats them as a full block (https://bugs.mojang.com/browse/MCPE-12109)
+		return [AxisAlignedBB::one()->trim(Facing::UP, 1 / 16)];
 	}
 
 	public function onNearbyBlockChange() : void{
@@ -79,44 +113,85 @@ class Farmland extends Transparent{
 
 	public function onRandomTick() : void{
 		$world = $this->position->getWorld();
+
+		//this property may be updated by canHydrate() - track this so we know if we need to set the block again
+		$oldWaterPositionIndex = $this->waterPositionIndex;
+		$changed = false;
+
 		if(!$this->canHydrate()){
 			if($this->wetness > 0){
-				$this->wetness--;
-				$world->setBlock($this->position, $this, false);
+				$event = new FarmlandHydrationChangeEvent($this, $this->wetness, $this->wetness - 1);
+				$event->call();
+				if(!$event->isCancelled()){
+					$this->wetness = $event->getNewHydration();
+					$world->setBlock($this->position, $this, false);
+					$changed = true;
+				}
 			}else{
 				$world->setBlock($this->position, VanillaBlocks::DIRT());
+				$changed = true;
 			}
 		}elseif($this->wetness < self::MAX_WETNESS){
-			$this->wetness = self::MAX_WETNESS;
+			$event = new FarmlandHydrationChangeEvent($this, $this->wetness, self::MAX_WETNESS);
+			$event->call();
+			if(!$event->isCancelled()){
+				$this->wetness = $event->getNewHydration();
+				$world->setBlock($this->position, $this, false);
+				$changed = true;
+			}
+		}
+
+		if(!$changed && $oldWaterPositionIndex !== $this->waterPositionIndex){
+			//ensure the water square index is saved regardless of whether anything else happened
 			$world->setBlock($this->position, $this, false);
 		}
 	}
 
 	public function onEntityLand(Entity $entity) : ?float{
-		if($entity instanceof Living && lcg_value() < $entity->getFallDistance() - 0.5){
+		if($entity instanceof Living && Utils::getRandomFloat() < $entity->getFallDistance() - 0.5){
 			$ev = new EntityTrampleFarmlandEvent($entity, $this);
 			$ev->call();
 			if(!$ev->isCancelled()){
-				$this->getPosition()->getWorld()->setBlock($this->getPosition(), VanillaBlocks::DIRT());
+				$this->position->getWorld()->setBlock($this->position, VanillaBlocks::DIRT());
 			}
 		}
 		return null;
 	}
 
 	protected function canHydrate() : bool{
-		//TODO: check rain
-		$start = $this->position->add(-4, 0, -4);
-		$end = $this->position->add(4, 1, 4);
-		for($y = $start->y; $y <= $end->y; ++$y){
-			for($z = $start->z; $z <= $end->z; ++$z){
-				for($x = $start->x; $x <= $end->x; ++$x){
-					if($this->position->getWorld()->getBlockAt($x, $y, $z) instanceof Water){
+		$world = $this->position->getWorld();
+
+		$startX = $this->position->getFloorX() - (int) (self::WATER_SEARCH_HORIZONTAL_LENGTH / 2);
+		$startY = $this->position->getFloorY();
+		$startZ = $this->position->getFloorZ() - (int) (self::WATER_SEARCH_HORIZONTAL_LENGTH / 2);
+
+		if($this->waterPositionIndex !== self::WATER_POSITION_INDEX_UNKNOWN){
+			$raw = $this->waterPositionIndex;
+			$x = $raw % self::WATER_SEARCH_HORIZONTAL_LENGTH;
+			$raw = intdiv($raw, self::WATER_SEARCH_HORIZONTAL_LENGTH);
+			$z = $raw % self::WATER_SEARCH_HORIZONTAL_LENGTH;
+			$raw = intdiv($raw, self::WATER_SEARCH_HORIZONTAL_LENGTH);
+			$y = $raw % self::WATER_SEARCH_VERTICAL_LENGTH;
+
+			if($world->getBlockAt($startX + $x, $startY + $y, $startZ + $z) instanceof Water){
+				return true;
+			}
+		}
+
+		//no water found at cached position - search the whole area
+		//y will increment after x/z have been exhausted, as usually water will be at the same Y as the farmland
+		for($y = 0; $y < self::WATER_SEARCH_VERTICAL_LENGTH; $y++){
+			for($x = 0; $x < self::WATER_SEARCH_HORIZONTAL_LENGTH; $x++){
+				for($z = 0; $z < self::WATER_SEARCH_HORIZONTAL_LENGTH; $z++){
+					if($world->getBlockAt($startX + $x, $startY + $y, $startZ + $z) instanceof Water){
+						$this->waterPositionIndex = $x + ($z * self::WATER_SEARCH_HORIZONTAL_LENGTH) + ($y * self::WATER_SEARCH_HORIZONTAL_LENGTH ** 2);
 						return true;
 					}
 				}
 			}
 		}
 
+		$this->waterPositionIndex = self::WATER_POSITION_INDEX_UNKNOWN;
 		return false;
 	}
 
diff --git a/src/block/Fence.php b/src/block/Fence.php
index 08c9b5eac0..30caaa4cfc 100644
--- a/src/block/Fence.php
+++ b/src/block/Fence.php
@@ -37,17 +37,21 @@ class Fence extends Transparent{
 		return 0.25;
 	}
 
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 
+		$this->collisionBoxes = null;
+
 		foreach(Facing::HORIZONTAL as $facing){
 			$block = $this->getSide($facing);
-			if($block instanceof static || $block instanceof FenceGate || ($block->isSolid() && !$block->isTransparent())){
+			if($block instanceof static || $block instanceof FenceGate || $block->getSupportType(Facing::opposite($facing)) === SupportType::FULL){
 				$this->connections[$facing] = true;
 			}else{
 				unset($this->connections[$facing]);
 			}
 		}
+
+		return $this;
 	}
 
 	/**
@@ -96,6 +100,6 @@ class Fence extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return Facing::axis($facing) === Axis::Y ? SupportType::CENTER() : SupportType::NONE();
+		return Facing::axis($facing) === Axis::Y ? SupportType::CENTER : SupportType::NONE;
 	}
 }
diff --git a/src/block/FenceGate.php b/src/block/FenceGate.php
index 7d45a917e4..7354564495 100644
--- a/src/block/FenceGate.php
+++ b/src/block/FenceGate.php
@@ -23,9 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\HorizontalFacingTrait;
 use pocketmine\block\utils\SupportType;
+use pocketmine\block\utils\WoodTypeTrait;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
@@ -35,25 +36,16 @@ use pocketmine\world\BlockTransaction;
 use pocketmine\world\sound\DoorSound;
 
 class FenceGate extends Transparent{
+	use WoodTypeTrait;
 	use HorizontalFacingTrait;
 
 	protected bool $open = false;
 	protected bool $inWall = false;
 
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::writeLegacyHorizontalFacing($this->facing) |
-			($this->open ? BlockLegacyMetadata::FENCE_GATE_FLAG_OPEN : 0) |
-			($this->inWall ? BlockLegacyMetadata::FENCE_GATE_FLAG_IN_WALL : 0);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::readLegacyHorizontalFacing($stateMeta & 0x03);
-		$this->open = ($stateMeta & BlockLegacyMetadata::FENCE_GATE_FLAG_OPEN) !== 0;
-		$this->inWall = ($stateMeta & BlockLegacyMetadata::FENCE_GATE_FLAG_IN_WALL) !== 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+		$w->bool($this->open);
+		$w->bool($this->inWall);
 	}
 
 	public function isOpen() : bool{ return $this->open; }
@@ -80,7 +72,7 @@ class FenceGate extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	private function checkInWall() : bool{
@@ -108,7 +100,7 @@ class FenceGate extends Transparent{
 		}
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		$this->open = !$this->open;
 		if($this->open && $player !== null){
 			$playerFacing = $player->getHorizontalFacing();
@@ -124,14 +116,14 @@ class FenceGate extends Transparent{
 	}
 
 	public function getFuelTime() : int{
-		return 300;
+		return $this->woodType->isFlammable() ? 300 : 0;
 	}
 
 	public function getFlameEncouragement() : int{
-		return 5;
+		return $this->woodType->isFlammable() ? 5 : 0;
 	}
 
 	public function getFlammability() : int{
-		return 20;
+		return $this->woodType->isFlammable() ? 20 : 0;
 	}
 }
diff --git a/src/block/FillableCauldron.php b/src/block/FillableCauldron.php
new file mode 100644
index 0000000000..ceef352996
--- /dev/null
+++ b/src/block/FillableCauldron.php
@@ -0,0 +1,127 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\item\Item;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
+use pocketmine\world\sound\Sound;
+use function min;
+
+abstract class FillableCauldron extends Transparent{
+	public const MIN_FILL_LEVEL = 1;
+	public const MAX_FILL_LEVEL = 6;
+
+	private int $fillLevel = self::MIN_FILL_LEVEL;
+
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->boundedIntAuto(self::MIN_FILL_LEVEL, self::MAX_FILL_LEVEL, $this->fillLevel);
+	}
+
+	public function getFillLevel() : int{ return $this->fillLevel; }
+
+	/** @return $this */
+	public function setFillLevel(int $fillLevel) : self{
+		if($fillLevel < self::MIN_FILL_LEVEL || $fillLevel > self::MAX_FILL_LEVEL){
+			throw new \InvalidArgumentException("Fill level must be in range " . self::MIN_FILL_LEVEL . " ... " . self::MAX_FILL_LEVEL);
+		}
+		$this->fillLevel = $fillLevel;
+		return $this;
+	}
+
+	protected function recalculateCollisionBoxes() : array{
+		$result = [
+			AxisAlignedBB::one()->trim(Facing::UP, 11 / 16) //bottom of the cauldron
+		];
+
+		foreach(Facing::HORIZONTAL as $f){ //add the frame parts around the bowl
+			$result[] = AxisAlignedBB::one()->trim($f, 14 / 16);
+		}
+		return $result;
+	}
+
+	public function getSupportType(int $facing) : SupportType{
+		return $facing === Facing::UP ? SupportType::EDGE : SupportType::NONE;
+	}
+
+	protected function withFillLevel(int $fillLevel) : Block{
+		return $fillLevel === 0 ? VanillaBlocks::CAULDRON() : $this->setFillLevel(min(self::MAX_FILL_LEVEL, $fillLevel));
+	}
+
+	/**
+	 * @param Item[] &$returnedItems
+	 */
+	protected function addFillLevels(int $amount, Item $usedItem, Item $returnedItem, array &$returnedItems) : void{
+		if($this->fillLevel >= self::MAX_FILL_LEVEL){
+			return;
+		}
+		$this->position->getWorld()->setBlock($this->position, $this->withFillLevel($this->fillLevel + $amount));
+		$this->position->getWorld()->addSound($this->position->add(0.5, 0.5, 0.5), $this->getFillSound());
+
+		$usedItem->pop();
+		$returnedItems[] = $returnedItem;
+	}
+
+	/**
+	 * @param Item[] &$returnedItems
+	 */
+	protected function removeFillLevels(int $amount, Item $usedItem, Item $returnedItem, array &$returnedItems) : void{
+		if($this->fillLevel < $amount){
+			return;
+		}
+
+		$this->position->getWorld()->setBlock($this->position, $this->withFillLevel($this->fillLevel - $amount));
+		$this->position->getWorld()->addSound($this->position->add(0.5, 0.5, 0.5), $this->getEmptySound());
+
+		$usedItem->pop();
+		$returnedItems[] = $returnedItem;
+	}
+
+	/**
+	 * Returns the sound played when adding levels to the cauldron liquid.
+	 */
+	abstract public function getFillSound() : Sound;
+
+	/**
+	 * Returns the sound played when removing levels from the cauldron liquid.
+	 */
+	abstract public function getEmptySound() : Sound;
+
+	/**
+	 * @param Item[] &$returnedItems
+	 */
+	protected function mix(Item $usedItem, Item $returnedItem, array &$returnedItems) : void{
+		$this->position->getWorld()->setBlock($this->position, VanillaBlocks::CAULDRON());
+		//TODO: sounds and particles
+
+		$usedItem->pop();
+		$returnedItems[] = $returnedItem;
+	}
+
+	public function asItem() : Item{
+		return VanillaBlocks::CAULDRON()->asItem();
+	}
+}
diff --git a/src/block/Fire.php b/src/block/Fire.php
index 648724529f..35a7a696c6 100644
--- a/src/block/Fire.php
+++ b/src/block/Fire.php
@@ -23,15 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
-use pocketmine\entity\Entity;
-use pocketmine\entity\projectile\Arrow;
+use pocketmine\block\utils\AgeableTrait;
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\block\utils\SupportType;
 use pocketmine\event\block\BlockBurnEvent;
-use pocketmine\event\block\BlockSpreadEvent;
-use pocketmine\event\entity\EntityCombustByBlockEvent;
-use pocketmine\event\entity\EntityDamageByBlockEvent;
-use pocketmine\event\entity\EntityDamageEvent;
-use pocketmine\item\Item;
 use pocketmine\math\Facing;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\World;
@@ -40,68 +35,25 @@ use function max;
 use function min;
 use function mt_rand;
 
-class Fire extends Flowable{
+class Fire extends BaseFire{
+	use AgeableTrait;
+
 	public const MAX_AGE = 15;
 
-	protected int $age = 0;
-
-	protected function writeStateToMeta() : int{
-		return $this->age;
+	protected function getFireDamage() : int{
+		return 1;
 	}
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->age = BlockDataSerializer::readBoundedInt("age", $stateMeta, 0, self::MAX_AGE);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
-	public function getAge() : int{ return $this->age; }
-
-	/** @return $this */
-	public function setAge(int $age) : self{
-		if($age < 0 || $age > self::MAX_AGE){
-			throw new \InvalidArgumentException("Age must be in range 0 ... " . self::MAX_AGE);
-		}
-		$this->age = $age;
-		return $this;
-	}
-
-	public function hasEntityCollision() : bool{
-		return true;
-	}
-
-	public function getLightLevel() : int{
-		return 15;
-	}
-
-	public function canBeReplaced() : bool{
-		return true;
-	}
-
-	public function onEntityInside(Entity $entity) : bool{
-		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1);
-		$entity->attack($ev);
-
-		$ev = new EntityCombustByBlockEvent($this, $entity, 8);
-		if($entity instanceof Arrow){
-			$ev->cancel();
-		}
-		$ev->call();
-		if(!$ev->isCancelled()){
-			$entity->setOnFire($ev->getDuration());
-		}
-		return true;
-	}
-
-	public function getDropsForCompatibleTool(Item $item) : array{
-		return [];
+	private function canBeSupportedBy(Block $block) : bool{
+		return $block->getSupportType(Facing::UP) === SupportType::FULL;
 	}
 
 	public function onNearbyBlockChange() : void{
 		$world = $this->position->getWorld();
-		if($this->getSide(Facing::DOWN)->isTransparent() && !$this->hasAdjacentFlammableBlocks()){
+		$down = $this->getSide(Facing::DOWN);
+		if(SoulFire::canBeSupportedBy($down)){
+			$world->setBlock($this->position, VanillaBlocks::SOUL_FIRE());
+		}elseif(!$this->canBeSupportedBy($this->getSide(Facing::DOWN)) && !$this->hasAdjacentFlammableBlocks()){
 			$world->setBlock($this->position, VanillaBlocks::AIR());
 		}else{
 			$world->scheduleDelayedBlockUpdate($this->position, mt_rand(30, 40));
@@ -178,13 +130,17 @@ class Fire extends Flowable{
 
 	private function burnBlock(Block $block, int $chanceBound) : void{
 		if(mt_rand(0, $chanceBound) < $block->getFlammability()){
-			$ev = new BlockBurnEvent($block, $this);
-			$ev->call();
-			if(!$ev->isCancelled()){
+			$cancelled = false;
+			if(BlockBurnEvent::hasHandlers()){
+				$ev = new BlockBurnEvent($block, $this);
+				$ev->call();
+				$cancelled = $ev->isCancelled();
+			}
+			if(!$cancelled){
 				$block->onIncinerate();
 
 				$world = $this->position->getWorld();
-				if($world->getBlock($block->getPosition())->isSameState($block)){
+				if($world->getBlock($block->position)->isSameState($block)){
 					$spreadedFire = false;
 					if(mt_rand(0, $this->age + 9) < 5){ //TODO: check rain
 						$fire = clone $this;
@@ -227,7 +183,7 @@ class Fire extends Flowable{
 						continue;
 					}
 					$block = $world->getBlockAt($targetX, $targetY, $targetZ);
-					if($block->getId() !== BlockLegacyIds::AIR){
+					if($block->getTypeId() !== BlockTypeIds::AIR){
 						continue;
 					}
 
@@ -258,13 +214,6 @@ class Fire extends Flowable{
 	}
 
 	private function spreadBlock(Block $block, Block $newState) : bool{
-		$ev = new BlockSpreadEvent($block, $this, $newState);
-		$ev->call();
-		if(!$ev->isCancelled()){
-			$block->position->getWorld()->setBlock($block->position, $ev->getNewState());
-			return true;
-		}
-
-		return false;
+		return BlockEventHelper::spread($block, $newState, $this);
 	}
 }
diff --git a/src/block/FloorBanner.php b/src/block/FloorBanner.php
index d2ac152afe..73bc457878 100644
--- a/src/block/FloorBanner.php
+++ b/src/block/FloorBanner.php
@@ -33,18 +33,6 @@ use pocketmine\world\BlockTransaction;
 final class FloorBanner extends BaseBanner{
 	use SignLikeRotationTrait;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->rotation = $stateMeta;
-	}
-
-	protected function writeStateToMeta() : int{
-		return $this->rotation;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
 	protected function getSupportingFace() : int{
 		return Facing::DOWN;
 	}
diff --git a/src/block/FloorCoralFan.php b/src/block/FloorCoralFan.php
index 8572adf73c..5b74d08aff 100644
--- a/src/block/FloorCoralFan.php
+++ b/src/block/FloorCoralFan.php
@@ -23,11 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\InvalidBlockStateException;
-use pocketmine\data\bedrock\CoralTypeIdMap;
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
-use pocketmine\item\ItemFactory;
-use pocketmine\item\ItemIds;
+use pocketmine\item\VanillaItems;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
@@ -37,49 +36,12 @@ use function atan2;
 use function rad2deg;
 
 final class FloorCoralFan extends BaseCoral{
-
-	protected BlockIdentifierFlattened $idInfoFlattened;
+	use StaticSupportTrait;
 
 	private int $axis = Axis::X;
 
-	public function __construct(BlockIdentifierFlattened $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->idInfoFlattened = $idInfo;
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->dead = $id === $this->idInfoFlattened->getSecondId();
-		$this->axis = ($stateMeta >> 3) === BlockLegacyMetadata::CORAL_FAN_EAST_WEST ? Axis::X : Axis::Z;
-		$coralType = CoralTypeIdMap::getInstance()->fromId($stateMeta & BlockLegacyMetadata::CORAL_FAN_TYPE_MASK);
-		if($coralType === null){
-			throw new InvalidBlockStateException("No such coral type");
-		}
-		$this->coralType = $coralType;
-	}
-
-	public function getId() : int{
-		return $this->dead ? $this->idInfoFlattened->getSecondId() : parent::getId();
-	}
-
-	public function asItem() : Item{
-		//TODO: HACK! workaround dead flag being lost when broken / blockpicked (original impl only uses first ID)
-		return ItemFactory::getInstance()->get(
-			$this->dead ? ItemIds::CORAL_FAN_DEAD : ItemIds::CORAL_FAN,
-			$this->writeStateToItemMeta()
-		);
-	}
-
-	protected function writeStateToMeta() : int{
-		return (($this->axis === Axis::X ? BlockLegacyMetadata::CORAL_FAN_EAST_WEST : BlockLegacyMetadata::CORAL_FAN_NORTH_SOUTH) << 3) |
-			CoralTypeIdMap::getInstance()->toId($this->coralType);
-	}
-
-	protected function writeStateToItemMeta() : int{
-		return CoralTypeIdMap::getInstance()->toId($this->coralType);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalAxis($this->axis);
 	}
 
 	public function getAxis() : int{ return $this->axis; }
@@ -94,12 +56,9 @@ final class FloorCoralFan extends BaseCoral{
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if(!$this->canBeSupportedBy($tx->fetchBlock($blockReplace->getPosition()->down()))){
-			return false;
-		}
 		if($player !== null){
 			$playerBlockPos = $player->getPosition()->floor();
-			$directionVector = $blockReplace->getPosition()->subtractVector($playerBlockPos)->normalize();
+			$directionVector = $blockReplace->position->subtractVector($playerBlockPos)->normalize();
 			$angle = rad2deg(atan2($directionVector->getZ(), $directionVector->getX()));
 
 			if($angle <= 45 || 315 <= $angle || (135 <= $angle && $angle <= 225)){
@@ -108,20 +67,17 @@ final class FloorCoralFan extends BaseCoral{
 				$this->axis = Axis::Z;
 			}
 		}
+
+		$this->dead = !$this->isCoveredWithWater();
+
 		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 	}
 
-	public function onNearbyBlockChange() : void{
-		$world = $this->position->getWorld();
-		if(!$this->canBeSupportedBy($world->getBlock($this->position->down()))){
-			$world->useBreakOn($this->position);
-		}else{
-			parent::onNearbyBlockChange();
-		}
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getAdjacentSupportType(Facing::DOWN)->hasCenterSupport();
 	}
 
-	private function canBeSupportedBy(Block $block) : bool{
-		return $block->getSupportType(Facing::UP)->hasCenterSupport();
+	public function asItem() : Item{
+		return VanillaItems::CORAL_FAN()->setCoralType($this->coralType)->setDead($this->dead);
 	}
-
 }
diff --git a/src/block/FloorSign.php b/src/block/FloorSign.php
index 13e4a6c9de..5615d15d89 100644
--- a/src/block/FloorSign.php
+++ b/src/block/FloorSign.php
@@ -33,18 +33,6 @@ use pocketmine\world\BlockTransaction;
 final class FloorSign extends BaseSign{
 	use SignLikeRotationTrait;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->rotation = $stateMeta;
-	}
-
-	protected function writeStateToMeta() : int{
-		return $this->rotation;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
 	protected function getSupportingFace() : int{
 		return Facing::DOWN;
 	}
diff --git a/src/block/Flowable.php b/src/block/Flowable.php
index 2b4e8a02bd..0328bcd745 100644
--- a/src/block/Flowable.php
+++ b/src/block/Flowable.php
@@ -25,6 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\block\utils\SupportType;
 use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
 
 /**
  * "Flowable" blocks are destroyed if water flows into the same space as the block. These blocks usually don't have any
@@ -40,6 +41,11 @@ abstract class Flowable extends Transparent{
 		return false;
 	}
 
+	public function canBePlacedAt(Block $blockReplace, Vector3 $clickVector, int $face, bool $isClickedBlock) : bool{
+		return (!$this->canBeFlowedInto() || !$blockReplace instanceof Liquid) &&
+			parent::canBePlacedAt($blockReplace, $clickVector, $face, $isClickedBlock);
+	}
+
 	/**
 	 * @return AxisAlignedBB[]
 	 */
@@ -48,6 +54,6 @@ abstract class Flowable extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 }
diff --git a/src/block/Flower.php b/src/block/Flower.php
index 31179c882d..ef79813fe2 100644
--- a/src/block/Flower.php
+++ b/src/block/Flower.php
@@ -23,27 +23,15 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\math\Facing;
-use pocketmine\math\Vector3;
-use pocketmine\player\Player;
-use pocketmine\world\BlockTransaction;
 
 class Flower extends Flowable{
+	use StaticSupportTrait;
 
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		$down = $this->getSide(Facing::DOWN);
-		if($down->getId() === BlockLegacyIds::GRASS || $down->getId() === BlockLegacyIds::DIRT || $down->getId() === BlockLegacyIds::FARMLAND){
-			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-		}
-
-		return false;
-	}
-
-	public function onNearbyBlockChange() : void{
-		if($this->getSide(Facing::DOWN)->isTransparent()){
-			$this->position->getWorld()->useBreakOn($this->position);
-		}
+	private function canBeSupportedAt(Block $block) : bool{
+		$supportBlock = $block->getSide(Facing::DOWN);
+		return $supportBlock->hasTypeTag(BlockTypeTags::DIRT) || $supportBlock->hasTypeTag(BlockTypeTags::MUD);
 	}
 
 	public function getFlameEncouragement() : int{
diff --git a/src/block/FlowerPot.php b/src/block/FlowerPot.php
index 5ebe6b8bae..fb3e78d82a 100644
--- a/src/block/FlowerPot.php
+++ b/src/block/FlowerPot.php
@@ -24,28 +24,20 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\tile\FlowerPot as TileFlowerPot;
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
-use pocketmine\world\BlockTransaction;
 use function assert;
 
 class FlowerPot extends Flowable{
+	use StaticSupportTrait;
 
 	protected ?Block $plant = null;
 
-	protected function writeStateToMeta() : int{
-		//TODO: HACK! this is just to make the client actually render the plant - we purposely don't read the flag back
-		return $this->plant !== null ? BlockLegacyMetadata::FLOWER_POT_FLAG_OCCUPIED : 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1;
-	}
-
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 		$tile = $this->position->getWorld()->getTile($this->position);
 		if($tile instanceof TileFlowerPot){
@@ -53,6 +45,8 @@ class FlowerPot extends Flowable{
 		}else{
 			$this->setPlant(null);
 		}
+
+		return $this;
 	}
 
 	public function writeStateToWorld() : void{
@@ -86,14 +80,7 @@ class FlowerPot extends Flowable{
 	}
 
 	private function isValidPlant(Block $block) : bool{
-		return
-			$block instanceof Cactus ||
-			$block instanceof DeadBush ||
-			$block instanceof Flower ||
-			$block instanceof RedMushroom ||
-			$block instanceof Sapling ||
-			($block instanceof TallGrass && $block->getIdInfo()->getVariant() === BlockLegacyMetadata::TALLGRASS_FERN); //TODO: clean up
-		//TODO: bamboo
+		return $block->hasTypeTag(BlockTypeTags::POTTABLE_PLANTS);
 	}
 
 	/**
@@ -103,25 +90,11 @@ class FlowerPot extends Flowable{
 		return [AxisAlignedBB::one()->contract(3 / 16, 0, 3 / 16)->trim(Facing::UP, 5 / 8)];
 	}
 
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if(!$this->canBeSupportedBy($this->getSide(Facing::DOWN))){
-			return false;
-		}
-
-		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getAdjacentSupportType(Facing::DOWN)->hasCenterSupport();
 	}
 
-	public function onNearbyBlockChange() : void{
-		if(!$this->canBeSupportedBy($this->getSide(Facing::DOWN))){
-			$this->position->getWorld()->useBreakOn($this->position);
-		}
-	}
-
-	private function canBeSupportedBy(Block $block) : bool{
-		return $block->getSupportType(Facing::UP)->hasCenterSupport();
-	}
-
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		$world = $this->position->getWorld();
 		$plant = $item->getBlock();
 		if($this->plant !== null){
diff --git a/src/block/Froglight.php b/src/block/Froglight.php
new file mode 100644
index 0000000000..562b33f174
--- /dev/null
+++ b/src/block/Froglight.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\FroglightType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+
+final class Froglight extends SimplePillar{
+
+	private FroglightType $froglightType = FroglightType::OCHRE;
+
+	public function describeBlockItemState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->froglightType);
+	}
+
+	public function getFroglightType() : FroglightType{ return $this->froglightType; }
+
+	/** @return $this */
+	public function setFroglightType(FroglightType $froglightType) : self{
+		$this->froglightType = $froglightType;
+		return $this;
+	}
+
+	public function getLightLevel() : int{
+		return 15;
+	}
+}
diff --git a/src/block/FrostedIce.php b/src/block/FrostedIce.php
index 95e15f3f71..3e85923067 100644
--- a/src/block/FrostedIce.php
+++ b/src/block/FrostedIce.php
@@ -23,45 +23,17 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
-use pocketmine\event\block\BlockMeltEvent;
+use pocketmine\block\utils\AgeableTrait;
+use pocketmine\block\utils\BlockEventHelper;
 use function mt_rand;
 
 class FrostedIce extends Ice{
+	use AgeableTrait;
+
 	public const MAX_AGE = 3;
 
-	protected int $age = 0;
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->age = BlockDataSerializer::readBoundedInt("age", $stateMeta, 0, self::MAX_AGE);
-	}
-
-	protected function writeStateToMeta() : int{
-		return $this->age;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b11;
-	}
-
-	public function getAge() : int{ return $this->age; }
-
-	/** @return $this */
-	public function setAge(int $age) : self{
-		if($age < 0 || $age > self::MAX_AGE){
-			throw new \InvalidArgumentException("Age must be in range 0 ... " . self::MAX_AGE);
-		}
-		$this->age = $age;
-		return $this;
-	}
-
 	public function onNearbyBlockChange() : void{
-		$world = $this->position->getWorld();
-		if(!$this->checkAdjacentBlocks(2)){
-			$world->useBreakOn($this->position);
-		}else{
-			$world->scheduleDelayedBlockUpdate($this->position, mt_rand(20, 40));
-		}
+		$this->position->getWorld()->scheduleDelayedBlockUpdate($this->position, mt_rand(20, 40));
 	}
 
 	public function onRandomTick() : void{
@@ -110,11 +82,7 @@ class FrostedIce extends Ice{
 	private function tryMelt() : bool{
 		$world = $this->position->getWorld();
 		if($this->age >= self::MAX_AGE){
-			$ev = new BlockMeltEvent($this, VanillaBlocks::WATER());
-			$ev->call();
-			if(!$ev->isCancelled()){
-				$world->setBlock($this->position, $ev->getNewState());
-			}
+			BlockEventHelper::melt($this, VanillaBlocks::WATER());
 			return true;
 		}
 
diff --git a/src/block/Furnace.php b/src/block/Furnace.php
index d4b1ba9f16..7a64e3cd3e 100644
--- a/src/block/Furnace.php
+++ b/src/block/Furnace.php
@@ -25,7 +25,9 @@ namespace pocketmine\block;
 
 use pocketmine\block\tile\Furnace as TileFurnace;
 use pocketmine\block\utils\FacesOppositePlacingPlayerTrait;
-use pocketmine\block\utils\NormalHorizontalFacingInMetadataTrait;
+use pocketmine\block\utils\LightableTrait;
+use pocketmine\crafting\FurnaceType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
@@ -33,45 +35,29 @@ use function mt_rand;
 
 class Furnace extends Opaque{
 	use FacesOppositePlacingPlayerTrait;
-	use NormalHorizontalFacingInMetadataTrait {
-		readStateFromData as readFacingStateFromData;
+	use LightableTrait;
+
+	protected FurnaceType $furnaceType;
+
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockTypeInfo $typeInfo, FurnaceType $furnaceType){
+		$this->furnaceType = $furnaceType;
+		parent::__construct($idInfo, $name, $typeInfo);
 	}
 
-	protected BlockIdentifierFlattened $idInfoFlattened;
-
-	protected bool $lit = false; //this is set based on the blockID
-
-	public function __construct(BlockIdentifierFlattened $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->idInfoFlattened = $idInfo;
-		parent::__construct($idInfo, $name, $breakInfo);
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+		$w->bool($this->lit);
 	}
 
-	public function getId() : int{
-		return $this->lit ? $this->idInfoFlattened->getSecondId() : parent::getId();
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->readFacingStateFromData($id, $stateMeta);
-		$this->lit = $id === $this->idInfoFlattened->getSecondId();
+	public function getFurnaceType() : FurnaceType{
+		return $this->furnaceType;
 	}
 
 	public function getLightLevel() : int{
 		return $this->lit ? 13 : 0;
 	}
 
-	public function isLit() : bool{
-		return $this->lit;
-	}
-
-	/**
-	 * @return $this
-	 */
-	public function setLit(bool $lit = true) : self{
-		$this->lit = $lit;
-		return $this;
-	}
-
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($player instanceof Player){
 			$furnace = $this->position->getWorld()->getTile($this->position);
 			if($furnace instanceof TileFurnace && $furnace->canOpenWith($item->getCustomName())){
diff --git a/src/block/GildedBlackstone.php b/src/block/GildedBlackstone.php
new file mode 100644
index 0000000000..75c822f8e0
--- /dev/null
+++ b/src/block/GildedBlackstone.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\FortuneDropHelper;
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+use function mt_rand;
+
+final class GildedBlackstone extends Opaque{
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		if(FortuneDropHelper::bonusChanceDivisor($item, 10, 3)){
+			return [VanillaItems::GOLD_NUGGET()->setCount(mt_rand(2, 5))];
+		}
+
+		return parent::getDropsForCompatibleTool($item);
+	}
+
+	public function isAffectedBySilkTouch() : bool{ return true; }
+}
diff --git a/src/block/GlazedTerracotta.php b/src/block/GlazedTerracotta.php
index 1787e51ae2..15b3254e5d 100644
--- a/src/block/GlazedTerracotta.php
+++ b/src/block/GlazedTerracotta.php
@@ -23,10 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\ColoredTrait;
 use pocketmine\block\utils\FacesOppositePlacingPlayerTrait;
-use pocketmine\block\utils\NormalHorizontalFacingInMetadataTrait;
 
 class GlazedTerracotta extends Opaque{
+	use ColoredTrait;
 	use FacesOppositePlacingPlayerTrait;
-	use NormalHorizontalFacingInMetadataTrait;
 }
diff --git a/src/block/GlowLichen.php b/src/block/GlowLichen.php
new file mode 100644
index 0000000000..d30e253958
--- /dev/null
+++ b/src/block/GlowLichen.php
@@ -0,0 +1,196 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\block\utils\MultiAnySupportTrait;
+use pocketmine\block\utils\SupportType;
+use pocketmine\item\Fertilizer;
+use pocketmine\item\Item;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\World;
+use function count;
+use function shuffle;
+
+class GlowLichen extends Transparent{
+	use MultiAnySupportTrait;
+
+	public function getLightLevel() : int{
+		return 7;
+	}
+
+	public function isSolid() : bool{
+		return false;
+	}
+
+	/**
+	 * @return AxisAlignedBB[]
+	 */
+	protected function recalculateCollisionBoxes() : array{
+		return [];
+	}
+
+	public function getSupportType(int $facing) : SupportType{
+		return SupportType::NONE;
+	}
+
+	public function canBeReplaced() : bool{
+		return true;
+	}
+
+	/**
+	 * @return int[]
+	 */
+	protected function getInitialPlaceFaces(Block $blockReplace) : array{
+		return $blockReplace instanceof GlowLichen ? $blockReplace->faces : [];
+	}
+
+	private function getSpreadBlock(Block $replace, int $spreadFace) : ?Block{
+		if($replace instanceof self && $replace->hasSameTypeId($this)){
+			if($replace->hasFace($spreadFace)){
+				return null;
+			}
+			$result = $replace;
+		}elseif($replace->getTypeId() === BlockTypeIds::AIR){
+			$result = VanillaBlocks::GLOW_LICHEN();
+		}else{
+			//TODO: if this is a water block, generate a waterlogged block
+			return null;
+		}
+		return $result->setFace($spreadFace, true);
+	}
+
+	private function spread(World $world, Vector3 $replacePos, int $spreadFace) : bool{
+		$supportBlock = $world->getBlock($replacePos->getSide($spreadFace));
+		$supportFace = Facing::opposite($spreadFace);
+
+		if($supportBlock->getSupportType($supportFace) !== SupportType::FULL){
+			return false;
+		}
+
+		$replacedBlock = $supportBlock->getSide($supportFace);
+		$replacementBlock = $this->getSpreadBlock($replacedBlock, Facing::opposite($supportFace));
+		if($replacementBlock === null){
+			return false;
+		}
+
+		return BlockEventHelper::spread($replacedBlock, $replacementBlock, $this);
+	}
+
+	/**
+	 * @phpstan-return \Generator<int, int, void, void>
+	 */
+	private static function getShuffledSpreadFaces(int $sourceFace) : \Generator{
+		$skipAxis = Facing::axis($sourceFace);
+
+		$faces = Facing::ALL;
+		shuffle($faces);
+		foreach($faces as $spreadFace){
+			if(Facing::axis($spreadFace) !== $skipAxis){
+				yield $spreadFace;
+			}
+		}
+	}
+
+	private function spreadAroundSupport(int $sourceFace) : bool{
+		$world = $this->position->getWorld();
+
+		$supportPos = $this->position->getSide($sourceFace);
+		foreach(self::getShuffledSpreadFaces($sourceFace) as $spreadFace){
+			$replacePos = $supportPos->getSide($spreadFace);
+			if($this->spread($world, $replacePos, Facing::opposite($spreadFace))){
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private function spreadAdjacentToSupport(int $sourceFace) : bool{
+		$world = $this->position->getWorld();
+
+		foreach(self::getShuffledSpreadFaces($sourceFace) as $spreadFace){
+			$replacePos = $this->position->getSide($spreadFace);
+			if($this->spread($world, $replacePos, $sourceFace)){
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private function spreadWithinSelf(int $sourceFace) : bool{
+		foreach(self::getShuffledSpreadFaces($sourceFace) as $spreadFace){
+			if(!$this->hasFace($spreadFace) && $this->spread($this->position->getWorld(), $this->position, $spreadFace)){
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($item instanceof Fertilizer && count($this->faces) > 0){
+			$shuffledFaces = $this->faces;
+			shuffle($shuffledFaces);
+
+			$spreadMethods = [
+				$this->spreadAroundSupport(...),
+				$this->spreadAdjacentToSupport(...),
+				$this->spreadWithinSelf(...),
+			];
+			shuffle($spreadMethods);
+
+			foreach($shuffledFaces as $sourceFace){
+				foreach($spreadMethods as $spreadMethod){
+					if($spreadMethod($sourceFace)){
+						$item->pop();
+						break 2;
+					}
+				}
+			}
+
+			return true;
+		}
+		return false;
+	}
+
+	public function getDrops(Item $item) : array{
+		if(($item->getBlockToolType() & BlockToolType::SHEARS) !== 0){
+			return $this->getDropsForCompatibleTool($item);
+		}
+
+		return [];
+	}
+
+	public function getFlameEncouragement() : int{
+		return 15;
+	}
+
+	public function getFlammability() : int{
+		return 100;
+	}
+}
diff --git a/src/block/Glowstone.php b/src/block/Glowstone.php
index 3b567aa5b3..1fead9abef 100644
--- a/src/block/Glowstone.php
+++ b/src/block/Glowstone.php
@@ -23,9 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\FortuneDropHelper;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
-use function mt_rand;
+use function min;
 
 class Glowstone extends Transparent{
 
@@ -35,7 +36,7 @@ class Glowstone extends Transparent{
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			VanillaItems::GLOWSTONE_DUST()->setCount(mt_rand(2, 4))
+			VanillaItems::GLOWSTONE_DUST()->setCount(min(4, FortuneDropHelper::discrete($item, 2, 4)))
 		];
 	}
 
diff --git a/src/block/GoldOre.php b/src/block/GoldOre.php
new file mode 100644
index 0000000000..75374c1b05
--- /dev/null
+++ b/src/block/GoldOre.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\FortuneDropHelper;
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+
+final class GoldOre extends Opaque{
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [VanillaItems::RAW_GOLD()->setCount(FortuneDropHelper::weighted($item, min: 1, maxBase: 1))];
+	}
+
+	public function isAffectedBySilkTouch() : bool{ return true; }
+}
diff --git a/src/block/Grass.php b/src/block/Grass.php
index 8ddbb7f0cb..8a9fea8eac 100644
--- a/src/block/Grass.php
+++ b/src/block/Grass.php
@@ -23,7 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\event\block\BlockSpreadEvent;
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\block\utils\DirtType;
 use pocketmine\item\Fertilizer;
 use pocketmine\item\Hoe;
 use pocketmine\item\Item;
@@ -57,11 +58,7 @@ class Grass extends Opaque{
 		$lightAbove = $world->getFullLightAt($this->position->x, $this->position->y + 1, $this->position->z);
 		if($lightAbove < 4 && $world->getBlockAt($this->position->x, $this->position->y + 1, $this->position->z)->getLightFilter() >= 2){
 			//grass dies
-			$ev = new BlockSpreadEvent($this, $this, VanillaBlocks::DIRT());
-			$ev->call();
-			if(!$ev->isCancelled()){
-				$world->setBlock($this->position, $ev->getNewState(), false);
-			}
+			BlockEventHelper::spread($this, VanillaBlocks::DIRT(), $this);
 		}elseif($lightAbove >= 9){
 			//try grass spread
 			for($i = 0; $i < 4; ++$i){
@@ -72,24 +69,20 @@ class Grass extends Opaque{
 				$b = $world->getBlockAt($x, $y, $z);
 				if(
 					!($b instanceof Dirt) ||
-					$b->isCoarse() ||
+					$b->getDirtType() !== DirtType::NORMAL ||
 					$world->getFullLightAt($x, $y + 1, $z) < 4 ||
 					$world->getBlockAt($x, $y + 1, $z)->getLightFilter() >= 2
 				){
 					continue;
 				}
 
-				$ev = new BlockSpreadEvent($b, $this, VanillaBlocks::GRASS());
-				$ev->call();
-				if(!$ev->isCancelled()){
-					$world->setBlock($b->position, $ev->getNewState(), false);
-				}
+				BlockEventHelper::spread($b, VanillaBlocks::GRASS(), $this);
 			}
 		}
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($face !== Facing::UP){
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($this->getSide(Facing::UP)->getTypeId() !== BlockTypeIds::AIR){
 			return false;
 		}
 		$world = $this->position->getWorld();
@@ -98,20 +91,23 @@ class Grass extends Opaque{
 			TallGrassObject::growGrass($world, $this->position, new Random(mt_rand()), 8, 2);
 
 			return true;
-		}elseif($item instanceof Hoe){
-			$item->applyDamage(1);
-			$newBlock = VanillaBlocks::FARMLAND();
-			$world->addSound($this->position->add(0.5, 0.5, 0.5), new ItemUseOnBlockSound($newBlock));
-			$world->setBlock($this->position, $newBlock);
+		}
+		if($face !== Facing::DOWN){
+			if($item instanceof Hoe){
+				$item->applyDamage(1);
+				$newBlock = VanillaBlocks::FARMLAND();
+				$world->addSound($this->position->add(0.5, 0.5, 0.5), new ItemUseOnBlockSound($newBlock));
+				$world->setBlock($this->position, $newBlock);
 
-			return true;
-		}elseif($item instanceof Shovel && $this->getSide(Facing::UP)->getId() === BlockLegacyIds::AIR){
-			$item->applyDamage(1);
-			$newBlock = VanillaBlocks::GRASS_PATH();
-			$world->addSound($this->position->add(0.5, 0.5, 0.5), new ItemUseOnBlockSound($newBlock));
-			$world->setBlock($this->position, $newBlock);
+				return true;
+			}elseif($item instanceof Shovel){
+				$item->applyDamage(1);
+				$newBlock = VanillaBlocks::GRASS_PATH();
+				$world->addSound($this->position->add(0.5, 0.5, 0.5), new ItemUseOnBlockSound($newBlock));
+				$world->setBlock($this->position, $newBlock);
 
-			return true;
+				return true;
+			}
 		}
 
 		return false;
diff --git a/src/block/GrassPath.php b/src/block/GrassPath.php
index 7cbb873ef4..5b11bd3745 100644
--- a/src/block/GrassPath.php
+++ b/src/block/GrassPath.php
@@ -33,7 +33,7 @@ class GrassPath extends Transparent{
 	 * @return AxisAlignedBB[]
 	 */
 	protected function recalculateCollisionBoxes() : array{
-		return [AxisAlignedBB::one()]; //TODO: this should be trimmed at the top by 1/16, but MCPE currently treats them as a full block (https://bugs.mojang.com/browse/MCPE-12109)
+		return [AxisAlignedBB::one()->trim(Facing::UP, 1 / 16)];
 	}
 
 	public function onNearbyBlockChange() : void{
diff --git a/src/block/Gravel.php b/src/block/Gravel.php
index 856449ce04..6445ce30eb 100644
--- a/src/block/Gravel.php
+++ b/src/block/Gravel.php
@@ -25,15 +25,15 @@ namespace pocketmine\block;
 
 use pocketmine\block\utils\Fallable;
 use pocketmine\block\utils\FallableTrait;
+use pocketmine\block\utils\FortuneDropHelper;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
-use function mt_rand;
 
 class Gravel extends Opaque implements Fallable{
 	use FallableTrait;
 
 	public function getDropsForCompatibleTool(Item $item) : array{
-		if(mt_rand(1, 10) === 1){
+		if(FortuneDropHelper::bonusChanceDivisor($item, 10, 3)){
 			return [
 				VanillaItems::FLINT()
 			];
@@ -45,8 +45,4 @@ class Gravel extends Opaque implements Fallable{
 	public function isAffectedBySilkTouch() : bool{
 		return true;
 	}
-
-	public function tickFalling() : ?Block{
-		return null;
-	}
 }
diff --git a/src/block/HangingRoots.php b/src/block/HangingRoots.php
new file mode 100644
index 0000000000..9c7bfd0960
--- /dev/null
+++ b/src/block/HangingRoots.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\item\enchantment\VanillaEnchantments;
+use pocketmine\item\Item;
+use pocketmine\math\Facing;
+
+final class HangingRoots extends Flowable{
+	use StaticSupportTrait;
+
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getAdjacentSupportType(Facing::UP)->hasCenterSupport(); //weird I know, but they can be placed on the bottom of fences
+	}
+
+	public function getDropsForIncompatibleTool(Item $item) : array{
+		if($item->hasEnchantment(VanillaEnchantments::SILK_TOUCH())){
+			return $this->getDropsForCompatibleTool($item);
+		}
+		return [];
+	}
+}
diff --git a/src/block/HayBale.php b/src/block/HayBale.php
index e47598ac5a..6fdd2cb635 100644
--- a/src/block/HayBale.php
+++ b/src/block/HayBale.php
@@ -23,11 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\PillarRotationInMetadataTrait;
+use pocketmine\block\utils\PillarRotationTrait;
 use pocketmine\entity\Entity;
 
 class HayBale extends Opaque{
-	use PillarRotationInMetadataTrait;
+	use PillarRotationTrait;
 
 	public function getFlameEncouragement() : int{
 		return 60;
diff --git a/src/block/Hopper.php b/src/block/Hopper.php
index 618862b9b6..0d823674b2 100644
--- a/src/block/Hopper.php
+++ b/src/block/Hopper.php
@@ -24,10 +24,9 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\tile\Hopper as TileHopper;
-use pocketmine\block\utils\BlockDataSerializer;
-use pocketmine\block\utils\InvalidBlockStateException;
 use pocketmine\block\utils\PoweredByRedstoneTrait;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
@@ -40,21 +39,9 @@ class Hopper extends Transparent{
 
 	private int $facing = Facing::DOWN;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$facing = BlockDataSerializer::readFacing($stateMeta & 0x07);
-		if($facing === Facing::UP){
-			throw new InvalidBlockStateException("Hopper may not face upward");
-		}
-		$this->facing = $facing;
-		$this->powered = ($stateMeta & BlockLegacyMetadata::HOPPER_FLAG_POWERED) !== 0;
-	}
-
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::writeFacing($this->facing) | ($this->powered ? BlockLegacyMetadata::HOPPER_FLAG_POWERED : 0);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->facingExcept($this->facing, Facing::UP);
+		$w->bool($this->powered);
 	}
 
 	public function getFacing() : int{ return $this->facing; }
@@ -81,9 +68,9 @@ class Hopper extends Transparent{
 
 	public function getSupportType(int $facing) : SupportType{
 		return match($facing){
-			Facing::UP => SupportType::FULL(),
-			Facing::DOWN => $this->facing === Facing::DOWN ? SupportType::CENTER() : SupportType::NONE(),
-			default => SupportType::NONE()
+			Facing::UP => SupportType::FULL,
+			Facing::DOWN => $this->facing === Facing::DOWN ? SupportType::CENTER : SupportType::NONE,
+			default => SupportType::NONE
 		};
 	}
 
@@ -93,7 +80,7 @@ class Hopper extends Transparent{
 		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($player !== null){
 			$tile = $this->position->getWorld()->getTile($this->position);
 			if($tile instanceof TileHopper){ //TODO: find a way to have inventories open on click without this boilerplate in every block
diff --git a/src/block/Ice.php b/src/block/Ice.php
index 5f62fc0323..ca0302f906 100644
--- a/src/block/Ice.php
+++ b/src/block/Ice.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\event\block\BlockMeltEvent;
+use pocketmine\block\utils\BlockEventHelper;
 use pocketmine\item\enchantment\VanillaEnchantments;
 use pocketmine\item\Item;
 use pocketmine\player\Player;
@@ -38,12 +38,12 @@ class Ice extends Transparent{
 		return 0.98;
 	}
 
-	public function onBreak(Item $item, ?Player $player = null) : bool{
+	public function onBreak(Item $item, ?Player $player = null, array &$returnedItems = []) : bool{
 		if(($player === null || $player->isSurvival()) && !$item->hasEnchantment(VanillaEnchantments::SILK_TOUCH())){
 			$this->position->getWorld()->setBlock($this->position, VanillaBlocks::WATER());
 			return true;
 		}
-		return parent::onBreak($item, $player);
+		return parent::onBreak($item, $player, $returnedItems);
 	}
 
 	public function ticksRandomly() : bool{
@@ -53,11 +53,7 @@ class Ice extends Transparent{
 	public function onRandomTick() : void{
 		$world = $this->position->getWorld();
 		if($world->getHighestAdjacentBlockLight($this->position->x, $this->position->y, $this->position->z) >= 12){
-			$ev = new BlockMeltEvent($this, VanillaBlocks::WATER());
-			$ev->call();
-			if(!$ev->isCancelled()){
-				$world->setBlock($this->position, $ev->getNewState());
-			}
+			BlockEventHelper::melt($this, VanillaBlocks::WATER());
 		}
 	}
 
diff --git a/src/block/InfestedStone.php b/src/block/InfestedStone.php
index 93e0aa3d63..deaa013fc7 100644
--- a/src/block/InfestedStone.php
+++ b/src/block/InfestedStone.php
@@ -29,13 +29,13 @@ final class InfestedStone extends Opaque{
 
 	private int $imitated;
 
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo, Block $imitated){
-		parent::__construct($idInfo, $name, $breakInfo);
-		$this->imitated = $imitated->getFullId();
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockTypeInfo $typeInfo, Block $imitated){
+		parent::__construct($idInfo, $name, $typeInfo);
+		$this->imitated = $imitated->getStateId();
 	}
 
 	public function getImitatedBlock() : Block{
-		return BlockFactory::getInstance()->fromFullBlock($this->imitated);
+		return RuntimeBlockStateRegistry::getInstance()->fromStateId($this->imitated);
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{
diff --git a/src/block/IronOre.php b/src/block/IronOre.php
new file mode 100644
index 0000000000..11c8cc2995
--- /dev/null
+++ b/src/block/IronOre.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\FortuneDropHelper;
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+
+final class IronOre extends Opaque{
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [VanillaItems::RAW_IRON()->setCount(FortuneDropHelper::weighted($item, min: 1, maxBase: 1))];
+	}
+
+	public function isAffectedBySilkTouch() : bool{ return true; }
+}
diff --git a/src/block/ItemFrame.php b/src/block/ItemFrame.php
index 7a224c47b5..c03806a3b5 100644
--- a/src/block/ItemFrame.php
+++ b/src/block/ItemFrame.php
@@ -24,22 +24,23 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\tile\ItemFrame as TileItemFrame;
-use pocketmine\block\utils\BlockDataSerializer;
-use pocketmine\block\utils\HorizontalFacingTrait;
+use pocketmine\block\utils\AnyFacingTrait;
+use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
+use pocketmine\utils\Utils;
 use pocketmine\world\BlockTransaction;
 use pocketmine\world\sound\ItemFrameAddItemSound;
 use pocketmine\world\sound\ItemFrameRemoveItemSound;
 use pocketmine\world\sound\ItemFrameRotateItemSound;
 use function is_infinite;
 use function is_nan;
-use function lcg_value;
 
 class ItemFrame extends Flowable{
-	use HorizontalFacingTrait;
+	use AnyFacingTrait;
 
 	public const ROTATIONS = 8;
 
@@ -49,16 +50,12 @@ class ItemFrame extends Flowable{
 	protected int $itemRotation = 0;
 	protected float $itemDropChance = 1.0;
 
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::write5MinusHorizontalFacing($this->facing) | ($this->hasMap ? BlockLegacyMetadata::ITEM_FRAME_FLAG_HAS_MAP : 0);
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->facing($this->facing);
+		$w->bool($this->hasMap);
 	}
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::read5MinusHorizontalFacing($stateMeta);
-		$this->hasMap = ($stateMeta & BlockLegacyMetadata::ITEM_FRAME_FLAG_HAS_MAP) !== 0;
-	}
-
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 		$tile = $this->position->getWorld()->getTile($this->position);
 		if($tile instanceof TileItemFrame){
@@ -69,6 +66,8 @@ class ItemFrame extends Flowable{
 			$this->itemRotation = $tile->getItemRotation() % self::ROTATIONS;
 			$this->itemDropChance = $tile->getItemDropChance();
 		}
+
+		return $this;
 	}
 
 	public function writeStateToWorld() : void{
@@ -81,10 +80,6 @@ class ItemFrame extends Flowable{
 		}
 	}
 
-	public function getStateBitmask() : int{
-		return 0b111;
-	}
-
 	public function getFramedItem() : ?Item{
 		return $this->framedItem !== null ? clone $this->framedItem : null;
 	}
@@ -136,7 +131,7 @@ class ItemFrame extends Flowable{
 		return $this;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($this->framedItem !== null){
 			$this->itemRotation = ($this->itemRotation + 1) % self::ROTATIONS;
 
@@ -159,7 +154,7 @@ class ItemFrame extends Flowable{
 			return false;
 		}
 		$world = $this->position->getWorld();
-		if(lcg_value() <= $this->itemDropChance){
+		if(Utils::getRandomFloat() <= $this->itemDropChance){
 			$world->dropItem($this->position->add(0.5, 0.5, 0.5), clone $this->framedItem);
 			$world->addSound($this->position, new ItemFrameRemoveItemSound());
 		}
@@ -168,14 +163,18 @@ class ItemFrame extends Flowable{
 		return true;
 	}
 
+	private function canBeSupportedAt(Block $block, int $face) : bool{
+		return $block->getAdjacentSupportType($face) !== SupportType::NONE;
+	}
+
 	public function onNearbyBlockChange() : void{
-		if(!$this->getSide(Facing::opposite($this->facing))->isSolid()){
+		if(!$this->canBeSupportedAt($this, Facing::opposite($this->facing))){
 			$this->position->getWorld()->useBreakOn($this->position);
 		}
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($face === Facing::DOWN || $face === Facing::UP || !$blockReplace->getSide(Facing::opposite($face))->isSolid()){
+		if(!$this->canBeSupportedAt($blockReplace, Facing::opposite($face))){
 			return false;
 		}
 
@@ -186,7 +185,7 @@ class ItemFrame extends Flowable{
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		$drops = parent::getDropsForCompatibleTool($item);
-		if($this->framedItem !== null && lcg_value() <= $this->itemDropChance){
+		if($this->framedItem !== null && Utils::getRandomFloat() <= $this->itemDropChance){
 			$drops[] = clone $this->framedItem;
 		}
 
diff --git a/src/block/Jukebox.php b/src/block/Jukebox.php
index b8cbf489b9..a61dd06dbe 100644
--- a/src/block/Jukebox.php
+++ b/src/block/Jukebox.php
@@ -26,7 +26,7 @@ namespace pocketmine\block;
 use pocketmine\block\tile\Jukebox as JukeboxTile;
 use pocketmine\item\Item;
 use pocketmine\item\Record;
-use pocketmine\lang\KnownTranslationKeys;
+use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
 use pocketmine\world\sound\RecordSound;
@@ -40,12 +40,12 @@ class Jukebox extends Opaque{
 		return 300;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($player instanceof Player){
 			if($this->record !== null){
 				$this->ejectRecord();
 			}elseif($item instanceof Record){
-				$player->sendJukeboxPopup(KnownTranslationKeys::RECORD_NOWPLAYING, [$player->getLanguage()->translate($item->getRecordType()->getTranslatableName())]);
+				$player->sendJukeboxPopup(KnownTranslationFactory::record_nowPlaying($item->getRecordType()->getTranslatableName()));
 				$this->insertRecord($item->pop());
 			}
 		}
@@ -61,7 +61,7 @@ class Jukebox extends Opaque{
 
 	public function ejectRecord() : void{
 		if($this->record !== null){
-			$this->getPosition()->getWorld()->dropItem($this->getPosition()->add(0.5, 1, 0.5), $this->record);
+			$this->position->getWorld()->dropItem($this->position->add(0.5, 1, 0.5), $this->record);
 			$this->record = null;
 			$this->stopSound();
 		}
@@ -76,17 +76,17 @@ class Jukebox extends Opaque{
 
 	public function startSound() : void{
 		if($this->record !== null){
-			$this->getPosition()->getWorld()->addSound($this->getPosition(), new RecordSound($this->record->getRecordType()));
+			$this->position->getWorld()->addSound($this->position, new RecordSound($this->record->getRecordType()));
 		}
 	}
 
 	public function stopSound() : void{
-		$this->getPosition()->getWorld()->addSound($this->getPosition(), new RecordStopSound());
+		$this->position->getWorld()->addSound($this->position, new RecordStopSound());
 	}
 
-	public function onBreak(Item $item, ?Player $player = null) : bool{
+	public function onBreak(Item $item, ?Player $player = null, array &$returnedItems = []) : bool{
 		$this->stopSound();
-		return parent::onBreak($item, $player);
+		return parent::onBreak($item, $player, $returnedItems);
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{
@@ -97,12 +97,14 @@ class Jukebox extends Opaque{
 		return $drops;
 	}
 
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 		$jukebox = $this->position->getWorld()->getTile($this->position);
 		if($jukebox instanceof JukeboxTile){
 			$this->record = $jukebox->getRecord();
 		}
+
+		return $this;
 	}
 
 	public function writeStateToWorld() : void{
diff --git a/src/block/Ladder.php b/src/block/Ladder.php
index ccedb33bdb..58f133f6ec 100644
--- a/src/block/Ladder.php
+++ b/src/block/Ladder.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\NormalHorizontalFacingInMetadataTrait;
+use pocketmine\block\utils\HorizontalFacingTrait;
 use pocketmine\block\utils\SupportType;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
@@ -36,7 +36,7 @@ use pocketmine\player\Player;
 use pocketmine\world\BlockTransaction;
 
 class Ladder extends Transparent{
-	use NormalHorizontalFacingInMetadataTrait;
+	use HorizontalFacingTrait;
 
 	public function hasEntityCollision() : bool{
 		return true;
@@ -66,11 +66,11 @@ class Ladder extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($this->canBeSupportedBy($blockReplace->getSide(Facing::opposite($face)), $face) && Facing::axis($face) !== Axis::Y){
+		if($this->canBeSupportedAt($blockReplace, Facing::opposite($face)) && Facing::axis($face) !== Axis::Y){
 			$this->facing = $face;
 			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 		}
@@ -79,12 +79,12 @@ class Ladder extends Transparent{
 	}
 
 	public function onNearbyBlockChange() : void{
-		if(!$this->canBeSupportedBy($this->getSide(Facing::opposite($this->facing)), $this->facing)){ //Replace with common break method
+		if(!$this->canBeSupportedAt($this, Facing::opposite($this->facing))){ //Replace with common break method
 			$this->position->getWorld()->useBreakOn($this->position);
 		}
 	}
 
-	private function canBeSupportedBy(Block $block, int $face) : bool{
-		return $block->getSupportType($face)->equals(SupportType::FULL());
+	private function canBeSupportedAt(Block $block, int $face) : bool{
+		return $block->getAdjacentSupportType($face) === SupportType::FULL;
 	}
 }
diff --git a/src/block/Lantern.php b/src/block/Lantern.php
index 0c2fb31efc..e9cbcc3fe9 100644
--- a/src/block/Lantern.php
+++ b/src/block/Lantern.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\Axis;
 use pocketmine\math\AxisAlignedBB;
@@ -33,19 +34,17 @@ use pocketmine\player\Player;
 use pocketmine\world\BlockTransaction;
 
 class Lantern extends Transparent{
+	private int $lightLevel; //readonly
 
 	protected bool $hanging = false;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->hanging = ($stateMeta & BlockLegacyMetadata::LANTERN_FLAG_HANGING) !== 0;
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockTypeInfo $typeInfo, int $lightLevel){
+		$this->lightLevel = $lightLevel;
+		parent::__construct($idInfo, $name, $typeInfo);
 	}
 
-	protected function writeStateToMeta() : int{
-		return $this->hanging ? BlockLegacyMetadata::LANTERN_FLAG_HANGING : 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->bool($this->hanging);
 	}
 
 	public function isHanging() : bool{ return $this->hanging; }
@@ -57,7 +56,7 @@ class Lantern extends Transparent{
 	}
 
 	public function getLightLevel() : int{
-		return 15;
+		return $this->lightLevel;
 	}
 
 	/**
@@ -74,26 +73,27 @@ class Lantern extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if(!$this->canBeSupportedBy($blockReplace->getSide(Facing::UP), Facing::DOWN) && !$this->canBeSupportedBy($blockReplace->getSide(Facing::DOWN), Facing::UP)){
+		$downSupport = $this->canBeSupportedAt($blockReplace, Facing::DOWN);
+		if(!$downSupport && !$this->canBeSupportedAt($blockReplace, Facing::UP)){
 			return false;
 		}
 
-		$this->hanging = ($face === Facing::DOWN || !$this->canBeSupportedBy($this->position->getWorld()->getBlock($blockReplace->getPosition()->down()), Facing::UP));
+		$this->hanging = $face === Facing::DOWN || !$downSupport;
 		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 	}
 
 	public function onNearbyBlockChange() : void{
 		$face = $this->hanging ? Facing::UP : Facing::DOWN;
-		if(!$this->canBeSupportedBy($this->getSide($face), Facing::opposite($face))){
+		if(!$this->canBeSupportedAt($this, $face)){
 			$this->position->getWorld()->useBreakOn($this->position);
 		}
 	}
 
-	private function canBeSupportedBy(Block $block, int $face) : bool{
-		return $block->getSupportType($face)->hasCenterSupport();
+	private function canBeSupportedAt(Block $block, int $face) : bool{
+		return $block->getAdjacentSupportType($face)->hasCenterSupport();
 	}
 }
diff --git a/src/block/LapisOre.php b/src/block/LapisOre.php
index 656b0a8951..ce54321a48 100644
--- a/src/block/LapisOre.php
+++ b/src/block/LapisOre.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\FortuneDropHelper;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
 use function mt_rand;
@@ -31,7 +32,7 @@ class LapisOre extends Opaque{
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			VanillaItems::LAPIS_LAZULI()->setCount(mt_rand(4, 8))
+			VanillaItems::LAPIS_LAZULI()->setCount(FortuneDropHelper::weighted($item, min: 4, maxBase: 9))
 		];
 	}
 
diff --git a/src/block/Lava.php b/src/block/Lava.php
index 0e94a4fc32..8c3bc179b7 100644
--- a/src/block/Lava.php
+++ b/src/block/Lava.php
@@ -54,31 +54,43 @@ class Lava extends Liquid{
 		return 2; //TODO: this is 1 in the nether
 	}
 
-	protected function checkForHarden() : bool{
-		if($this->falling){
-			return false;
-		}
-		$colliding = null;
+	/**
+	 * @phpstan-return \Generator<int, Block, void, void>
+	 */
+	private function getAdjacentBlocksExceptDown() : \Generator{
 		foreach(Facing::ALL as $side){
 			if($side === Facing::DOWN){
 				continue;
 			}
-			$blockSide = $this->getSide($side);
-			if($blockSide instanceof Water){
-				$colliding = $blockSide;
-				break;
+			yield $this->getSide($side);
+		}
+	}
+
+	protected function checkForHarden() : bool{
+		if($this->falling){
+			return false;
+		}
+		foreach($this->getAdjacentBlocksExceptDown() as $colliding){
+			if($colliding instanceof Water){
+				if($this->decay === 0){
+					$this->liquidCollide($colliding, VanillaBlocks::OBSIDIAN());
+					return true;
+				}elseif($this->decay <= 4){
+					$this->liquidCollide($colliding, VanillaBlocks::COBBLESTONE());
+					return true;
+				}
 			}
 		}
 
-		if($colliding !== null){
-			if($this->decay === 0){
-				$this->liquidCollide($colliding, VanillaBlocks::OBSIDIAN());
-				return true;
-			}elseif($this->decay <= 4){
-				$this->liquidCollide($colliding, VanillaBlocks::COBBLESTONE());
-				return true;
+		if($this->getSide(Facing::DOWN)->getTypeId() === BlockTypeIds::SOUL_SOIL){
+			foreach($this->getAdjacentBlocksExceptDown() as $colliding){
+				if($colliding->getTypeId() === BlockTypeIds::BLUE_ICE){
+					$this->liquidCollide($colliding, VanillaBlocks::BASALT());
+					return true;
+				}
 			}
 		}
+
 		return false;
 	}
 
diff --git a/src/block/LavaCauldron.php b/src/block/LavaCauldron.php
new file mode 100644
index 0000000000..3df903e228
--- /dev/null
+++ b/src/block/LavaCauldron.php
@@ -0,0 +1,88 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\tile\Cauldron as TileCauldron;
+use pocketmine\entity\Entity;
+use pocketmine\event\entity\EntityCombustByBlockEvent;
+use pocketmine\event\entity\EntityDamageByBlockEvent;
+use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\item\Item;
+use pocketmine\item\ItemTypeIds;
+use pocketmine\item\VanillaItems;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\sound\CauldronEmptyLavaSound;
+use pocketmine\world\sound\CauldronFillLavaSound;
+use pocketmine\world\sound\Sound;
+use function assert;
+
+final class LavaCauldron extends FillableCauldron{
+
+	public function writeStateToWorld() : void{
+		parent::writeStateToWorld();
+		$tile = $this->position->getWorld()->getTile($this->position);
+		assert($tile instanceof TileCauldron);
+
+		$tile->setCustomWaterColor(null);
+		$tile->setPotionItem(null);
+	}
+
+	public function getLightLevel() : int{
+		return 15;
+	}
+
+	public function getFillSound() : Sound{
+		return new CauldronFillLavaSound();
+	}
+
+	public function getEmptySound() : Sound{
+		return new CauldronEmptyLavaSound();
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		match($item->getTypeId()){
+			ItemTypeIds::BUCKET => $this->removeFillLevels(self::MAX_FILL_LEVEL, $item, VanillaItems::LAVA_BUCKET(), $returnedItems),
+			ItemTypeIds::POWDER_SNOW_BUCKET, ItemTypeIds::WATER_BUCKET => $this->mix($item, VanillaItems::BUCKET(), $returnedItems),
+			ItemTypeIds::LINGERING_POTION, ItemTypeIds::POTION, ItemTypeIds::SPLASH_POTION => $this->mix($item, VanillaItems::GLASS_BOTTLE(), $returnedItems),
+			default => null
+		};
+		return true;
+	}
+
+	public function hasEntityCollision() : bool{ return true; }
+
+	public function onEntityInside(Entity $entity) : bool{
+		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_LAVA, 4);
+		$entity->attack($ev);
+
+		$ev = new EntityCombustByBlockEvent($this, $entity, 8);
+		$ev->call();
+		if(!$ev->isCancelled()){
+			$entity->setOnFire($ev->getDuration());
+		}
+
+		return true;
+	}
+}
diff --git a/src/block/Leaves.php b/src/block/Leaves.php
index c845176e3b..7fe9eae74f 100644
--- a/src/block/Leaves.php
+++ b/src/block/Leaves.php
@@ -23,12 +23,12 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\FortuneDropHelper;
+use pocketmine\block\utils\LeavesType;
 use pocketmine\block\utils\SupportType;
-use pocketmine\block\utils\TreeType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\event\block\LeavesDecayEvent;
 use pocketmine\item\Item;
-use pocketmine\item\ItemFactory;
-use pocketmine\item\ItemIds;
 use pocketmine\item\VanillaItems;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
@@ -38,28 +38,23 @@ use pocketmine\world\World;
 use function mt_rand;
 
 class Leaves extends Transparent{
+	private const MAX_LOG_DISTANCE = 4;
 
-	protected TreeType $treeType;
+	protected LeavesType $leavesType; //immutable for now
 	protected bool $noDecay = false;
 	protected bool $checkDecay = false;
 
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo, TreeType $treeType){
-		parent::__construct($idInfo, $name, $breakInfo);
-		$this->treeType = $treeType;
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockTypeInfo $typeInfo, LeavesType $leavesType){
+		parent::__construct($idInfo, $name, $typeInfo);
+		$this->leavesType = $leavesType;
 	}
 
-	protected function writeStateToMeta() : int{
-		return ($this->noDecay ? BlockLegacyMetadata::LEAVES_FLAG_NO_DECAY : 0) | ($this->checkDecay ? BlockLegacyMetadata::LEAVES_FLAG_CHECK_DECAY : 0);
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->bool($this->noDecay);
+		$w->bool($this->checkDecay);
 	}
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->noDecay = ($stateMeta & BlockLegacyMetadata::LEAVES_FLAG_NO_DECAY) !== 0;
-		$this->checkDecay = ($stateMeta & BlockLegacyMetadata::LEAVES_FLAG_CHECK_DECAY) !== 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1100;
-	}
+	public function getLeavesType() : LeavesType{ return $this->leavesType; }
 
 	public function isNoDecay() : bool{ return $this->noDecay; }
 
@@ -98,7 +93,7 @@ class Leaves extends Transparent{
 			return true;
 		}
 
-		if($block->getId() === $this->getId() && $distance <= 4){
+		if($block instanceof Leaves && $distance <= self::MAX_LOG_DISTANCE){
 			foreach(Facing::ALL as $side){
 				if($this->findLog($pos->getSide($side), $visited, $distance + 1)){
 					return true;
@@ -117,15 +112,20 @@ class Leaves extends Transparent{
 	}
 
 	public function ticksRandomly() : bool{
-		return true;
+		return !$this->noDecay && $this->checkDecay;
 	}
 
 	public function onRandomTick() : void{
 		if(!$this->noDecay && $this->checkDecay){
-			$ev = new LeavesDecayEvent($this);
-			$ev->call();
+			$cancelled = false;
+			if(LeavesDecayEvent::hasHandlers()){
+				$ev = new LeavesDecayEvent($this);
+				$ev->call();
+				$cancelled = $ev->isCancelled();
+			}
+
 			$world = $this->position->getWorld();
-			if($ev->isCancelled() || $this->findLog($this->position)){
+			if($cancelled || $this->findLog($this->position)){
 				$this->checkDecay = false;
 				$world->setBlock($this->position, $this, false);
 			}else{
@@ -145,13 +145,30 @@ class Leaves extends Transparent{
 		}
 
 		$drops = [];
-		if(mt_rand(1, 20) === 1){ //Saplings
-			$drops[] = ItemFactory::getInstance()->get(ItemIds::SAPLING, $this->treeType->getMagicNumber());
+		if(FortuneDropHelper::bonusChanceDivisor($item, 20, 4)){ //Saplings
+			// TODO: according to the wiki, the jungle saplings have a different drop rate
+			$sapling = (match($this->leavesType){
+				LeavesType::ACACIA => VanillaBlocks::ACACIA_SAPLING(),
+				LeavesType::BIRCH => VanillaBlocks::BIRCH_SAPLING(),
+				LeavesType::DARK_OAK => VanillaBlocks::DARK_OAK_SAPLING(),
+				LeavesType::JUNGLE => VanillaBlocks::JUNGLE_SAPLING(),
+				LeavesType::OAK => VanillaBlocks::OAK_SAPLING(),
+				LeavesType::SPRUCE => VanillaBlocks::SPRUCE_SAPLING(),
+				LeavesType::MANGROVE, //TODO: mangrove propagule
+				LeavesType::AZALEA, LeavesType::FLOWERING_AZALEA => null, //TODO: azalea
+				LeavesType::CHERRY => null, //TODO: cherry
+			})?->asItem();
+			if($sapling !== null){
+				$drops[] = $sapling;
+			}
 		}
-		if(($this->treeType->equals(TreeType::OAK()) || $this->treeType->equals(TreeType::DARK_OAK())) && mt_rand(1, 200) === 1){ //Apples
+		if(
+			($this->leavesType === LeavesType::OAK || $this->leavesType === LeavesType::DARK_OAK) &&
+			FortuneDropHelper::bonusChanceDivisor($item, 200, 20)
+		){ //Apples
 			$drops[] = VanillaItems::APPLE();
 		}
-		if(mt_rand(1, 50) === 1){
+		if(FortuneDropHelper::bonusChanceDivisor($item, 50, 5)){
 			$drops[] = VanillaItems::STICK()->setCount(mt_rand(1, 2));
 		}
 
@@ -171,6 +188,6 @@ class Leaves extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 }
diff --git a/src/block/Lectern.php b/src/block/Lectern.php
index 1f339ad514..03880b3c5f 100644
--- a/src/block/Lectern.php
+++ b/src/block/Lectern.php
@@ -24,10 +24,9 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\tile\Lectern as TileLectern;
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\FacesOppositePlacingPlayerTrait;
-use pocketmine\block\utils\HorizontalFacingTrait;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\item\WritableBookBase;
 use pocketmine\math\AxisAlignedBB;
@@ -39,28 +38,26 @@ use function count;
 
 class Lectern extends Transparent{
 	use FacesOppositePlacingPlayerTrait;
-	use HorizontalFacingTrait;
 
 	protected int $viewedPage = 0;
 	protected ?WritableBookBase $book = null;
+
 	protected bool $producingSignal = false;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::readLegacyHorizontalFacing($stateMeta & 0x03);
-		$this->producingSignal = ($stateMeta & BlockLegacyMetadata::LECTERN_FLAG_POWERED) !== 0;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+		$w->bool($this->producingSignal);
 	}
 
-	public function writeStateToMeta() : int{
-		return BlockDataSerializer::writeLegacyHorizontalFacing($this->facing) | ($this->producingSignal ? BlockLegacyMetadata::LECTERN_FLAG_POWERED : 0);
-	}
-
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 		$tile = $this->position->getWorld()->getTile($this->position);
 		if($tile instanceof TileLectern){
 			$this->viewedPage = $tile->getViewedPage();
 			$this->book = $tile->getBook();
 		}
+
+		return $this;
 	}
 
 	public function writeStateToWorld() : void{
@@ -72,10 +69,6 @@ class Lectern extends Transparent{
 		}
 	}
 
-	public function getStateBitmask() : int{
-		return 0b111;
-	}
-
 	public function getFlammability() : int{
 		return 30;
 	}
@@ -94,7 +87,7 @@ class Lectern extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	public function isProducingSignal() : bool{ return $this->producingSignal; }
@@ -126,7 +119,7 @@ class Lectern extends Transparent{
 		return $this;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($this->book === null && $item instanceof WritableBookBase){
 			$world = $this->position->getWorld();
 			$world->setBlock($this->position, $this->setBook($item));
diff --git a/src/block/Lever.php b/src/block/Lever.php
index 01512007b3..d2b98efc34 100644
--- a/src/block/Lever.php
+++ b/src/block/Lever.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\LeverFacing;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
@@ -35,43 +36,12 @@ use pocketmine\world\sound\RedstonePowerOffSound;
 use pocketmine\world\sound\RedstonePowerOnSound;
 
 class Lever extends Flowable{
-	protected LeverFacing $facing;
+	protected LeverFacing $facing = LeverFacing::UP_AXIS_X;
 	protected bool $activated = false;
 
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->facing = LeverFacing::UP_AXIS_X();
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
-
-	protected function writeStateToMeta() : int{
-		$rotationMeta = match($this->facing->id()){
-			LeverFacing::DOWN_AXIS_X()->id() => 0,
-			LeverFacing::EAST()->id() => 1,
-			LeverFacing::WEST()->id() => 2,
-			LeverFacing::SOUTH()->id() => 3,
-			LeverFacing::NORTH()->id() => 4,
-			LeverFacing::UP_AXIS_Z()->id() => 5,
-			LeverFacing::UP_AXIS_X()->id() => 6,
-			LeverFacing::DOWN_AXIS_Z()->id() => 7,
-			default => throw new AssumptionFailedError(),
-		};
-		return $rotationMeta | ($this->activated ? BlockLegacyMetadata::LEVER_FLAG_POWERED : 0);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$rotationMeta = $stateMeta & 0x07;
-		$this->facing = match($rotationMeta){
-			0 => LeverFacing::DOWN_AXIS_X(),
-			1 => LeverFacing::EAST(),
-			2 => LeverFacing::WEST(),
-			3 => LeverFacing::SOUTH(),
-			4 => LeverFacing::NORTH(),
-			5 => LeverFacing::UP_AXIS_Z(),
-			6 => LeverFacing::UP_AXIS_X(),
-			7 => LeverFacing::DOWN_AXIS_Z(),
-		};
-
-		$this->activated = ($stateMeta & BlockLegacyMetadata::LEVER_FLAG_POWERED) !== 0;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->facing);
+		$w->bool($this->activated);
 	}
 
 	public function getFacing() : LeverFacing{ return $this->facing; }
@@ -90,12 +60,8 @@ class Lever extends Flowable{
 		return $this;
 	}
 
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if(!$this->canBeSupportedBy($blockReplace->getSide(Facing::opposite($face)), $face)){
+		if(!$this->canBeSupportedAt($blockReplace, Facing::opposite($face))){
 			return false;
 		}
 
@@ -106,12 +72,12 @@ class Lever extends Flowable{
 			return $x;
 		};
 		$this->facing = match($face){
-			Facing::DOWN => $selectUpDownPos(LeverFacing::DOWN_AXIS_X(), LeverFacing::DOWN_AXIS_Z()),
-			Facing::UP => $selectUpDownPos(LeverFacing::UP_AXIS_X(), LeverFacing::UP_AXIS_Z()),
-			Facing::NORTH => LeverFacing::NORTH(),
-			Facing::SOUTH => LeverFacing::SOUTH(),
-			Facing::WEST => LeverFacing::WEST(),
-			Facing::EAST => LeverFacing::EAST(),
+			Facing::DOWN => $selectUpDownPos(LeverFacing::DOWN_AXIS_X, LeverFacing::DOWN_AXIS_Z),
+			Facing::UP => $selectUpDownPos(LeverFacing::UP_AXIS_X, LeverFacing::UP_AXIS_Z),
+			Facing::NORTH => LeverFacing::NORTH,
+			Facing::SOUTH => LeverFacing::SOUTH,
+			Facing::WEST => LeverFacing::WEST,
+			Facing::EAST => LeverFacing::EAST,
 			default => throw new AssumptionFailedError("Bad facing value"),
 		};
 
@@ -119,13 +85,12 @@ class Lever extends Flowable{
 	}
 
 	public function onNearbyBlockChange() : void{
-		$facing = $this->facing->getFacing();
-		if(!$this->canBeSupportedBy($this->getSide(Facing::opposite($facing)), $facing)){
+		if(!$this->canBeSupportedAt($this, Facing::opposite($this->facing->getFacing()))){
 			$this->position->getWorld()->useBreakOn($this->position);
 		}
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		$this->activated = !$this->activated;
 		$world = $this->position->getWorld();
 		$world->setBlock($this->position, $this);
@@ -136,8 +101,8 @@ class Lever extends Flowable{
 		return true;
 	}
 
-	private function canBeSupportedBy(Block $block, int $face) : bool{
-		return $block->getSupportType($face)->hasCenterSupport();
+	private function canBeSupportedAt(Block $block, int $face) : bool{
+		return $block->getAdjacentSupportType($face)->hasCenterSupport();
 	}
 
 	//TODO
diff --git a/src/block/Light.php b/src/block/Light.php
new file mode 100644
index 0000000000..29a3a8dfca
--- /dev/null
+++ b/src/block/Light.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\item\Item;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+
+final class Light extends Flowable{
+	public const MIN_LIGHT_LEVEL = 0;
+	public const MAX_LIGHT_LEVEL = 15;
+
+	private int $level = self::MAX_LIGHT_LEVEL;
+
+	public function describeBlockItemState(RuntimeDataDescriber $w) : void{
+		$w->boundedIntAuto(self::MIN_LIGHT_LEVEL, self::MAX_LIGHT_LEVEL, $this->level);
+	}
+
+	public function getLightLevel() : int{ return $this->level; }
+
+	/** @return $this */
+	public function setLightLevel(int $level) : self{
+		if($level < self::MIN_LIGHT_LEVEL || $level > self::MAX_LIGHT_LEVEL){
+			throw new \InvalidArgumentException("Light level must be in the range " . self::MIN_LIGHT_LEVEL . " ... " . self::MAX_LIGHT_LEVEL);
+		}
+		$this->level = $level;
+		return $this;
+	}
+
+	public function canBeReplaced() : bool{ return true; }
+
+	public function canBePlacedAt(Block $blockReplace, Vector3 $clickVector, int $face, bool $isClickedBlock) : bool{
+		//light blocks behave like solid blocks when placing them on another light block
+		return $blockReplace->canBeReplaced() && $blockReplace->getTypeId() !== $this->getTypeId();
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		$this->level = $this->level === self::MAX_LIGHT_LEVEL ?
+			self::MIN_LIGHT_LEVEL :
+			$this->level + 1;
+
+		$this->position->getWorld()->setBlock($this->position, $this);
+
+		return true;
+	}
+}
diff --git a/src/block/LightningRod.php b/src/block/LightningRod.php
new file mode 100644
index 0000000000..a0dd50542c
--- /dev/null
+++ b/src/block/LightningRod.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\AnyFacingTrait;
+use pocketmine\item\Item;
+use pocketmine\math\Axis;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\BlockTransaction;
+
+final class LightningRod extends Transparent{
+	use AnyFacingTrait;
+
+	protected function recalculateCollisionBoxes() : array{
+		$myAxis = Facing::axis($this->facing);
+
+		$result = AxisAlignedBB::one();
+		foreach([Axis::X, Axis::Y, Axis::Z] as $axis){
+			if($axis !== $myAxis){
+				$result->squash($axis, 6 / 16);
+			}
+		}
+
+		return [$result];
+	}
+
+	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+		$this->facing = $face;
+		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+	}
+}
diff --git a/src/block/Liquid.php b/src/block/Liquid.php
index 10feaeecfb..a37019d650 100644
--- a/src/block/Liquid.php
+++ b/src/block/Liquid.php
@@ -23,25 +23,23 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
+use pocketmine\block\utils\BlockEventHelper;
 use pocketmine\block\utils\MinimumCostFlowCalculator;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\entity\Entity;
-use pocketmine\event\block\BlockFormEvent;
 use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
+use pocketmine\utils\Utils;
 use pocketmine\world\sound\FizzSound;
 use pocketmine\world\sound\Sound;
-use function lcg_value;
 
 abstract class Liquid extends Transparent{
 	public const MAX_DECAY = 7;
 
-	protected BlockIdentifierFlattened $idInfoFlattened;
-
 	public int $adjacentSources = 0;
 
 	protected ?Vector3 $flowVector = null;
@@ -50,27 +48,10 @@ abstract class Liquid extends Transparent{
 	protected int $decay = 0; //PC "level" property
 	protected bool $still = false;
 
-	public function __construct(BlockIdentifierFlattened $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->idInfoFlattened = $idInfo;
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
-
-	public function getId() : int{
-		return $this->still ? $this->idInfoFlattened->getSecondId() : parent::getId();
-	}
-
-	protected function writeStateToMeta() : int{
-		return $this->decay | ($this->falling ? BlockLegacyMetadata::LIQUID_FLAG_FALLING : 0);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->decay = BlockDataSerializer::readBoundedInt("decay", $stateMeta & 0x07, 0, self::MAX_DECAY);
-		$this->falling = ($stateMeta & BlockLegacyMetadata::LIQUID_FLAG_FALLING) !== 0;
-		$this->still = $id === $this->idInfoFlattened->getSecondId();
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->boundedIntAuto(0, self::MAX_DECAY, $this->decay);
+		$w->bool($this->falling);
+		$w->bool($this->still);
 	}
 
 	public function isFalling() : bool{ return $this->falling; }
@@ -116,7 +97,7 @@ abstract class Liquid extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{
@@ -163,16 +144,18 @@ abstract class Liquid extends Transparent{
 	}
 
 	protected function getEffectiveFlowDecay(Block $block) : int{
-		if(!($block instanceof Liquid) || !$block->isSameType($this)){
+		if(!($block instanceof Liquid) || !$block->hasSameTypeId($this)){
 			return -1;
 		}
 
 		return $block->falling ? 0 : $block->decay;
 	}
 
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 		$this->flowVector = null;
+
+		return $this;
 	}
 
 	public function getFlowVector() : Vector3{
@@ -182,23 +165,22 @@ abstract class Liquid extends Transparent{
 
 		$vX = $vY = $vZ = 0;
 
+		$x = $this->position->getFloorX();
+		$y = $this->position->getFloorY();
+		$z = $this->position->getFloorZ();
+
 		$decay = $this->getEffectiveFlowDecay($this);
 
 		$world = $this->position->getWorld();
 
 		foreach(Facing::HORIZONTAL as $j){
-			$x = $this->position->x;
-			$y = $this->position->y;
-			$z = $this->position->z;
+			[$dx, $dy, $dz] = Facing::OFFSET[$j];
 
-			match($j){
-				Facing::WEST => --$x,
-				Facing::EAST => ++$x,
-				Facing::NORTH => --$z,
-				Facing::SOUTH => ++$z
-			};
+			$sideX = $x + $dx;
+			$sideY = $y + $dy;
+			$sideZ = $z + $dz;
 
-			$sideBlock = $world->getBlockAt($x, $y, $z);
+			$sideBlock = $world->getBlockAt($sideX, $sideY, $sideZ);
 			$blockDecay = $this->getEffectiveFlowDecay($sideBlock);
 
 			if($blockDecay < 0){
@@ -206,21 +188,21 @@ abstract class Liquid extends Transparent{
 					continue;
 				}
 
-				$blockDecay = $this->getEffectiveFlowDecay($world->getBlockAt($x, $y - 1, $z));
+				$blockDecay = $this->getEffectiveFlowDecay($world->getBlockAt($sideX, $sideY - 1, $sideZ));
 
 				if($blockDecay >= 0){
 					$realDecay = $blockDecay - ($decay - 8);
-					$vX += ($x - $this->position->x) * $realDecay;
-					$vY += ($y - $this->position->y) * $realDecay;
-					$vZ += ($z - $this->position->z) * $realDecay;
+					$vX += $dx * $realDecay;
+					$vY += $dy * $realDecay;
+					$vZ += $dz * $realDecay;
 				}
 
 				continue;
 			}else{
 				$realDecay = $blockDecay - $decay;
-				$vX += ($x - $this->position->x) * $realDecay;
-				$vY += ($y - $this->position->y) * $realDecay;
-				$vZ += ($z - $this->position->z) * $realDecay;
+				$vX += $dx * $realDecay;
+				$vY += $dy * $realDecay;
+				$vZ += $dz * $realDecay;
 			}
 		}
 
@@ -228,10 +210,10 @@ abstract class Liquid extends Transparent{
 
 		if($this->falling){
 			foreach(Facing::HORIZONTAL as $facing){
-				$pos = $this->position->getSide($facing);
+				[$dx, $dy, $dz] = Facing::OFFSET[$facing];
 				if(
-					!$this->canFlowInto($world->getBlockAt($pos->x, $pos->y, $pos->z)) ||
-					!$this->canFlowInto($world->getBlockAt($pos->x, $pos->y + 1, $pos->z))
+					!$this->canFlowInto($world->getBlockAt($x + $dx, $y + $dy, $z + $dz)) ||
+					!$this->canFlowInto($world->getBlockAt($x + $dx, $y + $dy + 1, $z + $dz))
 				){
 					$vector = $vector->normalize()->add(0, -6, 0);
 					break;
@@ -277,13 +259,17 @@ abstract class Liquid extends Transparent{
 
 		$world = $this->position->getWorld();
 
+		$x = $this->position->getFloorX();
+		$y = $this->position->getFloorY();
+		$z = $this->position->getFloorZ();
+
 		if(!$this->isSource()){
 			$smallestFlowDecay = -100;
 			$this->adjacentSources = 0;
-			$smallestFlowDecay = $this->getSmallestFlowDecay($world->getBlockAt($this->position->x, $this->position->y, $this->position->z - 1), $smallestFlowDecay);
-			$smallestFlowDecay = $this->getSmallestFlowDecay($world->getBlockAt($this->position->x, $this->position->y, $this->position->z + 1), $smallestFlowDecay);
-			$smallestFlowDecay = $this->getSmallestFlowDecay($world->getBlockAt($this->position->x - 1, $this->position->y, $this->position->z), $smallestFlowDecay);
-			$smallestFlowDecay = $this->getSmallestFlowDecay($world->getBlockAt($this->position->x + 1, $this->position->y, $this->position->z), $smallestFlowDecay);
+			$smallestFlowDecay = $this->getSmallestFlowDecay($world->getBlockAt($x, $y, $z - 1), $smallestFlowDecay);
+			$smallestFlowDecay = $this->getSmallestFlowDecay($world->getBlockAt($x, $y, $z + 1), $smallestFlowDecay);
+			$smallestFlowDecay = $this->getSmallestFlowDecay($world->getBlockAt($x - 1, $y, $z), $smallestFlowDecay);
+			$smallestFlowDecay = $this->getSmallestFlowDecay($world->getBlockAt($x + 1, $y, $z), $smallestFlowDecay);
 
 			$newDecay = $smallestFlowDecay + $multiplier;
 			$falling = false;
@@ -292,14 +278,14 @@ abstract class Liquid extends Transparent{
 				$newDecay = -1;
 			}
 
-			if($this->getEffectiveFlowDecay($world->getBlockAt($this->position->x, $this->position->y + 1, $this->position->z)) >= 0){
+			if($this->getEffectiveFlowDecay($world->getBlockAt($x, $y + 1, $z)) >= 0){
 				$falling = true;
 			}
 
 			$minAdjacentSources = $this->getMinAdjacentSourcesToFormSource();
 			if($minAdjacentSources !== null && $this->adjacentSources >= $minAdjacentSources){
-				$bottomBlock = $world->getBlockAt($this->position->x, $this->position->y - 1, $this->position->z);
-				if($bottomBlock->isSolid() || ($bottomBlock instanceof Liquid && $bottomBlock->isSameType($this) && $bottomBlock->isSource())){
+				$bottomBlock = $world->getBlockAt($x, $y - 1, $z);
+				if($bottomBlock->isSolid() || ($bottomBlock instanceof Liquid && $bottomBlock->hasSameTypeId($this) && $bottomBlock->isSource())){
 					$newDecay = 0;
 					$falling = false;
 				}
@@ -307,17 +293,17 @@ abstract class Liquid extends Transparent{
 
 			if($falling !== $this->falling || (!$falling && $newDecay !== $this->decay)){
 				if(!$falling && $newDecay < 0){
-					$world->setBlock($this->position, VanillaBlocks::AIR());
+					$world->setBlockAt($x, $y, $z, VanillaBlocks::AIR());
 					return;
 				}
 
 				$this->falling = $falling;
 				$this->decay = $falling ? 0 : $newDecay;
-				$world->setBlock($this->position, $this); //local block update will cause an update to be scheduled
+				$world->setBlockAt($x, $y, $z, $this); //local block update will cause an update to be scheduled
 			}
 		}
 
-		$bottomBlock = $world->getBlockAt($this->position->x, $this->position->y - 1, $this->position->z);
+		$bottomBlock = $world->getBlockAt($x, $y - 1, $z);
 
 		$this->flowIntoBlock($bottomBlock, 0, true);
 
@@ -329,9 +315,10 @@ abstract class Liquid extends Transparent{
 			}
 
 			if($adjacentDecay <= self::MAX_DECAY){
-				$calculator = new MinimumCostFlowCalculator($world, $this->getFlowDecayPerBlock(), \Closure::fromCallable([$this, 'canFlowInto']));
-				foreach($calculator->getOptimalFlowDirections($this->position->getFloorX(), $this->position->getFloorY(), $this->position->getFloorZ()) as $facing){
-					$this->flowIntoBlock($world->getBlock($this->position->getSide($facing)), $adjacentDecay, false);
+				$calculator = new MinimumCostFlowCalculator($world, $this->getFlowDecayPerBlock(), $this->canFlowInto(...));
+				foreach($calculator->getOptimalFlowDirections($x, $y, $z) as $facing){
+					[$dx, $dy, $dz] = Facing::OFFSET[$facing];
+					$this->flowIntoBlock($world->getBlockAt($x + $dx, $y + $dy, $z + $dz), $adjacentDecay, false);
 				}
 			}
 		}
@@ -349,7 +336,7 @@ abstract class Liquid extends Transparent{
 			$ev->call();
 			if(!$ev->isCancelled()){
 				$world = $this->position->getWorld();
-				if($block->getId() !== BlockLegacyIds::AIR){
+				if($block->getTypeId() !== BlockTypeIds::AIR){
 					$world->useBreakOn($block->position);
 				}
 
@@ -360,7 +347,7 @@ abstract class Liquid extends Transparent{
 
 	/** @phpstan-impure */
 	private function getSmallestFlowDecay(Block $block, int $decay) : int{
-		if(!($block instanceof Liquid) || !$block->isSameType($this)){
+		if(!($block instanceof Liquid) || !$block->hasSameTypeId($this)){
 			return $decay;
 		}
 
@@ -380,12 +367,8 @@ abstract class Liquid extends Transparent{
 	}
 
 	protected function liquidCollide(Block $cause, Block $result) : bool{
-		$ev = new BlockFormEvent($this, $result);
-		$ev->call();
-		if(!$ev->isCancelled()){
-			$world = $this->position->getWorld();
-			$world->setBlock($this->position, $ev->getNewState());
-			$world->addSound($this->position->add(0.5, 0.5, 0.5), new FizzSound(2.6 + (lcg_value() - lcg_value()) * 0.8));
+		if(BlockEventHelper::form($this, $result, $cause)){
+			$this->position->getWorld()->addSound($this->position->add(0.5, 0.5, 0.5), new FizzSound(2.6 + (Utils::getRandomFloat() - Utils::getRandomFloat()) * 0.8));
 		}
 		return true;
 	}
diff --git a/src/block/Loom.php b/src/block/Loom.php
index 9c5f830f74..d3dd4f3c76 100644
--- a/src/block/Loom.php
+++ b/src/block/Loom.php
@@ -24,30 +24,15 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\inventory\LoomInventory;
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\FacesOppositePlacingPlayerTrait;
-use pocketmine\block\utils\HorizontalFacingTrait;
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
 
 final class Loom extends Opaque{
 	use FacesOppositePlacingPlayerTrait;
-	use HorizontalFacingTrait;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::readLegacyHorizontalFacing($stateMeta & 0x3);
-	}
-
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::writeLegacyHorizontalFacing($this->facing);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b11;
-	}
-
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($player !== null){
 			$player->setCurrentWindow(new LoomInventory($this->position));
 			return true;
diff --git a/src/block/MangroveRoots.php b/src/block/MangroveRoots.php
new file mode 100644
index 0000000000..c9bc49a3bd
--- /dev/null
+++ b/src/block/MangroveRoots.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+final class MangroveRoots extends Transparent{
+
+	public function getFlammability() : int{ return 5; }
+
+	public function getFlameEncouragement() : int{ return 5; }
+}
diff --git a/src/block/Melon.php b/src/block/Melon.php
index 42d54c0ab2..4a32332e11 100644
--- a/src/block/Melon.php
+++ b/src/block/Melon.php
@@ -23,15 +23,16 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\FortuneDropHelper;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
-use function mt_rand;
+use function min;
 
 class Melon extends Opaque{
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			VanillaItems::MELON()->setCount(mt_rand(3, 7))
+			VanillaItems::MELON()->setCount(min(9, FortuneDropHelper::discrete($item, 3, 7)))
 		];
 	}
 
diff --git a/src/block/MelonStem.php b/src/block/MelonStem.php
index d0282a546d..8ead526afa 100644
--- a/src/block/MelonStem.php
+++ b/src/block/MelonStem.php
@@ -23,9 +23,16 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+
 class MelonStem extends Stem{
 
 	protected function getPlant() : Block{
 		return VanillaBlocks::MELON();
 	}
+
+	public function asItem() : Item{
+		return VanillaItems::MELON_SEEDS();
+	}
 }
diff --git a/src/block/Skull.php b/src/block/MobHead.php
similarity index 59%
rename from src/block/Skull.php
rename to src/block/MobHead.php
index b96a29850f..f4e945841d 100644
--- a/src/block/Skull.php
+++ b/src/block/MobHead.php
@@ -23,9 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\tile\Skull as TileSkull;
-use pocketmine\block\utils\BlockDataSerializer;
-use pocketmine\block\utils\SkullType;
+use pocketmine\block\tile\MobHead as TileMobHead;
+use pocketmine\block\utils\MobHeadType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
@@ -35,61 +35,50 @@ use pocketmine\world\BlockTransaction;
 use function assert;
 use function floor;
 
-class Skull extends Flowable{
+class MobHead extends Flowable{
 	public const MIN_ROTATION = 0;
 	public const MAX_ROTATION = 15;
 
-	protected SkullType $skullType;
+	protected MobHeadType $mobHeadType = MobHeadType::SKELETON;
 
 	protected int $facing = Facing::NORTH;
-	protected bool $noDrops = false;
 	protected int $rotation = self::MIN_ROTATION; //TODO: split this into floor skull and wall skull handling
 
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->skullType = SkullType::SKELETON(); //TODO: this should be a parameter
-		parent::__construct($idInfo, $name, $breakInfo);
+	public function describeBlockItemState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->mobHeadType);
 	}
 
-	protected function writeStateToMeta() : int{
-		return ($this->facing === Facing::UP ? 1 : BlockDataSerializer::writeHorizontalFacing($this->facing)) |
-			($this->noDrops ? BlockLegacyMetadata::SKULL_FLAG_NO_DROPS : 0);
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->facingExcept($this->facing, Facing::DOWN);
 	}
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$facingMeta = $stateMeta & 0x7;
-		$this->facing = $facingMeta === 1 ? Facing::UP : BlockDataSerializer::readHorizontalFacing($facingMeta);
-		$this->noDrops = ($stateMeta & BlockLegacyMetadata::SKULL_FLAG_NO_DROPS) !== 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 		$tile = $this->position->getWorld()->getTile($this->position);
-		if($tile instanceof TileSkull){
-			$this->skullType = $tile->getSkullType();
+		if($tile instanceof TileMobHead){
+			$this->mobHeadType = $tile->getMobHeadType();
 			$this->rotation = $tile->getRotation();
 		}
+
+		return $this;
 	}
 
 	public function writeStateToWorld() : void{
 		parent::writeStateToWorld();
 		//extra block properties storage hack
 		$tile = $this->position->getWorld()->getTile($this->position);
-		assert($tile instanceof TileSkull);
+		assert($tile instanceof TileMobHead);
 		$tile->setRotation($this->rotation);
-		$tile->setSkullType($this->skullType);
+		$tile->setMobHeadType($this->mobHeadType);
 	}
 
-	public function getSkullType() : SkullType{
-		return $this->skullType;
+	public function getMobHeadType() : MobHeadType{
+		return $this->mobHeadType;
 	}
 
 	/** @return $this */
-	public function setSkullType(SkullType $skullType) : self{
-		$this->skullType = $skullType;
+	public function setMobHeadType(MobHeadType $mobHeadType) : self{
+		$this->mobHeadType = $mobHeadType;
 		return $this;
 	}
 
@@ -115,26 +104,19 @@ class Skull extends Flowable{
 		return $this;
 	}
 
-	public function isNoDrops() : bool{ return $this->noDrops; }
-
-	/** @return $this */
-	public function setNoDrops(bool $noDrops) : self{
-		$this->noDrops = $noDrops;
-		return $this;
-	}
-
 	/**
 	 * @return AxisAlignedBB[]
 	 */
 	protected function recalculateCollisionBoxes() : array{
-		$collisionBox = AxisAlignedBB::one()->contract(0.25, 0, 0.25)->trim(Facing::UP, 0.5);
-		return match($this->facing){
-			Facing::NORTH => [$collisionBox->offset(0, 0.25, 0.25)],
-			Facing::SOUTH => [$collisionBox->offset(0, 0.25, -0.25)],
-			Facing::WEST => [$collisionBox->offset(0.25, 0.25, 0)],
-			Facing::EAST => [$collisionBox->offset(-0.25, 0.25, 0)],
-			default => [$collisionBox]
-		};
+		$collisionBox = AxisAlignedBB::one()
+			->contract(0.25, 0, 0.25)
+			->trim(Facing::UP, 0.5);
+		if($this->facing !== Facing::UP){
+			$collisionBox = $collisionBox
+				->offsetTowards(Facing::opposite($this->facing), 0.25)
+				->offsetTowards(Facing::UP, 0.25);
+		}
+		return [$collisionBox];
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
@@ -148,8 +130,4 @@ class Skull extends Flowable{
 		}
 		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 	}
-
-	protected function writeStateToItemMeta() : int{
-		return $this->skullType->getMagicNumber();
-	}
 }
diff --git a/src/block/MonsterSpawner.php b/src/block/MonsterSpawner.php
index 129da33946..5cbe80e0a8 100644
--- a/src/block/MonsterSpawner.php
+++ b/src/block/MonsterSpawner.php
@@ -42,6 +42,6 @@ class MonsterSpawner extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 }
diff --git a/src/block/Mycelium.php b/src/block/Mycelium.php
index f7e989c45a..05b63d9bff 100644
--- a/src/block/Mycelium.php
+++ b/src/block/Mycelium.php
@@ -23,7 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\event\block\BlockSpreadEvent;
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\block\utils\DirtType;
 use pocketmine\item\Item;
 use pocketmine\math\Facing;
 use function mt_rand;
@@ -51,13 +52,9 @@ class Mycelium extends Opaque{
 		$z = mt_rand($this->position->z - 1, $this->position->z + 1);
 		$world = $this->position->getWorld();
 		$block = $world->getBlockAt($x, $y, $z);
-		if($block instanceof Dirt && !$block->isCoarse()){
+		if($block instanceof Dirt && $block->getDirtType() === DirtType::NORMAL){
 			if($block->getSide(Facing::UP) instanceof Transparent){
-				$ev = new BlockSpreadEvent($block, $this, VanillaBlocks::MYCELIUM());
-				$ev->call();
-				if(!$ev->isCancelled()){
-					$world->setBlock($block->position, $ev->getNewState());
-				}
+				BlockEventHelper::spread($block, VanillaBlocks::MYCELIUM(), $this);
 			}
 		}
 	}
diff --git a/src/block/NetherGoldOre.php b/src/block/NetherGoldOre.php
new file mode 100644
index 0000000000..fd6745df43
--- /dev/null
+++ b/src/block/NetherGoldOre.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\FortuneDropHelper;
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+
+final class NetherGoldOre extends Opaque{
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [VanillaItems::GOLD_NUGGET()->setCount(FortuneDropHelper::weighted($item, min: 2, maxBase: 6))];
+	}
+
+	public function isAffectedBySilkTouch() : bool{ return true; }
+}
diff --git a/src/block/NetherPortal.php b/src/block/NetherPortal.php
index 398b4c4681..6a45fb7a0a 100644
--- a/src/block/NetherPortal.php
+++ b/src/block/NetherPortal.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
 use pocketmine\math\Axis;
@@ -33,16 +34,8 @@ class NetherPortal extends Transparent{
 
 	protected int $axis = Axis::X;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->axis = $stateMeta === BlockLegacyMetadata::NETHER_PORTAL_AXIS_Z ? Axis::Z : Axis::X; //mojang u dumb
-	}
-
-	protected function writeStateToMeta() : int{
-		return $this->axis === Axis::Z ? BlockLegacyMetadata::NETHER_PORTAL_AXIS_Z : BlockLegacyMetadata::NETHER_PORTAL_AXIS_X;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b11;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalAxis($this->axis);
 	}
 
 	public function getAxis() : int{
@@ -77,7 +70,7 @@ class NetherPortal extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	public function getDrops(Item $item) : array{
diff --git a/src/block/NetherQuartzOre.php b/src/block/NetherQuartzOre.php
index c2ab20491b..0981974ee7 100644
--- a/src/block/NetherQuartzOre.php
+++ b/src/block/NetherQuartzOre.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\FortuneDropHelper;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
 use function mt_rand;
@@ -31,7 +32,7 @@ class NetherQuartzOre extends Opaque{
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			VanillaItems::NETHER_QUARTZ()
+			VanillaItems::NETHER_QUARTZ()->setCount(FortuneDropHelper::weighted($item, min: 1, maxBase: 1))
 		];
 	}
 
diff --git a/src/block/NetherReactor.php b/src/block/NetherReactor.php
index 2c1ee1eb67..5158978d85 100644
--- a/src/block/NetherReactor.php
+++ b/src/block/NetherReactor.php
@@ -23,26 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
 
 class NetherReactor extends Opaque{
 
-	protected int $state = BlockLegacyMetadata::NETHER_REACTOR_INACTIVE;
-
-	protected function writeStateToMeta() : int{
-		return $this->state;
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->state = BlockDataSerializer::readBoundedInt("state", $stateMeta, 0, 2);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b11;
-	}
-
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
 			VanillaItems::IRON_INGOT()->setCount(6),
diff --git a/src/block/NetherRoots.php b/src/block/NetherRoots.php
new file mode 100644
index 0000000000..0b08d1b180
--- /dev/null
+++ b/src/block/NetherRoots.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\math\Facing;
+
+final class NetherRoots extends Flowable{
+	use StaticSupportTrait;
+
+	private function canBeSupportedAt(Block $block) : bool{
+		//TODO: nylium, moss
+		$supportBlock = $block->getSide(Facing::DOWN);
+		return
+			$supportBlock->hasTypeTag(BlockTypeTags::DIRT) ||
+			$supportBlock->hasTypeTag(BlockTypeTags::MUD) ||
+			$supportBlock->getTypeId() === BlockTypeIds::SOUL_SOIL;
+	}
+}
diff --git a/src/block/NetherVines.php b/src/block/NetherVines.php
new file mode 100644
index 0000000000..e8729c00f0
--- /dev/null
+++ b/src/block/NetherVines.php
@@ -0,0 +1,164 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\AgeableTrait;
+use pocketmine\block\utils\FortuneDropHelper;
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\block\utils\SupportType;
+use pocketmine\entity\Entity;
+use pocketmine\event\block\StructureGrowEvent;
+use pocketmine\item\Fertilizer;
+use pocketmine\item\Item;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\BlockTransaction;
+use function min;
+use function mt_rand;
+
+/**
+ * This class is used for Weeping & Twisting vines, because they have same behaviour
+ */
+class NetherVines extends Flowable{
+	use AgeableTrait;
+	use StaticSupportTrait;
+
+	public const MAX_AGE = 25;
+
+	/** Direction the vine grows towards. */
+	private int $growthFace;
+
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockTypeInfo $typeInfo, int $growthFace){
+		$this->growthFace = $growthFace;
+		parent::__construct($idInfo, $name, $typeInfo);
+	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return true;
+	}
+
+	public function canClimb() : bool{
+		return true;
+	}
+
+	private function canBeSupportedAt(Block $block) : bool{
+		$supportBlock = $block->getSide(Facing::opposite($this->growthFace));
+		return $supportBlock->getSupportType($this->growthFace)->hasCenterSupport() || $supportBlock->hasSameTypeId($this);
+	}
+
+	/**
+	 * Returns the block at the end of the vine structure furthest from the supporting block.
+	 */
+	private function seekToTip() : NetherVines{
+		$top = $this;
+		while(($next = $top->getSide($this->growthFace)) instanceof NetherVines && $next->hasSameTypeId($this)){
+			$top = $next;
+		}
+		return $top;
+	}
+
+	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+		$this->age = mt_rand(0, self::MAX_AGE - 1);
+		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($item instanceof Fertilizer){
+			if($this->grow($player, mt_rand(1, 5))){
+				$item->pop();
+			}
+			return true;
+		}
+		return false;
+	}
+
+	public function ticksRandomly() : bool{
+		return $this->age < self::MAX_AGE;
+	}
+
+	public function onRandomTick() : void{
+		if($this->age < self::MAX_AGE && mt_rand(1, 10) === 1){
+			if($this->getSide($this->growthFace)->canBeReplaced()){
+				$this->grow(null);
+			}
+		}
+	}
+
+	private function grow(?Player $player, int $growthAmount = 1) : bool{
+		$top = $this->seekToTip();
+		$age = $top->age;
+		$pos = $top->position;
+		$world = $pos->getWorld();
+		$changedBlocks = 0;
+
+		$tx = new BlockTransaction($world);
+
+		for($i = 1; $i <= $growthAmount; $i++){
+			$growthPos = $pos->getSide($this->growthFace, $i);
+			if(!$world->isInWorld($growthPos->getFloorX(), $growthPos->getFloorY(), $growthPos->getFloorZ()) || !$world->getBlock($growthPos)->canBeReplaced()){
+				break;
+			}
+			$tx->addBlock($growthPos, (clone $top)->setAge(min(++$age, self::MAX_AGE)));
+			$changedBlocks++;
+		}
+
+		if($changedBlocks > 0){
+			$ev = new StructureGrowEvent($top, $tx, $player);
+			$ev->call();
+
+			if($ev->isCancelled()){
+				return false;
+			}
+
+			return $tx->apply();
+		}
+
+		return false;
+	}
+
+	public function hasEntityCollision() : bool{
+		return true;
+	}
+
+	public function onEntityInside(Entity $entity) : bool{
+		$entity->resetFallDistance();
+		return false;
+	}
+
+	protected function recalculateCollisionBoxes() : array{
+		return [];
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		if(($item->getBlockToolType() & BlockToolType::SHEARS) !== 0 || FortuneDropHelper::bonusChanceFixed($item, 1 / 3, 2 / 9)){
+			return [$this->asItem()];
+		}
+		return [];
+	}
+
+	public function getSupportType(int $facing) : SupportType{
+		return SupportType::NONE;
+	}
+}
diff --git a/src/block/NetherWartPlant.php b/src/block/NetherWartPlant.php
index 32478cae64..34e6fd57ec 100644
--- a/src/block/NetherWartPlant.php
+++ b/src/block/NetherWartPlant.php
@@ -23,77 +23,39 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
-use pocketmine\event\block\BlockGrowEvent;
+use pocketmine\block\utils\AgeableTrait;
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\block\utils\FortuneDropHelper;
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\item\Item;
 use pocketmine\math\Facing;
-use pocketmine\math\Vector3;
-use pocketmine\player\Player;
-use pocketmine\world\BlockTransaction;
 use function mt_rand;
 
 class NetherWartPlant extends Flowable{
+	use AgeableTrait;
+	use StaticSupportTrait;
+
 	public const MAX_AGE = 3;
 
-	protected int $age = 0;
-
-	protected function writeStateToMeta() : int{
-		return $this->age;
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->age = BlockDataSerializer::readBoundedInt("age", $stateMeta, 0, self::MAX_AGE);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b11;
-	}
-
-	public function getAge() : int{ return $this->age; }
-
-	/** @return $this */
-	public function setAge(int $age) : self{
-		if($age < 0 || $age > self::MAX_AGE){
-			throw new \InvalidArgumentException("Age must be in range 0 ..." . self::MAX_AGE);
-		}
-		$this->age = $age;
-		return $this;
-	}
-
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		$down = $this->getSide(Facing::DOWN);
-		if($down->getId() === BlockLegacyIds::SOUL_SAND){
-			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-		}
-
-		return false;
-	}
-
-	public function onNearbyBlockChange() : void{
-		if($this->getSide(Facing::DOWN)->getId() !== BlockLegacyIds::SOUL_SAND){
-			$this->position->getWorld()->useBreakOn($this->position);
-		}
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getSide(Facing::DOWN)->getTypeId() === BlockTypeIds::SOUL_SAND;
 	}
 
 	public function ticksRandomly() : bool{
-		return true;
+		return $this->age < self::MAX_AGE;
 	}
 
 	public function onRandomTick() : void{
 		if($this->age < self::MAX_AGE && mt_rand(0, 10) === 0){ //Still growing
 			$block = clone $this;
 			$block->age++;
-			$ev = new BlockGrowEvent($this, $block);
-			$ev->call();
-			if(!$ev->isCancelled()){
-				$this->position->getWorld()->setBlock($this->position, $ev->getNewState());
-			}
+			BlockEventHelper::grow($this, $block, null);
 		}
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			$this->asItem()->setCount($this->age === self::MAX_AGE ? mt_rand(2, 4) : 1)
+			$this->asItem()->setCount($this->age === self::MAX_AGE ? FortuneDropHelper::discrete($item, 2, 4) : 1)
 		];
 	}
 }
diff --git a/src/block/Note.php b/src/block/Note.php
index 8417ff8e88..b67891b87d 100644
--- a/src/block/Note.php
+++ b/src/block/Note.php
@@ -32,7 +32,7 @@ class Note extends Opaque{
 
 	private int $pitch = self::MIN_PITCH;
 
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 		$tile = $this->position->getWorld()->getTile($this->position);
 		if($tile instanceof TileNote){
@@ -40,6 +40,8 @@ class Note extends Opaque{
 		}else{
 			$this->pitch = self::MIN_PITCH;
 		}
+
+		return $this;
 	}
 
 	public function writeStateToWorld() : void{
diff --git a/src/block/PinkPetals.php b/src/block/PinkPetals.php
new file mode 100644
index 0000000000..17bc4c50a6
--- /dev/null
+++ b/src/block/PinkPetals.php
@@ -0,0 +1,114 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\block\utils\HorizontalFacingTrait;
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\item\Fertilizer;
+use pocketmine\item\Item;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\BlockTransaction;
+
+class PinkPetals extends Flowable{
+	use HorizontalFacingTrait;
+	use StaticSupportTrait {
+		canBePlacedAt as supportedWhenPlacedAt;
+	}
+
+	public const MIN_COUNT = 1;
+	public const MAX_COUNT = 4;
+
+	protected int $count = self::MIN_COUNT;
+
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+		$w->boundedIntAuto(self::MIN_COUNT, self::MAX_COUNT, $this->count);
+	}
+
+	public function getCount() : int{
+		return $this->count;
+	}
+
+	/** @return $this */
+	public function setCount(int $count) : self{
+		if($count < self::MIN_COUNT || $count > self::MAX_COUNT){
+			throw new \InvalidArgumentException("Count must be in range " . self::MIN_COUNT . " ... " . self::MAX_COUNT);
+		}
+		$this->count = $count;
+		return $this;
+	}
+
+	private function canBeSupportedAt(Block $block) : bool{
+		$supportBlock = $block->getSide(Facing::DOWN);
+		//TODO: Moss block
+		return $supportBlock->hasTypeTag(BlockTypeTags::DIRT) || $supportBlock->hasTypeTag(BlockTypeTags::MUD);
+	}
+
+	public function canBePlacedAt(Block $blockReplace, Vector3 $clickVector, int $face, bool $isClickedBlock) : bool{
+		return ($blockReplace instanceof PinkPetals && $blockReplace->count < self::MAX_COUNT) || $this->supportedWhenPlacedAt($blockReplace, $clickVector, $face, $isClickedBlock);
+	}
+
+	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+		if($blockReplace instanceof PinkPetals && $blockReplace->count < self::MAX_COUNT){
+			$this->count = $blockReplace->count + 1;
+			$this->facing = $blockReplace->facing;
+		}elseif($player !== null){
+			$this->facing = Facing::opposite($player->getHorizontalFacing());
+		}
+		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($item instanceof Fertilizer){
+			$grew = false;
+			if($this->count < self::MAX_COUNT){
+				$grew = BlockEventHelper::grow($this, (clone $this)->setCount($this->count + 1), $player);
+			}else{
+				$this->position->getWorld()->dropItem($this->position->add(0, 0.5, 0), $this->asItem());
+				$grew = true;
+			}
+			if($grew){
+				$item->pop();
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public function getFlameEncouragement() : int{
+		return 60;
+	}
+
+	public function getFlammability() : int{
+		return 100;
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [$this->asItem()->setCount($this->count)];
+	}
+}
diff --git a/src/block/PitcherCrop.php b/src/block/PitcherCrop.php
new file mode 100644
index 0000000000..d41aed284d
--- /dev/null
+++ b/src/block/PitcherCrop.php
@@ -0,0 +1,109 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\AgeableTrait;
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\block\utils\CropGrowthHelper;
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\event\block\StructureGrowEvent;
+use pocketmine\item\Fertilizer;
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+use pocketmine\math\Axis;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\BlockTransaction;
+
+final class PitcherCrop extends Flowable{
+	use AgeableTrait;
+	use StaticSupportTrait;
+
+	public const MAX_AGE = 2;
+
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getSide(Facing::DOWN)->getTypeId() === BlockTypeIds::FARMLAND;
+	}
+
+	protected function recalculateCollisionBoxes() : array{
+		$widthTrim = $this->age === 0 ? 5 : 3;
+		$heightTrim = $this->age === 0 ? 13 : 11;
+		return [
+			AxisAlignedBB::one()
+				->trim(Facing::UP, $heightTrim / 16)
+				->squash(Axis::X, $widthTrim / 16)
+				->squash(Axis::Z, $widthTrim / 16)
+				->extend(Facing::DOWN, 1 / 16) //presumably this is to correct for farmland being 15/16 of a block tall
+		];
+	}
+
+	private function grow(?Player $player) : bool{
+		if($this->age > self::MAX_AGE){
+			return false;
+		}
+
+		if($this->age === self::MAX_AGE){
+			$up = $this->getSide(Facing::UP);
+			if($up->getTypeId() !== BlockTypeIds::AIR){
+				return false;
+			}
+
+			$tx = new BlockTransaction($this->position->getWorld());
+			$tx->addBlock($this->position, VanillaBlocks::DOUBLE_PITCHER_CROP()->setTop(false));
+			$tx->addBlock($this->position->up(), VanillaBlocks::DOUBLE_PITCHER_CROP()->setTop(true));
+
+			$ev = new StructureGrowEvent($this, $tx, $player);
+			$ev->call();
+
+			return !$ev->isCancelled() && $tx->apply();
+		}
+
+		return BlockEventHelper::grow($this, (clone $this)->setAge($this->age + 1), $player);
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($item instanceof Fertilizer && $this->grow($player)){
+			$item->pop();
+			return true;
+		}
+
+		return false;
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
+		if(CropGrowthHelper::canGrow($this)){
+			$this->grow(null);
+		}
+	}
+
+	public function asItem() : Item{
+		return VanillaItems::PITCHER_POD();
+	}
+}
diff --git a/src/block/Planks.php b/src/block/Planks.php
index 9f780694a6..1074f8adf3 100644
--- a/src/block/Planks.php
+++ b/src/block/Planks.php
@@ -23,17 +23,20 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\WoodTypeTrait;
+
 class Planks extends Opaque{
+	use WoodTypeTrait;
 
 	public function getFuelTime() : int{
-		return 300;
+		return $this->woodType->isFlammable() ? 300 : 0;
 	}
 
 	public function getFlameEncouragement() : int{
-		return 5;
+		return $this->woodType->isFlammable() ? 5 : 0;
 	}
 
 	public function getFlammability() : int{
-		return 20;
+		return $this->woodType->isFlammable() ? 20 : 0;
 	}
 }
diff --git a/src/block/Podzol.php b/src/block/Podzol.php
index 4eb720573d..33285cc0ed 100644
--- a/src/block/Podzol.php
+++ b/src/block/Podzol.php
@@ -27,6 +27,10 @@ use pocketmine\item\Item;
 
 class Podzol extends Opaque{
 
+	public function isAffectedBySilkTouch() : bool{
+		return true;
+	}
+
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
 			VanillaBlocks::DIRT()->asItem()
diff --git a/src/block/Potato.php b/src/block/Potato.php
index 209107156d..4d1bbf9790 100644
--- a/src/block/Potato.php
+++ b/src/block/Potato.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\FortuneDropHelper;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
 use function mt_rand;
@@ -31,7 +32,8 @@ class Potato extends Crops{
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		$result = [
-			VanillaItems::POTATO()->setCount($this->age >= self::MAX_AGE ? mt_rand(1, 5) : 1)
+			//min/max would be 2-5 in Java
+			VanillaItems::POTATO()->setCount($this->age >= self::MAX_AGE ? FortuneDropHelper::binomial($item, 1) : 1)
 		];
 		if($this->age >= self::MAX_AGE && mt_rand(0, 49) === 0){
 			$result[] = VanillaItems::POISONOUS_POTATO();
@@ -39,7 +41,7 @@ class Potato extends Crops{
 		return $result;
 	}
 
-	public function getPickedItem(bool $addUserData = false) : Item{
+	public function asItem() : Item{
 		return VanillaItems::POTATO();
 	}
 }
diff --git a/src/block/PotionCauldron.php b/src/block/PotionCauldron.php
new file mode 100644
index 0000000000..ca91664e4e
--- /dev/null
+++ b/src/block/PotionCauldron.php
@@ -0,0 +1,116 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\tile\Cauldron as TileCauldron;
+use pocketmine\item\Item;
+use pocketmine\item\ItemTypeIds;
+use pocketmine\item\VanillaItems;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\sound\CauldronEmptyPotionSound;
+use pocketmine\world\sound\CauldronFillPotionSound;
+use pocketmine\world\sound\Sound;
+use function assert;
+
+final class PotionCauldron extends FillableCauldron{
+	public const POTION_FILL_AMOUNT = 2;
+
+	private ?Item $potionItem = null;
+
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockTypeInfo $typeInfo){
+		parent::__construct($idInfo, $name, $typeInfo);
+	}
+
+	public function readStateFromWorld() : Block{
+		parent::readStateFromWorld();
+		$tile = $this->position->getWorld()->getTile($this->position);
+		$this->potionItem = $tile instanceof TileCauldron ? $tile->getPotionItem() : null;
+
+		return $this;
+	}
+
+	public function writeStateToWorld() : void{
+		parent::writeStateToWorld();
+		$tile = $this->position->getWorld()->getTile($this->position);
+		assert($tile instanceof TileCauldron);
+		$tile->setCustomWaterColor(null);
+		$tile->setPotionItem($this->potionItem);
+	}
+
+	public function getPotionItem() : ?Item{ return $this->potionItem === null ? null : clone $this->potionItem; }
+
+	/** @return $this */
+	public function setPotionItem(?Item $potionItem) : self{
+		if($potionItem !== null && !match($potionItem->getTypeId()){
+			ItemTypeIds::POTION,
+			ItemTypeIds::SPLASH_POTION,
+			ItemTypeIds::LINGERING_POTION => true,
+			default => false,
+		}){
+			throw new \InvalidArgumentException("Item must be a POTION, SPLASH_POTION or LINGERING_POTION");
+		}
+		$this->potionItem = $potionItem !== null ? (clone $potionItem)->setCount(1) : null;
+		return $this;
+	}
+
+	public function getFillSound() : Sound{
+		return new CauldronFillPotionSound();
+	}
+
+	public function getEmptySound() : Sound{
+		return new CauldronEmptyPotionSound();
+	}
+
+	/**
+	 * @param Item[] &$returnedItems
+	 */
+	protected function addFillLevelsOrMix(int $amount, Item $usedItem, Item $returnedItem, array &$returnedItems) : void{
+		if($this->potionItem !== null && !$usedItem->equals($this->potionItem, true, false)){
+			$this->mix($usedItem, $returnedItem, $returnedItems);
+		}else{
+			$this->addFillLevels($amount, $usedItem, $returnedItem, $returnedItems);
+		}
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		match($item->getTypeId()){
+			ItemTypeIds::LINGERING_POTION, ItemTypeIds::POTION, ItemTypeIds::SPLASH_POTION => $this->addFillLevelsOrMix(self::POTION_FILL_AMOUNT, $item, VanillaItems::GLASS_BOTTLE(), $returnedItems),
+			ItemTypeIds::GLASS_BOTTLE => $this->potionItem === null ? null : $this->removeFillLevels(self::POTION_FILL_AMOUNT, $item, clone $this->potionItem, $returnedItems),
+			ItemTypeIds::LAVA_BUCKET, ItemTypeIds::POWDER_SNOW_BUCKET, ItemTypeIds::WATER_BUCKET => $this->mix($item, VanillaItems::BUCKET(), $returnedItems),
+			//TODO: tipped arrows
+			default => null
+		};
+		return true;
+	}
+
+	public function onNearbyBlockChange() : void{
+		$world = $this->position->getWorld();
+		if($world->getBlock($this->position->up())->getTypeId() === BlockTypeIds::WATER){
+			$cauldron = VanillaBlocks::WATER_CAULDRON()->setFillLevel(FillableCauldron::MAX_FILL_LEVEL);
+			$world->setBlock($this->position, $cauldron);
+			$world->addSound($this->position->add(0.5, 0.5, 0.5), $cauldron->getFillSound());
+		}
+	}
+}
diff --git a/src/block/PressurePlate.php b/src/block/PressurePlate.php
index 7f9403b742..1dd4b50d97 100644
--- a/src/block/PressurePlate.php
+++ b/src/block/PressurePlate.php
@@ -23,14 +23,31 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\block\utils\SupportType;
-use pocketmine\item\Item;
+use pocketmine\entity\Entity;
+use pocketmine\event\block\PressurePlateUpdateEvent;
+use pocketmine\math\Axis;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
-use pocketmine\math\Vector3;
-use pocketmine\player\Player;
-use pocketmine\world\BlockTransaction;
+use pocketmine\world\sound\PressurePlateActivateSound;
+use pocketmine\world\sound\PressurePlateDeactivateSound;
+use function count;
 
 abstract class PressurePlate extends Transparent{
+	use StaticSupportTrait;
+
+	private readonly int $deactivationDelayTicks;
+
+	public function __construct(
+		BlockIdentifier $idInfo,
+		string $name,
+		BlockTypeInfo $typeInfo,
+		int $deactivationDelayTicks = 20 //TODO: make this mandatory in PM6
+	){
+		parent::__construct($idInfo, $name, $typeInfo);
+		$this->deactivationDelayTicks = $deactivationDelayTicks;
+	}
 
 	public function isSolid() : bool{
 		return false;
@@ -41,25 +58,96 @@ abstract class PressurePlate extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($this->canBeSupportedBy($blockReplace->getSide(Facing::DOWN))){
-			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getAdjacentSupportType(Facing::DOWN) !== SupportType::NONE;
+	}
+
+	public function hasEntityCollision() : bool{
+		return true;
+	}
+
+	public function onEntityInside(Entity $entity) : bool{
+		if(!$this->hasOutputSignal()){
+			$this->position->getWorld()->scheduleDelayedBlockUpdate($this->position, 0);
 		}
+		return true;
+	}
+
+	/**
+	 * Returns the AABB that entities must intersect to activate the pressure plate.
+	 * Note that this is not the same as the collision box (pressure plate doesn't have one), nor the visual bounding
+	 * box. The activation area has a height of 0.25 blocks.
+	 */
+	protected function getActivationBox() : AxisAlignedBB{
+		return AxisAlignedBB::one()
+			->squash(Axis::X, 1 / 8)
+			->squash(Axis::Z, 1 / 8)
+			->trim(Facing::UP, 3 / 4)
+			->offset($this->position->x, $this->position->y, $this->position->z);
+	}
+
+	/**
+	 * TODO: make this abstract in PM6
+	 */
+	protected function hasOutputSignal() : bool{
 		return false;
 	}
 
-	private function canBeSupportedBy(Block $block) : bool{
-		return !$block->getSupportType(Facing::UP)->equals(SupportType::NONE());
+	/**
+	 * TODO: make this abstract in PM6
+	 *
+	 * @param Entity[] $entities
+	 *
+	 * @return mixed[]
+	 * @phpstan-return array{Block, ?bool}
+	 */
+	protected function calculatePlateState(array $entities) : array{
+		return [$this, null];
 	}
 
-	public function onNearbyBlockChange() : void{
-		if(!$this->canBeSupportedBy($this->getSide(Facing::DOWN))){
-			$this->position->getWorld()->useBreakOn($this->position);
+	/**
+	 * Filters entities which don't affect the pressure plate state from the given list.
+	 *
+	 * @param Entity[] $entities
+	 * @return Entity[]
+	 */
+	protected function filterIrrelevantEntities(array $entities) : array{
+		return $entities;
+	}
+
+	public function onScheduledUpdate() : void{
+		$world = $this->position->getWorld();
+
+		$intersectionAABB = $this->getActivationBox();
+		$activatingEntities = $this->filterIrrelevantEntities($world->getNearbyEntities($intersectionAABB));
+
+		//if an irrelevant entity is inside the full cube space of the pressure plate but not activating the plate,
+		//it will cause scheduled updates on the plate every tick. We don't want to fire events in this case if the
+		//plate is already deactivated.
+		if(count($activatingEntities) > 0 || $this->hasOutputSignal()){
+			[$newState, $pressedChange] = $this->calculatePlateState($activatingEntities);
+
+			//always call this, in case there are new entities on the plate
+			if(PressurePlateUpdateEvent::hasHandlers()){
+				$ev = new PressurePlateUpdateEvent($this, $newState, $activatingEntities);
+				$ev->call();
+				$newState = $ev->isCancelled() ? null : $ev->getNewState();
+			}
+			if($newState !== null){
+				$world->setBlock($this->position, $newState);
+				if($pressedChange !== null){
+					$world->addSound($this->position, $pressedChange ?
+						new PressurePlateActivateSound($this) :
+						new PressurePlateDeactivateSound($this)
+					);
+				}
+			}
+			if($pressedChange ?? $this->hasOutputSignal()){
+				$world->scheduleDelayedBlockUpdate($this->position, $this->deactivationDelayTicks);
+			}
 		}
 	}
-
-	//TODO
 }
diff --git a/src/block/Pumpkin.php b/src/block/Pumpkin.php
index 29dc196b7c..1b7f6a9cdd 100644
--- a/src/block/Pumpkin.php
+++ b/src/block/Pumpkin.php
@@ -33,7 +33,7 @@ use function in_array;
 
 class Pumpkin extends Opaque{
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($item instanceof Shears && in_array($face, Facing::HORIZONTAL, true)){
 			$item->applyDamage(1);
 			$world = $this->position->getWorld();
diff --git a/src/block/PumpkinStem.php b/src/block/PumpkinStem.php
index d7b8e2588d..9151ce2dcc 100644
--- a/src/block/PumpkinStem.php
+++ b/src/block/PumpkinStem.php
@@ -23,9 +23,16 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+
 class PumpkinStem extends Stem{
 
 	protected function getPlant() : Block{
 		return VanillaBlocks::PUMPKIN();
 	}
+
+	public function asItem() : Item{
+		return VanillaItems::PUMPKIN_SEEDS();
+	}
 }
diff --git a/src/block/Rail.php b/src/block/Rail.php
index ea3feba480..f516902f09 100644
--- a/src/block/Rail.php
+++ b/src/block/Rail.php
@@ -23,8 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\InvalidBlockStateException;
 use pocketmine\block\utils\RailConnectionInfo;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\math\Facing;
 use function array_keys;
 use function implode;
@@ -33,20 +34,8 @@ class Rail extends BaseRail{
 
 	private int $railShape = BlockLegacyMetadata::RAIL_STRAIGHT_NORTH_SOUTH;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		if(!isset(RailConnectionInfo::CONNECTIONS[$stateMeta]) && !isset(RailConnectionInfo::CURVE_CONNECTIONS[$stateMeta])){
-			throw new InvalidBlockStateException("No rail shape matches metadata $stateMeta");
-		}
-		$this->railShape = $stateMeta;
-	}
-
-	protected function writeStateToMeta() : int{
-		//TODO: railShape won't be plain metadata in future
-		return $this->railShape;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->railShape($this->railShape);
 	}
 
 	protected function setShapeFromConnections(array $connections) : void{
diff --git a/src/block/RedMushroom.php b/src/block/RedMushroom.php
index 7e07b83f4d..81ab940f53 100644
--- a/src/block/RedMushroom.php
+++ b/src/block/RedMushroom.php
@@ -43,11 +43,11 @@ class RedMushroom extends Flowable{
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
 		$down = $this->getSide(Facing::DOWN);
-		$position = $this->getPosition();
+		$position = $this->position;
 		$lightLevel = $position->getWorld()->getFullLightAt($position->x, $position->y, $position->z);
-		$downId = $down->getId();
+		$downId = $down->getTypeId();
 		//TODO: nylium support
-		if(($lightLevel <= 12 && !$down->isTransparent()) || $downId === BlockLegacyIds::MYCELIUM || $downId === BlockLegacyIds::PODZOL){
+		if(($lightLevel <= 12 && !$down->isTransparent()) || $downId === BlockTypeIds::MYCELIUM || $downId === BlockTypeIds::PODZOL){
 			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 		}
 
diff --git a/src/block/RedMushroomBlock.php b/src/block/RedMushroomBlock.php
index 820a0e5f89..0a7cb30f25 100644
--- a/src/block/RedMushroomBlock.php
+++ b/src/block/RedMushroomBlock.php
@@ -23,35 +23,18 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\InvalidBlockStateException;
 use pocketmine\block\utils\MushroomBlockType;
-use pocketmine\data\bedrock\MushroomBlockTypeIdMap;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use function mt_rand;
 
 class RedMushroomBlock extends Opaque{
+	protected MushroomBlockType $mushroomBlockType = MushroomBlockType::ALL_CAP;
 
-	protected MushroomBlockType $mushroomBlockType;
-
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->mushroomBlockType = MushroomBlockType::PORES();
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
-
-	protected function writeStateToMeta() : int{
-		return MushroomBlockTypeIdMap::getInstance()->toId($this->mushroomBlockType);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$type = MushroomBlockTypeIdMap::getInstance()->fromId($stateMeta);
-		if($type === null){
-			throw new InvalidBlockStateException("No such mushroom variant $stateMeta");
-		}
-		$this->mushroomBlockType = $type;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	public function describeBlockItemState(RuntimeDataDescriber $w) : void{
+		//these blocks always drop as all-cap, but may exist in other forms in the inventory (particularly creative),
+		//so this information needs to be kept in the type info
+		$w->enum($this->mushroomBlockType);
 	}
 
 	public function getMushroomBlockType() : MushroomBlockType{ return $this->mushroomBlockType; }
@@ -71,4 +54,12 @@ class RedMushroomBlock extends Opaque{
 	public function isAffectedBySilkTouch() : bool{
 		return true;
 	}
+
+	public function getSilkTouchDrops(Item $item) : array{
+		return [(clone $this)->setMushroomBlockType(MushroomBlockType::ALL_CAP)->asItem()];
+	}
+
+	public function getPickedItem(bool $addUserData = false) : Item{
+		return (clone $this)->setMushroomBlockType(MushroomBlockType::ALL_CAP)->asItem();
+	}
 }
diff --git a/src/block/RedstoneComparator.php b/src/block/RedstoneComparator.php
index c7396d1196..ee63a77a99 100644
--- a/src/block/RedstoneComparator.php
+++ b/src/block/RedstoneComparator.php
@@ -25,10 +25,11 @@ namespace pocketmine\block;
 
 use pocketmine\block\tile\Comparator;
 use pocketmine\block\utils\AnalogRedstoneSignalEmitterTrait;
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\HorizontalFacingTrait;
 use pocketmine\block\utils\PoweredByRedstoneTrait;
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
@@ -41,42 +42,24 @@ class RedstoneComparator extends Flowable{
 	use HorizontalFacingTrait;
 	use AnalogRedstoneSignalEmitterTrait;
 	use PoweredByRedstoneTrait;
-
-	protected BlockIdentifierFlattened $idInfoFlattened;
+	use StaticSupportTrait;
 
 	protected bool $isSubtractMode = false;
 
-	public function __construct(BlockIdentifierFlattened $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->idInfoFlattened = $idInfo;
-		parent::__construct($idInfo, $name, $breakInfo);
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+		$w->bool($this->isSubtractMode);
+		$w->bool($this->powered);
 	}
 
-	public function getId() : int{
-		return $this->powered ? $this->idInfoFlattened->getSecondId() : parent::getId();
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::readLegacyHorizontalFacing($stateMeta & 0x03);
-		$this->isSubtractMode = ($stateMeta & BlockLegacyMetadata::REDSTONE_COMPARATOR_FLAG_SUBTRACT) !== 0;
-		$this->powered = ($id === $this->idInfoFlattened->getSecondId() || ($stateMeta & BlockLegacyMetadata::REDSTONE_COMPARATOR_FLAG_POWERED) !== 0);
-	}
-
-	public function writeStateToMeta() : int{
-		return BlockDataSerializer::writeLegacyHorizontalFacing($this->facing) |
-			($this->isSubtractMode ? BlockLegacyMetadata::REDSTONE_COMPARATOR_FLAG_SUBTRACT : 0) |
-			($this->powered ? BlockLegacyMetadata::REDSTONE_COMPARATOR_FLAG_POWERED : 0);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 		$tile = $this->position->getWorld()->getTile($this->position);
 		if($tile instanceof Comparator){
 			$this->signalStrength = $tile->getSignalStrength();
 		}
+
+		return $this;
 	}
 
 	public function writeStateToWorld() : void{
@@ -104,30 +87,20 @@ class RedstoneComparator extends Flowable{
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($this->canBeSupportedBy($blockReplace->getSide(Facing::DOWN))){
-			if($player !== null){
-				$this->facing = Facing::opposite($player->getHorizontalFacing());
-			}
-			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+		if($player !== null){
+			$this->facing = Facing::opposite($player->getHorizontalFacing());
 		}
-
-		return false;
+		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		$this->isSubtractMode = !$this->isSubtractMode;
 		$this->position->getWorld()->setBlock($this->position, $this);
 		return true;
 	}
 
-	public function onNearbyBlockChange() : void{
-		if(!$this->canBeSupportedBy($this->getSide(Facing::DOWN))){
-			$this->position->getWorld()->useBreakOn($this->position);
-		}
-	}
-
-	private function canBeSupportedBy(Block $block) : bool{
-		return !$block->getSupportType(Facing::UP)->equals(SupportType::NONE());
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getAdjacentSupportType(Facing::DOWN) !== SupportType::NONE;
 	}
 
 	//TODO: redstone functionality
diff --git a/src/block/RedstoneLamp.php b/src/block/RedstoneLamp.php
index 5507881f5f..58098c395e 100644
--- a/src/block/RedstoneLamp.php
+++ b/src/block/RedstoneLamp.php
@@ -24,23 +24,13 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\PoweredByRedstoneTrait;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 
 class RedstoneLamp extends Opaque{
 	use PoweredByRedstoneTrait;
 
-	protected BlockIdentifierFlattened $idInfoFlattened;
-
-	public function __construct(BlockIdentifierFlattened $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->idInfoFlattened = $idInfo;
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
-
-	public function getId() : int{
-		return $this->powered ? $this->idInfoFlattened->getSecondId() : parent::getId();
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->powered = $id === $this->idInfoFlattened->getSecondId();
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->bool($this->powered);
 	}
 
 	public function getLightLevel() : int{
diff --git a/src/block/RedstoneOre.php b/src/block/RedstoneOre.php
index 1557634a84..10e701a6f4 100644
--- a/src/block/RedstoneOre.php
+++ b/src/block/RedstoneOre.php
@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\FortuneDropHelper;
+use pocketmine\block\utils\LightableTrait;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
 use pocketmine\math\Vector3;
@@ -30,41 +32,13 @@ use pocketmine\player\Player;
 use function mt_rand;
 
 class RedstoneOre extends Opaque{
-
-	protected BlockIdentifierFlattened $idInfoFlattened;
-
-	protected bool $lit = false;
-
-	public function __construct(BlockIdentifierFlattened $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->idInfoFlattened = $idInfo;
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
-
-	public function getId() : int{
-		return $this->lit ? $this->idInfoFlattened->getSecondId() : parent::getId();
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->lit = $id === $this->idInfoFlattened->getSecondId();
-	}
-
-	public function isLit() : bool{
-		return $this->lit;
-	}
-
-	/**
-	 * @return $this
-	 */
-	public function setLit(bool $lit = true) : self{
-		$this->lit = $lit;
-		return $this;
-	}
+	use LightableTrait;
 
 	public function getLightLevel() : int{
 		return $this->lit ? 9 : 0;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if(!$this->lit){
 			$this->lit = true;
 			$this->position->getWorld()->setBlock($this->position, $this); //no return here - this shouldn't prevent block placement
@@ -80,7 +54,7 @@ class RedstoneOre extends Opaque{
 	}
 
 	public function ticksRandomly() : bool{
-		return true;
+		return $this->lit;
 	}
 
 	public function onRandomTick() : void{
@@ -92,7 +66,7 @@ class RedstoneOre extends Opaque{
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			VanillaItems::REDSTONE_DUST()->setCount(mt_rand(4, 5))
+			VanillaItems::REDSTONE_DUST()->setCount(FortuneDropHelper::discrete($item, 4, 5))
 		];
 	}
 
diff --git a/src/block/RedstoneRepeater.php b/src/block/RedstoneRepeater.php
index 2fbd0b2598..7e6e73da84 100644
--- a/src/block/RedstoneRepeater.php
+++ b/src/block/RedstoneRepeater.php
@@ -23,10 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\HorizontalFacingTrait;
 use pocketmine\block\utils\PoweredByRedstoneTrait;
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
@@ -37,35 +38,17 @@ use pocketmine\world\BlockTransaction;
 class RedstoneRepeater extends Flowable{
 	use HorizontalFacingTrait;
 	use PoweredByRedstoneTrait;
+	use StaticSupportTrait;
 
 	public const MIN_DELAY = 1;
 	public const MAX_DELAY = 4;
 
-	protected BlockIdentifierFlattened $idInfoFlattened;
-
 	protected int $delay = self::MIN_DELAY;
 
-	public function __construct(BlockIdentifierFlattened $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->idInfoFlattened = $idInfo;
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
-
-	public function getId() : int{
-		return $this->powered ? $this->idInfoFlattened->getSecondId() : parent::getId();
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::readLegacyHorizontalFacing($stateMeta & 0x03);
-		$this->delay = BlockDataSerializer::readBoundedInt("delay", ($stateMeta >> 2) + 1, self::MIN_DELAY, self::MAX_DELAY);
-		$this->powered = $id === $this->idInfoFlattened->getSecondId();
-	}
-
-	public function writeStateToMeta() : int{
-		return BlockDataSerializer::writeLegacyHorizontalFacing($this->facing) | (($this->delay - 1) << 2);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+		$w->boundedIntAuto(self::MIN_DELAY, self::MAX_DELAY, $this->delay);
+		$w->bool($this->powered);
 	}
 
 	public function getDelay() : int{ return $this->delay; }
@@ -87,18 +70,14 @@ class RedstoneRepeater extends Flowable{
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($this->canBeSupportedBy($blockReplace->getSide(Facing::DOWN))){
-			if($player !== null){
-				$this->facing = Facing::opposite($player->getHorizontalFacing());
-			}
-
-			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+		if($player !== null){
+			$this->facing = Facing::opposite($player->getHorizontalFacing());
 		}
 
-		return false;
+		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if(++$this->delay > self::MAX_DELAY){
 			$this->delay = self::MIN_DELAY;
 		}
@@ -106,14 +85,8 @@ class RedstoneRepeater extends Flowable{
 		return true;
 	}
 
-	public function onNearbyBlockChange() : void{
-		if(!$this->canBeSupportedBy($this->getSide(Facing::DOWN))){
-			$this->position->getWorld()->useBreakOn($this->position);
-		}
-	}
-
-	private function canBeSupportedBy(Block $block) : bool{
-		return !$block->getSupportType(Facing::UP)->equals(SupportType::NONE());
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getAdjacentSupportType(Facing::DOWN) !== SupportType::NONE;
 	}
 
 	//TODO: redstone functionality
diff --git a/src/block/RedstoneTorch.php b/src/block/RedstoneTorch.php
index b5de4898ba..26c86038b9 100644
--- a/src/block/RedstoneTorch.php
+++ b/src/block/RedstoneTorch.php
@@ -23,36 +23,20 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\LightableTrait;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+
 class RedstoneTorch extends Torch{
+	use LightableTrait;
 
-	protected BlockIdentifierFlattened $idInfoFlattened;
-
-	protected bool $lit = true;
-
-	public function __construct(BlockIdentifierFlattened $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->idInfoFlattened = $idInfo;
-		parent::__construct($idInfo, $name, $breakInfo);
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockTypeInfo $typeInfo){
+		$this->lit = true;
+		parent::__construct($idInfo, $name, $typeInfo);
 	}
 
-	public function getId() : int{
-		return $this->lit ? parent::getId() : $this->idInfoFlattened->getSecondId();
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		parent::readStateFromData($id, $stateMeta);
-		$this->lit = $id !== $this->idInfoFlattened->getSecondId();
-	}
-
-	public function isLit() : bool{
-		return $this->lit;
-	}
-
-	/**
-	 * @return $this
-	 */
-	public function setLit(bool $lit = true) : self{
-		$this->lit = $lit;
-		return $this;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		parent::describeBlockOnlyState($w);
+		$w->bool($this->lit);
 	}
 
 	public function getLightLevel() : int{
diff --git a/src/block/RedstoneWire.php b/src/block/RedstoneWire.php
index e744c1849b..a2d293fca0 100644
--- a/src/block/RedstoneWire.php
+++ b/src/block/RedstoneWire.php
@@ -24,47 +24,27 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\AnalogRedstoneSignalEmitterTrait;
-use pocketmine\block\utils\BlockDataSerializer;
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
 use pocketmine\math\Facing;
-use pocketmine\math\Vector3;
-use pocketmine\player\Player;
-use pocketmine\world\BlockTransaction;
 
 class RedstoneWire extends Flowable{
 	use AnalogRedstoneSignalEmitterTrait;
+	use StaticSupportTrait;
 
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($this->canBeSupportedBy($this->getSide(Facing::DOWN))){
-			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-		}
-		return false;
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->signalStrength = BlockDataSerializer::readBoundedInt("signalStrength", $stateMeta, 0, 15);
-	}
-
-	protected function writeStateToMeta() : int{
-		return $this->signalStrength;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 		//TODO: check connections to nearby redstone components
+
+		return $this;
 	}
 
-	public function onNearbyBlockChange() : void{
-		if(!$this->canBeSupportedBy($this->getSide(Facing::DOWN))){
-			$this->position->getWorld()->useBreakOn($this->position);
-		}
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getAdjacentSupportType(Facing::DOWN)->hasCenterSupport();
 	}
 
-	private function canBeSupportedBy(Block $block) : bool{
-		return $block->getSupportType(Facing::UP)->hasCenterSupport();
+	public function asItem() : Item{
+		return VanillaItems::REDSTONE_DUST();
 	}
 }
diff --git a/src/block/RuntimeBlockStateRegistry.php b/src/block/RuntimeBlockStateRegistry.php
new file mode 100644
index 0000000000..a8ece7722c
--- /dev/null
+++ b/src/block/RuntimeBlockStateRegistry.php
@@ -0,0 +1,140 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\BlockBreakInfo as BreakInfo;
+use pocketmine\block\BlockIdentifier as BID;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\SingletonTrait;
+use pocketmine\world\light\LightUpdate;
+use function min;
+
+/**
+ * Blocks are stored as state IDs in chunks at runtime (it would waste far too much memory to represent every block as
+ * an object). This class maps block state IDs to their corresponding block objects when reading blocks from chunks at
+ * runtime.
+ *
+ * @internal Plugin devs shouldn't need to interact with this class at all, unless registering a new block type.
+ */
+class RuntimeBlockStateRegistry{
+	use SingletonTrait;
+
+	/**
+	 * @var Block[]
+	 * @phpstan-var array<int, Block>
+	 */
+	private array $fullList = [];
+
+	/**
+	 * Index of default states for every block type
+	 * @var Block[]
+	 * @phpstan-var array<int, Block>
+	 */
+	private array $typeIndex = [];
+
+	/**
+	 * @var int[]
+	 * @phpstan-var array<int, int>
+	 */
+	public array $light = [];
+	/**
+	 * @var int[]
+	 * @phpstan-var array<int, int>
+	 */
+	public array $lightFilter = [];
+	/**
+	 * @var true[]
+	 * @phpstan-var array<int, true>
+	 */
+	public array $blocksDirectSkyLight = [];
+	/**
+	 * @var float[]
+	 * @phpstan-var array<int, float>
+	 */
+	public array $blastResistance = [];
+
+	public function __construct(){
+		foreach(VanillaBlocks::getAll() as $block){
+			$this->register($block);
+		}
+	}
+
+	/**
+	 * Maps a block type's state permutations to its corresponding state IDs. This is necessary for the block to be
+	 * recognized when fetching it by its state ID from chunks at runtime.
+	 *
+	 * @throws \InvalidArgumentException if the desired block type ID is already registered
+	 */
+	public function register(Block $block) : void{
+		$typeId = $block->getTypeId();
+
+		if(isset($this->typeIndex[$typeId])){
+			throw new \InvalidArgumentException("Block ID $typeId is already used by another block");
+		}
+
+		$this->typeIndex[$typeId] = clone $block;
+
+		foreach($block->generateStatePermutations() as $v){
+			$this->fillStaticArrays($v->getStateId(), $v);
+		}
+	}
+
+	private function fillStaticArrays(int $index, Block $block) : void{
+		$fullId = $block->getStateId();
+		if($index !== $fullId){
+			throw new AssumptionFailedError("Cannot fill static arrays for an invalid blockstate");
+		}else{
+			$this->fullList[$index] = $block;
+			$this->blastResistance[$index] = $block->getBreakInfo()->getBlastResistance();
+			$this->light[$index] = $block->getLightLevel();
+			$this->lightFilter[$index] = min(15, $block->getLightFilter() + LightUpdate::BASE_LIGHT_FILTER);
+			if($block->blocksDirectSkyLight()){
+				$this->blocksDirectSkyLight[$index] = true;
+			}
+		}
+	}
+
+	public function fromStateId(int $stateId) : Block{
+		if($stateId < 0){
+			throw new \InvalidArgumentException("Block state ID cannot be negative");
+		}
+		if(isset($this->fullList[$stateId])) { //hot
+			$block = clone $this->fullList[$stateId];
+		}else{
+			$typeId = $stateId >> Block::INTERNAL_STATE_DATA_BITS;
+			$stateData = ($stateId ^ $typeId) & Block::INTERNAL_STATE_DATA_MASK;
+			$block = new UnknownBlock(new BID($typeId), new BlockTypeInfo(BreakInfo::instant()), $stateData);
+		}
+
+		return $block;
+	}
+
+	/**
+	 * @return Block[]
+	 * @phpstan-return array<int, Block>
+	 */
+	public function getAllKnownStates() : array{
+		return $this->fullList;
+	}
+}
diff --git a/src/block/Sand.php b/src/block/Sand.php
index 17fc80a204..df56b73484 100644
--- a/src/block/Sand.php
+++ b/src/block/Sand.php
@@ -28,8 +28,4 @@ use pocketmine\block\utils\FallableTrait;
 
 class Sand extends Opaque implements Fallable{
 	use FallableTrait;
-
-	public function tickFalling() : ?Block{
-		return null;
-	}
 }
diff --git a/src/block/Sapling.php b/src/block/Sapling.php
index ea6f71d547..b3fdf59af6 100644
--- a/src/block/Sapling.php
+++ b/src/block/Sapling.php
@@ -23,7 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\TreeType;
+use pocketmine\block\utils\SaplingType;
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\event\block\StructureGrowEvent;
 use pocketmine\item\Fertilizer;
 use pocketmine\item\Item;
@@ -31,31 +33,23 @@ use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
 use pocketmine\utils\Random;
-use pocketmine\world\BlockTransaction;
 use pocketmine\world\generator\object\TreeFactory;
 use function mt_rand;
 
 class Sapling extends Flowable{
+	use StaticSupportTrait;
 
 	protected bool $ready = false;
 
-	private TreeType $treeType;
+	private SaplingType $saplingType;
 
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo, TreeType $treeType){
-		parent::__construct($idInfo, $name, $breakInfo);
-		$this->treeType = $treeType;
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockTypeInfo $typeInfo, SaplingType $saplingType){
+		parent::__construct($idInfo, $name, $typeInfo);
+		$this->saplingType = $saplingType;
 	}
 
-	protected function writeStateToMeta() : int{
-		return ($this->ready ? BlockLegacyMetadata::SAPLING_FLAG_READY : 0);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->ready = ($stateMeta & BlockLegacyMetadata::SAPLING_FLAG_READY) !== 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1000;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->bool($this->ready);
 	}
 
 	public function isReady() : bool{ return $this->ready; }
@@ -66,16 +60,12 @@ class Sapling extends Flowable{
 		return $this;
 	}
 
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		$down = $this->getSide(Facing::DOWN);
-		if($down->getId() === BlockLegacyIds::GRASS || $down->getId() === BlockLegacyIds::DIRT || $down->getId() === BlockLegacyIds::FARMLAND){
-			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-		}
-
-		return false;
+	private function canBeSupportedAt(Block $block) : bool{
+		$supportBlock = $block->getSide(Facing::DOWN);
+		return $supportBlock->hasTypeTag(BlockTypeTags::DIRT) || $supportBlock->hasTypeTag(BlockTypeTags::MUD);
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($item instanceof Fertilizer && $this->grow($player)){
 			$item->pop();
 
@@ -85,12 +75,6 @@ class Sapling extends Flowable{
 		return false;
 	}
 
-	public function onNearbyBlockChange() : void{
-		if($this->getSide(Facing::DOWN)->isTransparent()){
-			$this->position->getWorld()->useBreakOn($this->position);
-		}
-	}
-
 	public function ticksRandomly() : bool{
 		return true;
 	}
@@ -109,7 +93,7 @@ class Sapling extends Flowable{
 
 	private function grow(?Player $player) : bool{
 		$random = new Random(mt_rand());
-		$tree = TreeFactory::get($random, $this->treeType);
+		$tree = TreeFactory::get($random, $this->saplingType->getTreeType());
 		$transaction = $tree?->getBlockTransaction($this->position->getWorld(), $this->position->getFloorX(), $this->position->getFloorY(), $this->position->getFloorZ(), $random);
 		if($transaction === null){
 			return false;
diff --git a/src/block/Sculk.php b/src/block/Sculk.php
new file mode 100644
index 0000000000..6f1f95f276
--- /dev/null
+++ b/src/block/Sculk.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+
+final class Sculk extends Opaque{
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [];
+	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return true;
+	}
+
+	public function getXpDropAmount() : int{
+		return 1;
+	}
+}
diff --git a/src/block/SeaLantern.php b/src/block/SeaLantern.php
index 27ed73f0df..ff0c97d733 100644
--- a/src/block/SeaLantern.php
+++ b/src/block/SeaLantern.php
@@ -23,8 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\FortuneDropHelper;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
+use function min;
 
 class SeaLantern extends Transparent{
 
@@ -34,7 +36,7 @@ class SeaLantern extends Transparent{
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			VanillaItems::PRISMARINE_CRYSTALS()->setCount(3)
+			VanillaItems::PRISMARINE_CRYSTALS()->setCount(min(5, FortuneDropHelper::discrete($item, 2, 3)))
 		];
 	}
 
diff --git a/src/block/SeaPickle.php b/src/block/SeaPickle.php
index 39917aded5..627af9bacc 100644
--- a/src/block/SeaPickle.php
+++ b/src/block/SeaPickle.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -37,17 +38,9 @@ class SeaPickle extends Transparent{
 	protected int $count = self::MIN_COUNT;
 	protected bool $underwater = false;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->count = ($stateMeta & 0x03) + 1;
-		$this->underwater = ($stateMeta & BlockLegacyMetadata::SEA_PICKLE_FLAG_NOT_UNDERWATER) === 0;
-	}
-
-	protected function writeStateToMeta() : int{
-		return ($this->count - 1) | ($this->underwater ? 0 : BlockLegacyMetadata::SEA_PICKLE_FLAG_NOT_UNDERWATER);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->boundedIntAuto(self::MIN_COUNT, self::MAX_COUNT, $this->count);
+		$w->bool($this->underwater);
 	}
 
 	public function getCount() : int{ return $this->count; }
@@ -85,7 +78,7 @@ class SeaPickle extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	public function canBePlacedAt(Block $blockReplace, Vector3 $clickVector, int $face, bool $isClickedBlock) : bool{
@@ -102,9 +95,9 @@ class SeaPickle extends Transparent{
 		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		//TODO: bonemeal logic (requires coral)
-		return parent::onInteract($item, $face, $clickVector, $player);
+		return parent::onInteract($item, $face, $clickVector, $player, $returnedItems);
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{
diff --git a/src/block/ShulkerBox.php b/src/block/ShulkerBox.php
index de8cefeb80..d557401eec 100644
--- a/src/block/ShulkerBox.php
+++ b/src/block/ShulkerBox.php
@@ -25,6 +25,8 @@ namespace pocketmine\block;
 
 use pocketmine\block\tile\ShulkerBox as TileShulkerBox;
 use pocketmine\block\utils\AnyFacingTrait;
+use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
@@ -33,6 +35,10 @@ use pocketmine\world\BlockTransaction;
 class ShulkerBox extends Opaque{
 	use AnyFacingTrait;
 
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		//NOOP - we don't read or write facing here, because the tile persists it
+	}
+
 	public function writeStateToWorld() : void{
 		parent::writeStateToWorld();
 		$shulker = $this->position->getWorld()->getTile($this->position);
@@ -41,12 +47,14 @@ class ShulkerBox extends Opaque{
 		}
 	}
 
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 		$shulker = $this->position->getWorld()->getTile($this->position);
 		if($shulker instanceof TileShulkerBox){
 			$this->facing = $shulker->getFacing();
 		}
+
+		return $this;
 	}
 
 	public function getMaxStackSize() : int{
@@ -85,7 +93,7 @@ class ShulkerBox extends Opaque{
 		return $result;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($player instanceof Player){
 
 			$shulker = $this->position->getWorld()->getTile($this->position);
@@ -103,4 +111,8 @@ class ShulkerBox extends Opaque{
 
 		return true;
 	}
+
+	public function getSupportType(int $facing) : SupportType{
+		return SupportType::NONE;
+	}
 }
diff --git a/src/block/SimplePillar.php b/src/block/SimplePillar.php
index 72750e000d..98c89f89cc 100644
--- a/src/block/SimplePillar.php
+++ b/src/block/SimplePillar.php
@@ -23,12 +23,12 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\PillarRotationInMetadataTrait;
+use pocketmine\block\utils\PillarRotationTrait;
 
 /**
  * @internal This class provides a general base for pillar-like blocks. It **should not** be used for contract binding
  * in APIs, because not all pillar-like blocks extend this class.
  */
 class SimplePillar extends Opaque{
-	use PillarRotationInMetadataTrait;
+	use PillarRotationTrait;
 }
diff --git a/src/block/SimplePressurePlate.php b/src/block/SimplePressurePlate.php
index 4ad9c5ce40..3429b9b5da 100644
--- a/src/block/SimplePressurePlate.php
+++ b/src/block/SimplePressurePlate.php
@@ -23,20 +23,14 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-abstract class SimplePressurePlate extends PressurePlate{
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use function count;
 
+abstract class SimplePressurePlate extends PressurePlate{
 	protected bool $pressed = false;
 
-	protected function writeStateToMeta() : int{
-		return $this->pressed ? BlockLegacyMetadata::PRESSURE_PLATE_FLAG_POWERED : 0;
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->pressed = ($stateMeta & BlockLegacyMetadata::PRESSURE_PLATE_FLAG_POWERED) !== 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->bool($this->pressed);
 	}
 
 	public function isPressed() : bool{ return $this->pressed; }
@@ -46,4 +40,19 @@ abstract class SimplePressurePlate extends PressurePlate{
 		$this->pressed = $pressed;
 		return $this;
 	}
+
+	protected function hasOutputSignal() : bool{
+		return $this->pressed;
+	}
+
+	protected function calculatePlateState(array $entities) : array{
+		$newPressed = count($entities) > 0;
+		if($newPressed === $this->pressed){
+			return [$this, null];
+		}
+		return [
+			(clone $this)->setPressed($newPressed),
+			$newPressed
+		];
+	}
 }
diff --git a/src/block/Slab.php b/src/block/Slab.php
index f3b21a5b8b..6000bec39e 100644
--- a/src/block/Slab.php
+++ b/src/block/Slab.php
@@ -25,6 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\block\utils\SlabType;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
@@ -33,42 +34,18 @@ use pocketmine\player\Player;
 use pocketmine\world\BlockTransaction;
 
 class Slab extends Transparent{
+	protected SlabType $slabType = SlabType::BOTTOM;
 
-	protected BlockIdentifierFlattened $idInfoFlattened;
-
-	protected SlabType $slabType;
-
-	public function __construct(BlockIdentifierFlattened $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->idInfoFlattened = $idInfo;
-		parent::__construct($idInfo, $name . " Slab", $breakInfo);
-		$this->slabType = SlabType::BOTTOM();
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockTypeInfo $typeInfo){
+		parent::__construct($idInfo, $name . " Slab", $typeInfo);
 	}
 
-	public function getId() : int{
-		return $this->slabType->equals(SlabType::DOUBLE()) ? $this->idInfoFlattened->getSecondId() : parent::getId();
-	}
-
-	protected function writeStateToMeta() : int{
-		if(!$this->slabType->equals(SlabType::DOUBLE())){
-			return ($this->slabType->equals(SlabType::TOP()) ? BlockLegacyMetadata::SLAB_FLAG_UPPER : 0);
-		}
-		return 0;
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		if($id === $this->idInfoFlattened->getSecondId()){
-			$this->slabType = SlabType::DOUBLE();
-		}else{
-			$this->slabType = ($stateMeta & BlockLegacyMetadata::SLAB_FLAG_UPPER) !== 0 ? SlabType::TOP() : SlabType::BOTTOM();
-		}
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1000;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->slabType);
 	}
 
 	public function isTransparent() : bool{
-		return !$this->slabType->equals(SlabType::DOUBLE());
+		return $this->slabType !== SlabType::DOUBLE;
 	}
 
 	/**
@@ -91,8 +68,8 @@ class Slab extends Transparent{
 			return true;
 		}
 
-		if($blockReplace instanceof Slab && !$blockReplace->slabType->equals(SlabType::DOUBLE()) && $blockReplace->isSameType($this)){
-			if($blockReplace->slabType->equals(SlabType::TOP())){ //Trying to combine with top slab
+		if($blockReplace instanceof Slab && $blockReplace->slabType !== SlabType::DOUBLE && $blockReplace->hasSameTypeId($this)){
+			if($blockReplace->slabType === SlabType::TOP){ //Trying to combine with top slab
 				return $clickVector->y <= 0.5 || (!$isClickedBlock && $face === Facing::UP);
 			}else{
 				return $clickVector->y >= 0.5 || (!$isClickedBlock && $face === Facing::DOWN);
@@ -103,14 +80,14 @@ class Slab extends Transparent{
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($blockReplace instanceof Slab && !$blockReplace->slabType->equals(SlabType::DOUBLE()) && $blockReplace->isSameType($this) && (
-			($blockReplace->slabType->equals(SlabType::TOP()) && ($clickVector->y <= 0.5 || $face === Facing::UP)) ||
-			($blockReplace->slabType->equals(SlabType::BOTTOM()) && ($clickVector->y >= 0.5 || $face === Facing::DOWN))
+		if($blockReplace instanceof Slab && $blockReplace->slabType !== SlabType::DOUBLE && $blockReplace->hasSameTypeId($this) && (
+			($blockReplace->slabType === SlabType::TOP && ($clickVector->y <= 0.5 || $face === Facing::UP)) ||
+			($blockReplace->slabType === SlabType::BOTTOM && ($clickVector->y >= 0.5 || $face === Facing::DOWN))
 		)){
 			//Clicked in empty half of existing slab
-			$this->slabType = SlabType::DOUBLE();
+			$this->slabType = SlabType::DOUBLE;
 		}else{
-			$this->slabType = (($face !== Facing::UP && $clickVector->y > 0.5) || $face === Facing::DOWN) ? SlabType::TOP() : SlabType::BOTTOM();
+			$this->slabType = (($face !== Facing::UP && $clickVector->y > 0.5) || $face === Facing::DOWN) ? SlabType::TOP : SlabType::BOTTOM;
 		}
 
 		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
@@ -120,22 +97,22 @@ class Slab extends Transparent{
 	 * @return AxisAlignedBB[]
 	 */
 	protected function recalculateCollisionBoxes() : array{
-		if($this->slabType->equals(SlabType::DOUBLE())){
+		if($this->slabType === SlabType::DOUBLE){
 			return [AxisAlignedBB::one()];
 		}
-		return [AxisAlignedBB::one()->trim($this->slabType->equals(SlabType::TOP()) ? Facing::DOWN : Facing::UP, 0.5)];
+		return [AxisAlignedBB::one()->trim($this->slabType === SlabType::TOP ? Facing::DOWN : Facing::UP, 0.5)];
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		if($this->slabType->equals(SlabType::DOUBLE())){
-			return SupportType::FULL();
-		}elseif(($facing === Facing::UP && $this->slabType->equals(SlabType::TOP())) || ($facing === Facing::DOWN && $this->slabType->equals(SlabType::BOTTOM()))){
-			return SupportType::FULL();
+		if($this->slabType === SlabType::DOUBLE){
+			return SupportType::FULL;
+		}elseif(($facing === Facing::UP && $this->slabType === SlabType::TOP) || ($facing === Facing::DOWN && $this->slabType === SlabType::BOTTOM)){
+			return SupportType::FULL;
 		}
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{
-		return [$this->asItem()->setCount($this->slabType->equals(SlabType::DOUBLE()) ? 2 : 1)];
+		return [$this->asItem()->setCount($this->slabType === SlabType::DOUBLE ? 2 : 1)];
 	}
 }
diff --git a/src/block/SmallDripleaf.php b/src/block/SmallDripleaf.php
new file mode 100644
index 0000000000..d192e43db7
--- /dev/null
+++ b/src/block/SmallDripleaf.php
@@ -0,0 +1,170 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\HorizontalFacingTrait;
+use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\event\block\StructureGrowEvent;
+use pocketmine\item\Fertilizer;
+use pocketmine\item\Item;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\BlockTransaction;
+use pocketmine\world\Position;
+use function mt_rand;
+
+class SmallDripleaf extends Transparent{
+	use HorizontalFacingTrait;
+
+	protected bool $top = false;
+
+	public function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+		$w->bool($this->top);
+	}
+
+	public function isTop() : bool{
+		return $this->top;
+	}
+
+	/** @return $this */
+	public function setTop(bool $top) : self{
+		$this->top = $top;
+		return $this;
+	}
+
+	private function canBeSupportedBy(Block $block) : bool{
+		//TODO: Moss
+		//TODO: Small Dripleaf also can be placed on dirt, coarse dirt, farmland, grass blocks,
+		// podzol, rooted dirt, mycelium, and mud if these blocks are underwater (needs waterlogging)
+		return $block->getTypeId() === BlockTypeIds::CLAY;
+	}
+
+	public function onNearbyBlockChange() : void{
+		if(!$this->top && !$this->canBeSupportedBy($this->getSide(Facing::DOWN))){
+			$this->position->getWorld()->useBreakOn($this->position);
+			return;
+		}
+		$face = $this->top ? Facing::DOWN : Facing::UP;
+		if(!$this->getSide($face)->hasSameTypeId($this)){
+			$this->position->getWorld()->useBreakOn($this->position);
+		}
+	}
+
+	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+		$block = $blockReplace->getSide(Facing::UP);
+		if($block->getTypeId() !== BlockTypeIds::AIR || !$this->canBeSupportedBy($blockReplace->getSide(Facing::DOWN))){
+			return false;
+		}
+		if($player !== null){
+			$this->facing = Facing::opposite($player->getHorizontalFacing());
+		}
+
+		$tx->addBlock($block->position, VanillaBlocks::SMALL_DRIPLEAF()
+			->setFacing($this->facing)
+			->setTop(true)
+		);
+		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($item instanceof Fertilizer && $this->grow($player)){
+			$item->pop();
+			return true;
+		}
+		return false;
+	}
+
+	private function canGrowTo(Position $pos) : bool{
+		$world = $pos->getWorld();
+		if(!$world->isInWorld($pos->getFloorX(), $pos->getFloorY(), $pos->getFloorZ())){
+			return false;
+		}
+		$block = $world->getBlock($pos);
+		return $block->hasSameTypeId($this) || $block->getTypeId() === BlockTypeIds::AIR;
+	}
+
+	private function grow(?Player $player) : bool{
+		$bottomBlock = $this->top ? $this->getSide(Facing::DOWN) : $this;
+		if(!$this->hasSameTypeId($bottomBlock)){
+			return false;
+		}
+		$world = $this->position->getWorld();
+		$tx = new BlockTransaction($world);
+		$height = mt_rand(2, 5);
+		$grown = 0;
+		for($i = 0; $i < $height; $i++){
+			$pos = $bottomBlock->getSide(Facing::UP, $i)->position;
+			if(!$this->canGrowTo($pos)){
+				break;
+			}
+			$block = ++$grown < $height && $this->canGrowTo($pos->getSide(Facing::UP)) ?
+				VanillaBlocks::BIG_DRIPLEAF_STEM() :
+				VanillaBlocks::BIG_DRIPLEAF_HEAD();
+			$tx->addBlock($pos, $block->setFacing($this->facing));
+		}
+		if($grown > 1){
+			$ev = new StructureGrowEvent($bottomBlock, $tx, $player);
+			$ev->call();
+			if(!$ev->isCancelled()){
+				return $tx->apply();
+			}
+		}
+
+		return false;
+	}
+
+	public function getAffectedBlocks() : array{
+		$other = $this->getSide($this->top ? Facing::DOWN : Facing::UP);
+		if($other->hasSameTypeId($this)){
+			return [$this, $other];
+		}
+		return parent::getAffectedBlocks();
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		if(!$this->top){
+			return [$this->asItem()];
+		}
+		return [];
+	}
+
+	public function getFlameEncouragement() : int{
+		return 15;
+	}
+
+	public function getFlammability() : int{
+		return 100;
+	}
+
+	public function getSupportType(int $facing) : SupportType{
+		return SupportType::NONE;
+	}
+
+	protected function recalculateCollisionBoxes() : array{
+		return [];
+	}
+}
diff --git a/src/player/PlayerChunkLoader.php b/src/block/SmithingTable.php
similarity index 61%
rename from src/player/PlayerChunkLoader.php
rename to src/block/SmithingTable.php
index 65267642c1..741e9c02fd 100644
--- a/src/player/PlayerChunkLoader.php
+++ b/src/block/SmithingTable.php
@@ -21,23 +21,24 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\player;
+namespace pocketmine\block;
 
+use pocketmine\block\inventory\SmithingTableInventory;
+use pocketmine\item\Item;
 use pocketmine\math\Vector3;
-use pocketmine\world\TickingChunkLoader;
+use pocketmine\player\Player;
 
-final class PlayerChunkLoader implements TickingChunkLoader{
-	public function __construct(private Vector3 $currentLocation){}
+final class SmithingTable extends Opaque{
 
-	public function setCurrentLocation(Vector3 $currentLocation) : void{
-		$this->currentLocation = $currentLocation;
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($player !== null){
+			$player->setCurrentWindow(new SmithingTableInventory($this->position));
+		}
+
+		return true;
 	}
 
-	public function getX() : float{
-		return $this->currentLocation->getFloorX();
-	}
-
-	public function getZ() : float{
-		return $this->currentLocation->getFloorZ();
+	public function getFuelTime() : int{
+		return 300;
 	}
 }
diff --git a/src/block/SnowLayer.php b/src/block/SnowLayer.php
index 40c4b36339..cca8424a98 100644
--- a/src/block/SnowLayer.php
+++ b/src/block/SnowLayer.php
@@ -23,11 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
+use pocketmine\block\utils\BlockEventHelper;
 use pocketmine\block\utils\Fallable;
 use pocketmine\block\utils\FallableTrait;
 use pocketmine\block\utils\SupportType;
-use pocketmine\event\block\BlockMeltEvent;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
 use pocketmine\math\AxisAlignedBB;
@@ -46,16 +46,8 @@ class SnowLayer extends Flowable implements Fallable{
 
 	protected int $layers = self::MIN_LAYERS;
 
-	protected function writeStateToMeta() : int{
-		return $this->layers - 1;
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->layers = BlockDataSerializer::readBoundedInt("layers", $stateMeta + 1, self::MIN_LAYERS, self::MAX_LAYERS);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->boundedIntAuto(self::MIN_LAYERS, self::MAX_LAYERS, $this->layers);
 	}
 
 	public function getLayers() : int{ return $this->layers; }
@@ -83,13 +75,13 @@ class SnowLayer extends Flowable implements Fallable{
 
 	public function getSupportType(int $facing) : SupportType{
 		if(!$this->canBeReplaced()){
-			return SupportType::FULL();
+			return SupportType::FULL;
 		}
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
-	private function canBeSupportedBy(Block $b) : bool{
-		return $b->getSupportType(Facing::UP)->equals(SupportType::FULL());
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getAdjacentSupportType(Facing::DOWN) === SupportType::FULL;
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
@@ -99,7 +91,7 @@ class SnowLayer extends Flowable implements Fallable{
 			}
 			$this->layers = $blockReplace->layers + 1;
 		}
-		if($this->canBeSupportedBy($blockReplace->getSide(Facing::DOWN))){
+		if($this->canBeSupportedAt($blockReplace)){
 			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 		}
 
@@ -113,18 +105,10 @@ class SnowLayer extends Flowable implements Fallable{
 	public function onRandomTick() : void{
 		$world = $this->position->getWorld();
 		if($world->getBlockLightAt($this->position->x, $this->position->y, $this->position->z) >= 12){
-			$ev = new BlockMeltEvent($this, VanillaBlocks::AIR());
-			$ev->call();
-			if(!$ev->isCancelled()){
-				$world->setBlock($this->position, $ev->getNewState());
-			}
+			BlockEventHelper::melt($this, VanillaBlocks::AIR());
 		}
 	}
 
-	public function tickFalling() : ?Block{
-		return null;
-	}
-
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
 			VanillaItems::SNOWBALL()->setCount(max(1, (int) floor($this->layers / 2)))
diff --git a/src/block/SoulCampfire.php b/src/block/SoulCampfire.php
new file mode 100644
index 0000000000..a9c8fc918f
--- /dev/null
+++ b/src/block/SoulCampfire.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\crafting\FurnaceType;
+use pocketmine\item\Item;
+
+class SoulCampfire extends Campfire{
+
+	public function getLightLevel() : int{
+		return $this->lit ? 10 : 0;
+	}
+
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [
+			VanillaBlocks::SOUL_SOIL()->asItem()
+		];
+	}
+
+	protected function getEntityCollisionDamage() : int{
+		return 2;
+	}
+
+	protected function getFurnaceType() : FurnaceType{
+		return FurnaceType::SOUL_CAMPFIRE;
+	}
+}
diff --git a/src/block/SoulFire.php b/src/block/SoulFire.php
new file mode 100644
index 0000000000..03729c75e3
--- /dev/null
+++ b/src/block/SoulFire.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\math\Facing;
+
+final class SoulFire extends BaseFire{
+
+	public function getLightLevel() : int{
+		return 10;
+	}
+
+	protected function getFireDamage() : int{
+		return 2;
+	}
+
+	public static function canBeSupportedBy(Block $block) : bool{
+		//TODO: this really ought to use some kind of tag system
+		$id = $block->getTypeId();
+		return $id === BlockTypeIds::SOUL_SAND || $id === BlockTypeIds::SOUL_SOIL;
+	}
+
+	public function onNearbyBlockChange() : void{
+		if(!self::canBeSupportedBy($this->getSide(Facing::DOWN))){
+			$this->position->getWorld()->setBlock($this->position, VanillaBlocks::AIR());
+		}
+	}
+}
diff --git a/src/block/Sponge.php b/src/block/Sponge.php
index eb69c64c05..915c98ee1b 100644
--- a/src/block/Sponge.php
+++ b/src/block/Sponge.php
@@ -23,24 +23,13 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-class Sponge extends Opaque{
+use pocketmine\data\runtime\RuntimeDataDescriber;
 
+class Sponge extends Opaque{
 	protected bool $wet = false;
 
-	protected function writeStateToMeta() : int{
-		return $this->wet ? BlockLegacyMetadata::SPONGE_FLAG_WET : 0;
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->wet = ($stateMeta & BlockLegacyMetadata::SPONGE_FLAG_WET) !== 0;
-	}
-
-	protected function writeStateToItemMeta() : int{
-		return $this->writeStateToMeta();
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1;
+	public function describeBlockItemState(RuntimeDataDescriber $w) : void{
+		$w->bool($this->wet);
 	}
 
 	public function isWet() : bool{ return $this->wet; }
diff --git a/src/block/SporeBlossom.php b/src/block/SporeBlossom.php
new file mode 100644
index 0000000000..3ca5fa1f20
--- /dev/null
+++ b/src/block/SporeBlossom.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\block\utils\SupportType;
+use pocketmine\math\Facing;
+
+final class SporeBlossom extends Flowable{
+	use StaticSupportTrait;
+
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getAdjacentSupportType(Facing::UP) === SupportType::FULL;
+	}
+}
diff --git a/src/block/StainedGlass.php b/src/block/StainedGlass.php
index 422d38dde5..bc0d848770 100644
--- a/src/block/StainedGlass.php
+++ b/src/block/StainedGlass.php
@@ -23,14 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\ColorInMetadataTrait;
-use pocketmine\block\utils\DyeColor;
+use pocketmine\block\utils\ColoredTrait;
 
 final class StainedGlass extends Glass{
-	use ColorInMetadataTrait;
-
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->color = DyeColor::WHITE();
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
+	use ColoredTrait;
 }
diff --git a/src/block/StainedGlassPane.php b/src/block/StainedGlassPane.php
index 4514991db9..18ecfdee0e 100644
--- a/src/block/StainedGlassPane.php
+++ b/src/block/StainedGlassPane.php
@@ -23,14 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\ColorInMetadataTrait;
-use pocketmine\block\utils\DyeColor;
+use pocketmine\block\utils\ColoredTrait;
 
 final class StainedGlassPane extends GlassPane{
-	use ColorInMetadataTrait;
-
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->color = DyeColor::WHITE();
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
+	use ColoredTrait;
 }
diff --git a/src/block/StainedHardenedClay.php b/src/block/StainedHardenedClay.php
index 8d07bc0a37..2c2c01ba3a 100644
--- a/src/block/StainedHardenedClay.php
+++ b/src/block/StainedHardenedClay.php
@@ -23,14 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\ColorInMetadataTrait;
-use pocketmine\block\utils\DyeColor;
+use pocketmine\block\utils\ColoredTrait;
 
 final class StainedHardenedClay extends HardenedClay{
-	use ColorInMetadataTrait;
-
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->color = DyeColor::WHITE();
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
+	use ColoredTrait;
 }
diff --git a/src/block/StainedHardenedGlass.php b/src/block/StainedHardenedGlass.php
index 5913841827..cc609a49a9 100644
--- a/src/block/StainedHardenedGlass.php
+++ b/src/block/StainedHardenedGlass.php
@@ -23,14 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\ColorInMetadataTrait;
-use pocketmine\block\utils\DyeColor;
+use pocketmine\block\utils\ColoredTrait;
 
 final class StainedHardenedGlass extends HardenedGlass{
-	use ColorInMetadataTrait;
-
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->color = DyeColor::WHITE();
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
+	use ColoredTrait;
 }
diff --git a/src/block/StainedHardenedGlassPane.php b/src/block/StainedHardenedGlassPane.php
index ea9f213d3b..63dbe1f776 100644
--- a/src/block/StainedHardenedGlassPane.php
+++ b/src/block/StainedHardenedGlassPane.php
@@ -23,14 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\ColorInMetadataTrait;
-use pocketmine\block\utils\DyeColor;
+use pocketmine\block\utils\ColoredTrait;
 
 final class StainedHardenedGlassPane extends HardenedGlassPane{
-	use ColorInMetadataTrait;
-
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->color = DyeColor::WHITE();
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
+	use ColoredTrait;
 }
diff --git a/src/block/Stair.php b/src/block/Stair.php
index 6ffc68be0d..d66a9ce5cf 100644
--- a/src/block/Stair.php
+++ b/src/block/Stair.php
@@ -23,10 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\HorizontalFacingTrait;
 use pocketmine\block\utils\StairShape;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\Axis;
 use pocketmine\math\AxisAlignedBB;
@@ -39,37 +39,28 @@ class Stair extends Transparent{
 	use HorizontalFacingTrait;
 
 	protected bool $upsideDown = false;
-	protected StairShape $shape;
+	protected StairShape $shape = StairShape::STRAIGHT;
 
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->shape = StairShape::STRAIGHT();
-		parent::__construct($idInfo, $name, $breakInfo);
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+		$w->bool($this->upsideDown);
 	}
 
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::write5MinusHorizontalFacing($this->facing) | ($this->upsideDown ? BlockLegacyMetadata::STAIR_FLAG_UPSIDE_DOWN : 0);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::read5MinusHorizontalFacing($stateMeta);
-		$this->upsideDown = ($stateMeta & BlockLegacyMetadata::STAIR_FLAG_UPSIDE_DOWN) !== 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b111;
-	}
-
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 
+		$this->collisionBoxes = null;
+
 		$clockwise = Facing::rotateY($this->facing, true);
 		if(($backFacing = $this->getPossibleCornerFacing(false)) !== null){
-			$this->shape = $backFacing === $clockwise ? StairShape::OUTER_RIGHT() : StairShape::OUTER_LEFT();
+			$this->shape = $backFacing === $clockwise ? StairShape::OUTER_RIGHT : StairShape::OUTER_LEFT;
 		}elseif(($frontFacing = $this->getPossibleCornerFacing(true)) !== null){
-			$this->shape = $frontFacing === $clockwise ? StairShape::INNER_RIGHT() : StairShape::INNER_LEFT();
+			$this->shape = $frontFacing === $clockwise ? StairShape::INNER_RIGHT : StairShape::INNER_LEFT;
 		}else{
-			$this->shape = StairShape::STRAIGHT();
+			$this->shape = StairShape::STRAIGHT;
 		}
+
+		return $this;
 	}
 
 	public function isUpsideDown() : bool{ return $this->upsideDown; }
@@ -98,14 +89,14 @@ class Stair extends Transparent{
 			->trim(Facing::opposite($topStepFace), 0.5)
 			->trim(Facing::opposite($this->facing), 0.5);
 
-		if($this->shape->equals(StairShape::OUTER_LEFT()) || $this->shape->equals(StairShape::OUTER_RIGHT())){
-			$topStep->trim(Facing::rotateY($this->facing, $this->shape->equals(StairShape::OUTER_LEFT())), 0.5);
-		}elseif($this->shape->equals(StairShape::INNER_LEFT()) || $this->shape->equals(StairShape::INNER_RIGHT())){
+		if($this->shape === StairShape::OUTER_LEFT || $this->shape === StairShape::OUTER_RIGHT){
+			$topStep->trim(Facing::rotateY($this->facing, $this->shape === StairShape::OUTER_LEFT), 0.5);
+		}elseif($this->shape === StairShape::INNER_LEFT || $this->shape === StairShape::INNER_RIGHT){
 			//add an extra cube
 			$bbs[] = AxisAlignedBB::one()
 				->trim(Facing::opposite($topStepFace), 0.5)
 				->trim($this->facing, 0.5) //avoid overlapping with main step
-				->trim(Facing::rotateY($this->facing, $this->shape->equals(StairShape::INNER_LEFT())), 0.5);
+				->trim(Facing::rotateY($this->facing, $this->shape === StairShape::INNER_LEFT), 0.5);
 		}
 
 		$bbs[] = $topStep;
@@ -115,15 +106,15 @@ class Stair extends Transparent{
 
 	public function getSupportType(int $facing) : SupportType{
 		if(
-			$facing === Facing::UP && $this->isUpsideDown() ||
-			$facing === Facing::DOWN && !$this->isUpsideDown() ||
-			($facing === $this->facing && !$this->shape->equals(StairShape::OUTER_LEFT()) && !$this->shape->equals(StairShape::OUTER_RIGHT())) ||
-			($facing === Facing::rotate($this->facing, Axis::Y, false) && $this->shape->equals(StairShape::INNER_LEFT())) ||
-			($facing === Facing::rotate($this->facing, Axis::Y, true) && $this->shape->equals(StairShape::INNER_RIGHT()))
+			$facing === Facing::UP && $this->upsideDown ||
+			$facing === Facing::DOWN && !$this->upsideDown ||
+			($facing === $this->facing && $this->shape !== StairShape::OUTER_LEFT && $this->shape !== StairShape::OUTER_RIGHT) ||
+			($facing === Facing::rotate($this->facing, Axis::Y, false) && $this->shape === StairShape::INNER_LEFT) ||
+			($facing === Facing::rotate($this->facing, Axis::Y, true) && $this->shape === StairShape::INNER_RIGHT)
 		){
-			return SupportType::FULL();
+			return SupportType::FULL;
 		}
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	private function getPossibleCornerFacing(bool $oppositeFacing) : ?int{
diff --git a/src/block/Stem.php b/src/block/Stem.php
index 7db17a8d47..2ac95aa3f1 100644
--- a/src/block/Stem.php
+++ b/src/block/Stem.php
@@ -23,42 +23,66 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\event\block\BlockGrowEvent;
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\block\utils\CropGrowthHelper;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\Facing;
 use function array_rand;
 use function mt_rand;
 
 abstract class Stem extends Crops{
+	protected int $facing = Facing::UP;
+
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		parent::describeBlockOnlyState($w);
+		$w->facingExcept($this->facing, Facing::DOWN);
+	}
+
+	public function getFacing() : int{ return $this->facing; }
+
+	/** @return $this */
+	public function setFacing(int $facing) : self{
+		if($facing === Facing::DOWN){
+			throw new \InvalidArgumentException("DOWN is not a valid facing for this block");
+		}
+		$this->facing = $facing;
+		return $this;
+	}
 
 	abstract protected function getPlant() : Block;
 
+	public function onNearbyBlockChange() : void{
+		if($this->facing !== Facing::UP && !$this->getSide($this->facing)->hasSameTypeId($this->getPlant())){
+			$this->position->getWorld()->setBlock($this->position, $this->setFacing(Facing::UP));
+		}
+		parent::onNearbyBlockChange();
+	}
+
+	public function ticksRandomly() : bool{
+		return $this->age < self::MAX_AGE || $this->facing === Facing::UP;
+	}
+
 	public function onRandomTick() : void{
-		if(mt_rand(0, 2) === 1){
+		if($this->facing === Facing::UP && CropGrowthHelper::canGrow($this)){
 			$world = $this->position->getWorld();
 			if($this->age < self::MAX_AGE){
 				$block = clone $this;
 				++$block->age;
-				$ev = new BlockGrowEvent($this, $block);
-				$ev->call();
-				if(!$ev->isCancelled()){
-					$world->setBlock($this->position, $ev->getNewState());
-				}
+				BlockEventHelper::grow($this, $block, null);
 			}else{
 				$grow = $this->getPlant();
 				foreach(Facing::HORIZONTAL as $side){
-					if($this->getSide($side)->isSameType($grow)){
+					if($this->getSide($side)->hasSameTypeId($grow)){
 						return;
 					}
 				}
 
-				$side = $this->getSide(Facing::HORIZONTAL[array_rand(Facing::HORIZONTAL)]);
-				$d = $side->getSide(Facing::DOWN);
-				if($side->getId() === BlockLegacyIds::AIR && ($d->getId() === BlockLegacyIds::FARMLAND || $d->getId() === BlockLegacyIds::GRASS || $d->getId() === BlockLegacyIds::DIRT)){
-					$ev = new BlockGrowEvent($side, $grow);
-					$ev->call();
-					if(!$ev->isCancelled()){
-						$world->setBlock($side->position, $ev->getNewState());
+				$facing = Facing::HORIZONTAL[array_rand(Facing::HORIZONTAL)];
+				$side = $this->getSide($facing);
+				if($side->getTypeId() === BlockTypeIds::AIR && $side->getSide(Facing::DOWN)->hasTypeTag(BlockTypeTags::DIRT)){
+					if(BlockEventHelper::grow($side, $grow, null)){
+						$this->position->getWorld()->setBlock($this->position, $this->setFacing($facing));
 					}
 				}
 			}
diff --git a/src/block/StonePressurePlate.php b/src/block/StonePressurePlate.php
index 626e6d8851..5ddc5a5993 100644
--- a/src/block/StonePressurePlate.php
+++ b/src/block/StonePressurePlate.php
@@ -23,6 +23,13 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Entity;
+use pocketmine\entity\Living;
+use function array_filter;
+
 class StonePressurePlate extends SimplePressurePlate{
 
+	protected function filterIrrelevantEntities(array $entities) : array{
+		return array_filter($entities, fn(Entity $e) => $e instanceof Living); //TODO: armor stands should activate stone plates too
+	}
 }
diff --git a/src/block/Stonecutter.php b/src/block/Stonecutter.php
index e16b00236b..30c19d25dc 100644
--- a/src/block/Stonecutter.php
+++ b/src/block/Stonecutter.php
@@ -24,9 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\inventory\StonecutterInventory;
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\FacesOppositePlacingPlayerTrait;
-use pocketmine\block\utils\HorizontalFacingTrait;
 use pocketmine\block\utils\SupportType;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
@@ -36,21 +34,8 @@ use pocketmine\player\Player;
 
 class Stonecutter extends Transparent{
 	use FacesOppositePlacingPlayerTrait;
-	use HorizontalFacingTrait;
 
-	public function writeStateToMeta() : int{
-		return BlockDataSerializer::writeHorizontalFacing($this->facing);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::readHorizontalFacing($stateMeta);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b111;
-	}
-
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($player !== null){
 			$player->setCurrentWindow(new StonecutterInventory($this->position));
 		}
@@ -62,6 +47,6 @@ class Stonecutter extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 }
diff --git a/src/block/StraightOnlyRail.php b/src/block/StraightOnlyRail.php
index 37c88012f9..054983dbc9 100644
--- a/src/block/StraightOnlyRail.php
+++ b/src/block/StraightOnlyRail.php
@@ -23,8 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\InvalidBlockStateException;
 use pocketmine\block\utils\RailConnectionInfo;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use function array_keys;
 use function implode;
 
@@ -35,21 +36,8 @@ class StraightOnlyRail extends BaseRail{
 
 	private int $railShape = BlockLegacyMetadata::RAIL_STRAIGHT_NORTH_SOUTH;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$railShape = $stateMeta & ~BlockLegacyMetadata::REDSTONE_RAIL_FLAG_POWERED;
-		if(!isset(RailConnectionInfo::CONNECTIONS[$railShape])){
-			throw new InvalidBlockStateException("No rail shape matches meta $stateMeta");
-		}
-		$this->railShape = $railShape;
-	}
-
-	protected function writeStateToMeta() : int{
-		//TODO: railShape won't be plain metadata in the future
-		return $this->railShape;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->straightOnlyRailShape($this->railShape);
 	}
 
 	protected function setShapeFromConnections(array $connections) : void{
diff --git a/src/block/Sugarcane.php b/src/block/Sugarcane.php
index 80c7585041..2da2dc9b97 100644
--- a/src/block/Sugarcane.php
+++ b/src/block/Sugarcane.php
@@ -23,8 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
-use pocketmine\event\block\BlockGrowEvent;
+use pocketmine\block\utils\AgeableTrait;
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\item\Fertilizer;
 use pocketmine\item\Item;
 use pocketmine\math\Facing;
@@ -34,32 +35,23 @@ use pocketmine\world\BlockTransaction;
 use pocketmine\world\Position;
 
 class Sugarcane extends Flowable{
+	use AgeableTrait;
+	use StaticSupportTrait {
+		onNearbyBlockChange as onSupportBlockChange;
+	}
+
 	public const MAX_AGE = 15;
 
-	protected int $age = 0;
-
-	protected function writeStateToMeta() : int{
-		return $this->age;
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->age = BlockDataSerializer::readBoundedInt("age", $stateMeta, 0, self::MAX_AGE);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
 	private function seekToBottom() : Position{
 		$world = $this->position->getWorld();
 		$bottom = $this->position;
-		while(($next = $world->getBlock($bottom->down()))->isSameType($this)){
+		while(($next = $world->getBlock($bottom->down()))->hasSameTypeId($this)){
 			$bottom = $next->position;
 		}
 		return $bottom;
 	}
 
-	private function grow(Position $pos) : bool{
+	private function grow(Position $pos, ?Player $player = null) : bool{
 		$grew = false;
 		$world = $pos->getWorld();
 		for($y = 1; $y < 3; ++$y){
@@ -67,15 +59,13 @@ class Sugarcane extends Flowable{
 				break;
 			}
 			$b = $world->getBlockAt($pos->x, $pos->y + $y, $pos->z);
-			if($b->getId() === BlockLegacyIds::AIR){
-				$ev = new BlockGrowEvent($b, VanillaBlocks::SUGARCANE());
-				$ev->call();
-				if($ev->isCancelled()){
+			if($b->getTypeId() === BlockTypeIds::AIR){
+				if(BlockEventHelper::grow($b, VanillaBlocks::SUGARCANE(), $player)){
+					$grew = true;
+				}else{
 					break;
 				}
-				$world->setBlock($b->position, $ev->getNewState());
-				$grew = true;
-			}elseif(!$b->isSameType($this)){
+			}elseif(!$b->hasSameTypeId($this)){
 				break;
 			}
 		}
@@ -84,20 +74,9 @@ class Sugarcane extends Flowable{
 		return $grew;
 	}
 
-	public function getAge() : int{ return $this->age; }
-
-	/** @return $this */
-	public function setAge(int $age) : self{
-		if($age < 0 || $age > self::MAX_AGE){
-			throw new \InvalidArgumentException("Age must be in range 0 ... " . self::MAX_AGE);
-		}
-		$this->age = $age;
-		return $this;
-	}
-
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($item instanceof Fertilizer){
-			if($this->grow($this->seekToBottom())){
+			if($this->grow($this->seekToBottom(), $player)){
 				$item->pop();
 			}
 
@@ -107,11 +86,12 @@ class Sugarcane extends Flowable{
 		return false;
 	}
 
-	public function onNearbyBlockChange() : void{
-		$down = $this->getSide(Facing::DOWN);
-		if(!$this->isValidSupport($down)){
-			$this->position->getWorld()->useBreakOn($this->position);
-		}
+	private function canBeSupportedAt(Block $block) : bool{
+		$supportBlock = $block->getSide(Facing::DOWN);
+		return $supportBlock->hasSameTypeId($this) ||
+			$supportBlock->hasTypeTag(BlockTypeTags::MUD) ||
+			$supportBlock->hasTypeTag(BlockTypeTags::DIRT) ||
+			$supportBlock->hasTypeTag(BlockTypeTags::SAND);
 	}
 
 	public function ticksRandomly() : bool{
@@ -119,7 +99,13 @@ class Sugarcane extends Flowable{
 	}
 
 	public function onRandomTick() : void{
-		if(!$this->getSide(Facing::DOWN)->isSameType($this)){
+		$down = $this->getSide(Facing::DOWN);
+		if(!$down->hasSameTypeId($this)){
+			if(!$this->hasNearbyWater($down)){
+				$this->position->getWorld()->useBreakOn($this->position, createParticles: true);
+				return;
+			}
+
 			if($this->age === self::MAX_AGE){
 				$this->grow($this->position);
 			}else{
@@ -130,29 +116,38 @@ class Sugarcane extends Flowable{
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		$down = $this->getSide(Facing::DOWN);
-		if($down->isSameType($this)){
+		$down = $blockReplace->getSide(Facing::DOWN);
+		if($down->hasSameTypeId($this)){
 			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-		}elseif($this->isValidSupport($down)){
-			foreach(Facing::HORIZONTAL as $side){
-				$sideBlock = $down->getSide($side);
-				if($sideBlock instanceof Water || $sideBlock instanceof FrostedIce){
-					return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-				}
+		}
+
+		//support criteria are checked by FixedSupportTrait, but this part applies to placement only
+		foreach(Facing::HORIZONTAL as $side){
+			$sideBlock = $down->getSide($side);
+			if($sideBlock instanceof Water || $sideBlock instanceof FrostedIce){
+				return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 			}
 		}
 
 		return false;
 	}
 
-	private function isValidSupport(Block $block) : bool{
-		$id = $block->getId();
-		//TODO: rooted dirt, moss block
-		return $block->isSameType($this)
-			|| $id === BlockLegacyIds::GRASS
-			|| $id === BlockLegacyIds::DIRT
-			|| $id === BlockLegacyIds::PODZOL
-			|| $id === BlockLegacyIds::MYCELIUM
-			|| $id === BlockLegacyIds::SAND;
+	private function hasNearbyWater(Block $down) : bool{
+		foreach($down->getHorizontalSides() as $sideBlock){
+			$blockId = $sideBlock->getTypeId();
+			if($blockId === BlockTypeIds::WATER || $blockId === BlockTypeIds::FROSTED_ICE){
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public function onNearbyBlockChange() : void{
+		$down = $this->getSide(Facing::DOWN);
+		if(!$down->hasSameTypeId($this) && !$this->hasNearbyWater($down)){
+			$this->position->getWorld()->useBreakOn($this->position, createParticles: true);
+		}else{
+			$this->onSupportBlockChange();
+		}
 	}
 }
diff --git a/src/block/SweetBerryBush.php b/src/block/SweetBerryBush.php
index 0f18beba20..eabdde118a 100644
--- a/src/block/SweetBerryBush.php
+++ b/src/block/SweetBerryBush.php
@@ -23,10 +23,12 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
+use pocketmine\block\utils\AgeableTrait;
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\block\utils\FortuneDropHelper;
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
-use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\item\Fertilizer;
 use pocketmine\item\Item;
@@ -34,39 +36,18 @@ use pocketmine\item\VanillaItems;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
-use pocketmine\world\BlockTransaction;
+use pocketmine\world\sound\SweetBerriesPickSound;
 use function mt_rand;
 
 class SweetBerryBush extends Flowable{
+	use AgeableTrait;
+	use StaticSupportTrait;
+
 	public const STAGE_SAPLING = 0;
 	public const STAGE_BUSH_NO_BERRIES = 1;
 	public const STAGE_BUSH_SOME_BERRIES = 2;
 	public const STAGE_MATURE = 3;
-
-	protected int $age = self::STAGE_SAPLING;
-
-	protected function writeStateToMeta() : int{
-		return $this->age;
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->age = BlockDataSerializer::readBoundedInt("stage", $stateMeta, self::STAGE_SAPLING, self::STAGE_MATURE);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b111;
-	}
-
-	public function getAge() : int{ return $this->age; }
-
-	/** @return $this */
-	public function setAge(int $age) : self{
-		if($age < self::STAGE_SAPLING || $age > self::STAGE_MATURE){
-			throw new \InvalidArgumentException("Age must be in range 0-3");
-		}
-		$this->age = $age;
-		return $this;
-	}
+	public const MAX_AGE = self::STAGE_MATURE;
 
 	public function getBerryDropAmount() : int{
 		if($this->age === self::STAGE_MATURE){
@@ -77,35 +58,31 @@ class SweetBerryBush extends Flowable{
 		return 0;
 	}
 
+	/**
+	 * @deprecated
+	 */
 	protected function canBeSupportedBy(Block $block) : bool{
-		$id = $block->getId();
-		return $id === BlockLegacyIds::GRASS || $id === BlockLegacyIds::DIRT || $id === BlockLegacyIds::PODZOL;
+		return $block->getTypeId() !== BlockTypeIds::FARMLAND && //bedrock-specific thing (bug?)
+			($block->hasTypeTag(BlockTypeTags::DIRT) || $block->hasTypeTag(BlockTypeTags::MUD));
 	}
 
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if(!$this->canBeSupportedBy($blockReplace->getSide(Facing::DOWN))){
-			return false;
-		}
-		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+	private function canBeSupportedAt(Block $block) : bool{
+		$supportBlock = $block->getSide(Facing::DOWN);
+		return $this->canBeSupportedBy($supportBlock);
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		$world = $this->position->getWorld();
 		if($this->age < self::STAGE_MATURE && $item instanceof Fertilizer){
 			$block = clone $this;
 			$block->age++;
-
-			$ev = new BlockGrowEvent($this, $block);
-			$ev->call();
-
-			if(!$ev->isCancelled()){
-				$world->setBlock($this->position, $ev->getNewState());
+			if(BlockEventHelper::grow($this, $block, $player)){
 				$item->pop();
 			}
-
 		}elseif(($dropAmount = $this->getBerryDropAmount()) > 0){
 			$world->setBlock($this->position, $this->setAge(self::STAGE_BUSH_NO_BERRIES));
 			$world->dropItem($this->position, $this->asItem()->setCount($dropAmount));
+			$world->addSound($this->position, new SweetBerriesPickSound());
 		}
 
 		return true;
@@ -116,34 +93,25 @@ class SweetBerryBush extends Flowable{
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{
-		if(($dropAmount = $this->getBerryDropAmount()) > 0){
-			return [
-				$this->asItem()->setCount($dropAmount)
-			];
-		}
-
-		return [];
-	}
-
-	public function onNearbyBlockChange() : void{
-		if(!$this->canBeSupportedBy($this->getSide(Facing::DOWN))){
-			$this->position->getWorld()->useBreakOn($this->position);
-		}
+		$count = match($this->age){
+			self::STAGE_MATURE => FortuneDropHelper::discrete($item, 2, 3),
+			self::STAGE_BUSH_SOME_BERRIES => FortuneDropHelper::discrete($item, 1, 2),
+			default => 0
+		};
+		return [
+			$this->asItem()->setCount($count)
+		];
 	}
 
 	public function ticksRandomly() : bool{
-		return true;
+		return $this->age < self::STAGE_MATURE;
 	}
 
 	public function onRandomTick() : void{
 		if($this->age < self::STAGE_MATURE && mt_rand(0, 2) === 1){
 			$block = clone $this;
 			++$block->age;
-			$ev = new BlockGrowEvent($this, $block);
-			$ev->call();
-			if(!$ev->isCancelled()){
-				$this->position->getWorld()->setBlock($this->position, $ev->getNewState());
-			}
+			BlockEventHelper::grow($this, $block, null);
 		}
 	}
 
diff --git a/src/block/TNT.php b/src/block/TNT.php
index 6bd5178a3a..a0256bb673 100644
--- a/src/block/TNT.php
+++ b/src/block/TNT.php
@@ -23,14 +23,16 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\entity\Entity;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\entity\Location;
 use pocketmine\entity\object\PrimedTNT;
-use pocketmine\entity\projectile\Arrow;
+use pocketmine\entity\projectile\Projectile;
 use pocketmine\item\Durable;
 use pocketmine\item\enchantment\VanillaEnchantments;
 use pocketmine\item\FlintSteel;
 use pocketmine\item\Item;
+use pocketmine\item\ItemTypeIds;
+use pocketmine\math\RayTraceResult;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
 use pocketmine\utils\Random;
@@ -40,25 +42,15 @@ use function sin;
 use const M_PI;
 
 class TNT extends Opaque{
-
 	protected bool $unstable = false; //TODO: Usage unclear, seems to be a weird hack in vanilla
 	protected bool $worksUnderwater = false;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->unstable = ($stateMeta & BlockLegacyMetadata::TNT_FLAG_UNSTABLE) !== 0;
-		$this->worksUnderwater = ($stateMeta & BlockLegacyMetadata::TNT_FLAG_UNDERWATER) !== 0;
+	public function describeBlockItemState(RuntimeDataDescriber $w) : void{
+		$w->bool($this->worksUnderwater);
 	}
 
-	protected function writeStateToMeta() : int{
-		return ($this->unstable ? BlockLegacyMetadata::TNT_FLAG_UNSTABLE : 0) | ($this->worksUnderwater ? BlockLegacyMetadata::TNT_FLAG_UNDERWATER : 0);
-	}
-
-	protected function writeStateToItemMeta() : int{
-		return $this->worksUnderwater ? BlockLegacyMetadata::TNT_FLAG_UNDERWATER : 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b11;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->bool($this->unstable);
 	}
 
 	public function isUnstable() : bool{ return $this->unstable; }
@@ -77,15 +69,20 @@ class TNT extends Opaque{
 		return $this;
 	}
 
-	public function onBreak(Item $item, ?Player $player = null) : bool{
+	public function onBreak(Item $item, ?Player $player = null, array &$returnedItems = []) : bool{
 		if($this->unstable){
 			$this->ignite();
 			return true;
 		}
-		return parent::onBreak($item, $player);
+		return parent::onBreak($item, $player, $returnedItems);
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($item->getTypeId() === ItemTypeIds::FIRE_CHARGE){
+			$item->pop();
+			$this->ignite();
+			return true;
+		}
 		if($item instanceof FlintSteel || $item->hasEnchantment(VanillaEnchantments::FIRE_ASPECT())){
 			if($item instanceof Durable){
 				$item->applyDamage(1);
@@ -97,18 +94,6 @@ class TNT extends Opaque{
 		return false;
 	}
 
-	public function hasEntityCollision() : bool{
-		return true;
-	}
-
-	public function onEntityInside(Entity $entity) : bool{
-		if($entity instanceof Arrow && $entity->isOnFire()){
-			$this->ignite();
-			return false;
-		}
-		return true;
-	}
-
 	public function ignite(int $fuse = 80) : void{
 		$world = $this->position->getWorld();
 		$world->setBlock($this->position, VanillaBlocks::AIR());
@@ -135,4 +120,10 @@ class TNT extends Opaque{
 	public function onIncinerate() : void{
 		$this->ignite();
 	}
+
+	public function onProjectileHit(Projectile $projectile, RayTraceResult $hitResult) : void{
+		if($projectile->isOnFire()){
+			$this->ignite();
+		}
+	}
 }
diff --git a/src/block/TallGrass.php b/src/block/TallGrass.php
index 586b157030..459751c4e9 100644
--- a/src/block/TallGrass.php
+++ b/src/block/TallGrass.php
@@ -23,50 +23,16 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
-use pocketmine\item\VanillaItems;
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\block\utils\TallGrassTrait;
 use pocketmine\math\Facing;
-use pocketmine\math\Vector3;
-use pocketmine\player\Player;
-use pocketmine\world\BlockTransaction;
-use function mt_rand;
 
 class TallGrass extends Flowable{
+	use TallGrassTrait;
+	use StaticSupportTrait;
 
-	public function canBeReplaced() : bool{
-		return true;
-	}
-
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		$down = $this->getSide(Facing::DOWN)->getId();
-		if($down === BlockLegacyIds::GRASS || $down === BlockLegacyIds::DIRT){
-			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-		}
-
-		return false;
-	}
-
-	public function onNearbyBlockChange() : void{
-		if($this->getSide(Facing::DOWN)->isTransparent()){ //Replace with common break method
-			$this->position->getWorld()->useBreakOn($this->position);
-		}
-	}
-
-	public function getDropsForIncompatibleTool(Item $item) : array{
-		if(mt_rand(0, 15) === 0){
-			return [
-				VanillaItems::WHEAT_SEEDS()
-			];
-		}
-
-		return [];
-	}
-
-	public function getFlameEncouragement() : int{
-		return 60;
-	}
-
-	public function getFlammability() : int{
-		return 100;
+	private function canBeSupportedAt(Block $block) : bool{
+		$supportBlock = $block->getSide(Facing::DOWN);
+		return $supportBlock->hasTypeTag(BlockTypeTags::DIRT) || $supportBlock->hasTypeTag(BlockTypeTags::MUD);
 	}
 }
diff --git a/src/block/Thin.php b/src/block/Thin.php
index d480d43bbd..dde2d7d847 100644
--- a/src/block/Thin.php
+++ b/src/block/Thin.php
@@ -36,17 +36,21 @@ class Thin extends Transparent{
 	/** @var bool[] facing => dummy */
 	protected array $connections = [];
 
-	public function readStateFromWorld() : void{
+	public function readStateFromWorld() : Block{
 		parent::readStateFromWorld();
 
+		$this->collisionBoxes = null;
+
 		foreach(Facing::HORIZONTAL as $facing){
 			$side = $this->getSide($facing);
-			if($side instanceof Thin || $side instanceof Wall || $side->isFullCube()){
+			if($side instanceof Thin || $side instanceof Wall || $side->getSupportType(Facing::opposite($facing)) === SupportType::FULL){
 				$this->connections[$facing] = true;
 			}else{
 				unset($this->connections[$facing]);
 			}
 		}
+
+		return $this;
 	}
 
 	protected function recalculateCollisionBoxes() : array{
@@ -88,6 +92,6 @@ class Thin extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 }
diff --git a/src/block/Log.php b/src/block/TintedGlass.php
similarity index 79%
rename from src/block/Log.php
rename to src/block/TintedGlass.php
index b96a0d3800..752f07c93c 100644
--- a/src/block/Log.php
+++ b/src/block/TintedGlass.php
@@ -23,12 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\PillarRotationInMetadataTrait;
+final class TintedGlass extends Transparent{
 
-class Log extends Wood{
-	use PillarRotationInMetadataTrait;
-
-	protected function getAxisMetaShift() : int{
-		return $this->isStripped() ? 0 : 2;
+	public function getLightFilter() : int{
+		return 15;
 	}
 }
diff --git a/src/block/Torch.php b/src/block/Torch.php
index 768c212232..aee4da32aa 100644
--- a/src/block/Torch.php
+++ b/src/block/Torch.php
@@ -23,10 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
-use pocketmine\math\Axis;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
@@ -36,17 +35,8 @@ class Torch extends Flowable{
 
 	protected int $facing = Facing::UP;
 
-	protected function writeStateToMeta() : int{
-		return $this->facing === Facing::UP ? 5 : 6 - BlockDataSerializer::writeHorizontalFacing($this->facing);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$facingMeta = $stateMeta & 0x7;
-		$this->facing = $facingMeta === 5 ? Facing::UP : BlockDataSerializer::readHorizontalFacing(6 - $facingMeta);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->facingExcept($this->facing, Facing::DOWN);
 	}
 
 	public function getFacing() : int{ return $this->facing; }
@@ -65,15 +55,13 @@ class Torch extends Flowable{
 	}
 
 	public function onNearbyBlockChange() : void{
-		$face = Facing::opposite($this->facing);
-
-		if(!$this->canBeSupportedBy($this->getSide($face), $this->facing)){
+		if(!$this->canBeSupportedAt($this, Facing::opposite($this->facing))){
 			$this->position->getWorld()->useBreakOn($this->position);
 		}
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if($face !== Facing::DOWN && $this->canBeSupportedBy($blockReplace->getSide(Facing::opposite($face)), $face)){
+		if($face !== Facing::DOWN && $this->canBeSupportedAt($blockReplace, Facing::opposite($face))){
 			$this->facing = $face;
 			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 		}else{
@@ -84,8 +72,7 @@ class Torch extends Flowable{
 				Facing::EAST,
 				Facing::DOWN
 			] as $side){
-				$block = $this->getSide($side);
-				if($this->canBeSupportedBy($block, Facing::opposite($side))){
+				if($this->canBeSupportedAt($blockReplace, $side)){
 					$this->facing = Facing::opposite($side);
 					return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 				}
@@ -94,8 +81,9 @@ class Torch extends Flowable{
 		return false;
 	}
 
-	private function canBeSupportedBy(Block $support, int $face) : bool{
-		return ($face === Facing::UP && $support->getSupportType($face)->hasCenterSupport()) ||
-			(Facing::axis($face) !== Axis::Y && $support->getSupportType($face)->equals(SupportType::FULL()));
+	private function canBeSupportedAt(Block $block, int $face) : bool{
+		return $face === Facing::DOWN ?
+			$block->getAdjacentSupportType($face)->hasCenterSupport() :
+			$block->getAdjacentSupportType($face) === SupportType::FULL;
 	}
 }
diff --git a/src/block/TorchflowerCrop.php b/src/block/TorchflowerCrop.php
new file mode 100644
index 0000000000..033b08552e
--- /dev/null
+++ b/src/block/TorchflowerCrop.php
@@ -0,0 +1,90 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\BlockEventHelper;
+use pocketmine\block\utils\CropGrowthHelper;
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\item\Fertilizer;
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+
+final class TorchflowerCrop extends Flowable{
+	use StaticSupportTrait;
+
+	private bool $ready = false;
+
+	public function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->bool($this->ready);
+	}
+
+	public function isReady() : bool{ return $this->ready; }
+
+	public function setReady(bool $ready) : self{
+		$this->ready = $ready;
+		return $this;
+	}
+
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getSide(Facing::DOWN)->getTypeId() === BlockTypeIds::FARMLAND;
+	}
+
+	private function getNextState() : Block{
+		if($this->ready){
+			return VanillaBlocks::TORCHFLOWER();
+		}else{
+			return VanillaBlocks::TORCHFLOWER_CROP()->setReady(true);
+		}
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($item instanceof Fertilizer){
+			if(BlockEventHelper::grow($this, $this->getNextState(), $player)){
+				$item->pop();
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
+		if(CropGrowthHelper::canGrow($this)){
+			BlockEventHelper::grow($this, $this->getNextState(), null);
+		}
+	}
+
+	public function asItem() : Item{
+		return VanillaItems::TORCHFLOWER_SEEDS();
+	}
+}
diff --git a/src/block/Trapdoor.php b/src/block/Trapdoor.php
index 6082aee51e..20b6af2abd 100644
--- a/src/block/Trapdoor.php
+++ b/src/block/Trapdoor.php
@@ -23,9 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\HorizontalFacingTrait;
 use pocketmine\block\utils\SupportType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
@@ -40,20 +40,10 @@ class Trapdoor extends Transparent{
 	protected bool $open = false;
 	protected bool $top = false;
 
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::write5MinusHorizontalFacing($this->facing) | ($this->top ? BlockLegacyMetadata::TRAPDOOR_FLAG_UPPER : 0) | ($this->open ? BlockLegacyMetadata::TRAPDOOR_FLAG_OPEN : 0);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		//TODO: in PC the values are reversed (facing - 2)
-
-		$this->facing = BlockDataSerializer::read5MinusHorizontalFacing($stateMeta);
-		$this->top = ($stateMeta & BlockLegacyMetadata::TRAPDOOR_FLAG_UPPER) !== 0;
-		$this->open = ($stateMeta & BlockLegacyMetadata::TRAPDOOR_FLAG_OPEN) !== 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+		$w->bool($this->top);
+		$w->bool($this->open);
 	}
 
 	public function isOpen() : bool{ return $this->open; }
@@ -80,7 +70,7 @@ class Trapdoor extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return SupportType::NONE();
+		return SupportType::NONE;
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
@@ -94,7 +84,7 @@ class Trapdoor extends Transparent{
 		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		$this->open = !$this->open;
 		$world = $this->position->getWorld();
 		$world->setBlock($this->position, $this);
diff --git a/src/block/Tripwire.php b/src/block/Tripwire.php
index 504ae68eb8..2ddad2784a 100644
--- a/src/block/Tripwire.php
+++ b/src/block/Tripwire.php
@@ -23,29 +23,21 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-class Tripwire extends Flowable{
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
 
+class Tripwire extends Flowable{
 	protected bool $triggered = false;
 	protected bool $suspended = false; //unclear usage, makes hitbox bigger if set
 	protected bool $connected = false;
 	protected bool $disarmed = false;
 
-	protected function writeStateToMeta() : int{
-		return ($this->triggered ? BlockLegacyMetadata::TRIPWIRE_FLAG_TRIGGERED : 0) |
-			($this->suspended ? BlockLegacyMetadata::TRIPWIRE_FLAG_SUSPENDED : 0) |
-			($this->connected ? BlockLegacyMetadata::TRIPWIRE_FLAG_CONNECTED : 0) |
-			($this->disarmed ? BlockLegacyMetadata::TRIPWIRE_FLAG_DISARMED : 0);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->triggered = ($stateMeta & BlockLegacyMetadata::TRIPWIRE_FLAG_TRIGGERED) !== 0;
-		$this->suspended = ($stateMeta & BlockLegacyMetadata::TRIPWIRE_FLAG_SUSPENDED) !== 0;
-		$this->connected = ($stateMeta & BlockLegacyMetadata::TRIPWIRE_FLAG_CONNECTED) !== 0;
-		$this->disarmed = ($stateMeta & BlockLegacyMetadata::TRIPWIRE_FLAG_DISARMED) !== 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->bool($this->triggered);
+		$w->bool($this->suspended);
+		$w->bool($this->connected);
+		$w->bool($this->disarmed);
 	}
 
 	public function isTriggered() : bool{ return $this->triggered; }
@@ -79,4 +71,8 @@ class Tripwire extends Flowable{
 		$this->disarmed = $disarmed;
 		return $this;
 	}
+
+	public function asItem() : Item{
+		return VanillaItems::STRING();
+	}
 }
diff --git a/src/block/TripwireHook.php b/src/block/TripwireHook.php
index 87490d7322..3258198252 100644
--- a/src/block/TripwireHook.php
+++ b/src/block/TripwireHook.php
@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\block\utils\HorizontalFacingTrait;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
@@ -38,20 +38,10 @@ class TripwireHook extends Flowable{
 	protected bool $connected = false;
 	protected bool $powered = false;
 
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::writeLegacyHorizontalFacing($this->facing) |
-			($this->connected ? BlockLegacyMetadata::TRIPWIRE_HOOK_FLAG_CONNECTED : 0) |
-			($this->powered ? BlockLegacyMetadata::TRIPWIRE_HOOK_FLAG_POWERED : 0);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::readLegacyHorizontalFacing($stateMeta & 0x03);
-		$this->connected = ($stateMeta & BlockLegacyMetadata::TRIPWIRE_HOOK_FLAG_CONNECTED) !== 0;
-		$this->powered = ($stateMeta & BlockLegacyMetadata::TRIPWIRE_HOOK_FLAG_POWERED) !== 0;
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+		$w->bool($this->connected);
+		$w->bool($this->powered);
 	}
 
 	public function isConnected() : bool{ return $this->connected; }
diff --git a/src/block/UnknownBlock.php b/src/block/UnknownBlock.php
index e81e0ed19d..97c7c80a44 100644
--- a/src/block/UnknownBlock.php
+++ b/src/block/UnknownBlock.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 
 /**
@@ -30,8 +31,17 @@ use pocketmine\item\Item;
  */
 class UnknownBlock extends Transparent{
 
-	public function __construct(BlockIdentifier $idInfo, BlockBreakInfo $breakInfo){
-		parent::__construct($idInfo, "Unknown", $breakInfo);
+	private int $stateData;
+
+	public function __construct(BlockIdentifier $idInfo, BlockTypeInfo $typeInfo, int $stateData){
+		$this->stateData = $stateData;
+		parent::__construct($idInfo, "Unknown", $typeInfo);
+	}
+
+	public function describeBlockItemState(RuntimeDataDescriber $w) : void{
+		//use type instead of state, so we don't lose any information like colour
+		//this might be an improperly registered plugin block
+		$w->int(Block::INTERNAL_STATE_DATA_BITS, $this->stateData);
 	}
 
 	public function canBePlaced() : bool{
diff --git a/src/block/VanillaBlocks.php b/src/block/VanillaBlocks.php
index c2216c5dd7..54cf90a0c3 100644
--- a/src/block/VanillaBlocks.php
+++ b/src/block/VanillaBlocks.php
@@ -23,8 +23,54 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\BlockLegacyIds as Ids;
+use pocketmine\block\BlockBreakInfo as BreakInfo;
+use pocketmine\block\BlockIdentifier as BID;
+use pocketmine\block\BlockToolType as ToolType;
+use pocketmine\block\BlockTypeInfo as Info;
+use pocketmine\block\BlockTypeTags as Tags;
+use pocketmine\block\tile\Banner as TileBanner;
+use pocketmine\block\tile\Barrel as TileBarrel;
+use pocketmine\block\tile\Beacon as TileBeacon;
+use pocketmine\block\tile\Bed as TileBed;
+use pocketmine\block\tile\Bell as TileBell;
+use pocketmine\block\tile\BlastFurnace as TileBlastFurnace;
+use pocketmine\block\tile\BrewingStand as TileBrewingStand;
+use pocketmine\block\tile\Campfire as TileCampfire;
+use pocketmine\block\tile\Cauldron as TileCauldron;
+use pocketmine\block\tile\Chest as TileChest;
+use pocketmine\block\tile\ChiseledBookshelf as TileChiseledBookshelf;
+use pocketmine\block\tile\Comparator as TileComparator;
+use pocketmine\block\tile\DaylightSensor as TileDaylightSensor;
+use pocketmine\block\tile\EnchantTable as TileEnchantingTable;
+use pocketmine\block\tile\EnderChest as TileEnderChest;
+use pocketmine\block\tile\FlowerPot as TileFlowerPot;
+use pocketmine\block\tile\GlowingItemFrame as TileGlowingItemFrame;
+use pocketmine\block\tile\Hopper as TileHopper;
+use pocketmine\block\tile\ItemFrame as TileItemFrame;
+use pocketmine\block\tile\Jukebox as TileJukebox;
+use pocketmine\block\tile\Lectern as TileLectern;
+use pocketmine\block\tile\MobHead as TileMobHead;
+use pocketmine\block\tile\MonsterSpawner as TileMonsterSpawner;
+use pocketmine\block\tile\NormalFurnace as TileNormalFurnace;
+use pocketmine\block\tile\Note as TileNote;
+use pocketmine\block\tile\ShulkerBox as TileShulkerBox;
+use pocketmine\block\tile\Smoker as TileSmoker;
+use pocketmine\block\tile\Tile;
+use pocketmine\block\utils\AmethystTrait;
+use pocketmine\block\utils\LeavesType;
+use pocketmine\block\utils\SaplingType;
+use pocketmine\block\utils\WoodType;
+use pocketmine\crafting\FurnaceType;
+use pocketmine\item\enchantment\ItemEnchantmentTags as EnchantmentTags;
+use pocketmine\item\Item;
+use pocketmine\item\ToolTier;
+use pocketmine\item\VanillaItems;
+use pocketmine\math\Facing;
 use pocketmine\utils\CloningRegistryTrait;
+use function is_int;
+use function mb_strtolower;
+use function mb_strtoupper;
+use function strtolower;
 
 /**
  * This doc-block is generated automatically, do not modify it manually.
@@ -37,7 +83,7 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static WoodenFence ACACIA_FENCE()
  * @method static FenceGate ACACIA_FENCE_GATE()
  * @method static Leaves ACACIA_LEAVES()
- * @method static Log ACACIA_LOG()
+ * @method static Wood ACACIA_LOG()
  * @method static Planks ACACIA_PLANKS()
  * @method static WoodenPressurePlate ACACIA_PRESSURE_PLATE()
  * @method static Sapling ACACIA_SAPLING()
@@ -51,28 +97,35 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Air AIR()
  * @method static Flower ALLIUM()
  * @method static MushroomStem ALL_SIDED_MUSHROOM_STEM()
+ * @method static Opaque AMETHYST()
+ * @method static AmethystCluster AMETHYST_CLUSTER()
+ * @method static Opaque ANCIENT_DEBRIS()
  * @method static Opaque ANDESITE()
  * @method static Slab ANDESITE_SLAB()
  * @method static Stair ANDESITE_STAIRS()
  * @method static Wall ANDESITE_WALL()
  * @method static Anvil ANVIL()
+ * @method static Leaves AZALEA_LEAVES()
  * @method static Flower AZURE_BLUET()
  * @method static Bamboo BAMBOO()
  * @method static BambooSapling BAMBOO_SAPLING()
  * @method static FloorBanner BANNER()
  * @method static Barrel BARREL()
  * @method static Transparent BARRIER()
+ * @method static SimplePillar BASALT()
  * @method static Beacon BEACON()
  * @method static Bed BED()
  * @method static Bedrock BEDROCK()
  * @method static Beetroot BEETROOTS()
  * @method static Bell BELL()
+ * @method static BigDripleafHead BIG_DRIPLEAF_HEAD()
+ * @method static BigDripleafStem BIG_DRIPLEAF_STEM()
  * @method static WoodenButton BIRCH_BUTTON()
  * @method static WoodenDoor BIRCH_DOOR()
  * @method static WoodenFence BIRCH_FENCE()
  * @method static FenceGate BIRCH_FENCE_GATE()
  * @method static Leaves BIRCH_LEAVES()
- * @method static Log BIRCH_LOG()
+ * @method static Wood BIRCH_LOG()
  * @method static Planks BIRCH_PLANKS()
  * @method static WoodenPressurePlate BIRCH_PRESSURE_PLATE()
  * @method static Sapling BIRCH_SAPLING()
@@ -82,9 +135,11 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static WoodenTrapdoor BIRCH_TRAPDOOR()
  * @method static WallSign BIRCH_WALL_SIGN()
  * @method static Wood BIRCH_WOOD()
- * @method static GlazedTerracotta BLACK_GLAZED_TERRACOTTA()
+ * @method static Opaque BLACKSTONE()
+ * @method static Slab BLACKSTONE_SLAB()
+ * @method static Stair BLACKSTONE_STAIRS()
+ * @method static Wall BLACKSTONE_WALL()
  * @method static Furnace BLAST_FURNACE()
- * @method static GlazedTerracotta BLUE_GLAZED_TERRACOTTA()
  * @method static BlueIce BLUE_ICE()
  * @method static Flower BLUE_ORCHID()
  * @method static Torch BLUE_TORCH()
@@ -95,23 +150,59 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Slab BRICK_SLAB()
  * @method static Stair BRICK_STAIRS()
  * @method static Wall BRICK_WALL()
- * @method static GlazedTerracotta BROWN_GLAZED_TERRACOTTA()
  * @method static BrownMushroom BROWN_MUSHROOM()
  * @method static BrownMushroomBlock BROWN_MUSHROOM_BLOCK()
+ * @method static BuddingAmethyst BUDDING_AMETHYST()
  * @method static Cactus CACTUS()
  * @method static Cake CAKE()
+ * @method static CakeWithCandle CAKE_WITH_CANDLE()
+ * @method static CakeWithDyedCandle CAKE_WITH_DYED_CANDLE()
+ * @method static Opaque CALCITE()
+ * @method static Campfire CAMPFIRE()
+ * @method static Candle CANDLE()
  * @method static Carpet CARPET()
  * @method static Carrot CARROTS()
+ * @method static CartographyTable CARTOGRAPHY_TABLE()
  * @method static CarvedPumpkin CARVED_PUMPKIN()
+ * @method static Cauldron CAULDRON()
+ * @method static CaveVines CAVE_VINES()
+ * @method static Chain CHAIN()
  * @method static ChemicalHeat CHEMICAL_HEAT()
+ * @method static WoodenButton CHERRY_BUTTON()
+ * @method static WoodenDoor CHERRY_DOOR()
+ * @method static WoodenFence CHERRY_FENCE()
+ * @method static FenceGate CHERRY_FENCE_GATE()
+ * @method static Leaves CHERRY_LEAVES()
+ * @method static Wood CHERRY_LOG()
+ * @method static Planks CHERRY_PLANKS()
+ * @method static WoodenPressurePlate CHERRY_PRESSURE_PLATE()
+ * @method static FloorSign CHERRY_SIGN()
+ * @method static WoodenSlab CHERRY_SLAB()
+ * @method static WoodenStairs CHERRY_STAIRS()
+ * @method static WoodenTrapdoor CHERRY_TRAPDOOR()
+ * @method static WallSign CHERRY_WALL_SIGN()
+ * @method static Wood CHERRY_WOOD()
  * @method static Chest CHEST()
+ * @method static ChiseledBookshelf CHISELED_BOOKSHELF()
+ * @method static Copper CHISELED_COPPER()
+ * @method static Opaque CHISELED_DEEPSLATE()
+ * @method static Opaque CHISELED_NETHER_BRICKS()
+ * @method static Opaque CHISELED_POLISHED_BLACKSTONE()
  * @method static SimplePillar CHISELED_QUARTZ()
  * @method static Opaque CHISELED_RED_SANDSTONE()
  * @method static Opaque CHISELED_SANDSTONE()
  * @method static Opaque CHISELED_STONE_BRICKS()
+ * @method static Opaque CHISELED_TUFF()
+ * @method static Opaque CHISELED_TUFF_BRICKS()
+ * @method static ChorusFlower CHORUS_FLOWER()
+ * @method static ChorusPlant CHORUS_PLANT()
  * @method static Clay CLAY()
  * @method static Coal COAL()
  * @method static CoalOre COAL_ORE()
+ * @method static Opaque COBBLED_DEEPSLATE()
+ * @method static Slab COBBLED_DEEPSLATE_SLAB()
+ * @method static Stair COBBLED_DEEPSLATE_STAIRS()
+ * @method static Wall COBBLED_DEEPSLATE_WALL()
  * @method static Opaque COBBLESTONE()
  * @method static Slab COBBLESTONE_SLAB()
  * @method static Stair COBBLESTONE_STAIRS()
@@ -121,24 +212,51 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static ChemistryTable COMPOUND_CREATOR()
  * @method static Concrete CONCRETE()
  * @method static ConcretePowder CONCRETE_POWDER()
+ * @method static Copper COPPER()
+ * @method static CopperBulb COPPER_BULB()
+ * @method static CopperDoor COPPER_DOOR()
+ * @method static CopperGrate COPPER_GRATE()
+ * @method static CopperOre COPPER_ORE()
+ * @method static CopperTrapdoor COPPER_TRAPDOOR()
  * @method static Coral CORAL()
  * @method static CoralBlock CORAL_BLOCK()
  * @method static FloorCoralFan CORAL_FAN()
  * @method static Flower CORNFLOWER()
+ * @method static Opaque CRACKED_DEEPSLATE_BRICKS()
+ * @method static Opaque CRACKED_DEEPSLATE_TILES()
+ * @method static Opaque CRACKED_NETHER_BRICKS()
+ * @method static Opaque CRACKED_POLISHED_BLACKSTONE_BRICKS()
  * @method static Opaque CRACKED_STONE_BRICKS()
  * @method static CraftingTable CRAFTING_TABLE()
+ * @method static WoodenButton CRIMSON_BUTTON()
+ * @method static WoodenDoor CRIMSON_DOOR()
+ * @method static WoodenFence CRIMSON_FENCE()
+ * @method static FenceGate CRIMSON_FENCE_GATE()
+ * @method static Wood CRIMSON_HYPHAE()
+ * @method static Planks CRIMSON_PLANKS()
+ * @method static WoodenPressurePlate CRIMSON_PRESSURE_PLATE()
+ * @method static NetherRoots CRIMSON_ROOTS()
+ * @method static FloorSign CRIMSON_SIGN()
+ * @method static WoodenSlab CRIMSON_SLAB()
+ * @method static WoodenStairs CRIMSON_STAIRS()
+ * @method static Wood CRIMSON_STEM()
+ * @method static WoodenTrapdoor CRIMSON_TRAPDOOR()
+ * @method static WallSign CRIMSON_WALL_SIGN()
+ * @method static Opaque CRYING_OBSIDIAN()
+ * @method static Copper CUT_COPPER()
+ * @method static CopperSlab CUT_COPPER_SLAB()
+ * @method static CopperStairs CUT_COPPER_STAIRS()
  * @method static Opaque CUT_RED_SANDSTONE()
  * @method static Slab CUT_RED_SANDSTONE_SLAB()
  * @method static Opaque CUT_SANDSTONE()
  * @method static Slab CUT_SANDSTONE_SLAB()
- * @method static GlazedTerracotta CYAN_GLAZED_TERRACOTTA()
  * @method static Flower DANDELION()
  * @method static WoodenButton DARK_OAK_BUTTON()
  * @method static WoodenDoor DARK_OAK_DOOR()
  * @method static WoodenFence DARK_OAK_FENCE()
  * @method static FenceGate DARK_OAK_FENCE_GATE()
  * @method static Leaves DARK_OAK_LEAVES()
- * @method static Log DARK_OAK_LOG()
+ * @method static Wood DARK_OAK_LOG()
  * @method static Planks DARK_OAK_PLANKS()
  * @method static WoodenPressurePlate DARK_OAK_PRESSURE_PLATE()
  * @method static Sapling DARK_OAK_SAPLING()
@@ -153,6 +271,23 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Stair DARK_PRISMARINE_STAIRS()
  * @method static DaylightSensor DAYLIGHT_SENSOR()
  * @method static DeadBush DEAD_BUSH()
+ * @method static SimplePillar DEEPSLATE()
+ * @method static Opaque DEEPSLATE_BRICKS()
+ * @method static Slab DEEPSLATE_BRICK_SLAB()
+ * @method static Stair DEEPSLATE_BRICK_STAIRS()
+ * @method static Wall DEEPSLATE_BRICK_WALL()
+ * @method static CoalOre DEEPSLATE_COAL_ORE()
+ * @method static CopperOre DEEPSLATE_COPPER_ORE()
+ * @method static DiamondOre DEEPSLATE_DIAMOND_ORE()
+ * @method static EmeraldOre DEEPSLATE_EMERALD_ORE()
+ * @method static GoldOre DEEPSLATE_GOLD_ORE()
+ * @method static IronOre DEEPSLATE_IRON_ORE()
+ * @method static LapisOre DEEPSLATE_LAPIS_LAZULI_ORE()
+ * @method static RedstoneOre DEEPSLATE_REDSTONE_ORE()
+ * @method static Opaque DEEPSLATE_TILES()
+ * @method static Slab DEEPSLATE_TILE_SLAB()
+ * @method static Stair DEEPSLATE_TILE_STAIRS()
+ * @method static Wall DEEPSLATE_TILE_WALL()
  * @method static DetectorRail DETECTOR_RAIL()
  * @method static Opaque DIAMOND()
  * @method static DiamondOre DIAMOND_ORE()
@@ -161,9 +296,11 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Stair DIORITE_STAIRS()
  * @method static Wall DIORITE_WALL()
  * @method static Dirt DIRT()
+ * @method static DoublePitcherCrop DOUBLE_PITCHER_CROP()
  * @method static DoubleTallGrass DOUBLE_TALLGRASS()
  * @method static DragonEgg DRAGON_EGG()
  * @method static DriedKelp DRIED_KELP()
+ * @method static DyedCandle DYED_CANDLE()
  * @method static DyedShulkerBox DYED_SHULKER_BOX()
  * @method static Element ELEMENT_ACTINIUM()
  * @method static Element ELEMENT_ALUMINUM()
@@ -301,15 +438,21 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static TallGrass FERN()
  * @method static Fire FIRE()
  * @method static FletchingTable FLETCHING_TABLE()
+ * @method static Leaves FLOWERING_AZALEA_LEAVES()
  * @method static FlowerPot FLOWER_POT()
+ * @method static Froglight FROGLIGHT()
  * @method static FrostedIce FROSTED_ICE()
  * @method static Furnace FURNACE()
+ * @method static GildedBlackstone GILDED_BLACKSTONE()
  * @method static Glass GLASS()
  * @method static GlassPane GLASS_PANE()
+ * @method static GlazedTerracotta GLAZED_TERRACOTTA()
+ * @method static ItemFrame GLOWING_ITEM_FRAME()
  * @method static GlowingObsidian GLOWING_OBSIDIAN()
  * @method static Glowstone GLOWSTONE()
+ * @method static GlowLichen GLOW_LICHEN()
  * @method static Opaque GOLD()
- * @method static Opaque GOLD_ORE()
+ * @method static GoldOre GOLD_ORE()
  * @method static Opaque GRANITE()
  * @method static Slab GRANITE_SLAB()
  * @method static Stair GRANITE_STAIRS()
@@ -317,13 +460,13 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Grass GRASS()
  * @method static GrassPath GRASS_PATH()
  * @method static Gravel GRAVEL()
- * @method static GlazedTerracotta GRAY_GLAZED_TERRACOTTA()
- * @method static GlazedTerracotta GREEN_GLAZED_TERRACOTTA()
  * @method static Torch GREEN_TORCH()
+ * @method static HangingRoots HANGING_ROOTS()
  * @method static HardenedClay HARDENED_CLAY()
  * @method static HardenedGlass HARDENED_GLASS()
  * @method static HardenedGlassPane HARDENED_GLASS_PANE()
  * @method static HayBale HAY_BALE()
+ * @method static Opaque HONEYCOMB()
  * @method static Hopper HOPPER()
  * @method static Ice ICE()
  * @method static InfestedStone INFESTED_CHISELED_STONE_BRICK()
@@ -338,7 +481,7 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Opaque IRON()
  * @method static Thin IRON_BARS()
  * @method static Door IRON_DOOR()
- * @method static Opaque IRON_ORE()
+ * @method static IronOre IRON_ORE()
  * @method static Trapdoor IRON_TRAPDOOR()
  * @method static ItemFrame ITEM_FRAME()
  * @method static Jukebox JUKEBOX()
@@ -347,7 +490,7 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static WoodenFence JUNGLE_FENCE()
  * @method static FenceGate JUNGLE_FENCE_GATE()
  * @method static Leaves JUNGLE_LEAVES()
- * @method static Log JUNGLE_LOG()
+ * @method static Wood JUNGLE_LOG()
  * @method static Planks JUNGLE_PLANKS()
  * @method static WoodenPressurePlate JUNGLE_PRESSURE_PLATE()
  * @method static Sapling JUNGLE_SAPLING()
@@ -364,23 +507,37 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static LapisOre LAPIS_LAZULI_ORE()
  * @method static DoubleTallGrass LARGE_FERN()
  * @method static Lava LAVA()
+ * @method static LavaCauldron LAVA_CAULDRON()
  * @method static Lectern LECTERN()
  * @method static Opaque LEGACY_STONECUTTER()
  * @method static Lever LEVER()
- * @method static GlazedTerracotta LIGHT_BLUE_GLAZED_TERRACOTTA()
- * @method static GlazedTerracotta LIGHT_GRAY_GLAZED_TERRACOTTA()
+ * @method static Light LIGHT()
+ * @method static LightningRod LIGHTNING_ROD()
  * @method static DoublePlant LILAC()
  * @method static Flower LILY_OF_THE_VALLEY()
  * @method static WaterLily LILY_PAD()
- * @method static GlazedTerracotta LIME_GLAZED_TERRACOTTA()
  * @method static LitPumpkin LIT_PUMPKIN()
  * @method static Loom LOOM()
- * @method static GlazedTerracotta MAGENTA_GLAZED_TERRACOTTA()
  * @method static Magma MAGMA()
+ * @method static WoodenButton MANGROVE_BUTTON()
+ * @method static WoodenDoor MANGROVE_DOOR()
+ * @method static WoodenFence MANGROVE_FENCE()
+ * @method static FenceGate MANGROVE_FENCE_GATE()
+ * @method static Leaves MANGROVE_LEAVES()
+ * @method static Wood MANGROVE_LOG()
+ * @method static Planks MANGROVE_PLANKS()
+ * @method static WoodenPressurePlate MANGROVE_PRESSURE_PLATE()
+ * @method static MangroveRoots MANGROVE_ROOTS()
+ * @method static FloorSign MANGROVE_SIGN()
+ * @method static WoodenSlab MANGROVE_SLAB()
+ * @method static WoodenStairs MANGROVE_STAIRS()
+ * @method static WoodenTrapdoor MANGROVE_TRAPDOOR()
+ * @method static WallSign MANGROVE_WALL_SIGN()
+ * @method static Wood MANGROVE_WOOD()
  * @method static ChemistryTable MATERIAL_REDUCER()
  * @method static Melon MELON()
  * @method static MelonStem MELON_STEM()
- * @method static Skull MOB_HEAD()
+ * @method static MobHead MOB_HEAD()
  * @method static MonsterSpawner MONSTER_SPAWNER()
  * @method static Opaque MOSSY_COBBLESTONE()
  * @method static Slab MOSSY_COBBLESTONE_SLAB()
@@ -390,14 +547,22 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Slab MOSSY_STONE_BRICK_SLAB()
  * @method static Stair MOSSY_STONE_BRICK_STAIRS()
  * @method static Wall MOSSY_STONE_BRICK_WALL()
+ * @method static Opaque MUD()
+ * @method static SimplePillar MUDDY_MANGROVE_ROOTS()
+ * @method static Opaque MUD_BRICKS()
+ * @method static Slab MUD_BRICK_SLAB()
+ * @method static Stair MUD_BRICK_STAIRS()
+ * @method static Wall MUD_BRICK_WALL()
  * @method static MushroomStem MUSHROOM_STEM()
  * @method static Mycelium MYCELIUM()
+ * @method static Opaque NETHERITE()
  * @method static Netherrack NETHERRACK()
  * @method static Opaque NETHER_BRICKS()
  * @method static Fence NETHER_BRICK_FENCE()
  * @method static Slab NETHER_BRICK_SLAB()
  * @method static Stair NETHER_BRICK_STAIRS()
  * @method static Wall NETHER_BRICK_WALL()
+ * @method static NetherGoldOre NETHER_GOLD_ORE()
  * @method static NetherPortal NETHER_PORTAL()
  * @method static NetherQuartzOre NETHER_QUARTZ_ORE()
  * @method static NetherReactor NETHER_REACTOR_CORE()
@@ -409,7 +574,7 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static WoodenFence OAK_FENCE()
  * @method static FenceGate OAK_FENCE_GATE()
  * @method static Leaves OAK_LEAVES()
- * @method static Log OAK_LOG()
+ * @method static Wood OAK_LOG()
  * @method static Planks OAK_PLANKS()
  * @method static WoodenPressurePlate OAK_PRESSURE_PLATE()
  * @method static Sapling OAK_SAPLING()
@@ -420,25 +585,47 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static WallSign OAK_WALL_SIGN()
  * @method static Wood OAK_WOOD()
  * @method static Opaque OBSIDIAN()
- * @method static GlazedTerracotta ORANGE_GLAZED_TERRACOTTA()
  * @method static Flower ORANGE_TULIP()
  * @method static Flower OXEYE_DAISY()
  * @method static PackedIce PACKED_ICE()
+ * @method static Opaque PACKED_MUD()
  * @method static DoublePlant PEONY()
- * @method static GlazedTerracotta PINK_GLAZED_TERRACOTTA()
+ * @method static PinkPetals PINK_PETALS()
  * @method static Flower PINK_TULIP()
+ * @method static PitcherCrop PITCHER_CROP()
+ * @method static DoublePlant PITCHER_PLANT()
  * @method static Podzol PODZOL()
  * @method static Opaque POLISHED_ANDESITE()
  * @method static Slab POLISHED_ANDESITE_SLAB()
  * @method static Stair POLISHED_ANDESITE_STAIRS()
+ * @method static SimplePillar POLISHED_BASALT()
+ * @method static Opaque POLISHED_BLACKSTONE()
+ * @method static Opaque POLISHED_BLACKSTONE_BRICKS()
+ * @method static Slab POLISHED_BLACKSTONE_BRICK_SLAB()
+ * @method static Stair POLISHED_BLACKSTONE_BRICK_STAIRS()
+ * @method static Wall POLISHED_BLACKSTONE_BRICK_WALL()
+ * @method static StoneButton POLISHED_BLACKSTONE_BUTTON()
+ * @method static StonePressurePlate POLISHED_BLACKSTONE_PRESSURE_PLATE()
+ * @method static Slab POLISHED_BLACKSTONE_SLAB()
+ * @method static Stair POLISHED_BLACKSTONE_STAIRS()
+ * @method static Wall POLISHED_BLACKSTONE_WALL()
+ * @method static Opaque POLISHED_DEEPSLATE()
+ * @method static Slab POLISHED_DEEPSLATE_SLAB()
+ * @method static Stair POLISHED_DEEPSLATE_STAIRS()
+ * @method static Wall POLISHED_DEEPSLATE_WALL()
  * @method static Opaque POLISHED_DIORITE()
  * @method static Slab POLISHED_DIORITE_SLAB()
  * @method static Stair POLISHED_DIORITE_STAIRS()
  * @method static Opaque POLISHED_GRANITE()
  * @method static Slab POLISHED_GRANITE_SLAB()
  * @method static Stair POLISHED_GRANITE_STAIRS()
+ * @method static Opaque POLISHED_TUFF()
+ * @method static Slab POLISHED_TUFF_SLAB()
+ * @method static Stair POLISHED_TUFF_STAIRS()
+ * @method static Wall POLISHED_TUFF_WALL()
  * @method static Flower POPPY()
  * @method static Potato POTATOES()
+ * @method static PotionCauldron POTION_CAULDRON()
  * @method static PoweredRail POWERED_RAIL()
  * @method static Opaque PRISMARINE()
  * @method static Opaque PRISMARINE_BRICKS()
@@ -449,17 +636,20 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Wall PRISMARINE_WALL()
  * @method static Pumpkin PUMPKIN()
  * @method static PumpkinStem PUMPKIN_STEM()
- * @method static GlazedTerracotta PURPLE_GLAZED_TERRACOTTA()
  * @method static Torch PURPLE_TORCH()
  * @method static Opaque PURPUR()
  * @method static SimplePillar PURPUR_PILLAR()
  * @method static Slab PURPUR_SLAB()
  * @method static Stair PURPUR_STAIRS()
  * @method static Opaque QUARTZ()
+ * @method static Opaque QUARTZ_BRICKS()
  * @method static SimplePillar QUARTZ_PILLAR()
  * @method static Slab QUARTZ_SLAB()
  * @method static Stair QUARTZ_STAIRS()
  * @method static Rail RAIL()
+ * @method static Opaque RAW_COPPER()
+ * @method static Opaque RAW_GOLD()
+ * @method static Opaque RAW_IRON()
  * @method static Redstone REDSTONE()
  * @method static RedstoneComparator REDSTONE_COMPARATOR()
  * @method static RedstoneLamp REDSTONE_LAMP()
@@ -467,7 +657,6 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static RedstoneRepeater REDSTONE_REPEATER()
  * @method static RedstoneTorch REDSTONE_TORCH()
  * @method static RedstoneWire REDSTONE_WIRE()
- * @method static GlazedTerracotta RED_GLAZED_TERRACOTTA()
  * @method static RedMushroom RED_MUSHROOM()
  * @method static RedMushroomBlock RED_MUSHROOM_BLOCK()
  * @method static Opaque RED_NETHER_BRICKS()
@@ -481,6 +670,7 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Wall RED_SANDSTONE_WALL()
  * @method static Torch RED_TORCH()
  * @method static Flower RED_TULIP()
+ * @method static Opaque REINFORCED_DEEPSLATE()
  * @method static Reserved6 RESERVED6()
  * @method static DoublePlant ROSE_BUSH()
  * @method static Sand SAND()
@@ -488,11 +678,16 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Slab SANDSTONE_SLAB()
  * @method static Stair SANDSTONE_STAIRS()
  * @method static Wall SANDSTONE_WALL()
+ * @method static Sculk SCULK()
  * @method static SeaLantern SEA_LANTERN()
  * @method static SeaPickle SEA_PICKLE()
+ * @method static Opaque SHROOMLIGHT()
  * @method static ShulkerBox SHULKER_BOX()
  * @method static Slime SLIME()
+ * @method static SmallDripleaf SMALL_DRIPLEAF()
+ * @method static SmithingTable SMITHING_TABLE()
  * @method static Furnace SMOKER()
+ * @method static Opaque SMOOTH_BASALT()
  * @method static Opaque SMOOTH_QUARTZ()
  * @method static Slab SMOOTH_QUARTZ_SLAB()
  * @method static Stair SMOOTH_QUARTZ_STAIRS()
@@ -506,14 +701,20 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Slab SMOOTH_STONE_SLAB()
  * @method static Snow SNOW()
  * @method static SnowLayer SNOW_LAYER()
+ * @method static SoulCampfire SOUL_CAMPFIRE()
+ * @method static SoulFire SOUL_FIRE()
+ * @method static Lantern SOUL_LANTERN()
  * @method static SoulSand SOUL_SAND()
+ * @method static Opaque SOUL_SOIL()
+ * @method static Torch SOUL_TORCH()
  * @method static Sponge SPONGE()
+ * @method static SporeBlossom SPORE_BLOSSOM()
  * @method static WoodenButton SPRUCE_BUTTON()
  * @method static WoodenDoor SPRUCE_DOOR()
  * @method static WoodenFence SPRUCE_FENCE()
  * @method static FenceGate SPRUCE_FENCE_GATE()
  * @method static Leaves SPRUCE_LEAVES()
- * @method static Log SPRUCE_LOG()
+ * @method static Wood SPRUCE_LOG()
  * @method static Planks SPRUCE_PLANKS()
  * @method static WoodenPressurePlate SPRUCE_PRESSURE_PLATE()
  * @method static Sapling SPRUCE_SAPLING()
@@ -538,39 +739,55 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static StonePressurePlate STONE_PRESSURE_PLATE()
  * @method static Slab STONE_SLAB()
  * @method static Stair STONE_STAIRS()
- * @method static Log STRIPPED_ACACIA_LOG()
- * @method static Wood STRIPPED_ACACIA_WOOD()
- * @method static Log STRIPPED_BIRCH_LOG()
- * @method static Wood STRIPPED_BIRCH_WOOD()
- * @method static Log STRIPPED_DARK_OAK_LOG()
- * @method static Wood STRIPPED_DARK_OAK_WOOD()
- * @method static Log STRIPPED_JUNGLE_LOG()
- * @method static Wood STRIPPED_JUNGLE_WOOD()
- * @method static Log STRIPPED_OAK_LOG()
- * @method static Wood STRIPPED_OAK_WOOD()
- * @method static Log STRIPPED_SPRUCE_LOG()
- * @method static Wood STRIPPED_SPRUCE_WOOD()
  * @method static Sugarcane SUGARCANE()
  * @method static DoublePlant SUNFLOWER()
  * @method static SweetBerryBush SWEET_BERRY_BUSH()
  * @method static TallGrass TALL_GRASS()
+ * @method static TintedGlass TINTED_GLASS()
  * @method static TNT TNT()
  * @method static Torch TORCH()
+ * @method static Flower TORCHFLOWER()
+ * @method static TorchflowerCrop TORCHFLOWER_CROP()
  * @method static TrappedChest TRAPPED_CHEST()
  * @method static Tripwire TRIPWIRE()
  * @method static TripwireHook TRIPWIRE_HOOK()
+ * @method static Opaque TUFF()
+ * @method static Opaque TUFF_BRICKS()
+ * @method static Slab TUFF_BRICK_SLAB()
+ * @method static Stair TUFF_BRICK_STAIRS()
+ * @method static Wall TUFF_BRICK_WALL()
+ * @method static Slab TUFF_SLAB()
+ * @method static Stair TUFF_STAIRS()
+ * @method static Wall TUFF_WALL()
+ * @method static NetherVines TWISTING_VINES()
  * @method static UnderwaterTorch UNDERWATER_TORCH()
  * @method static Vine VINES()
  * @method static WallBanner WALL_BANNER()
  * @method static WallCoralFan WALL_CORAL_FAN()
+ * @method static WoodenButton WARPED_BUTTON()
+ * @method static WoodenDoor WARPED_DOOR()
+ * @method static WoodenFence WARPED_FENCE()
+ * @method static FenceGate WARPED_FENCE_GATE()
+ * @method static Wood WARPED_HYPHAE()
+ * @method static Planks WARPED_PLANKS()
+ * @method static WoodenPressurePlate WARPED_PRESSURE_PLATE()
+ * @method static NetherRoots WARPED_ROOTS()
+ * @method static FloorSign WARPED_SIGN()
+ * @method static WoodenSlab WARPED_SLAB()
+ * @method static WoodenStairs WARPED_STAIRS()
+ * @method static Wood WARPED_STEM()
+ * @method static WoodenTrapdoor WARPED_TRAPDOOR()
+ * @method static WallSign WARPED_WALL_SIGN()
+ * @method static Opaque WARPED_WART_BLOCK()
  * @method static Water WATER()
+ * @method static WaterCauldron WATER_CAULDRON()
+ * @method static NetherVines WEEPING_VINES()
  * @method static WeightedPressurePlateHeavy WEIGHTED_PRESSURE_PLATE_HEAVY()
  * @method static WeightedPressurePlateLight WEIGHTED_PRESSURE_PLATE_LIGHT()
  * @method static Wheat WHEAT()
- * @method static GlazedTerracotta WHITE_GLAZED_TERRACOTTA()
  * @method static Flower WHITE_TULIP()
+ * @method static WitherRose WITHER_ROSE()
  * @method static Wool WOOL()
- * @method static GlazedTerracotta YELLOW_GLAZED_TERRACOTTA()
  */
 final class VanillaBlocks{
 	use CloningRegistryTrait;
@@ -579,8 +796,28 @@ final class VanillaBlocks{
 		//NOOP
 	}
 
-	protected static function register(string $name, Block $block) : void{
+	/**
+	 * @phpstan-template TBlock of Block
+	 * @phpstan-param \Closure(BID) : TBlock $createBlock
+	 * @phpstan-param class-string<covariant Tile> $tileClass
+	 * @phpstan-return TBlock
+	 */
+	protected static function register(string $name, \Closure $createBlock, ?string $tileClass = null) : Block{
+		//this sketchy hack allows us to avoid manually writing the constants inline
+		//since type IDs are generated from this class anyway, I'm OK with this hack
+		//nonetheless, we should try to get rid of it in a future major version (e.g by using string type IDs)
+		$reflect = new \ReflectionClass(BlockTypeIds::class);
+		$typeId = $reflect->getConstant(mb_strtoupper($name));
+		if(!is_int($typeId)){
+			//this allows registering new stuff without adding new type ID constants
+			//this reduces the number of mandatory steps to test new features in local development
+			\GlobalLogger::get()->error(self::class . ": No constant type ID found for $name, generating a new one");
+			$typeId = BlockTypeIds::newId();
+		}
+		$block = $createBlock(new BID($typeId, $tileClass));
 		self::_registryRegister($name, $block);
+
+		return $block;
 	}
 
 	/**
@@ -595,545 +832,928 @@ final class VanillaBlocks{
 	}
 
 	protected static function setup() : void{
-		$factory = BlockFactory::getInstance();
-		self::register("acacia_button", $factory->get(Ids::ACACIA_BUTTON, 0));
-		self::register("acacia_door", $factory->get(Ids::ACACIA_DOOR_BLOCK, 0));
-		self::register("acacia_fence", $factory->get(Ids::FENCE, 4));
-		self::register("acacia_fence_gate", $factory->get(Ids::ACACIA_FENCE_GATE, 0));
-		self::register("acacia_leaves", $factory->get(Ids::LEAVES2, 0));
-		self::register("acacia_log", $factory->get(Ids::LOG2, 0));
-		self::register("acacia_planks", $factory->get(Ids::PLANKS, 4));
-		self::register("acacia_pressure_plate", $factory->get(Ids::ACACIA_PRESSURE_PLATE, 0));
-		self::register("acacia_sapling", $factory->get(Ids::SAPLING, 4));
-		self::register("acacia_sign", $factory->get(Ids::ACACIA_STANDING_SIGN, 0));
-		self::register("acacia_slab", $factory->get(Ids::WOODEN_SLAB, 4));
-		self::register("acacia_stairs", $factory->get(Ids::ACACIA_STAIRS, 0));
-		self::register("acacia_trapdoor", $factory->get(Ids::ACACIA_TRAPDOOR, 0));
-		self::register("acacia_wall_sign", $factory->get(Ids::ACACIA_WALL_SIGN, 2));
-		self::register("acacia_wood", $factory->get(Ids::WOOD, 4));
-		self::register("activator_rail", $factory->get(Ids::ACTIVATOR_RAIL, 0));
-		self::register("air", $factory->get(Ids::AIR, 0));
-		self::register("all_sided_mushroom_stem", $factory->get(Ids::BROWN_MUSHROOM_BLOCK, 15));
-		self::register("allium", $factory->get(Ids::POPPY, 2));
-		self::register("andesite", $factory->get(Ids::STONE, 5));
-		self::register("andesite_slab", $factory->get(Ids::STONE_SLAB3, 3));
-		self::register("andesite_stairs", $factory->get(Ids::ANDESITE_STAIRS, 0));
-		self::register("andesite_wall", $factory->get(Ids::COBBLESTONE_WALL, 4));
-		self::register("anvil", $factory->get(Ids::ANVIL, 0));
-		self::register("azure_bluet", $factory->get(Ids::POPPY, 3));
-		self::register("bamboo", $factory->get(Ids::BAMBOO, 0));
-		self::register("bamboo_sapling", $factory->get(Ids::BAMBOO_SAPLING, 0));
-		self::register("banner", $factory->get(Ids::STANDING_BANNER, 0));
-		self::register("barrel", $factory->get(Ids::BARREL, 0));
-		self::register("barrier", $factory->get(Ids::BARRIER, 0));
-		self::register("beacon", $factory->get(Ids::BEACON, 0));
-		self::register("bed", $factory->get(Ids::BED_BLOCK, 0));
-		self::register("bedrock", $factory->get(Ids::BEDROCK, 0));
-		self::register("beetroots", $factory->get(Ids::BEETROOT_BLOCK, 0));
-		self::register("bell", $factory->get(Ids::BELL, 0));
-		self::register("birch_button", $factory->get(Ids::BIRCH_BUTTON, 0));
-		self::register("birch_door", $factory->get(Ids::BIRCH_DOOR_BLOCK, 0));
-		self::register("birch_fence", $factory->get(Ids::FENCE, 2));
-		self::register("birch_fence_gate", $factory->get(Ids::BIRCH_FENCE_GATE, 0));
-		self::register("birch_leaves", $factory->get(Ids::LEAVES, 2));
-		self::register("birch_log", $factory->get(Ids::LOG, 2));
-		self::register("birch_planks", $factory->get(Ids::PLANKS, 2));
-		self::register("birch_pressure_plate", $factory->get(Ids::BIRCH_PRESSURE_PLATE, 0));
-		self::register("birch_sapling", $factory->get(Ids::SAPLING, 2));
-		self::register("birch_sign", $factory->get(Ids::BIRCH_STANDING_SIGN, 0));
-		self::register("birch_slab", $factory->get(Ids::WOODEN_SLAB, 2));
-		self::register("birch_stairs", $factory->get(Ids::BIRCH_STAIRS, 0));
-		self::register("birch_trapdoor", $factory->get(Ids::BIRCH_TRAPDOOR, 0));
-		self::register("birch_wall_sign", $factory->get(Ids::BIRCH_WALL_SIGN, 2));
-		self::register("birch_wood", $factory->get(Ids::WOOD, 2));
-		self::register("black_glazed_terracotta", $factory->get(Ids::BLACK_GLAZED_TERRACOTTA, 2));
-		self::register("blast_furnace", $factory->get(Ids::BLAST_FURNACE, 2));
-		self::register("blue_glazed_terracotta", $factory->get(Ids::BLUE_GLAZED_TERRACOTTA, 2));
-		self::register("blue_ice", $factory->get(Ids::BLUE_ICE, 0));
-		self::register("blue_orchid", $factory->get(Ids::POPPY, 1));
-		self::register("blue_torch", $factory->get(Ids::COLORED_TORCH_BP, 5));
-		self::register("bone_block", $factory->get(Ids::BONE_BLOCK, 0));
-		self::register("bookshelf", $factory->get(Ids::BOOKSHELF, 0));
-		self::register("brewing_stand", $factory->get(Ids::BREWING_STAND_BLOCK, 0));
-		self::register("brick_slab", $factory->get(Ids::STONE_SLAB, 4));
-		self::register("brick_stairs", $factory->get(Ids::BRICK_STAIRS, 0));
-		self::register("brick_wall", $factory->get(Ids::COBBLESTONE_WALL, 6));
-		self::register("bricks", $factory->get(Ids::BRICK_BLOCK, 0));
-		self::register("brown_glazed_terracotta", $factory->get(Ids::BROWN_GLAZED_TERRACOTTA, 2));
-		self::register("brown_mushroom", $factory->get(Ids::BROWN_MUSHROOM, 0));
-		self::register("brown_mushroom_block", $factory->get(Ids::BROWN_MUSHROOM_BLOCK, 0));
-		self::register("cactus", $factory->get(Ids::CACTUS, 0));
-		self::register("cake", $factory->get(Ids::CAKE_BLOCK, 0));
-		self::register("carpet", $factory->get(Ids::CARPET, 0));
-		self::register("carrots", $factory->get(Ids::CARROTS, 0));
-		self::register("carved_pumpkin", $factory->get(Ids::CARVED_PUMPKIN, 0));
-		self::register("chemical_heat", $factory->get(Ids::CHEMICAL_HEAT, 0));
-		self::register("chest", $factory->get(Ids::CHEST, 2));
-		self::register("chiseled_quartz", $factory->get(Ids::QUARTZ_BLOCK, 1));
-		self::register("chiseled_red_sandstone", $factory->get(Ids::RED_SANDSTONE, 1));
-		self::register("chiseled_sandstone", $factory->get(Ids::SANDSTONE, 1));
-		self::register("chiseled_stone_bricks", $factory->get(Ids::STONEBRICK, 3));
-		self::register("clay", $factory->get(Ids::CLAY_BLOCK, 0));
-		self::register("coal", $factory->get(Ids::COAL_BLOCK, 0));
-		self::register("coal_ore", $factory->get(Ids::COAL_ORE, 0));
-		self::register("cobblestone", $factory->get(Ids::COBBLESTONE, 0));
-		self::register("cobblestone_slab", $factory->get(Ids::STONE_SLAB, 3));
-		self::register("cobblestone_stairs", $factory->get(Ids::COBBLESTONE_STAIRS, 0));
-		self::register("cobblestone_wall", $factory->get(Ids::COBBLESTONE_WALL, 0));
-		self::register("cobweb", $factory->get(Ids::COBWEB, 0));
-		self::register("cocoa_pod", $factory->get(Ids::COCOA, 0));
-		self::register("compound_creator", $factory->get(Ids::CHEMISTRY_TABLE, 0));
-		self::register("concrete", $factory->get(Ids::CONCRETE, 0));
-		self::register("concrete_powder", $factory->get(Ids::CONCRETEPOWDER, 0));
-		self::register("coral", $factory->get(Ids::CORAL, 0));
-		self::register("coral_block", $factory->get(Ids::CORAL_BLOCK, 0));
-		self::register("coral_fan", $factory->get(Ids::CORAL_FAN, 0));
-		self::register("cornflower", $factory->get(Ids::POPPY, 9));
-		self::register("cracked_stone_bricks", $factory->get(Ids::STONEBRICK, 2));
-		self::register("crafting_table", $factory->get(Ids::CRAFTING_TABLE, 0));
-		self::register("cut_red_sandstone", $factory->get(Ids::RED_SANDSTONE, 2));
-		self::register("cut_red_sandstone_slab", $factory->get(Ids::STONE_SLAB4, 4));
-		self::register("cut_sandstone", $factory->get(Ids::SANDSTONE, 2));
-		self::register("cut_sandstone_slab", $factory->get(Ids::STONE_SLAB4, 3));
-		self::register("cyan_glazed_terracotta", $factory->get(Ids::CYAN_GLAZED_TERRACOTTA, 2));
-		self::register("dandelion", $factory->get(Ids::DANDELION, 0));
-		self::register("dark_oak_button", $factory->get(Ids::DARK_OAK_BUTTON, 0));
-		self::register("dark_oak_door", $factory->get(Ids::DARK_OAK_DOOR_BLOCK, 0));
-		self::register("dark_oak_fence", $factory->get(Ids::FENCE, 5));
-		self::register("dark_oak_fence_gate", $factory->get(Ids::DARK_OAK_FENCE_GATE, 0));
-		self::register("dark_oak_leaves", $factory->get(Ids::LEAVES2, 1));
-		self::register("dark_oak_log", $factory->get(Ids::LOG2, 1));
-		self::register("dark_oak_planks", $factory->get(Ids::PLANKS, 5));
-		self::register("dark_oak_pressure_plate", $factory->get(Ids::DARK_OAK_PRESSURE_PLATE, 0));
-		self::register("dark_oak_sapling", $factory->get(Ids::SAPLING, 5));
-		self::register("dark_oak_sign", $factory->get(Ids::DARKOAK_STANDING_SIGN, 0));
-		self::register("dark_oak_slab", $factory->get(Ids::WOODEN_SLAB, 5));
-		self::register("dark_oak_stairs", $factory->get(Ids::DARK_OAK_STAIRS, 0));
-		self::register("dark_oak_trapdoor", $factory->get(Ids::DARK_OAK_TRAPDOOR, 0));
-		self::register("dark_oak_wall_sign", $factory->get(Ids::DARKOAK_WALL_SIGN, 2));
-		self::register("dark_oak_wood", $factory->get(Ids::WOOD, 5));
-		self::register("dark_prismarine", $factory->get(Ids::PRISMARINE, 1));
-		self::register("dark_prismarine_slab", $factory->get(Ids::STONE_SLAB2, 3));
-		self::register("dark_prismarine_stairs", $factory->get(Ids::DARK_PRISMARINE_STAIRS, 0));
-		self::register("daylight_sensor", $factory->get(Ids::DAYLIGHT_DETECTOR, 0));
-		self::register("dead_bush", $factory->get(Ids::DEADBUSH, 0));
-		self::register("detector_rail", $factory->get(Ids::DETECTOR_RAIL, 0));
-		self::register("diamond", $factory->get(Ids::DIAMOND_BLOCK, 0));
-		self::register("diamond_ore", $factory->get(Ids::DIAMOND_ORE, 0));
-		self::register("diorite", $factory->get(Ids::STONE, 3));
-		self::register("diorite_slab", $factory->get(Ids::STONE_SLAB3, 4));
-		self::register("diorite_stairs", $factory->get(Ids::DIORITE_STAIRS, 0));
-		self::register("diorite_wall", $factory->get(Ids::COBBLESTONE_WALL, 3));
-		self::register("dirt", $factory->get(Ids::DIRT, 0));
-		self::register("double_tallgrass", $factory->get(Ids::DOUBLE_PLANT, 2));
-		self::register("dragon_egg", $factory->get(Ids::DRAGON_EGG, 0));
-		self::register("dried_kelp", $factory->get(Ids::DRIED_KELP_BLOCK, 0));
-		self::register("dyed_shulker_box", $factory->get(Ids::SHULKER_BOX, 0));
-		self::register("element_actinium", $factory->get(Ids::ELEMENT_89, 0));
-		self::register("element_aluminum", $factory->get(Ids::ELEMENT_13, 0));
-		self::register("element_americium", $factory->get(Ids::ELEMENT_95, 0));
-		self::register("element_antimony", $factory->get(Ids::ELEMENT_51, 0));
-		self::register("element_argon", $factory->get(Ids::ELEMENT_18, 0));
-		self::register("element_arsenic", $factory->get(Ids::ELEMENT_33, 0));
-		self::register("element_astatine", $factory->get(Ids::ELEMENT_85, 0));
-		self::register("element_barium", $factory->get(Ids::ELEMENT_56, 0));
-		self::register("element_berkelium", $factory->get(Ids::ELEMENT_97, 0));
-		self::register("element_beryllium", $factory->get(Ids::ELEMENT_4, 0));
-		self::register("element_bismuth", $factory->get(Ids::ELEMENT_83, 0));
-		self::register("element_bohrium", $factory->get(Ids::ELEMENT_107, 0));
-		self::register("element_boron", $factory->get(Ids::ELEMENT_5, 0));
-		self::register("element_bromine", $factory->get(Ids::ELEMENT_35, 0));
-		self::register("element_cadmium", $factory->get(Ids::ELEMENT_48, 0));
-		self::register("element_calcium", $factory->get(Ids::ELEMENT_20, 0));
-		self::register("element_californium", $factory->get(Ids::ELEMENT_98, 0));
-		self::register("element_carbon", $factory->get(Ids::ELEMENT_6, 0));
-		self::register("element_cerium", $factory->get(Ids::ELEMENT_58, 0));
-		self::register("element_cesium", $factory->get(Ids::ELEMENT_55, 0));
-		self::register("element_chlorine", $factory->get(Ids::ELEMENT_17, 0));
-		self::register("element_chromium", $factory->get(Ids::ELEMENT_24, 0));
-		self::register("element_cobalt", $factory->get(Ids::ELEMENT_27, 0));
-		self::register("element_constructor", $factory->get(Ids::CHEMISTRY_TABLE, 8));
-		self::register("element_copernicium", $factory->get(Ids::ELEMENT_112, 0));
-		self::register("element_copper", $factory->get(Ids::ELEMENT_29, 0));
-		self::register("element_curium", $factory->get(Ids::ELEMENT_96, 0));
-		self::register("element_darmstadtium", $factory->get(Ids::ELEMENT_110, 0));
-		self::register("element_dubnium", $factory->get(Ids::ELEMENT_105, 0));
-		self::register("element_dysprosium", $factory->get(Ids::ELEMENT_66, 0));
-		self::register("element_einsteinium", $factory->get(Ids::ELEMENT_99, 0));
-		self::register("element_erbium", $factory->get(Ids::ELEMENT_68, 0));
-		self::register("element_europium", $factory->get(Ids::ELEMENT_63, 0));
-		self::register("element_fermium", $factory->get(Ids::ELEMENT_100, 0));
-		self::register("element_flerovium", $factory->get(Ids::ELEMENT_114, 0));
-		self::register("element_fluorine", $factory->get(Ids::ELEMENT_9, 0));
-		self::register("element_francium", $factory->get(Ids::ELEMENT_87, 0));
-		self::register("element_gadolinium", $factory->get(Ids::ELEMENT_64, 0));
-		self::register("element_gallium", $factory->get(Ids::ELEMENT_31, 0));
-		self::register("element_germanium", $factory->get(Ids::ELEMENT_32, 0));
-		self::register("element_gold", $factory->get(Ids::ELEMENT_79, 0));
-		self::register("element_hafnium", $factory->get(Ids::ELEMENT_72, 0));
-		self::register("element_hassium", $factory->get(Ids::ELEMENT_108, 0));
-		self::register("element_helium", $factory->get(Ids::ELEMENT_2, 0));
-		self::register("element_holmium", $factory->get(Ids::ELEMENT_67, 0));
-		self::register("element_hydrogen", $factory->get(Ids::ELEMENT_1, 0));
-		self::register("element_indium", $factory->get(Ids::ELEMENT_49, 0));
-		self::register("element_iodine", $factory->get(Ids::ELEMENT_53, 0));
-		self::register("element_iridium", $factory->get(Ids::ELEMENT_77, 0));
-		self::register("element_iron", $factory->get(Ids::ELEMENT_26, 0));
-		self::register("element_krypton", $factory->get(Ids::ELEMENT_36, 0));
-		self::register("element_lanthanum", $factory->get(Ids::ELEMENT_57, 0));
-		self::register("element_lawrencium", $factory->get(Ids::ELEMENT_103, 0));
-		self::register("element_lead", $factory->get(Ids::ELEMENT_82, 0));
-		self::register("element_lithium", $factory->get(Ids::ELEMENT_3, 0));
-		self::register("element_livermorium", $factory->get(Ids::ELEMENT_116, 0));
-		self::register("element_lutetium", $factory->get(Ids::ELEMENT_71, 0));
-		self::register("element_magnesium", $factory->get(Ids::ELEMENT_12, 0));
-		self::register("element_manganese", $factory->get(Ids::ELEMENT_25, 0));
-		self::register("element_meitnerium", $factory->get(Ids::ELEMENT_109, 0));
-		self::register("element_mendelevium", $factory->get(Ids::ELEMENT_101, 0));
-		self::register("element_mercury", $factory->get(Ids::ELEMENT_80, 0));
-		self::register("element_molybdenum", $factory->get(Ids::ELEMENT_42, 0));
-		self::register("element_moscovium", $factory->get(Ids::ELEMENT_115, 0));
-		self::register("element_neodymium", $factory->get(Ids::ELEMENT_60, 0));
-		self::register("element_neon", $factory->get(Ids::ELEMENT_10, 0));
-		self::register("element_neptunium", $factory->get(Ids::ELEMENT_93, 0));
-		self::register("element_nickel", $factory->get(Ids::ELEMENT_28, 0));
-		self::register("element_nihonium", $factory->get(Ids::ELEMENT_113, 0));
-		self::register("element_niobium", $factory->get(Ids::ELEMENT_41, 0));
-		self::register("element_nitrogen", $factory->get(Ids::ELEMENT_7, 0));
-		self::register("element_nobelium", $factory->get(Ids::ELEMENT_102, 0));
-		self::register("element_oganesson", $factory->get(Ids::ELEMENT_118, 0));
-		self::register("element_osmium", $factory->get(Ids::ELEMENT_76, 0));
-		self::register("element_oxygen", $factory->get(Ids::ELEMENT_8, 0));
-		self::register("element_palladium", $factory->get(Ids::ELEMENT_46, 0));
-		self::register("element_phosphorus", $factory->get(Ids::ELEMENT_15, 0));
-		self::register("element_platinum", $factory->get(Ids::ELEMENT_78, 0));
-		self::register("element_plutonium", $factory->get(Ids::ELEMENT_94, 0));
-		self::register("element_polonium", $factory->get(Ids::ELEMENT_84, 0));
-		self::register("element_potassium", $factory->get(Ids::ELEMENT_19, 0));
-		self::register("element_praseodymium", $factory->get(Ids::ELEMENT_59, 0));
-		self::register("element_promethium", $factory->get(Ids::ELEMENT_61, 0));
-		self::register("element_protactinium", $factory->get(Ids::ELEMENT_91, 0));
-		self::register("element_radium", $factory->get(Ids::ELEMENT_88, 0));
-		self::register("element_radon", $factory->get(Ids::ELEMENT_86, 0));
-		self::register("element_rhenium", $factory->get(Ids::ELEMENT_75, 0));
-		self::register("element_rhodium", $factory->get(Ids::ELEMENT_45, 0));
-		self::register("element_roentgenium", $factory->get(Ids::ELEMENT_111, 0));
-		self::register("element_rubidium", $factory->get(Ids::ELEMENT_37, 0));
-		self::register("element_ruthenium", $factory->get(Ids::ELEMENT_44, 0));
-		self::register("element_rutherfordium", $factory->get(Ids::ELEMENT_104, 0));
-		self::register("element_samarium", $factory->get(Ids::ELEMENT_62, 0));
-		self::register("element_scandium", $factory->get(Ids::ELEMENT_21, 0));
-		self::register("element_seaborgium", $factory->get(Ids::ELEMENT_106, 0));
-		self::register("element_selenium", $factory->get(Ids::ELEMENT_34, 0));
-		self::register("element_silicon", $factory->get(Ids::ELEMENT_14, 0));
-		self::register("element_silver", $factory->get(Ids::ELEMENT_47, 0));
-		self::register("element_sodium", $factory->get(Ids::ELEMENT_11, 0));
-		self::register("element_strontium", $factory->get(Ids::ELEMENT_38, 0));
-		self::register("element_sulfur", $factory->get(Ids::ELEMENT_16, 0));
-		self::register("element_tantalum", $factory->get(Ids::ELEMENT_73, 0));
-		self::register("element_technetium", $factory->get(Ids::ELEMENT_43, 0));
-		self::register("element_tellurium", $factory->get(Ids::ELEMENT_52, 0));
-		self::register("element_tennessine", $factory->get(Ids::ELEMENT_117, 0));
-		self::register("element_terbium", $factory->get(Ids::ELEMENT_65, 0));
-		self::register("element_thallium", $factory->get(Ids::ELEMENT_81, 0));
-		self::register("element_thorium", $factory->get(Ids::ELEMENT_90, 0));
-		self::register("element_thulium", $factory->get(Ids::ELEMENT_69, 0));
-		self::register("element_tin", $factory->get(Ids::ELEMENT_50, 0));
-		self::register("element_titanium", $factory->get(Ids::ELEMENT_22, 0));
-		self::register("element_tungsten", $factory->get(Ids::ELEMENT_74, 0));
-		self::register("element_uranium", $factory->get(Ids::ELEMENT_92, 0));
-		self::register("element_vanadium", $factory->get(Ids::ELEMENT_23, 0));
-		self::register("element_xenon", $factory->get(Ids::ELEMENT_54, 0));
-		self::register("element_ytterbium", $factory->get(Ids::ELEMENT_70, 0));
-		self::register("element_yttrium", $factory->get(Ids::ELEMENT_39, 0));
-		self::register("element_zero", $factory->get(Ids::ELEMENT_0, 0));
-		self::register("element_zinc", $factory->get(Ids::ELEMENT_30, 0));
-		self::register("element_zirconium", $factory->get(Ids::ELEMENT_40, 0));
-		self::register("emerald", $factory->get(Ids::EMERALD_BLOCK, 0));
-		self::register("emerald_ore", $factory->get(Ids::EMERALD_ORE, 0));
-		self::register("enchanting_table", $factory->get(Ids::ENCHANTING_TABLE, 0));
-		self::register("end_portal_frame", $factory->get(Ids::END_PORTAL_FRAME, 0));
-		self::register("end_rod", $factory->get(Ids::END_ROD, 0));
-		self::register("end_stone", $factory->get(Ids::END_STONE, 0));
-		self::register("end_stone_brick_slab", $factory->get(Ids::STONE_SLAB3, 0));
-		self::register("end_stone_brick_stairs", $factory->get(Ids::END_BRICK_STAIRS, 0));
-		self::register("end_stone_brick_wall", $factory->get(Ids::COBBLESTONE_WALL, 10));
-		self::register("end_stone_bricks", $factory->get(Ids::END_BRICKS, 0));
-		self::register("ender_chest", $factory->get(Ids::ENDER_CHEST, 2));
-		self::register("fake_wooden_slab", $factory->get(Ids::STONE_SLAB, 2));
-		self::register("farmland", $factory->get(Ids::FARMLAND, 0));
-		self::register("fern", $factory->get(Ids::TALLGRASS, 2));
-		self::register("fire", $factory->get(Ids::FIRE, 0));
-		self::register("fletching_table", $factory->get(Ids::FLETCHING_TABLE, 0));
-		self::register("flower_pot", $factory->get(Ids::FLOWER_POT_BLOCK, 0));
-		self::register("frosted_ice", $factory->get(Ids::FROSTED_ICE, 0));
-		self::register("furnace", $factory->get(Ids::FURNACE, 2));
-		self::register("glass", $factory->get(Ids::GLASS, 0));
-		self::register("glass_pane", $factory->get(Ids::GLASS_PANE, 0));
-		self::register("glowing_obsidian", $factory->get(Ids::GLOWINGOBSIDIAN, 0));
-		self::register("glowstone", $factory->get(Ids::GLOWSTONE, 0));
-		self::register("gold", $factory->get(Ids::GOLD_BLOCK, 0));
-		self::register("gold_ore", $factory->get(Ids::GOLD_ORE, 0));
-		self::register("granite", $factory->get(Ids::STONE, 1));
-		self::register("granite_slab", $factory->get(Ids::STONE_SLAB3, 6));
-		self::register("granite_stairs", $factory->get(Ids::GRANITE_STAIRS, 0));
-		self::register("granite_wall", $factory->get(Ids::COBBLESTONE_WALL, 2));
-		self::register("grass", $factory->get(Ids::GRASS, 0));
-		self::register("grass_path", $factory->get(Ids::GRASS_PATH, 0));
-		self::register("gravel", $factory->get(Ids::GRAVEL, 0));
-		self::register("gray_glazed_terracotta", $factory->get(Ids::GRAY_GLAZED_TERRACOTTA, 2));
-		self::register("green_glazed_terracotta", $factory->get(Ids::GREEN_GLAZED_TERRACOTTA, 2));
-		self::register("green_torch", $factory->get(Ids::COLORED_TORCH_RG, 13));
-		self::register("hardened_clay", $factory->get(Ids::HARDENED_CLAY, 0));
-		self::register("hardened_glass", $factory->get(Ids::HARD_GLASS, 0));
-		self::register("hardened_glass_pane", $factory->get(Ids::HARD_GLASS_PANE, 0));
-		self::register("hay_bale", $factory->get(Ids::HAY_BALE, 0));
-		self::register("hopper", $factory->get(Ids::HOPPER_BLOCK, 0));
-		self::register("ice", $factory->get(Ids::ICE, 0));
-		self::register("infested_chiseled_stone_brick", $factory->get(Ids::MONSTER_EGG, 5));
-		self::register("infested_cobblestone", $factory->get(Ids::MONSTER_EGG, 1));
-		self::register("infested_cracked_stone_brick", $factory->get(Ids::MONSTER_EGG, 4));
-		self::register("infested_mossy_stone_brick", $factory->get(Ids::MONSTER_EGG, 3));
-		self::register("infested_stone", $factory->get(Ids::MONSTER_EGG, 0));
-		self::register("infested_stone_brick", $factory->get(Ids::MONSTER_EGG, 2));
-		self::register("info_update", $factory->get(Ids::INFO_UPDATE, 0));
-		self::register("info_update2", $factory->get(Ids::INFO_UPDATE2, 0));
-		self::register("invisible_bedrock", $factory->get(Ids::INVISIBLEBEDROCK, 0));
-		self::register("iron", $factory->get(Ids::IRON_BLOCK, 0));
-		self::register("iron_bars", $factory->get(Ids::IRON_BARS, 0));
-		self::register("iron_door", $factory->get(Ids::IRON_DOOR_BLOCK, 0));
-		self::register("iron_ore", $factory->get(Ids::IRON_ORE, 0));
-		self::register("iron_trapdoor", $factory->get(Ids::IRON_TRAPDOOR, 0));
-		self::register("item_frame", $factory->get(Ids::FRAME_BLOCK, 0));
-		self::register("jukebox", $factory->get(Ids::JUKEBOX, 0));
-		self::register("jungle_button", $factory->get(Ids::JUNGLE_BUTTON, 0));
-		self::register("jungle_door", $factory->get(Ids::JUNGLE_DOOR_BLOCK, 0));
-		self::register("jungle_fence", $factory->get(Ids::FENCE, 3));
-		self::register("jungle_fence_gate", $factory->get(Ids::JUNGLE_FENCE_GATE, 0));
-		self::register("jungle_leaves", $factory->get(Ids::LEAVES, 3));
-		self::register("jungle_log", $factory->get(Ids::LOG, 3));
-		self::register("jungle_planks", $factory->get(Ids::PLANKS, 3));
-		self::register("jungle_pressure_plate", $factory->get(Ids::JUNGLE_PRESSURE_PLATE, 0));
-		self::register("jungle_sapling", $factory->get(Ids::SAPLING, 3));
-		self::register("jungle_sign", $factory->get(Ids::JUNGLE_STANDING_SIGN, 0));
-		self::register("jungle_slab", $factory->get(Ids::WOODEN_SLAB, 3));
-		self::register("jungle_stairs", $factory->get(Ids::JUNGLE_STAIRS, 0));
-		self::register("jungle_trapdoor", $factory->get(Ids::JUNGLE_TRAPDOOR, 0));
-		self::register("jungle_wall_sign", $factory->get(Ids::JUNGLE_WALL_SIGN, 2));
-		self::register("jungle_wood", $factory->get(Ids::WOOD, 3));
-		self::register("lab_table", $factory->get(Ids::CHEMISTRY_TABLE, 12));
-		self::register("ladder", $factory->get(Ids::LADDER, 2));
-		self::register("lantern", $factory->get(Ids::LANTERN, 0));
-		self::register("lapis_lazuli", $factory->get(Ids::LAPIS_BLOCK, 0));
-		self::register("lapis_lazuli_ore", $factory->get(Ids::LAPIS_ORE, 0));
-		self::register("large_fern", $factory->get(Ids::DOUBLE_PLANT, 3));
-		self::register("lava", $factory->get(Ids::FLOWING_LAVA, 0));
-		self::register("lectern", $factory->get(Ids::LECTERN, 0));
-		self::register("legacy_stonecutter", $factory->get(Ids::STONECUTTER, 0));
-		self::register("lever", $factory->get(Ids::LEVER, 0));
-		self::register("light_blue_glazed_terracotta", $factory->get(Ids::LIGHT_BLUE_GLAZED_TERRACOTTA, 2));
-		self::register("light_gray_glazed_terracotta", $factory->get(Ids::SILVER_GLAZED_TERRACOTTA, 2));
-		self::register("lilac", $factory->get(Ids::DOUBLE_PLANT, 1));
-		self::register("lily_of_the_valley", $factory->get(Ids::POPPY, 10));
-		self::register("lily_pad", $factory->get(Ids::LILY_PAD, 0));
-		self::register("lime_glazed_terracotta", $factory->get(Ids::LIME_GLAZED_TERRACOTTA, 2));
-		self::register("lit_pumpkin", $factory->get(Ids::JACK_O_LANTERN, 0));
-		self::register("loom", $factory->get(Ids::LOOM, 0));
-		self::register("magenta_glazed_terracotta", $factory->get(Ids::MAGENTA_GLAZED_TERRACOTTA, 2));
-		self::register("magma", $factory->get(Ids::MAGMA, 0));
-		self::register("material_reducer", $factory->get(Ids::CHEMISTRY_TABLE, 4));
-		self::register("melon", $factory->get(Ids::MELON_BLOCK, 0));
-		self::register("melon_stem", $factory->get(Ids::MELON_STEM, 0));
-		self::register("mob_head", $factory->get(Ids::MOB_HEAD_BLOCK, 2));
-		self::register("monster_spawner", $factory->get(Ids::MOB_SPAWNER, 0));
-		self::register("mossy_cobblestone", $factory->get(Ids::MOSSY_COBBLESTONE, 0));
-		self::register("mossy_cobblestone_slab", $factory->get(Ids::STONE_SLAB2, 5));
-		self::register("mossy_cobblestone_stairs", $factory->get(Ids::MOSSY_COBBLESTONE_STAIRS, 0));
-		self::register("mossy_cobblestone_wall", $factory->get(Ids::COBBLESTONE_WALL, 1));
-		self::register("mossy_stone_brick_slab", $factory->get(Ids::STONE_SLAB4, 0));
-		self::register("mossy_stone_brick_stairs", $factory->get(Ids::MOSSY_STONE_BRICK_STAIRS, 0));
-		self::register("mossy_stone_brick_wall", $factory->get(Ids::COBBLESTONE_WALL, 8));
-		self::register("mossy_stone_bricks", $factory->get(Ids::STONEBRICK, 1));
-		self::register("mushroom_stem", $factory->get(Ids::BROWN_MUSHROOM_BLOCK, 10));
-		self::register("mycelium", $factory->get(Ids::MYCELIUM, 0));
-		self::register("nether_brick_fence", $factory->get(Ids::NETHER_BRICK_FENCE, 0));
-		self::register("nether_brick_slab", $factory->get(Ids::STONE_SLAB, 7));
-		self::register("nether_brick_stairs", $factory->get(Ids::NETHER_BRICK_STAIRS, 0));
-		self::register("nether_brick_wall", $factory->get(Ids::COBBLESTONE_WALL, 9));
-		self::register("nether_bricks", $factory->get(Ids::NETHER_BRICK_BLOCK, 0));
-		self::register("nether_portal", $factory->get(Ids::PORTAL, 1));
-		self::register("nether_quartz_ore", $factory->get(Ids::NETHER_QUARTZ_ORE, 0));
-		self::register("nether_reactor_core", $factory->get(Ids::NETHERREACTOR, 0));
-		self::register("nether_wart", $factory->get(Ids::NETHER_WART_PLANT, 0));
-		self::register("nether_wart_block", $factory->get(Ids::NETHER_WART_BLOCK, 0));
-		self::register("netherrack", $factory->get(Ids::NETHERRACK, 0));
-		self::register("note_block", $factory->get(Ids::NOTEBLOCK, 0));
-		self::register("oak_button", $factory->get(Ids::WOODEN_BUTTON, 0));
-		self::register("oak_door", $factory->get(Ids::OAK_DOOR_BLOCK, 0));
-		self::register("oak_fence", $factory->get(Ids::FENCE, 0));
-		self::register("oak_fence_gate", $factory->get(Ids::FENCE_GATE, 0));
-		self::register("oak_leaves", $factory->get(Ids::LEAVES, 0));
-		self::register("oak_log", $factory->get(Ids::LOG, 0));
-		self::register("oak_planks", $factory->get(Ids::PLANKS, 0));
-		self::register("oak_pressure_plate", $factory->get(Ids::WOODEN_PRESSURE_PLATE, 0));
-		self::register("oak_sapling", $factory->get(Ids::SAPLING, 0));
-		self::register("oak_sign", $factory->get(Ids::SIGN_POST, 0));
-		self::register("oak_slab", $factory->get(Ids::WOODEN_SLAB, 0));
-		self::register("oak_stairs", $factory->get(Ids::OAK_STAIRS, 0));
-		self::register("oak_trapdoor", $factory->get(Ids::TRAPDOOR, 0));
-		self::register("oak_wall_sign", $factory->get(Ids::WALL_SIGN, 2));
-		self::register("oak_wood", $factory->get(Ids::WOOD, 0));
-		self::register("obsidian", $factory->get(Ids::OBSIDIAN, 0));
-		self::register("orange_glazed_terracotta", $factory->get(Ids::ORANGE_GLAZED_TERRACOTTA, 2));
-		self::register("orange_tulip", $factory->get(Ids::POPPY, 5));
-		self::register("oxeye_daisy", $factory->get(Ids::POPPY, 8));
-		self::register("packed_ice", $factory->get(Ids::PACKED_ICE, 0));
-		self::register("peony", $factory->get(Ids::DOUBLE_PLANT, 5));
-		self::register("pink_glazed_terracotta", $factory->get(Ids::PINK_GLAZED_TERRACOTTA, 2));
-		self::register("pink_tulip", $factory->get(Ids::POPPY, 7));
-		self::register("podzol", $factory->get(Ids::PODZOL, 0));
-		self::register("polished_andesite", $factory->get(Ids::STONE, 6));
-		self::register("polished_andesite_slab", $factory->get(Ids::STONE_SLAB3, 2));
-		self::register("polished_andesite_stairs", $factory->get(Ids::POLISHED_ANDESITE_STAIRS, 0));
-		self::register("polished_diorite", $factory->get(Ids::STONE, 4));
-		self::register("polished_diorite_slab", $factory->get(Ids::STONE_SLAB3, 5));
-		self::register("polished_diorite_stairs", $factory->get(Ids::POLISHED_DIORITE_STAIRS, 0));
-		self::register("polished_granite", $factory->get(Ids::STONE, 2));
-		self::register("polished_granite_slab", $factory->get(Ids::STONE_SLAB3, 7));
-		self::register("polished_granite_stairs", $factory->get(Ids::POLISHED_GRANITE_STAIRS, 0));
-		self::register("poppy", $factory->get(Ids::POPPY, 0));
-		self::register("potatoes", $factory->get(Ids::POTATOES, 0));
-		self::register("powered_rail", $factory->get(Ids::GOLDEN_RAIL, 0));
-		self::register("prismarine", $factory->get(Ids::PRISMARINE, 0));
-		self::register("prismarine_bricks", $factory->get(Ids::PRISMARINE, 2));
-		self::register("prismarine_bricks_slab", $factory->get(Ids::STONE_SLAB2, 4));
-		self::register("prismarine_bricks_stairs", $factory->get(Ids::PRISMARINE_BRICKS_STAIRS, 0));
-		self::register("prismarine_slab", $factory->get(Ids::STONE_SLAB2, 2));
-		self::register("prismarine_stairs", $factory->get(Ids::PRISMARINE_STAIRS, 0));
-		self::register("prismarine_wall", $factory->get(Ids::COBBLESTONE_WALL, 11));
-		self::register("pumpkin", $factory->get(Ids::PUMPKIN, 0));
-		self::register("pumpkin_stem", $factory->get(Ids::PUMPKIN_STEM, 0));
-		self::register("purple_glazed_terracotta", $factory->get(Ids::PURPLE_GLAZED_TERRACOTTA, 2));
-		self::register("purple_torch", $factory->get(Ids::COLORED_TORCH_BP, 13));
-		self::register("purpur", $factory->get(Ids::PURPUR_BLOCK, 0));
-		self::register("purpur_pillar", $factory->get(Ids::PURPUR_BLOCK, 2));
-		self::register("purpur_slab", $factory->get(Ids::STONE_SLAB2, 1));
-		self::register("purpur_stairs", $factory->get(Ids::PURPUR_STAIRS, 0));
-		self::register("quartz", $factory->get(Ids::QUARTZ_BLOCK, 0));
-		self::register("quartz_pillar", $factory->get(Ids::QUARTZ_BLOCK, 2));
-		self::register("quartz_slab", $factory->get(Ids::STONE_SLAB, 6));
-		self::register("quartz_stairs", $factory->get(Ids::QUARTZ_STAIRS, 0));
-		self::register("rail", $factory->get(Ids::RAIL, 0));
-		self::register("red_glazed_terracotta", $factory->get(Ids::RED_GLAZED_TERRACOTTA, 2));
-		self::register("red_mushroom", $factory->get(Ids::RED_MUSHROOM, 0));
-		self::register("red_mushroom_block", $factory->get(Ids::RED_MUSHROOM_BLOCK, 0));
-		self::register("red_nether_brick_slab", $factory->get(Ids::STONE_SLAB2, 7));
-		self::register("red_nether_brick_stairs", $factory->get(Ids::RED_NETHER_BRICK_STAIRS, 0));
-		self::register("red_nether_brick_wall", $factory->get(Ids::COBBLESTONE_WALL, 13));
-		self::register("red_nether_bricks", $factory->get(Ids::RED_NETHER_BRICK, 0));
-		self::register("red_sand", $factory->get(Ids::SAND, 1));
-		self::register("red_sandstone", $factory->get(Ids::RED_SANDSTONE, 0));
-		self::register("red_sandstone_slab", $factory->get(Ids::STONE_SLAB2, 0));
-		self::register("red_sandstone_stairs", $factory->get(Ids::RED_SANDSTONE_STAIRS, 0));
-		self::register("red_sandstone_wall", $factory->get(Ids::COBBLESTONE_WALL, 12));
-		self::register("red_torch", $factory->get(Ids::COLORED_TORCH_RG, 5));
-		self::register("red_tulip", $factory->get(Ids::POPPY, 4));
-		self::register("redstone", $factory->get(Ids::REDSTONE_BLOCK, 0));
-		self::register("redstone_comparator", $factory->get(Ids::COMPARATOR_BLOCK, 0));
-		self::register("redstone_lamp", $factory->get(Ids::REDSTONE_LAMP, 0));
-		self::register("redstone_ore", $factory->get(Ids::REDSTONE_ORE, 0));
-		self::register("redstone_repeater", $factory->get(Ids::REPEATER_BLOCK, 0));
-		self::register("redstone_torch", $factory->get(Ids::LIT_REDSTONE_TORCH, 5));
-		self::register("redstone_wire", $factory->get(Ids::REDSTONE_WIRE, 0));
-		self::register("reserved6", $factory->get(Ids::RESERVED6, 0));
-		self::register("rose_bush", $factory->get(Ids::DOUBLE_PLANT, 4));
-		self::register("sand", $factory->get(Ids::SAND, 0));
-		self::register("sandstone", $factory->get(Ids::SANDSTONE, 0));
-		self::register("sandstone_slab", $factory->get(Ids::STONE_SLAB, 1));
-		self::register("sandstone_stairs", $factory->get(Ids::SANDSTONE_STAIRS, 0));
-		self::register("sandstone_wall", $factory->get(Ids::COBBLESTONE_WALL, 5));
-		self::register("sea_lantern", $factory->get(Ids::SEALANTERN, 0));
-		self::register("sea_pickle", $factory->get(Ids::SEA_PICKLE, 0));
-		self::register("shulker_box", $factory->get(Ids::UNDYED_SHULKER_BOX, 0));
-		self::register("slime", $factory->get(Ids::SLIME, 0));
-		self::register("smoker", $factory->get(Ids::SMOKER, 2));
-		self::register("smooth_quartz", $factory->get(Ids::QUARTZ_BLOCK, 3));
-		self::register("smooth_quartz_slab", $factory->get(Ids::STONE_SLAB4, 1));
-		self::register("smooth_quartz_stairs", $factory->get(Ids::SMOOTH_QUARTZ_STAIRS, 0));
-		self::register("smooth_red_sandstone", $factory->get(Ids::RED_SANDSTONE, 3));
-		self::register("smooth_red_sandstone_slab", $factory->get(Ids::STONE_SLAB3, 1));
-		self::register("smooth_red_sandstone_stairs", $factory->get(Ids::SMOOTH_RED_SANDSTONE_STAIRS, 0));
-		self::register("smooth_sandstone", $factory->get(Ids::SANDSTONE, 3));
-		self::register("smooth_sandstone_slab", $factory->get(Ids::STONE_SLAB2, 6));
-		self::register("smooth_sandstone_stairs", $factory->get(Ids::SMOOTH_SANDSTONE_STAIRS, 0));
-		self::register("smooth_stone", $factory->get(Ids::SMOOTH_STONE, 0));
-		self::register("smooth_stone_slab", $factory->get(Ids::STONE_SLAB, 0));
-		self::register("snow", $factory->get(Ids::SNOW, 0));
-		self::register("snow_layer", $factory->get(Ids::SNOW_LAYER, 0));
-		self::register("soul_sand", $factory->get(Ids::SOUL_SAND, 0));
-		self::register("sponge", $factory->get(Ids::SPONGE, 0));
-		self::register("spruce_button", $factory->get(Ids::SPRUCE_BUTTON, 0));
-		self::register("spruce_door", $factory->get(Ids::SPRUCE_DOOR_BLOCK, 0));
-		self::register("spruce_fence", $factory->get(Ids::FENCE, 1));
-		self::register("spruce_fence_gate", $factory->get(Ids::SPRUCE_FENCE_GATE, 0));
-		self::register("spruce_leaves", $factory->get(Ids::LEAVES, 1));
-		self::register("spruce_log", $factory->get(Ids::LOG, 1));
-		self::register("spruce_planks", $factory->get(Ids::PLANKS, 1));
-		self::register("spruce_pressure_plate", $factory->get(Ids::SPRUCE_PRESSURE_PLATE, 0));
-		self::register("spruce_sapling", $factory->get(Ids::SAPLING, 1));
-		self::register("spruce_sign", $factory->get(Ids::SPRUCE_STANDING_SIGN, 0));
-		self::register("spruce_slab", $factory->get(Ids::WOODEN_SLAB, 1));
-		self::register("spruce_stairs", $factory->get(Ids::SPRUCE_STAIRS, 0));
-		self::register("spruce_trapdoor", $factory->get(Ids::SPRUCE_TRAPDOOR, 0));
-		self::register("spruce_wall_sign", $factory->get(Ids::SPRUCE_WALL_SIGN, 2));
-		self::register("spruce_wood", $factory->get(Ids::WOOD, 1));
-		self::register("stained_clay", $factory->get(Ids::STAINED_CLAY, 0));
-		self::register("stained_glass", $factory->get(Ids::STAINED_GLASS, 0));
-		self::register("stained_glass_pane", $factory->get(Ids::STAINED_GLASS_PANE, 0));
-		self::register("stained_hardened_glass", $factory->get(Ids::HARD_STAINED_GLASS, 0));
-		self::register("stained_hardened_glass_pane", $factory->get(Ids::HARD_STAINED_GLASS_PANE, 0));
-		self::register("stone", $factory->get(Ids::STONE, 0));
-		self::register("stone_brick_slab", $factory->get(Ids::STONE_SLAB, 5));
-		self::register("stone_brick_stairs", $factory->get(Ids::STONE_BRICK_STAIRS, 0));
-		self::register("stone_brick_wall", $factory->get(Ids::COBBLESTONE_WALL, 7));
-		self::register("stone_bricks", $factory->get(Ids::STONEBRICK, 0));
-		self::register("stone_button", $factory->get(Ids::STONE_BUTTON, 0));
-		self::register("stone_pressure_plate", $factory->get(Ids::STONE_PRESSURE_PLATE, 0));
-		self::register("stone_slab", $factory->get(Ids::STONE_SLAB4, 2));
-		self::register("stone_stairs", $factory->get(Ids::NORMAL_STONE_STAIRS, 0));
-		self::register("stonecutter", $factory->get(Ids::STONECUTTER_BLOCK, 2));
-		self::register("stripped_acacia_log", $factory->get(Ids::STRIPPED_ACACIA_LOG, 0));
-		self::register("stripped_acacia_wood", $factory->get(Ids::WOOD, 12));
-		self::register("stripped_birch_log", $factory->get(Ids::STRIPPED_BIRCH_LOG, 0));
-		self::register("stripped_birch_wood", $factory->get(Ids::WOOD, 10));
-		self::register("stripped_dark_oak_log", $factory->get(Ids::STRIPPED_DARK_OAK_LOG, 0));
-		self::register("stripped_dark_oak_wood", $factory->get(Ids::WOOD, 13));
-		self::register("stripped_jungle_log", $factory->get(Ids::STRIPPED_JUNGLE_LOG, 0));
-		self::register("stripped_jungle_wood", $factory->get(Ids::WOOD, 11));
-		self::register("stripped_oak_log", $factory->get(Ids::STRIPPED_OAK_LOG, 0));
-		self::register("stripped_oak_wood", $factory->get(Ids::WOOD, 8));
-		self::register("stripped_spruce_log", $factory->get(Ids::STRIPPED_SPRUCE_LOG, 0));
-		self::register("stripped_spruce_wood", $factory->get(Ids::WOOD, 9));
-		self::register("sugarcane", $factory->get(Ids::REEDS_BLOCK, 0));
-		self::register("sunflower", $factory->get(Ids::DOUBLE_PLANT, 0));
-		self::register("sweet_berry_bush", $factory->get(Ids::SWEET_BERRY_BUSH, 0));
-		self::register("tall_grass", $factory->get(Ids::TALLGRASS, 1));
-		self::register("tnt", $factory->get(Ids::TNT, 0));
-		self::register("torch", $factory->get(Ids::TORCH, 5));
-		self::register("trapped_chest", $factory->get(Ids::TRAPPED_CHEST, 2));
-		self::register("tripwire", $factory->get(Ids::TRIPWIRE, 0));
-		self::register("tripwire_hook", $factory->get(Ids::TRIPWIRE_HOOK, 0));
-		self::register("underwater_torch", $factory->get(Ids::UNDERWATER_TORCH, 5));
-		self::register("vines", $factory->get(Ids::VINE, 0));
-		self::register("wall_banner", $factory->get(Ids::WALL_BANNER, 2));
-		self::register("wall_coral_fan", $factory->get(Ids::CORAL_FAN_HANG, 0));
-		self::register("water", $factory->get(Ids::FLOWING_WATER, 0));
-		self::register("weighted_pressure_plate_heavy", $factory->get(Ids::HEAVY_WEIGHTED_PRESSURE_PLATE, 0));
-		self::register("weighted_pressure_plate_light", $factory->get(Ids::LIGHT_WEIGHTED_PRESSURE_PLATE, 0));
-		self::register("wheat", $factory->get(Ids::WHEAT_BLOCK, 0));
-		self::register("white_glazed_terracotta", $factory->get(Ids::WHITE_GLAZED_TERRACOTTA, 2));
-		self::register("white_tulip", $factory->get(Ids::POPPY, 6));
-		self::register("wool", $factory->get(Ids::WOOL, 0));
-		self::register("yellow_glazed_terracotta", $factory->get(Ids::YELLOW_GLAZED_TERRACOTTA, 2));
+		self::register("air", fn(BID $id) => new Air($id, "Air", new Info(BreakInfo::indestructible(-1.0))));
+
+		$railBreakInfo = new Info(new BreakInfo(0.7));
+		self::register("activator_rail", fn(BID $id) => new ActivatorRail($id, "Activator Rail", $railBreakInfo));
+		self::register("anvil", fn(BID $id) => new Anvil($id, "Anvil", new Info(BreakInfo::pickaxe(5.0, ToolTier::WOOD, 6000.0))));
+		self::register("bamboo", fn(BID $id) => new Bamboo($id, "Bamboo", new Info(new class(2.0 /* 1.0 in PC */, ToolType::AXE) extends BreakInfo{
+			public function getBreakTime(Item $item) : float{
+				if($item->getBlockToolType() === ToolType::SWORD){
+					return 0.0;
+				}
+				return parent::getBreakTime($item);
+			}
+		}, [Tags::POTTABLE_PLANTS])));
+		self::register("bamboo_sapling", fn(BID $id) => new BambooSapling($id, "Bamboo Sapling", new Info(BreakInfo::instant())));
+
+		$bannerBreakInfo = new Info(BreakInfo::axe(1.0));
+		self::register("banner", fn(BID $id) => new FloorBanner($id, "Banner", $bannerBreakInfo), TileBanner::class);
+		self::register("wall_banner", fn(BID $id) => new WallBanner($id, "Wall Banner", $bannerBreakInfo), TileBanner::class);
+		self::register("barrel", fn(BID $id) => new Barrel($id, "Barrel", new Info(BreakInfo::axe(2.5))), TileBarrel::class);
+		self::register("barrier", fn(BID $id) => new Transparent($id, "Barrier", new Info(BreakInfo::indestructible())));
+		self::register("beacon", fn(BID $id) => new Beacon($id, "Beacon", new Info(new BreakInfo(3.0))), TileBeacon::class);
+		self::register("bed", fn(BID $id) => new Bed($id, "Bed Block", new Info(new BreakInfo(0.2))), TileBed::class);
+		self::register("bedrock", fn(BID $id) => new Bedrock($id, "Bedrock", new Info(BreakInfo::indestructible())));
+
+		self::register("beetroots", fn(BID $id) => new Beetroot($id, "Beetroot Block", new Info(BreakInfo::instant())));
+		self::register("bell", fn(BID $id) => new Bell($id, "Bell", new Info(BreakInfo::pickaxe(5.0, ToolTier::WOOD))), TileBell::class);
+		self::register("blue_ice", fn(BID $id) => new BlueIce($id, "Blue Ice", new Info(BreakInfo::pickaxe(2.8))));
+		self::register("bone_block", fn(BID $id) => new BoneBlock($id, "Bone Block", new Info(BreakInfo::pickaxe(2.0, ToolTier::WOOD))));
+		self::register("bookshelf", fn(BID $id) => new Bookshelf($id, "Bookshelf", new Info(BreakInfo::axe(1.5))));
+		self::register("chiseled_bookshelf", fn(BID $id) => new ChiseledBookshelf($id, "Chiseled Bookshelf", new Info(BreakInfo::axe(1.5))), TileChiseledBookshelf::class);
+		self::register("brewing_stand", fn(BID $id) => new BrewingStand($id, "Brewing Stand", new Info(BreakInfo::pickaxe(0.5, ToolTier::WOOD))), TileBrewingStand::class);
+
+		$bricksBreakInfo = new Info(BreakInfo::pickaxe(2.0, ToolTier::WOOD, 30.0));
+		self::register("brick_stairs", fn(BID $id) => new Stair($id, "Brick Stairs", $bricksBreakInfo));
+		self::register("bricks", fn(BID $id) => new Opaque($id, "Bricks", $bricksBreakInfo));
+
+		self::register("brown_mushroom", fn(BID $id) => new BrownMushroom($id, "Brown Mushroom", new Info(BreakInfo::instant(), [Tags::POTTABLE_PLANTS])));
+		self::register("cactus", fn(BID $id) => new Cactus($id, "Cactus", new Info(new BreakInfo(0.4), [Tags::POTTABLE_PLANTS])));
+		self::register("cake", fn(BID $id) => new Cake($id, "Cake", new Info(new BreakInfo(0.5))));
+
+		$campfireBreakInfo = new Info(BreakInfo::axe(2.0));
+		self::register("campfire", fn(BID $id) => new Campfire($id, "Campfire", $campfireBreakInfo), TileCampfire::class);
+		self::register("soul_campfire", fn(BID $id) => new SoulCampfire($id, "Soul Campfire", $campfireBreakInfo), TileCampfire::class);
+
+		self::register("carrots", fn(BID $id) => new Carrot($id, "Carrot Block", new Info(BreakInfo::instant())));
+
+		$chestBreakInfo = new Info(BreakInfo::axe(2.5));
+		self::register("chest", fn(BID $id) => new Chest($id, "Chest", $chestBreakInfo), TileChest::class);
+		self::register("clay", fn(BID $id) => new Clay($id, "Clay Block", new Info(BreakInfo::shovel(0.6))));
+		self::register("coal", fn(BID $id) => new Coal($id, "Coal Block", new Info(BreakInfo::pickaxe(5.0, ToolTier::WOOD, 30.0))));
+
+		$cobblestoneBreakInfo = new Info(BreakInfo::pickaxe(2.0, ToolTier::WOOD, 30.0));
+		$cobblestone = self::register("cobblestone", fn(BID $id) => new Opaque($id, "Cobblestone", $cobblestoneBreakInfo));
+		self::register("mossy_cobblestone", fn(BID $id) => new Opaque($id, "Mossy Cobblestone", $cobblestoneBreakInfo));
+		self::register("cobblestone_stairs", fn(BID $id) => new Stair($id, "Cobblestone Stairs", $cobblestoneBreakInfo));
+		self::register("mossy_cobblestone_stairs", fn(BID $id) => new Stair($id, "Mossy Cobblestone Stairs", $cobblestoneBreakInfo));
+
+		self::register("cobweb", fn(BID $id) => new Cobweb($id, "Cobweb", new Info(new BreakInfo(4.0, ToolType::SWORD | ToolType::SHEARS, 1))));
+		self::register("cocoa_pod", fn(BID $id) => new CocoaBlock($id, "Cocoa Block", new Info(BreakInfo::axe(0.2, null, 15.0))));
+		self::register("coral_block", fn(BID $id) => new CoralBlock($id, "Coral Block", new Info(BreakInfo::pickaxe(7.0, ToolTier::WOOD))));
+		self::register("daylight_sensor", fn(BID $id) => new DaylightSensor($id, "Daylight Sensor", new Info(BreakInfo::axe(0.2))), TileDaylightSensor::class);
+		self::register("dead_bush", fn(BID $id) => new DeadBush($id, "Dead Bush", new Info(BreakInfo::instant(ToolType::SHEARS, 1), [Tags::POTTABLE_PLANTS])));
+		self::register("detector_rail", fn(BID $id) => new DetectorRail($id, "Detector Rail", $railBreakInfo));
+
+		self::register("diamond", fn(BID $id) => new Opaque($id, "Diamond Block", new Info(BreakInfo::pickaxe(5.0, ToolTier::IRON, 30.0))));
+		self::register("dirt", fn(BID $id) => new Dirt($id, "Dirt", new Info(BreakInfo::shovel(0.5), [Tags::DIRT])));
+		self::register("sunflower", fn(BID $id) => new DoublePlant($id, "Sunflower", new Info(BreakInfo::instant())));
+		self::register("lilac", fn(BID $id) => new DoublePlant($id, "Lilac", new Info(BreakInfo::instant())));
+		self::register("rose_bush", fn(BID $id) => new DoublePlant($id, "Rose Bush", new Info(BreakInfo::instant())));
+		self::register("peony", fn(BID $id) => new DoublePlant($id, "Peony", new Info(BreakInfo::instant())));
+		self::register("pink_petals", fn(BID $id) => new PinkPetals($id, "Pink Petals", new Info(BreakInfo::instant())));
+		self::register("double_tallgrass", fn(BID $id) => new DoubleTallGrass($id, "Double Tallgrass", new Info(BreakInfo::instant(ToolType::SHEARS, 1))));
+		self::register("large_fern", fn(BID $id) => new DoubleTallGrass($id, "Large Fern", new Info(BreakInfo::instant(ToolType::SHEARS, 1))));
+		self::register("pitcher_plant", fn(BID $id) => new DoublePlant($id, "Pitcher Plant", new Info(BreakInfo::instant())));
+		self::register("pitcher_crop", fn(BID $id) => new PitcherCrop($id, "Pitcher Crop", new Info(BreakInfo::instant())));
+		self::register("double_pitcher_crop", fn(BID $id) => new DoublePitcherCrop($id, "Double Pitcher Crop", new Info(BreakInfo::instant())));
+		self::register("dragon_egg", fn(BID $id) => new DragonEgg($id, "Dragon Egg", new Info(BreakInfo::pickaxe(3.0, ToolTier::WOOD))));
+		self::register("dried_kelp", fn(BID $id) => new DriedKelp($id, "Dried Kelp Block", new Info(new BreakInfo(0.5, ToolType::NONE, 0, 12.5))));
+		self::register("emerald", fn(BID $id) => new Opaque($id, "Emerald Block", new Info(BreakInfo::pickaxe(5.0, ToolTier::IRON, 30.0))));
+		self::register("enchanting_table", fn(BID $id) => new EnchantingTable($id, "Enchanting Table", new Info(BreakInfo::pickaxe(5.0, ToolTier::WOOD, 6000.0))), TileEnchantingTable::class);
+		self::register("end_portal_frame", fn(BID $id) => new EndPortalFrame($id, "End Portal Frame", new Info(BreakInfo::indestructible())));
+		self::register("end_rod", fn(BID $id) => new EndRod($id, "End Rod", new Info(BreakInfo::instant())));
+		self::register("end_stone", fn(BID $id) => new Opaque($id, "End Stone", new Info(BreakInfo::pickaxe(3.0, ToolTier::WOOD, 45.0))));
+
+		$endBrickBreakInfo = new Info(BreakInfo::pickaxe(0.8, ToolTier::WOOD, 4.0));
+		self::register("end_stone_bricks", fn(BID $id) => new Opaque($id, "End Stone Bricks", $endBrickBreakInfo));
+		self::register("end_stone_brick_stairs", fn(BID $id) => new Stair($id, "End Stone Brick Stairs", $endBrickBreakInfo));
+
+		self::register("ender_chest", fn(BID $id) => new EnderChest($id, "Ender Chest", new Info(BreakInfo::pickaxe(22.5, ToolTier::WOOD, 3000.0))), TileEnderChest::class);
+		self::register("farmland", fn(BID $id) => new Farmland($id, "Farmland", new Info(BreakInfo::shovel(0.6), [Tags::DIRT])));
+		self::register("fire", fn(BID $id) => new Fire($id, "Fire Block", new Info(BreakInfo::instant(), [Tags::FIRE])));
+
+		$flowerTypeInfo = new Info(BreakInfo::instant(), [Tags::POTTABLE_PLANTS]);
+		self::register("dandelion", fn(BID $id) => new Flower($id, "Dandelion", $flowerTypeInfo));
+		self::register("poppy", fn(BID $id) => new Flower($id, "Poppy", $flowerTypeInfo));
+		self::register("allium", fn(BID $id) => new Flower($id, "Allium", $flowerTypeInfo));
+		self::register("azure_bluet", fn(BID $id) => new Flower($id, "Azure Bluet", $flowerTypeInfo));
+		self::register("blue_orchid", fn(BID $id) => new Flower($id, "Blue Orchid", $flowerTypeInfo));
+		self::register("cornflower", fn(BID $id) => new Flower($id, "Cornflower", $flowerTypeInfo));
+		self::register("lily_of_the_valley", fn(BID $id) => new Flower($id, "Lily of the Valley", $flowerTypeInfo));
+		self::register("orange_tulip", fn(BID $id) => new Flower($id, "Orange Tulip", $flowerTypeInfo));
+		self::register("oxeye_daisy", fn(BID $id) => new Flower($id, "Oxeye Daisy", $flowerTypeInfo));
+		self::register("pink_tulip", fn(BID $id) => new Flower($id, "Pink Tulip", $flowerTypeInfo));
+		self::register("red_tulip", fn(BID $id) => new Flower($id, "Red Tulip", $flowerTypeInfo));
+		self::register("white_tulip", fn(BID $id) => new Flower($id, "White Tulip", $flowerTypeInfo));
+		self::register("torchflower", fn(BID $id) => new Flower($id, "Torchflower", $flowerTypeInfo));
+		self::register("torchflower_crop", fn(BID $id) => new TorchflowerCrop($id, "Torchflower Crop", new Info(BreakInfo::instant())));
+		self::register("flower_pot", fn(BID $id) => new FlowerPot($id, "Flower Pot", new Info(BreakInfo::instant())), TileFlowerPot::class);
+		self::register("frosted_ice", fn(BID $id) => new FrostedIce($id, "Frosted Ice", new Info(BreakInfo::pickaxe(2.5))));
+		self::register("furnace", fn(BID $id) => new Furnace($id, "Furnace", new Info(BreakInfo::pickaxe(3.5, ToolTier::WOOD)), FurnaceType::FURNACE), TileNormalFurnace::class);
+		self::register("blast_furnace", fn(BID $id) => new Furnace($id, "Blast Furnace", new Info(BreakInfo::pickaxe(3.5, ToolTier::WOOD)), FurnaceType::BLAST_FURNACE), TileBlastFurnace::class);
+		self::register("smoker", fn(BID $id) => new Furnace($id, "Smoker", new Info(BreakInfo::pickaxe(3.5, ToolTier::WOOD)), FurnaceType::SMOKER), TileSmoker::class);
+
+		$glassBreakInfo = new Info(new BreakInfo(0.3));
+		self::register("glass", fn(BID $id) => new Glass($id, "Glass", $glassBreakInfo));
+		self::register("glass_pane", fn(BID $id) => new GlassPane($id, "Glass Pane", $glassBreakInfo));
+		self::register("glowing_obsidian", fn(BID $id) => new GlowingObsidian($id, "Glowing Obsidian", new Info(BreakInfo::pickaxe(10.0, ToolTier::DIAMOND, 50.0))));
+		self::register("glowstone", fn(BID $id) => new Glowstone($id, "Glowstone", new Info(BreakInfo::pickaxe(0.3))));
+		self::register("glow_lichen", fn(BID $id) => new GlowLichen($id, "Glow Lichen", new Info(BreakInfo::axe(0.2, null, 0.2))));
+		self::register("gold", fn(BID $id) => new Opaque($id, "Gold Block", new Info(BreakInfo::pickaxe(3.0, ToolTier::IRON, 30.0))));
+
+		$grassBreakInfo = BreakInfo::shovel(0.6);
+		self::register("grass", fn(BID $id) => new Grass($id, "Grass", new Info($grassBreakInfo, [Tags::DIRT])));
+		self::register("grass_path", fn(BID $id) => new GrassPath($id, "Grass Path", new Info($grassBreakInfo)));
+		self::register("gravel", fn(BID $id) => new Gravel($id, "Gravel", new Info(BreakInfo::shovel(0.6))));
+
+		$hardenedClayBreakInfo = new Info(BreakInfo::pickaxe(1.25, ToolTier::WOOD, 21.0));
+		self::register("hardened_clay", fn(BID $id) => new HardenedClay($id, "Hardened Clay", $hardenedClayBreakInfo));
+
+		$hardenedGlassBreakInfo = new Info(new BreakInfo(10.0));
+		self::register("hardened_glass", fn(BID $id) => new HardenedGlass($id, "Hardened Glass", $hardenedGlassBreakInfo));
+		self::register("hardened_glass_pane", fn(BID $id) => new HardenedGlassPane($id, "Hardened Glass Pane", $hardenedGlassBreakInfo));
+		self::register("hay_bale", fn(BID $id) => new HayBale($id, "Hay Bale", new Info(new BreakInfo(0.5))));
+		self::register("hopper", fn(BID $id) => new Hopper($id, "Hopper", new Info(BreakInfo::pickaxe(3.0, ToolTier::WOOD, 15.0))), TileHopper::class);
+		self::register("ice", fn(BID $id) => new Ice($id, "Ice", new Info(BreakInfo::pickaxe(0.5))));
+
+		$updateBlockBreakInfo = new Info(new BreakInfo(1.0));
+		self::register("info_update", fn(BID $id) => new Opaque($id, "update!", $updateBlockBreakInfo));
+		self::register("info_update2", fn(BID $id) => new Opaque($id, "ate!upd", $updateBlockBreakInfo));
+		self::register("invisible_bedrock", fn(BID $id) => new Transparent($id, "Invisible Bedrock", new Info(BreakInfo::indestructible())));
+
+		$ironBreakInfo = new Info(BreakInfo::pickaxe(5.0, ToolTier::STONE, 30.0));
+		self::register("iron", fn(BID $id) => new Opaque($id, "Iron Block", $ironBreakInfo));
+		self::register("iron_bars", fn(BID $id) => new Thin($id, "Iron Bars", $ironBreakInfo));
+		$ironDoorBreakInfo = new Info(BreakInfo::pickaxe(5.0, ToolTier::WOOD, 25.0));
+		self::register("iron_door", fn(BID $id) => new Door($id, "Iron Door", $ironDoorBreakInfo));
+		self::register("iron_trapdoor", fn(BID $id) => new Trapdoor($id, "Iron Trapdoor", $ironDoorBreakInfo));
+
+		$itemFrameInfo = new Info(new BreakInfo(0.25));
+		self::register("item_frame", fn(BID $id) => new ItemFrame($id, "Item Frame", $itemFrameInfo), TileItemFrame::class);
+		self::register("glowing_item_frame", fn(BID $id) => new ItemFrame($id, "Glow Item Frame", $itemFrameInfo), TileGlowingItemFrame::class);
+
+		self::register("jukebox", fn(BID $id) => new Jukebox($id, "Jukebox", new Info(BreakInfo::axe(0.8))), TileJukebox::class); //TODO: in PC the hardness is 2.0, not 0.8, unsure if this is a MCPE bug or not
+		self::register("ladder", fn(BID $id) => new Ladder($id, "Ladder", new Info(BreakInfo::axe(0.4))));
+
+		$lanternBreakInfo = new Info(BreakInfo::pickaxe(5.0, ToolTier::WOOD));
+		self::register("lantern", fn(BID $id) => new Lantern($id, "Lantern", $lanternBreakInfo, 15));
+		self::register("soul_lantern", fn(BID $id) => new Lantern($id, "Soul Lantern", $lanternBreakInfo, 10));
+
+		self::register("lapis_lazuli", fn(BID $id) => new Opaque($id, "Lapis Lazuli Block", new Info(BreakInfo::pickaxe(3.0, ToolTier::STONE))));
+		self::register("lava", fn(BID $id) => new Lava($id, "Lava", new Info(BreakInfo::indestructible(500.0))));
+		self::register("lectern", fn(BID $id) => new Lectern($id, "Lectern", new Info(BreakInfo::axe(2.0))), TileLectern::class);
+		self::register("lever", fn(BID $id) => new Lever($id, "Lever", new Info(new BreakInfo(0.5))));
+		self::register("magma", fn(BID $id) => new Magma($id, "Magma Block", new Info(BreakInfo::pickaxe(0.5, ToolTier::WOOD))));
+		self::register("melon", fn(BID $id) => new Melon($id, "Melon Block", new Info(BreakInfo::axe(1.0))));
+		self::register("melon_stem", fn(BID $id) => new MelonStem($id, "Melon Stem", new Info(BreakInfo::instant())));
+		self::register("monster_spawner", fn(BID $id) => new MonsterSpawner($id, "Monster Spawner", new Info(BreakInfo::pickaxe(5.0, ToolTier::WOOD))), TileMonsterSpawner::class);
+		self::register("mycelium", fn(BID $id) => new Mycelium($id, "Mycelium", new Info(BreakInfo::shovel(0.6), [Tags::DIRT])));
+
+		$netherBrickBreakInfo = new Info(BreakInfo::pickaxe(2.0, ToolTier::WOOD, 30.0));
+		self::register("nether_bricks", fn(BID $id) => new Opaque($id, "Nether Bricks", $netherBrickBreakInfo));
+		self::register("red_nether_bricks", fn(BID $id) => new Opaque($id, "Red Nether Bricks", $netherBrickBreakInfo));
+		self::register("nether_brick_fence", fn(BID $id) => new Fence($id, "Nether Brick Fence", $netherBrickBreakInfo));
+		self::register("nether_brick_stairs", fn(BID $id) => new Stair($id, "Nether Brick Stairs", $netherBrickBreakInfo));
+		self::register("red_nether_brick_stairs", fn(BID $id) => new Stair($id, "Red Nether Brick Stairs", $netherBrickBreakInfo));
+		self::register("chiseled_nether_bricks", fn(BID $id) => new Opaque($id, "Chiseled Nether Bricks", $netherBrickBreakInfo));
+		self::register("cracked_nether_bricks", fn(BID $id) => new Opaque($id, "Cracked Nether Bricks", $netherBrickBreakInfo));
+
+		self::register("nether_portal", fn(BID $id) => new NetherPortal($id, "Nether Portal", new Info(BreakInfo::indestructible(0.0))));
+		self::register("nether_reactor_core", fn(BID $id) => new NetherReactor($id, "Nether Reactor Core", new Info(BreakInfo::pickaxe(3.0, ToolTier::WOOD))));
+		self::register("nether_wart_block", fn(BID $id) => new Opaque($id, "Nether Wart Block", new Info(new BreakInfo(1.0, ToolType::HOE))));
+		self::register("nether_wart", fn(BID $id) => new NetherWartPlant($id, "Nether Wart", new Info(BreakInfo::instant())));
+		self::register("netherrack", fn(BID $id) => new Netherrack($id, "Netherrack", new Info(BreakInfo::pickaxe(0.4, ToolTier::WOOD))));
+		self::register("note_block", fn(BID $id) => new Note($id, "Note Block", new Info(BreakInfo::axe(0.8))), TileNote::class);
+		self::register("obsidian", fn(BID $id) => new Opaque($id, "Obsidian", new Info(BreakInfo::pickaxe(35.0 /* 50 in PC */,  ToolTier::DIAMOND, 6000.0))));
+		self::register("packed_ice", fn(BID $id) => new PackedIce($id, "Packed Ice", new Info(BreakInfo::pickaxe(0.5))));
+		self::register("podzol", fn(BID $id) => new Podzol($id, "Podzol", new Info(BreakInfo::shovel(0.5), [Tags::DIRT])));
+		self::register("potatoes", fn(BID $id) => new Potato($id, "Potato Block", new Info(BreakInfo::instant())));
+		self::register("powered_rail", fn(BID $id) => new PoweredRail($id, "Powered Rail", $railBreakInfo));
+
+		$prismarineBreakInfo = new Info(BreakInfo::pickaxe(1.5, ToolTier::WOOD, 30.0));
+		self::register("prismarine", fn(BID $id) => new Opaque($id, "Prismarine", $prismarineBreakInfo));
+		self::register("dark_prismarine", fn(BID $id) => new Opaque($id, "Dark Prismarine", $prismarineBreakInfo));
+		self::register("prismarine_bricks", fn(BID $id) => new Opaque($id, "Prismarine Bricks", $prismarineBreakInfo));
+		self::register("prismarine_bricks_stairs", fn(BID $id) => new Stair($id, "Prismarine Bricks Stairs", $prismarineBreakInfo));
+		self::register("dark_prismarine_stairs", fn(BID $id) => new Stair($id, "Dark Prismarine Stairs", $prismarineBreakInfo));
+		self::register("prismarine_stairs", fn(BID $id) => new Stair($id, "Prismarine Stairs", $prismarineBreakInfo));
+
+		$pumpkinBreakInfo = new Info(BreakInfo::axe(1.0));
+		self::register("pumpkin", fn(BID $id) => new Pumpkin($id, "Pumpkin", $pumpkinBreakInfo));
+		self::register("carved_pumpkin", fn(BID $id) => new CarvedPumpkin($id, "Carved Pumpkin", new Info(BreakInfo::axe(1.0), enchantmentTags: [EnchantmentTags::MASK])));
+		self::register("lit_pumpkin", fn(BID $id) => new LitPumpkin($id, "Jack o'Lantern", $pumpkinBreakInfo));
+
+		self::register("pumpkin_stem", fn(BID $id) => new PumpkinStem($id, "Pumpkin Stem", new Info(BreakInfo::instant())));
+
+		$purpurBreakInfo = new Info(BreakInfo::pickaxe(1.5, ToolTier::WOOD, 30.0));
+		self::register("purpur", fn(BID $id) => new Opaque($id, "Purpur Block", $purpurBreakInfo));
+		self::register("purpur_pillar", fn(BID $id) => new SimplePillar($id, "Purpur Pillar", $purpurBreakInfo));
+		self::register("purpur_stairs", fn(BID $id) => new Stair($id, "Purpur Stairs", $purpurBreakInfo));
+
+		$quartzBreakInfo = new Info(BreakInfo::pickaxe(0.8, ToolTier::WOOD));
+		self::register("quartz", fn(BID $id) => new Opaque($id, "Quartz Block", $quartzBreakInfo));
+		self::register("chiseled_quartz", fn(BID $id) => new SimplePillar($id, "Chiseled Quartz Block", $quartzBreakInfo));
+		self::register("quartz_pillar", fn(BID $id) => new SimplePillar($id, "Quartz Pillar", $quartzBreakInfo));
+		self::register("smooth_quartz", fn(BID $id) => new Opaque($id, "Smooth Quartz Block", $quartzBreakInfo));
+		self::register("quartz_bricks", fn(BID $id) => new Opaque($id, "Quartz Bricks", $quartzBreakInfo));
+
+		self::register("quartz_stairs", fn(BID $id) => new Stair($id, "Quartz Stairs", $quartzBreakInfo));
+		self::register("smooth_quartz_stairs", fn(BID $id) => new Stair($id, "Smooth Quartz Stairs", $quartzBreakInfo));
+
+		self::register("rail", fn(BID $id) => new Rail($id, "Rail", $railBreakInfo));
+		self::register("red_mushroom", fn(BID $id) => new RedMushroom($id, "Red Mushroom", new Info(BreakInfo::instant(), [Tags::POTTABLE_PLANTS])));
+		self::register("redstone", fn(BID $id) => new Redstone($id, "Redstone Block", new Info(BreakInfo::pickaxe(5.0, ToolTier::WOOD, 30.0))));
+		self::register("redstone_comparator", fn(BID $id) => new RedstoneComparator($id, "Redstone Comparator", new Info(BreakInfo::instant())), TileComparator::class);
+		self::register("redstone_lamp", fn(BID $id) => new RedstoneLamp($id, "Redstone Lamp", new Info(new BreakInfo(0.3))));
+		self::register("redstone_repeater", fn(BID $id) => new RedstoneRepeater($id, "Redstone Repeater", new Info(BreakInfo::instant())));
+		self::register("redstone_torch", fn(BID $id) => new RedstoneTorch($id, "Redstone Torch", new Info(BreakInfo::instant())));
+		self::register("redstone_wire", fn(BID $id) => new RedstoneWire($id, "Redstone", new Info(BreakInfo::instant())));
+		self::register("reserved6", fn(BID $id) => new Reserved6($id, "reserved6", new Info(BreakInfo::instant())));
+
+		$sandTypeInfo = new Info(BreakInfo::shovel(0.5), [Tags::SAND]);
+		self::register("sand", fn(BID $id) => new Sand($id, "Sand", $sandTypeInfo));
+		self::register("red_sand", fn(BID $id) => new Sand($id, "Red Sand", $sandTypeInfo));
+
+		self::register("sea_lantern", fn(BID $id) => new SeaLantern($id, "Sea Lantern", new Info(new BreakInfo(0.3))));
+		self::register("sea_pickle", fn(BID $id) => new SeaPickle($id, "Sea Pickle", new Info(BreakInfo::instant())));
+		self::register("mob_head", fn(BID $id) => new MobHead($id, "Mob Head", new Info(new BreakInfo(1.0), enchantmentTags: [EnchantmentTags::MASK])), TileMobHead::class);
+		self::register("slime", fn(BID $id) => new Slime($id, "Slime Block", new Info(BreakInfo::instant())));
+		self::register("snow", fn(BID $id) => new Snow($id, "Snow Block", new Info(BreakInfo::shovel(0.2, ToolTier::WOOD))));
+		self::register("snow_layer", fn(BID $id) => new SnowLayer($id, "Snow Layer", new Info(BreakInfo::shovel(0.1, ToolTier::WOOD))));
+		self::register("soul_sand", fn(BID $id) => new SoulSand($id, "Soul Sand", new Info(BreakInfo::shovel(0.5))));
+		self::register("sponge", fn(BID $id) => new Sponge($id, "Sponge", new Info(new BreakInfo(0.6, ToolType::HOE))));
+		$shulkerBoxBreakInfo = new Info(BreakInfo::pickaxe(2));
+		self::register("shulker_box", fn(BID $id) => new ShulkerBox($id, "Shulker Box", $shulkerBoxBreakInfo), TileShulkerBox::class);
+
+		$stoneBreakInfo = new Info(BreakInfo::pickaxe(1.5, ToolTier::WOOD, 30.0));
+		$stone = self::register(
+			"stone",
+			fn(BID $id) => new class($id, "Stone", $stoneBreakInfo) extends Opaque{
+				public function getDropsForCompatibleTool(Item $item) : array{
+					return [VanillaBlocks::COBBLESTONE()->asItem()];
+				}
+
+				public function isAffectedBySilkTouch() : bool{
+					return true;
+				}
+			}
+		);
+		self::register("andesite", fn(BID $id) => new Opaque($id, "Andesite", $stoneBreakInfo));
+		self::register("diorite", fn(BID $id) => new Opaque($id, "Diorite", $stoneBreakInfo));
+		self::register("granite", fn(BID $id) => new Opaque($id, "Granite", $stoneBreakInfo));
+		self::register("polished_andesite", fn(BID $id) => new Opaque($id, "Polished Andesite", $stoneBreakInfo));
+		self::register("polished_diorite", fn(BID $id) => new Opaque($id, "Polished Diorite", $stoneBreakInfo));
+		self::register("polished_granite", fn(BID $id) => new Opaque($id, "Polished Granite", $stoneBreakInfo));
+
+		$stoneBrick = self::register("stone_bricks", fn(BID $id) => new Opaque($id, "Stone Bricks", $stoneBreakInfo));
+		$mossyStoneBrick = self::register("mossy_stone_bricks", fn(BID $id) => new Opaque($id, "Mossy Stone Bricks", $stoneBreakInfo));
+		$crackedStoneBrick = self::register("cracked_stone_bricks", fn(BID $id) => new Opaque($id, "Cracked Stone Bricks", $stoneBreakInfo));
+		$chiseledStoneBrick = self::register("chiseled_stone_bricks", fn(BID $id) => new Opaque($id, "Chiseled Stone Bricks", $stoneBreakInfo));
+
+		$infestedStoneBreakInfo = new Info(BreakInfo::pickaxe(0.75));
+		self::register("infested_stone", fn(BID $id) => new InfestedStone($id, "Infested Stone", $infestedStoneBreakInfo, $stone));
+		self::register("infested_stone_brick", fn(BID $id) => new InfestedStone($id, "Infested Stone Brick", $infestedStoneBreakInfo, $stoneBrick));
+		self::register("infested_cobblestone", fn(BID $id) => new InfestedStone($id, "Infested Cobblestone", $infestedStoneBreakInfo, $cobblestone));
+		self::register("infested_mossy_stone_brick", fn(BID $id) => new InfestedStone($id, "Infested Mossy Stone Brick", $infestedStoneBreakInfo, $mossyStoneBrick));
+		self::register("infested_cracked_stone_brick", fn(BID $id) => new InfestedStone($id, "Infested Cracked Stone Brick", $infestedStoneBreakInfo, $crackedStoneBrick));
+		self::register("infested_chiseled_stone_brick", fn(BID $id) => new InfestedStone($id, "Infested Chiseled Stone Brick", $infestedStoneBreakInfo, $chiseledStoneBrick));
+
+		self::register("stone_stairs", fn(BID $id) => new Stair($id, "Stone Stairs", $stoneBreakInfo));
+		self::register("smooth_stone", fn(BID $id) => new Opaque($id, "Smooth Stone", $stoneBreakInfo));
+		self::register("andesite_stairs", fn(BID $id) => new Stair($id, "Andesite Stairs", $stoneBreakInfo));
+		self::register("diorite_stairs", fn(BID $id) => new Stair($id, "Diorite Stairs", $stoneBreakInfo));
+		self::register("granite_stairs", fn(BID $id) => new Stair($id, "Granite Stairs", $stoneBreakInfo));
+		self::register("polished_andesite_stairs", fn(BID $id) => new Stair($id, "Polished Andesite Stairs", $stoneBreakInfo));
+		self::register("polished_diorite_stairs", fn(BID $id) => new Stair($id, "Polished Diorite Stairs", $stoneBreakInfo));
+		self::register("polished_granite_stairs", fn(BID $id) => new Stair($id, "Polished Granite Stairs", $stoneBreakInfo));
+		self::register("stone_brick_stairs", fn(BID $id) => new Stair($id, "Stone Brick Stairs", $stoneBreakInfo));
+		self::register("mossy_stone_brick_stairs", fn(BID $id) => new Stair($id, "Mossy Stone Brick Stairs", $stoneBreakInfo));
+		self::register("stone_button", fn(BID $id) => new StoneButton($id, "Stone Button", new Info(BreakInfo::pickaxe(0.5))));
+		self::register("stonecutter", fn(BID $id) => new Stonecutter($id, "Stonecutter", new Info(BreakInfo::pickaxe(3.5))));
+		self::register("stone_pressure_plate", fn(BID $id) => new StonePressurePlate($id, "Stone Pressure Plate", new Info(BreakInfo::pickaxe(0.5, ToolTier::WOOD))));
+
+		//TODO: in the future this won't be the same for all the types
+		$stoneSlabBreakInfo = new Info(BreakInfo::pickaxe(2.0, ToolTier::WOOD, 30.0));
+
+		self::register("brick_slab", fn(BID $id) => new Slab($id, "Brick", $stoneSlabBreakInfo));
+		self::register("cobblestone_slab", fn(BID $id) => new Slab($id, "Cobblestone", $stoneSlabBreakInfo));
+		self::register("fake_wooden_slab", fn(BID $id) => new Slab($id, "Fake Wooden", $stoneSlabBreakInfo));
+		self::register("nether_brick_slab", fn(BID $id) => new Slab($id, "Nether Brick", $stoneSlabBreakInfo));
+		self::register("quartz_slab", fn(BID $id) => new Slab($id, "Quartz", $stoneSlabBreakInfo));
+		self::register("sandstone_slab", fn(BID $id) => new Slab($id, "Sandstone", $stoneSlabBreakInfo));
+		self::register("smooth_stone_slab", fn(BID $id) => new Slab($id, "Smooth Stone", $stoneSlabBreakInfo));
+		self::register("stone_brick_slab", fn(BID $id) => new Slab($id, "Stone Brick", $stoneSlabBreakInfo));
+		self::register("dark_prismarine_slab", fn(BID $id) => new Slab($id, "Dark Prismarine", $stoneSlabBreakInfo));
+		self::register("mossy_cobblestone_slab", fn(BID $id) => new Slab($id, "Mossy Cobblestone", $stoneSlabBreakInfo));
+		self::register("prismarine_slab", fn(BID $id) => new Slab($id, "Prismarine", $stoneSlabBreakInfo));
+		self::register("prismarine_bricks_slab", fn(BID $id) => new Slab($id, "Prismarine Bricks", $stoneSlabBreakInfo));
+		self::register("purpur_slab", fn(BID $id) => new Slab($id, "Purpur", $stoneSlabBreakInfo));
+		self::register("red_nether_brick_slab", fn(BID $id) => new Slab($id, "Red Nether Brick", $stoneSlabBreakInfo));
+		self::register("red_sandstone_slab", fn(BID $id) => new Slab($id, "Red Sandstone", $stoneSlabBreakInfo));
+		self::register("smooth_sandstone_slab", fn(BID $id) => new Slab($id, "Smooth Sandstone", $stoneSlabBreakInfo));
+		self::register("andesite_slab", fn(BID $id) => new Slab($id, "Andesite", $stoneSlabBreakInfo));
+		self::register("diorite_slab", fn(BID $id) => new Slab($id, "Diorite", $stoneSlabBreakInfo));
+		self::register("end_stone_brick_slab", fn(BID $id) => new Slab($id, "End Stone Brick", $stoneSlabBreakInfo));
+		self::register("granite_slab", fn(BID $id) => new Slab($id, "Granite", $stoneSlabBreakInfo));
+		self::register("polished_andesite_slab", fn(BID $id) => new Slab($id, "Polished Andesite", $stoneSlabBreakInfo));
+		self::register("polished_diorite_slab", fn(BID $id) => new Slab($id, "Polished Diorite", $stoneSlabBreakInfo));
+		self::register("polished_granite_slab", fn(BID $id) => new Slab($id, "Polished Granite", $stoneSlabBreakInfo));
+		self::register("smooth_red_sandstone_slab", fn(BID $id) => new Slab($id, "Smooth Red Sandstone", $stoneSlabBreakInfo));
+		self::register("cut_red_sandstone_slab", fn(BID $id) => new Slab($id, "Cut Red Sandstone", $stoneSlabBreakInfo));
+		self::register("cut_sandstone_slab", fn(BID $id) => new Slab($id, "Cut Sandstone", $stoneSlabBreakInfo));
+		self::register("mossy_stone_brick_slab", fn(BID $id) => new Slab($id, "Mossy Stone Brick", $stoneSlabBreakInfo));
+		self::register("smooth_quartz_slab", fn(BID $id) => new Slab($id, "Smooth Quartz", $stoneSlabBreakInfo));
+		self::register("stone_slab", fn(BID $id) => new Slab($id, "Stone", $stoneSlabBreakInfo));
+
+		self::register("legacy_stonecutter", fn(BID $id) => new Opaque($id, "Legacy Stonecutter", new Info(BreakInfo::pickaxe(3.5, ToolTier::WOOD))));
+		self::register("sugarcane", fn(BID $id) => new Sugarcane($id, "Sugarcane", new Info(BreakInfo::instant())));
+		self::register("sweet_berry_bush", fn(BID $id) => new SweetBerryBush($id, "Sweet Berry Bush", new Info(BreakInfo::instant())));
+		self::register("tnt", fn(BID $id) => new TNT($id, "TNT", new Info(BreakInfo::instant())));
+		self::register("fern", fn(BID $id) => new TallGrass($id, "Fern", new Info(BreakInfo::instant(ToolType::SHEARS, 1), [Tags::POTTABLE_PLANTS])));
+		self::register("tall_grass", fn(BID $id) => new TallGrass($id, "Tall Grass", new Info(BreakInfo::instant(ToolType::SHEARS, 1))));
+
+		self::register("blue_torch", fn(BID $id) => new Torch($id, "Blue Torch", new Info(BreakInfo::instant())));
+		self::register("purple_torch", fn(BID $id) => new Torch($id, "Purple Torch", new Info(BreakInfo::instant())));
+		self::register("red_torch", fn(BID $id) => new Torch($id, "Red Torch", new Info(BreakInfo::instant())));
+		self::register("green_torch", fn(BID $id) => new Torch($id, "Green Torch", new Info(BreakInfo::instant())));
+		self::register("torch", fn(BID $id) => new Torch($id, "Torch", new Info(BreakInfo::instant())));
+
+		self::register("trapped_chest", fn(BID $id) => new TrappedChest($id, "Trapped Chest", $chestBreakInfo), TileChest::class);
+		self::register("tripwire", fn(BID $id) => new Tripwire($id, "Tripwire", new Info(BreakInfo::instant())));
+		self::register("tripwire_hook", fn(BID $id) => new TripwireHook($id, "Tripwire Hook", new Info(BreakInfo::instant())));
+		self::register("underwater_torch", fn(BID $id) => new UnderwaterTorch($id, "Underwater Torch", new Info(BreakInfo::instant())));
+		self::register("vines", fn(BID $id) => new Vine($id, "Vines", new Info(BreakInfo::axe(0.2))));
+		self::register("water", fn(BID $id) => new Water($id, "Water", new Info(BreakInfo::indestructible(500.0))));
+		self::register("lily_pad", fn(BID $id) => new WaterLily($id, "Lily Pad", new Info(BreakInfo::instant())));
+
+		$weightedPressurePlateBreakInfo = new Info(BreakInfo::pickaxe(0.5, ToolTier::WOOD));
+		self::register("weighted_pressure_plate_heavy", fn(BID $id) => new WeightedPressurePlateHeavy(
+			$id,
+			"Weighted Pressure Plate Heavy",
+			$weightedPressurePlateBreakInfo,
+			deactivationDelayTicks: 10,
+			signalStrengthFactor: 0.1
+		));
+		self::register("weighted_pressure_plate_light", fn(BID $id) => new WeightedPressurePlateLight(
+			$id,
+			"Weighted Pressure Plate Light",
+			$weightedPressurePlateBreakInfo,
+			deactivationDelayTicks: 10,
+			signalStrengthFactor: 1.0
+		));
+		self::register("wheat", fn(BID $id) => new Wheat($id, "Wheat Block", new Info(BreakInfo::instant())));
+
+		$leavesBreakInfo = new Info(new class(0.2, ToolType::HOE) extends BreakInfo{
+			public function getBreakTime(Item $item) : float{
+				if($item->getBlockToolType() === ToolType::SHEARS){
+					return 0.0;
+				}
+				return parent::getBreakTime($item);
+			}
+		});
+		$saplingTypeInfo = new Info(BreakInfo::instant(), [Tags::POTTABLE_PLANTS]);
+
+		foreach(SaplingType::cases() as $saplingType){
+			$name = $saplingType->getDisplayName();
+			self::register(strtolower($saplingType->name) . "_sapling", fn(BID $id) => new Sapling($id, $name . " Sapling", $saplingTypeInfo, $saplingType));
+		}
+		foreach(LeavesType::cases() as $leavesType){
+			$name = $leavesType->getDisplayName();
+			self::register(strtolower($leavesType->name) . "_leaves", fn(BID $id) => new Leaves($id, $name . " Leaves", $leavesBreakInfo, $leavesType));
+		}
+
+		$sandstoneBreakInfo = new Info(BreakInfo::pickaxe(0.8, ToolTier::WOOD));
+		self::register("red_sandstone_stairs", fn(BID $id) => new Stair($id, "Red Sandstone Stairs", $sandstoneBreakInfo));
+		self::register("smooth_red_sandstone_stairs", fn(BID $id) => new Stair($id, "Smooth Red Sandstone Stairs", $sandstoneBreakInfo));
+		self::register("red_sandstone", fn(BID $id) => new Opaque($id, "Red Sandstone", $sandstoneBreakInfo));
+		self::register("chiseled_red_sandstone", fn(BID $id) => new Opaque($id, "Chiseled Red Sandstone", $sandstoneBreakInfo));
+		self::register("cut_red_sandstone", fn(BID $id) => new Opaque($id, "Cut Red Sandstone", $sandstoneBreakInfo));
+		self::register("smooth_red_sandstone", fn(BID $id) => new Opaque($id, "Smooth Red Sandstone", $sandstoneBreakInfo));
+
+		self::register("sandstone_stairs", fn(BID $id) => new Stair($id, "Sandstone Stairs", $sandstoneBreakInfo));
+		self::register("smooth_sandstone_stairs", fn(BID $id) => new Stair($id, "Smooth Sandstone Stairs", $sandstoneBreakInfo));
+		self::register("sandstone", fn(BID $id) => new Opaque($id, "Sandstone", $sandstoneBreakInfo));
+		self::register("chiseled_sandstone", fn(BID $id) => new Opaque($id, "Chiseled Sandstone", $sandstoneBreakInfo));
+		self::register("cut_sandstone", fn(BID $id) => new Opaque($id, "Cut Sandstone", $sandstoneBreakInfo));
+		self::register("smooth_sandstone", fn(BID $id) => new Opaque($id, "Smooth Sandstone", $sandstoneBreakInfo));
+
+		self::register("glazed_terracotta", fn(BID $id) => new GlazedTerracotta($id, "Glazed Terracotta", new Info(BreakInfo::pickaxe(1.4, ToolTier::WOOD))));
+		self::register("dyed_shulker_box", fn(BID $id) => new DyedShulkerBox($id, "Dyed Shulker Box", $shulkerBoxBreakInfo), TileShulkerBox::class);
+		self::register("stained_glass", fn(BID $id) => new StainedGlass($id, "Stained Glass", $glassBreakInfo));
+		self::register("stained_glass_pane", fn(BID $id) => new StainedGlassPane($id, "Stained Glass Pane", $glassBreakInfo));
+		self::register("stained_clay", fn(BID $id) => new StainedHardenedClay($id, "Stained Clay", $hardenedClayBreakInfo));
+		self::register("stained_hardened_glass", fn(BID $id) => new StainedHardenedGlass($id, "Stained Hardened Glass", $hardenedGlassBreakInfo));
+		self::register("stained_hardened_glass_pane", fn(BID $id) => new StainedHardenedGlassPane($id, "Stained Hardened Glass Pane", $hardenedGlassBreakInfo));
+		self::register("carpet", fn(BID $id) => new Carpet($id, "Carpet", new Info(new BreakInfo(0.1))));
+		self::register("concrete", fn(BID $id) => new Concrete($id, "Concrete", new Info(BreakInfo::pickaxe(1.8, ToolTier::WOOD))));
+		self::register("concrete_powder", fn(BID $id) => new ConcretePowder($id, "Concrete Powder", new Info(BreakInfo::shovel(0.5))));
+		self::register("wool", fn(BID $id) => new Wool($id, "Wool", new Info(new class(0.8, ToolType::SHEARS) extends BreakInfo{
+			public function getBreakTime(Item $item) : float{
+				$time = parent::getBreakTime($item);
+				if($item->getBlockToolType() === ToolType::SHEARS){
+					$time *= 3; //shears break compatible blocks 15x faster, but wool 5x
+				}
+
+				return $time;
+			}
+		})));
+
+		//TODO: in the future these won't all have the same hardness; they only do now because of the old metadata crap
+		$wallBreakInfo = new Info(BreakInfo::pickaxe(2.0, ToolTier::WOOD, 30.0));
+		self::register("cobblestone_wall", fn(BID $id) => new Wall($id, "Cobblestone Wall", $wallBreakInfo));
+		self::register("andesite_wall", fn(BID $id) => new Wall($id, "Andesite Wall", $wallBreakInfo));
+		self::register("brick_wall", fn(BID $id) => new Wall($id, "Brick Wall", $wallBreakInfo));
+		self::register("diorite_wall", fn(BID $id) => new Wall($id, "Diorite Wall", $wallBreakInfo));
+		self::register("end_stone_brick_wall", fn(BID $id) => new Wall($id, "End Stone Brick Wall", $wallBreakInfo));
+		self::register("granite_wall", fn(BID $id) => new Wall($id, "Granite Wall", $wallBreakInfo));
+		self::register("mossy_stone_brick_wall", fn(BID $id) => new Wall($id, "Mossy Stone Brick Wall", $wallBreakInfo));
+		self::register("mossy_cobblestone_wall", fn(BID $id) => new Wall($id, "Mossy Cobblestone Wall", $wallBreakInfo));
+		self::register("nether_brick_wall", fn(BID $id) => new Wall($id, "Nether Brick Wall", $wallBreakInfo));
+		self::register("prismarine_wall", fn(BID $id) => new Wall($id, "Prismarine Wall", $wallBreakInfo));
+		self::register("red_nether_brick_wall", fn(BID $id) => new Wall($id, "Red Nether Brick Wall", $wallBreakInfo));
+		self::register("red_sandstone_wall", fn(BID $id) => new Wall($id, "Red Sandstone Wall", $wallBreakInfo));
+		self::register("sandstone_wall", fn(BID $id) => new Wall($id, "Sandstone Wall", $wallBreakInfo));
+		self::register("stone_brick_wall", fn(BID $id) => new Wall($id, "Stone Brick Wall", $wallBreakInfo));
+
+		self::registerElements();
+
+		$chemistryTableBreakInfo = new Info(BreakInfo::pickaxe(2.5, ToolTier::WOOD));
+		self::register("compound_creator", fn(BID $id) => new ChemistryTable($id, "Compound Creator", $chemistryTableBreakInfo));
+		self::register("element_constructor", fn(BID $id) => new ChemistryTable($id, "Element Constructor", $chemistryTableBreakInfo));
+		self::register("lab_table", fn(BID $id) => new ChemistryTable($id, "Lab Table", $chemistryTableBreakInfo));
+		self::register("material_reducer", fn(BID $id) => new ChemistryTable($id, "Material Reducer", $chemistryTableBreakInfo));
+
+		self::register("chemical_heat", fn(BID $id) => new ChemicalHeat($id, "Heat Block", $chemistryTableBreakInfo));
+
+		self::registerMushroomBlocks();
+
+		self::register("coral", fn(BID $id) => new Coral(
+			$id,
+			"Coral",
+			new Info(BreakInfo::instant()),
+		));
+		self::register("coral_fan", fn(BID $id) => new FloorCoralFan(
+			$id,
+			"Coral Fan",
+			new Info(BreakInfo::instant()),
+		));
+		self::register("wall_coral_fan", fn(BID $id) => new WallCoralFan(
+			$id,
+			"Wall Coral Fan",
+			new Info(BreakInfo::instant()),
+		));
+
+		self::register("mangrove_roots", fn(BID $id) => new MangroveRoots($id, "Mangrove Roots", new Info(BreakInfo::axe(0.7))));
+		self::register("muddy_mangrove_roots", fn(BID $id) => new SimplePillar($id, "Muddy Mangrove Roots", new Info(BreakInfo::shovel(0.7), [Tags::MUD])));
+		self::register("froglight", fn(BID $id) => new Froglight($id, "Froglight", new Info(new BreakInfo(0.3))));
+		self::register("sculk", fn(BID $id) => new Sculk($id, "Sculk", new Info(new BreakInfo(0.6, ToolType::HOE))));
+		self::register("reinforced_deepslate", fn(BID $id) => new class($id, "Reinforced Deepslate", new Info(new BreakInfo(55.0, ToolType::NONE, 0, 3600.0))) extends Opaque{
+			public function getDropsForCompatibleTool(Item $item) : array{
+				return [];
+			}
+		});
+
+		self::registerBlocksR13();
+		self::registerBlocksR14();
+		self::registerBlocksR16();
+		self::registerBlocksR17();
+		self::registerBlocksR18();
+		self::registerMudBlocks();
+		self::registerTuffBlocks();
+
+		self::registerCraftingTables();
+		self::registerChorusBlocks();
+		self::registerOres();
+		self::registerWoodenBlocks();
+		self::registerCauldronBlocks();
+	}
+
+	private static function registerWoodenBlocks() : void{
+		$planksBreakInfo = new Info(BreakInfo::axe(2.0, null, 15.0));
+		$signBreakInfo = new Info(BreakInfo::axe(1.0));
+		$logBreakInfo = new Info(BreakInfo::axe(2.0));
+		$woodenDoorBreakInfo = new Info(BreakInfo::axe(3.0, null, 15.0));
+		$woodenButtonBreakInfo = new Info(BreakInfo::axe(0.5));
+		$woodenPressurePlateBreakInfo = new Info(BreakInfo::axe(0.5));
+
+		foreach(WoodType::cases() as $woodType){
+			$name = $woodType->getDisplayName();
+			$idName = fn(string $suffix) => strtolower($woodType->name) . "_" . $suffix;
+
+			self::register($idName(mb_strtolower($woodType->getStandardLogSuffix() ?? "log", 'US-ASCII')), fn(BID $id) => new Wood($id, $name . " " . ($woodType->getStandardLogSuffix() ?? "Log"), $logBreakInfo, $woodType));
+			self::register($idName(mb_strtolower($woodType->getAllSidedLogSuffix() ?? "wood", 'US-ASCII')), fn(BID $id) => new Wood($id, $name . " " . ($woodType->getAllSidedLogSuffix() ?? "Wood"), $logBreakInfo, $woodType));
+
+			self::register($idName("planks"), fn(BID $id) => new Planks($id, $name . " Planks", $planksBreakInfo, $woodType));
+			self::register($idName("fence"), fn(BID $id) => new WoodenFence($id, $name . " Fence", $planksBreakInfo, $woodType));
+			self::register($idName("slab"), fn(BID $id) => new WoodenSlab($id, $name, $planksBreakInfo, $woodType));
+
+			self::register($idName("fence_gate"), fn(BID $id) => new FenceGate($id, $name . " Fence Gate", $planksBreakInfo, $woodType));
+			self::register($idName("stairs"), fn(BID $id) => new WoodenStairs($id, $name . " Stairs", $planksBreakInfo, $woodType));
+			self::register($idName("door"), fn(BID $id) => new WoodenDoor($id, $name . " Door", $woodenDoorBreakInfo, $woodType));
+
+			self::register($idName("button"), fn(BID $id) => new WoodenButton($id, $name . " Button", $woodenButtonBreakInfo, $woodType));
+			self::register($idName("pressure_plate"), fn(BID $id) => new WoodenPressurePlate($id, $name . " Pressure Plate", $woodenPressurePlateBreakInfo, $woodType, 20));
+			self::register($idName("trapdoor"), fn(BID $id) => new WoodenTrapdoor($id, $name . " Trapdoor", $woodenDoorBreakInfo, $woodType));
+
+			$signAsItem = match($woodType){
+				WoodType::OAK => VanillaItems::OAK_SIGN(...),
+				WoodType::SPRUCE => VanillaItems::SPRUCE_SIGN(...),
+				WoodType::BIRCH => VanillaItems::BIRCH_SIGN(...),
+				WoodType::JUNGLE => VanillaItems::JUNGLE_SIGN(...),
+				WoodType::ACACIA => VanillaItems::ACACIA_SIGN(...),
+				WoodType::DARK_OAK => VanillaItems::DARK_OAK_SIGN(...),
+				WoodType::MANGROVE => VanillaItems::MANGROVE_SIGN(...),
+				WoodType::CRIMSON => VanillaItems::CRIMSON_SIGN(...),
+				WoodType::WARPED => VanillaItems::WARPED_SIGN(...),
+				WoodType::CHERRY => VanillaItems::CHERRY_SIGN(...),
+			};
+			self::register($idName("sign"), fn(BID $id) => new FloorSign($id, $name . " Sign", $signBreakInfo, $woodType, $signAsItem));
+			self::register($idName("wall_sign"), fn(BID $id) => new WallSign($id, $name . " Wall Sign", $signBreakInfo, $woodType, $signAsItem));
+		}
+	}
+
+	private static function registerMushroomBlocks() : void{
+		$mushroomBlockBreakInfo = new Info(BreakInfo::axe(0.2));
+
+		self::register("brown_mushroom_block", fn(BID $id) => new BrownMushroomBlock($id, "Brown Mushroom Block", $mushroomBlockBreakInfo));
+		self::register("red_mushroom_block", fn(BID $id) => new RedMushroomBlock($id, "Red Mushroom Block", $mushroomBlockBreakInfo));
+
+		//finally, the stems
+		self::register("mushroom_stem", fn(BID $id) => new MushroomStem($id, "Mushroom Stem", $mushroomBlockBreakInfo));
+		self::register("all_sided_mushroom_stem", fn(BID $id) => new MushroomStem($id, "All Sided Mushroom Stem", $mushroomBlockBreakInfo));
+	}
+
+	private static function registerElements() : void{
+		$instaBreak = new Info(BreakInfo::instant());
+		self::register("element_zero", fn(BID $id) => new Opaque($id, "???", $instaBreak));
+
+		$register = fn(string $name, string $displayName, string $symbol, int $atomicWeight, int $group) =>
+			self::register("element_$name", fn(BID $id) => new Element($id, $displayName, $instaBreak, $symbol, $atomicWeight, $group));
+
+		$register("hydrogen", "Hydrogen", "h", 1, 5);
+		$register("helium", "Helium", "he", 2, 7);
+		$register("lithium", "Lithium", "li", 3, 0);
+		$register("beryllium", "Beryllium", "be", 4, 1);
+		$register("boron", "Boron", "b", 5, 4);
+		$register("carbon", "Carbon", "c", 6, 5);
+		$register("nitrogen", "Nitrogen", "n", 7, 5);
+		$register("oxygen", "Oxygen", "o", 8, 5);
+		$register("fluorine", "Fluorine", "f", 9, 6);
+		$register("neon", "Neon", "ne", 10, 7);
+		$register("sodium", "Sodium", "na", 11, 0);
+		$register("magnesium", "Magnesium", "mg", 12, 1);
+		$register("aluminum", "Aluminum", "al", 13, 3);
+		$register("silicon", "Silicon", "si", 14, 4);
+		$register("phosphorus", "Phosphorus", "p", 15, 5);
+		$register("sulfur", "Sulfur", "s", 16, 5);
+		$register("chlorine", "Chlorine", "cl", 17, 6);
+		$register("argon", "Argon", "ar", 18, 7);
+		$register("potassium", "Potassium", "k", 19, 0);
+		$register("calcium", "Calcium", "ca", 20, 1);
+		$register("scandium", "Scandium", "sc", 21, 2);
+		$register("titanium", "Titanium", "ti", 22, 2);
+		$register("vanadium", "Vanadium", "v", 23, 2);
+		$register("chromium", "Chromium", "cr", 24, 2);
+		$register("manganese", "Manganese", "mn", 25, 2);
+		$register("iron", "Iron", "fe", 26, 2);
+		$register("cobalt", "Cobalt", "co", 27, 2);
+		$register("nickel", "Nickel", "ni", 28, 2);
+		$register("copper", "Copper", "cu", 29, 2);
+		$register("zinc", "Zinc", "zn", 30, 2);
+		$register("gallium", "Gallium", "ga", 31, 3);
+		$register("germanium", "Germanium", "ge", 32, 4);
+		$register("arsenic", "Arsenic", "as", 33, 4);
+		$register("selenium", "Selenium", "se", 34, 5);
+		$register("bromine", "Bromine", "br", 35, 6);
+		$register("krypton", "Krypton", "kr", 36, 7);
+		$register("rubidium", "Rubidium", "rb", 37, 0);
+		$register("strontium", "Strontium", "sr", 38, 1);
+		$register("yttrium", "Yttrium", "y", 39, 2);
+		$register("zirconium", "Zirconium", "zr", 40, 2);
+		$register("niobium", "Niobium", "nb", 41, 2);
+		$register("molybdenum", "Molybdenum", "mo", 42, 2);
+		$register("technetium", "Technetium", "tc", 43, 2);
+		$register("ruthenium", "Ruthenium", "ru", 44, 2);
+		$register("rhodium", "Rhodium", "rh", 45, 2);
+		$register("palladium", "Palladium", "pd", 46, 2);
+		$register("silver", "Silver", "ag", 47, 2);
+		$register("cadmium", "Cadmium", "cd", 48, 2);
+		$register("indium", "Indium", "in", 49, 3);
+		$register("tin", "Tin", "sn", 50, 3);
+		$register("antimony", "Antimony", "sb", 51, 4);
+		$register("tellurium", "Tellurium", "te", 52, 4);
+		$register("iodine", "Iodine", "i", 53, 6);
+		$register("xenon", "Xenon", "xe", 54, 7);
+		$register("cesium", "Cesium", "cs", 55, 0);
+		$register("barium", "Barium", "ba", 56, 1);
+		$register("lanthanum", "Lanthanum", "la", 57, 8);
+		$register("cerium", "Cerium", "ce", 58, 8);
+		$register("praseodymium", "Praseodymium", "pr", 59, 8);
+		$register("neodymium", "Neodymium", "nd", 60, 8);
+		$register("promethium", "Promethium", "pm", 61, 8);
+		$register("samarium", "Samarium", "sm", 62, 8);
+		$register("europium", "Europium", "eu", 63, 8);
+		$register("gadolinium", "Gadolinium", "gd", 64, 8);
+		$register("terbium", "Terbium", "tb", 65, 8);
+		$register("dysprosium", "Dysprosium", "dy", 66, 8);
+		$register("holmium", "Holmium", "ho", 67, 8);
+		$register("erbium", "Erbium", "er", 68, 8);
+		$register("thulium", "Thulium", "tm", 69, 8);
+		$register("ytterbium", "Ytterbium", "yb", 70, 8);
+		$register("lutetium", "Lutetium", "lu", 71, 8);
+		$register("hafnium", "Hafnium", "hf", 72, 2);
+		$register("tantalum", "Tantalum", "ta", 73, 2);
+		$register("tungsten", "Tungsten", "w", 74, 2);
+		$register("rhenium", "Rhenium", "re", 75, 2);
+		$register("osmium", "Osmium", "os", 76, 2);
+		$register("iridium", "Iridium", "ir", 77, 2);
+		$register("platinum", "Platinum", "pt", 78, 2);
+		$register("gold", "Gold", "au", 79, 2);
+		$register("mercury", "Mercury", "hg", 80, 2);
+		$register("thallium", "Thallium", "tl", 81, 3);
+		$register("lead", "Lead", "pb", 82, 3);
+		$register("bismuth", "Bismuth", "bi", 83, 3);
+		$register("polonium", "Polonium", "po", 84, 4);
+		$register("astatine", "Astatine", "at", 85, 6);
+		$register("radon", "Radon", "rn", 86, 7);
+		$register("francium", "Francium", "fr", 87, 0);
+		$register("radium", "Radium", "ra", 88, 1);
+		$register("actinium", "Actinium", "ac", 89, 9);
+		$register("thorium", "Thorium", "th", 90, 9);
+		$register("protactinium", "Protactinium", "pa", 91, 9);
+		$register("uranium", "Uranium", "u", 92, 9);
+		$register("neptunium", "Neptunium", "np", 93, 9);
+		$register("plutonium", "Plutonium", "pu", 94, 9);
+		$register("americium", "Americium", "am", 95, 9);
+		$register("curium", "Curium", "cm", 96, 9);
+		$register("berkelium", "Berkelium", "bk", 97, 9);
+		$register("californium", "Californium", "cf", 98, 9);
+		$register("einsteinium", "Einsteinium", "es", 99, 9);
+		$register("fermium", "Fermium", "fm", 100, 9);
+		$register("mendelevium", "Mendelevium", "md", 101, 9);
+		$register("nobelium", "Nobelium", "no", 102, 9);
+		$register("lawrencium", "Lawrencium", "lr", 103, 9);
+		$register("rutherfordium", "Rutherfordium", "rf", 104, 2);
+		$register("dubnium", "Dubnium", "db", 105, 2);
+		$register("seaborgium", "Seaborgium", "sg", 106, 2);
+		$register("bohrium", "Bohrium", "bh", 107, 2);
+		$register("hassium", "Hassium", "hs", 108, 2);
+		$register("meitnerium", "Meitnerium", "mt", 109, 2);
+		$register("darmstadtium", "Darmstadtium", "ds", 110, 2);
+		$register("roentgenium", "Roentgenium", "rg", 111, 2);
+		$register("copernicium", "Copernicium", "cn", 112, 2);
+		$register("nihonium", "Nihonium", "nh", 113, 3);
+		$register("flerovium", "Flerovium", "fl", 114, 3);
+		$register("moscovium", "Moscovium", "mc", 115, 3);
+		$register("livermorium", "Livermorium", "lv", 116, 3);
+		$register("tennessine", "Tennessine", "ts", 117, 6);
+		$register("oganesson", "Oganesson", "og", 118, 7);
+	}
+
+	private static function registerOres() : void{
+		$stoneOreBreakInfo = fn(ToolTier $toolTier) => new Info(BreakInfo::pickaxe(3.0, $toolTier));
+		self::register("coal_ore", fn(BID $id) => new CoalOre($id, "Coal Ore", $stoneOreBreakInfo(ToolTier::WOOD)));
+		self::register("copper_ore", fn(BID $id) => new CopperOre($id, "Copper Ore", $stoneOreBreakInfo(ToolTier::STONE)));
+		self::register("diamond_ore", fn(BID $id) => new DiamondOre($id, "Diamond Ore", $stoneOreBreakInfo(ToolTier::IRON)));
+		self::register("emerald_ore", fn(BID $id) => new EmeraldOre($id, "Emerald Ore", $stoneOreBreakInfo(ToolTier::IRON)));
+		self::register("gold_ore", fn(BID $id) => new GoldOre($id, "Gold Ore", $stoneOreBreakInfo(ToolTier::IRON)));
+		self::register("iron_ore", fn(BID $id) => new IronOre($id, "Iron Ore", $stoneOreBreakInfo(ToolTier::STONE)));
+		self::register("lapis_lazuli_ore", fn(BID $id) => new LapisOre($id, "Lapis Lazuli Ore", $stoneOreBreakInfo(ToolTier::STONE)));
+		self::register("redstone_ore", fn(BID $id) => new RedstoneOre($id, "Redstone Ore", $stoneOreBreakInfo(ToolTier::IRON)));
+
+		$deepslateOreBreakInfo = fn(ToolTier $toolTier) => new Info(BreakInfo::pickaxe(4.5, $toolTier));
+		self::register("deepslate_coal_ore", fn(BID $id) => new CoalOre($id, "Deepslate Coal Ore", $deepslateOreBreakInfo(ToolTier::WOOD)));
+		self::register("deepslate_copper_ore", fn(BID $id) => new CopperOre($id, "Deepslate Copper Ore", $deepslateOreBreakInfo(ToolTier::STONE)));
+		self::register("deepslate_diamond_ore", fn(BID $id) => new DiamondOre($id, "Deepslate Diamond Ore", $deepslateOreBreakInfo(ToolTier::IRON)));
+		self::register("deepslate_emerald_ore", fn(BID $id) => new EmeraldOre($id, "Deepslate Emerald Ore", $deepslateOreBreakInfo(ToolTier::IRON)));
+		self::register("deepslate_gold_ore", fn(BID $id) => new GoldOre($id, "Deepslate Gold Ore", $deepslateOreBreakInfo(ToolTier::IRON)));
+		self::register("deepslate_iron_ore", fn(BID $id) => new IronOre($id, "Deepslate Iron Ore", $deepslateOreBreakInfo(ToolTier::STONE)));
+		self::register("deepslate_lapis_lazuli_ore", fn(BID $id) => new LapisOre($id, "Deepslate Lapis Lazuli Ore", $deepslateOreBreakInfo(ToolTier::STONE)));
+		self::register("deepslate_redstone_ore", fn(BID $id) => new RedstoneOre($id, "Deepslate Redstone Ore", $deepslateOreBreakInfo(ToolTier::IRON)));
+
+		$netherrackOreBreakInfo = new Info(BreakInfo::pickaxe(3.0, ToolTier::WOOD));
+		self::register("nether_quartz_ore", fn(BID $id) => new NetherQuartzOre($id, "Nether Quartz Ore", $netherrackOreBreakInfo));
+		self::register("nether_gold_ore", fn(BID $id) => new NetherGoldOre($id, "Nether Gold Ore", $netherrackOreBreakInfo));
+	}
+
+	private static function registerCraftingTables() : void{
+		//TODO: this is the same for all wooden crafting blocks
+		$craftingBlockBreakInfo = new Info(BreakInfo::axe(2.5));
+		self::register("cartography_table", fn(BID $id) => new CartographyTable($id, "Cartography Table", $craftingBlockBreakInfo));
+		self::register("crafting_table", fn(BID $id) => new CraftingTable($id, "Crafting Table", $craftingBlockBreakInfo));
+		self::register("fletching_table", fn(BID $id) => new FletchingTable($id, "Fletching Table", $craftingBlockBreakInfo));
+		self::register("loom", fn(BID $id) => new Loom($id, "Loom", $craftingBlockBreakInfo));
+		self::register("smithing_table", fn(BID $id) => new SmithingTable($id, "Smithing Table", $craftingBlockBreakInfo));
+	}
+
+	private static function registerChorusBlocks() : void{
+		$chorusBlockBreakInfo = new Info(BreakInfo::axe(0.4));
+		self::register("chorus_plant", fn(BID $id) => new ChorusPlant($id, "Chorus Plant", $chorusBlockBreakInfo));
+		self::register("chorus_flower", fn(BID $id) => new ChorusFlower($id, "Chorus Flower", $chorusBlockBreakInfo));
+	}
+
+	private static function registerBlocksR13() : void{
+		self::register("light", fn(BID $id) => new Light($id, "Light Block", new Info(BreakInfo::indestructible())));
+		self::register("wither_rose", fn(BID $id) => new WitherRose($id, "Wither Rose", new Info(BreakInfo::instant(), [Tags::POTTABLE_PLANTS])));
+	}
+
+	private static function registerBlocksR14() : void{
+		self::register("honeycomb", fn(BID $id) => new Opaque($id, "Honeycomb Block", new Info(new BreakInfo(0.6))));
+	}
+
+	private static function registerBlocksR16() : void{
+		//for some reason, slabs have weird hardness like the legacy ones
+		$slabBreakInfo = new Info(BreakInfo::pickaxe(2.0, ToolTier::WOOD, 30.0));
+
+		self::register("ancient_debris", fn(BID $id) => new class($id, "Ancient Debris", new Info(BreakInfo::pickaxe(30, ToolTier::DIAMOND, 3600.0))) extends Opaque{
+			public function isFireProofAsItem() : bool{ return true; }
+		});
+		$netheriteBreakInfo = new Info(BreakInfo::pickaxe(50, ToolTier::DIAMOND, 3600.0));
+		self::register("netherite", fn(BID $id) => new class($id, "Netherite Block", $netheriteBreakInfo) extends Opaque{
+			public function isFireProofAsItem() : bool{ return true; }
+		});
+
+		$basaltBreakInfo = new Info(BreakInfo::pickaxe(1.25, ToolTier::WOOD, 21.0));
+		self::register("basalt", fn(BID $id) => new SimplePillar($id, "Basalt", $basaltBreakInfo));
+		self::register("polished_basalt", fn(BID $id) => new SimplePillar($id, "Polished Basalt", $basaltBreakInfo));
+		self::register("smooth_basalt", fn(BID $id) => new Opaque($id, "Smooth Basalt", $basaltBreakInfo));
+
+		$blackstoneBreakInfo = new Info(BreakInfo::pickaxe(1.5, ToolTier::WOOD, 30.0));
+		self::register("blackstone", fn(BID $id) => new Opaque($id, "Blackstone", $blackstoneBreakInfo));
+		self::register("blackstone_slab", fn(BID $id) => new Slab($id, "Blackstone", $slabBreakInfo));
+		self::register("blackstone_stairs", fn(BID $id) => new Stair($id, "Blackstone Stairs", $blackstoneBreakInfo));
+		self::register("blackstone_wall", fn(BID $id) => new Wall($id, "Blackstone Wall", $blackstoneBreakInfo));
+
+		self::register("gilded_blackstone", fn(BID $id) => new GildedBlackstone($id, "Gilded Blackstone", $blackstoneBreakInfo));
+
+		//TODO: polished blackstone ought to have 2.0 hardness (as per java) but it's 1.5 in Bedrock (probably parity bug)
+		$prefix = fn(string $thing) => "Polished Blackstone" . ($thing !== "" ? " $thing" : "");
+		self::register("polished_blackstone", fn(BID $id) => new Opaque($id, $prefix(""), $blackstoneBreakInfo));
+		self::register("polished_blackstone_button", fn(BID $id) => new StoneButton($id, $prefix("Button"), new Info(BreakInfo::pickaxe(0.5))));
+		self::register("polished_blackstone_pressure_plate", fn(BID $id) => new StonePressurePlate($id, $prefix("Pressure Plate"), new Info(BreakInfo::pickaxe(0.5, ToolTier::WOOD)), 20));
+		self::register("polished_blackstone_slab", fn(BID $id) => new Slab($id, $prefix(""), $slabBreakInfo));
+		self::register("polished_blackstone_stairs", fn(BID $id) => new Stair($id, $prefix("Stairs"), $blackstoneBreakInfo));
+		self::register("polished_blackstone_wall", fn(BID $id) => new Wall($id, $prefix("Wall"), $blackstoneBreakInfo));
+		self::register("chiseled_polished_blackstone", fn(BID $id) => new Opaque($id, "Chiseled Polished Blackstone", $blackstoneBreakInfo));
+
+		$prefix = fn(string $thing) => "Polished Blackstone Brick" . ($thing !== "" ? " $thing" : "");
+		self::register("polished_blackstone_bricks", fn(BID $id) => new Opaque($id, "Polished Blackstone Bricks", $blackstoneBreakInfo));
+		self::register("polished_blackstone_brick_slab", fn(BID $id) => new Slab($id, "Polished Blackstone Brick", $slabBreakInfo));
+		self::register("polished_blackstone_brick_stairs", fn(BID $id) => new Stair($id, $prefix("Stairs"), $blackstoneBreakInfo));
+		self::register("polished_blackstone_brick_wall", fn(BID $id) => new Wall($id, $prefix("Wall"), $blackstoneBreakInfo));
+		self::register("cracked_polished_blackstone_bricks", fn(BID $id) => new Opaque($id, "Cracked Polished Blackstone Bricks", $blackstoneBreakInfo));
+
+		self::register("soul_torch", fn(BID $id) => new Torch($id, "Soul Torch", new Info(BreakInfo::instant())));
+		self::register("soul_fire", fn(BID $id) => new SoulFire($id, "Soul Fire", new Info(BreakInfo::instant(), [Tags::FIRE])));
+
+		//TODO: soul soul ought to have 0.5 hardness (as per java) but it's 1.0 in Bedrock (probably parity bug)
+		self::register("soul_soil", fn(BID $id) => new Opaque($id, "Soul Soil", new Info(BreakInfo::shovel(1.0))));
+
+		self::register("shroomlight", fn(BID $id) => new class($id, "Shroomlight", new Info(new BreakInfo(1.0, ToolType::HOE))) extends Opaque{
+			public function getLightLevel() : int{ return 15; }
+		});
+
+		self::register("warped_wart_block", fn(BID $id) => new Opaque($id, "Warped Wart Block", new Info(new BreakInfo(1.0, ToolType::HOE))));
+		self::register("crying_obsidian", fn(BID $id) => new class($id, "Crying Obsidian", new Info(BreakInfo::pickaxe(35.0 /* 50 in Java */, ToolTier::DIAMOND, 6000.0))) extends Opaque{
+			public function getLightLevel() : int{ return 10;}
+		});
+
+		self::register("twisting_vines", fn(BID $id) => new NetherVines($id, "Twisting Vines", new Info(BreakInfo::instant()), Facing::UP));
+		self::register("weeping_vines", fn(BID $id) => new NetherVines($id, "Weeping Vines", new Info(BreakInfo::instant()), Facing::DOWN));
+
+		$netherRootsInfo = new Info(BreakInfo::instant(), [Tags::POTTABLE_PLANTS]);
+		self::register("crimson_roots", fn(BID $id) => new NetherRoots($id, "Crimson Roots", $netherRootsInfo));
+		self::register("warped_roots", fn(BID $id) => new NetherRoots($id, "Warped Roots", $netherRootsInfo));
+
+		self::register("chain", fn(BID $id) => new Chain($id, "Chain", new Info(BreakInfo::pickaxe(5.0, ToolTier::WOOD))));
+	}
+
+	private static function registerBlocksR17() : void{
+		//in java this can be acquired using any tool - seems to be a parity issue in bedrock
+		$amethystInfo = new Info(BreakInfo::pickaxe(1.5, ToolTier::WOOD));
+		self::register("amethyst", fn(BID $id) => new class($id, "Amethyst", $amethystInfo) extends Opaque{
+			use AmethystTrait;
+		});
+		self::register("budding_amethyst", fn(BID $id) => new BuddingAmethyst($id, "Budding Amethyst", $amethystInfo));
+		self::register("amethyst_cluster", fn(BID $id) => new AmethystCluster($id, "Amethyst Cluster", $amethystInfo));
+
+		self::register("calcite", fn(BID $id) => new Opaque($id, "Calcite", new Info(BreakInfo::pickaxe(0.75, ToolTier::WOOD))));
+
+		self::register("raw_copper", fn(BID $id) => new Opaque($id, "Raw Copper Block", new Info(BreakInfo::pickaxe(5, ToolTier::STONE, 30.0))));
+		self::register("raw_gold", fn(BID $id) => new Opaque($id, "Raw Gold Block", new Info(BreakInfo::pickaxe(5, ToolTier::IRON, 30.0))));
+		self::register("raw_iron", fn(BID $id) => new Opaque($id, "Raw Iron Block", new Info(BreakInfo::pickaxe(5, ToolTier::STONE, 30.0))));
+
+		$deepslateBreakInfo = new Info(BreakInfo::pickaxe(3, ToolTier::WOOD, 18.0));
+		self::register("deepslate", fn(BID $id) => new class($id, "Deepslate", $deepslateBreakInfo) extends SimplePillar{
+			public function getDropsForCompatibleTool(Item $item) : array{
+				return [VanillaBlocks::COBBLED_DEEPSLATE()->asItem()];
+			}
+
+			public function isAffectedBySilkTouch() : bool{
+				return true;
+			}
+		});
+
+		//TODO: parity issue here - in Java this has a hardness of 3.0, but in bedrock it's 3.5
+		self::register("chiseled_deepslate", fn(BID $id) => new Opaque($id, "Chiseled Deepslate", new Info(BreakInfo::pickaxe(3.5, ToolTier::WOOD, 18.0))));
+
+		$deepslateBrickBreakInfo = new Info(BreakInfo::pickaxe(3.5, ToolTier::WOOD, 18.0));
+		self::register("deepslate_bricks", fn(BID $id) => new Opaque($id, "Deepslate Bricks", $deepslateBrickBreakInfo));
+		self::register("deepslate_brick_slab", fn(BID $id) => new Slab($id, "Deepslate Brick", $deepslateBrickBreakInfo));
+		self::register("deepslate_brick_stairs", fn(BID $id) => new Stair($id, "Deepslate Brick Stairs", $deepslateBrickBreakInfo));
+		self::register("deepslate_brick_wall", fn(BID $id) => new Wall($id, "Deepslate Brick Wall", $deepslateBrickBreakInfo));
+		self::register("cracked_deepslate_bricks", fn(BID $id) => new Opaque($id, "Cracked Deepslate Bricks", $deepslateBrickBreakInfo));
+
+		$deepslateTilesBreakInfo = new Info(BreakInfo::pickaxe(3.5, ToolTier::WOOD, 18.0));
+		self::register("deepslate_tiles", fn(BID $id) => new Opaque($id, "Deepslate Tiles", $deepslateTilesBreakInfo));
+		self::register("deepslate_tile_slab", fn(BID $id) => new Slab($id, "Deepslate Tile", $deepslateTilesBreakInfo));
+		self::register("deepslate_tile_stairs", fn(BID $id) => new Stair($id, "Deepslate Tile Stairs", $deepslateTilesBreakInfo));
+		self::register("deepslate_tile_wall", fn(BID $id) => new Wall($id, "Deepslate Tile Wall", $deepslateTilesBreakInfo));
+		self::register("cracked_deepslate_tiles", fn(BID $id) => new Opaque($id, "Cracked Deepslate Tiles", $deepslateTilesBreakInfo));
+
+		$cobbledDeepslateBreakInfo = new Info(BreakInfo::pickaxe(3.5, ToolTier::WOOD, 18.0));
+		self::register("cobbled_deepslate", fn(BID $id) => new Opaque($id, "Cobbled Deepslate", $cobbledDeepslateBreakInfo));
+		self::register("cobbled_deepslate_slab", fn(BID $id) => new Slab($id, "Cobbled Deepslate", $cobbledDeepslateBreakInfo));
+		self::register("cobbled_deepslate_stairs", fn(BID $id) => new Stair($id, "Cobbled Deepslate Stairs", $cobbledDeepslateBreakInfo));
+		self::register("cobbled_deepslate_wall", fn(BID $id) => new Wall($id, "Cobbled Deepslate Wall", $cobbledDeepslateBreakInfo));
+
+		$polishedDeepslateBreakInfo = new Info(BreakInfo::pickaxe(3.5, ToolTier::WOOD, 18.0));
+		self::register("polished_deepslate", fn(BID $id) => new Opaque($id, "Polished Deepslate", $polishedDeepslateBreakInfo));
+		self::register("polished_deepslate_slab", fn(BID $id) => new Slab($id, "Polished Deepslate", $polishedDeepslateBreakInfo));
+		self::register("polished_deepslate_stairs", fn(BID $id) => new Stair($id, "Polished Deepslate Stairs", $polishedDeepslateBreakInfo));
+		self::register("polished_deepslate_wall", fn(BID $id) => new Wall($id, "Polished Deepslate Wall", $polishedDeepslateBreakInfo));
+
+		self::register("tinted_glass", fn(BID $id) => new TintedGlass($id, "Tinted Glass", new Info(new BreakInfo(0.3))));
+
+		//blast resistance should be 30 if we were matched with java :(
+		$copperBreakInfo = new Info(BreakInfo::pickaxe(3.0, ToolTier::STONE, 18.0));
+		self::register("lightning_rod", fn(BID $id) => new LightningRod($id, "Lightning Rod", $copperBreakInfo));
+
+		self::register("copper", fn(BID $id) => new Copper($id, "Copper Block", $copperBreakInfo));
+		self::register("chiseled_copper", fn(BID $id) => new Copper($id, "Chiseled Copper", $copperBreakInfo));
+		self::register("copper_grate", fn(BID $id) => new CopperGrate($id, "Copper Grate", $copperBreakInfo));
+		self::register("cut_copper", fn(BID $id) => new Copper($id, "Cut Copper Block", $copperBreakInfo));
+		self::register("cut_copper_slab", fn(BID $id) => new CopperSlab($id, "Cut Copper Slab", $copperBreakInfo));
+		self::register("cut_copper_stairs", fn(BID $id) => new CopperStairs($id, "Cut Copper Stairs", $copperBreakInfo));
+		self::register("copper_bulb", fn(BID $id) => new CopperBulb($id, "Copper Bulb", $copperBreakInfo));
+
+		$copperDoorBreakInfo = new Info(BreakInfo::pickaxe(3.0, ToolTier::STONE, 30.0));
+		self::register("copper_door", fn(BID $id) => new CopperDoor($id, "Copper Door", $copperDoorBreakInfo));
+		self::register("copper_trapdoor", fn(BID $id) => new CopperTrapdoor($id, "Copper Trapdoor", $copperDoorBreakInfo));
+
+		$candleBreakInfo = new Info(new BreakInfo(0.1));
+		self::register("candle", fn(BID $id) => new Candle($id, "Candle", $candleBreakInfo));
+		self::register("dyed_candle", fn(BID $id) => new DyedCandle($id, "Dyed Candle", $candleBreakInfo));
+
+		//TODO: duplicated break info :(
+		$cakeBreakInfo = new Info(new BreakInfo(0.5));
+		self::register("cake_with_candle", fn(BID $id) => new CakeWithCandle($id, "Cake With Candle", $cakeBreakInfo));
+		self::register("cake_with_dyed_candle", fn(BID $id) => new CakeWithDyedCandle($id, "Cake With Dyed Candle", $cakeBreakInfo));
+
+		self::register("hanging_roots", fn(BID $id) => new HangingRoots($id, "Hanging Roots", new Info(BreakInfo::instant(ToolType::SHEARS, 1))));
+
+		self::register("cave_vines", fn(BID $id) => new CaveVines($id, "Cave Vines", new Info(BreakInfo::instant())));
+
+		self::register("small_dripleaf", fn(BID $id) => new SmallDripleaf($id, "Small Dripleaf", new Info(BreakInfo::instant(ToolType::SHEARS, toolHarvestLevel: 1))));
+		self::register("big_dripleaf_head", fn(BID $id) => new BigDripleafHead($id, "Big Dripleaf", new Info(BreakInfo::instant())));
+		self::register("big_dripleaf_stem", fn(BID $id) => new BigDripleafStem($id, "Big Dripleaf Stem", new Info(BreakInfo::instant())));
+	}
+
+	private static function registerBlocksR18() : void{
+		self::register("spore_blossom", fn(BID $id) => new SporeBlossom($id, "Spore Blossom", new Info(BreakInfo::instant())));
+	}
+
+	private static function registerMudBlocks() : void{
+		self::register("mud", fn(BID $id) => new Opaque($id, "Mud", new Info(BreakInfo::shovel(0.5), [Tags::MUD])));
+		self::register("packed_mud", fn(BID $id) => new Opaque($id, "Packed Mud", new Info(BreakInfo::pickaxe(1.0, null, 15.0))));
+
+		$mudBricksBreakInfo = new Info(BreakInfo::pickaxe(2.0, ToolTier::WOOD, 30.0));
+
+		self::register("mud_bricks", fn(BID $id) => new Opaque($id, "Mud Bricks", $mudBricksBreakInfo));
+		self::register("mud_brick_slab", fn(BID $id) => new Slab($id, "Mud Brick", $mudBricksBreakInfo));
+		self::register("mud_brick_stairs", fn(BID $id) => new Stair($id, "Mud Brick Stairs", $mudBricksBreakInfo));
+		self::register("mud_brick_wall", fn(BID $id) => new Wall($id, "Mud Brick Wall", $mudBricksBreakInfo));
+	}
+
+	private static function registerTuffBlocks() : void{
+		$tuffBreakInfo = new Info(BreakInfo::pickaxe(1.5, ToolTier::WOOD, 30.0));
+
+		self::register("tuff", fn(BID $id) => new Opaque($id, "Tuff", $tuffBreakInfo));
+		self::register("tuff_slab", fn(BID $id) => new Slab($id, "Tuff", $tuffBreakInfo));
+		self::register("tuff_stairs", fn(BID $id) => new Stair($id, "Tuff Stairs", $tuffBreakInfo));
+		self::register("tuff_wall", fn(BID $id) => new Wall($id, "Tuff Wall", $tuffBreakInfo));
+		self::register("chiseled_tuff", fn(BID $id) => new Opaque($id, "Chiseled Tuff", $tuffBreakInfo));
+
+		self::register("tuff_bricks", fn(BID $id) => new Opaque($id, "Tuff Bricks", $tuffBreakInfo));
+		self::register("tuff_brick_slab", fn(BID $id) => new Slab($id, "Tuff Brick", $tuffBreakInfo));
+		self::register("tuff_brick_stairs", fn(BID $id) => new Stair($id, "Tuff Brick Stairs", $tuffBreakInfo));
+		self::register("tuff_brick_wall", fn(BID $id) => new Wall($id, "Tuff Brick Wall", $tuffBreakInfo));
+		self::register("chiseled_tuff_bricks", fn(BID $id) => new Opaque($id, "Chiseled Tuff Bricks", $tuffBreakInfo));
+
+		self::register("polished_tuff", fn(BID $id) => new Opaque($id, "Polished Tuff", $tuffBreakInfo));
+		self::register("polished_tuff_slab", fn(BID $id) => new Slab($id, "Polished Tuff", $tuffBreakInfo));
+		self::register("polished_tuff_stairs", fn(BID $id) => new Stair($id, "Polished Tuff Stairs", $tuffBreakInfo));
+		self::register("polished_tuff_wall", fn(BID $id) => new Wall($id, "Polished Tuff Wall", $tuffBreakInfo));
+	}
+
+	private static function registerCauldronBlocks() : void{
+		$cauldronBreakInfo = new Info(BreakInfo::pickaxe(2, ToolTier::WOOD));
+
+		self::register("cauldron", fn(BID $id) => new Cauldron($id, "Cauldron", $cauldronBreakInfo), TileCauldron::class);
+		self::register("water_cauldron", fn(BID $id) => new WaterCauldron($id, "Water Cauldron", $cauldronBreakInfo), TileCauldron::class);
+		self::register("lava_cauldron", fn(BID $id) => new LavaCauldron($id, "Lava Cauldron", $cauldronBreakInfo), TileCauldron::class);
+		self::register("potion_cauldron", fn(BID $id) => new PotionCauldron($id, "Potion Cauldron", $cauldronBreakInfo), TileCauldron::class);
 	}
 }
diff --git a/src/block/Vine.php b/src/block/Vine.php
index 80943dc7ce..cc516bbca7 100644
--- a/src/block/Vine.php
+++ b/src/block/Vine.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
 use pocketmine\math\Axis;
@@ -38,32 +39,17 @@ class Vine extends Flowable{
 	/** @var int[] */
 	protected array $faces = [];
 
-	protected function writeStateToMeta() : int{
-		return
-			(isset($this->faces[Facing::SOUTH]) ? BlockLegacyMetadata::VINE_FLAG_SOUTH : 0) |
-			(isset($this->faces[Facing::WEST]) ? BlockLegacyMetadata::VINE_FLAG_WEST : 0) |
-			(isset($this->faces[Facing::NORTH]) ? BlockLegacyMetadata::VINE_FLAG_NORTH : 0) |
-			(isset($this->faces[Facing::EAST]) ? BlockLegacyMetadata::VINE_FLAG_EAST : 0);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->setFaceFromMeta($stateMeta, BlockLegacyMetadata::VINE_FLAG_SOUTH, Facing::SOUTH);
-		$this->setFaceFromMeta($stateMeta, BlockLegacyMetadata::VINE_FLAG_WEST, Facing::WEST);
-		$this->setFaceFromMeta($stateMeta, BlockLegacyMetadata::VINE_FLAG_NORTH, Facing::NORTH);
-		$this->setFaceFromMeta($stateMeta, BlockLegacyMetadata::VINE_FLAG_EAST, Facing::EAST);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
-	private function setFaceFromMeta(int $meta, int $flag, int $face) : void{
-		$this->setFace($face, ($meta & $flag) !== 0);
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacingFlags($this->faces);
 	}
 
 	/** @return int[] */
 	public function getFaces() : array{ return $this->faces; }
 
+	public function hasFace(int $face) : bool{
+		return isset($this->faces[$face]);
+	}
+
 	/**
 	 * @param int[] $faces
 	 * @phpstan-param list<Facing::NORTH|Facing::EAST|Facing::SOUTH|Facing::WEST> $faces
diff --git a/src/block/Wall.php b/src/block/Wall.php
index 8a31d4816e..520ced8eb0 100644
--- a/src/block/Wall.php
+++ b/src/block/Wall.php
@@ -24,29 +24,101 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\SupportType;
+use pocketmine\block\utils\WallConnectionType;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\math\Axis;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
 
+/**
+ * @phpstan-type WallConnectionSet array<Facing::NORTH|Facing::EAST|Facing::SOUTH|Facing::WEST, WallConnectionType>
+ */
 class Wall extends Transparent{
 
-	/** @var int[] facing => facing */
+	/**
+	 * @var WallConnectionType[]
+	 * @phpstan-var WallConnectionSet
+	 */
 	protected array $connections = [];
-	protected bool $up = false;
+	protected bool $post = false;
 
-	public function readStateFromWorld() : void{
-		parent::readStateFromWorld();
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->wallConnections($this->connections);
+		$w->bool($this->post);
+	}
+
+	/**
+	 * @return WallConnectionType[]
+	 * @phpstan-return WallConnectionSet
+	 */
+	public function getConnections() : array{ return $this->connections; }
+
+	public function getConnection(int $face) : ?WallConnectionType{
+		return $this->connections[$face] ?? null;
+	}
+
+	/**
+	 * @param WallConnectionType[] $connections
+	 * @phpstan-param WallConnectionSet $connections
+	 * @return $this
+	 */
+	public function setConnections(array $connections) : self{
+		$this->connections = $connections;
+		return $this;
+	}
+
+	/** @return $this */
+	public function setConnection(int $face, ?WallConnectionType $type) : self{
+		if($face !== Facing::NORTH && $face !== Facing::SOUTH && $face !== Facing::WEST && $face !== Facing::EAST){
+			throw new \InvalidArgumentException("Facing can only be north, east, south or west");
+		}
+		if($type !== null){
+			$this->connections[$face] = $type;
+		}else{
+			unset($this->connections[$face]);
+		}
+		return $this;
+	}
+
+	public function isPost() : bool{ return $this->post; }
+
+	/** @return $this */
+	public function setPost(bool $post) : self{
+		$this->post = $post;
+		return $this;
+	}
+
+	public function onNearbyBlockChange() : void{
+		if($this->recalculateConnections()){
+			$this->position->getWorld()->setBlock($this->position, $this);
+		}
+	}
+
+	protected function recalculateConnections() : bool{
+		$changed = 0;
+
+		//TODO: implement tall/short connections - right now we only support short as per pre-1.16
 
 		foreach(Facing::HORIZONTAL as $facing){
 			$block = $this->getSide($facing);
-			if($block instanceof static || $block instanceof FenceGate || $block instanceof Thin || ($block->isSolid() && !$block->isTransparent())){
-				$this->connections[$facing] = $facing;
-			}else{
+			if($block instanceof static || $block instanceof FenceGate || $block instanceof Thin || $block->getSupportType(Facing::opposite($facing)) === SupportType::FULL){
+				if(!isset($this->connections[$facing])){
+					$this->connections[$facing] = WallConnectionType::SHORT;
+					$changed++;
+				}
+			}elseif(isset($this->connections[$facing])){
 				unset($this->connections[$facing]);
+				$changed++;
 			}
 		}
 
-		$this->up = $this->getSide(Facing::UP)->getId() !== BlockLegacyIds::AIR;
+		$up = $this->getSide(Facing::UP)->getTypeId() !== BlockTypeIds::AIR;
+		if($up !== $this->post){
+			$this->post = $up;
+			$changed++;
+		}
+
+		return $changed > 0;
 	}
 
 	protected function recalculateCollisionBoxes() : array{
@@ -59,7 +131,7 @@ class Wall extends Transparent{
 
 		$inset = 0.25;
 		if(
-			!$this->up && //if there is a block on top, it stays as a post
+			!$this->post && //if there is a block on top, it stays as a post
 			(
 				($north && $south && !$west && !$east) ||
 				(!$north && !$south && $west && $east)
@@ -80,6 +152,6 @@ class Wall extends Transparent{
 	}
 
 	public function getSupportType(int $facing) : SupportType{
-		return Facing::axis($facing) === Axis::Y ? SupportType::CENTER() : SupportType::NONE();
+		return Facing::axis($facing) === Axis::Y ? SupportType::CENTER : SupportType::NONE;
 	}
 }
diff --git a/src/block/WallBanner.php b/src/block/WallBanner.php
index c8c2182567..5182fe9f8f 100644
--- a/src/block/WallBanner.php
+++ b/src/block/WallBanner.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\NormalHorizontalFacingInMetadataTrait;
+use pocketmine\block\utils\HorizontalFacingTrait;
 use pocketmine\item\Item;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
@@ -32,7 +32,7 @@ use pocketmine\player\Player;
 use pocketmine\world\BlockTransaction;
 
 final class WallBanner extends BaseBanner{
-	use NormalHorizontalFacingInMetadataTrait;
+	use HorizontalFacingTrait;
 
 	protected function getSupportingFace() : int{
 		return Facing::opposite($this->facing);
diff --git a/src/block/WallCoralFan.php b/src/block/WallCoralFan.php
index fe8dc40a8a..f9dece1cd6 100644
--- a/src/block/WallCoralFan.php
+++ b/src/block/WallCoralFan.php
@@ -23,113 +23,49 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\BlockDataSerializer;
-use pocketmine\block\utils\CoralType;
 use pocketmine\block\utils\HorizontalFacingTrait;
-use pocketmine\block\utils\InvalidBlockStateException;
-use pocketmine\data\bedrock\CoralTypeIdMap;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
-use pocketmine\item\ItemFactory;
-use pocketmine\item\ItemIds;
+use pocketmine\item\VanillaItems;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
-use pocketmine\utils\AssumptionFailedError;
 use pocketmine\world\BlockTransaction;
 
 final class WallCoralFan extends BaseCoral{
 	use HorizontalFacingTrait;
 
-	protected BlockIdentifierFlattened $idInfoFlattened;
-
-	public function __construct(BlockIdentifierFlattened $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->idInfoFlattened = $idInfo;
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
-
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::readCoralFacing($stateMeta >> 2);
-		$this->dead = ($stateMeta & BlockLegacyMetadata::CORAL_FAN_HANG_FLAG_DEAD) !== 0;
-
-		$coralTypeFlag = $stateMeta & BlockLegacyMetadata::CORAL_FAN_HANG_TYPE_MASK;
-		switch($id){
-			case $this->idInfoFlattened->getBlockId():
-				$this->coralType = $coralTypeFlag === BlockLegacyMetadata::CORAL_FAN_HANG_TUBE ? CoralType::TUBE() : CoralType::BRAIN();
-				break;
-			case $this->idInfoFlattened->getAdditionalId(0):
-				$this->coralType = $coralTypeFlag === BlockLegacyMetadata::CORAL_FAN_HANG2_BUBBLE ? CoralType::BUBBLE() : CoralType::FIRE();
-				break;
-			case $this->idInfoFlattened->getAdditionalId(1):
-				if($coralTypeFlag !== BlockLegacyMetadata::CORAL_FAN_HANG3_HORN){
-					throw new InvalidBlockStateException("Invalid CORAL_FAN_HANG3 type");
-				}
-				$this->coralType = CoralType::HORN();
-				break;
-			default:
-				throw new \LogicException("ID/meta doesn't match any CORAL_FAN_HANG type");
-		}
-	}
-
-	public function getId() : int{
-		if($this->coralType->equals(CoralType::TUBE()) || $this->coralType->equals(CoralType::BRAIN())){
-			return $this->idInfoFlattened->getBlockId();
-		}elseif($this->coralType->equals(CoralType::BUBBLE()) || $this->coralType->equals(CoralType::FIRE())){
-			return $this->idInfoFlattened->getAdditionalId(0);
-		}elseif($this->coralType->equals(CoralType::HORN())){
-			return $this->idInfoFlattened->getAdditionalId(1);
-		}
-		throw new AssumptionFailedError("All types of coral should be covered");
-	}
-
-	public function writeStateToMeta() : int{
-		$coralTypeFlag = (function() : int{
-			switch($this->coralType->id()){
-				case CoralType::TUBE()->id(): return BlockLegacyMetadata::CORAL_FAN_HANG_TUBE;
-				case CoralType::BRAIN()->id(): return BlockLegacyMetadata::CORAL_FAN_HANG_BRAIN;
-				case CoralType::BUBBLE()->id(): return BlockLegacyMetadata::CORAL_FAN_HANG2_BUBBLE;
-				case CoralType::FIRE()->id(): return BlockLegacyMetadata::CORAL_FAN_HANG2_FIRE;
-				case CoralType::HORN()->id(): return BlockLegacyMetadata::CORAL_FAN_HANG3_HORN;
-				default: throw new AssumptionFailedError("All types of coral should be covered");
-			}
-		})();
-		return (BlockDataSerializer::writeCoralFacing($this->facing) << 2) | ($this->dead ? BlockLegacyMetadata::CORAL_FAN_HANG_FLAG_DEAD : 0) | $coralTypeFlag;
-	}
-
-	protected function writeStateToItemMeta() : int{
-		return CoralTypeIdMap::getInstance()->toId($this->coralType);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-
-	public function asItem() : Item{
-		return ItemFactory::getInstance()->get(
-			$this->dead ? ItemIds::CORAL_FAN_DEAD : ItemIds::CORAL_FAN,
-			$this->writeStateToItemMeta()
-		);
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
 		$axis = Facing::axis($face);
-		if(($axis !== Axis::X && $axis !== Axis::Z) || !$this->canBeSupportedBy($blockReplace->getSide(Facing::opposite($face)), $face)){
+		if(($axis !== Axis::X && $axis !== Axis::Z) || !$this->canBeSupportedAt($blockReplace, Facing::opposite($face))){
 			return false;
 		}
 		$this->facing = $face;
+
+		$this->dead = !$this->isCoveredWithWater();
+
 		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 	}
 
 	public function onNearbyBlockChange() : void{
 		$world = $this->position->getWorld();
-		if(!$this->canBeSupportedBy($world->getBlock($this->position->getSide(Facing::opposite($this->facing))), $this->facing)){
+		if(!$this->canBeSupportedAt($this, Facing::opposite($this->facing))){
 			$world->useBreakOn($this->position);
 		}else{
 			parent::onNearbyBlockChange();
 		}
 	}
 
-	private function canBeSupportedBy(Block $block, int $face) : bool{
-		return $block->getSupportType($face)->hasCenterSupport();
+	private function canBeSupportedAt(Block $block, int $face) : bool{
+		return $block->getAdjacentSupportType($face)->hasCenterSupport();
+	}
+
+	public function asItem() : Item{
+		return VanillaItems::CORAL_FAN()->setCoralType($this->coralType)->setDead($this->dead);
 	}
 }
diff --git a/src/block/WallSign.php b/src/block/WallSign.php
index 014ad4db0f..07826eae73 100644
--- a/src/block/WallSign.php
+++ b/src/block/WallSign.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\NormalHorizontalFacingInMetadataTrait;
+use pocketmine\block\utils\HorizontalFacingTrait;
 use pocketmine\item\Item;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
@@ -32,7 +32,7 @@ use pocketmine\player\Player;
 use pocketmine\world\BlockTransaction;
 
 final class WallSign extends BaseSign{
-	use NormalHorizontalFacingInMetadataTrait;
+	use HorizontalFacingTrait;
 
 	protected function getSupportingFace() : int{
 		return Facing::opposite($this->facing);
diff --git a/src/block/WaterCauldron.php b/src/block/WaterCauldron.php
new file mode 100644
index 0000000000..e470aa6cb8
--- /dev/null
+++ b/src/block/WaterCauldron.php
@@ -0,0 +1,208 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\tile\Cauldron as TileCauldron;
+use pocketmine\block\utils\DyeColor;
+use pocketmine\color\Color;
+use pocketmine\entity\Entity;
+use pocketmine\item\Armor;
+use pocketmine\item\Banner;
+use pocketmine\item\Dye;
+use pocketmine\item\Item;
+use pocketmine\item\ItemTypeIds;
+use pocketmine\item\Potion;
+use pocketmine\item\PotionType;
+use pocketmine\item\SplashPotion;
+use pocketmine\item\VanillaItems;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\sound\CauldronAddDyeSound;
+use pocketmine\world\sound\CauldronCleanItemSound;
+use pocketmine\world\sound\CauldronDyeItemSound;
+use pocketmine\world\sound\CauldronEmptyWaterSound;
+use pocketmine\world\sound\CauldronFillWaterSound;
+use pocketmine\world\sound\Sound;
+use function array_pop;
+use function assert;
+use function count;
+
+final class WaterCauldron extends FillableCauldron{
+
+	public const WATER_BOTTLE_FILL_AMOUNT = 2;
+
+	public const DYE_ARMOR_USE_AMOUNT = 1;
+	public const CLEAN_ARMOR_USE_AMOUNT = 1;
+	public const CLEAN_BANNER_USE_AMOUNT = 1;
+	public const CLEAN_SHULKER_BOX_USE_AMOUNT = 1;
+
+	//TODO: I'm not sure if this was intended to be 2 (to match java) but in Bedrock you can extinguish yourself 6 times ...
+	public const ENTITY_EXTINGUISH_USE_AMOUNT = 1;
+
+	private ?Color $customWaterColor = null;
+
+	public function readStateFromWorld() : Block{
+		$result = parent::readStateFromWorld();
+		if($result !== $this){
+			return $result;
+		}
+
+		$tile = $this->position->getWorld()->getTile($this->position);
+
+		$potionItem = $tile instanceof TileCauldron ? $tile->getPotionItem() : null;
+		if($potionItem !== null){
+			//TODO: HACK! we keep potion cauldrons as a separate block type due to different behaviour, but in the
+			//blockstate they are typically indistinguishable from water cauldrons. This hack converts cauldrons into
+			//their appropriate type.
+			return VanillaBlocks::POTION_CAULDRON()->setFillLevel($this->getFillLevel())->setPotionItem($potionItem);
+		}
+
+		$this->customWaterColor = $tile instanceof TileCauldron ? $tile->getCustomWaterColor() : null;
+
+		return $this;
+	}
+
+	public function writeStateToWorld() : void{
+		parent::writeStateToWorld();
+		$tile = $this->position->getWorld()->getTile($this->position);
+		assert($tile instanceof TileCauldron);
+		$tile->setCustomWaterColor($this->customWaterColor);
+		$tile->setPotionItem(null);
+	}
+
+	public function getCustomWaterColor() : ?Color{ return $this->customWaterColor; }
+
+	/** @return $this */
+	public function setCustomWaterColor(?Color $customWaterColor) : self{
+		$this->customWaterColor = $customWaterColor;
+		return $this;
+	}
+
+	public function getFillSound() : Sound{
+		return new CauldronFillWaterSound();
+	}
+
+	public function getEmptySound() : Sound{
+		return new CauldronEmptyWaterSound();
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		$world = $this->position->getWorld();
+		if(($dyeColor = match($item->getTypeId()){
+				ItemTypeIds::LAPIS_LAZULI => DyeColor::BLUE,
+				ItemTypeIds::INK_SAC => DyeColor::BLACK,
+				ItemTypeIds::COCOA_BEANS => DyeColor::BROWN,
+				ItemTypeIds::BONE_MEAL => DyeColor::WHITE,
+				ItemTypeIds::DYE => $item instanceof Dye ? $item->getColor() : null,
+				default => null
+			}) !== null && ($newColor = $dyeColor->getRgbValue())->toRGBA() !== $this->customWaterColor?->toRGBA()
+		){
+			$world->setBlock($this->position, $this->setCustomWaterColor($this->customWaterColor === null ? $newColor : Color::mix($this->customWaterColor, $newColor)));
+			$world->addSound($this->position->add(0.5, 0.5, 0.5), new CauldronAddDyeSound());
+
+			$item->pop();
+		}elseif($item instanceof Potion || $item instanceof SplashPotion){ //TODO: lingering potion
+			if($item->getType() === PotionType::WATER){
+				$this->setCustomWaterColor(null)->addFillLevels(self::WATER_BOTTLE_FILL_AMOUNT, $item, VanillaItems::GLASS_BOTTLE(), $returnedItems);
+			}else{
+				$this->mix($item, VanillaItems::GLASS_BOTTLE(), $returnedItems);
+			}
+		}elseif($item instanceof Armor){
+			if($this->customWaterColor !== null){
+				if(match($item->getTypeId()){ //TODO: a DyeableArmor class would probably be a better idea, since not all types of armor are dyeable
+					ItemTypeIds::LEATHER_CAP,
+					ItemTypeIds::LEATHER_TUNIC,
+					ItemTypeIds::LEATHER_PANTS,
+					ItemTypeIds::LEATHER_BOOTS => true,
+					default => false
+				} && $item->getCustomColor()?->toRGBA() !== $this->customWaterColor->toRGBA()){
+					$item->setCustomColor($this->customWaterColor);
+					$world->setBlock($this->position, $this->withFillLevel($this->getFillLevel() - self::DYE_ARMOR_USE_AMOUNT));
+					$world->addSound($this->position->add(0.5, 0.5, 0.5), new CauldronDyeItemSound());
+				}
+			}elseif($item->getCustomColor() !== null){
+				$item->clearCustomColor();
+				$world->setBlock($this->position, $this->withFillLevel($this->getFillLevel() - self::CLEAN_ARMOR_USE_AMOUNT));
+				$world->addSound($this->position->add(0.5, 0.5, 0.5), new CauldronCleanItemSound());
+			}
+		}elseif($item instanceof Banner){
+			$patterns = $item->getPatterns();
+			if(count($patterns) > 0 && $this->customWaterColor === null){
+				array_pop($patterns);
+				$item->setPatterns($patterns);
+
+				$world->setBlock($this->position, $this->withFillLevel($this->getFillLevel() - self::CLEAN_BANNER_USE_AMOUNT));
+				$world->addSound($this->position->add(0.5, 0.5, 0.5), new CauldronCleanItemSound());
+			}
+		}elseif(ItemTypeIds::toBlockTypeId($item->getTypeId()) === BlockTypeIds::DYED_SHULKER_BOX){
+			if($this->customWaterColor === null){
+				$newItem = VanillaBlocks::SHULKER_BOX()->asItem();
+				$newItem->setNamedTag($item->getNamedTag());
+
+				$item->pop();
+				$returnedItems[] = $newItem;
+
+				$world->setBlock($this->position, $this->withFillLevel($this->getFillLevel() - self::CLEAN_SHULKER_BOX_USE_AMOUNT));
+				$world->addSound($this->position->add(0.5, 0.5, 0.5), new CauldronCleanItemSound());
+			}
+		}else{
+			match($item->getTypeId()){
+				ItemTypeIds::WATER_BUCKET => $this->setCustomWaterColor(null)->addFillLevels(self::MAX_FILL_LEVEL, $item, VanillaItems::BUCKET(), $returnedItems),
+				ItemTypeIds::BUCKET => $this->removeFillLevels(self::MAX_FILL_LEVEL, $item, VanillaItems::WATER_BUCKET(), $returnedItems),
+				ItemTypeIds::GLASS_BOTTLE => $this->removeFillLevels(self::WATER_BOTTLE_FILL_AMOUNT, $item, VanillaItems::POTION()->setType(PotionType::WATER), $returnedItems),
+				ItemTypeIds::LAVA_BUCKET, ItemTypeIds::POWDER_SNOW_BUCKET => $this->mix($item, VanillaItems::BUCKET(), $returnedItems),
+				default => null
+			};
+		}
+
+		return true;
+	}
+
+	public function hasEntityCollision() : bool{ return true; }
+
+	public function onEntityInside(Entity $entity) : bool{
+		if($entity->isOnFire()){
+			$entity->extinguish();
+			//TODO: particles
+
+			$this->position->getWorld()->setBlock($this->position, $this->withFillLevel($this->getFillLevel() - self::ENTITY_EXTINGUISH_USE_AMOUNT));
+		}
+
+		return true;
+	}
+
+	public function onNearbyBlockChange() : void{
+		$hasCustomWaterColor = $this->customWaterColor !== null;
+		if($this->getFillLevel() < self::MAX_FILL_LEVEL || $hasCustomWaterColor){
+			$world = $this->position->getWorld();
+			if($world->getBlock($this->position->up())->getTypeId() === BlockTypeIds::WATER){
+				if($hasCustomWaterColor){
+					//TODO: particles
+				}
+				$world->setBlock($this->position, $this->setCustomWaterColor(null)->setFillLevel(FillableCauldron::MAX_FILL_LEVEL));
+				$world->addSound($this->position->add(0.5, 0.5, 0.5), $this->getFillSound());
+			}
+		}
+	}
+}
diff --git a/src/block/WaterLily.php b/src/block/WaterLily.php
index 8263330f64..5dfb0d74a1 100644
--- a/src/block/WaterLily.php
+++ b/src/block/WaterLily.php
@@ -23,14 +23,15 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\block\utils\StaticSupportTrait;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
-use pocketmine\player\Player;
-use pocketmine\world\BlockTransaction;
 
 class WaterLily extends Flowable{
+	use StaticSupportTrait {
+		canBePlacedAt as supportedWhenPlacedAt;
+	}
 
 	/**
 	 * @return AxisAlignedBB[]
@@ -40,23 +41,10 @@ class WaterLily extends Flowable{
 	}
 
 	public function canBePlacedAt(Block $blockReplace, Vector3 $clickVector, int $face, bool $isClickedBlock) : bool{
-		return !$blockReplace instanceof Water && parent::canBePlacedAt($blockReplace, $clickVector, $face, $isClickedBlock);
+		return !$blockReplace instanceof Water && $this->supportedWhenPlacedAt($blockReplace, $clickVector, $face, $isClickedBlock);
 	}
 
-	private function canBeSupportedBy(Block $block) : bool{
-		return $block instanceof Water;
-	}
-
-	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if(!$this->canBeSupportedBy($blockReplace->getSide(Facing::DOWN))){
-			return false;
-		}
-		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-	}
-
-	public function onNearbyBlockChange() : void{
-		if(!$this->canBeSupportedBy($this->getSide(Facing::DOWN))){
-			$this->position->getWorld()->useBreakOn($this->position);
-		}
+	private function canBeSupportedAt(Block $block) : bool{
+		return $block->getSide(Facing::DOWN) instanceof Water;
 	}
 }
diff --git a/src/block/WeightedPressurePlate.php b/src/block/WeightedPressurePlate.php
index 3fce83b1c0..726b31f6ba 100644
--- a/src/block/WeightedPressurePlate.php
+++ b/src/block/WeightedPressurePlate.php
@@ -24,20 +24,40 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\AnalogRedstoneSignalEmitterTrait;
-use pocketmine\block\utils\BlockDataSerializer;
+use function ceil;
+use function count;
+use function max;
+use function min;
 
-abstract class WeightedPressurePlate extends PressurePlate{
+class WeightedPressurePlate extends PressurePlate{
 	use AnalogRedstoneSignalEmitterTrait;
 
-	protected function writeStateToMeta() : int{
-		return $this->signalStrength;
+	private readonly float $signalStrengthFactor;
+
+	/**
+	 * @param float $signalStrengthFactor Number of entities on the plate is divided by this value to get signal strength
+	 */
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockTypeInfo $typeInfo, int $deactivationDelayTicks, float $signalStrengthFactor = 1.0){
+		parent::__construct($idInfo, $name, $typeInfo, $deactivationDelayTicks);
+		$this->signalStrengthFactor = $signalStrengthFactor;
 	}
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->signalStrength = BlockDataSerializer::readBoundedInt("signalStrength", $stateMeta, 0, 15);
+	protected function hasOutputSignal() : bool{
+		return $this->signalStrength > 0;
 	}
 
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function calculatePlateState(array $entities) : array{
+		$newSignalStrength = min(15, max(0,
+			(int) ceil(count($entities) * $this->signalStrengthFactor)
+		));
+		if($newSignalStrength === $this->signalStrength){
+			return [$this, null];
+		}
+		$wasActive = $this->signalStrength !== 0;
+		$isActive = $newSignalStrength !== 0;
+		return [
+			(clone $this)->setOutputSignalStrength($newSignalStrength),
+			$wasActive !== $isActive ? $isActive : null
+		];
 	}
 }
diff --git a/src/block/WeightedPressurePlateHeavy.php b/src/block/WeightedPressurePlateHeavy.php
index 390297436f..9a8d1c31b9 100644
--- a/src/block/WeightedPressurePlateHeavy.php
+++ b/src/block/WeightedPressurePlateHeavy.php
@@ -23,6 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+/**
+ * @deprecated
+ */
 class WeightedPressurePlateHeavy extends WeightedPressurePlate{
 
 }
diff --git a/src/block/WeightedPressurePlateLight.php b/src/block/WeightedPressurePlateLight.php
index 458c07e1a0..85c13d438c 100644
--- a/src/block/WeightedPressurePlateLight.php
+++ b/src/block/WeightedPressurePlateLight.php
@@ -23,6 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+/**
+ * @deprecated
+ */
 class WeightedPressurePlateLight extends WeightedPressurePlate{
 
 }
diff --git a/src/block/Wheat.php b/src/block/Wheat.php
index ccccd015a7..92f155f766 100644
--- a/src/block/Wheat.php
+++ b/src/block/Wheat.php
@@ -23,9 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\FortuneDropHelper;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
-use function mt_rand;
 
 class Wheat extends Crops{
 
@@ -33,7 +33,7 @@ class Wheat extends Crops{
 		if($this->age >= self::MAX_AGE){
 			return [
 				VanillaItems::WHEAT(),
-				VanillaItems::WHEAT_SEEDS()->setCount(mt_rand(0, 3))
+				VanillaItems::WHEAT_SEEDS()->setCount(FortuneDropHelper::binomial($item, 0))
 			];
 		}else{
 			return [
@@ -42,7 +42,7 @@ class Wheat extends Crops{
 		}
 	}
 
-	public function getPickedItem(bool $addUserData = false) : Item{
+	public function asItem() : Item{
 		return VanillaItems::WHEAT_SEEDS();
 	}
 }
diff --git a/src/block/WitherRose.php b/src/block/WitherRose.php
new file mode 100644
index 0000000000..8c0977b375
--- /dev/null
+++ b/src/block/WitherRose.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\StaticSupportTrait;
+use pocketmine\entity\effect\EffectInstance;
+use pocketmine\entity\effect\VanillaEffects;
+use pocketmine\entity\Entity;
+use pocketmine\entity\Living;
+use pocketmine\math\Facing;
+
+class WitherRose extends Flowable{
+	use StaticSupportTrait;
+
+	private function canBeSupportedAt(Block $block) : bool{
+		$supportBlock = $block->getSide(Facing::DOWN);
+		return
+			$supportBlock->hasTypeTag(BlockTypeTags::DIRT) ||
+			$supportBlock->hasTypeTag(BlockTypeTags::MUD) ||
+			match($supportBlock->getTypeId()){
+				BlockTypeIds::NETHERRACK,
+				BlockTypeIds::SOUL_SAND,
+				BlockTypeIds::SOUL_SOIL => true,
+				default => false
+			};
+	}
+
+	public function hasEntityCollision() : bool{ return true; }
+
+	public function onEntityInside(Entity $entity) : bool{
+		if($entity instanceof Living && !$entity->getEffects()->has(VanillaEffects::WITHER())){
+			$entity->getEffects()->add(new EffectInstance(VanillaEffects::WITHER(), 40));
+		}
+		return true;
+	}
+
+	public function getFlameEncouragement() : int{ return 60; }
+
+	public function getFlammability() : int{ return 100; }
+}
diff --git a/src/block/Wood.php b/src/block/Wood.php
index a71f490fa1..127533b989 100644
--- a/src/block/Wood.php
+++ b/src/block/Wood.php
@@ -23,47 +23,51 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\TreeType;
+use pocketmine\block\utils\PillarRotationTrait;
+use pocketmine\block\utils\WoodTypeTrait;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\item\Axe;
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
+use pocketmine\world\sound\ItemUseOnBlockSound;
 
 class Wood extends Opaque{
+	use PillarRotationTrait;
+	use WoodTypeTrait;
 
-	private TreeType $treeType;
+	private bool $stripped = false;
 
-	private bool $stripped;
-
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo, TreeType $treeType, bool $stripped){
-		$this->stripped = $stripped; //TODO: this should be dynamic, but right now legacy shit gets in the way
-		parent::__construct($idInfo, $name, $breakInfo);
-		$this->treeType = $treeType;
-	}
-
-	/**
-	 * TODO: this is ad hoc, but add an interface for this to all tree-related blocks
-	 */
-	public function getTreeType() : TreeType{
-		return $this->treeType;
+	public function describeBlockItemState(RuntimeDataDescriber $w) : void{
+		$w->bool($this->stripped);
 	}
 
 	public function isStripped() : bool{ return $this->stripped; }
 
+	/** @return $this */
+	public function setStripped(bool $stripped) : self{
+		$this->stripped = $stripped;
+		return $this;
+	}
+
 	public function getFuelTime() : int{
-		return 300;
+		return $this->woodType->isFlammable() ? 300 : 0;
 	}
 
 	public function getFlameEncouragement() : int{
-		return 5;
+		return $this->woodType->isFlammable() ? 5 : 0;
 	}
 
 	public function getFlammability() : int{
-		return 5;
+		return $this->woodType->isFlammable() ? 5 : 0;
 	}
 
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if(!$this->stripped && ($item->getBlockToolType() & BlockToolType::AXE) !== 0){
-			//TODO: strip logs; can't implement this yet because of legacy limitations :(
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if(!$this->stripped && $item instanceof Axe){
+			$item->applyDamage(1);
+			$this->stripped = true;
+			$this->position->getWorld()->setBlock($this->position, $this);
+			$this->position->getWorld()->addSound($this->position, new ItemUseOnBlockSound($this));
 			return true;
 		}
 		return false;
diff --git a/src/block/WoodenButton.php b/src/block/WoodenButton.php
index 3116840b24..7ba8a7af0d 100644
--- a/src/block/WoodenButton.php
+++ b/src/block/WoodenButton.php
@@ -23,7 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\WoodTypeTrait;
+
 class WoodenButton extends Button{
+	use WoodTypeTrait;
 
 	protected function getActivationTime() : int{
 		return 30;
@@ -32,4 +35,8 @@ class WoodenButton extends Button{
 	public function hasEntityCollision() : bool{
 		return false; //TODO: arrows activate wooden buttons
 	}
+
+	public function getFuelTime() : int{
+		return $this->woodType->isFlammable() ? 100 : 0;
+	}
 }
diff --git a/src/block/WoodenDoor.php b/src/block/WoodenDoor.php
index c77253e699..96f349e496 100644
--- a/src/block/WoodenDoor.php
+++ b/src/block/WoodenDoor.php
@@ -23,6 +23,12 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-class WoodenDoor extends Door{
+use pocketmine\block\utils\WoodTypeTrait;
 
+class WoodenDoor extends Door{
+	use WoodTypeTrait;
+
+	public function getFuelTime() : int{
+		return $this->woodType->isFlammable() ? 200 : 0;
+	}
 }
diff --git a/src/block/WoodenFence.php b/src/block/WoodenFence.php
index a84abef5fd..c12043a865 100644
--- a/src/block/WoodenFence.php
+++ b/src/block/WoodenFence.php
@@ -23,17 +23,20 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\WoodTypeTrait;
+
 class WoodenFence extends Fence{
+	use WoodTypeTrait;
 
 	public function getFuelTime() : int{
-		return 300;
+		return $this->woodType->isFlammable() ? 300 : 0;
 	}
 
 	public function getFlameEncouragement() : int{
-		return 5;
+		return $this->woodType->isFlammable() ? 5 : 0;
 	}
 
 	public function getFlammability() : int{
-		return 20;
+		return $this->woodType->isFlammable() ? 20 : 0;
 	}
 }
diff --git a/src/block/WoodenPressurePlate.php b/src/block/WoodenPressurePlate.php
index 163789b2f9..a629c2f1c7 100644
--- a/src/block/WoodenPressurePlate.php
+++ b/src/block/WoodenPressurePlate.php
@@ -23,7 +23,22 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\WoodType;
+use pocketmine\block\utils\WoodTypeTrait;
+
 class WoodenPressurePlate extends SimplePressurePlate{
+	use WoodTypeTrait;
+
+	public function __construct(
+		BlockIdentifier $idInfo,
+		string $name,
+		BlockTypeInfo $typeInfo,
+		WoodType $woodType,
+		int $deactivationDelayTicks = 20 //TODO: make this mandatory in PM6
+	){
+		$this->woodType = $woodType;
+		parent::__construct($idInfo, $name, $typeInfo, $deactivationDelayTicks);
+	}
 
 	public function getFuelTime() : int{
 		return 300;
diff --git a/src/block/WoodenSlab.php b/src/block/WoodenSlab.php
index f1fc42b66c..b388a36ea3 100644
--- a/src/block/WoodenSlab.php
+++ b/src/block/WoodenSlab.php
@@ -23,17 +23,20 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\WoodTypeTrait;
+
 class WoodenSlab extends Slab{
+	use WoodTypeTrait;
 
 	public function getFuelTime() : int{
-		return 300;
+		return $this->woodType->isFlammable() ? 300 : 0;
 	}
 
 	public function getFlameEncouragement() : int{
-		return 5;
+		return $this->woodType->isFlammable() ? 5 : 0;
 	}
 
 	public function getFlammability() : int{
-		return 20;
+		return $this->woodType->isFlammable() ? 20 : 0;
 	}
 }
diff --git a/src/block/WoodenStairs.php b/src/block/WoodenStairs.php
index 9c2f16a159..0d9ba62ceb 100644
--- a/src/block/WoodenStairs.php
+++ b/src/block/WoodenStairs.php
@@ -23,7 +23,14 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\WoodTypeTrait;
+
 class WoodenStairs extends Stair{
+	use WoodTypeTrait;
+
+	public function getFuelTime() : int{
+		return $this->woodType->isFlammable() ? 300 : 0;
+	}
 
 	public function getFlameEncouragement() : int{
 		return 5;
diff --git a/src/block/WoodenTrapdoor.php b/src/block/WoodenTrapdoor.php
index 83b3fb6c86..c0a6623a17 100644
--- a/src/block/WoodenTrapdoor.php
+++ b/src/block/WoodenTrapdoor.php
@@ -23,7 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\block\utils\WoodTypeTrait;
+
 class WoodenTrapdoor extends Trapdoor{
+	use WoodTypeTrait;
 
 	public function getFuelTime() : int{
 		return 300;
diff --git a/src/block/Wool.php b/src/block/Wool.php
index 993f0a0389..0b008ac042 100644
--- a/src/block/Wool.php
+++ b/src/block/Wool.php
@@ -23,16 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\block\utils\ColorInMetadataTrait;
-use pocketmine\block\utils\DyeColor;
+use pocketmine\block\utils\ColoredTrait;
 
 class Wool extends Opaque{
-	use ColorInMetadataTrait;
-
-	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
-		$this->color = DyeColor::WHITE();
-		parent::__construct($idInfo, $name, $breakInfo);
-	}
+	use ColoredTrait;
 
 	public function getFlameEncouragement() : int{
 		return 30;
diff --git a/src/block/inventory/AnimatedBlockInventoryTrait.php b/src/block/inventory/AnimatedBlockInventoryTrait.php
index a9965190cd..8720c985b1 100644
--- a/src/block/inventory/AnimatedBlockInventoryTrait.php
+++ b/src/block/inventory/AnimatedBlockInventoryTrait.php
@@ -47,20 +47,20 @@ trait AnimatedBlockInventoryTrait{
 	public function onOpen(Player $who) : void{
 		parent::onOpen($who);
 
-		if($this->getHolder()->isValid() && $this->getViewerCount() === 1){
+		if($this->holder->isValid() && $this->getViewerCount() === 1){
 			//TODO: this crap really shouldn't be managed by the inventory
 			$this->animateBlock(true);
-			$this->getHolder()->getWorld()->addSound($this->getHolder()->add(0.5, 0.5, 0.5), $this->getOpenSound());
+			$this->holder->getWorld()->addSound($this->holder->add(0.5, 0.5, 0.5), $this->getOpenSound());
 		}
 	}
 
 	abstract protected function animateBlock(bool $isOpen) : void;
 
 	public function onClose(Player $who) : void{
-		if($this->getHolder()->isValid() && $this->getViewerCount() === 1){
+		if($this->holder->isValid() && $this->getViewerCount() === 1){
 			//TODO: this crap really shouldn't be managed by the inventory
 			$this->animateBlock(false);
-			$this->getHolder()->getWorld()->addSound($this->getHolder()->add(0.5, 0.5, 0.5), $this->getCloseSound());
+			$this->holder->getWorld()->addSound($this->holder->add(0.5, 0.5, 0.5), $this->getCloseSound());
 		}
 		parent::onClose($who);
 	}
diff --git a/src/block/inventory/CampfireInventory.php b/src/block/inventory/CampfireInventory.php
new file mode 100644
index 0000000000..ae762473e2
--- /dev/null
+++ b/src/block/inventory/CampfireInventory.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\inventory;
+
+use pocketmine\inventory\SimpleInventory;
+use pocketmine\world\Position;
+
+class CampfireInventory extends SimpleInventory implements BlockInventory{
+	use BlockInventoryTrait;
+
+	public function __construct(Position $holder){
+		$this->holder = $holder;
+		parent::__construct(4);
+	}
+
+	public function getMaxStackSize() : int{
+		return 1;
+	}
+}
diff --git a/src/block/inventory/CartographyTableInventory.php b/src/block/inventory/CartographyTableInventory.php
new file mode 100644
index 0000000000..7bd9146ac6
--- /dev/null
+++ b/src/block/inventory/CartographyTableInventory.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\inventory;
+
+use pocketmine\inventory\SimpleInventory;
+use pocketmine\inventory\TemporaryInventory;
+use pocketmine\world\Position;
+
+final class CartographyTableInventory extends SimpleInventory implements BlockInventory, TemporaryInventory{
+	use BlockInventoryTrait;
+
+	public function __construct(Position $holder){
+		$this->holder = $holder;
+		parent::__construct(2);
+	}
+}
diff --git a/src/block/inventory/DoubleChestInventory.php b/src/block/inventory/DoubleChestInventory.php
index 92c75ef9f1..a7eb4a4398 100644
--- a/src/block/inventory/DoubleChestInventory.php
+++ b/src/block/inventory/DoubleChestInventory.php
@@ -41,7 +41,7 @@ class DoubleChestInventory extends BaseInventory implements BlockInventory, Inve
 		parent::__construct();
 	}
 
-	public function getInventory(){
+	public function getInventory() : self{
 		return $this;
 	}
 
@@ -85,6 +85,20 @@ class DoubleChestInventory extends BaseInventory implements BlockInventory, Inve
 		$this->right->setContents($rightContents);
 	}
 
+	protected function getMatchingItemCount(int $slot, Item $test, bool $checkTags) : int{
+		$leftSize = $this->left->getSize();
+		return $slot < $leftSize ?
+			$this->left->getMatchingItemCount($slot, $test, $checkTags) :
+			$this->right->getMatchingItemCount($slot - $leftSize, $test, $checkTags);
+	}
+
+	public function isSlotEmpty(int $index) : bool{
+		$leftSize = $this->left->getSize();
+		return $index < $leftSize ?
+			$this->left->isSlotEmpty($index) :
+			$this->right->isSlotEmpty($index - $leftSize);
+	}
+
 	protected function getOpenSound() : Sound{ return new ChestOpenSound(); }
 
 	protected function getCloseSound() : Sound{ return new ChestCloseSound(); }
diff --git a/src/block/inventory/EnchantInventory.php b/src/block/inventory/EnchantInventory.php
index 2c682d134b..6dffbad32b 100644
--- a/src/block/inventory/EnchantInventory.php
+++ b/src/block/inventory/EnchantInventory.php
@@ -23,9 +23,15 @@ declare(strict_types=1);
 
 namespace pocketmine\block\inventory;
 
+use pocketmine\event\player\PlayerEnchantingOptionsRequestEvent;
 use pocketmine\inventory\SimpleInventory;
 use pocketmine\inventory\TemporaryInventory;
+use pocketmine\item\enchantment\EnchantingHelper as Helper;
+use pocketmine\item\enchantment\EnchantingOption;
+use pocketmine\item\Item;
 use pocketmine\world\Position;
+use function array_values;
+use function count;
 
 class EnchantInventory extends SimpleInventory implements BlockInventory, TemporaryInventory{
 	use BlockInventoryTrait;
@@ -33,8 +39,50 @@ class EnchantInventory extends SimpleInventory implements BlockInventory, Tempor
 	public const SLOT_INPUT = 0;
 	public const SLOT_LAPIS = 1;
 
+	/**
+	 * @var EnchantingOption[] $options
+	 * @phpstan-var list<EnchantingOption>
+	 */
+	private array $options = [];
+
 	public function __construct(Position $holder){
 		$this->holder = $holder;
 		parent::__construct(2);
 	}
+
+	protected function onSlotChange(int $index, Item $before) : void{
+		if($index === self::SLOT_INPUT){
+			foreach($this->viewers as $viewer){
+				$this->options = [];
+				$item = $this->getInput();
+				$options = Helper::generateOptions($this->holder, $item, $viewer->getEnchantmentSeed());
+
+				$event = new PlayerEnchantingOptionsRequestEvent($viewer, $this, $options);
+				$event->call();
+				if(!$event->isCancelled() && count($event->getOptions()) > 0){
+					$this->options = array_values($event->getOptions());
+					$viewer->getNetworkSession()->getInvManager()?->syncEnchantingTableOptions($this->options);
+				}
+			}
+		}
+
+		parent::onSlotChange($index, $before);
+	}
+
+	public function getInput() : Item{
+		return $this->getItem(self::SLOT_INPUT);
+	}
+
+	public function getLapis() : Item{
+		return $this->getItem(self::SLOT_LAPIS);
+	}
+
+	public function getOutput(int $optionId) : ?Item{
+		$option = $this->getOption($optionId);
+		return $option === null ? null : Helper::enchantItem($this->getInput(), $option->getEnchantments());
+	}
+
+	public function getOption(int $optionId) : ?EnchantingOption{
+		return $this->options[$optionId] ?? null;
+	}
 }
diff --git a/src/block/inventory/ShulkerBoxInventory.php b/src/block/inventory/ShulkerBoxInventory.php
index a61e371987..d915a99518 100644
--- a/src/block/inventory/ShulkerBoxInventory.php
+++ b/src/block/inventory/ShulkerBoxInventory.php
@@ -23,9 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\block\inventory;
 
+use pocketmine\block\BlockTypeIds;
 use pocketmine\inventory\SimpleInventory;
 use pocketmine\item\Item;
-use pocketmine\item\ItemIds;
+use pocketmine\item\ItemTypeIds;
 use pocketmine\network\mcpe\protocol\BlockEventPacket;
 use pocketmine\network\mcpe\protocol\types\BlockPosition;
 use pocketmine\world\Position;
@@ -50,7 +51,8 @@ class ShulkerBoxInventory extends SimpleInventory implements BlockInventory{
 	}
 
 	public function canAddItem(Item $item) : bool{
-		if($item->getId() === ItemIds::UNDYED_SHULKER_BOX || $item->getId() === ItemIds::SHULKER_BOX){
+		$blockTypeId = ItemTypeIds::toBlockTypeId($item->getTypeId());
+		if($blockTypeId === BlockTypeIds::SHULKER_BOX || $blockTypeId === BlockTypeIds::DYED_SHULKER_BOX){
 			return false;
 		}
 		return parent::canAddItem($item);
diff --git a/src/block/inventory/SmithingTableInventory.php b/src/block/inventory/SmithingTableInventory.php
new file mode 100644
index 0000000000..2f67ac9d2d
--- /dev/null
+++ b/src/block/inventory/SmithingTableInventory.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\inventory;
+
+use pocketmine\inventory\SimpleInventory;
+use pocketmine\inventory\TemporaryInventory;
+use pocketmine\world\Position;
+
+final class SmithingTableInventory extends SimpleInventory implements BlockInventory, TemporaryInventory{
+	use BlockInventoryTrait;
+
+	public function __construct(Position $holder){
+		$this->holder = $holder;
+		parent::__construct(3);
+	}
+}
diff --git a/src/block/tile/Banner.php b/src/block/tile/Banner.php
index 191d4c8a52..08a560707b 100644
--- a/src/block/tile/Banner.php
+++ b/src/block/tile/Banner.php
@@ -27,11 +27,9 @@ use pocketmine\block\utils\BannerPatternLayer;
 use pocketmine\block\utils\DyeColor;
 use pocketmine\data\bedrock\BannerPatternTypeIdMap;
 use pocketmine\data\bedrock\DyeColorIdMap;
-use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\ListTag;
-use pocketmine\world\World;
 
 /**
  * @deprecated
@@ -44,7 +42,7 @@ class Banner extends Spawnable{
 	public const TAG_PATTERN_COLOR = "Color";
 	public const TAG_PATTERN_NAME = "Pattern";
 
-	private DyeColor $baseColor;
+	private DyeColor $baseColor = DyeColor::BLACK;
 
 	/**
 	 * @var BannerPatternLayer[]
@@ -52,11 +50,6 @@ class Banner extends Spawnable{
 	 */
 	private array $patterns = [];
 
-	public function __construct(World $world, Vector3 $pos){
-		$this->baseColor = DyeColor::BLACK();
-		parent::__construct($world, $pos);
-	}
-
 	public function readSaveData(CompoundTag $nbt) : void{
 		$colorIdMap = DyeColorIdMap::getInstance();
 		if(
@@ -65,7 +58,7 @@ class Banner extends Spawnable{
 		){
 			$this->baseColor = $baseColor;
 		}else{
-			$this->baseColor = DyeColor::BLACK(); //TODO: this should be an error
+			$this->baseColor = DyeColor::BLACK; //TODO: this should be an error
 		}
 
 		$patternTypeIdMap = BannerPatternTypeIdMap::getInstance();
@@ -74,7 +67,7 @@ class Banner extends Spawnable{
 		if($patterns !== null){
 			/** @var CompoundTag $pattern */
 			foreach($patterns as $pattern){
-				$patternColor = $colorIdMap->fromInvertedId($pattern->getInt(self::TAG_PATTERN_COLOR)) ?? DyeColor::BLACK(); //TODO: missing pattern colour should be an error
+				$patternColor = $colorIdMap->fromInvertedId($pattern->getInt(self::TAG_PATTERN_COLOR)) ?? DyeColor::BLACK; //TODO: missing pattern colour should be an error
 				$patternType = $patternTypeIdMap->fromId($pattern->getString(self::TAG_PATTERN_NAME));
 				if($patternType === null){
 					continue; //TODO: this should be an error, but right now we don't have the setup to deal with it
diff --git a/src/block/tile/Barrel.php b/src/block/tile/Barrel.php
index 4a1119a8b9..a7f3532142 100644
--- a/src/block/tile/Barrel.php
+++ b/src/block/tile/Barrel.php
@@ -32,8 +32,7 @@ class Barrel extends Spawnable implements Container, Nameable{
 	use NameableTrait;
 	use ContainerTrait;
 
-	/** @var BarrelInventory */
-	protected $inventory;
+	protected BarrelInventory $inventory;
 
 	public function __construct(World $world, Vector3 $pos){
 		parent::__construct($world, $pos);
@@ -57,17 +56,11 @@ class Barrel extends Spawnable implements Container, Nameable{
 		}
 	}
 
-	/**
-	 * @return BarrelInventory
-	 */
-	public function getInventory(){
+	public function getInventory() : BarrelInventory{
 		return $this->inventory;
 	}
 
-	/**
-	 * @return BarrelInventory
-	 */
-	public function getRealInventory(){
+	public function getRealInventory() : BarrelInventory{
 		return $this->inventory;
 	}
 
diff --git a/src/block/tile/Bed.php b/src/block/tile/Bed.php
index 847bcca1fd..17a0c8d9d3 100644
--- a/src/block/tile/Bed.php
+++ b/src/block/tile/Bed.php
@@ -25,20 +25,13 @@ namespace pocketmine\block\tile;
 
 use pocketmine\block\utils\DyeColor;
 use pocketmine\data\bedrock\DyeColorIdMap;
-use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\ByteTag;
 use pocketmine\nbt\tag\CompoundTag;
-use pocketmine\world\World;
 
 class Bed extends Spawnable{
 	public const TAG_COLOR = "color";
 
-	private DyeColor $color;
-
-	public function __construct(World $world, Vector3 $pos){
-		$this->color = DyeColor::RED();
-		parent::__construct($world, $pos);
-	}
+	private DyeColor $color = DyeColor::RED;
 
 	public function getColor() : DyeColor{
 		return $this->color;
@@ -55,7 +48,7 @@ class Bed extends Spawnable{
 		){
 			$this->color = $color;
 		}else{
-			$this->color = DyeColor::RED(); //TODO: this should be an error, but we don't have the systems to handle it yet
+			$this->color = DyeColor::RED; //TODO: this should be an error, but we don't have the systems to handle it yet
 		}
 	}
 
diff --git a/src/block/tile/Bell.php b/src/block/tile/Bell.php
index 64707c02da..7a1e784e37 100644
--- a/src/block/tile/Bell.php
+++ b/src/block/tile/Bell.php
@@ -23,12 +23,12 @@ declare(strict_types=1);
 
 namespace pocketmine\block\tile;
 
-use pocketmine\block\utils\BlockDataSerializer;
 use pocketmine\math\Facing;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\network\mcpe\protocol\BlockActorDataPacket;
 use pocketmine\network\mcpe\protocol\types\BlockPosition;
 use pocketmine\network\mcpe\protocol\types\CacheableNbt;
+use pocketmine\utils\AssumptionFailedError;
 
 final class Bell extends Spawnable{
 	public const TAG_DIRECTION = "Direction"; //TAG_Int
@@ -80,7 +80,13 @@ final class Bell extends Spawnable{
 	public function createFakeUpdatePacket(int $bellHitFace) : BlockActorDataPacket{
 		$nbt = $this->getSpawnCompound();
 		$nbt->setByte(self::TAG_RINGING, 1);
-		$nbt->setInt(self::TAG_DIRECTION, BlockDataSerializer::writeLegacyHorizontalFacing($bellHitFace));
+		$nbt->setInt(self::TAG_DIRECTION, match($bellHitFace){
+			Facing::SOUTH => 0,
+			Facing::WEST => 1,
+			Facing::NORTH => 2,
+			Facing::EAST => 3,
+			default => throw new AssumptionFailedError("Unreachable")
+		});
 		$nbt->setInt(self::TAG_TICKS, 0);
 		return BlockActorDataPacket::create(BlockPosition::fromVector3($this->position), new CacheableNbt($nbt));
 	}
diff --git a/src/block/tile/BlastFurnace.php b/src/block/tile/BlastFurnace.php
index e6e23c88c3..1356e32bf4 100644
--- a/src/block/tile/BlastFurnace.php
+++ b/src/block/tile/BlastFurnace.php
@@ -27,6 +27,6 @@ use pocketmine\crafting\FurnaceType;
 
 class BlastFurnace extends Furnace{
 	public function getFurnaceType() : FurnaceType{
-		return FurnaceType::BLAST_FURNACE();
+		return FurnaceType::BLAST_FURNACE;
 	}
 }
diff --git a/src/block/tile/BrewingStand.php b/src/block/tile/BrewingStand.php
index 6f77e9e34a..c3a331e6c6 100644
--- a/src/block/tile/BrewingStand.php
+++ b/src/block/tile/BrewingStand.php
@@ -112,17 +112,11 @@ class BrewingStand extends Spawnable implements Container, Nameable{
 		}
 	}
 
-	/**
-	 * @return BrewingStandInventory
-	 */
-	public function getInventory(){
+	public function getInventory() : BrewingStandInventory{
 		return $this->inventory;
 	}
 
-	/**
-	 * @return BrewingStandInventory
-	 */
-	public function getRealInventory(){
+	public function getRealInventory() : BrewingStandInventory{
 		return $this->inventory;
 	}
 
diff --git a/src/block/tile/Campfire.php b/src/block/tile/Campfire.php
new file mode 100644
index 0000000000..ad4a193d7b
--- /dev/null
+++ b/src/block/tile/Campfire.php
@@ -0,0 +1,143 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\tile;
+
+use pocketmine\block\Campfire as BlockCampfire;
+use pocketmine\block\inventory\CampfireInventory;
+use pocketmine\inventory\CallbackInventoryListener;
+use pocketmine\inventory\Inventory;
+use pocketmine\item\Item;
+use pocketmine\math\Vector3;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\network\mcpe\convert\TypeConverter;
+use pocketmine\world\World;
+
+class Campfire extends Spawnable implements Container{
+	use ContainerTrait;
+
+	private const TAG_FIRST_INPUT_ITEM = "Item1"; //TAG_Compound
+	private const TAG_SECOND_INPUT_ITEM = "Item2"; //TAG_Compound
+	private const TAG_THIRD_INPUT_ITEM = "Item3"; //TAG_Compound
+	private const TAG_FOURTH_INPUT_ITEM = "Item4"; //TAG_Compound
+
+	private const TAG_FIRST_COOKING_TIME = "ItemTime1"; //TAG_Int
+	private const TAG_SECOND_COOKING_TIME = "ItemTime2"; //TAG_Int
+	private const TAG_THIRD_COOKING_TIME = "ItemTime3"; //TAG_Int
+	private const TAG_FOURTH_COOKING_TIME = "ItemTime4"; //TAG_Int
+
+	protected CampfireInventory $inventory;
+	/** @var array<int, int> */
+	private array $cookingTimes = [];
+
+	public function __construct(World $world, Vector3 $pos){
+		parent::__construct($world, $pos);
+		$this->inventory = new CampfireInventory($this->position);
+		$this->inventory->getListeners()->add(CallbackInventoryListener::onAnyChange(
+			static function(Inventory $unused) use ($world, $pos) : void{
+				$block = $world->getBlock($pos);
+				if($block instanceof BlockCampfire){
+					$world->setBlock($pos, $block);
+				}
+			})
+		);
+	}
+
+	public function getInventory() : CampfireInventory{
+		return $this->inventory;
+	}
+
+	public function getRealInventory() : CampfireInventory{
+		return $this->inventory;
+	}
+
+	/**
+	 * @return int[]
+	 * @phpstan-return array<int, int>
+	 */
+	public function getCookingTimes() : array{
+		return $this->cookingTimes;
+	}
+
+	/**
+	 * @param int[] $cookingTimes
+	 * @phpstan-param array<int, int> $cookingTimes
+	 */
+	public function setCookingTimes(array $cookingTimes) : void{
+		$this->cookingTimes = $cookingTimes;
+	}
+
+	public function readSaveData(CompoundTag $nbt) : void{
+		$items = [];
+		$listeners = $this->inventory->getListeners()->toArray();
+		$this->inventory->getListeners()->remove(...$listeners); //prevent any events being fired by initialization
+
+		foreach([
+			[0, self::TAG_FIRST_INPUT_ITEM, self::TAG_FIRST_COOKING_TIME],
+			[1, self::TAG_SECOND_INPUT_ITEM, self::TAG_SECOND_COOKING_TIME],
+			[2, self::TAG_THIRD_INPUT_ITEM, self::TAG_THIRD_COOKING_TIME],
+			[3, self::TAG_FOURTH_INPUT_ITEM, self::TAG_FOURTH_COOKING_TIME],
+		] as [$slot, $itemTag, $cookingTimeTag]){
+			if(($tag = $nbt->getTag($itemTag)) instanceof CompoundTag){
+				$items[$slot] = Item::nbtDeserialize($tag);
+			}
+			if(($tag = $nbt->getTag($cookingTimeTag)) instanceof IntTag){
+				$this->cookingTimes[$slot] = $tag->getValue();
+			}
+		}
+		$this->inventory->setContents($items);
+		$this->inventory->getListeners()->add(...$listeners);
+	}
+
+	protected function writeSaveData(CompoundTag $nbt) : void{
+		foreach([
+			[0, self::TAG_FIRST_INPUT_ITEM, self::TAG_FIRST_COOKING_TIME],
+			[1, self::TAG_SECOND_INPUT_ITEM, self::TAG_SECOND_COOKING_TIME],
+			[2, self::TAG_THIRD_INPUT_ITEM, self::TAG_THIRD_COOKING_TIME],
+			[3, self::TAG_FOURTH_INPUT_ITEM, self::TAG_FOURTH_COOKING_TIME],
+		] as [$slot, $itemTag, $cookingTimeTag]){
+			$item = $this->inventory->getItem($slot);
+			if(!$item->isNull()){
+				$nbt->setTag($itemTag, $item->nbtSerialize());
+				if(isset($this->cookingTimes[$slot])){
+					$nbt->setInt($cookingTimeTag, $this->cookingTimes[$slot]);
+				}
+			}
+		}
+	}
+
+	protected function addAdditionalSpawnData(CompoundTag $nbt) : void{
+		foreach([
+			0 => self::TAG_FIRST_INPUT_ITEM,
+			1 => self::TAG_SECOND_INPUT_ITEM,
+			2 => self::TAG_THIRD_INPUT_ITEM,
+			3 => self::TAG_FOURTH_INPUT_ITEM
+		] as $slot => $tag){
+			$item = $this->inventory->getItem($slot);
+			if(!$item->isNull()){
+				$nbt->setTag($tag, TypeConverter::getInstance()->getItemTranslator()->toNetworkNbt($item));
+			}
+		}
+	}
+}
diff --git a/src/block/tile/Cauldron.php b/src/block/tile/Cauldron.php
new file mode 100644
index 0000000000..d10f97e149
--- /dev/null
+++ b/src/block/tile/Cauldron.php
@@ -0,0 +1,135 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\tile;
+
+use pocketmine\block\Block;
+use pocketmine\block\FillableCauldron;
+use pocketmine\color\Color;
+use pocketmine\data\bedrock\block\BlockStateNames;
+use pocketmine\data\bedrock\PotionTypeIdMap;
+use pocketmine\data\SavedDataLoadingException;
+use pocketmine\item\Item;
+use pocketmine\item\ItemTypeIds;
+use pocketmine\item\Potion;
+use pocketmine\item\SplashPotion;
+use pocketmine\item\VanillaItems;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Binary;
+
+final class Cauldron extends Spawnable{
+
+	private const POTION_CONTAINER_TYPE_NONE = -1;
+	private const POTION_CONTAINER_TYPE_NORMAL = 0;
+	private const POTION_CONTAINER_TYPE_SPLASH = 1;
+	private const POTION_CONTAINER_TYPE_LINGERING = 2;
+
+	private const POTION_ID_NONE = -1;
+
+	private const TAG_POTION_ID = "PotionId"; //TAG_Short
+	private const TAG_POTION_CONTAINER_TYPE = "PotionType"; //TAG_Short
+	private const TAG_CUSTOM_COLOR = "CustomColor"; //TAG_Int
+
+	private ?Item $potionItem = null;
+	private ?Color $customWaterColor = null;
+
+	public function getPotionItem() : ?Item{ return $this->potionItem; }
+
+	public function setPotionItem(?Item $potionItem) : void{
+		$this->potionItem = $potionItem;
+	}
+
+	public function getCustomWaterColor() : ?Color{ return $this->customWaterColor; }
+
+	public function setCustomWaterColor(?Color $customWaterColor) : void{
+		$this->customWaterColor = $customWaterColor;
+	}
+
+	protected function addAdditionalSpawnData(CompoundTag $nbt) : void{
+		$nbt->setShort(self::TAG_POTION_CONTAINER_TYPE, match($this->potionItem?->getTypeId()){
+			ItemTypeIds::POTION => self::POTION_CONTAINER_TYPE_NORMAL,
+			ItemTypeIds::SPLASH_POTION => self::POTION_CONTAINER_TYPE_SPLASH,
+			ItemTypeIds::LINGERING_POTION => self::POTION_CONTAINER_TYPE_LINGERING,
+			null => self::POTION_CONTAINER_TYPE_NONE,
+			default => throw new AssumptionFailedError("Unexpected potion item type")
+		});
+
+		//TODO: lingering potion
+		$type = $this->potionItem instanceof Potion || $this->potionItem instanceof SplashPotion ? $this->potionItem->getType() : null;
+		$nbt->setShort(self::TAG_POTION_ID, $type === null ? self::POTION_ID_NONE : PotionTypeIdMap::getInstance()->toId($type));
+
+		if($this->customWaterColor !== null){
+			$nbt->setInt(self::TAG_CUSTOM_COLOR, Binary::signInt($this->customWaterColor->toARGB()));
+		}
+	}
+
+	public function readSaveData(CompoundTag $nbt) : void{
+		$containerType = $nbt->getShort(self::TAG_POTION_CONTAINER_TYPE, self::POTION_CONTAINER_TYPE_NONE);
+		$potionId = $nbt->getShort(self::TAG_POTION_ID, self::POTION_ID_NONE);
+		if($containerType !== self::POTION_CONTAINER_TYPE_NONE && $potionId !== self::POTION_ID_NONE){
+			$potionType = PotionTypeIdMap::getInstance()->fromId($potionId);
+			if($potionType === null){
+				throw new SavedDataLoadingException("Unknown potion type ID $potionId");
+			}
+			$this->potionItem = match($containerType){
+				self::POTION_CONTAINER_TYPE_NORMAL => VanillaItems::POTION()->setType($potionType),
+				self::POTION_CONTAINER_TYPE_SPLASH => VanillaItems::SPLASH_POTION()->setType($potionType),
+				self::POTION_CONTAINER_TYPE_LINGERING => throw new SavedDataLoadingException("Not implemented"),
+				default => throw new SavedDataLoadingException("Invalid potion container type ID $containerType")
+			};
+		}else{
+			$this->potionItem = null;
+		}
+
+		$this->customWaterColor = ($customColorTag = $nbt->getTag(self::TAG_CUSTOM_COLOR)) instanceof IntTag ? Color::fromARGB(Binary::unsignInt($customColorTag->getValue())) : null;
+	}
+
+	protected function writeSaveData(CompoundTag $nbt) : void{
+		$nbt->setShort(self::TAG_POTION_CONTAINER_TYPE, match($this->potionItem?->getTypeId()){
+			ItemTypeIds::POTION => self::POTION_CONTAINER_TYPE_NORMAL,
+			ItemTypeIds::SPLASH_POTION => self::POTION_CONTAINER_TYPE_SPLASH,
+			ItemTypeIds::LINGERING_POTION => self::POTION_CONTAINER_TYPE_LINGERING,
+			null => self::POTION_CONTAINER_TYPE_NONE,
+			default => throw new AssumptionFailedError("Unexpected potion item type")
+		});
+
+		//TODO: lingering potion
+		$type = $this->potionItem instanceof Potion || $this->potionItem instanceof SplashPotion ? $this->potionItem->getType() : null;
+		$nbt->setShort(self::TAG_POTION_ID, $type === null ? self::POTION_ID_NONE : PotionTypeIdMap::getInstance()->toId($type));
+
+		if($this->customWaterColor !== null){
+			$nbt->setInt(self::TAG_CUSTOM_COLOR, Binary::signInt($this->customWaterColor->toARGB()));
+		}
+	}
+
+	public function getRenderUpdateBugWorkaroundStateProperties(Block $block) : array{
+		if($block instanceof FillableCauldron){
+			$realFillLevel = $block->getFillLevel();
+			return [BlockStateNames::FILL_LEVEL => new IntTag($realFillLevel === FillableCauldron::MAX_FILL_LEVEL ? FillableCauldron::MIN_FILL_LEVEL : $realFillLevel + 1)];
+		}
+
+		return [];
+	}
+}
diff --git a/src/block/tile/Chest.php b/src/block/tile/Chest.php
index 287b05d91a..4f97eed234 100644
--- a/src/block/tile/Chest.php
+++ b/src/block/tile/Chest.php
@@ -44,10 +44,8 @@ class Chest extends Spawnable implements Container, Nameable{
 	public const TAG_PAIRZ = "pairz";
 	public const TAG_PAIR_LEAD = "pairlead";
 
-	/** @var ChestInventory */
-	protected $inventory;
-	/** @var DoubleChestInventory|null */
-	protected $doubleInventory = null;
+	protected ChestInventory $inventory;
+	protected ?DoubleChestInventory $doubleInventory = null;
 
 	private ?int $pairX = null;
 	private ?int $pairZ = null;
@@ -116,20 +114,14 @@ class Chest extends Spawnable implements Container, Nameable{
 		$this->containerTraitBlockDestroyedHook();
 	}
 
-	/**
-	 * @return ChestInventory|DoubleChestInventory
-	 */
-	public function getInventory(){
+	public function getInventory() : ChestInventory|DoubleChestInventory{
 		if($this->isPaired() && $this->doubleInventory === null){
 			$this->checkPairing();
 		}
 		return $this->doubleInventory instanceof DoubleChestInventory ? $this->doubleInventory : $this->inventory;
 	}
 
-	/**
-	 * @return ChestInventory
-	 */
-	public function getRealInventory(){
+	public function getRealInventory() : ChestInventory{
 		return $this->inventory;
 	}
 
@@ -147,7 +139,7 @@ class Chest extends Spawnable implements Container, Nameable{
 				if($pair->doubleInventory !== null){
 					$this->doubleInventory = $pair->doubleInventory;
 				}else{
-					if(($pair->getPosition()->x + ($pair->getPosition()->z << 15)) > ($this->position->x + ($this->position->z << 15))){ //Order them correctly
+					if(($pair->position->x + ($pair->position->z << 15)) > ($this->position->x + ($this->position->z << 15))){ //Order them correctly
 						$this->doubleInventory = $pair->doubleInventory = new DoubleChestInventory($pair->inventory, $this->inventory);
 					}else{
 						$this->doubleInventory = $pair->doubleInventory = new DoubleChestInventory($this->inventory, $pair->inventory);
diff --git a/src/block/tile/ChiseledBookshelf.php b/src/block/tile/ChiseledBookshelf.php
new file mode 100644
index 0000000000..06175e27f4
--- /dev/null
+++ b/src/block/tile/ChiseledBookshelf.php
@@ -0,0 +1,139 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\tile;
+
+use pocketmine\block\utils\ChiseledBookshelfSlot;
+use pocketmine\data\bedrock\item\SavedItemData;
+use pocketmine\data\bedrock\item\SavedItemStackData;
+use pocketmine\data\SavedDataLoadingException;
+use pocketmine\inventory\SimpleInventory;
+use pocketmine\item\Item;
+use pocketmine\math\Vector3;
+use pocketmine\nbt\NBT;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\ListTag;
+use pocketmine\nbt\tag\StringTag;
+use pocketmine\world\World;
+use function count;
+
+class ChiseledBookshelf extends Tile implements Container{
+	use ContainerTrait;
+
+	private const TAG_LAST_INTERACTED_SLOT = "LastInteractedSlot"; //TAG_Int
+
+	private SimpleInventory $inventory;
+
+	private ?ChiseledBookshelfSlot $lastInteractedSlot = null;
+
+	public function __construct(World $world, Vector3 $pos){
+		parent::__construct($world, $pos);
+		$this->inventory = new SimpleInventory(count(ChiseledBookshelfSlot::cases()));
+	}
+
+	public function getInventory() : SimpleInventory{
+		return $this->inventory;
+	}
+
+	public function getRealInventory() : SimpleInventory{
+		return $this->inventory;
+	}
+
+	public function getLastInteractedSlot() : ?ChiseledBookshelfSlot{
+		return $this->lastInteractedSlot;
+	}
+
+	public function setLastInteractedSlot(?ChiseledBookshelfSlot $lastInteractedSlot) : void{
+		$this->lastInteractedSlot = $lastInteractedSlot;
+	}
+
+	public function readSaveData(CompoundTag $nbt) : void{
+		$this->loadItems($nbt);
+
+		$lastInteractedSlot = $nbt->getInt(self::TAG_LAST_INTERACTED_SLOT, 0);
+		if($lastInteractedSlot !== 0){
+			$this->lastInteractedSlot = ChiseledBookshelfSlot::tryFrom($lastInteractedSlot - 1);
+		}
+	}
+
+	protected function writeSaveData(CompoundTag $nbt) : void{
+		$this->saveItems($nbt);
+
+		$nbt->setInt(self::TAG_LAST_INTERACTED_SLOT, $this->lastInteractedSlot !== null ?
+			$this->lastInteractedSlot->value + 1 :
+			0
+		);
+	}
+
+	protected function loadItems(CompoundTag $tag) : void{
+		if(($inventoryTag = $tag->getTag(Container::TAG_ITEMS)) instanceof ListTag && $inventoryTag->getTagType() === NBT::TAG_Compound){
+			$inventory = $this->getRealInventory();
+			$listeners = $inventory->getListeners()->toArray();
+			$inventory->getListeners()->remove(...$listeners); //prevent any events being fired by initialization
+
+			$newContents = [];
+			/** @var CompoundTag $itemNBT */
+			foreach($inventoryTag as $slot => $itemNBT){
+				try{
+					$count = $itemNBT->getByte(SavedItemStackData::TAG_COUNT);
+					if($count === 0){
+						continue;
+					}
+					$newContents[$slot] = Item::nbtDeserialize($itemNBT);
+				}catch(SavedDataLoadingException $e){
+					//TODO: not the best solution
+					\GlobalLogger::get()->logException($e);
+					continue;
+				}
+			}
+			$inventory->setContents($newContents);
+
+			$inventory->getListeners()->add(...$listeners);
+		}
+
+		if(($lockTag = $tag->getTag(Container::TAG_LOCK)) instanceof StringTag){
+			$this->lock = $lockTag->getValue();
+		}
+	}
+
+	protected function saveItems(CompoundTag $tag) : void{
+		$items = [];
+		foreach($this->getRealInventory()->getContents(true) as $slot => $item){
+			if($item->isNull()){
+				$items[$slot] = CompoundTag::create()
+					->setByte(SavedItemStackData::TAG_COUNT, 0)
+					->setShort(SavedItemData::TAG_DAMAGE, 0)
+					->setString(SavedItemData::TAG_NAME, "")
+					->setByte(SavedItemStackData::TAG_WAS_PICKED_UP, 0);
+			}else{
+				$items[$slot] = $item->nbtSerialize();
+			}
+		}
+
+		$tag->setTag(Container::TAG_ITEMS, new ListTag($items, NBT::TAG_Compound));
+
+		if($this->lock !== null){
+			$tag->setString(Container::TAG_LOCK, $this->lock);
+		}
+	}
+}
diff --git a/src/block/tile/Comparator.php b/src/block/tile/Comparator.php
index f0a286babb..bad160911a 100644
--- a/src/block/tile/Comparator.php
+++ b/src/block/tile/Comparator.php
@@ -33,8 +33,7 @@ use pocketmine\nbt\tag\CompoundTag;
 class Comparator extends Tile{
 	private const TAG_OUTPUT_SIGNAL = "OutputSignal"; //int
 
-	/** @var int */
-	protected $signalStrength = 0;
+	protected int $signalStrength = 0;
 
 	public function getSignalStrength() : int{
 		return $this->signalStrength;
diff --git a/src/block/tile/Container.php b/src/block/tile/Container.php
index d9dde11f6c..dd257dd9c5 100644
--- a/src/block/tile/Container.php
+++ b/src/block/tile/Container.php
@@ -30,10 +30,7 @@ interface Container extends InventoryHolder{
 	public const TAG_ITEMS = "Items";
 	public const TAG_LOCK = "Lock";
 
-	/**
-	 * @return Inventory
-	 */
-	public function getRealInventory();
+	public function getRealInventory() : Inventory;
 
 	/**
 	 * Returns whether this container can be opened by an item with the given custom name.
diff --git a/src/block/tile/ContainerTrait.php b/src/block/tile/ContainerTrait.php
index ecaa544d29..fdd050a416 100644
--- a/src/block/tile/ContainerTrait.php
+++ b/src/block/tile/ContainerTrait.php
@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block\tile;
 
+use pocketmine\data\bedrock\item\SavedItemStackData;
+use pocketmine\data\SavedDataLoadingException;
 use pocketmine\inventory\Inventory;
 use pocketmine\item\Item;
 use pocketmine\nbt\NBT;
@@ -38,10 +40,7 @@ trait ContainerTrait{
 	/** @var string|null */
 	private $lock = null;
 
-	/**
-	 * @return Inventory
-	 */
-	abstract public function getRealInventory();
+	abstract public function getRealInventory() : Inventory;
 
 	protected function loadItems(CompoundTag $tag) : void{
 		if(($inventoryTag = $tag->getTag(Container::TAG_ITEMS)) instanceof ListTag && $inventoryTag->getTagType() === NBT::TAG_Compound){
@@ -52,7 +51,13 @@ trait ContainerTrait{
 			$newContents = [];
 			/** @var CompoundTag $itemNBT */
 			foreach($inventoryTag as $itemNBT){
-				$newContents[$itemNBT->getByte(Item::TAG_SLOT)] = Item::nbtDeserialize($itemNBT);
+				try{
+					$newContents[$itemNBT->getByte(SavedItemStackData::TAG_SLOT)] = Item::nbtDeserialize($itemNBT);
+				}catch(SavedDataLoadingException $e){
+					//TODO: not the best solution
+					\GlobalLogger::get()->logException($e);
+					continue;
+				}
 			}
 			$inventory->setContents($newContents);
 
diff --git a/src/block/tile/FlowerPot.php b/src/block/tile/FlowerPot.php
index b8d9a36a3c..5d114f6631 100644
--- a/src/block/tile/FlowerPot.php
+++ b/src/block/tile/FlowerPot.php
@@ -25,10 +25,16 @@ namespace pocketmine\block\tile;
 
 use pocketmine\block\Air;
 use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
+use pocketmine\block\RuntimeBlockStateRegistry;
+use pocketmine\data\bedrock\block\BlockStateDeserializeException;
+use pocketmine\data\bedrock\block\BlockStateNames;
+use pocketmine\data\SavedDataLoadingException;
+use pocketmine\nbt\tag\ByteTag;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\ShortTag;
+use pocketmine\network\mcpe\convert\TypeConverter;
+use pocketmine\world\format\io\GlobalBlockStateHandlers;
 
 /**
  * @deprecated
@@ -37,25 +43,41 @@ use pocketmine\nbt\tag\ShortTag;
 class FlowerPot extends Spawnable{
 	private const TAG_ITEM = "item";
 	private const TAG_ITEM_DATA = "mData";
+	private const TAG_PLANT_BLOCK = "PlantBlock";
 
 	private ?Block $plant = null;
 
 	public function readSaveData(CompoundTag $nbt) : void{
+		$blockStateData = null;
+
+		$blockDataUpgrader = GlobalBlockStateHandlers::getUpgrader();
 		if(($itemIdTag = $nbt->getTag(self::TAG_ITEM)) instanceof ShortTag && ($itemMetaTag = $nbt->getTag(self::TAG_ITEM_DATA)) instanceof IntTag){
 			try{
-				$this->setPlant(BlockFactory::getInstance()->get($itemIdTag->getValue(), $itemMetaTag->getValue()));
-			}catch(\InvalidArgumentException $e){
-				//noop
+				$blockStateData = $blockDataUpgrader->upgradeIntIdMeta($itemIdTag->getValue(), $itemMetaTag->getValue());
+			}catch(BlockStateDeserializeException $e){
+				throw new SavedDataLoadingException("Error loading legacy flower pot item data: " . $e->getMessage(), 0, $e);
 			}
-		}else{
-			//TODO: new PlantBlock tag
+		}elseif(($plantBlockTag = $nbt->getCompoundTag(self::TAG_PLANT_BLOCK)) !== null){
+			try{
+				$blockStateData = $blockDataUpgrader->upgradeBlockStateNbt($plantBlockTag);
+			}catch(BlockStateDeserializeException $e){
+				throw new SavedDataLoadingException("Error loading " . self::TAG_PLANT_BLOCK . " tag for flower pot: " . $e->getMessage(), 0, $e);
+			}
+		}
+
+		if($blockStateData !== null){
+			try{
+				$blockStateId = GlobalBlockStateHandlers::getDeserializer()->deserialize($blockStateData);
+			}catch(BlockStateDeserializeException $e){
+				throw new SavedDataLoadingException("Error deserializing plant for flower pot: " . $e->getMessage(), 0, $e);
+			}
+			$this->setPlant(RuntimeBlockStateRegistry::getInstance()->fromStateId($blockStateId));
 		}
 	}
 
 	protected function writeSaveData(CompoundTag $nbt) : void{
 		if($this->plant !== null){
-			$nbt->setShort(self::TAG_ITEM, $this->plant->getId());
-			$nbt->setInt(self::TAG_ITEM_DATA, $this->plant->getMeta());
+			$nbt->setTag(self::TAG_PLANT_BLOCK, GlobalBlockStateHandlers::getSerializer()->serialize($this->plant->getStateId())->toNbt());
 		}
 	}
 
@@ -73,8 +95,11 @@ class FlowerPot extends Spawnable{
 
 	protected function addAdditionalSpawnData(CompoundTag $nbt) : void{
 		if($this->plant !== null){
-			$nbt->setShort(self::TAG_ITEM, $this->plant->getId());
-			$nbt->setInt(self::TAG_ITEM_DATA, $this->plant->getMeta());
+			$nbt->setTag(self::TAG_PLANT_BLOCK, TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkStateData($this->plant->getStateId())->toNbt());
 		}
 	}
+
+	public function getRenderUpdateBugWorkaroundStateProperties(Block $block) : array{
+		return [BlockStateNames::UPDATE_BIT => new ByteTag(1)];
+	}
 }
diff --git a/src/block/tile/Furnace.php b/src/block/tile/Furnace.php
index e26e9006e2..a706a827e7 100644
--- a/src/block/tile/Furnace.php
+++ b/src/block/tile/Furnace.php
@@ -48,8 +48,7 @@ abstract class Furnace extends Spawnable implements Container, Nameable{
 	public const TAG_COOK_TIME = "CookTime";
 	public const TAG_MAX_TIME = "MaxTime";
 
-	/** @var FurnaceInventory */
-	protected $inventory;
+	protected FurnaceInventory $inventory;
 	private int $remainingFuelTime = 0;
 	private int $cookTime = 0;
 	private int $maxFuelTime = 0;
@@ -105,17 +104,11 @@ abstract class Furnace extends Spawnable implements Container, Nameable{
 		}
 	}
 
-	/**
-	 * @return FurnaceInventory
-	 */
-	public function getInventory(){
+	public function getInventory() : FurnaceInventory{
 		return $this->inventory;
 	}
 
-	/**
-	 * @return FurnaceInventory
-	 */
-	public function getRealInventory(){
+	public function getRealInventory() : FurnaceInventory{
 		return $this->getInventory();
 	}
 
@@ -172,7 +165,7 @@ abstract class Furnace extends Spawnable implements Container, Nameable{
 
 		$furnaceType = $this->getFurnaceType();
 		$smelt = $this->position->getWorld()->getServer()->getCraftingManager()->getFurnaceRecipeManager($furnaceType)->match($raw);
-		$canSmelt = ($smelt instanceof FurnaceRecipe && $raw->getCount() > 0 && (($smelt->getResult()->equals($product) && $product->getCount() < $product->getMaxStackSize()) || $product->isNull()));
+		$canSmelt = ($smelt instanceof FurnaceRecipe && $raw->getCount() > 0 && (($smelt->getResult()->canStackWith($product) && $product->getCount() < $product->getMaxStackSize()) || $product->isNull()));
 
 		if($this->remainingFuelTime <= 0 && $canSmelt && $fuel->getFuelTime() > 0 && $fuel->getCount() > 0){
 			$this->checkFuel($fuel);
diff --git a/src/block/tile/GlowingItemFrame.php b/src/block/tile/GlowingItemFrame.php
new file mode 100644
index 0000000000..c388241b8b
--- /dev/null
+++ b/src/block/tile/GlowingItemFrame.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\tile;
+
+/**
+ * @deprecated
+ * @see \pocketmine\block\ItemFrame
+ */
+final class GlowingItemFrame extends ItemFrame{
+
+}
diff --git a/src/block/tile/Hopper.php b/src/block/tile/Hopper.php
index 02b5193ee9..5c39bc2bd5 100644
--- a/src/block/tile/Hopper.php
+++ b/src/block/tile/Hopper.php
@@ -69,17 +69,11 @@ class Hopper extends Spawnable implements Container, Nameable{
 		return "Hopper";
 	}
 
-	/**
-	 * @return HopperInventory
-	 */
-	public function getInventory(){
+	public function getInventory() : HopperInventory{
 		return $this->inventory;
 	}
 
-	/**
-	 * @return HopperInventory
-	 */
-	public function getRealInventory(){
+	public function getRealInventory() : HopperInventory{
 		return $this->inventory;
 	}
 }
diff --git a/src/block/tile/ItemFrame.php b/src/block/tile/ItemFrame.php
index d05c8fedca..7d003770e6 100644
--- a/src/block/tile/ItemFrame.php
+++ b/src/block/tile/ItemFrame.php
@@ -27,6 +27,8 @@ use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\FloatTag;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\world\World;
 
 /**
@@ -51,14 +53,20 @@ class ItemFrame extends Spawnable{
 		if(($itemTag = $nbt->getCompoundTag(self::TAG_ITEM)) !== null){
 			$this->item = Item::nbtDeserialize($itemTag);
 		}
-		$this->itemRotation = $nbt->getByte(self::TAG_ITEM_ROTATION, $this->itemRotation);
+		if($nbt->getTag(self::TAG_ITEM_ROTATION) instanceof FloatTag){
+			$this->itemRotation = (int) ($nbt->getFloat(self::TAG_ITEM_ROTATION, $this->itemRotation * 45) / 45);
+		} else {
+			$this->itemRotation = $nbt->getByte(self::TAG_ITEM_ROTATION, $this->itemRotation);
+		}
 		$this->itemDropChance = $nbt->getFloat(self::TAG_ITEM_DROP_CHANCE, $this->itemDropChance);
 	}
 
 	protected function writeSaveData(CompoundTag $nbt) : void{
 		$nbt->setFloat(self::TAG_ITEM_DROP_CHANCE, $this->itemDropChance);
-		$nbt->setByte(self::TAG_ITEM_ROTATION, $this->itemRotation);
-		$nbt->setTag(self::TAG_ITEM, $this->item->nbtSerialize());
+		$nbt->setFloat(self::TAG_ITEM_ROTATION, $this->itemRotation * 45);
+		if(!$this->item->isNull()){
+			$nbt->setTag(self::TAG_ITEM, $this->item->nbtSerialize());
+		}
 	}
 
 	public function hasItem() : bool{
@@ -95,7 +103,9 @@ class ItemFrame extends Spawnable{
 
 	protected function addAdditionalSpawnData(CompoundTag $nbt) : void{
 		$nbt->setFloat(self::TAG_ITEM_DROP_CHANCE, $this->itemDropChance);
-		$nbt->setByte(self::TAG_ITEM_ROTATION, $this->itemRotation);
-		$nbt->setTag(self::TAG_ITEM, $this->item->nbtSerialize());
+		$nbt->setFloat(self::TAG_ITEM_ROTATION, $this->itemRotation * 45);
+		if(!$this->item->isNull()){
+			$nbt->setTag(self::TAG_ITEM, TypeConverter::getInstance()->getItemTranslator()->toNetworkNbt($this->item));
+		}
 	}
 }
diff --git a/src/block/tile/Jukebox.php b/src/block/tile/Jukebox.php
index 3154c6a073..54acd60eeb 100644
--- a/src/block/tile/Jukebox.php
+++ b/src/block/tile/Jukebox.php
@@ -26,6 +26,8 @@ namespace pocketmine\block\tile;
 use pocketmine\item\Item;
 use pocketmine\item\Record;
 use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\network\mcpe\convert\TypeConverter;
+use pocketmine\world\sound\RecordStopSound;
 
 class Jukebox extends Spawnable{
 	private const TAG_RECORD = "RecordItem"; //Item CompoundTag
@@ -58,7 +60,11 @@ class Jukebox extends Spawnable{
 	protected function addAdditionalSpawnData(CompoundTag $nbt) : void{
 		//this is needed for the note particles to show on the client side
 		if($this->record !== null){
-			$nbt->setTag(self::TAG_RECORD, $this->record->nbtSerialize());
+			$nbt->setTag(self::TAG_RECORD, TypeConverter::getInstance()->getItemTranslator()->toNetworkNbt($this->record));
 		}
 	}
+
+	protected function onBlockDestroyedHook() : void{
+		$this->position->getWorld()->addSound($this->position, new RecordStopSound());
+	}
 }
diff --git a/src/block/tile/Lectern.php b/src/block/tile/Lectern.php
index 28be8904e9..37e79b10e6 100644
--- a/src/block/tile/Lectern.php
+++ b/src/block/tile/Lectern.php
@@ -26,6 +26,7 @@ namespace pocketmine\block\tile;
 use pocketmine\item\Item;
 use pocketmine\item\WritableBookBase;
 use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use function count;
 
 /**
@@ -80,7 +81,7 @@ class Lectern extends Spawnable{
 		$nbt->setByte(self::TAG_HAS_BOOK, $this->book !== null ? 1 : 0);
 		$nbt->setInt(self::TAG_PAGE, $this->viewedPage);
 		if($this->book !== null){
-			$nbt->setTag(self::TAG_BOOK, $this->book->nbtSerialize());
+			$nbt->setTag(self::TAG_BOOK, TypeConverter::getInstance()->getItemTranslator()->toNetworkNbt($this->book));
 			$nbt->setInt(self::TAG_TOTAL_PAGES, count($this->book->getPages()));
 		}
 	}
diff --git a/src/block/tile/Skull.php b/src/block/tile/MobHead.php
similarity index 59%
rename from src/block/tile/Skull.php
rename to src/block/tile/MobHead.php
index 92ca7af690..be7c0ac2bc 100644
--- a/src/block/tile/Skull.php
+++ b/src/block/tile/MobHead.php
@@ -23,68 +23,63 @@ declare(strict_types=1);
 
 namespace pocketmine\block\tile;
 
-use pocketmine\block\utils\SkullType;
-use pocketmine\math\Vector3;
+use pocketmine\block\utils\MobHeadType;
+use pocketmine\data\bedrock\MobHeadTypeIdMap;
+use pocketmine\data\SavedDataLoadingException;
 use pocketmine\nbt\tag\ByteTag;
 use pocketmine\nbt\tag\CompoundTag;
-use pocketmine\world\World;
 
 /**
  * @deprecated
- * @see \pocketmine\block\Skull
+ * @see \pocketmine\block\MobHead
  */
-class Skull extends Spawnable{
+class MobHead extends Spawnable{
 
 	private const TAG_SKULL_TYPE = "SkullType"; //TAG_Byte
 	private const TAG_ROT = "Rot"; //TAG_Byte
 	private const TAG_MOUTH_MOVING = "MouthMoving"; //TAG_Byte
 	private const TAG_MOUTH_TICK_COUNT = "MouthTickCount"; //TAG_Int
 
-	private SkullType $skullType;
-	private int $skullRotation = 0;
-
-	public function __construct(World $world, Vector3 $pos){
-		$this->skullType = SkullType::SKELETON();
-		parent::__construct($world, $pos);
-	}
+	private MobHeadType $mobHeadType = MobHeadType::SKELETON;
+	private int $rotation = 0;
 
 	public function readSaveData(CompoundTag $nbt) : void{
 		if(($skullTypeTag = $nbt->getTag(self::TAG_SKULL_TYPE)) instanceof ByteTag){
-			try{
-				$this->skullType = SkullType::fromMagicNumber($skullTypeTag->getValue());
-			}catch(\InvalidArgumentException $e){
-				//bad data, drop it
+			$mobHeadType = MobHeadTypeIdMap::getInstance()->fromId($skullTypeTag->getValue());
+			if($mobHeadType === null){
+				throw new SavedDataLoadingException("Invalid skull type tag value " . $skullTypeTag->getValue());
 			}
+			$this->mobHeadType = $mobHeadType;
 		}
 		$rotation = $nbt->getByte(self::TAG_ROT, 0);
 		if($rotation >= 0 && $rotation <= 15){
-			$this->skullRotation = $rotation;
+			$this->rotation = $rotation;
 		}
 	}
 
 	protected function writeSaveData(CompoundTag $nbt) : void{
-		$nbt->setByte(self::TAG_SKULL_TYPE, $this->skullType->getMagicNumber());
-		$nbt->setByte(self::TAG_ROT, $this->skullRotation);
+		$nbt->setByte(self::TAG_SKULL_TYPE, MobHeadTypeIdMap::getInstance()->toId($this->mobHeadType));
+		$nbt->setByte(self::TAG_ROT, $this->rotation);
 	}
 
-	public function setSkullType(SkullType $type) : void{
-		$this->skullType = $type;
+	public function setMobHeadType(MobHeadType $type) : void{
+		$this->mobHeadType = $type;
 	}
 
-	public function getSkullType() : SkullType{
-		return $this->skullType;
+	public function getMobHeadType() : MobHeadType{
+		return $this->mobHeadType;
 	}
 
 	public function getRotation() : int{
-		return $this->skullRotation;
+		return $this->rotation;
 	}
 
 	public function setRotation(int $rotation) : void{
-		$this->skullRotation = $rotation;
+		$this->rotation = $rotation;
 	}
 
 	protected function addAdditionalSpawnData(CompoundTag $nbt) : void{
-		$nbt->setByte(self::TAG_SKULL_TYPE, $this->skullType->getMagicNumber());
-		$nbt->setByte(self::TAG_ROT, $this->skullRotation);
+		$nbt->setByte(self::TAG_SKULL_TYPE, MobHeadTypeIdMap::getInstance()->toId($this->mobHeadType));
+		$nbt->setByte(self::TAG_ROT, $this->rotation);
 	}
 }
diff --git a/src/block/tile/NormalFurnace.php b/src/block/tile/NormalFurnace.php
index 9580920e20..6aa61b8ce7 100644
--- a/src/block/tile/NormalFurnace.php
+++ b/src/block/tile/NormalFurnace.php
@@ -27,6 +27,6 @@ use pocketmine\crafting\FurnaceType;
 
 class NormalFurnace extends Furnace{
 	public function getFurnaceType() : FurnaceType{
-		return FurnaceType::FURNACE();
+		return FurnaceType::FURNACE;
 	}
 }
diff --git a/src/block/tile/ShulkerBox.php b/src/block/tile/ShulkerBox.php
index 693da26d9a..a30b75c4ea 100644
--- a/src/block/tile/ShulkerBox.php
+++ b/src/block/tile/ShulkerBox.php
@@ -38,11 +38,9 @@ class ShulkerBox extends Spawnable implements Container, Nameable{
 
 	public const TAG_FACING = "facing";
 
-	/** @var int */
-	protected $facing = Facing::NORTH;
+	protected int $facing = Facing::NORTH;
 
-	/** @var ShulkerBoxInventory */
-	protected $inventory;
+	protected ShulkerBoxInventory $inventory;
 
 	public function __construct(World $world, Vector3 $pos){
 		parent::__construct($world, $pos);
@@ -95,17 +93,11 @@ class ShulkerBox extends Spawnable implements Container, Nameable{
 		$this->facing = $facing;
 	}
 
-	/**
-	 * @return ShulkerBoxInventory
-	 */
-	public function getInventory(){
+	public function getInventory() : ShulkerBoxInventory{
 		return $this->inventory;
 	}
 
-	/**
-	 * @return ShulkerBoxInventory
-	 */
-	public function getRealInventory(){
+	public function getRealInventory() : ShulkerBoxInventory{
 		return $this->inventory;
 	}
 
diff --git a/src/block/tile/Sign.php b/src/block/tile/Sign.php
index 383526bd84..2ced414ff9 100644
--- a/src/block/tile/Sign.php
+++ b/src/block/tile/Sign.php
@@ -24,8 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\block\tile;
 
 use pocketmine\block\utils\SignText;
+use pocketmine\color\Color;
 use pocketmine\math\Vector3;
+use pocketmine\nbt\tag\ByteTag;
 use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\StringTag;
 use pocketmine\utils\Binary;
 use pocketmine\world\World;
@@ -45,12 +48,18 @@ class Sign extends Spawnable{
 	public const TAG_TEXT_LINE = "Text%d"; //sprintf()able
 	public const TAG_TEXT_COLOR = "SignTextColor";
 	public const TAG_GLOWING_TEXT = "IgnoreLighting";
+	public const TAG_PERSIST_FORMATTING = "PersistFormatting"; //TAG_Byte
 	/**
 	 * This tag is set to indicate that MCPE-117835 has been addressed in whatever version this sign was created.
 	 * @see https://bugs.mojang.com/browse/MCPE-117835
 	 */
 	public const TAG_LEGACY_BUG_RESOLVE = "TextIgnoreLegacyBugResolved";
 
+	public const TAG_FRONT_TEXT = "FrontText"; //TAG_Compound
+	public const TAG_BACK_TEXT = "BackText"; //TAG_Compound
+	public const TAG_WAXED = "IsWaxed"; //TAG_Byte
+	public const TAG_LOCKED_FOR_EDITING_BY = "LockedForEditingBy"; //TAG_Long
+
 	/**
 	 * @return string[]
 	 */
@@ -58,20 +67,40 @@ class Sign extends Spawnable{
 		return array_slice(array_pad(explode("\n", $blob), 4, ""), 0, 4);
 	}
 
-	/** @var SignText */
-	protected $text;
+	protected SignText $text;
+	private bool $waxed = false;
 
-	/** @var int|null */
-	protected $editorEntityRuntimeId = null;
+	protected ?int $editorEntityRuntimeId = null;
 
 	public function __construct(World $world, Vector3 $pos){
 		$this->text = new SignText();
 		parent::__construct($world, $pos);
 	}
 
+	private function readTextTag(CompoundTag $nbt, bool $lightingBugResolved) : void{
+		$baseColor = new Color(0, 0, 0);
+		$glowingText = false;
+		if(($baseColorTag = $nbt->getTag(self::TAG_TEXT_COLOR)) instanceof IntTag){
+			$baseColor = Color::fromARGB(Binary::unsignInt($baseColorTag->getValue()));
+		}
+		if($lightingBugResolved && ($glowingTextTag = $nbt->getTag(self::TAG_GLOWING_TEXT)) instanceof ByteTag){
+			//both of these must be 1 - if only one is set, it's a leftover from 1.16.210 experimental features
+			//see https://bugs.mojang.com/browse/MCPE-117835
+			$glowingText = $glowingTextTag->getValue() !== 0;
+		}
+		$this->text = SignText::fromBlob(mb_scrub($nbt->getString(self::TAG_TEXT_BLOB), 'UTF-8'), $baseColor, $glowingText);
+	}
+
 	public function readSaveData(CompoundTag $nbt) : void{
-		if(($textBlobTag = $nbt->getTag(self::TAG_TEXT_BLOB)) instanceof StringTag){ //MCPE 1.2 save format
-			$this->text = SignText::fromBlob(mb_scrub($textBlobTag->getValue(), 'UTF-8'));
+		$frontTextTag = $nbt->getTag(self::TAG_FRONT_TEXT);
+		if($frontTextTag instanceof CompoundTag){
+			$this->readTextTag($frontTextTag, true);
+		}elseif($nbt->getTag(self::TAG_TEXT_BLOB) instanceof StringTag){ //MCPE 1.2 save format
+			$lightingBugResolved = false;
+			if(($lightingBugResolvedTag = $nbt->getTag(self::TAG_LEGACY_BUG_RESOLVE)) instanceof ByteTag){
+				$lightingBugResolved = $lightingBugResolvedTag->getValue() !== 0;
+			}
+			$this->readTextTag($nbt, $lightingBugResolved);
 		}else{
 			$text = [];
 			for($i = 0; $i < SignText::LINE_COUNT; ++$i){
@@ -82,15 +111,24 @@ class Sign extends Spawnable{
 			}
 			$this->text = new SignText($text);
 		}
+		$this->waxed = $nbt->getByte(self::TAG_WAXED, 0) !== 0;
 	}
 
 	protected function writeSaveData(CompoundTag $nbt) : void{
-		$nbt->setString(self::TAG_TEXT_BLOB, implode("\n", $this->text->getLines()));
+		$nbt->setTag(self::TAG_FRONT_TEXT, CompoundTag::create()
+			->setString(self::TAG_TEXT_BLOB, implode("\n", $this->text->getLines()))
+			->setInt(self::TAG_TEXT_COLOR, Binary::signInt($this->text->getBaseColor()->toARGB()))
+			->setByte(self::TAG_GLOWING_TEXT, $this->text->isGlowing() ? 1 : 0)
+			->setByte(self::TAG_PERSIST_FORMATTING, 1)
+		);
+		$nbt->setTag(self::TAG_BACK_TEXT, CompoundTag::create()
+			->setString(self::TAG_TEXT_BLOB, "")
+			->setInt(self::TAG_TEXT_COLOR, Binary::signInt(0xff_00_00_00))
+			->setByte(self::TAG_GLOWING_TEXT, 0)
+			->setByte(self::TAG_PERSIST_FORMATTING, 1)
+		);
 
-		for($i = 0; $i < SignText::LINE_COUNT; ++$i){ //Backwards-compatibility
-			$textKey = sprintf(self::TAG_TEXT_LINE, $i + 1);
-			$nbt->setString($textKey, $this->text->getLine($i));
-		}
+		$nbt->setByte(self::TAG_WAXED, $this->waxed ? 1 : 0);
 	}
 
 	public function getText() : SignText{
@@ -101,6 +139,10 @@ class Sign extends Spawnable{
 		$this->text = $text;
 	}
 
+	public function isWaxed() : bool{ return $this->waxed; }
+
+	public function setWaxed(bool $waxed) : void{ $this->waxed = $waxed; }
+
 	/**
 	 * Returns the entity runtime ID of the player who placed this sign. Only the player whose entity ID matches this
 	 * one may edit the sign text.
@@ -118,12 +160,20 @@ class Sign extends Spawnable{
 	}
 
 	protected function addAdditionalSpawnData(CompoundTag $nbt) : void{
-		$nbt->setString(self::TAG_TEXT_BLOB, implode("\n", $this->text->getLines()));
-
-		//the following are not yet used by the server, but needed to roll back any changes to glowing state or colour
-		//if the client uses dye on the sign
-		$nbt->setInt(self::TAG_TEXT_COLOR, Binary::signInt(0xff_00_00_00));
-		$nbt->setByte(self::TAG_GLOWING_TEXT, 0);
-		$nbt->setByte(self::TAG_LEGACY_BUG_RESOLVE, 1);
+		$nbt->setTag(self::TAG_FRONT_TEXT, CompoundTag::create()
+			->setString(self::TAG_TEXT_BLOB, implode("\n", $this->text->getLines()))
+			->setInt(self::TAG_TEXT_COLOR, Binary::signInt($this->text->getBaseColor()->toARGB()))
+			->setByte(self::TAG_GLOWING_TEXT, $this->text->isGlowing() ? 1 : 0)
+			->setByte(self::TAG_PERSIST_FORMATTING, 1) //TODO: not sure what this is used for
+		);
+		//TODO: this is not yet used by the server, but needed to rollback any client-side changes to the back text
+		$nbt->setTag(self::TAG_BACK_TEXT, CompoundTag::create()
+			->setString(self::TAG_TEXT_BLOB, "")
+			->setInt(self::TAG_TEXT_COLOR, Binary::signInt(0xff_00_00_00))
+			->setByte(self::TAG_GLOWING_TEXT, 0)
+			->setByte(self::TAG_PERSIST_FORMATTING, 1)
+		);
+		$nbt->setByte(self::TAG_WAXED, $this->waxed ? 1 : 0);
+		$nbt->setLong(self::TAG_LOCKED_FOR_EDITING_BY, $this->editorEntityRuntimeId ?? -1);
 	}
 }
diff --git a/src/block/tile/Smoker.php b/src/block/tile/Smoker.php
index 4b5a017336..824eeedd28 100644
--- a/src/block/tile/Smoker.php
+++ b/src/block/tile/Smoker.php
@@ -27,6 +27,6 @@ use pocketmine\crafting\FurnaceType;
 
 class Smoker extends Furnace{
 	public function getFurnaceType() : FurnaceType{
-		return FurnaceType::SMOKER();
+		return FurnaceType::SMOKER;
 	}
 }
diff --git a/src/block/tile/Spawnable.php b/src/block/tile/Spawnable.php
index 73ad2142af..67bc72fd91 100644
--- a/src/block/tile/Spawnable.php
+++ b/src/block/tile/Spawnable.php
@@ -23,7 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\block\tile;
 
+use pocketmine\block\Block;
+use pocketmine\nbt\tag\ByteTag;
 use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\StringTag;
 use pocketmine\network\mcpe\protocol\types\CacheableNbt;
 use function get_class;
 
@@ -49,6 +53,22 @@ abstract class Spawnable extends Tile{
 		$this->spawnCompoundCache = null;
 	}
 
+	/**
+	 * The Bedrock client won't re-render a block if the block's state properties didn't change. This is a problem when
+	 * the tile may affect the block's appearance. For example, a cauldron's liquid changes colour based on the dye
+	 * inside.
+	 *
+	 * This is worked around in vanilla by modifying one of the block's state properties to a different value, and then
+	 * changing it back again. Since we don't want to litter core implementation with hacks like this, we brush it under
+	 * the rug into Tile.
+	 *
+	 * @return ByteTag[]|IntTag[]|StringTag[]
+	 * @phpstan-return array<string, IntTag|StringTag|ByteTag>
+	 */
+	public function getRenderUpdateBugWorkaroundStateProperties(Block $block) : array{
+		return [];
+	}
+
 	/**
 	 * Returns encoded NBT (varint, little-endian) used to spawn this tile to clients. Uses cache where possible,
 	 * populates cache if it is null.
diff --git a/src/block/tile/SporeBlossom.php b/src/block/tile/SporeBlossom.php
new file mode 100644
index 0000000000..46ad80e10f
--- /dev/null
+++ b/src/block/tile/SporeBlossom.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\tile;
+
+use pocketmine\nbt\tag\CompoundTag;
+
+/**
+ * This exists to force the client to update the spore blossom every tick, which is necessary for it to generate
+ * particles.
+ */
+final class SporeBlossom extends Spawnable{
+
+	protected function addAdditionalSpawnData(CompoundTag $nbt) : void{
+		//NOOP
+	}
+
+	public function readSaveData(CompoundTag $nbt) : void{
+		//NOOP
+	}
+
+	protected function writeSaveData(CompoundTag $nbt) : void{
+		//NOOP
+	}
+}
diff --git a/src/block/tile/Tile.php b/src/block/tile/Tile.php
index 9a2f443b1b..7b709f6799 100644
--- a/src/block/tile/Tile.php
+++ b/src/block/tile/Tile.php
@@ -34,6 +34,7 @@ use pocketmine\nbt\NbtDataException;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\timings\Timings;
 use pocketmine\timings\TimingsHandler;
+use pocketmine\VersionInfo;
 use pocketmine\world\Position;
 use pocketmine\world\World;
 use function get_class;
@@ -45,12 +46,9 @@ abstract class Tile{
 	public const TAG_Y = "y";
 	public const TAG_Z = "z";
 
-	/** @var Position */
-	protected $position;
-	/** @var bool */
-	public $closed = false;
-	/** @var TimingsHandler */
-	protected $timings;
+	protected Position $position;
+	public bool $closed = false;
+	protected TimingsHandler $timings;
 
 	public function __construct(World $world, Vector3 $pos){
 		$this->position = Position::fromObject($pos, $world);
@@ -74,7 +72,8 @@ abstract class Tile{
 			->setString(self::TAG_ID, TileFactory::getInstance()->getSaveId(get_class($this)))
 			->setInt(self::TAG_X, $this->position->getFloorX())
 			->setInt(self::TAG_Y, $this->position->getFloorY())
-			->setInt(self::TAG_Z, $this->position->getFloorZ());
+			->setInt(self::TAG_Z, $this->position->getFloorZ())
+			->setLong(VersionInfo::TAG_WORLD_DATA_VERSION, VersionInfo::WORLD_DATA_VERSION);
 		$this->writeSaveData($nbt);
 
 		return $nbt;
diff --git a/src/block/tile/TileFactory.php b/src/block/tile/TileFactory.php
index 99ace99bd4..515dd8c63c 100644
--- a/src/block/tile/TileFactory.php
+++ b/src/block/tile/TileFactory.php
@@ -57,7 +57,10 @@ final class TileFactory{
 		$this->register(Bell::class, ["Bell", "minecraft:bell"]);
 		$this->register(BlastFurnace::class, ["BlastFurnace", "minecraft:blast_furnace"]);
 		$this->register(BrewingStand::class, ["BrewingStand", "minecraft:brewing_stand"]);
+		$this->register(Campfire::class, ["Campfire", "minecraft:campfire"]);
+		$this->register(Cauldron::class, ["Cauldron", "minecraft:cauldron"]);
 		$this->register(Chest::class, ["Chest", "minecraft:chest"]);
+		$this->register(ChiseledBookshelf::class, ["ChiseledBookshelf", "minecraft:chiseled_bookshelf"]);
 		$this->register(Comparator::class, ["Comparator", "minecraft:comparator"]);
 		$this->register(DaylightSensor::class, ["DaylightDetector", "minecraft:daylight_detector"]);
 		$this->register(EnchantTable::class, ["EnchantTable", "minecraft:enchanting_table"]);
@@ -73,10 +76,10 @@ final class TileFactory{
 		$this->register(ShulkerBox::class, ["ShulkerBox", "minecraft:shulker_box"]);
 		$this->register(Sign::class, ["Sign", "minecraft:sign"]);
 		$this->register(Smoker::class, ["Smoker", "minecraft:smoker"]);
-		$this->register(Skull::class, ["Skull", "minecraft:skull"]);
+		$this->register(SporeBlossom::class, ["SporeBlossom", "minecraft:spore_blossom"]);
+		$this->register(MobHead::class, ["Skull", "minecraft:skull"]);
+		$this->register(GlowingItemFrame::class, ["GlowItemFrame"]);
 
-		//TODO: Campfire
-		//TODO: Cauldron
 		//TODO: ChalkboardBlock
 		//TODO: ChemistryTable
 		//TODO: CommandBlock
diff --git a/src/block/utils/AgeableTrait.php b/src/block/utils/AgeableTrait.php
new file mode 100644
index 0000000000..dc1369c876
--- /dev/null
+++ b/src/block/utils/AgeableTrait.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\data\runtime\RuntimeDataDescriber;
+
+/**
+ * This trait is used for blocks that have an age property.
+ * Need to add to the block the constant MAX_AGE.
+ */
+trait AgeableTrait{
+	protected int $age = 0;
+
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->boundedIntAuto(0, self::MAX_AGE, $this->age);
+	}
+
+	public function getAge() : int{ return $this->age; }
+
+	/**
+	 * @return $this
+	 */
+	public function setAge(int $age) : self{
+		if($age < 0 || $age > self::MAX_AGE){
+			throw new \InvalidArgumentException("Age must be in range 0 ... " . self::MAX_AGE);
+		}
+		$this->age = $age;
+		return $this;
+	}
+}
diff --git a/src/block/utils/AmethystTrait.php b/src/block/utils/AmethystTrait.php
new file mode 100644
index 0000000000..e581d3517d
--- /dev/null
+++ b/src/block/utils/AmethystTrait.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\block\Block;
+use pocketmine\entity\projectile\Projectile;
+use pocketmine\math\RayTraceResult;
+use pocketmine\world\sound\AmethystBlockChimeSound;
+use pocketmine\world\sound\BlockPunchSound;
+
+trait AmethystTrait{
+	/**
+	 * @see Block::onProjectileHit()
+	 */
+	public function onProjectileHit(Projectile $projectile, RayTraceResult $hitResult) : void{
+		$this->position->getWorld()->addSound($this->position, new AmethystBlockChimeSound());
+		$this->position->getWorld()->addSound($this->position, new BlockPunchSound($this));
+	}
+}
diff --git a/src/block/utils/AnalogRedstoneSignalEmitterTrait.php b/src/block/utils/AnalogRedstoneSignalEmitterTrait.php
index 5fb4a3da1d..4b86946436 100644
--- a/src/block/utils/AnalogRedstoneSignalEmitterTrait.php
+++ b/src/block/utils/AnalogRedstoneSignalEmitterTrait.php
@@ -23,9 +23,15 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
+use pocketmine\data\runtime\RuntimeDataDescriber;
+
 trait AnalogRedstoneSignalEmitterTrait{
 	protected int $signalStrength = 0;
 
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->boundedIntAuto(0, 15, $this->signalStrength);
+	}
+
 	public function getOutputSignalStrength() : int{ return $this->signalStrength; }
 
 	/** @return $this */
diff --git a/src/block/utils/AnyFacingTrait.php b/src/block/utils/AnyFacingTrait.php
index 3a4e03eb23..4805b7b7c5 100644
--- a/src/block/utils/AnyFacingTrait.php
+++ b/src/block/utils/AnyFacingTrait.php
@@ -23,11 +23,15 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\math\Facing;
 
 trait AnyFacingTrait{
-	/** @var int */
-	protected $facing = Facing::DOWN;
+	protected int $facing = Facing::DOWN;
+
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->facing($this->facing);
+	}
 
 	public function getFacing() : int{ return $this->facing; }
 
diff --git a/src/block/utils/BannerPatternType.php b/src/block/utils/BannerPatternType.php
index 85b0640591..9b19636033 100644
--- a/src/block/utils/BannerPatternType.php
+++ b/src/block/utils/BannerPatternType.php
@@ -23,13 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static BannerPatternType BORDER()
  * @method static BannerPatternType BRICKS()
@@ -70,49 +68,49 @@ use pocketmine\utils\EnumTrait;
  * @method static BannerPatternType TRIANGLE_BOTTOM()
  * @method static BannerPatternType TRIANGLE_TOP()
  */
-final class BannerPatternType{
-	use EnumTrait;
+enum BannerPatternType{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("border"),
-			new self("bricks"),
-			new self("circle"),
-			new self("creeper"),
-			new self("cross"),
-			new self("curly_border"),
-			new self("diagonal_left"),
-			new self("diagonal_right"),
-			new self("diagonal_up_left"),
-			new self("diagonal_up_right"),
-			new self("flower"),
-			new self("gradient"),
-			new self("gradient_up"),
-			new self("half_horizontal"),
-			new self("half_horizontal_bottom"),
-			new self("half_vertical"),
-			new self("half_vertical_right"),
-			new self("mojang"),
-			new self("rhombus"),
-			new self("skull"),
-			new self("small_stripes"),
-			new self("square_bottom_left"),
-			new self("square_bottom_right"),
-			new self("square_top_left"),
-			new self("square_top_right"),
-			new self("straight_cross"),
-			new self("stripe_bottom"),
-			new self("stripe_center"),
-			new self("stripe_downleft"),
-			new self("stripe_downright"),
-			new self("stripe_left"),
-			new self("stripe_middle"),
-			new self("stripe_right"),
-			new self("stripe_top"),
-			new self("triangle_bottom"),
-			new self("triangle_top"),
-			new self("triangles_bottom"),
-			new self("triangles_top")
-		);
-	}
+	case BORDER;
+	case BRICKS;
+	case CIRCLE;
+	case CREEPER;
+	case CROSS;
+	case CURLY_BORDER;
+	case DIAGONAL_LEFT;
+	case DIAGONAL_RIGHT;
+	case DIAGONAL_UP_LEFT;
+	case DIAGONAL_UP_RIGHT;
+	case FLOW;
+	case FLOWER;
+	case GLOBE;
+	case GRADIENT;
+	case GRADIENT_UP;
+	case GUSTER;
+	case HALF_HORIZONTAL;
+	case HALF_HORIZONTAL_BOTTOM;
+	case HALF_VERTICAL;
+	case HALF_VERTICAL_RIGHT;
+	case MOJANG;
+	case PIGLIN;
+	case RHOMBUS;
+	case SKULL;
+	case SMALL_STRIPES;
+	case SQUARE_BOTTOM_LEFT;
+	case SQUARE_BOTTOM_RIGHT;
+	case SQUARE_TOP_LEFT;
+	case SQUARE_TOP_RIGHT;
+	case STRAIGHT_CROSS;
+	case STRIPE_BOTTOM;
+	case STRIPE_CENTER;
+	case STRIPE_DOWNLEFT;
+	case STRIPE_DOWNRIGHT;
+	case STRIPE_LEFT;
+	case STRIPE_MIDDLE;
+	case STRIPE_RIGHT;
+	case STRIPE_TOP;
+	case TRIANGLE_BOTTOM;
+	case TRIANGLE_TOP;
+	case TRIANGLES_BOTTOM;
+	case TRIANGLES_TOP;
 }
diff --git a/src/block/utils/BellAttachmentType.php b/src/block/utils/BellAttachmentType.php
index 963257031b..29b88a2c40 100644
--- a/src/block/utils/BellAttachmentType.php
+++ b/src/block/utils/BellAttachmentType.php
@@ -23,28 +23,22 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static BellAttachmentType CEILING()
  * @method static BellAttachmentType FLOOR()
  * @method static BellAttachmentType ONE_WALL()
  * @method static BellAttachmentType TWO_WALLS()
  */
-final class BellAttachmentType{
-	use EnumTrait;
+enum BellAttachmentType{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("ceiling"),
-			new self("floor"),
-			new self("one_wall"),
-			new self("two_walls")
-		);
-	}
+	case CEILING;
+	case FLOOR;
+	case ONE_WALL;
+	case TWO_WALLS;
 }
diff --git a/src/block/utils/BlockDataSerializer.php b/src/block/utils/BlockDataSerializer.php
deleted file mode 100644
index 1d7ae28fae..0000000000
--- a/src/block/utils/BlockDataSerializer.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\block\utils;
-
-use pocketmine\math\Axis;
-use pocketmine\math\Facing;
-
-final class BlockDataSerializer{
-
-	private function __construct(){
-
-	}
-
-	/**
-	 * @throws InvalidBlockStateException
-	 */
-	public static function readFacing(int $raw) : int{
-		$result = [ //this is for redundancy, for when/if the FACING constant values change
-			0 => Facing::DOWN,
-			1 => Facing::UP,
-			2 => Facing::NORTH,
-			3 => Facing::SOUTH,
-			4 => Facing::WEST,
-			5 => Facing::EAST
-		][$raw] ?? null;
-		if($result === null){
-			throw new InvalidBlockStateException("Invalid facing $raw");
-		}
-		return $result;
-	}
-
-	public static function writeFacing(int $facing) : int{
-		$result = [ //again, for redundancy
-			Facing::DOWN => 0,
-			Facing::UP => 1,
-			Facing::NORTH => 2,
-			Facing::SOUTH => 3,
-			Facing::WEST => 4,
-			Facing::EAST => 5
-		][$facing] ?? null;
-		if($result === null){
-			throw new \InvalidArgumentException("Invalid facing $facing");
-		}
-		return $result;
-	}
-
-	/**
-	 * @throws InvalidBlockStateException
-	 */
-	public static function readHorizontalFacing(int $facing) : int{
-		$facing = self::readFacing($facing);
-		if(Facing::axis($facing) === Axis::Y){
-			throw new InvalidBlockStateException("Invalid Y-axis facing $facing");
-		}
-		return $facing;
-	}
-
-	public static function writeHorizontalFacing(int $facing) : int{
-		if(Facing::axis($facing) === Axis::Y){
-			throw new \InvalidArgumentException("Invalid Y-axis facing");
-		}
-		return self::writeFacing($facing);
-	}
-
-	/**
-	 * @throws InvalidBlockStateException
-	 */
-	public static function readLegacyHorizontalFacing(int $raw) : int{
-		$result = [ //again, for redundancy
-			0 => Facing::SOUTH,
-			1 => Facing::WEST,
-			2 => Facing::NORTH,
-			3 => Facing::EAST
-		][$raw] ?? null;
-		if($result === null){
-			throw new InvalidBlockStateException("Invalid legacy facing $raw");
-		}
-		return $result;
-	}
-
-	public static function writeLegacyHorizontalFacing(int $facing) : int{
-		$result = [
-			Facing::SOUTH => 0,
-			Facing::WEST => 1,
-			Facing::NORTH => 2,
-			Facing::EAST => 3
-		][$facing] ?? null;
-		if($result === null){
-			throw new \InvalidArgumentException("Invalid Y-axis facing");
-		}
-		return $result;
-	}
-
-	/**
-	 * @throws InvalidBlockStateException
-	 */
-	public static function read5MinusHorizontalFacing(int $value) : int{
-		return self::readHorizontalFacing(5 - ($value & 0x03));
-	}
-
-	public static function write5MinusHorizontalFacing(int $value) : int{
-		return 5 - self::writeHorizontalFacing($value);
-	}
-
-	public static function readCoralFacing(int $value) : int{
-		$result = [
-			0 => Facing::WEST,
-			1 => Facing::EAST,
-			2 => Facing::NORTH,
-			3 => Facing::SOUTH
-		][$value] ?? null;
-		if($result === null){
-			throw new InvalidBlockStateException("Invalid coral facing $value");
-		}
-		return $result;
-	}
-
-	public static function writeCoralFacing(int $value) : int{
-		$result = [
-			Facing::WEST => 0,
-			Facing::EAST => 1,
-			Facing::NORTH => 2,
-			Facing::SOUTH => 3
-		][$value] ?? null;
-		if($result === null){
-			throw new \InvalidArgumentException("Invalid Y-axis facing $value");
-		}
-		return $result;
-	}
-
-	public static function readBoundedInt(string $name, int $v, int $min, int $max) : int{
-		if($v < $min || $v > $max){
-			throw new InvalidBlockStateException("$name should be in range $min - $max, got $v");
-		}
-		return $v;
-	}
-}
diff --git a/src/block/utils/BlockEventHelper.php b/src/block/utils/BlockEventHelper.php
new file mode 100644
index 0000000000..fc9b06d13c
--- /dev/null
+++ b/src/block/utils/BlockEventHelper.php
@@ -0,0 +1,115 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\block\Block;
+use pocketmine\event\block\BlockDeathEvent;
+use pocketmine\event\block\BlockFormEvent;
+use pocketmine\event\block\BlockGrowEvent;
+use pocketmine\event\block\BlockMeltEvent;
+use pocketmine\event\block\BlockSpreadEvent;
+use pocketmine\player\Player;
+
+/**
+ * Helper class to call block changing events and apply the results to the world.
+ * TODO: try to further reduce the amount of code duplication here - while this is much better than before, it's still
+ * very repetitive.
+ */
+final class BlockEventHelper{
+
+	public static function grow(Block $oldState, Block $newState, ?Player $causingPlayer) : bool{
+		if(BlockGrowEvent::hasHandlers()){
+			$ev = new BlockGrowEvent($oldState, $newState, $causingPlayer);
+			$ev->call();
+			if($ev->isCancelled()){
+				return false;
+			}
+			$newState = $ev->getNewState();
+		}
+
+		$position = $oldState->getPosition();
+		$position->getWorld()->setBlock($position, $newState);
+		return true;
+	}
+
+	public static function spread(Block $oldState, Block $newState, Block $source) : bool{
+		if(BlockSpreadEvent::hasHandlers()){
+			$ev = new BlockSpreadEvent($oldState, $source, $newState);
+			$ev->call();
+			if($ev->isCancelled()){
+				return false;
+			}
+			$newState = $ev->getNewState();
+		}
+
+		$position = $oldState->getPosition();
+		$position->getWorld()->setBlock($position, $newState);
+		return true;
+	}
+
+	public static function form(Block $oldState, Block $newState, Block $cause) : bool{
+		if(BlockFormEvent::hasHandlers()){
+			$ev = new BlockFormEvent($oldState, $newState, $cause);
+			$ev->call();
+			if($ev->isCancelled()){
+				return false;
+			}
+			$newState = $ev->getNewState();
+		}
+
+		$position = $oldState->getPosition();
+		$position->getWorld()->setBlock($position, $newState);
+		return true;
+	}
+
+	public static function melt(Block $oldState, Block $newState) : bool{
+		if(BlockMeltEvent::hasHandlers()){
+			$ev = new BlockMeltEvent($oldState, $newState);
+			$ev->call();
+			if($ev->isCancelled()){
+				return false;
+			}
+			$newState = $ev->getNewState();
+		}
+
+		$position = $oldState->getPosition();
+		$position->getWorld()->setBlock($position, $newState);
+		return true;
+	}
+
+	public static function die(Block $oldState, Block $newState) : bool{
+		if(BlockDeathEvent::hasHandlers()){
+			$ev = new BlockDeathEvent($oldState, $newState);
+			$ev->call();
+			if($ev->isCancelled()){
+				return false;
+			}
+			$newState = $ev->getNewState();
+		}
+
+		$position = $oldState->getPosition();
+		$position->getWorld()->setBlock($position, $newState);
+		return true;
+	}
+}
diff --git a/src/block/utils/BrewingStandSlot.php b/src/block/utils/BrewingStandSlot.php
index faeeaa7c4a..21500b1c97 100644
--- a/src/block/utils/BrewingStandSlot.php
+++ b/src/block/utils/BrewingStandSlot.php
@@ -24,37 +24,31 @@ declare(strict_types=1);
 namespace pocketmine\block\utils;
 
 use pocketmine\block\inventory\BrewingStandInventory;
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static BrewingStandSlot EAST()
  * @method static BrewingStandSlot NORTHWEST()
  * @method static BrewingStandSlot SOUTHWEST()
  */
-final class BrewingStandSlot{
-	use EnumTrait {
-		__construct as Enum___construct;
-	}
+enum BrewingStandSlot{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("east", BrewingStandInventory::SLOT_BOTTLE_LEFT),
-			new self("northwest", BrewingStandInventory::SLOT_BOTTLE_MIDDLE),
-			new self("southwest", BrewingStandInventory::SLOT_BOTTLE_RIGHT)
-		);
-	}
-
-	private function __construct(string $enumName, private int $slotNumber){
-		$this->Enum___construct($enumName);
-	}
+	case EAST;
+	case NORTHWEST;
+	case SOUTHWEST;
 
 	/**
 	 * Returns the brewing stand inventory slot number associated with this visual slot.
 	 */
-	public function getSlotNumber() : int{ return $this->slotNumber; }
+	public function getSlotNumber() : int{
+		return match($this){
+			self::EAST => BrewingStandInventory::SLOT_BOTTLE_LEFT,
+			self::NORTHWEST => BrewingStandInventory::SLOT_BOTTLE_MIDDLE,
+			self::SOUTHWEST => BrewingStandInventory::SLOT_BOTTLE_RIGHT
+		};
+	}
 }
diff --git a/src/block/utils/CandleTrait.php b/src/block/utils/CandleTrait.php
new file mode 100644
index 0000000000..c9da97ee0c
--- /dev/null
+++ b/src/block/utils/CandleTrait.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\block\Block;
+use pocketmine\entity\projectile\Projectile;
+use pocketmine\item\Durable;
+use pocketmine\item\enchantment\VanillaEnchantments;
+use pocketmine\item\Item;
+use pocketmine\item\ItemTypeIds;
+use pocketmine\math\RayTraceResult;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\sound\BlazeShootSound;
+use pocketmine\world\sound\FireExtinguishSound;
+use pocketmine\world\sound\FlintSteelSound;
+
+trait CandleTrait{
+	use LightableTrait;
+
+	public function getLightLevel() : int{
+		return $this->lit ? 3 : 0;
+	}
+
+	/** @see Block::onInteract() */
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if($item->getTypeId() === ItemTypeIds::FIRE_CHARGE || $item->getTypeId() === ItemTypeIds::FLINT_AND_STEEL || $item->hasEnchantment(VanillaEnchantments::FIRE_ASPECT())){
+			if($this->lit){
+				return true;
+			}
+			if($item instanceof Durable){
+				$item->applyDamage(1);
+			}elseif($item->getTypeId() === ItemTypeIds::FIRE_CHARGE){
+				$item->pop();
+				//TODO: not sure if this is intentional, but it's what Bedrock currently does as of 1.20.10
+				$this->position->getWorld()->addSound($this->position, new BlazeShootSound());
+			}
+			$this->position->getWorld()->addSound($this->position, new FlintSteelSound());
+			$this->position->getWorld()->setBlock($this->position, $this->setLit(true));
+
+			return true;
+		}
+		if($item->isNull()){ //candle can only be extinguished with an empty hand
+			if(!$this->lit){
+				return true;
+			}
+			$this->position->getWorld()->addSound($this->position, new FireExtinguishSound());
+			$this->position->getWorld()->setBlock($this->position, $this->setLit(false));
+
+			return true;
+		}
+
+		//yes, this is intentional! in vanilla, if the candle is not interacted with, a block is placed.
+		return false;
+	}
+
+	/** @see Block::onProjectileHit() */
+	public function onProjectileHit(Projectile $projectile, RayTraceResult $hitResult) : void{
+		if(!$this->lit && $projectile->isOnFire()){
+			$this->position->getWorld()->setBlock($this->position, $this->setLit(true));
+		}
+	}
+}
diff --git a/src/block/utils/ChiseledBookshelfSlot.php b/src/block/utils/ChiseledBookshelfSlot.php
new file mode 100644
index 0000000000..b5a676bed2
--- /dev/null
+++ b/src/block/utils/ChiseledBookshelfSlot.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+enum ChiseledBookshelfSlot : int{
+	case TOP_LEFT = 0;
+	case TOP_MIDDLE = 1;
+	case TOP_RIGHT = 2;
+	case BOTTOM_LEFT = 3;
+	case BOTTOM_MIDDLE = 4;
+	case BOTTOM_RIGHT = 5;
+
+	private const SLOTS_PER_SHELF = 3;
+
+	public static function fromBlockFaceCoordinates(float $x, float $y) : self{
+		if($x < 0 || $x > 1){
+			throw new \InvalidArgumentException("X must be between 0 and 1, got $x");
+		}
+		if($y < 0 || $y > 1){
+			throw new \InvalidArgumentException("Y must be between 0 and 1, got $y");
+		}
+
+		$slot = ($y < 0.5 ? self::SLOTS_PER_SHELF : 0) + match(true){
+			//we can't use simple maths here as the action is aligned to the 16x16 pixel grid :(
+			$x < 6 / 16 => 0,
+			$x < 11 / 16 => 1,
+			default => 2
+		};
+
+		return self::from($slot);
+	}
+}
diff --git a/src/block/utils/ColorInMetadataTrait.php b/src/block/utils/ColorInMetadataTrait.php
deleted file mode 100644
index 232db837f0..0000000000
--- a/src/block/utils/ColorInMetadataTrait.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\block\utils;
-
-use pocketmine\block\Block;
-use pocketmine\data\bedrock\DyeColorIdMap;
-
-trait ColorInMetadataTrait{
-	use ColoredTrait;
-
-	/**
-	 * @see Block::readStateFromData()
-	 */
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$color = DyeColorIdMap::getInstance()->fromId($stateMeta);
-		if($color === null){
-			throw new InvalidBlockStateException("No dye colour corresponds to ID $stateMeta");
-		}
-		$this->color = $color;
-	}
-
-	/**
-	 * @see Block::writeStateToMeta()
-	 */
-	protected function writeStateToMeta() : int{
-		return DyeColorIdMap::getInstance()->toId($this->color);
-	}
-
-	/**
-	 * @see Block::writeStateToItemMeta()
-	 */
-	protected function writeStateToItemMeta() : int{
-		return DyeColorIdMap::getInstance()->toId($this->color);
-	}
-
-	/**
-	 * @see Block::getStateBitmask()
-	 */
-	public function getStateBitmask() : int{
-		return 0b1111;
-	}
-}
diff --git a/src/block/utils/ColoredTrait.php b/src/block/utils/ColoredTrait.php
index 3ed323ca34..2ecd58e203 100644
--- a/src/block/utils/ColoredTrait.php
+++ b/src/block/utils/ColoredTrait.php
@@ -23,9 +23,17 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
+use pocketmine\block\Block;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+
 trait ColoredTrait{
 	/** @var DyeColor */
-	private $color;
+	private $color = DyeColor::WHITE;
+
+	/** @see Block::describeBlockItemState() */
+	public function describeBlockItemState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->color);
+	}
 
 	public function getColor() : DyeColor{ return $this->color; }
 
diff --git a/src/block/utils/CopperMaterial.php b/src/block/utils/CopperMaterial.php
new file mode 100644
index 0000000000..6df22620b7
--- /dev/null
+++ b/src/block/utils/CopperMaterial.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+/**
+ * Represents copper blocks that have oxidized and waxed variations.
+ */
+interface CopperMaterial{
+
+	public function getOxidation() : CopperOxidation;
+
+	public function setOxidation(CopperOxidation $oxidation) : CopperMaterial;
+
+	public function isWaxed() : bool;
+
+	public function setWaxed(bool $waxed) : CopperMaterial;
+}
diff --git a/src/block/utils/CopperOxidation.php b/src/block/utils/CopperOxidation.php
new file mode 100644
index 0000000000..ba9abeaed3
--- /dev/null
+++ b/src/block/utils/CopperOxidation.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\utils\LegacyEnumShimTrait;
+
+/**
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
+ *
+ * @method static CopperOxidation EXPOSED()
+ * @method static CopperOxidation NONE()
+ * @method static CopperOxidation OXIDIZED()
+ * @method static CopperOxidation WEATHERED()
+ */
+enum CopperOxidation : int{
+	use LegacyEnumShimTrait;
+
+	case NONE = 0;
+	case EXPOSED = 1;
+	case WEATHERED = 2;
+	case OXIDIZED = 3;
+
+	public function getPrevious() : ?self{
+		return self::tryFrom($this->value - 1);
+	}
+
+	public function getNext() : ?self{
+		return self::tryFrom($this->value + 1);
+	}
+}
diff --git a/src/block/utils/CopperTrait.php b/src/block/utils/CopperTrait.php
new file mode 100644
index 0000000000..5ad8aa82d1
--- /dev/null
+++ b/src/block/utils/CopperTrait.php
@@ -0,0 +1,94 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\item\Axe;
+use pocketmine\item\Item;
+use pocketmine\item\ItemTypeIds;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\sound\CopperWaxApplySound;
+use pocketmine\world\sound\CopperWaxRemoveSound;
+use pocketmine\world\sound\ScrapeSound;
+
+trait CopperTrait{
+	private CopperOxidation $oxidation = CopperOxidation::NONE;
+	private bool $waxed = false;
+
+	public function describeBlockItemState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->oxidation);
+		$w->bool($this->waxed);
+	}
+
+	public function getOxidation() : CopperOxidation{ return $this->oxidation; }
+
+	/** @return $this */
+	public function setOxidation(CopperOxidation $oxidation) : self{
+		$this->oxidation = $oxidation;
+		return $this;
+	}
+
+	public function isWaxed() : bool{ return $this->waxed; }
+
+	/** @return $this */
+	public function setWaxed(bool $waxed) : self{
+		$this->waxed = $waxed;
+		return $this;
+	}
+
+	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
+		if(!$this->waxed && $item->getTypeId() === ItemTypeIds::HONEYCOMB){
+			$this->waxed = true;
+			$this->position->getWorld()->setBlock($this->position, $this);
+			//TODO: orange particles are supposed to appear when applying wax
+			$this->position->getWorld()->addSound($this->position, new CopperWaxApplySound());
+			$item->pop();
+			return true;
+		}
+
+		if($item instanceof Axe){
+			if($this->waxed){
+				$this->waxed = false;
+				$this->position->getWorld()->setBlock($this->position, $this);
+				//TODO: white particles are supposed to appear when removing wax
+				$this->position->getWorld()->addSound($this->position, new CopperWaxRemoveSound());
+				$item->applyDamage(1);
+				return true;
+			}
+
+			$previousOxidation = $this->oxidation->getPrevious();
+			if($previousOxidation !== null){
+				$this->oxidation = $previousOxidation;
+				$this->position->getWorld()->setBlock($this->position, $this);
+				//TODO: turquoise particles are supposed to appear when removing oxidation
+				$this->position->getWorld()->addSound($this->position, new ScrapeSound());
+				$item->applyDamage(1);
+				return true;
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/src/block/utils/CoralType.php b/src/block/utils/CoralType.php
index 5a4d88fa9c..cba3e8ddee 100644
--- a/src/block/utils/CoralType.php
+++ b/src/block/utils/CoralType.php
@@ -23,13 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static CoralType BRAIN()
  * @method static CoralType BUBBLE()
@@ -37,27 +35,22 @@ use pocketmine\utils\EnumTrait;
  * @method static CoralType HORN()
  * @method static CoralType TUBE()
  */
-final class CoralType{
-	use EnumTrait {
-		__construct as Enum___construct;
-	}
+enum CoralType{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("tube", "Tube"),
-			new self("brain", "Brain"),
-			new self("bubble", "Bubble"),
-			new self("fire", "Fire"),
-			new self("horn", "Horn"),
-		);
-	}
+	case TUBE;
+	case BRAIN;
+	case BUBBLE;
+	case FIRE;
+	case HORN;
 
-	private function __construct(
-		string $name,
-		private string $displayName
-	){
-		$this->Enum___construct($name);
+	public function getDisplayName() : string{
+		return match($this){
+			self::TUBE => "Tube",
+			self::BRAIN => "Brain",
+			self::BUBBLE => "Bubble",
+			self::FIRE => "Fire",
+			self::HORN => "Horn",
+		};
 	}
-
-	public function getDisplayName() : string{ return $this->displayName; }
 }
diff --git a/src/block/utils/CoralTypeTrait.php b/src/block/utils/CoralTypeTrait.php
index afeac309c0..a335bf9ecc 100644
--- a/src/block/utils/CoralTypeTrait.php
+++ b/src/block/utils/CoralTypeTrait.php
@@ -23,11 +23,19 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-trait CoralTypeTrait{
+use pocketmine\block\Block;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 
-	protected CoralType $coralType;
+trait CoralTypeTrait{
+	protected CoralType $coralType = CoralType::TUBE;
 	protected bool $dead = false;
 
+	/** @see Block::describeBlockItemState() */
+	public function describeBlockItemState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->coralType);
+		$w->bool($this->dead);
+	}
+
 	public function getCoralType() : CoralType{ return $this->coralType; }
 
 	/** @return $this */
diff --git a/src/block/utils/CropGrowthHelper.php b/src/block/utils/CropGrowthHelper.php
new file mode 100644
index 0000000000..e85b0b82d3
--- /dev/null
+++ b/src/block/utils/CropGrowthHelper.php
@@ -0,0 +1,120 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\block\Block;
+use pocketmine\block\Farmland;
+use function mt_rand;
+
+final class CropGrowthHelper{
+
+	private const ON_HYDRATED_FARMLAND_BONUS = 3;
+	private const ON_DRY_FARMLAND_BONUS = 1;
+	private const ADJACENT_HYDRATED_FARMLAND_BONUS = 3 / 4;
+	private const ADJACENT_DRY_FARMLAND_BONUS = 1 / 4;
+
+	private const IMPROPER_ARRANGEMENT_DIVISOR = 2;
+
+	private const MIN_LIGHT_LEVEL = 9;
+
+	private function __construct(){
+		//NOOP
+	}
+
+	/**
+	 * Returns the speed at which this crop will grow, depending on its surroundings.
+	 * The default is once every 26 random ticks.
+	 *
+	 * Things which influence this include nearby farmland (bonus for hydrated farmland) and the position of other
+	 * nearby crops of the same type (nearby crops of the same type will negatively influence growth speed unless
+	 * planted in rows and properly spaced apart).
+	 */
+	public static function calculateMultiplier(Block $block) : float{
+		$result = 1;
+
+		$position = $block->getPosition();
+
+		$world = $position->getWorld();
+		$baseX = $position->getFloorX();
+		$baseY = $position->getFloorY();
+		$baseZ = $position->getFloorZ();
+
+		$farmland = $world->getBlockAt($baseX, $baseY - 1, $baseZ);
+
+		if($farmland instanceof Farmland){
+			$result += $farmland->getWetness() > 0 ? self::ON_HYDRATED_FARMLAND_BONUS : self::ON_DRY_FARMLAND_BONUS;
+		}
+
+		$xRow = false;
+		$zRow = false;
+		$improperArrangement = false;
+
+		for($x = -1; $x <= 1; $x++){
+			for($z = -1; $z <= 1; $z++){
+				if($x === 0 && $z === 0){
+					continue;
+				}
+				$nextFarmland = $world->getBlockAt($baseX + $x, $baseY - 1, $baseZ + $z);
+
+				if(!$nextFarmland instanceof Farmland){
+					continue;
+				}
+
+				$result += $nextFarmland->getWetness() > 0 ? self::ADJACENT_HYDRATED_FARMLAND_BONUS : self::ADJACENT_DRY_FARMLAND_BONUS;
+
+				if(!$improperArrangement){
+					$nextCrop = $world->getBlockAt($baseX + $x, $baseY, $baseZ + $z);
+					if($nextCrop->hasSameTypeId($block)){
+						match(0){
+							$x => $zRow ? $improperArrangement = true : $xRow = true,
+							$z => $xRow ? $improperArrangement = true : $zRow = true,
+							default => $improperArrangement = true,
+						};
+					}
+				}
+			}
+		}
+
+		//crops can be arranged in rows, but the rows must not cross and must be spaced apart by at least one block
+		if($improperArrangement){
+			$result /= self::IMPROPER_ARRANGEMENT_DIVISOR;
+		}
+
+		return $result;
+	}
+
+	public static function hasEnoughLight(Block $block, int $minLevel = self::MIN_LIGHT_LEVEL) : bool{
+		$position = $block->getPosition();
+		$world = $position->getWorld();
+
+		//crop growth is not affected by time of day since 1.11 or so
+		return $world->getPotentialLightAt($position->x, $position->y, $position->z) >= $minLevel;
+	}
+
+	public static function canGrow(Block $block) : bool{
+		//while it may be tempting to use mt_rand(0, 25) < multiplier, this would make crops grow a bit faster than
+		//vanilla in most cases due to the remainder of 25 / multiplier not being discarded
+		return mt_rand(0, (int) (25 / self::calculateMultiplier($block))) === 0 && self::hasEnoughLight($block);
+	}
+}
diff --git a/src/block/utils/DirtType.php b/src/block/utils/DirtType.php
new file mode 100644
index 0000000000..9bed30d1c5
--- /dev/null
+++ b/src/block/utils/DirtType.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\utils\LegacyEnumShimTrait;
+
+/**
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
+ *
+ * @method static DirtType COARSE()
+ * @method static DirtType NORMAL()
+ * @method static DirtType ROOTED()
+ */
+enum DirtType{
+	use LegacyEnumShimTrait;
+
+	case NORMAL;
+	case COARSE;
+	case ROOTED;
+}
diff --git a/src/block/utils/DripleafState.php b/src/block/utils/DripleafState.php
new file mode 100644
index 0000000000..4b0cedce7e
--- /dev/null
+++ b/src/block/utils/DripleafState.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\utils\LegacyEnumShimTrait;
+
+/**
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
+ *
+ * @method static DripleafState FULL_TILT()
+ * @method static DripleafState PARTIAL_TILT()
+ * @method static DripleafState STABLE()
+ * @method static DripleafState UNSTABLE()
+ */
+enum DripleafState{
+	use LegacyEnumShimTrait;
+
+	case STABLE;
+	case UNSTABLE;
+	case PARTIAL_TILT;
+	case FULL_TILT;
+
+	public function getScheduledUpdateDelayTicks() : ?int{
+		return match($this){
+			self::STABLE => null,
+			self::UNSTABLE, self::PARTIAL_TILT => 10,
+			self::FULL_TILT => 100,
+		};
+	}
+}
diff --git a/src/block/utils/DyeColor.php b/src/block/utils/DyeColor.php
index 81c51618a0..5b205eda5e 100644
--- a/src/block/utils/DyeColor.php
+++ b/src/block/utils/DyeColor.php
@@ -24,13 +24,12 @@ declare(strict_types=1);
 namespace pocketmine\block\utils;
 
 use pocketmine\color\Color;
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
+use function spl_object_id;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static DyeColor BLACK()
  * @method static DyeColor BLUE()
@@ -48,46 +47,70 @@ use pocketmine\utils\EnumTrait;
  * @method static DyeColor RED()
  * @method static DyeColor WHITE()
  * @method static DyeColor YELLOW()
+ *
+ * @phpstan-type TMetadata array{0: string, 1: Color}
  */
-final class DyeColor{
-	use EnumTrait {
-		__construct as Enum___construct;
+enum DyeColor{
+	use LegacyEnumShimTrait;
+
+	case WHITE;
+	case ORANGE;
+	case MAGENTA;
+	case LIGHT_BLUE;
+	case YELLOW;
+	case LIME;
+	case PINK;
+	case GRAY;
+	case LIGHT_GRAY;
+	case CYAN;
+	case PURPLE;
+	case BLUE;
+	case BROWN;
+	case GREEN;
+	case RED;
+	case BLACK;
+
+	/**
+	 * This function exists only to permit the use of named arguments and to make the code easier to read in PhpStorm.
+	 *
+	 * @phpstan-return TMetadata
+	 */
+	private static function meta(string $displayName, Color $rgbValue) : array{
+		return [$displayName, $rgbValue];
 	}
 
-	protected static function setup() : void{
-		self::registerAll(
-			new DyeColor("white", "White", new Color(0xf0, 0xf0, 0xf0)),
-			new DyeColor("orange", "Orange", new Color(0xf9, 0x80, 0x1d)),
-			new DyeColor("magenta", "Magenta", new Color(0xc7, 0x4e, 0xbd)),
-			new DyeColor("light_blue", "Light Blue", new Color(0x3a, 0xb3, 0xda)),
-			new DyeColor("yellow", "Yellow", new Color(0xfe, 0xd8, 0x3d)),
-			new DyeColor("lime", "Lime", new Color(0x80, 0xc7, 0x1f)),
-			new DyeColor("pink", "Pink", new Color(0xf3, 0x8b, 0xaa)),
-			new DyeColor("gray", "Gray", new Color(0x47, 0x4f, 0x52)),
-			new DyeColor("light_gray", "Light Gray", new Color(0x9d, 0x9d, 0x97)),
-			new DyeColor("cyan", "Cyan", new Color(0x16, 0x9c, 0x9c)),
-			new DyeColor("purple", "Purple", new Color(0x89, 0x32, 0xb8)),
-			new DyeColor("blue", "Blue", new Color(0x3c, 0x44, 0xaa)),
-			new DyeColor("brown", "Brown", new Color(0x83, 0x54, 0x32)),
-			new DyeColor("green", "Green", new Color(0x5e, 0x7c, 0x16)),
-			new DyeColor("red", "Red", new Color(0xb0, 0x2e, 0x26)),
-			new DyeColor("black", "Black", new Color(0x1d, 0x1d, 0x21))
-		);
-	}
+	/**
+	 * @phpstan-return TMetadata
+	 */
+	private function getMetadata() : array{
+		/** @phpstan-var array<int, TMetadata> $cache */
+		static $cache = [];
 
-	private function __construct(
-		string $enumName,
-		private string $displayName,
-		private Color $rgbValue
-	){
-		$this->Enum___construct($enumName);
+		return $cache[spl_object_id($this)] ??= match($this){
+			self::WHITE => self::meta("White", new Color(0xf0, 0xf0, 0xf0)),
+			self::ORANGE => self::meta("Orange", new Color(0xf9, 0x80, 0x1d)),
+			self::MAGENTA => self::meta("Magenta", new Color(0xc7, 0x4e, 0xbd)),
+			self::LIGHT_BLUE => self::meta("Light Blue", new Color(0x3a, 0xb3, 0xda)),
+			self::YELLOW => self::meta("Yellow", new Color(0xfe, 0xd8, 0x3d)),
+			self::LIME => self::meta("Lime", new Color(0x80, 0xc7, 0x1f)),
+			self::PINK => self::meta("Pink", new Color(0xf3, 0x8b, 0xaa)),
+			self::GRAY => self::meta("Gray", new Color(0x47, 0x4f, 0x52)),
+			self::LIGHT_GRAY => self::meta("Light Gray", new Color(0x9d, 0x9d, 0x97)),
+			self::CYAN => self::meta("Cyan", new Color(0x16, 0x9c, 0x9c)),
+			self::PURPLE => self::meta("Purple", new Color(0x89, 0x32, 0xb8)),
+			self::BLUE => self::meta("Blue", new Color(0x3c, 0x44, 0xaa)),
+			self::BROWN => self::meta("Brown", new Color(0x83, 0x54, 0x32)),
+			self::GREEN => self::meta("Green", new Color(0x5e, 0x7c, 0x16)),
+			self::RED => self::meta("Red", new Color(0xb0, 0x2e, 0x26)),
+			self::BLACK => self::meta("Black", new Color(0x1d, 0x1d, 0x21)),
+		};
 	}
 
 	public function getDisplayName() : string{
-		return $this->displayName;
+		return $this->getMetadata()[0];
 	}
 
 	public function getRgbValue() : Color{
-		return $this->rgbValue;
+		return $this->getMetadata()[1];
 	}
 }
diff --git a/src/block/utils/Fallable.php b/src/block/utils/Fallable.php
index 2f191f1c2d..8f0dbc8348 100644
--- a/src/block/utils/Fallable.php
+++ b/src/block/utils/Fallable.php
@@ -24,6 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\block\utils;
 
 use pocketmine\block\Block;
+use pocketmine\entity\object\FallingBlock;
+use pocketmine\world\sound\Sound;
 
 interface Fallable{
 
@@ -33,4 +35,27 @@ interface Fallable{
 	 * Return null if you don't want to change the usual behaviour.
 	 */
 	public function tickFalling() : ?Block;
+
+	/**
+	 * Called when FallingBlock hits the ground.
+	 * Returns whether the block should be placed.
+	 */
+	public function onHitGround(FallingBlock $blockEntity) : bool;
+
+	/**
+	 * Returns the damage caused per fallen block. This is multiplied by the fall distance (and capped according to
+	 * {@link Fallable::getMaxFallDamage()}) to calculate the damage dealt to any entities who intersect with the block
+	 * when it hits the ground.
+	 */
+	public function getFallDamagePerBlock() : float;
+
+	/**
+	 * Returns the maximum damage the block can deal to an entity when it hits the ground.
+	 */
+	public function getMaxFallDamage() : float;
+
+	/**
+	 * Returns the sound that will be played when FallingBlock hits the ground.
+	 */
+	public function getLandSound() : ?Sound;
 }
diff --git a/src/block/utils/FallableTrait.php b/src/block/utils/FallableTrait.php
index 3d7e122140..f062792efa 100644
--- a/src/block/utils/FallableTrait.php
+++ b/src/block/utils/FallableTrait.php
@@ -30,6 +30,7 @@ use pocketmine\entity\object\FallingBlock;
 use pocketmine\math\Facing;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\world\Position;
+use pocketmine\world\sound\Sound;
 
 /**
  * This trait handles falling behaviour for blocks that need them.
@@ -40,10 +41,6 @@ trait FallableTrait{
 
 	abstract protected function getPosition() : Position;
 
-	abstract protected function getId() : int;
-
-	abstract protected function getMeta() : int;
-
 	public function onNearbyBlockChange() : void{
 		$pos = $this->getPosition();
 		$world = $pos->getWorld();
@@ -58,4 +55,24 @@ trait FallableTrait{
 			$fall->spawnToAll();
 		}
 	}
+
+	public function tickFalling() : ?Block{
+		return null;
+	}
+
+	public function onHitGround(FallingBlock $blockEntity) : bool{
+		return true;
+	}
+
+	public function getFallDamagePerBlock() : float{
+		return 0.0;
+	}
+
+	public function getMaxFallDamage() : float{
+		return 0.0;
+	}
+
+	public function getLandSound() : ?Sound{
+		return null;
+	}
 }
diff --git a/src/block/utils/FortuneDropHelper.php b/src/block/utils/FortuneDropHelper.php
new file mode 100644
index 0000000000..4cf9b0249d
--- /dev/null
+++ b/src/block/utils/FortuneDropHelper.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\block\utils;
+
+use pocketmine\item\enchantment\VanillaEnchantments;
+use pocketmine\item\Item;
+use function max;
+use function min;
+use function mt_getrandmax;
+use function mt_rand;
+
+final class FortuneDropHelper{
+	/**
+	 * If a random number between 0-1 is greater than 2/(level+2), this multiplies the max drop amount by level+1, and
+	 * picks a random amount between the minimum and multiplied maximum. Each level of fortune increases the chance of
+	 * fortune activation, and also increases the maximum drop limit when activated.
+	 *
+	 * Otherwise, returns a random amount of the item between the minimum and original maximum.
+	 *
+	 * @param Item $usedItem The item used to break the block
+	 * @param int  $min      Minimum amount
+	 * @param int  $maxBase  Maximum amount, as if fortune level was 0
+	 *
+	 * @return int the number of items to drop
+	 */
+	public static function weighted(Item $usedItem, int $min, int $maxBase) : int{
+		if($maxBase < $min){
+			throw new \InvalidArgumentException("Maximum drop amount must be greater than or equal to minimum drop amount");
+		}
+
+		$fortuneLevel = $usedItem->getEnchantmentLevel(VanillaEnchantments::FORTUNE());
+
+		return mt_rand($min,
+			$fortuneLevel > 0 && mt_rand() / mt_getrandmax() > 2 / ($fortuneLevel + 2) ?
+				$maxBase * ($fortuneLevel + 1) :
+				$maxBase
+		);
+	}
+
+	/**
+	 * Increases the drop amount according to a binomial distribution. The function will roll maxBase+level times, and add 1
+	 * if a random number between 0-1 is less than the given probability. Each level of fortune adds one extra roll.
+	 *
+	 * As many as maxBase+level items can be dropped. This applies even if the fortune level is 0.
+	 *
+	 * @param float $chance   The chance of adding 1 to the amount for each roll, must be in the range 0-1
+	 * @param int   $min      Minimum amount
+	 * @param int   $minRolls Number of rolls if fortune level is 0, added to fortune level to calculate total rolls
+	 *
+	 * @return int the number of items to drop
+	 */
+	public static function binomial(Item $usedItem, int $min, int $minRolls = 3, float $chance = 4 / 7) : int{
+		$fortuneLevel = $usedItem->getEnchantmentLevel(VanillaEnchantments::FORTUNE());
+
+		$count = $min;
+		$rolls = $minRolls + $fortuneLevel;
+		for($i = 0; $i < $rolls; ++$i){
+			if(mt_rand() / mt_getrandmax() < $chance){
+				++$count;
+			}
+		}
+
+		return $count;
+	}
+
+	/**
+	 * Adds the fortune level to the base max and picks a random number between the minimim and adjusted maximum.
+	 * Each amount in the range has an equal chance of being picked.
+	 *
+	 * @param int $maxBase Maximum base amount, as if the fortune level was 0
+	 *
+	 * @return int the number of items to drop
+	 */
+	public static function discrete(Item $usedItem, int $min, int $maxBase) : int{
+		if($maxBase < $min){
+			throw new \InvalidArgumentException("Minimum base drop amount must be less than or equal to maximum base drop amount");
+		}
+
+		$max = $maxBase + $usedItem->getEnchantmentLevel(VanillaEnchantments::FORTUNE());
+		return mt_rand($min, $max);
+	}
+
+	/**
+	 * Calculates a chance of getting an extra bonus drop by reducing the chance divisor by a given amount per fortune
+	 * level.
+	 *
+	 * @param int $divisorBase             The number to divide 1 by to get the chance, as if the fortune level was 0
+	 * @param int $divisorSubtractPerLevel The amount to subtract from the divisor for each level of fortune
+	 *
+	 * @return bool whether the bonus drop should be added
+	 */
+	public static function bonusChanceDivisor(Item $usedItem, int $divisorBase, int $divisorSubtractPerLevel) : bool{
+		$fortuneLevel = $usedItem->getEnchantmentLevel(VanillaEnchantments::FORTUNE());
+		return mt_rand(1, max(1, $divisorBase - ($fortuneLevel * $divisorSubtractPerLevel))) === 1;
+	}
+
+	/**
+	 * Calculates a chance of getting an extra bonus drop by increasing the chance by a fixed amount per fortune level.
+	 *
+	 * @param float $chanceBase          The base chance of getting a bonus drop, as if the fortune level was 0
+	 * @param float $addedChancePerLevel The amount to add to the chance for each level of fortune
+	 */
+	public static function bonusChanceFixed(Item $usedItem, float $chanceBase, float $addedChancePerLevel) : bool{
+		$fortuneLevel = $usedItem->getEnchantmentLevel(VanillaEnchantments::FORTUNE());
+		$chance = min(1, $chanceBase + ($fortuneLevel * $addedChancePerLevel));
+		return mt_rand() / mt_getrandmax() < $chance;
+	}
+}
diff --git a/src/block/utils/FroglightType.php b/src/block/utils/FroglightType.php
new file mode 100644
index 0000000000..ab20d31ac5
--- /dev/null
+++ b/src/block/utils/FroglightType.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\utils\LegacyEnumShimTrait;
+
+/**
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
+ *
+ * @method static FroglightType OCHRE()
+ * @method static FroglightType PEARLESCENT()
+ * @method static FroglightType VERDANT()
+ */
+enum FroglightType{
+	use LegacyEnumShimTrait;
+
+	case OCHRE;
+	case PEARLESCENT;
+	case VERDANT;
+}
diff --git a/src/block/utils/HorizontalFacingTrait.php b/src/block/utils/HorizontalFacingTrait.php
index 21f1cc007b..a5bd6dcf4d 100644
--- a/src/block/utils/HorizontalFacingTrait.php
+++ b/src/block/utils/HorizontalFacingTrait.php
@@ -23,12 +23,16 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
 
 trait HorizontalFacingTrait{
-	/** @var int */
-	protected $facing = Facing::NORTH;
+	protected int $facing = Facing::NORTH;
+
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->horizontalFacing($this->facing);
+	}
 
 	public function getFacing() : int{ return $this->facing; }
 
diff --git a/src/block/utils/LeavesType.php b/src/block/utils/LeavesType.php
new file mode 100644
index 0000000000..975551ad6d
--- /dev/null
+++ b/src/block/utils/LeavesType.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\utils\LegacyEnumShimTrait;
+
+/**
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
+ *
+ * @method static LeavesType ACACIA()
+ * @method static LeavesType AZALEA()
+ * @method static LeavesType BIRCH()
+ * @method static LeavesType CHERRY()
+ * @method static LeavesType DARK_OAK()
+ * @method static LeavesType FLOWERING_AZALEA()
+ * @method static LeavesType JUNGLE()
+ * @method static LeavesType MANGROVE()
+ * @method static LeavesType OAK()
+ * @method static LeavesType SPRUCE()
+ */
+enum LeavesType{
+	use LegacyEnumShimTrait;
+
+	case OAK;
+	case SPRUCE;
+	case BIRCH;
+	case JUNGLE;
+	case ACACIA;
+	case DARK_OAK;
+	case MANGROVE;
+	case AZALEA;
+	case FLOWERING_AZALEA;
+	case CHERRY;
+
+	public function getDisplayName() : string{
+		return match($this){
+			self::OAK => "Oak",
+			self::SPRUCE => "Spruce",
+			self::BIRCH => "Birch",
+			self::JUNGLE => "Jungle",
+			self::ACACIA => "Acacia",
+			self::DARK_OAK => "Dark Oak",
+			self::MANGROVE => "Mangrove",
+			self::AZALEA => "Azalea",
+			self::FLOWERING_AZALEA => "Flowering Azalea",
+			self::CHERRY => "Cherry"
+		};
+	}
+}
diff --git a/src/block/utils/LeverFacing.php b/src/block/utils/LeverFacing.php
index 99eeb88d30..1af92d6c4c 100644
--- a/src/block/utils/LeverFacing.php
+++ b/src/block/utils/LeverFacing.php
@@ -24,13 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\block\utils;
 
 use pocketmine\math\Facing;
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static LeverFacing DOWN_AXIS_X()
  * @method static LeverFacing DOWN_AXIS_Z()
@@ -41,27 +39,26 @@ use pocketmine\utils\EnumTrait;
  * @method static LeverFacing UP_AXIS_Z()
  * @method static LeverFacing WEST()
  */
-final class LeverFacing{
-	use EnumTrait {
-		__construct as Enum___construct;
-	}
+enum LeverFacing{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("up_axis_x", Facing::UP),
-			new self("up_axis_z", Facing::UP),
-			new self("down_axis_x", Facing::DOWN),
-			new self("down_axis_z", Facing::DOWN),
-			new self("north", Facing::NORTH),
-			new self("east", Facing::EAST),
-			new self("south", Facing::SOUTH),
-			new self("west", Facing::WEST),
-		);
-	}
+	case UP_AXIS_X;
+	case UP_AXIS_Z;
+	case DOWN_AXIS_X;
+	case DOWN_AXIS_Z;
+	case NORTH;
+	case EAST;
+	case SOUTH;
+	case WEST;
 
-	private function __construct(string $enumName, private int $facing){
-		$this->Enum___construct($enumName);
+	public function getFacing() : int{
+		return match($this){
+			self::UP_AXIS_X, self::UP_AXIS_Z => Facing::UP,
+			self::DOWN_AXIS_X, self::DOWN_AXIS_Z => Facing::DOWN,
+			self::NORTH => Facing::NORTH,
+			self::EAST => Facing::EAST,
+			self::SOUTH => Facing::SOUTH,
+			self::WEST => Facing::WEST,
+		};
 	}
-
-	public function getFacing() : int{ return $this->facing; }
 }
diff --git a/src/block/utils/NormalHorizontalFacingInMetadataTrait.php b/src/block/utils/LightableTrait.php
similarity index 67%
rename from src/block/utils/NormalHorizontalFacingInMetadataTrait.php
rename to src/block/utils/LightableTrait.php
index f41efd98a7..51ce54f42c 100644
--- a/src/block/utils/NormalHorizontalFacingInMetadataTrait.php
+++ b/src/block/utils/LightableTrait.php
@@ -23,18 +23,24 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-trait NormalHorizontalFacingInMetadataTrait{
-	use HorizontalFacingTrait;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 
-	protected function writeStateToMeta() : int{
-		return BlockDataSerializer::writeHorizontalFacing($this->facing);
+trait LightableTrait{
+	protected bool $lit = false;
+
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->bool($this->lit);
 	}
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->facing = BlockDataSerializer::readHorizontalFacing($stateMeta);
+	public function isLit() : bool{
+		return $this->lit;
 	}
 
-	public function getStateBitmask() : int{
-		return 0b111;
+	/**
+	 * @return $this
+	 */
+	public function setLit(bool $lit = true) : self{
+		$this->lit = $lit;
+		return $this;
 	}
 }
diff --git a/src/block/utils/MinimumCostFlowCalculator.php b/src/block/utils/MinimumCostFlowCalculator.php
index 84b003bbd1..a690a74870 100644
--- a/src/block/utils/MinimumCostFlowCalculator.php
+++ b/src/block/utils/MinimumCostFlowCalculator.php
@@ -58,17 +58,10 @@ final class MinimumCostFlowCalculator{
 			if($j === $originOpposite || $j === $lastOpposite){
 				continue;
 			}
-
-			$x = $blockX;
-			$y = $blockY;
-			$z = $blockZ;
-
-			match($j){
-				Facing::WEST => --$x,
-				Facing::EAST => ++$x,
-				Facing::NORTH => --$z,
-				Facing::SOUTH => ++$z
-			};
+			[$dx, $dy, $dz] = Facing::OFFSET[$j];
+			$x = $blockX + $dx;
+			$y = $blockY + $dy;
+			$z = $blockZ + $dz;
 
 			if(!isset($this->flowCostVisited[$hash = World::blockHash($x, $y, $z)])){
 				if(!$this->world->isInWorld($x, $y, $z) || !$this->canFlowInto($this->world->getBlockAt($x, $y, $z))){
@@ -109,16 +102,10 @@ final class MinimumCostFlowCalculator{
 		$flowCost = array_fill_keys(Facing::HORIZONTAL, 1000);
 		$maxCost = intdiv(4, $this->flowDecayPerBlock);
 		foreach(Facing::HORIZONTAL as $j){
-			$x = $originX;
-			$y = $originY;
-			$z = $originZ;
-
-			match($j){
-				Facing::WEST => --$x,
-				Facing::EAST => ++$x,
-				Facing::NORTH => --$z,
-				Facing::SOUTH => ++$z
-			};
+			[$dx, $dy, $dz] = Facing::OFFSET[$j];
+			$x = $originX + $dx;
+			$y = $originY + $dy;
+			$z = $originZ + $dz;
 
 			if(!$this->world->isInWorld($x, $y, $z) || !$this->canFlowInto($this->world->getBlockAt($x, $y, $z))){
 				$this->flowCostVisited[World::blockHash($x, $y, $z)] = self::BLOCKED;
diff --git a/src/block/utils/MobHeadType.php b/src/block/utils/MobHeadType.php
new file mode 100644
index 0000000000..af1fe1c4c2
--- /dev/null
+++ b/src/block/utils/MobHeadType.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\utils\LegacyEnumShimTrait;
+
+/**
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
+ *
+ * @method static MobHeadType CREEPER()
+ * @method static MobHeadType DRAGON()
+ * @method static MobHeadType PIGLIN()
+ * @method static MobHeadType PLAYER()
+ * @method static MobHeadType SKELETON()
+ * @method static MobHeadType WITHER_SKELETON()
+ * @method static MobHeadType ZOMBIE()
+ */
+enum MobHeadType{
+	use LegacyEnumShimTrait;
+
+	case SKELETON;
+	case WITHER_SKELETON;
+	case ZOMBIE;
+	case PLAYER;
+	case CREEPER;
+	case DRAGON;
+	case PIGLIN;
+
+	public function getDisplayName() : string{
+		return match($this){
+			self::SKELETON => "Skeleton Skull",
+			self::WITHER_SKELETON => "Wither Skeleton Skull",
+			self::ZOMBIE => "Zombie Head",
+			self::PLAYER => "Player Head",
+			self::CREEPER => "Creeper Head",
+			self::DRAGON => "Dragon Head",
+			self::PIGLIN => "Piglin Head"
+		};
+	}
+}
diff --git a/src/block/utils/MultiAnyFacingTrait.php b/src/block/utils/MultiAnyFacingTrait.php
new file mode 100644
index 0000000000..66f26d9800
--- /dev/null
+++ b/src/block/utils/MultiAnyFacingTrait.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\block\utils;
+
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\math\Facing;
+
+/**
+ * Used by blocks that can have multiple target faces in the area of one solid block, such as covering three sides of a corner.
+ */
+trait MultiAnyFacingTrait{
+
+	/** @var int[] */
+	protected array $faces = [];
+
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->facingFlags($this->faces);
+	}
+
+	/** @return int[] */
+	public function getFaces() : array{ return $this->faces; }
+
+	public function hasFace(int $face) : bool{
+		return isset($this->faces[$face]);
+	}
+
+	/**
+	 * @param int[] $faces
+	 * @return $this
+	 */
+	public function setFaces(array $faces) : self{
+		$uniqueFaces = [];
+		foreach($faces as $face){
+			Facing::validate($face);
+			$uniqueFaces[$face] = $face;
+		}
+		$this->faces = $uniqueFaces;
+		return $this;
+	}
+
+	/** @return $this */
+	public function setFace(int $face, bool $value) : self{
+		Facing::validate($face);
+		if($value){
+			$this->faces[$face] = $face;
+		}else{
+			unset($this->faces[$face]);
+		}
+		return $this;
+	}
+}
diff --git a/src/block/utils/MultiAnySupportTrait.php b/src/block/utils/MultiAnySupportTrait.php
new file mode 100644
index 0000000000..ae1da7befe
--- /dev/null
+++ b/src/block/utils/MultiAnySupportTrait.php
@@ -0,0 +1,96 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\block\Block;
+use pocketmine\item\Item;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\BlockTransaction;
+use function array_key_first;
+use function count;
+
+/**
+ * Used by blocks that have multiple support requirements in the area of one solid block, such as covering three sides of a corner.
+ * Prevents placement if support isn't available and automatically destroys a block side if it's support is removed.
+ */
+trait MultiAnySupportTrait{
+	use MultiAnyFacingTrait;
+
+	/**
+	 * Returns a list of faces that block should already have when placed.
+	 *
+	 * @return int[]
+	 */
+	abstract protected function getInitialPlaceFaces(Block $blockReplace) : array;
+
+	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
+		$this->faces = $this->getInitialPlaceFaces($blockReplace);
+		$availableFaces = $this->getAvailableFaces();
+
+		if(count($availableFaces) === 0){
+			return false;
+		}
+
+		$opposite = Facing::opposite($face);
+		$placedFace = isset($availableFaces[$opposite]) ? $opposite : array_key_first($availableFaces);
+		$this->faces[$placedFace] = $placedFace;
+
+		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
+	}
+
+	public function onNearbyBlockChange() : void{
+		$changed = false;
+
+		foreach($this->faces as $face){
+			if($this->getAdjacentSupportType($face) !== SupportType::FULL){
+				unset($this->faces[$face]);
+				$changed = true;
+			}
+		}
+
+		if($changed){
+			$world = $this->position->getWorld();
+			if(count($this->faces) === 0){
+				$world->useBreakOn($this->position);
+			}else{
+				$world->setBlock($this->position, $this);
+			}
+		}
+	}
+
+	/**
+	 * @return array<int, int> $faces
+	 */
+	private function getAvailableFaces() : array{
+		$faces = [];
+		foreach(Facing::ALL as $face){
+			if(!$this->hasFace($face) && $this->getAdjacentSupportType($face) === SupportType::FULL){
+				$faces[$face] = $face;
+			}
+		}
+		return $faces;
+	}
+}
diff --git a/src/block/utils/MushroomBlockType.php b/src/block/utils/MushroomBlockType.php
index 7f001d13da..6bc499b236 100644
--- a/src/block/utils/MushroomBlockType.php
+++ b/src/block/utils/MushroomBlockType.php
@@ -23,13 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static MushroomBlockType ALL_CAP()
  * @method static MushroomBlockType CAP_EAST()
@@ -43,22 +41,18 @@ use pocketmine\utils\EnumTrait;
  * @method static MushroomBlockType CAP_WEST()
  * @method static MushroomBlockType PORES()
  */
-final class MushroomBlockType{
-	use EnumTrait;
+enum MushroomBlockType{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("PORES"),
-			new self("CAP_NORTHWEST"),
-			new self("CAP_NORTH"),
-			new self("CAP_NORTHEAST"),
-			new self("CAP_WEST"),
-			new self("CAP_MIDDLE"),
-			new self("CAP_EAST"),
-			new self("CAP_SOUTHWEST"),
-			new self("CAP_SOUTH"),
-			new self("CAP_SOUTHEAST"),
-			new self("ALL_CAP")
-		);
-	}
+	case PORES;
+	case CAP_NORTHWEST;
+	case CAP_NORTH;
+	case CAP_NORTHEAST;
+	case CAP_WEST;
+	case CAP_MIDDLE;
+	case CAP_EAST;
+	case CAP_SOUTHWEST;
+	case CAP_SOUTH;
+	case CAP_SOUTHEAST;
+	case ALL_CAP;
 }
diff --git a/src/block/utils/PillarRotationInMetadataTrait.php b/src/block/utils/PillarRotationInMetadataTrait.php
deleted file mode 100644
index 229ed9d0b8..0000000000
--- a/src/block/utils/PillarRotationInMetadataTrait.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\block\utils;
-
-use pocketmine\math\Axis;
-
-trait PillarRotationInMetadataTrait{
-	use PillarRotationTrait;
-
-	protected function getAxisMetaShift() : int{
-		return 2; //default
-	}
-
-	/**
-	 * @see Block::writeStateToMeta()
-	 */
-	protected function writeStateToMeta() : int{
-		return $this->writeAxisToMeta();
-	}
-
-	/**
-	 * @see Block::readStateFromData()
-	 */
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->readAxisFromMeta($stateMeta);
-	}
-
-	/**
-	 * @see Block::getStateBitmask()
-	 */
-	public function getStateBitmask() : int{
-		return 0b11 << $this->getAxisMetaShift();
-	}
-
-	protected function readAxisFromMeta(int $meta) : void{
-		$axis = $meta >> $this->getAxisMetaShift();
-		$mapped = [
-			0 => Axis::Y,
-			1 => Axis::X,
-			2 => Axis::Z
-		][$axis] ?? null;
-		if($mapped === null){
-			throw new InvalidBlockStateException("Invalid axis meta $axis");
-		}
-		$this->axis = $mapped;
-	}
-
-	protected function writeAxisToMeta() : int{
-		return [
-			Axis::Y => 0,
-			Axis::Z => 2,
-			Axis::X => 1
-		][$this->axis] << $this->getAxisMetaShift();
-	}
-}
diff --git a/src/block/utils/PillarRotationTrait.php b/src/block/utils/PillarRotationTrait.php
index 694b504246..3f0117dec1 100644
--- a/src/block/utils/PillarRotationTrait.php
+++ b/src/block/utils/PillarRotationTrait.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block\utils;
 
 use pocketmine\block\Block;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
@@ -32,9 +33,11 @@ use pocketmine\player\Player;
 use pocketmine\world\BlockTransaction;
 
 trait PillarRotationTrait{
+	protected int $axis = Axis::Y;
 
-	/** @var int */
-	protected $axis = Axis::Y;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->axis($this->axis);
+	}
 
 	/** @see Axis */
 	public function getAxis() : int{ return $this->axis; }
diff --git a/src/block/utils/RailConnectionInfo.php b/src/block/utils/RailConnectionInfo.php
index c12c53b31c..f343bb7266 100644
--- a/src/block/utils/RailConnectionInfo.php
+++ b/src/block/utils/RailConnectionInfo.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\block\BlockLegacyMetadata;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
 use pocketmine\math\Facing;
 
 final class RailConnectionInfo{
diff --git a/src/block/utils/RailPoweredByRedstoneTrait.php b/src/block/utils/RailPoweredByRedstoneTrait.php
index 044dd7a49d..05384f6110 100644
--- a/src/block/utils/RailPoweredByRedstoneTrait.php
+++ b/src/block/utils/RailPoweredByRedstoneTrait.php
@@ -23,22 +23,13 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\block\BlockLegacyMetadata;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 
 trait RailPoweredByRedstoneTrait{
 	use PoweredByRedstoneTrait;
 
-	public function readStateFromData(int $id, int $stateMeta) : void{
-		parent::readStateFromData($id, $stateMeta & ~BlockLegacyMetadata::REDSTONE_RAIL_FLAG_POWERED);
-		$this->powered = ($stateMeta & BlockLegacyMetadata::REDSTONE_RAIL_FLAG_POWERED) !== 0;
-	}
-
-	protected function writeStateToMeta() : int{
-		//TODO: railShape won't be plain metadata in the future
-		return parent::writeStateToMeta() | ($this->powered ? BlockLegacyMetadata::REDSTONE_RAIL_FLAG_POWERED : 0);
-	}
-
-	public function getStateBitmask() : int{
-		return 0b1111;
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		parent::describeBlockOnlyState($w);
+		$w->bool($this->powered);
 	}
 }
diff --git a/src/block/utils/RecordType.php b/src/block/utils/RecordType.php
index f58f9fd605..e63cee9204 100644
--- a/src/block/utils/RecordType.php
+++ b/src/block/utils/RecordType.php
@@ -26,66 +26,85 @@ namespace pocketmine\block\utils;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\lang\Translatable;
 use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
+use function spl_object_id;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static RecordType DISK_11()
  * @method static RecordType DISK_13()
+ * @method static RecordType DISK_5()
  * @method static RecordType DISK_BLOCKS()
  * @method static RecordType DISK_CAT()
  * @method static RecordType DISK_CHIRP()
  * @method static RecordType DISK_FAR()
  * @method static RecordType DISK_MALL()
  * @method static RecordType DISK_MELLOHI()
+ * @method static RecordType DISK_OTHERSIDE()
+ * @method static RecordType DISK_PIGSTEP()
  * @method static RecordType DISK_STAL()
  * @method static RecordType DISK_STRAD()
  * @method static RecordType DISK_WAIT()
  * @method static RecordType DISK_WARD()
+ *
+ * @phpstan-type TMetadata array{0: string, 1: LevelSoundEvent::*, 2: Translatable}
  */
-final class RecordType{
-	use EnumTrait {
-		__construct as Enum___construct;
-	}
+enum RecordType{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new RecordType("disk_13", "C418 - 13", LevelSoundEvent::RECORD_13, KnownTranslationFactory::item_record_13_desc()),
-			new RecordType("disk_cat", "C418 - cat", LevelSoundEvent::RECORD_CAT, KnownTranslationFactory::item_record_cat_desc()),
-			new RecordType("disk_blocks", "C418 - blocks", LevelSoundEvent::RECORD_BLOCKS, KnownTranslationFactory::item_record_blocks_desc()),
-			new RecordType("disk_chirp", "C418 - chirp", LevelSoundEvent::RECORD_CHIRP, KnownTranslationFactory::item_record_chirp_desc()),
-			new RecordType("disk_far", "C418 - far", LevelSoundEvent::RECORD_FAR, KnownTranslationFactory::item_record_far_desc()),
-			new RecordType("disk_mall", "C418 - mall", LevelSoundEvent::RECORD_MALL, KnownTranslationFactory::item_record_mall_desc()),
-			new RecordType("disk_mellohi", "C418 - mellohi", LevelSoundEvent::RECORD_MELLOHI, KnownTranslationFactory::item_record_mellohi_desc()),
-			new RecordType("disk_stal", "C418 - stal", LevelSoundEvent::RECORD_STAL, KnownTranslationFactory::item_record_stal_desc()),
-			new RecordType("disk_strad", "C418 - strad", LevelSoundEvent::RECORD_STRAD, KnownTranslationFactory::item_record_strad_desc()),
-			new RecordType("disk_ward", "C418 - ward", LevelSoundEvent::RECORD_WARD, KnownTranslationFactory::item_record_ward_desc()),
-			new RecordType("disk_11", "C418 - 11", LevelSoundEvent::RECORD_11, KnownTranslationFactory::item_record_11_desc()),
-			new RecordType("disk_wait", "C418 - wait", LevelSoundEvent::RECORD_WAIT, KnownTranslationFactory::item_record_wait_desc())
-			//TODO: Lena Raine - Pigstep
-		);
-	}
+	case DISK_13;
+	case DISK_5;
+	case DISK_CAT;
+	case DISK_BLOCKS;
+	case DISK_CHIRP;
+	case DISK_FAR;
+	case DISK_MALL;
+	case DISK_MELLOHI;
+	case DISK_OTHERSIDE;
+	case DISK_PIGSTEP;
+	case DISK_STAL;
+	case DISK_STRAD;
+	case DISK_WARD;
+	case DISK_11;
+	case DISK_WAIT;
 
-	private function __construct(
-		string $enumName,
-		private string $soundName,
-		private int $soundId,
-		private Translatable $translatableName
-	){
-		$this->Enum___construct($enumName);
+	/**
+	 * @phpstan-return TMetadata
+	 */
+	private function getMetadata() : array{
+		/** @phpstan-var array<int, TMetadata> $cache */
+		static $cache = [];
+
+		return $cache[spl_object_id($this)] ??= match($this){
+			self::DISK_13 => ["C418 - 13", LevelSoundEvent::RECORD_13, KnownTranslationFactory::item_record_13_desc()],
+			self::DISK_5 => ["Samuel Åberg - 5", LevelSoundEvent::RECORD_5, KnownTranslationFactory::item_record_5_desc()],
+			self::DISK_CAT => ["C418 - cat", LevelSoundEvent::RECORD_CAT, KnownTranslationFactory::item_record_cat_desc()],
+			self::DISK_BLOCKS => ["C418 - blocks", LevelSoundEvent::RECORD_BLOCKS, KnownTranslationFactory::item_record_blocks_desc()],
+			self::DISK_CHIRP => ["C418 - chirp", LevelSoundEvent::RECORD_CHIRP, KnownTranslationFactory::item_record_chirp_desc()],
+			self::DISK_FAR => ["C418 - far", LevelSoundEvent::RECORD_FAR, KnownTranslationFactory::item_record_far_desc()],
+			self::DISK_MALL => ["C418 - mall", LevelSoundEvent::RECORD_MALL, KnownTranslationFactory::item_record_mall_desc()],
+			self::DISK_MELLOHI => ["C418 - mellohi", LevelSoundEvent::RECORD_MELLOHI, KnownTranslationFactory::item_record_mellohi_desc()],
+			self::DISK_OTHERSIDE => ["Lena Raine - otherside", LevelSoundEvent::RECORD_OTHERSIDE, KnownTranslationFactory::item_record_otherside_desc()],
+			self::DISK_PIGSTEP => ["Lena Raine - Pigstep", LevelSoundEvent::RECORD_PIGSTEP, KnownTranslationFactory::item_record_pigstep_desc()],
+			self::DISK_STAL => ["C418 - stal", LevelSoundEvent::RECORD_STAL, KnownTranslationFactory::item_record_stal_desc()],
+			self::DISK_STRAD => ["C418 - strad", LevelSoundEvent::RECORD_STRAD, KnownTranslationFactory::item_record_strad_desc()],
+			self::DISK_WARD => ["C418 - ward", LevelSoundEvent::RECORD_WARD, KnownTranslationFactory::item_record_ward_desc()],
+			self::DISK_11 => ["C418 - 11", LevelSoundEvent::RECORD_11, KnownTranslationFactory::item_record_11_desc()],
+			self::DISK_WAIT => ["C418 - wait", LevelSoundEvent::RECORD_WAIT, KnownTranslationFactory::item_record_wait_desc()]
+		};
 	}
 
 	public function getSoundName() : string{
-		return $this->soundName;
+		return $this->getMetadata()[0];
 	}
 
 	public function getSoundId() : int{
-		return $this->soundId;
+		return $this->getMetadata()[1];
 	}
 
-	public function getTranslatableName() : Translatable{ return $this->translatableName; }
+	public function getTranslatableName() : Translatable{
+		return $this->getMetadata()[2];
+	}
 }
diff --git a/src/block/utils/SaplingType.php b/src/block/utils/SaplingType.php
new file mode 100644
index 0000000000..9fe87936cd
--- /dev/null
+++ b/src/block/utils/SaplingType.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\utils\LegacyEnumShimTrait;
+use pocketmine\world\generator\object\TreeType;
+
+/**
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
+ *
+ * @method static SaplingType ACACIA()
+ * @method static SaplingType BIRCH()
+ * @method static SaplingType DARK_OAK()
+ * @method static SaplingType JUNGLE()
+ * @method static SaplingType OAK()
+ * @method static SaplingType SPRUCE()
+ */
+enum SaplingType{
+	use LegacyEnumShimTrait;
+
+	case OAK;
+	case SPRUCE;
+	case BIRCH;
+	case JUNGLE;
+	case ACACIA;
+	case DARK_OAK;
+	//TODO: cherry
+
+	public function getTreeType() : TreeType{
+		return match($this){
+			self::OAK => TreeType::OAK,
+			self::SPRUCE => TreeType::SPRUCE,
+			self::BIRCH => TreeType::BIRCH,
+			self::JUNGLE => TreeType::JUNGLE,
+			self::ACACIA => TreeType::ACACIA,
+			self::DARK_OAK => TreeType::DARK_OAK,
+		};
+	}
+
+	public function getDisplayName() : string{
+		return $this->getTreeType()->getDisplayName();
+	}
+}
diff --git a/src/block/utils/SignLikeRotationTrait.php b/src/block/utils/SignLikeRotationTrait.php
index d9b1568958..36b2dce3fa 100644
--- a/src/block/utils/SignLikeRotationTrait.php
+++ b/src/block/utils/SignLikeRotationTrait.php
@@ -23,12 +23,17 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use function floor;
 
 trait SignLikeRotationTrait{
 	/** @var int */
 	private $rotation = 0;
 
+	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
+		$w->boundedIntAuto(0, 15, $this->rotation);
+	}
+
 	public function getRotation() : int{ return $this->rotation; }
 
 	/** @return $this */
diff --git a/src/block/utils/SignText.php b/src/block/utils/SignText.php
index 2ba27d1ea1..a7e8759b8d 100644
--- a/src/block/utils/SignText.php
+++ b/src/block/utils/SignText.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
+use pocketmine\color\Color;
 use pocketmine\utils\Utils;
 use function array_fill;
 use function array_pad;
@@ -35,17 +36,23 @@ use function str_contains;
 class SignText{
 	public const LINE_COUNT = 4;
 
-	/** @var string[] */
+	/**
+	 * @var string[]
+	 * @phpstan-var array{0: string, 1: string, 2: string, 3: string}
+	 */
 	private array $lines;
+	private Color $baseColor;
+	private bool $glowing;
 
 	/**
 	 * @param string[]|null $lines index-sensitive; keys 0-3 will be used, regardless of array order
+	 * @phpstan-param array{0?: string, 1?: string, 2?: string, 3?: string}|null $lines
 	 *
 	 * @throws \InvalidArgumentException if the array size is greater than 4
 	 * @throws \InvalidArgumentException if invalid keys (out of bounds or string) are found in the array
 	 * @throws \InvalidArgumentException if any line is not valid UTF-8 or contains a newline
 	 */
-	public function __construct(?array $lines = null){
+	public function __construct(?array $lines = null, ?Color $baseColor = null, bool $glowing = false){
 		$this->lines = array_fill(0, self::LINE_COUNT, "");
 		if($lines !== null){
 			if(count($lines) > self::LINE_COUNT){
@@ -61,6 +68,8 @@ class SignText{
 				$this->lines[$k] = $line;
 			}
 		}
+		$this->baseColor = $baseColor ?? new Color(0, 0, 0);
+		$this->glowing = $glowing;
 	}
 
 	/**
@@ -69,23 +78,21 @@ class SignText{
 	 *
 	 * @throws \InvalidArgumentException if the text is not valid UTF-8
 	 */
-	public static function fromBlob(string $blob) : SignText{
-		return new self(array_slice(array_pad(explode("\n", $blob), self::LINE_COUNT, ""), 0, self::LINE_COUNT));
+	public static function fromBlob(string $blob, ?Color $baseColor = null, bool $glowing = false) : SignText{
+		return new self(array_slice(array_pad(explode("\n", $blob), self::LINE_COUNT, ""), 0, self::LINE_COUNT), $baseColor, $glowing);
 	}
 
 	/**
 	 * Returns an array of lines currently on the sign.
 	 *
 	 * @return string[]
+	 * @phpstan-return array{0: string, 1: string, 2: string, 3: string}
 	 */
 	public function getLines() : array{
 		return $this->lines;
 	}
 
-	/**
-	 * @param int|string $index
-	 */
-	private function checkLineIndex($index) : void{
+	private function checkLineIndex(int|string $index) : void{
 		if(!is_int($index)){
 			throw new \InvalidArgumentException("Index must be an integer");
 		}
@@ -103,4 +110,19 @@ class SignText{
 		$this->checkLineIndex($index);
 		return $this->lines[$index];
 	}
+
+	/**
+	 * Returns the base text color of sign. Color codes using the § escape character will override this color when used.
+	 */
+	public function getBaseColor() : Color{
+		return $this->baseColor;
+	}
+
+	/**
+	 * Returns whether the sign text is glowing. When true, the text will have an outline (usually a darker tone of the
+	 * base color, or white for black text), and will glow in the dark, making it readable without any light sources.
+	 */
+	public function isGlowing() : bool{
+		return $this->glowing;
+	}
 }
diff --git a/src/block/utils/SkullType.php b/src/block/utils/SkullType.php
deleted file mode 100644
index c2031cde33..0000000000
--- a/src/block/utils/SkullType.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\block\utils;
-
-use pocketmine\utils\EnumTrait;
-
-/**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
- *
- * @method static SkullType CREEPER()
- * @method static SkullType DRAGON()
- * @method static SkullType PLAYER()
- * @method static SkullType SKELETON()
- * @method static SkullType WITHER_SKELETON()
- * @method static SkullType ZOMBIE()
- */
-final class SkullType{
-	use EnumTrait {
-		register as Enum_register;
-		__construct as Enum___construct;
-	}
-
-	/** @var SkullType[] */
-	private static array $numericIdMap = [];
-
-	protected static function setup() : void{
-		self::registerAll(
-			new SkullType("skeleton", "Skeleton Skull", 0),
-			new SkullType("wither_skeleton", "Wither Skeleton Skull", 1),
-			new SkullType("zombie", "Zombie Head", 2),
-			new SkullType("player", "Player Head", 3),
-			new SkullType("creeper", "Creeper Head", 4),
-			new SkullType("dragon", "Dragon Head", 5)
-		);
-	}
-
-	protected static function register(SkullType $type) : void{
-		self::Enum_register($type);
-		self::$numericIdMap[$type->getMagicNumber()] = $type;
-	}
-
-	/**
-	 * @internal
-	 *
-	 * @throws \InvalidArgumentException
-	 */
-	public static function fromMagicNumber(int $magicNumber) : SkullType{
-		if(!isset(self::$numericIdMap[$magicNumber])){
-			throw new \InvalidArgumentException("Unknown skull type magic number $magicNumber");
-		}
-		return self::$numericIdMap[$magicNumber];
-	}
-
-	private function __construct(
-		string $enumName,
-		private string $displayName,
-		private int $magicNumber
-	){
-		$this->Enum___construct($enumName);
-	}
-
-	public function getDisplayName() : string{
-		return $this->displayName;
-	}
-
-	public function getMagicNumber() : int{
-		return $this->magicNumber;
-	}
-}
diff --git a/src/block/utils/SlabType.php b/src/block/utils/SlabType.php
index 1da1b3e5a3..90f3e09535 100644
--- a/src/block/utils/SlabType.php
+++ b/src/block/utils/SlabType.php
@@ -23,26 +23,20 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static SlabType BOTTOM()
  * @method static SlabType DOUBLE()
  * @method static SlabType TOP()
  */
-final class SlabType{
-	use EnumTrait;
+enum SlabType{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("bottom"),
-			new self("top"),
-			new self("double")
-		);
-	}
+	case BOTTOM;
+	case TOP;
+	case DOUBLE;
 }
diff --git a/src/block/utils/StairShape.php b/src/block/utils/StairShape.php
index c98aec8fba..b89b9adbb2 100644
--- a/src/block/utils/StairShape.php
+++ b/src/block/utils/StairShape.php
@@ -23,13 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static StairShape INNER_LEFT()
  * @method static StairShape INNER_RIGHT()
@@ -37,16 +35,12 @@ use pocketmine\utils\EnumTrait;
  * @method static StairShape OUTER_RIGHT()
  * @method static StairShape STRAIGHT()
  */
-final class StairShape{
-	use EnumTrait;
+enum StairShape{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("straight"),
-			new self("inner_left"),
-			new self("inner_right"),
-			new self("outer_left"),
-			new self("outer_right")
-		);
-	}
+	case STRAIGHT;
+	case INNER_LEFT;
+	case INNER_RIGHT;
+	case OUTER_LEFT;
+	case OUTER_RIGHT;
 }
diff --git a/src/block/utils/StaticSupportTrait.php b/src/block/utils/StaticSupportTrait.php
new file mode 100644
index 0000000000..0e40230cc6
--- /dev/null
+++ b/src/block/utils/StaticSupportTrait.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\block\Block;
+use pocketmine\math\Vector3;
+
+/**
+ * Used by blocks which always have the same support requirements no matter what state they are in.
+ * Prevents placement if support isn't available, and automatically destroys itself if support is removed.
+ */
+trait StaticSupportTrait{
+
+	/**
+	 * Implement this to define the block's support requirements.
+	 */
+	abstract private function canBeSupportedAt(Block $block) : bool;
+
+	/**
+	 * @see Block::canBePlacedAt()
+	 */
+	public function canBePlacedAt(Block $blockReplace, Vector3 $clickVector, int $face, bool $isClickedBlock) : bool{
+		return $this->canBeSupportedAt($blockReplace) && parent::canBePlacedAt($blockReplace, $clickVector, $face, $isClickedBlock);
+	}
+
+	/**
+	 * @see Block::onNearbyBlockChange()
+	 */
+	public function onNearbyBlockChange() : void{
+		if(!$this->canBeSupportedAt($this)){
+			$this->position->getWorld()->useBreakOn($this->position);
+		}else{
+			parent::onNearbyBlockChange();
+		}
+	}
+}
diff --git a/src/block/utils/SupportType.php b/src/block/utils/SupportType.php
index b4480bf57f..9513d86401 100644
--- a/src/block/utils/SupportType.php
+++ b/src/block/utils/SupportType.php
@@ -23,36 +23,30 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static SupportType CENTER()
  * @method static SupportType EDGE()
  * @method static SupportType FULL()
  * @method static SupportType NONE()
  */
-final class SupportType{
-	use EnumTrait;
+enum SupportType{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("full"),
-			new self("center"),
-			new self("edge"),
-			new self("none")
-		);
-	}
+	case FULL;
+	case CENTER;
+	case EDGE;
+	case NONE;
 
 	public function hasEdgeSupport() : bool{
-		return $this->equals(self::EDGE()) || $this->equals(self::FULL());
+		return $this === self::EDGE || $this === self::FULL;
 	}
 
 	public function hasCenterSupport() : bool{
-		return $this->equals(self::CENTER()) || $this->equals(self::FULL());
+		return $this === self::CENTER || $this === self::FULL;
 	}
 }
diff --git a/src/block/utils/TallGrassTrait.php b/src/block/utils/TallGrassTrait.php
new file mode 100644
index 0000000000..88fc36e127
--- /dev/null
+++ b/src/block/utils/TallGrassTrait.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\block\utils;
+
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+
+/**
+ * @internal
+ */
+trait TallGrassTrait{
+	public function canBeReplaced() : bool{
+		return true;
+	}
+
+	public function getDropsForIncompatibleTool(Item $item) : array{
+		if(FortuneDropHelper::bonusChanceDivisor($item, 8, 2)){
+			return [
+				VanillaItems::WHEAT_SEEDS()
+			];
+		}
+
+		return [];
+	}
+
+	public function getFlameEncouragement() : int{
+		return 60;
+	}
+
+	public function getFlammability() : int{
+		return 100;
+	}
+}
diff --git a/src/block/utils/TreeType.php b/src/block/utils/TreeType.php
deleted file mode 100644
index b031e0e99f..0000000000
--- a/src/block/utils/TreeType.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\block\utils;
-
-use pocketmine\utils\EnumTrait;
-
-/**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
- *
- * @method static TreeType ACACIA()
- * @method static TreeType BIRCH()
- * @method static TreeType DARK_OAK()
- * @method static TreeType JUNGLE()
- * @method static TreeType OAK()
- * @method static TreeType SPRUCE()
- */
-final class TreeType{
-	use EnumTrait {
-		register as Enum_register;
-		__construct as Enum___construct;
-	}
-
-	/** @var TreeType[] */
-	private static array $numericIdMap = [];
-
-	protected static function setup() : void{
-		self::registerAll(
-			new TreeType("oak", "Oak", 0),
-			new TreeType("spruce", "Spruce", 1),
-			new TreeType("birch", "Birch", 2),
-			new TreeType("jungle", "Jungle", 3),
-			new TreeType("acacia", "Acacia", 4),
-			new TreeType("dark_oak", "Dark Oak", 5)
-		);
-	}
-
-	protected static function register(TreeType $type) : void{
-		self::Enum_register($type);
-		self::$numericIdMap[$type->getMagicNumber()] = $type;
-	}
-
-	/**
-	 * @internal
-	 *
-	 * @throws \InvalidArgumentException
-	 */
-	public static function fromMagicNumber(int $magicNumber) : TreeType{
-		self::checkInit();
-		if(!isset(self::$numericIdMap[$magicNumber])){
-			throw new \InvalidArgumentException("Unknown tree type magic number $magicNumber");
-		}
-		return self::$numericIdMap[$magicNumber];
-	}
-
-	private function __construct(
-		string $enumName,
-		private string $displayName,
-		private int $magicNumber
-	){
-		$this->Enum___construct($enumName);
-	}
-
-	public function getDisplayName() : string{
-		return $this->displayName;
-	}
-
-	public function getMagicNumber() : int{
-		return $this->magicNumber;
-	}
-}
diff --git a/src/block/utils/WallConnectionType.php b/src/block/utils/WallConnectionType.php
new file mode 100644
index 0000000000..1d4c8d1524
--- /dev/null
+++ b/src/block/utils/WallConnectionType.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\utils\LegacyEnumShimTrait;
+
+/**
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
+ *
+ * @method static WallConnectionType SHORT()
+ * @method static WallConnectionType TALL()
+ */
+enum WallConnectionType{
+	use LegacyEnumShimTrait;
+
+	case SHORT;
+	case TALL;
+}
diff --git a/src/block/utils/WoodType.php b/src/block/utils/WoodType.php
new file mode 100644
index 0000000000..f6195b9f90
--- /dev/null
+++ b/src/block/utils/WoodType.php
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\utils\LegacyEnumShimTrait;
+
+/**
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
+ *
+ * @method static WoodType ACACIA()
+ * @method static WoodType BIRCH()
+ * @method static WoodType CHERRY()
+ * @method static WoodType CRIMSON()
+ * @method static WoodType DARK_OAK()
+ * @method static WoodType JUNGLE()
+ * @method static WoodType MANGROVE()
+ * @method static WoodType OAK()
+ * @method static WoodType SPRUCE()
+ * @method static WoodType WARPED()
+ */
+enum WoodType{
+	use LegacyEnumShimTrait;
+
+	case OAK;
+	case SPRUCE;
+	case BIRCH;
+	case JUNGLE;
+	case ACACIA;
+	case DARK_OAK;
+	case MANGROVE;
+	case CRIMSON;
+	case WARPED;
+	case CHERRY;
+
+	public function getDisplayName() : string{
+		return match($this){
+			self::OAK => "Oak",
+			self::SPRUCE => "Spruce",
+			self::BIRCH => "Birch",
+			self::JUNGLE => "Jungle",
+			self::ACACIA => "Acacia",
+			self::DARK_OAK => "Dark Oak",
+			self::MANGROVE => "Mangrove",
+			self::CRIMSON => "Crimson",
+			self::WARPED => "Warped",
+			self::CHERRY => "Cherry",
+		};
+	}
+
+	public function isFlammable() : bool{
+		return $this !== self::CRIMSON && $this !== self::WARPED;
+	}
+
+	public function getStandardLogSuffix() : ?string{
+		return $this === self::CRIMSON || $this === self::WARPED ? "Stem" : null;
+	}
+
+	public function getAllSidedLogSuffix() : ?string{
+		return $this === self::CRIMSON || $this === self::WARPED ? "Hyphae" : null;
+	}
+}
diff --git a/src/block/utils/WoodTypeTrait.php b/src/block/utils/WoodTypeTrait.php
new file mode 100644
index 0000000000..b2e023ad90
--- /dev/null
+++ b/src/block/utils/WoodTypeTrait.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\block\BlockIdentifier;
+use pocketmine\block\BlockTypeInfo;
+
+trait WoodTypeTrait{
+	private WoodType $woodType; //immutable for now
+
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockTypeInfo $typeInfo, WoodType $woodType){
+		$this->woodType = $woodType;
+		parent::__construct($idInfo, $name, $typeInfo);
+	}
+
+	public function getWoodType() : WoodType{
+		return $this->woodType;
+	}
+}
diff --git a/src/command/Command.php b/src/command/Command.php
index 12a1b8e38b..4c2c6815b2 100644
--- a/src/command/Command.php
+++ b/src/command/Command.php
@@ -31,11 +31,10 @@ use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\lang\Translatable;
 use pocketmine\permission\PermissionManager;
 use pocketmine\Server;
-use pocketmine\timings\Timings;
-use pocketmine\timings\TimingsHandler;
 use pocketmine\utils\BroadcastLoggerForwarder;
 use pocketmine\utils\TextFormat;
 use function explode;
+use function implode;
 use function str_replace;
 
 abstract class Command{
@@ -45,28 +44,31 @@ abstract class Command{
 	private string $nextLabel;
 	private string $label;
 
-	/** @var string[] */
+	/**
+	 * @var string[]
+	 * @phpstan-var list<string>
+	 */
 	private array $aliases = [];
 
-	/** @var string[] */
+	/**
+	 * @var string[]
+	 * @phpstan-var list<string>
+	 */
 	private array $activeAliases = [];
 
 	private ?CommandMap $commandMap = null;
 
-	/** @var Translatable|string */
-	protected $description = "";
+	protected Translatable|string $description = "";
 
-	/** @var Translatable|string */
-	protected $usageMessage;
+	protected Translatable|string $usageMessage;
 
-	private ?string $permission = null;
+	/** @var string[] */
+	private array $permission = [];
 	private ?string $permissionMessage = null;
 
-	/** @var TimingsHandler|null */
-	public $timings = null;
-
 	/**
 	 * @param string[] $aliases
+	 * @phpstan-param list<string> $aliases
 	 */
 	public function __construct(string $name, Translatable|string $description = "", Translatable|string|null $usageMessage = null, array $aliases = []){
 		$this->name = $name;
@@ -88,19 +90,28 @@ abstract class Command{
 		return $this->name;
 	}
 
-	public function getPermission() : ?string{
+	/**
+	 * @return string[]
+	 */
+	public function getPermissions() : array{
 		return $this->permission;
 	}
 
-	public function setPermission(?string $permission) : void{
-		if($permission !== null){
-			foreach(explode(";", $permission) as $perm){
-				if(PermissionManager::getInstance()->getPermission($perm) === null){
-					throw new \InvalidArgumentException("Cannot use non-existing permission \"$perm\"");
-				}
+	/**
+	 * @param string[] $permissions
+	 */
+	public function setPermissions(array $permissions) : void{
+		$permissionManager = PermissionManager::getInstance();
+		foreach($permissions as $perm){
+			if($permissionManager->getPermission($perm) === null){
+				throw new \InvalidArgumentException("Cannot use non-existing permission \"$perm\"");
 			}
 		}
-		$this->permission = $permission;
+		$this->permission = $permissions;
+	}
+
+	public function setPermission(?string $permission) : void{
+		$this->setPermissions($permission === null ? [] : explode(";", $permission));
 	}
 
 	public function testPermission(CommandSender $target, ?string $permission = null) : bool{
@@ -111,19 +122,15 @@ abstract class Command{
 		if($this->permissionMessage === null){
 			$target->sendMessage(KnownTranslationFactory::pocketmine_command_error_permission($this->name)->prefix(TextFormat::RED));
 		}elseif($this->permissionMessage !== ""){
-			$target->sendMessage(str_replace("<permission>", $permission ?? $this->permission, $this->permissionMessage));
+			$target->sendMessage(str_replace("<permission>", $permission ?? implode(";", $this->permission), $this->permissionMessage));
 		}
 
 		return false;
 	}
 
 	public function testPermissionSilent(CommandSender $target, ?string $permission = null) : bool{
-		$permission ??= $this->permission;
-		if($permission === null || $permission === ""){
-			return true;
-		}
-
-		foreach(explode(";", $permission) as $p){
+		$list = $permission !== null ? [$permission] : $this->permission;
+		foreach($list as $p){
 			if($target->hasPermission($p)){
 				return true;
 			}
@@ -139,7 +146,6 @@ abstract class Command{
 	public function setLabel(string $name) : bool{
 		$this->nextLabel = $name;
 		if(!$this->isRegistered()){
-			$this->timings = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Command: " . $name);
 			$this->label = $name;
 
 			return true;
@@ -183,6 +189,7 @@ abstract class Command{
 
 	/**
 	 * @return string[]
+	 * @phpstan-return list<string>
 	 */
 	public function getAliases() : array{
 		return $this->activeAliases;
@@ -202,6 +209,7 @@ abstract class Command{
 
 	/**
 	 * @param string[] $aliases
+	 * @phpstan-param list<string> $aliases
 	 */
 	public function setAliases(array $aliases) : void{
 		$this->aliases = $aliases;
diff --git a/src/command/FormattedCommandAlias.php b/src/command/FormattedCommandAlias.php
index df2b8f4fe3..5086672f6a 100644
--- a/src/command/FormattedCommandAlias.php
+++ b/src/command/FormattedCommandAlias.php
@@ -26,6 +26,7 @@ namespace pocketmine\command;
 use pocketmine\command\utils\CommandStringHelper;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\lang\KnownTranslationFactory;
+use pocketmine\timings\Timings;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\TextFormat;
 use function array_shift;
@@ -95,14 +96,15 @@ class FormattedCommandAlias extends Command{
 			}
 
 			if(($target = $commandMap->getCommand($commandLabel)) !== null){
-				$target->timings->startTiming();
+				$timings = Timings::getCommandDispatchTimings($target->getLabel());
+				$timings->startTiming();
 
 				try{
 					$target->execute($sender, $commandLabel, $commandArgs);
 				}catch(InvalidCommandSyntaxException $e){
 					$sender->sendMessage($sender->getLanguage()->translate(KnownTranslationFactory::commands_generic_usage($target->getUsage())));
 				}finally{
-					$target->timings->stopTiming();
+					$timings->stopTiming();
 				}
 			}else{
 				$sender->sendMessage($sender->getLanguage()->translate(KnownTranslationFactory::pocketmine_command_notFound($commandLabel, "/help")->prefix(TextFormat::RED)));
diff --git a/src/command/PluginCommand.php b/src/command/PluginCommand.php
index 07b0999f05..55b8df3ed9 100644
--- a/src/command/PluginCommand.php
+++ b/src/command/PluginCommand.php
@@ -43,10 +43,6 @@ final class PluginCommand extends Command implements PluginOwned{
 			return false;
 		}
 
-		if(!$this->testPermission($sender)){
-			return false;
-		}
-
 		$success = $this->executor->onCommand($sender, $this, $commandLabel, $args);
 
 		if(!$success && $this->usageMessage !== ""){
diff --git a/src/command/SimpleCommandMap.php b/src/command/SimpleCommandMap.php
index 6fb8421383..e0d8e6565e 100644
--- a/src/command/SimpleCommandMap.php
+++ b/src/command/SimpleCommandMap.php
@@ -64,11 +64,14 @@ use pocketmine\command\defaults\TransferServerCommand;
 use pocketmine\command\defaults\VanillaCommand;
 use pocketmine\command\defaults\VersionCommand;
 use pocketmine\command\defaults\WhitelistCommand;
+use pocketmine\command\defaults\XpCommand;
 use pocketmine\command\utils\CommandStringHelper;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\Server;
+use pocketmine\timings\Timings;
 use pocketmine\utils\TextFormat;
+use pocketmine\utils\Utils;
 use function array_shift;
 use function count;
 use function implode;
@@ -79,8 +82,11 @@ use function trim;
 
 class SimpleCommandMap implements CommandMap{
 
-	/** @var Command[] */
-	protected $knownCommands = [];
+	/**
+	 * @var Command[]
+	 * @phpstan-var array<string, Command>
+	 */
+	protected array $knownCommands = [];
 
 	public function __construct(private Server $server){
 		$this->setDefaultCommands();
@@ -88,46 +94,47 @@ class SimpleCommandMap implements CommandMap{
 
 	private function setDefaultCommands() : void{
 		$this->registerAll("pocketmine", [
-			new BanCommand("ban"),
-			new BanIpCommand("ban-ip"),
-			new BanListCommand("banlist"),
-			new ClearCommand("clear"),
-			new DefaultGamemodeCommand("defaultgamemode"),
-			new DeopCommand("deop"),
-			new DifficultyCommand("difficulty"),
-			new DumpMemoryCommand("dumpmemory"),
-			new EffectCommand("effect"),
-			new EnchantCommand("enchant"),
-			new GamemodeCommand("gamemode"),
-			new GarbageCollectorCommand("gc"),
-			new GiveCommand("give"),
-			new HelpCommand("help"),
-			new KickCommand("kick"),
-			new KillCommand("kill"),
-			new ListCommand("list"),
-			new MeCommand("me"),
-			new OpCommand("op"),
-			new PardonCommand("pardon"),
-			new PardonIpCommand("pardon-ip"),
-			new ParticleCommand("particle"),
-			new PluginsCommand("plugins"),
-			new SaveCommand("save-all"),
-			new SaveOffCommand("save-off"),
-			new SaveOnCommand("save-on"),
-			new SayCommand("say"),
-			new SeedCommand("seed"),
-			new SetWorldSpawnCommand("setworldspawn"),
-			new SpawnpointCommand("spawnpoint"),
-			new StatusCommand("status"),
-			new StopCommand("stop"),
-			new TeleportCommand("tp"),
-			new TellCommand("tell"),
-			new TimeCommand("time"),
-			new TimingsCommand("timings"),
-			new TitleCommand("title"),
-			new TransferServerCommand("transferserver"),
-			new VersionCommand("version"),
-			new WhitelistCommand("whitelist")
+			new BanCommand(),
+			new BanIpCommand(),
+			new BanListCommand(),
+			new ClearCommand(),
+			new DefaultGamemodeCommand(),
+			new DeopCommand(),
+			new DifficultyCommand(),
+			new DumpMemoryCommand(),
+			new EffectCommand(),
+			new EnchantCommand(),
+			new GamemodeCommand(),
+			new GarbageCollectorCommand(),
+			new GiveCommand(),
+			new HelpCommand(),
+			new KickCommand(),
+			new KillCommand(),
+			new ListCommand(),
+			new MeCommand(),
+			new OpCommand(),
+			new PardonCommand(),
+			new PardonIpCommand(),
+			new ParticleCommand(),
+			new PluginsCommand(),
+			new SaveCommand(),
+			new SaveOffCommand(),
+			new SaveOnCommand(),
+			new SayCommand(),
+			new SeedCommand(),
+			new SetWorldSpawnCommand(),
+			new SpawnpointCommand(),
+			new StatusCommand(),
+			new StopCommand(),
+			new TeleportCommand(),
+			new TellCommand(),
+			new TimeCommand(),
+			new TimingsCommand(),
+			new TitleCommand(),
+			new TransferServerCommand(),
+			new VersionCommand(),
+			new WhitelistCommand(),
+			new XpCommand(),
 		]);
 	}
 
@@ -138,6 +145,10 @@ class SimpleCommandMap implements CommandMap{
 	}
 
 	public function register(string $fallbackPrefix, Command $command, ?string $label = null) : bool{
+		if(count($command->getPermissions()) === 0){
+			throw new \InvalidArgumentException("Commands must have a permission set");
+		}
+
 		if($label === null){
 			$label = $command->getLabel();
 		}
@@ -164,7 +175,7 @@ class SimpleCommandMap implements CommandMap{
 	}
 
 	public function unregister(Command $command) : bool{
-		foreach($this->knownCommands as $lbl => $cmd){
+		foreach(Utils::promoteKeys($this->knownCommands) as $lbl => $cmd){
 			if($cmd === $command){
 				unset($this->knownCommands[$lbl]);
 			}
@@ -199,14 +210,17 @@ class SimpleCommandMap implements CommandMap{
 
 		$sentCommandLabel = array_shift($args);
 		if($sentCommandLabel !== null && ($target = $this->getCommand($sentCommandLabel)) !== null){
-			$target->timings->startTiming();
+			$timings = Timings::getCommandDispatchTimings($target->getLabel());
+			$timings->startTiming();
 
 			try{
-				$target->execute($sender, $sentCommandLabel, $args);
+				if($target->testPermission($sender)){
+					$target->execute($sender, $sentCommandLabel, $args);
+				}
 			}catch(InvalidCommandSyntaxException $e){
 				$sender->sendMessage($sender->getLanguage()->translate(KnownTranslationFactory::commands_generic_usage($target->getUsage())));
 			}finally{
-				$target->timings->stopTiming();
+				$timings->stopTiming();
 			}
 			return true;
 		}
@@ -229,6 +243,7 @@ class SimpleCommandMap implements CommandMap{
 
 	/**
 	 * @return Command[]
+	 * @phpstan-return array<string, Command>
 	 */
 	public function getCommands() : array{
 		return $this->knownCommands;
@@ -237,7 +252,7 @@ class SimpleCommandMap implements CommandMap{
 	public function registerServerAliases() : void{
 		$values = $this->server->getCommandAliases();
 
-		foreach($values as $alias => $commandStrings){
+		foreach(Utils::stringifyKeys($values) as $alias => $commandStrings){
 			if(str_contains($alias, ":")){
 				$this->server->getLogger()->warning($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_command_alias_illegal($alias)));
 				continue;
diff --git a/src/command/defaults/BanCommand.php b/src/command/defaults/BanCommand.php
index 734159a209..adbdb6d3ad 100644
--- a/src/command/defaults/BanCommand.php
+++ b/src/command/defaults/BanCommand.php
@@ -35,9 +35,9 @@ use function implode;
 
 class BanCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"ban",
 			KnownTranslationFactory::pocketmine_command_ban_player_description(),
 			KnownTranslationFactory::commands_ban_usage()
 		);
@@ -45,10 +45,6 @@ class BanCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) === 0){
 			throw new InvalidCommandSyntaxException();
 		}
@@ -59,7 +55,7 @@ class BanCommand extends VanillaCommand{
 		$sender->getServer()->getNameBans()->addBan($name, $reason, null, $sender->getName());
 
 		if(($player = $sender->getServer()->getPlayerExact($name)) instanceof Player){
-			$player->kick($reason !== "" ? "Banned by admin. Reason: " . $reason : "Banned by admin.");
+			$player->kick($reason !== "" ? KnownTranslationFactory::pocketmine_disconnect_ban($reason) : KnownTranslationFactory::pocketmine_disconnect_ban_noReason());
 		}
 
 		Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_ban_success($player !== null ? $player->getName() : $name));
diff --git a/src/command/defaults/BanIpCommand.php b/src/command/defaults/BanIpCommand.php
index 13c74888c3..a23477e0d7 100644
--- a/src/command/defaults/BanIpCommand.php
+++ b/src/command/defaults/BanIpCommand.php
@@ -36,9 +36,9 @@ use function inet_pton;
 
 class BanIpCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"ban-ip",
 			KnownTranslationFactory::pocketmine_command_ban_ip_description(),
 			KnownTranslationFactory::commands_banip_usage()
 		);
@@ -46,10 +46,6 @@ class BanIpCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) === 0){
 			throw new InvalidCommandSyntaxException();
 		}
@@ -82,7 +78,7 @@ class BanIpCommand extends VanillaCommand{
 
 		foreach($sender->getServer()->getOnlinePlayers() as $player){
 			if($player->getNetworkSession()->getIp() === $ip){
-				$player->kick("Banned by admin. Reason: " . ($reason !== "" ? $reason : "IP banned."));
+				$player->kick(KnownTranslationFactory::pocketmine_disconnect_ban($reason !== "" ? $reason : KnownTranslationFactory::pocketmine_disconnect_ban_ip()));
 			}
 		}
 
diff --git a/src/command/defaults/BanListCommand.php b/src/command/defaults/BanListCommand.php
index 5ec515a2b9..95c2149696 100644
--- a/src/command/defaults/BanListCommand.php
+++ b/src/command/defaults/BanListCommand.php
@@ -37,9 +37,9 @@ use const SORT_STRING;
 
 class BanListCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"banlist",
 			KnownTranslationFactory::pocketmine_command_banlist_description(),
 			KnownTranslationFactory::commands_banlist_usage()
 		);
@@ -47,10 +47,6 @@ class BanListCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(isset($args[0])){
 			$args[0] = strtolower($args[0]);
 			if($args[0] === "ips"){
diff --git a/src/command/defaults/ClearCommand.php b/src/command/defaults/ClearCommand.php
index 5200278515..f6f491fbfa 100644
--- a/src/command/defaults/ClearCommand.php
+++ b/src/command/defaults/ClearCommand.php
@@ -35,25 +35,20 @@ use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\permission\DefaultPermissionNames;
 use pocketmine\utils\TextFormat;
 use function count;
-use function implode;
 use function min;
 
 class ClearCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"clear",
 			KnownTranslationFactory::pocketmine_command_clear_description(),
 			KnownTranslationFactory::pocketmine_command_clear_usage()
 		);
-		$this->setPermission(implode(";", [DefaultPermissionNames::COMMAND_CLEAR_SELF, DefaultPermissionNames::COMMAND_CLEAR_OTHER]));
+		$this->setPermissions([DefaultPermissionNames::COMMAND_CLEAR_SELF, DefaultPermissionNames::COMMAND_CLEAR_OTHER]);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) > 3){
 			throw new InvalidCommandSyntaxException();
 		}
diff --git a/src/command/defaults/DefaultGamemodeCommand.php b/src/command/defaults/DefaultGamemodeCommand.php
index 860a7506d6..d3030eb27b 100644
--- a/src/command/defaults/DefaultGamemodeCommand.php
+++ b/src/command/defaults/DefaultGamemodeCommand.php
@@ -28,13 +28,14 @@ use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\permission\DefaultPermissionNames;
 use pocketmine\player\GameMode;
+use pocketmine\ServerProperties;
 use function count;
 
 class DefaultGamemodeCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"defaultgamemode",
 			KnownTranslationFactory::pocketmine_command_defaultgamemode_description(),
 			KnownTranslationFactory::commands_defaultgamemode_usage()
 		);
@@ -42,10 +43,6 @@ class DefaultGamemodeCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) === 0){
 			throw new InvalidCommandSyntaxException();
 		}
@@ -56,7 +53,8 @@ class DefaultGamemodeCommand extends VanillaCommand{
 			return true;
 		}
 
-		$sender->getServer()->getConfigGroup()->setConfigString("gamemode", $gameMode->name());
+		//TODO: this probably shouldn't use the enum name directly
+		$sender->getServer()->getConfigGroup()->setConfigString(ServerProperties::GAME_MODE, $gameMode->name);
 		$sender->sendMessage(KnownTranslationFactory::commands_defaultgamemode_success($gameMode->getTranslatableName()));
 		return true;
 	}
diff --git a/src/command/defaults/DeopCommand.php b/src/command/defaults/DeopCommand.php
index a32d941085..4167012f76 100644
--- a/src/command/defaults/DeopCommand.php
+++ b/src/command/defaults/DeopCommand.php
@@ -35,9 +35,9 @@ use function count;
 
 class DeopCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"deop",
 			KnownTranslationFactory::pocketmine_command_deop_description(),
 			KnownTranslationFactory::commands_deop_usage()
 		);
@@ -45,10 +45,6 @@ class DeopCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) === 0){
 			throw new InvalidCommandSyntaxException();
 		}
diff --git a/src/command/defaults/DifficultyCommand.php b/src/command/defaults/DifficultyCommand.php
index b73204f56b..dee75e025e 100644
--- a/src/command/defaults/DifficultyCommand.php
+++ b/src/command/defaults/DifficultyCommand.php
@@ -28,14 +28,15 @@ use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\permission\DefaultPermissionNames;
+use pocketmine\ServerProperties;
 use pocketmine\world\World;
 use function count;
 
 class DifficultyCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"difficulty",
 			KnownTranslationFactory::pocketmine_command_difficulty_description(),
 			KnownTranslationFactory::commands_difficulty_usage()
 		);
@@ -43,10 +44,6 @@ class DifficultyCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) !== 1){
 			throw new InvalidCommandSyntaxException();
 		}
@@ -58,7 +55,7 @@ class DifficultyCommand extends VanillaCommand{
 		}
 
 		if($difficulty !== -1){
-			$sender->getServer()->getConfigGroup()->setConfigInt("difficulty", $difficulty);
+			$sender->getServer()->getConfigGroup()->setConfigInt(ServerProperties::DIFFICULTY, $difficulty);
 
 			//TODO: add per-world support
 			foreach($sender->getServer()->getWorldManager()->getWorlds() as $world){
diff --git a/src/command/defaults/DumpMemoryCommand.php b/src/command/defaults/DumpMemoryCommand.php
index 5911b8ebcc..08dc0debae 100644
--- a/src/command/defaults/DumpMemoryCommand.php
+++ b/src/command/defaults/DumpMemoryCommand.php
@@ -31,20 +31,16 @@ use function date;
 
 class DumpMemoryCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"dumpmemory",
 			KnownTranslationFactory::pocketmine_command_dumpmemory_description(),
-			"/$name [path]"
+			"/dumpmemory [path]"
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_DUMPMEMORY);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		$sender->getServer()->getMemoryManager()->dumpServerMemory($args[0] ?? (Path::join($sender->getServer()->getDataPath(), "memory_dumps", date("D_M_j-H.i.s-T_Y"))), 48, 80);
 		return true;
 	}
diff --git a/src/command/defaults/EffectCommand.php b/src/command/defaults/EffectCommand.php
index 2db88b257d..9383232229 100644
--- a/src/command/defaults/EffectCommand.php
+++ b/src/command/defaults/EffectCommand.php
@@ -32,28 +32,23 @@ use pocketmine\permission\DefaultPermissionNames;
 use pocketmine\utils\Limits;
 use pocketmine\utils\TextFormat;
 use function count;
-use function implode;
 use function strtolower;
 
 class EffectCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"effect",
 			KnownTranslationFactory::pocketmine_command_effect_description(),
 			KnownTranslationFactory::commands_effect_usage()
 		);
-		$this->setPermission(implode(";", [
+		$this->setPermissions([
 			DefaultPermissionNames::COMMAND_EFFECT_SELF,
 			DefaultPermissionNames::COMMAND_EFFECT_OTHER
-		]));
+		]);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) < 2){
 			throw new InvalidCommandSyntaxException();
 		}
diff --git a/src/command/defaults/EnchantCommand.php b/src/command/defaults/EnchantCommand.php
index b93d3de96a..191a146b03 100644
--- a/src/command/defaults/EnchantCommand.php
+++ b/src/command/defaults/EnchantCommand.php
@@ -25,32 +25,28 @@ namespace pocketmine\command\defaults;
 
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
+use pocketmine\item\enchantment\EnchantingHelper;
 use pocketmine\item\enchantment\EnchantmentInstance;
 use pocketmine\item\enchantment\StringToEnchantmentParser;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\permission\DefaultPermissionNames;
 use function count;
-use function implode;
 
 class EnchantCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"enchant",
 			KnownTranslationFactory::pocketmine_command_enchant_description(),
 			KnownTranslationFactory::commands_enchant_usage()
 		);
-		$this->setPermission(implode(";", [
+		$this->setPermissions([
 			DefaultPermissionNames::COMMAND_ENCHANT_SELF,
 			DefaultPermissionNames::COMMAND_ENCHANT_OTHER
-		]));
+		]);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) < 2){
 			throw new InvalidCommandSyntaxException();
 		}
@@ -81,8 +77,9 @@ class EnchantCommand extends VanillaCommand{
 			}
 		}
 
-		$item->addEnchantment(new EnchantmentInstance($enchantment, $level));
-		$player->getInventory()->setItemInHand($item);
+		//this is necessary to deal with enchanted books, which are a different item type than regular books
+		$enchantedItem = EnchantingHelper::enchantItem($item, [new EnchantmentInstance($enchantment, $level)]);
+		$player->getInventory()->setItemInHand($enchantedItem);
 
 		self::broadcastCommandMessage($sender, KnownTranslationFactory::commands_enchant_success($player->getName()));
 		return true;
diff --git a/src/command/defaults/GamemodeCommand.php b/src/command/defaults/GamemodeCommand.php
index 4cddfc8f93..666626a692 100644
--- a/src/command/defaults/GamemodeCommand.php
+++ b/src/command/defaults/GamemodeCommand.php
@@ -30,27 +30,22 @@ use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\permission\DefaultPermissionNames;
 use pocketmine\player\GameMode;
 use function count;
-use function implode;
 
 class GamemodeCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"gamemode",
 			KnownTranslationFactory::pocketmine_command_gamemode_description(),
 			KnownTranslationFactory::commands_gamemode_usage()
 		);
-		$this->setPermission(implode(";", [
+		$this->setPermissions([
 			DefaultPermissionNames::COMMAND_GAMEMODE_SELF,
 			DefaultPermissionNames::COMMAND_GAMEMODE_OTHER
-		]));
+		]);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) === 0){
 			throw new InvalidCommandSyntaxException();
 		}
@@ -66,13 +61,13 @@ class GamemodeCommand extends VanillaCommand{
 			return true;
 		}
 
-		if($target->getGamemode()->equals($gameMode)){
+		if($target->getGamemode() === $gameMode){
 			$sender->sendMessage(KnownTranslationFactory::pocketmine_command_gamemode_failure($target->getName()));
 			return true;
 		}
 
 		$target->setGamemode($gameMode);
-		if(!$gameMode->equals($target->getGamemode())){
+		if($gameMode !== $target->getGamemode()){
 			$sender->sendMessage(KnownTranslationFactory::pocketmine_command_gamemode_failure($target->getName()));
 		}else{
 			if($target === $sender){
diff --git a/src/command/defaults/GarbageCollectorCommand.php b/src/command/defaults/GarbageCollectorCommand.php
index cdfe2b8838..7bd64666f1 100644
--- a/src/command/defaults/GarbageCollectorCommand.php
+++ b/src/command/defaults/GarbageCollectorCommand.php
@@ -34,19 +34,15 @@ use function round;
 
 class GarbageCollectorCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"gc",
 			KnownTranslationFactory::pocketmine_command_gc_description()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_GC);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		$chunksCollected = 0;
 		$entitiesCollected = 0;
 
diff --git a/src/command/defaults/GiveCommand.php b/src/command/defaults/GiveCommand.php
index 4b8fbe3fe3..72d33688b0 100644
--- a/src/command/defaults/GiveCommand.php
+++ b/src/command/defaults/GiveCommand.php
@@ -41,23 +41,19 @@ use function implode;
 
 class GiveCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"give",
 			KnownTranslationFactory::pocketmine_command_give_description(),
 			KnownTranslationFactory::pocketmine_command_give_usage()
 		);
-		$this->setPermission(implode(";", [
+		$this->setPermissions([
 			DefaultPermissionNames::COMMAND_GIVE_SELF,
 			DefaultPermissionNames::COMMAND_GIVE_OTHER
-		]));
+		]);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) < 2){
 			throw new InvalidCommandSyntaxException();
 		}
diff --git a/src/command/defaults/HelpCommand.php b/src/command/defaults/HelpCommand.php
index 9eec9bc68c..487c915f28 100644
--- a/src/command/defaults/HelpCommand.php
+++ b/src/command/defaults/HelpCommand.php
@@ -44,9 +44,9 @@ use const SORT_NATURAL;
 
 class HelpCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"help",
 			KnownTranslationFactory::pocketmine_command_help_description(),
 			KnownTranslationFactory::commands_help_usage(),
 			["?"]
@@ -55,10 +55,6 @@ class HelpCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) === 0){
 			$commandName = "";
 			$pageNumber = 1;
diff --git a/src/command/defaults/KickCommand.php b/src/command/defaults/KickCommand.php
index 3ccb2e527c..3d63e8bb33 100644
--- a/src/command/defaults/KickCommand.php
+++ b/src/command/defaults/KickCommand.php
@@ -37,9 +37,9 @@ use function trim;
 
 class KickCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"kick",
 			KnownTranslationFactory::pocketmine_command_kick_description(),
 			KnownTranslationFactory::commands_kick_usage()
 		);
@@ -47,10 +47,6 @@ class KickCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) === 0){
 			throw new InvalidCommandSyntaxException();
 		}
@@ -59,7 +55,7 @@ class KickCommand extends VanillaCommand{
 		$reason = trim(implode(" ", $args));
 
 		if(($player = $sender->getServer()->getPlayerByPrefix($name)) instanceof Player){
-			$player->kick("Kicked by admin." . ($reason !== "" ? " Reason: " . $reason : ""));
+			$player->kick($reason !== "" ? KnownTranslationFactory::pocketmine_disconnect_kick($reason) : KnownTranslationFactory::pocketmine_disconnect_kick_noReason());
 			if($reason !== ""){
 				Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_kick_success_reason($player->getName(), $reason));
 			}else{
diff --git a/src/command/defaults/KillCommand.php b/src/command/defaults/KillCommand.php
index e452f79254..fbc7436902 100644
--- a/src/command/defaults/KillCommand.php
+++ b/src/command/defaults/KillCommand.php
@@ -30,25 +30,20 @@ use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\permission\DefaultPermissionNames;
 use function count;
-use function implode;
 
 class KillCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"kill",
 			KnownTranslationFactory::pocketmine_command_kill_description(),
 			KnownTranslationFactory::pocketmine_command_kill_usage(),
 			["suicide"]
 		);
-		$this->setPermission(implode(";", [DefaultPermissionNames::COMMAND_KILL_SELF, DefaultPermissionNames::COMMAND_KILL_OTHER]));
+		$this->setPermissions([DefaultPermissionNames::COMMAND_KILL_SELF, DefaultPermissionNames::COMMAND_KILL_OTHER]);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) >= 2){
 			throw new InvalidCommandSyntaxException();
 		}
@@ -58,7 +53,7 @@ class KillCommand extends VanillaCommand{
 			return true;
 		}
 
-		$player->attack(new EntityDamageEvent($player, EntityDamageEvent::CAUSE_SUICIDE, 1000));
+		$player->attack(new EntityDamageEvent($player, EntityDamageEvent::CAUSE_SUICIDE, $player->getHealth()));
 		if($player === $sender){
 			$sender->sendMessage(KnownTranslationFactory::commands_kill_successful($sender->getName()));
 		}else{
diff --git a/src/command/defaults/ListCommand.php b/src/command/defaults/ListCommand.php
index 5df3e1a918..0264a2ef4f 100644
--- a/src/command/defaults/ListCommand.php
+++ b/src/command/defaults/ListCommand.php
@@ -36,19 +36,15 @@ use const SORT_STRING;
 
 class ListCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"list",
 			KnownTranslationFactory::pocketmine_command_list_description()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_LIST);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		$playerNames = array_map(function(Player $player) : string{
 			return $player->getName();
 		}, array_filter($sender->getServer()->getOnlinePlayers(), function(Player $player) use ($sender) : bool{
diff --git a/src/command/defaults/MeCommand.php b/src/command/defaults/MeCommand.php
index 82bec234f8..a6708840c3 100644
--- a/src/command/defaults/MeCommand.php
+++ b/src/command/defaults/MeCommand.php
@@ -34,9 +34,9 @@ use function implode;
 
 class MeCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"me",
 			KnownTranslationFactory::pocketmine_command_me_description(),
 			KnownTranslationFactory::commands_me_usage()
 		);
@@ -44,10 +44,6 @@ class MeCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) === 0){
 			throw new InvalidCommandSyntaxException();
 		}
diff --git a/src/command/defaults/OpCommand.php b/src/command/defaults/OpCommand.php
index 53cbc7461b..bcd1193511 100644
--- a/src/command/defaults/OpCommand.php
+++ b/src/command/defaults/OpCommand.php
@@ -35,9 +35,9 @@ use function count;
 
 class OpCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"op",
 			KnownTranslationFactory::pocketmine_command_op_description(),
 			KnownTranslationFactory::commands_op_usage()
 		);
@@ -45,10 +45,6 @@ class OpCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) === 0){
 			throw new InvalidCommandSyntaxException();
 		}
diff --git a/src/command/defaults/PardonCommand.php b/src/command/defaults/PardonCommand.php
index a1ea1e6ee5..425b9e69f1 100644
--- a/src/command/defaults/PardonCommand.php
+++ b/src/command/defaults/PardonCommand.php
@@ -32,9 +32,9 @@ use function count;
 
 class PardonCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"pardon",
 			KnownTranslationFactory::pocketmine_command_unban_player_description(),
 			KnownTranslationFactory::commands_unban_usage(),
 			["unban"]
@@ -43,10 +43,6 @@ class PardonCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) !== 1){
 			throw new InvalidCommandSyntaxException();
 		}
diff --git a/src/command/defaults/PardonIpCommand.php b/src/command/defaults/PardonIpCommand.php
index d9a229354a..65bed221b0 100644
--- a/src/command/defaults/PardonIpCommand.php
+++ b/src/command/defaults/PardonIpCommand.php
@@ -33,9 +33,9 @@ use function inet_pton;
 
 class PardonIpCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"pardon-ip",
 			KnownTranslationFactory::pocketmine_command_unban_ip_description(),
 			KnownTranslationFactory::commands_unbanip_usage(),
 			["unban-ip"]
@@ -44,10 +44,6 @@ class PardonIpCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) !== 1){
 			throw new InvalidCommandSyntaxException();
 		}
diff --git a/src/command/defaults/ParticleCommand.php b/src/command/defaults/ParticleCommand.php
index 5beb650a9e..f20d47ccc3 100644
--- a/src/command/defaults/ParticleCommand.php
+++ b/src/command/defaults/ParticleCommand.php
@@ -23,11 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\command\defaults;
 
-use pocketmine\block\BlockFactory;
+use pocketmine\block\BlockTypeIds;
 use pocketmine\color\Color;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\item\ItemFactory;
+use pocketmine\item\StringToItemParser;
 use pocketmine\item\VanillaItems;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\math\Vector3;
@@ -70,14 +70,13 @@ use function explode;
 use function max;
 use function microtime;
 use function mt_rand;
-use function str_starts_with;
 use function strtolower;
 
 class ParticleCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"particle",
 			KnownTranslationFactory::pocketmine_command_particle_description(),
 			KnownTranslationFactory::pocketmine_command_particle_usage()
 		);
@@ -85,10 +84,6 @@ class ParticleCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) < 7){
 			throw new InvalidCommandSyntaxException();
 		}
@@ -114,7 +109,7 @@ class ParticleCommand extends VanillaCommand{
 
 		$count = isset($args[7]) ? max(1, (int) $args[7]) : 1;
 
-		$data = isset($args[8]) ? (int) $args[8] : null;
+		$data = $args[8] ?? null;
 
 		$particle = $this->getParticle($name, $data);
 
@@ -138,7 +133,7 @@ class ParticleCommand extends VanillaCommand{
 		return true;
 	}
 
-	private function getParticle(string $name, ?int $data = null) : ?Particle{
+	private function getParticle(string $name, ?string $data = null) : ?Particle{
 		switch($name){
 			case "explode":
 				return new ExplodeParticle();
@@ -156,7 +151,7 @@ class ParticleCommand extends VanillaCommand{
 			case "crit":
 				return new CriticalParticle();
 			case "smoke":
-				return new SmokeParticle($data ?? 0);
+				return new SmokeParticle((int) ($data ?? 0));
 			case "spell":
 				return new EnchantParticle(new Color(0, 0, 0, 255)); //TODO: colour support
 			case "instantspell":
@@ -175,25 +170,31 @@ class ParticleCommand extends VanillaCommand{
 			case "lava":
 				return new LavaParticle();
 			case "reddust":
-				return new RedstoneParticle($data ?? 1);
+				return new RedstoneParticle((int) ($data ?? 1));
 			case "snowballpoof":
 				return new ItemBreakParticle(VanillaItems::SNOWBALL());
 			case "slime":
 				return new ItemBreakParticle(VanillaItems::SLIMEBALL());
 			case "itembreak":
-				if($data !== null && $data !== 0){
-					return new ItemBreakParticle(ItemFactory::getInstance()->get($data));
+				if($data !== null){
+					$item = StringToItemParser::getInstance()->parse($data);
+					if($item !== null && !$item->isNull()){
+						return new ItemBreakParticle($item);
+					}
 				}
 				break;
 			case "terrain":
-				if($data !== null && $data !== 0){
-					return new TerrainParticle(BlockFactory::getInstance()->get($data, 0));
+				if($data !== null){
+					$block = StringToItemParser::getInstance()->parse($data)?->getBlock();
+					if($block !== null && $block->getTypeId() !== BlockTypeIds::AIR){
+						return new TerrainParticle($block);
+					}
 				}
 				break;
 			case "heart":
-				return new HeartParticle($data ?? 0);
+				return new HeartParticle((int) ($data ?? 0));
 			case "ink":
-				return new InkParticle($data ?? 0);
+				return new InkParticle((int) ($data ?? 0));
 			case "droplet":
 				return new RainSplashParticle();
 			case "enchantmenttable":
@@ -203,26 +204,32 @@ class ParticleCommand extends VanillaCommand{
 			case "angryvillager":
 				return new AngryVillagerParticle();
 			case "forcefield":
-				return new BlockForceFieldParticle($data ?? 0);
+				return new BlockForceFieldParticle((int) ($data ?? 0));
 			case "mobflame":
 				return new EntityFlameParticle();
-		}
-
-		if(str_starts_with($name, "iconcrack_")){
-			$d = explode("_", $name);
-			if(count($d) === 3){
-				return new ItemBreakParticle(ItemFactory::getInstance()->get((int) $d[1], (int) $d[2]));
-			}
-		}elseif(str_starts_with($name, "blockcrack_")){
-			$d = explode("_", $name);
-			if(count($d) === 2){
-				return new TerrainParticle(BlockFactory::getInstance()->get(((int) $d[1]) & 0xff, ((int) $d[1]) >> 12));
-			}
-		}elseif(str_starts_with($name, "blockdust_")){
-			$d = explode("_", $name);
-			if(count($d) >= 4){
-				return new DustParticle(new Color(((int) $d[1]) & 0xff, ((int) $d[2]) & 0xff, ((int) $d[3]) & 0xff, isset($d[4]) ? ((int) $d[4]) & 0xff : 255));
-			}
+			case "iconcrack":
+				if($data !== null && ($item = StringToItemParser::getInstance()->parse($data)) !== null && !$item->isNull()){
+					return new ItemBreakParticle($item);
+				}
+				break;
+			case "blockcrack":
+				if($data !== null && ($block = StringToItemParser::getInstance()->parse($data)?->getBlock()) !== null && $block->getTypeId() !== BlockTypeIds::AIR){
+					return new TerrainParticle($block);
+				}
+				break;
+			case "blockdust":
+				if($data !== null){
+					$d = explode("_", $data);
+					if(count($d) >= 3){
+						return new DustParticle(new Color(
+							((int) $d[0]) & 0xff,
+							((int) $d[1]) & 0xff,
+							((int) $d[2]) & 0xff,
+							((int) ($d[3] ?? 255)) & 0xff
+						));
+					}
+				}
+				break;
 		}
 
 		return null;
diff --git a/src/command/defaults/PluginsCommand.php b/src/command/defaults/PluginsCommand.php
index 420b7708c9..d68fcbb01a 100644
--- a/src/command/defaults/PluginsCommand.php
+++ b/src/command/defaults/PluginsCommand.php
@@ -36,9 +36,9 @@ use const SORT_STRING;
 
 class PluginsCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"plugins",
 			KnownTranslationFactory::pocketmine_command_plugins_description(),
 			null,
 			["pl"]
@@ -47,10 +47,6 @@ class PluginsCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		$list = array_map(function(Plugin $plugin) : string{
 			return ($plugin->isEnabled() ? TextFormat::GREEN : TextFormat::RED) . $plugin->getDescription()->getFullName();
 		}, $sender->getServer()->getPluginManager()->getPlugins());
diff --git a/src/command/defaults/SaveCommand.php b/src/command/defaults/SaveCommand.php
index 10d036d55c..4e406e6a3c 100644
--- a/src/command/defaults/SaveCommand.php
+++ b/src/command/defaults/SaveCommand.php
@@ -32,19 +32,15 @@ use function round;
 
 class SaveCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"save-all",
 			KnownTranslationFactory::pocketmine_command_save_description()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_SAVE_PERFORM);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		Command::broadcastCommandMessage($sender, KnownTranslationFactory::pocketmine_save_start());
 		$start = microtime(true);
 
diff --git a/src/command/defaults/SaveOffCommand.php b/src/command/defaults/SaveOffCommand.php
index b4d86d486c..73b8ca1517 100644
--- a/src/command/defaults/SaveOffCommand.php
+++ b/src/command/defaults/SaveOffCommand.php
@@ -30,19 +30,15 @@ use pocketmine\permission\DefaultPermissionNames;
 
 class SaveOffCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"save-off",
 			KnownTranslationFactory::pocketmine_command_saveoff_description()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_SAVE_DISABLE);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		$sender->getServer()->getWorldManager()->setAutoSave(false);
 
 		Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_save_disabled());
diff --git a/src/command/defaults/SaveOnCommand.php b/src/command/defaults/SaveOnCommand.php
index 20504122b7..f0a324aebe 100644
--- a/src/command/defaults/SaveOnCommand.php
+++ b/src/command/defaults/SaveOnCommand.php
@@ -30,19 +30,15 @@ use pocketmine\permission\DefaultPermissionNames;
 
 class SaveOnCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"save-on",
 			KnownTranslationFactory::pocketmine_command_saveon_description()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_SAVE_ENABLE);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		$sender->getServer()->getWorldManager()->setAutoSave(true);
 
 		Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_save_enabled());
diff --git a/src/command/defaults/SayCommand.php b/src/command/defaults/SayCommand.php
index 16e681553a..5c3203b5f0 100644
--- a/src/command/defaults/SayCommand.php
+++ b/src/command/defaults/SayCommand.php
@@ -35,9 +35,9 @@ use function implode;
 
 class SayCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"say",
 			KnownTranslationFactory::pocketmine_command_say_description(),
 			KnownTranslationFactory::commands_say_usage()
 		);
@@ -45,10 +45,6 @@ class SayCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) === 0){
 			throw new InvalidCommandSyntaxException();
 		}
diff --git a/src/command/defaults/SeedCommand.php b/src/command/defaults/SeedCommand.php
index e7345f8baa..6b426bd45e 100644
--- a/src/command/defaults/SeedCommand.php
+++ b/src/command/defaults/SeedCommand.php
@@ -30,19 +30,15 @@ use pocketmine\player\Player;
 
 class SeedCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"seed",
 			KnownTranslationFactory::pocketmine_command_seed_description()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_SEED);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if($sender instanceof Player){
 			$seed = $sender->getPosition()->getWorld()->getSeed();
 		}else{
diff --git a/src/command/defaults/SetWorldSpawnCommand.php b/src/command/defaults/SetWorldSpawnCommand.php
index 0c0d46c110..f251ab8a44 100644
--- a/src/command/defaults/SetWorldSpawnCommand.php
+++ b/src/command/defaults/SetWorldSpawnCommand.php
@@ -36,9 +36,9 @@ use function count;
 
 class SetWorldSpawnCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"setworldspawn",
 			KnownTranslationFactory::pocketmine_command_setworldspawn_description(),
 			KnownTranslationFactory::commands_setworldspawn_usage()
 		);
@@ -46,10 +46,6 @@ class SetWorldSpawnCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) === 0){
 			if($sender instanceof Player){
 				$location = $sender->getPosition();
diff --git a/src/command/defaults/SpawnpointCommand.php b/src/command/defaults/SpawnpointCommand.php
index a4c1f2da89..614a749d53 100644
--- a/src/command/defaults/SpawnpointCommand.php
+++ b/src/command/defaults/SpawnpointCommand.php
@@ -32,28 +32,23 @@ use pocketmine\player\Player;
 use pocketmine\world\Position;
 use pocketmine\world\World;
 use function count;
-use function implode;
 use function round;
 
 class SpawnpointCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"spawnpoint",
 			KnownTranslationFactory::pocketmine_command_spawnpoint_description(),
 			KnownTranslationFactory::commands_spawnpoint_usage()
 		);
-		$this->setPermission(implode(";", [
+		$this->setPermissions([
 			DefaultPermissionNames::COMMAND_SPAWNPOINT_SELF,
 			DefaultPermissionNames::COMMAND_SPAWNPOINT_OTHER
-		]));
+		]);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		$target = $this->fetchPermittedPlayerTarget($sender, $args[0] ?? null, DefaultPermissionNames::COMMAND_SPAWNPOINT_SELF, DefaultPermissionNames::COMMAND_SPAWNPOINT_OTHER);
 		if($target === null){
 			return true;
diff --git a/src/command/defaults/StatusCommand.php b/src/command/defaults/StatusCommand.php
index 7c2884993d..033a2f2607 100644
--- a/src/command/defaults/StatusCommand.php
+++ b/src/command/defaults/StatusCommand.php
@@ -36,19 +36,15 @@ use function round;
 
 class StatusCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"status",
 			KnownTranslationFactory::pocketmine_command_status_description()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_STATUS);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		$mUsage = Process::getAdvancedMemoryUsage();
 
 		$server = $sender->getServer();
@@ -110,7 +106,8 @@ class StatusCommand extends VanillaCommand{
 			$worldName = $world->getFolderName() !== $world->getDisplayName() ? " (" . $world->getDisplayName() . ")" : "";
 			$timeColor = $world->getTickRateTime() > 40 ? TextFormat::RED : TextFormat::YELLOW;
 			$sender->sendMessage(TextFormat::GOLD . "World \"{$world->getFolderName()}\"$worldName: " .
-				TextFormat::RED . number_format(count($world->getLoadedChunks())) . TextFormat::GREEN . " chunks, " .
+				TextFormat::RED . number_format(count($world->getLoadedChunks())) . TextFormat::GREEN . " loaded chunks, " .
+				TextFormat::RED . number_format(count($world->getTickingChunks())) . TextFormat::GREEN . " ticking chunks, " .
 				TextFormat::RED . number_format(count($world->getEntities())) . TextFormat::GREEN . " entities. " .
 				"Time $timeColor" . round($world->getTickRateTime(), 2) . "ms"
 			);
diff --git a/src/command/defaults/StopCommand.php b/src/command/defaults/StopCommand.php
index 664fa3657f..bc4eef91cb 100644
--- a/src/command/defaults/StopCommand.php
+++ b/src/command/defaults/StopCommand.php
@@ -30,19 +30,15 @@ use pocketmine\permission\DefaultPermissionNames;
 
 class StopCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"stop",
 			KnownTranslationFactory::pocketmine_command_stop_description()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_STOP);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_stop_start());
 
 		$sender->getServer()->shutdown();
diff --git a/src/command/defaults/TeleportCommand.php b/src/command/defaults/TeleportCommand.php
index d1685dc8d5..b506364bf5 100644
--- a/src/command/defaults/TeleportCommand.php
+++ b/src/command/defaults/TeleportCommand.php
@@ -35,22 +35,21 @@ use pocketmine\utils\TextFormat;
 use pocketmine\world\World;
 use function array_shift;
 use function count;
-use function implode;
 use function round;
 
 class TeleportCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"tp",
 			KnownTranslationFactory::pocketmine_command_tp_description(),
 			KnownTranslationFactory::commands_tp_usage(),
 			["teleport"]
 		);
-		$this->setPermission(implode(";", [
+		$this->setPermissions([
 			DefaultPermissionNames::COMMAND_TELEPORT_SELF,
 			DefaultPermissionNames::COMMAND_TELEPORT_OTHER
-		]));
+		]);
 	}
 
 	private function findPlayer(CommandSender $sender, string $playerName) : ?Player{
@@ -63,10 +62,6 @@ class TeleportCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		switch(count($args)){
 			case 1: // /tp targetPlayer
 			case 3: // /tp x y z
diff --git a/src/command/defaults/TellCommand.php b/src/command/defaults/TellCommand.php
index bf36d255fa..713023382b 100644
--- a/src/command/defaults/TellCommand.php
+++ b/src/command/defaults/TellCommand.php
@@ -36,9 +36,9 @@ use function implode;
 
 class TellCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"tell",
 			KnownTranslationFactory::pocketmine_command_tell_description(),
 			KnownTranslationFactory::commands_message_usage(),
 			["w", "msg"]
@@ -47,10 +47,6 @@ class TellCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) < 2){
 			throw new InvalidCommandSyntaxException();
 		}
diff --git a/src/command/defaults/TimeCommand.php b/src/command/defaults/TimeCommand.php
index 49edee2b84..8e937b21be 100644
--- a/src/command/defaults/TimeCommand.php
+++ b/src/command/defaults/TimeCommand.php
@@ -31,29 +31,25 @@ use pocketmine\permission\DefaultPermissionNames;
 use pocketmine\player\Player;
 use pocketmine\world\World;
 use function count;
-use function implode;
 
 class TimeCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"time",
 			KnownTranslationFactory::pocketmine_command_time_description(),
 			KnownTranslationFactory::pocketmine_command_time_usage()
 		);
-		$this->setPermission(implode(";", [
+		$this->setPermissions([
 			DefaultPermissionNames::COMMAND_TIME_ADD,
 			DefaultPermissionNames::COMMAND_TIME_SET,
 			DefaultPermissionNames::COMMAND_TIME_START,
 			DefaultPermissionNames::COMMAND_TIME_STOP,
 			DefaultPermissionNames::COMMAND_TIME_QUERY
-		]));
+		]);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
 		if(count($args) < 1){
 			throw new InvalidCommandSyntaxException();
 		}
diff --git a/src/command/defaults/TimingsCommand.php b/src/command/defaults/TimingsCommand.php
index ecfa7b281c..3c0701ea42 100644
--- a/src/command/defaults/TimingsCommand.php
+++ b/src/command/defaults/TimingsCommand.php
@@ -35,6 +35,7 @@ use pocketmine\timings\TimingsHandler;
 use pocketmine\utils\InternetException;
 use pocketmine\utils\InternetRequestResult;
 use pocketmine\utils\Utils;
+use pocketmine\YmlServerProperties;
 use Symfony\Component\Filesystem\Path;
 use function count;
 use function fclose;
@@ -57,9 +58,9 @@ use const PHP_EOL;
 
 class TimingsCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"timings",
 			KnownTranslationFactory::pocketmine_command_timings_description(),
 			KnownTranslationFactory::pocketmine_command_timings_usage()
 		);
@@ -67,10 +68,6 @@ class TimingsCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) !== 1){
 			throw new InvalidCommandSyntaxException();
 		}
@@ -134,7 +131,7 @@ class TimingsCommand extends VanillaCommand{
 				];
 				fclose($fileTimings);
 
-				$host = $sender->getServer()->getConfigGroup()->getPropertyString("timings.host", "timings.pmmp.io");
+				$host = $sender->getServer()->getConfigGroup()->getPropertyString(YmlServerProperties::TIMINGS_HOST, "timings.pmmp.io");
 
 				$sender->getServer()->getAsyncPool()->submitTask(new BulkCurlTask(
 					[new BulkCurlTaskOperation(
@@ -167,6 +164,7 @@ class TimingsCommand extends VanillaCommand{
 							Command::broadcastCommandMessage($sender, KnownTranslationFactory::pocketmine_command_timings_timingsRead(
 								"https://" . $host . "/?id=" . $response["id"]));
 						}else{
+							$sender->getServer()->getLogger()->debug("Invalid response from timings server (" . $result->getCode() . "): " . $result->getBody());
 							Command::broadcastCommandMessage($sender, KnownTranslationFactory::pocketmine_command_timings_pasteError());
 						}
 					}
diff --git a/src/command/defaults/TitleCommand.php b/src/command/defaults/TitleCommand.php
index ce722d484b..ecc4c569cf 100644
--- a/src/command/defaults/TitleCommand.php
+++ b/src/command/defaults/TitleCommand.php
@@ -33,23 +33,19 @@ use function implode;
 
 class TitleCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"title",
 			KnownTranslationFactory::pocketmine_command_title_description(),
 			KnownTranslationFactory::commands_title_usage()
 		);
-		$this->setPermission(implode(";", [
+		$this->setPermissions([
 			DefaultPermissionNames::COMMAND_TITLE_SELF,
 			DefaultPermissionNames::COMMAND_TITLE_OTHER
-		]));
+		]);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) < 2){
 			throw new InvalidCommandSyntaxException();
 		}
diff --git a/src/command/defaults/TransferServerCommand.php b/src/command/defaults/TransferServerCommand.php
index 5d15c82585..d0cbd316a9 100644
--- a/src/command/defaults/TransferServerCommand.php
+++ b/src/command/defaults/TransferServerCommand.php
@@ -32,9 +32,9 @@ use function count;
 
 class TransferServerCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"transferserver",
 			KnownTranslationFactory::pocketmine_command_transferserver_description(),
 			KnownTranslationFactory::pocketmine_command_transferserver_usage()
 		);
@@ -42,10 +42,6 @@ class TransferServerCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) < 1){
 			throw new InvalidCommandSyntaxException();
 		}elseif(!($sender instanceof Player)){
diff --git a/src/command/defaults/VersionCommand.php b/src/command/defaults/VersionCommand.php
index 487f84affc..bafb129d1a 100644
--- a/src/command/defaults/VersionCommand.php
+++ b/src/command/defaults/VersionCommand.php
@@ -40,9 +40,9 @@ use const PHP_VERSION;
 
 class VersionCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"version",
 			KnownTranslationFactory::pocketmine_command_version_description(),
 			KnownTranslationFactory::pocketmine_command_version_usage(),
 			["ver", "about"]
@@ -51,10 +51,6 @@ class VersionCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) === 0){
 			$sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_serverSoftwareName(
 				TextFormat::GREEN . VersionInfo::NAME . TextFormat::RESET
diff --git a/src/command/defaults/WhitelistCommand.php b/src/command/defaults/WhitelistCommand.php
index 02fd65f23f..fdf01ff562 100644
--- a/src/command/defaults/WhitelistCommand.php
+++ b/src/command/defaults/WhitelistCommand.php
@@ -30,6 +30,7 @@ use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\permission\DefaultPermissionNames;
 use pocketmine\player\Player;
 use pocketmine\Server;
+use pocketmine\ServerProperties;
 use function count;
 use function implode;
 use function sort;
@@ -38,27 +39,23 @@ use const SORT_STRING;
 
 class WhitelistCommand extends VanillaCommand{
 
-	public function __construct(string $name){
+	public function __construct(){
 		parent::__construct(
-			$name,
+			"whitelist",
 			KnownTranslationFactory::pocketmine_command_whitelist_description(),
 			KnownTranslationFactory::commands_whitelist_usage()
 		);
-		$this->setPermission(implode(";", [
+		$this->setPermissions([
 			DefaultPermissionNames::COMMAND_WHITELIST_RELOAD,
 			DefaultPermissionNames::COMMAND_WHITELIST_ENABLE,
 			DefaultPermissionNames::COMMAND_WHITELIST_DISABLE,
 			DefaultPermissionNames::COMMAND_WHITELIST_LIST,
 			DefaultPermissionNames::COMMAND_WHITELIST_ADD,
 			DefaultPermissionNames::COMMAND_WHITELIST_REMOVE
-		]));
+		]);
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
-		if(!$this->testPermission($sender)){
-			return true;
-		}
-
 		if(count($args) === 1){
 			switch(strtolower($args[0])){
 				case "reload":
@@ -75,7 +72,7 @@ class WhitelistCommand extends VanillaCommand{
 				case "on":
 					if($this->testPermission($sender, DefaultPermissionNames::COMMAND_WHITELIST_ENABLE)){
 						$server = $sender->getServer();
-						$server->getConfigGroup()->setConfigBool("white-list", true);
+						$server->getConfigGroup()->setConfigBool(ServerProperties::WHITELIST, true);
 						$this->kickNonWhitelistedPlayers($server);
 						Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_whitelist_enabled());
 					}
@@ -83,7 +80,7 @@ class WhitelistCommand extends VanillaCommand{
 					return true;
 				case "off":
 					if($this->testPermission($sender, DefaultPermissionNames::COMMAND_WHITELIST_DISABLE)){
-						$sender->getServer()->getConfigGroup()->setConfigBool("white-list", false);
+						$sender->getServer()->getConfigGroup()->setConfigBool(ServerProperties::WHITELIST, false);
 						Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_whitelist_disabled());
 					}
 
@@ -126,7 +123,7 @@ class WhitelistCommand extends VanillaCommand{
 						$server = $sender->getServer();
 						$server->removeWhitelist($args[1]);
 						if(!$server->isWhitelisted($args[1])){
-							$server->getPlayerExact($args[1])?->kick("Server whitelisted.");
+							$server->getPlayerExact($args[1])?->kick(KnownTranslationFactory::pocketmine_disconnect_kick(KnownTranslationFactory::pocketmine_disconnect_whitelisted()));
 						}
 						Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_whitelist_remove_success($args[1]));
 					}
@@ -139,9 +136,10 @@ class WhitelistCommand extends VanillaCommand{
 	}
 
 	private function kickNonWhitelistedPlayers(Server $server) : void{
+		$message = KnownTranslationFactory::pocketmine_disconnect_kick(KnownTranslationFactory::pocketmine_disconnect_whitelisted());
 		foreach($server->getOnlinePlayers() as $player){
 			if(!$server->isWhitelisted($player->getName())){
-				$player->kick("Server whitelisted.");
+				$player->kick($message);
 			}
 		}
 	}
diff --git a/src/command/defaults/XpCommand.php b/src/command/defaults/XpCommand.php
new file mode 100644
index 0000000000..cb03523657
--- /dev/null
+++ b/src/command/defaults/XpCommand.php
@@ -0,0 +1,89 @@
+<?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\command\defaults;
+
+use pocketmine\command\CommandSender;
+use pocketmine\command\utils\InvalidCommandSyntaxException;
+use pocketmine\entity\Attribute;
+use pocketmine\lang\KnownTranslationFactory;
+use pocketmine\permission\DefaultPermissionNames;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Limits;
+use pocketmine\utils\TextFormat;
+use function abs;
+use function count;
+use function str_ends_with;
+use function substr;
+
+class XpCommand extends VanillaCommand{
+
+	public function __construct(){
+		parent::__construct(
+			"xp",
+			KnownTranslationFactory::pocketmine_command_xp_description(),
+			KnownTranslationFactory::pocketmine_command_xp_usage()
+		);
+		$this->setPermissions([
+			DefaultPermissionNames::COMMAND_XP_SELF,
+			DefaultPermissionNames::COMMAND_XP_OTHER
+		]);
+	}
+
+	public function execute(CommandSender $sender, string $commandLabel, array $args){
+		if(count($args) < 1){
+			throw new InvalidCommandSyntaxException();
+		}
+
+		$player = $this->fetchPermittedPlayerTarget($sender, $args[1] ?? null, DefaultPermissionNames::COMMAND_XP_SELF, DefaultPermissionNames::COMMAND_XP_OTHER);
+		if($player === null){
+			return true;
+		}
+
+		$xpManager = $player->getXpManager();
+		if(str_ends_with($args[0], "L")){
+			$xpLevelAttr = $player->getAttributeMap()->get(Attribute::EXPERIENCE_LEVEL) ?? throw new AssumptionFailedError();
+			$maxXpLevel = (int) $xpLevelAttr->getMaxValue();
+			$currentXpLevel = $xpManager->getXpLevel();
+			$xpLevels = $this->getInteger($sender, substr($args[0], 0, -1), -$currentXpLevel, $maxXpLevel - $currentXpLevel);
+			if($xpLevels >= 0){
+				$xpManager->addXpLevels($xpLevels, false);
+				$sender->sendMessage(KnownTranslationFactory::commands_xp_success_levels((string) $xpLevels, $player->getName()));
+			}else{
+				$xpLevels = abs($xpLevels);
+				$xpManager->subtractXpLevels($xpLevels);
+				$sender->sendMessage(KnownTranslationFactory::commands_xp_success_negative_levels((string) $xpLevels, $player->getName()));
+			}
+		}else{
+			$xp = $this->getInteger($sender, $args[0], max: Limits::INT32_MAX);
+			if($xp < 0){
+				$sender->sendMessage(KnownTranslationFactory::commands_xp_failure_widthdrawXp()->prefix(TextFormat::RED));
+			}else{
+				$xpManager->addXp($xp, false);
+				$sender->sendMessage(KnownTranslationFactory::commands_xp_success((string) $xp, $player->getName()));
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/src/console/ConsoleCommandSender.php b/src/console/ConsoleCommandSender.php
index ef3683b0bc..aa7ea6e699 100644
--- a/src/console/ConsoleCommandSender.php
+++ b/src/console/ConsoleCommandSender.php
@@ -39,11 +39,8 @@ use const PHP_INT_MAX;
 class ConsoleCommandSender implements CommandSender{
 	use PermissibleDelegateTrait;
 
-	/**
-	 * @var int|null
-	 * @phpstan-var positive-int|null
-	 */
-	protected $lineHeight = null;
+	/** @phpstan-var positive-int|null */
+	protected ?int $lineHeight = null;
 
 	public function __construct(
 		private Server $server,
diff --git a/src/console/ConsoleReaderChildProcess.php b/src/console/ConsoleReaderChildProcess.php
index 2d4e3fc56f..c0c4f0048f 100644
--- a/src/console/ConsoleReaderChildProcess.php
+++ b/src/console/ConsoleReaderChildProcess.php
@@ -23,36 +23,39 @@ declare(strict_types=1);
 
 namespace pocketmine\console;
 
+use pmmp\thread\Thread as NativeThread;
+use pmmp\thread\ThreadSafeArray;
 use pocketmine\utils\Process;
 use function cli_set_process_title;
 use function count;
 use function dirname;
-use function feof;
 use function fwrite;
-use function stream_socket_client;
-use const PTHREADS_INHERIT_NONE;
+use function is_numeric;
+use const PHP_EOL;
+use const STDOUT;
+
+if(count($argv) !== 2 || !is_numeric($argv[1])){
+	echo "Usage: " . $argv[0] . " <command token seed>" . PHP_EOL;
+	exit(1);
+}
+
+$commandTokenSeed = (int) $argv[1];
 
 require dirname(__DIR__, 2) . '/vendor/autoload.php';
 
-if(count($argv) !== 2){
-	die("Please provide a server to connect to");
-}
-
 @cli_set_process_title('PocketMine-MP Console Reader');
-$errCode = null;
-$errMessage = null;
-$socket = stream_socket_client($argv[1], $errCode, $errMessage, 15.0);
-if($socket === false){
-	throw new \RuntimeException("Failed to connect to server process ($errCode): $errMessage");
-}
 
-$channel = new \Threaded();
-$thread = new class($channel) extends \Thread{
+/** @phpstan-var ThreadSafeArray<int, string> $channel */
+$channel = new ThreadSafeArray();
+$thread = new class($channel) extends NativeThread{
+	/**
+	 * @phpstan-param ThreadSafeArray<int, string> $channel
+	 */
 	public function __construct(
-		private \Threaded $channel,
+		private ThreadSafeArray $channel,
 	){}
 
-	public function run(){
+	public function run() : void{
 		require dirname(__DIR__, 2) . '/vendor/autoload.php';
 
 		$channel = $this->channel;
@@ -69,17 +72,16 @@ $thread = new class($channel) extends \Thread{
 	}
 };
 
-$thread->start(PTHREADS_INHERIT_NONE);
-while(!feof($socket)){
+$thread->start(NativeThread::INHERIT_NONE);
+while(true){
 	$line = $channel->synchronized(function() use ($channel) : ?string{
 		if(count($channel) === 0){
 			$channel->wait(1_000_000);
 		}
-		/** @var string|null $line */
-		$line = $channel->shift();
-		return $line;
+		return $channel->shift();
 	});
-	if(@fwrite($socket, ($line ?? "") . "\n") === false){
+	$message = $line !== null ? ConsoleReaderChildProcessUtils::createMessage($line, $commandTokenSeed) : "";
+	if(@fwrite(STDOUT, $message . "\n") === false){
 		//Always send even if there's no line, to check if the parent is alive
 		//If the parent process was terminated forcibly, it won't close the connection properly, so feof() will return
 		//false even though the connection is actually broken. However, fwrite() will fail.
@@ -90,4 +92,4 @@ while(!feof($socket)){
 //For simplicity's sake, we don't bother with a graceful shutdown here.
 //The parent process would normally forcibly terminate the child process anyway, so we only reach this point if the
 //parent process was terminated forcibly and didn't clean up after itself.
-Process::kill(Process::pid(), false);
+Process::kill(Process::pid());
diff --git a/src/console/ConsoleReaderChildProcessDaemon.php b/src/console/ConsoleReaderChildProcessDaemon.php
index 138559f06e..f7300b7a52 100644
--- a/src/console/ConsoleReaderChildProcessDaemon.php
+++ b/src/console/ConsoleReaderChildProcessDaemon.php
@@ -29,19 +29,16 @@ use Symfony\Component\Filesystem\Path;
 use function base64_encode;
 use function fgets;
 use function fopen;
+use function mt_rand;
 use function preg_replace;
 use function proc_close;
 use function proc_open;
 use function proc_terminate;
+use function rtrim;
 use function sprintf;
 use function stream_select;
-use function stream_socket_accept;
-use function stream_socket_get_name;
-use function stream_socket_server;
-use function stream_socket_shutdown;
 use function trim;
 use const PHP_BINARY;
-use const STREAM_SHUT_RDWR;
 
 /**
  * This pile of shit exists because PHP on Windows is broken, and can't handle stream_select() on stdin or pipes
@@ -58,44 +55,44 @@ use const STREAM_SHUT_RDWR;
  * communication.
  */
 final class ConsoleReaderChildProcessDaemon{
+	public const TOKEN_DELIMITER = ":";
+	public const TOKEN_HASH_ALGO = "xxh3";
+
 	private \PrefixedLogger $logger;
 	/** @var resource */
 	private $subprocess;
 	/** @var resource */
 	private $socket;
+	private int $commandTokenSeed;
 
 	public function __construct(
 		\Logger $logger
 	){
 		$this->logger = new \PrefixedLogger($logger, "Console Reader Daemon");
+		$this->commandTokenSeed = mt_rand();
 		$this->prepareSubprocess();
 	}
 
 	private function prepareSubprocess() : void{
-		$server = stream_socket_server("tcp://127.0.0.1:0");
-		if($server === false){
-			throw new \RuntimeException("Failed to open console reader socket server");
-		}
-		$address = Utils::assumeNotFalse(stream_socket_get_name($server, false), "stream_socket_get_name() shouldn't return false here");
-
 		//Windows sucks, and likes to corrupt UTF-8 file paths when they travel to the subprocess, so we base64 encode
 		//the path to avoid the problem. This is an abysmally shitty hack, but here we are :(
 		$sub = Utils::assumeNotFalse(proc_open(
-			[PHP_BINARY, '-dopcache.enable_cli=0', '-r', sprintf('require base64_decode("%s", true);', base64_encode(Path::join(__DIR__, 'ConsoleReaderChildProcess.php'))), $address],
 			[
+				PHP_BINARY,
+				'-dopcache.enable_cli=0',
+				'-r',
+				sprintf('require base64_decode("%s", true);', base64_encode(Path::join(__DIR__, 'ConsoleReaderChildProcess.php'))),
+				(string) $this->commandTokenSeed
+			],
+			[
+				1 => ['socket'],
 				2 => fopen("php://stderr", "w"),
 			],
 			$pipes
 		), "Something has gone horribly wrong");
 
-		$client = stream_socket_accept($server, 15);
-		if($client === false){
-			throw new AssumptionFailedError("stream_socket_accept() returned false");
-		}
-		stream_socket_shutdown($server, STREAM_SHUT_RDWR);
-
 		$this->subprocess = $sub;
-		$this->socket = $client;
+		$this->socket = $pipes[1];
 	}
 
 	private function shutdownSubprocess() : void{
@@ -104,7 +101,6 @@ final class ConsoleReaderChildProcessDaemon{
 		//the first place).
 		proc_terminate($this->subprocess);
 		proc_close($this->subprocess);
-		stream_socket_shutdown($this->socket, STREAM_SHUT_RDWR);
 	}
 
 	public function readLine() : ?string{
@@ -112,13 +108,27 @@ final class ConsoleReaderChildProcessDaemon{
 		$w = null;
 		$e = null;
 		if(stream_select($r, $w, $e, 0, 0) === 1){
-			$command = fgets($this->socket);
-			if($command === false){
+			$line = fgets($this->socket);
+			if($line === false){
 				$this->logger->debug("Lost connection to subprocess, restarting (maybe the child process was killed from outside?)");
 				$this->shutdownSubprocess();
 				$this->prepareSubprocess();
 				return null;
 			}
+			$line = rtrim($line, "\n");
+
+			if($line === ""){
+				//keepalive
+				return null;
+			}
+
+			$command = ConsoleReaderChildProcessUtils::parseMessage($line, $this->commandTokenSeed);
+			if($command === null){
+				//this is not a command - it may be some kind of error output from the subprocess
+				//write it directly to the console
+				$this->logger->warning("Unexpected output from child process: $line");
+				return null;
+			}
 
 			$command = preg_replace("#\\x1b\\x5b([^\\x1b]*\\x7e|[\\x40-\\x50])#", "", trim($command)) ?? throw new AssumptionFailedError("This regex is assumed to be valid");
 			$command = preg_replace('/[[:cntrl:]]/', '', $command) ?? throw new AssumptionFailedError("This regex is assumed to be valid");
diff --git a/src/console/ConsoleReaderChildProcessUtils.php b/src/console/ConsoleReaderChildProcessUtils.php
new file mode 100644
index 0000000000..661e9b0f7b
--- /dev/null
+++ b/src/console/ConsoleReaderChildProcessUtils.php
@@ -0,0 +1,71 @@
+<?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\console;
+
+use function hash;
+use function strlen;
+use function strrpos;
+use function substr;
+
+final class ConsoleReaderChildProcessUtils{
+	public const TOKEN_DELIMITER = ":";
+	public const TOKEN_HASH_ALGO = "xxh3";
+
+	private function __construct(){
+
+	}
+
+	/**
+	 * Creates an IPC message to transmit a user's input command to the parent process.
+	 *
+	 * Unfortunately we can't currently provide IPC pipes other than stdout/stderr to subprocesses on Windows, so this
+	 * adds a hash of the user input (with a counter as salt) to prevent unintended process output (like error messages)
+	 * from being treated as user input.
+	 */
+	public static function createMessage(string $line, int &$counter) : string{
+		$token = hash(self::TOKEN_HASH_ALGO, $line, options: ['seed' => $counter]);
+		$counter++;
+		return $line . self::TOKEN_DELIMITER . $token;
+	}
+
+	/**
+	 * Extracts a command from an IPC message from the console reader subprocess.
+	 * Returns the user's input command, or null if this isn't a user input.
+	 */
+	public static function parseMessage(string $message, int &$counter) : ?string{
+		$delimiterPos = strrpos($message, self::TOKEN_DELIMITER);
+		if($delimiterPos !== false){
+			$left = substr($message, 0, $delimiterPos);
+			$right = substr($message, $delimiterPos + strlen(self::TOKEN_DELIMITER));
+			$expectedToken = hash(self::TOKEN_HASH_ALGO, $left, options: ['seed' => $counter]);
+
+			if($expectedToken === $right){
+				$counter++;
+				return $left;
+			}
+		}
+
+		return null;
+	}
+}
diff --git a/src/crafting/CraftingManager.php b/src/crafting/CraftingManager.php
index 8edfaf3aa6..ff2be69268 100644
--- a/src/crafting/CraftingManager.php
+++ b/src/crafting/CraftingManager.php
@@ -29,6 +29,7 @@ use pocketmine\nbt\TreeRoot;
 use pocketmine\utils\BinaryStream;
 use pocketmine\utils\DestructorCallbackTrait;
 use pocketmine\utils\ObjectSet;
+use function spl_object_id;
 use function usort;
 
 class CraftingManager{
@@ -38,38 +39,50 @@ class CraftingManager{
 	 * @var ShapedRecipe[][]
 	 * @phpstan-var array<string, list<ShapedRecipe>>
 	 */
-	protected $shapedRecipes = [];
+	protected array $shapedRecipes = [];
 	/**
 	 * @var ShapelessRecipe[][]
 	 * @phpstan-var array<string, list<ShapelessRecipe>>
 	 */
-	protected $shapelessRecipes = [];
+	protected array $shapelessRecipes = [];
+
+	/**
+	 * @var CraftingRecipe[]
+	 * @phpstan-var array<int, CraftingRecipe>
+	 */
+	private array $craftingRecipeIndex = [];
 
 	/**
 	 * @var FurnaceRecipeManager[]
 	 * @phpstan-var array<int, FurnaceRecipeManager>
 	 */
-	protected $furnaceRecipeManagers;
+	protected array $furnaceRecipeManagers = [];
 
 	/**
 	 * @var PotionTypeRecipe[][]
-	 * @phpstan-var array<string, array<string, PotionTypeRecipe>>
+	 * @phpstan-var list<PotionTypeRecipe>
 	 */
-	protected $potionTypeRecipes = [];
+	protected array $potionTypeRecipes = [];
 
 	/**
-	 * @var PotionContainerChangeRecipe[][]
-	 * @phpstan-var array<int, array<string, PotionContainerChangeRecipe>>
+	 * @var PotionContainerChangeRecipe[]
+	 * @phpstan-var list<PotionContainerChangeRecipe>
 	 */
-	protected $potionContainerChangeRecipes = [];
+	protected array $potionContainerChangeRecipes = [];
+
+	/**
+	 * @var BrewingRecipe[][]
+	 * @phpstan-var array<int, array<int, BrewingRecipe>>
+	 */
+	private array $brewingRecipeCache = [];
 
 	/** @phpstan-var ObjectSet<\Closure() : void> */
 	private ObjectSet $recipeRegisteredCallbacks;
 
 	public function __construct(){
 		$this->recipeRegisteredCallbacks = new ObjectSet();
-		foreach(FurnaceType::getAll() as $furnaceType){
-			$this->furnaceRecipeManagers[$furnaceType->id()] = new FurnaceRecipeManager();
+		foreach(FurnaceType::cases() as $furnaceType){
+			$this->furnaceRecipeManagers[spl_object_id($furnaceType)] = new FurnaceRecipeManager();
 		}
 
 		$recipeRegisteredCallbacks = $this->recipeRegisteredCallbacks;
@@ -90,21 +103,22 @@ class CraftingManager{
 	 */
 	public static function sort(Item $i1, Item $i2) : int{
 		//Use spaceship operator to compare each property, then try the next one if they are equivalent.
-		($retval = $i1->getId() <=> $i2->getId()) === 0 && ($retval = $i1->getMeta() <=> $i2->getMeta()) === 0 && ($retval = $i1->getCount() <=> $i2->getCount()) === 0;
+		($retval = $i1->getStateId() <=> $i2->getStateId()) === 0 && ($retval = $i1->getCount() <=> $i2->getCount()) === 0;
 
 		return $retval;
 	}
 
 	/**
 	 * @param Item[] $items
+	 * @phpstan-param list<Item> $items
 	 *
 	 * @return Item[]
+	 * @phpstan-return list<Item>
 	 */
 	private static function pack(array $items) : array{
-		/** @var Item[] $result */
 		$result = [];
 
-		foreach($items as $i => $item){
+		foreach($items as $item){
 			foreach($result as $otherItem){
 				if($item->canStackWith($otherItem)){
 					$otherItem->setCount($otherItem->getCount() + $item->getCount());
@@ -121,6 +135,7 @@ class CraftingManager{
 
 	/**
 	 * @param Item[] $outputs
+	 * @phpstan-param list<Item> $outputs
 	 */
 	private static function hashOutputs(array $outputs) : string{
 		$outputs = self::pack($outputs);
@@ -129,8 +144,7 @@ class CraftingManager{
 		foreach($outputs as $o){
 			//count is not written because the outputs might be from multiple repetitions of a single recipe
 			//this reduces the accuracy of the hash, but it won't matter in most cases.
-			$result->putVarInt($o->getId());
-			$result->putVarInt($o->getMeta());
+			$result->putVarInt($o->getStateId());
 			$result->put((new LittleEndianNbtSerializer())->write(new TreeRoot($o->getNamedTag())));
 		}
 
@@ -153,21 +167,33 @@ class CraftingManager{
 		return $this->shapedRecipes;
 	}
 
+	/**
+	 * @return CraftingRecipe[]
+	 * @phpstan-return array<int, CraftingRecipe>
+	 */
+	public function getCraftingRecipeIndex() : array{
+		return $this->craftingRecipeIndex;
+	}
+
+	public function getCraftingRecipeFromIndex(int $index) : ?CraftingRecipe{
+		return $this->craftingRecipeIndex[$index] ?? null;
+	}
+
 	public function getFurnaceRecipeManager(FurnaceType $furnaceType) : FurnaceRecipeManager{
-		return $this->furnaceRecipeManagers[$furnaceType->id()];
+		return $this->furnaceRecipeManagers[spl_object_id($furnaceType)];
 	}
 
 	/**
-	 * @return PotionTypeRecipe[][]
-	 * @phpstan-return array<string, array<string, PotionTypeRecipe>>
+	 * @return PotionTypeRecipe[]
+	 * @phpstan-return list<PotionTypeRecipe>
 	 */
 	public function getPotionTypeRecipes() : array{
 		return $this->potionTypeRecipes;
 	}
 
 	/**
-	 * @return PotionContainerChangeRecipe[][]
-	 * @phpstan-return array<int, array<string, PotionContainerChangeRecipe>>
+	 * @return PotionContainerChangeRecipe[]
+	 * @phpstan-return list<PotionContainerChangeRecipe>
 	 */
 	public function getPotionContainerChangeRecipes() : array{
 		return $this->potionContainerChangeRecipes;
@@ -175,6 +201,7 @@ class CraftingManager{
 
 	public function registerShapedRecipe(ShapedRecipe $recipe) : void{
 		$this->shapedRecipes[self::hashOutputs($recipe->getResults())][] = $recipe;
+		$this->craftingRecipeIndex[] = $recipe;
 
 		foreach($this->recipeRegisteredCallbacks as $callback){
 			$callback();
@@ -183,6 +210,7 @@ class CraftingManager{
 
 	public function registerShapelessRecipe(ShapelessRecipe $recipe) : void{
 		$this->shapelessRecipes[self::hashOutputs($recipe->getResults())][] = $recipe;
+		$this->craftingRecipeIndex[] = $recipe;
 
 		foreach($this->recipeRegisteredCallbacks as $callback){
 			$callback();
@@ -190,9 +218,7 @@ class CraftingManager{
 	}
 
 	public function registerPotionTypeRecipe(PotionTypeRecipe $recipe) : void{
-		$input = $recipe->getInput();
-		$ingredient = $recipe->getIngredient();
-		$this->potionTypeRecipes[$input->getId() . ":" . $input->getMeta()][$ingredient->getId() . ":" . ($ingredient->hasAnyDamageValue() ? "?" : $ingredient->getMeta())] = $recipe;
+		$this->potionTypeRecipes[] = $recipe;
 
 		foreach($this->recipeRegisteredCallbacks as $callback){
 			$callback();
@@ -200,8 +226,7 @@ class CraftingManager{
 	}
 
 	public function registerPotionContainerChangeRecipe(PotionContainerChangeRecipe $recipe) : void{
-		$ingredient = $recipe->getIngredient();
-		$this->potionContainerChangeRecipes[$recipe->getInputItemId()][$ingredient->getId() . ":" . ($ingredient->hasAnyDamageValue() ? "?" : $ingredient->getMeta())] = $recipe;
+		$this->potionContainerChangeRecipes[] = $recipe;
 
 		foreach($this->recipeRegisteredCallbacks as $callback){
 			$callback();
@@ -260,9 +285,25 @@ class CraftingManager{
 	}
 
 	public function matchBrewingRecipe(Item $input, Item $ingredient) : ?BrewingRecipe{
-		return $this->potionTypeRecipes[$input->getId() . ":" . $input->getMeta()][$ingredient->getId() . ":" . $ingredient->getMeta()] ??
-			$this->potionTypeRecipes[$input->getId() . ":" . $input->getMeta()][$ingredient->getId() . ":?"] ??
-			$this->potionContainerChangeRecipes[$input->getId()][$ingredient->getId() . ":" . $ingredient->getMeta()] ??
-			$this->potionContainerChangeRecipes[$input->getId()][$ingredient->getId() . ":?"] ?? null;
+		$inputHash = $input->getStateId();
+		$ingredientHash = $ingredient->getStateId();
+		$cached = $this->brewingRecipeCache[$inputHash][$ingredientHash] ?? null;
+		if($cached !== null){
+			return $cached;
+		}
+
+		foreach($this->potionContainerChangeRecipes as $recipe){
+			if($recipe->getIngredient()->accepts($ingredient) && $recipe->getResultFor($input) !== null){
+				return $this->brewingRecipeCache[$inputHash][$ingredientHash] = $recipe;
+			}
+		}
+
+		foreach($this->potionTypeRecipes as $recipe){
+			if($recipe->getIngredient()->accepts($ingredient) && $recipe->getResultFor($input) !== null){
+				return $this->brewingRecipeCache[$inputHash][$ingredientHash] = $recipe;
+			}
+		}
+
+		return null;
 	}
 }
diff --git a/src/crafting/CraftingManagerFromDataHelper.php b/src/crafting/CraftingManagerFromDataHelper.php
index a728ab93d2..3df6bfb62a 100644
--- a/src/crafting/CraftingManagerFromDataHelper.php
+++ b/src/crafting/CraftingManagerFromDataHelper.php
@@ -23,118 +23,318 @@ declare(strict_types=1);
 
 namespace pocketmine\crafting;
 
+use pocketmine\crafting\json\FurnaceRecipeData;
+use pocketmine\crafting\json\ItemStackData;
+use pocketmine\crafting\json\PotionContainerChangeRecipeData;
+use pocketmine\crafting\json\PotionTypeRecipeData;
+use pocketmine\crafting\json\RecipeIngredientData;
+use pocketmine\crafting\json\ShapedRecipeData;
+use pocketmine\crafting\json\ShapelessRecipeData;
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\data\bedrock\item\BlockItemIdMap;
+use pocketmine\data\bedrock\item\ItemTypeDeserializeException;
+use pocketmine\data\bedrock\item\SavedItemData;
+use pocketmine\data\bedrock\item\SavedItemStackData;
+use pocketmine\data\SavedDataLoadingException;
+use pocketmine\errorhandler\ErrorToExceptionHandler;
 use pocketmine\item\Item;
-use pocketmine\item\ItemFactory;
-use pocketmine\utils\AssumptionFailedError;
+use pocketmine\nbt\LittleEndianNbtSerializer;
 use pocketmine\utils\Filesystem;
-use function array_map;
+use pocketmine\utils\Utils;
+use pocketmine\world\format\io\GlobalItemDataHandlers;
+use Symfony\Component\Filesystem\Path;
+use function base64_decode;
+use function get_debug_type;
 use function is_array;
+use function is_object;
 use function json_decode;
 
 final class CraftingManagerFromDataHelper{
 
-	/**
-	 * @param Item[] $items
-	 */
-	private static function containsUnknownOutputs(array $items) : bool{
-		$factory = ItemFactory::getInstance();
-		foreach($items as $item){
-			if($item->hasAnyDamageValue()){
-				throw new \InvalidArgumentException("Recipe outputs must not have wildcard meta values");
-			}
-			if(!$factory->isRegistered($item->getId(), $item->getMeta())){
-				return true;
-			}
+	private static function deserializeIngredient(RecipeIngredientData $data) : ?RecipeIngredient{
+		if(isset($data->count) && $data->count !== 1){
+			//every case we've seen so far where this isn't the case, it's been a bug and the count was ignored anyway
+			//e.g. gold blocks crafted from 9 ingots, but each input item individually had a count of 9
+			throw new SavedDataLoadingException("Recipe inputs should have a count of exactly 1");
+		}
+		if(isset($data->tag)){
+			return new TagWildcardRecipeIngredient($data->tag);
 		}
 
-		return false;
+		$meta = $data->meta ?? null;
+		if($meta === RecipeIngredientData::WILDCARD_META_VALUE){
+			//this could be an unimplemented item, but it doesn't really matter, since the item shouldn't be able to
+			//be obtained anyway - filtering unknown items is only really important for outputs, to prevent players
+			//obtaining them
+			return new MetaWildcardRecipeIngredient($data->name);
+		}
+
+		$itemStack = self::deserializeItemStackFromFields(
+			$data->name,
+			$meta,
+			$data->count ?? null,
+			$data->block_states ?? null,
+			null,
+			[],
+			[]
+		);
+		if($itemStack === null){
+			//probably unknown item
+			return null;
+		}
+		return new ExactRecipeIngredient($itemStack);
 	}
 
-	public static function make(string $filePath) : CraftingManager{
-		$recipes = json_decode(Filesystem::fileGetContents($filePath), true);
-		if(!is_array($recipes)){
-			throw new AssumptionFailedError("recipes.json root should contain a map of recipe types");
+	public static function deserializeItemStack(ItemStackData $data) : ?Item{
+		//count, name, block_name, block_states, meta, nbt, can_place_on, can_destroy
+		return self::deserializeItemStackFromFields(
+			$data->name,
+			$data->meta ?? null,
+			$data->count ?? null,
+			$data->block_states ?? null,
+			$data->nbt ?? null,
+			$data->can_place_on ?? [],
+			$data->can_destroy ?? []
+		);
+	}
+
+	/**
+	 * @param string[] $canPlaceOn
+	 * @param string[] $canDestroy
+	 */
+	private static function deserializeItemStackFromFields(string $name, ?int $meta, ?int $count, ?string $blockStatesRaw, ?string $nbtRaw, array $canPlaceOn, array $canDestroy) : ?Item{
+		$meta ??= 0;
+		$count ??= 1;
+
+		$blockName = BlockItemIdMap::getInstance()->lookupBlockId($name);
+		if($blockName !== null){
+			if($meta !== 0){
+				throw new SavedDataLoadingException("Meta should not be specified for blockitems");
+			}
+			$blockStatesTag = $blockStatesRaw === null ?
+				[] :
+				(new LittleEndianNbtSerializer())
+					->read(ErrorToExceptionHandler::trapAndRemoveFalse(fn() => base64_decode($blockStatesRaw, true)))
+					->mustGetCompoundTag()
+					->getValue();
+			$blockStateData = BlockStateData::current($blockName, $blockStatesTag);
+		}else{
+			$blockStateData = null;
 		}
+
+		$nbt = $nbtRaw === null ? null : (new LittleEndianNbtSerializer())
+			->read(ErrorToExceptionHandler::trapAndRemoveFalse(fn() => base64_decode($nbtRaw, true)))
+			->mustGetCompoundTag();
+
+		$itemStackData = new SavedItemStackData(
+			new SavedItemData(
+				$name,
+				$meta,
+				$blockStateData,
+				$nbt
+			),
+			$count,
+			null,
+			null,
+			$canPlaceOn,
+			$canDestroy,
+		);
+
+		try{
+			return GlobalItemDataHandlers::getDeserializer()->deserializeStack($itemStackData);
+		}catch(ItemTypeDeserializeException){
+			//probably unknown item
+			return null;
+		}
+	}
+
+	/**
+	 * @return mixed[]
+	 *
+	 * @phpstan-template TData of object
+	 * @phpstan-param class-string<TData> $modelCLass
+	 * @phpstan-return list<TData>
+	 */
+	public static function loadJsonArrayOfObjectsFile(string $filePath, string $modelCLass) : array{
+		$recipes = json_decode(Filesystem::fileGetContents($filePath));
+		if(!is_array($recipes)){
+			throw new SavedDataLoadingException("$filePath root should be an array, got " . get_debug_type($recipes));
+		}
+
+		$mapper = new \JsonMapper();
+		$mapper->bStrictObjectTypeChecking = true;
+		$mapper->bExceptionOnUndefinedProperty = true;
+		$mapper->bExceptionOnMissingData = true;
+
+		return self::loadJsonObjectListIntoModel($mapper, $modelCLass, $recipes);
+	}
+
+	/**
+	 * @phpstan-template TRecipeData of object
+	 * @phpstan-param class-string<TRecipeData> $modelClass
+	 * @phpstan-return TRecipeData
+	 */
+	private static function loadJsonObjectIntoModel(\JsonMapper $mapper, string $modelClass, object $data) : object{
+		//JsonMapper does this for subtypes, but not for the base type :(
+		try{
+			return $mapper->map($data, (new \ReflectionClass($modelClass))->newInstanceWithoutConstructor());
+		}catch(\JsonMapper_Exception $e){
+			throw new SavedDataLoadingException($e->getMessage(), 0, $e);
+		}
+	}
+
+	/**
+	 * @param mixed[] $data
+	 * @return object[]
+	 *
+	 * @phpstan-template TRecipeData of object
+	 * @phpstan-param class-string<TRecipeData> $modelClass
+	 * @phpstan-return list<TRecipeData>
+	 */
+	private static function loadJsonObjectListIntoModel(\JsonMapper $mapper, string $modelClass, array $data) : array{
+		$result = [];
+		foreach(Utils::promoteKeys($data) as $i => $item){
+			if(!is_object($item)){
+				throw new SavedDataLoadingException("Invalid entry at index $i: expected object, got " . get_debug_type($item));
+			}
+			try{
+				$result[] = self::loadJsonObjectIntoModel($mapper, $modelClass, $item);
+			}catch(SavedDataLoadingException $e){
+				throw new SavedDataLoadingException("Invalid entry at index $i: " . $e->getMessage(), 0, $e);
+			}
+		}
+		return $result;
+	}
+
+	public static function make(string $directoryPath) : CraftingManager{
 		$result = new CraftingManager();
 
-		$itemDeserializerFunc = \Closure::fromCallable([Item::class, 'jsonDeserialize']);
-
-		foreach($recipes["shapeless"] as $recipe){
-			$recipeType = match($recipe["block"]){
-				"crafting_table" => ShapelessRecipeType::CRAFTING(),
-				"stonecutter" => ShapelessRecipeType::STONECUTTER(),
-				//TODO: Cartography Table
+		foreach(self::loadJsonArrayOfObjectsFile(Path::join($directoryPath, 'shapeless_crafting.json'), ShapelessRecipeData::class) as $recipe){
+			$recipeType = match($recipe->block){
+				"crafting_table" => ShapelessRecipeType::CRAFTING,
+				"stonecutter" => ShapelessRecipeType::STONECUTTER,
+				"smithing_table" => ShapelessRecipeType::SMITHING,
+				"cartography_table" => ShapelessRecipeType::CARTOGRAPHY,
 				default => null
 			};
 			if($recipeType === null){
 				continue;
 			}
-			$output = array_map($itemDeserializerFunc, $recipe["output"]);
-			if(self::containsUnknownOutputs($output)){
-				continue;
+			$inputs = [];
+			foreach($recipe->input as $inputData){
+				$input = self::deserializeIngredient($inputData);
+				if($input === null){ //unknown input item
+					continue 2;
+				}
+				$inputs[] = $input;
 			}
+			$outputs = [];
+			foreach($recipe->output as $outputData){
+				$output = self::deserializeItemStack($outputData);
+				if($output === null){ //unknown output item
+					continue 2;
+				}
+				$outputs[] = $output;
+			}
+			//TODO: check unlocking requirements - our current system doesn't support this
 			$result->registerShapelessRecipe(new ShapelessRecipe(
-				array_map($itemDeserializerFunc, $recipe["input"]),
-				$output,
+				$inputs,
+				$outputs,
 				$recipeType
 			));
 		}
-		foreach($recipes["shaped"] as $recipe){
-			if($recipe["block"] !== "crafting_table"){ //TODO: filter others out for now to avoid breaking economics
+		foreach(self::loadJsonArrayOfObjectsFile(Path::join($directoryPath, 'shaped_crafting.json'), ShapedRecipeData::class) as $recipe){
+			if($recipe->block !== "crafting_table"){ //TODO: filter others out for now to avoid breaking economics
 				continue;
 			}
-			$output = array_map($itemDeserializerFunc, $recipe["output"]);
-			if(self::containsUnknownOutputs($output)){
-				continue;
+			$inputs = [];
+			foreach(Utils::stringifyKeys($recipe->input) as $symbol => $inputData){
+				$input = self::deserializeIngredient($inputData);
+				if($input === null){ //unknown input item
+					continue 2;
+				}
+				$inputs[$symbol] = $input;
 			}
+			$outputs = [];
+			foreach($recipe->output as $outputData){
+				$output = self::deserializeItemStack($outputData);
+				if($output === null){ //unknown output item
+					continue 2;
+				}
+				$outputs[] = $output;
+			}
+			//TODO: check unlocking requirements - our current system doesn't support this
 			$result->registerShapedRecipe(new ShapedRecipe(
-				$recipe["shape"],
-				array_map($itemDeserializerFunc, $recipe["input"]),
-				$output
+				$recipe->shape,
+				$inputs,
+				$outputs
 			));
 		}
-		foreach($recipes["smelting"] as $recipe){
-			$furnaceType = match ($recipe["block"]){
-				"furnace" => FurnaceType::FURNACE(),
-				"blast_furnace" => FurnaceType::BLAST_FURNACE(),
-				"smoker" => FurnaceType::SMOKER(),
-				//TODO: campfire
+		foreach(self::loadJsonArrayOfObjectsFile(Path::join($directoryPath, 'smelting.json'), FurnaceRecipeData::class) as $recipe){
+			$furnaceType = match ($recipe->block){
+				"furnace" => FurnaceType::FURNACE,
+				"blast_furnace" => FurnaceType::BLAST_FURNACE,
+				"smoker" => FurnaceType::SMOKER,
+				"campfire" => FurnaceType::CAMPFIRE,
+				"soul_campfire" => FurnaceType::SOUL_CAMPFIRE,
 				default => null
 			};
 			if($furnaceType === null){
 				continue;
 			}
-			$output = Item::jsonDeserialize($recipe["output"]);
-			if(self::containsUnknownOutputs([$output])){
+			$output = self::deserializeItemStack($recipe->output);
+			if($output === null){
+				continue;
+			}
+			$input = self::deserializeIngredient($recipe->input);
+			if($input === null){
 				continue;
 			}
 			$result->getFurnaceRecipeManager($furnaceType)->register(new FurnaceRecipe(
 				$output,
-				Item::jsonDeserialize($recipe["input"]))
-			);
+				$input
+			));
 		}
-		foreach($recipes["potion_type"] as $recipe){
-			$output = Item::jsonDeserialize($recipe["output"]);
-			if(self::containsUnknownOutputs([$output])){
+
+		foreach(self::loadJsonArrayOfObjectsFile(Path::join($directoryPath, 'potion_type.json'), PotionTypeRecipeData::class) as $recipe){
+			$input = self::deserializeIngredient($recipe->input);
+			$ingredient = self::deserializeIngredient($recipe->ingredient);
+			$output = self::deserializeItemStack($recipe->output);
+			if($input === null || $ingredient === null || $output === null){
 				continue;
 			}
 			$result->registerPotionTypeRecipe(new PotionTypeRecipe(
-				Item::jsonDeserialize($recipe["input"]),
-				Item::jsonDeserialize($recipe["ingredient"]),
+				$input,
+				$ingredient,
 				$output
 			));
 		}
-		foreach($recipes["potion_container_change"] as $recipe){
-			if(!ItemFactory::getInstance()->isRegistered($recipe["output_item_id"])){
+		foreach(self::loadJsonArrayOfObjectsFile(Path::join($directoryPath, 'potion_container_change.json'), PotionContainerChangeRecipeData::class) as $recipe){
+			$ingredient = self::deserializeIngredient($recipe->ingredient);
+			if($ingredient === null){
+				continue;
+			}
+
+			$inputId = $recipe->input_item_name;
+			$outputId = $recipe->output_item_name;
+
+			//TODO: this is a really awful way to just check if an ID is recognized ...
+			if(
+				self::deserializeItemStackFromFields($inputId, null, null, null, null, [], []) === null ||
+				self::deserializeItemStackFromFields($outputId, null, null, null, null, [], []) === null
+			){
+				//unknown item
 				continue;
 			}
 			$result->registerPotionContainerChangeRecipe(new PotionContainerChangeRecipe(
-				$recipe["input_item_id"],
-				Item::jsonDeserialize($recipe["ingredient"]),
-				$recipe["output_item_id"]
+				$inputId,
+				$ingredient,
+				$outputId
 			));
 		}
 
+		//TODO: smithing
+
 		return $result;
 	}
 }
diff --git a/src/crafting/CraftingRecipe.php b/src/crafting/CraftingRecipe.php
index 8666235a88..d7342aae31 100644
--- a/src/crafting/CraftingRecipe.php
+++ b/src/crafting/CraftingRecipe.php
@@ -29,7 +29,8 @@ interface CraftingRecipe{
 	/**
 	 * Returns a list of items needed to craft this recipe. This MUST NOT include Air items or items with a zero count.
 	 *
-	 * @return Item[]
+	 * @return RecipeIngredient[]
+	 * @phpstan-return list<RecipeIngredient>
 	 */
 	public function getIngredientList() : array;
 
@@ -37,6 +38,7 @@ interface CraftingRecipe{
 	 * Returns a list of results this recipe will produce when the inputs in the given crafting grid are consumed.
 	 *
 	 * @return Item[]
+	 * @phpstan-return list<Item>
 	 */
 	public function getResultsFor(CraftingGrid $grid) : array;
 
diff --git a/src/crafting/ExactRecipeIngredient.php b/src/crafting/ExactRecipeIngredient.php
new file mode 100644
index 0000000000..76543b0acf
--- /dev/null
+++ b/src/crafting/ExactRecipeIngredient.php
@@ -0,0 +1,56 @@
+<?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\crafting;
+
+use pocketmine\item\Item;
+
+/**
+ * Recipe ingredient that matches exactly one item, without wildcards.
+ * Note that recipe inputs cannot require NBT.
+ */
+final class ExactRecipeIngredient implements RecipeIngredient{
+
+	public function __construct(private Item $item){
+		if($item->isNull()){
+			throw new \InvalidArgumentException("Recipe ingredients must not be air items");
+		}
+		if($item->getCount() !== 1){
+			throw new \InvalidArgumentException("Recipe ingredients cannot require count");
+		}
+		$this->item = clone $item;
+	}
+
+	public function getItem() : Item{ return clone $this->item; }
+
+	public function accepts(Item $item) : bool{
+		//client-side, recipe inputs can't actually require NBT
+		//but on the PM side, we currently check for it if the input requires it, so we have to continue to do so for
+		//the sake of consistency
+		return $item->getCount() >= 1 && $this->item->equals($item, true, $this->item->hasNamedTag());
+	}
+
+	public function __toString() : string{
+		return "ExactRecipeIngredient(" . $this->item . ")";
+	}
+}
diff --git a/src/crafting/FurnaceRecipe.php b/src/crafting/FurnaceRecipe.php
index e719aa07b3..f54dd23341 100644
--- a/src/crafting/FurnaceRecipe.php
+++ b/src/crafting/FurnaceRecipe.php
@@ -29,14 +29,13 @@ class FurnaceRecipe{
 
 	public function __construct(
 		private Item $result,
-		private Item $ingredient
+		private RecipeIngredient $ingredient
 	){
 		$this->result = clone $result;
-		$this->ingredient = clone $ingredient;
 	}
 
-	public function getInput() : Item{
-		return clone $this->ingredient;
+	public function getInput() : RecipeIngredient{
+		return $this->ingredient;
 	}
 
 	public function getResult() : Item{
diff --git a/src/crafting/FurnaceRecipeManager.php b/src/crafting/FurnaceRecipeManager.php
index 779256eced..d13465b44a 100644
--- a/src/crafting/FurnaceRecipeManager.php
+++ b/src/crafting/FurnaceRecipeManager.php
@@ -28,7 +28,13 @@ use pocketmine\utils\ObjectSet;
 
 final class FurnaceRecipeManager{
 	/** @var FurnaceRecipe[] */
-	protected $furnaceRecipes = [];
+	protected array $furnaceRecipes = [];
+
+	/**
+	 * @var FurnaceRecipe[]
+	 * @phpstan-var array<int, FurnaceRecipe>
+	 */
+	private array $lookupCache = [];
 
 	/** @phpstan-var ObjectSet<\Closure(FurnaceRecipe) : void> */
 	private ObjectSet $recipeRegisteredCallbacks;
@@ -52,14 +58,27 @@ final class FurnaceRecipeManager{
 	}
 
 	public function register(FurnaceRecipe $recipe) : void{
-		$input = $recipe->getInput();
-		$this->furnaceRecipes[$input->getId() . ":" . ($input->hasAnyDamageValue() ? "?" : $input->getMeta())] = $recipe;
+		$this->furnaceRecipes[] = $recipe;
 		foreach($this->recipeRegisteredCallbacks as $callback){
 			$callback($recipe);
 		}
 	}
 
 	public function match(Item $input) : ?FurnaceRecipe{
-		return $this->furnaceRecipes[$input->getId() . ":" . $input->getMeta()] ?? $this->furnaceRecipes[$input->getId() . ":?"] ?? null;
+		$index = $input->getStateId();
+		$simpleRecipe = $this->lookupCache[$index] ?? null;
+		if($simpleRecipe !== null){
+			return $simpleRecipe;
+		}
+
+		foreach($this->furnaceRecipes as $recipe){
+			if($recipe->getInput()->accepts($input)){
+				//remember that this item is accepted by this recipe, so we don't need to bruteforce it again
+				$this->lookupCache[$index] = $recipe;
+				return $recipe;
+			}
+		}
+
+		return null;
 	}
 }
diff --git a/src/crafting/FurnaceType.php b/src/crafting/FurnaceType.php
index 649ff4484d..89834c8214 100644
--- a/src/crafting/FurnaceType.php
+++ b/src/crafting/FurnaceType.php
@@ -23,40 +23,51 @@ declare(strict_types=1);
 
 namespace pocketmine\crafting;
 
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 use pocketmine\world\sound\BlastFurnaceSound;
+use pocketmine\world\sound\CampfireSound;
 use pocketmine\world\sound\FurnaceSound;
 use pocketmine\world\sound\SmokerSound;
 use pocketmine\world\sound\Sound;
+use function spl_object_id;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static FurnaceType BLAST_FURNACE()
+ * @method static FurnaceType CAMPFIRE()
  * @method static FurnaceType FURNACE()
  * @method static FurnaceType SMOKER()
+ * @method static FurnaceType SOUL_CAMPFIRE()
+ *
+ * @phpstan-type TMetadata array{0: int, 1: Sound}
  */
-final class FurnaceType{
-	use EnumTrait {
-		__construct as Enum___construct;
+enum FurnaceType{
+	use LegacyEnumShimTrait;
+
+	case FURNACE;
+	case BLAST_FURNACE;
+	case SMOKER;
+	case CAMPFIRE;
+	case SOUL_CAMPFIRE;
+
+	/**
+	 * @phpstan-return TMetadata
+	 */
+	private function getMetadata() : array{
+		/** @phpstan-var array<int, TMetadata> $cache */
+		static $cache = [];
+
+		return $cache[spl_object_id($this)] ??= match($this){
+			self::FURNACE => [200, new FurnaceSound()],
+			self::BLAST_FURNACE => [100, new BlastFurnaceSound()],
+			self::SMOKER => [100, new SmokerSound()],
+			self::CAMPFIRE, self::SOUL_CAMPFIRE => [600, new CampfireSound()]
+		};
 	}
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("furnace", 200, new FurnaceSound()),
-			new self("blast_furnace", 100, new BlastFurnaceSound()),
-			new self("smoker", 100, new SmokerSound()),
-		);
-	}
+	public function getCookDurationTicks() : int{ return $this->getMetadata()[0]; }
 
-	private function __construct(string $enumName, private int $cookDurationTicks, private Sound $cookSound){
-		$this->Enum___construct($enumName);
-	}
-
-	public function getCookDurationTicks() : int{ return $this->cookDurationTicks; }
-
-	public function getCookSound() : Sound{ return $this->cookSound; }
+	public function getCookSound() : Sound{ return $this->getMetadata()[1]; }
 }
diff --git a/src/crafting/MetaWildcardRecipeIngredient.php b/src/crafting/MetaWildcardRecipeIngredient.php
new file mode 100644
index 0000000000..8aa6a1f177
--- /dev/null
+++ b/src/crafting/MetaWildcardRecipeIngredient.php
@@ -0,0 +1,57 @@
+<?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\crafting;
+
+use pocketmine\item\Item;
+use pocketmine\world\format\io\GlobalItemDataHandlers;
+
+/**
+ * Recipe ingredient that matches items by their Minecraft ID only. This is used for things like the crafting table
+ * recipe from planks (multiple types of planks are accepted).
+ *
+ * WARNING: Plugins shouldn't usually use this. This is a hack that relies on internal Minecraft behaviour, which might
+ * change or break at any time.
+ *
+ * @internal
+ */
+final class MetaWildcardRecipeIngredient implements RecipeIngredient{
+
+	public function __construct(
+		private string $itemId,
+	){}
+
+	public function getItemId() : string{ return $this->itemId; }
+
+	public function accepts(Item $item) : bool{
+		if($item->getCount() < 1){
+			return false;
+		}
+
+		return GlobalItemDataHandlers::getSerializer()->serializeType($item)->getName() === $this->itemId;
+	}
+
+	public function __toString() : string{
+		return "MetaWildcardRecipeIngredient($this->itemId)";
+	}
+}
diff --git a/src/crafting/PotionContainerChangeRecipe.php b/src/crafting/PotionContainerChangeRecipe.php
index da24050cb8..3530aee68a 100644
--- a/src/crafting/PotionContainerChangeRecipe.php
+++ b/src/crafting/PotionContainerChangeRecipe.php
@@ -23,32 +23,40 @@ declare(strict_types=1);
 
 namespace pocketmine\crafting;
 
+use pocketmine\data\bedrock\item\SavedItemData;
 use pocketmine\item\Item;
-use pocketmine\item\ItemFactory;
+use pocketmine\world\format\io\GlobalItemDataHandlers;
 
 class PotionContainerChangeRecipe implements BrewingRecipe{
 
 	public function __construct(
-		private int $inputItemId,
-		private Item $ingredient,
-		private int $outputItemId
-	){
-		$this->ingredient = clone $ingredient;
-	}
+		private string $inputItemId,
+		private RecipeIngredient $ingredient,
+		private string $outputItemId
+	){}
 
-	public function getInputItemId() : int{
+	public function getInputItemId() : string{
 		return $this->inputItemId;
 	}
 
-	public function getIngredient() : Item{
-		return clone $this->ingredient;
+	public function getIngredient() : RecipeIngredient{
+		return $this->ingredient;
 	}
 
-	public function getOutputItemId() : int{
+	public function getOutputItemId() : string{
 		return $this->outputItemId;
 	}
 
 	public function getResultFor(Item $input) : ?Item{
-		return $input->getId() === $this->getInputItemId() ? ItemFactory::getInstance()->get($this->getOutputItemId(), $input->getMeta()) : null;
+		//TODO: this is a really awful hack, but there isn't another way for now
+		//this relies on transforming the serialized item's ID, relying on the target item type's data being the same as the input.
+		//This is the same assumption previously made using ItemFactory::get(), except it was less obvious how bad it was.
+		//The other way is to bake the actual Potion class types into here, which isn't great for data-driving stuff.
+		//We need a better solution for this.
+
+		$data = GlobalItemDataHandlers::getSerializer()->serializeType($input);
+		return $data->getName() === $this->getInputItemId() ?
+			GlobalItemDataHandlers::getDeserializer()->deserializeType(new SavedItemData($this->getOutputItemId(), $data->getMeta(), $data->getBlock(), $data->getTag())) :
+			null;
 	}
 }
diff --git a/src/crafting/PotionTypeRecipe.php b/src/crafting/PotionTypeRecipe.php
index 4d450450ef..1d0b1b580f 100644
--- a/src/crafting/PotionTypeRecipe.php
+++ b/src/crafting/PotionTypeRecipe.php
@@ -28,21 +28,19 @@ use pocketmine\item\Item;
 class PotionTypeRecipe implements BrewingRecipe{
 
 	public function __construct(
-		private Item $input,
-		private Item $ingredient,
+		private RecipeIngredient $input,
+		private RecipeIngredient $ingredient,
 		private Item $output
 	){
-		$this->input = clone $input;
-		$this->ingredient = clone $ingredient;
 		$this->output = clone $output;
 	}
 
-	public function getInput() : Item{
-		return clone $this->input;
+	public function getInput() : RecipeIngredient{
+		return $this->input;
 	}
 
-	public function getIngredient() : Item{
-		return clone $this->ingredient;
+	public function getIngredient() : RecipeIngredient{
+		return $this->ingredient;
 	}
 
 	public function getOutput() : Item{
@@ -50,6 +48,6 @@ class PotionTypeRecipe implements BrewingRecipe{
 	}
 
 	public function getResultFor(Item $input) : ?Item{
-		return $input->equals($this->input, true, false) ? $this->getOutput() : null;
+		return $this->input->accepts($input) ? $this->getOutput() : null;
 	}
 }
diff --git a/src/crafting/RecipeIngredient.php b/src/crafting/RecipeIngredient.php
new file mode 100644
index 0000000000..19a7b6085f
--- /dev/null
+++ b/src/crafting/RecipeIngredient.php
@@ -0,0 +1,31 @@
+<?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\crafting;
+
+use pocketmine\item\Item;
+
+interface RecipeIngredient extends \Stringable{
+
+	public function accepts(Item $item) : bool;
+}
diff --git a/src/crafting/ShapedRecipe.php b/src/crafting/ShapedRecipe.php
index 250f30d8da..4c40eb0f50 100644
--- a/src/crafting/ShapedRecipe.php
+++ b/src/crafting/ShapedRecipe.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\crafting;
 
 use pocketmine\item\Item;
-use pocketmine\item\VanillaItems;
 use pocketmine\utils\Utils;
 use function array_values;
 use function count;
@@ -33,11 +32,20 @@ use function str_contains;
 use function strlen;
 
 class ShapedRecipe implements CraftingRecipe{
-	/** @var string[] */
+	/**
+	 * @var string[]
+	 * @phpstan-var list<string>
+	 */
 	private array $shape = [];
-	/** @var Item[] char => Item map */
+	/**
+	 * @var RecipeIngredient[] char => RecipeIngredient map
+	 * @phpstan-var array<string, RecipeIngredient>
+	 */
 	private array $ingredientList = [];
-	/** @var Item[] */
+	/**
+	 * @var Item[]
+	 * @phpstan-var list<Item>
+	 */
 	private array $results = [];
 
 	private int $height;
@@ -46,17 +54,21 @@ class ShapedRecipe implements CraftingRecipe{
 	/**
 	 * Constructs a ShapedRecipe instance.
 	 *
-	 * @param string[] $shape       <br>
-	 *                              Array of 1, 2, or 3 strings representing the rows of the recipe.
-	 *                              This accepts an array of 1, 2 or 3 strings. Each string should be of the same length and must be at most 3
-	 *                              characters long. Each character represents a unique type of ingredient. Spaces are interpreted as air.
-	 * @param Item[]   $ingredients <br>
-	 *                              Char => Item map of items to be set into the shape.
-	 *                              This accepts an array of Items, indexed by character. Every unique character (except space) in the shape
-	 *                              array MUST have a corresponding item in this list. Space character is automatically treated as air.
-	 * @param Item[]   $results     List of items that this recipe produces when crafted.
+	 * @param string[]           $shape       <br>
+	 *                                        Array of 1, 2, or 3 strings representing the rows of the recipe.
+	 *                                        This accepts an array of 1, 2 or 3 strings. Each string should be of the same length and must be at most 3
+	 *                                        characters long. Each character represents a unique type of ingredient. Spaces are interpreted as air.
+	 * @param RecipeIngredient[] $ingredients <br>
+	 *                                        Char => Item map of items to be set into the shape.
+	 *                                        This accepts an array of Items, indexed by character. Every unique character (except space) in the shape
+	 *                                        array MUST have a corresponding item in this list. Space character is automatically treated as air.
+	 * @param Item[]             $results     List of items that this recipe produces when crafted.
 	 *
 	 * Note: Recipes **do not** need to be square. Do NOT add padding for empty rows/columns.
+	 *
+	 * @phpstan-param list<string> $shape
+	 * @phpstan-param array<string, RecipeIngredient> $ingredients
+	 * @phpstan-param list<Item> $results
 	 */
 	public function __construct(array $shape, array $ingredients, array $results){
 		$this->height = count($shape);
@@ -85,7 +97,7 @@ class ShapedRecipe implements CraftingRecipe{
 
 		$this->shape = $shape;
 
-		foreach($ingredients as $char => $i){
+		foreach(Utils::stringifyKeys($ingredients) as $char => $i){
 			if(!str_contains(implode($this->shape), $char)){
 				throw new \InvalidArgumentException("Symbol '$char' does not appear in the recipe shape");
 			}
@@ -106,6 +118,7 @@ class ShapedRecipe implements CraftingRecipe{
 
 	/**
 	 * @return Item[]
+	 * @phpstan-return list<Item>
 	 */
 	public function getResults() : array{
 		return Utils::cloneObjectArray($this->results);
@@ -113,13 +126,15 @@ class ShapedRecipe implements CraftingRecipe{
 
 	/**
 	 * @return Item[]
+	 * @phpstan-return list<Item>
 	 */
 	public function getResultsFor(CraftingGrid $grid) : array{
 		return $this->getResults();
 	}
 
 	/**
-	 * @return Item[][]
+	 * @return (RecipeIngredient|null)[][]
+	 * @phpstan-return list<list<RecipeIngredient|null>>
 	 */
 	public function getIngredientMap() : array{
 		$ingredients = [];
@@ -133,16 +148,13 @@ class ShapedRecipe implements CraftingRecipe{
 		return $ingredients;
 	}
 
-	/**
-	 * @return Item[]
-	 */
 	public function getIngredientList() : array{
 		$ingredients = [];
 
 		for($y = 0; $y < $this->height; ++$y){
 			for($x = 0; $x < $this->width; ++$x){
 				$ingredient = $this->getIngredient($x, $y);
-				if(!$ingredient->isNull()){
+				if($ingredient !== null){
 					$ingredients[] = $ingredient;
 				}
 			}
@@ -151,14 +163,14 @@ class ShapedRecipe implements CraftingRecipe{
 		return $ingredients;
 	}
 
-	public function getIngredient(int $x, int $y) : Item{
-		$exists = $this->ingredientList[$this->shape[$y][$x]] ?? null;
-		return $exists !== null ? clone $exists : VanillaItems::AIR();
+	public function getIngredient(int $x, int $y) : ?RecipeIngredient{
+		return $this->ingredientList[$this->shape[$y][$x]] ?? null;
 	}
 
 	/**
 	 * Returns an array of strings containing characters representing the recipe's shape.
 	 * @return string[]
+	 * @phpstan-return list<string>
 	 */
 	public function getShape() : array{
 		return $this->shape;
@@ -170,7 +182,12 @@ class ShapedRecipe implements CraftingRecipe{
 
 				$given = $grid->getIngredient($reverse ? $this->width - $x - 1 : $x, $y);
 				$required = $this->getIngredient($x, $y);
-				if(!$required->equals($given, !$required->hasAnyDamageValue(), $required->hasNamedTag()) || $required->getCount() > $given->getCount()){
+
+				if($required === null){
+					if(!$given->isNull()){
+						return false; //hole, such as that in the center of a chest recipe, should not be filled
+					}
+				}elseif(!$required->accepts($given)){
 					return false;
 				}
 			}
diff --git a/src/crafting/ShapelessRecipe.php b/src/crafting/ShapelessRecipe.php
index 2b77e58b86..7a4a22fda7 100644
--- a/src/crafting/ShapelessRecipe.php
+++ b/src/crafting/ShapelessRecipe.php
@@ -28,36 +28,38 @@ use pocketmine\utils\Utils;
 use function count;
 
 class ShapelessRecipe implements CraftingRecipe{
-	/** @var Item[] */
+	/**
+	 * @var RecipeIngredient[]
+	 * @phpstan-var list<RecipeIngredient>
+	 */
 	private array $ingredients = [];
-	/** @var Item[] */
+	/**
+	 * @var Item[]
+	 * @phpstan-var list<Item>
+	 */
 	private array $results;
 	private ShapelessRecipeType $type;
 
 	/**
-	 * @param Item[] $ingredients No more than 9 total. This applies to sum of item stack counts, not count of array.
-	 * @param Item[] $results     List of result items created by this recipe.
+	 * @param RecipeIngredient[] $ingredients No more than 9 total. This applies to sum of item stack counts, not count of array.
+	 * @param Item[]             $results     List of result items created by this recipe.
 	 *
-	 * TODO: we'll want to make the type parameter mandatory in PM5
+	 * @phpstan-param list<RecipeIngredient> $ingredients
+	 * @phpstan-param list<Item>             $results
 	 */
-	public function __construct(array $ingredients, array $results, ?ShapelessRecipeType $type = null){
-		$this->type = $type ?? ShapelessRecipeType::CRAFTING();
-		foreach($ingredients as $item){
-			//Ensure they get split up properly
-			if(count($this->ingredients) + $item->getCount() > 9){
-				throw new \InvalidArgumentException("Shapeless recipes cannot have more than 9 ingredients");
-			}
+	public function __construct(array $ingredients, array $results, ShapelessRecipeType $type){
+		$this->type = $type;
 
-			while($item->getCount() > 0){
-				$this->ingredients[] = $item->pop();
-			}
+		if(count($ingredients) > 9){
+			throw new \InvalidArgumentException("Shapeless recipes cannot have more than 9 ingredients");
 		}
-
+		$this->ingredients = $ingredients;
 		$this->results = Utils::cloneObjectArray($results);
 	}
 
 	/**
 	 * @return Item[]
+	 * @phpstan-return list<Item>
 	 */
 	public function getResults() : array{
 		return Utils::cloneObjectArray($this->results);
@@ -71,29 +73,21 @@ class ShapelessRecipe implements CraftingRecipe{
 		return $this->type;
 	}
 
-	/**
-	 * @return Item[]
-	 */
 	public function getIngredientList() : array{
-		return Utils::cloneObjectArray($this->ingredients);
+		return $this->ingredients;
 	}
 
 	public function getIngredientCount() : int{
-		$count = 0;
-		foreach($this->ingredients as $ingredient){
-			$count += $ingredient->getCount();
-		}
-
-		return $count;
+		return count($this->ingredients);
 	}
 
 	public function matchesCraftingGrid(CraftingGrid $grid) : bool{
 		//don't pack the ingredients - shapeless recipes require that each ingredient be in a separate slot
 		$input = $grid->getContents();
 
-		foreach($this->ingredients as $needItem){
+		foreach($this->ingredients as $ingredient){
 			foreach($input as $j => $haveItem){
-				if($haveItem->equals($needItem, !$needItem->hasAnyDamageValue(), $needItem->hasNamedTag()) && $haveItem->getCount() >= $needItem->getCount()){
+				if($ingredient->accepts($haveItem)){
 					unset($input[$j]);
 					continue 2;
 				}
diff --git a/src/crafting/ShapelessRecipeType.php b/src/crafting/ShapelessRecipeType.php
index e7d3242d57..4f4624a4bf 100644
--- a/src/crafting/ShapelessRecipeType.php
+++ b/src/crafting/ShapelessRecipeType.php
@@ -23,24 +23,22 @@ declare(strict_types=1);
 
 namespace pocketmine\crafting;
 
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
+ * @method static ShapelessRecipeType CARTOGRAPHY()
  * @method static ShapelessRecipeType CRAFTING()
+ * @method static ShapelessRecipeType SMITHING()
  * @method static ShapelessRecipeType STONECUTTER()
  */
-final class ShapelessRecipeType{
-	use EnumTrait;
+enum ShapelessRecipeType{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("crafting"),
-			new self("stonecutter")
-		);
-	}
+	case CRAFTING;
+	case STONECUTTER;
+	case SMITHING;
+	case CARTOGRAPHY;
 }
diff --git a/src/crafting/TagWildcardRecipeIngredient.php b/src/crafting/TagWildcardRecipeIngredient.php
new file mode 100644
index 0000000000..32bcf08e1a
--- /dev/null
+++ b/src/crafting/TagWildcardRecipeIngredient.php
@@ -0,0 +1,55 @@
+<?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\crafting;
+
+use pocketmine\data\bedrock\ItemTagToIdMap;
+use pocketmine\item\Item;
+use pocketmine\world\format\io\GlobalItemDataHandlers;
+
+/**
+ * Recipe ingredient that matches items whose ID falls within a specific set. This is used for magic meta value
+ * wildcards and also for ingredients which use item tags (since tags implicitly rely on ID only).
+ *
+ * @internal
+ */
+final class TagWildcardRecipeIngredient implements RecipeIngredient{
+
+	public function __construct(
+		private string $tagName
+	){}
+
+	public function getTagName() : string{ return $this->tagName; }
+
+	public function accepts(Item $item) : bool{
+		if($item->getCount() < 1){
+			return false;
+		}
+
+		return ItemTagToIdMap::getInstance()->tagContainsId($this->tagName, GlobalItemDataHandlers::getSerializer()->serializeType($item)->getName());
+	}
+
+	public function __toString() : string{
+		return "TagWildcardRecipeIngredient($this->tagName)";
+	}
+}
diff --git a/src/crafting/json/FurnaceRecipeData.php b/src/crafting/json/FurnaceRecipeData.php
new file mode 100644
index 0000000000..c5513030bc
--- /dev/null
+++ b/src/crafting/json/FurnaceRecipeData.php
@@ -0,0 +1,42 @@
+<?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\crafting\json;
+
+final class FurnaceRecipeData{
+
+	/** @required */
+	public RecipeIngredientData $input;
+
+	/** @required */
+	public ItemStackData $output;
+
+	/** @required */
+	public string $block;
+
+	public function __construct(RecipeIngredientData $input, ItemStackData $output, string $block){
+		$this->input = $input;
+		$this->output = $output;
+		$this->block = $block;
+	}
+}
diff --git a/src/crafting/json/ItemStackData.php b/src/crafting/json/ItemStackData.php
new file mode 100644
index 0000000000..032c7da7d2
--- /dev/null
+++ b/src/crafting/json/ItemStackData.php
@@ -0,0 +1,43 @@
+<?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\crafting\json;
+
+final class ItemStackData{
+
+	/** @required */
+	public string $name;
+
+	public int $count;
+	public string $block_states;
+	public int $meta;
+	public string $nbt;
+	/** @var string[] */
+	public array $can_place_on;
+	/** @var string[] */
+	public array $can_destroy;
+
+	public function __construct(string $name){
+		$this->name = $name;
+	}
+}
diff --git a/src/crafting/json/PotionContainerChangeRecipeData.php b/src/crafting/json/PotionContainerChangeRecipeData.php
new file mode 100644
index 0000000000..4664a0ae9a
--- /dev/null
+++ b/src/crafting/json/PotionContainerChangeRecipeData.php
@@ -0,0 +1,41 @@
+<?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\crafting\json;
+
+final class PotionContainerChangeRecipeData{
+	/** @required */
+	public string $input_item_name;
+
+	/** @required */
+	public RecipeIngredientData $ingredient;
+
+	/** @required */
+	public string $output_item_name;
+
+	public function __construct(string $input_item_name, RecipeIngredientData $ingredient, string $output_item_name){
+		$this->input_item_name = $input_item_name;
+		$this->ingredient = $ingredient;
+		$this->output_item_name = $output_item_name;
+	}
+}
diff --git a/src/crafting/json/PotionTypeRecipeData.php b/src/crafting/json/PotionTypeRecipeData.php
new file mode 100644
index 0000000000..d500058936
--- /dev/null
+++ b/src/crafting/json/PotionTypeRecipeData.php
@@ -0,0 +1,41 @@
+<?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\crafting\json;
+
+final class PotionTypeRecipeData{
+	/** @required */
+	public RecipeIngredientData $input;
+
+	/** @required */
+	public RecipeIngredientData $ingredient;
+
+	/** @required */
+	public ItemStackData $output;
+
+	public function __construct(RecipeIngredientData $input, RecipeIngredientData $ingredient, ItemStackData $output){
+		$this->input = $input;
+		$this->ingredient = $ingredient;
+		$this->output = $output;
+	}
+}
diff --git a/src/crafting/json/RecipeIngredientData.php b/src/crafting/json/RecipeIngredientData.php
new file mode 100644
index 0000000000..b1ee8056d2
--- /dev/null
+++ b/src/crafting/json/RecipeIngredientData.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\crafting\json;
+
+final class RecipeIngredientData{
+	public const WILDCARD_META_VALUE = 32767;
+
+	public string $name;
+	public int $meta;
+	public string $block_states;
+
+	public string $tag;
+
+	public string $molang_expression;
+	public int $molang_version;
+
+	public int $count;
+}
diff --git a/src/crafting/json/ShapedRecipeData.php b/src/crafting/json/ShapedRecipeData.php
new file mode 100644
index 0000000000..965a437ea6
--- /dev/null
+++ b/src/crafting/json/ShapedRecipeData.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\crafting\json;
+
+use function count;
+
+final class ShapedRecipeData implements \JsonSerializable{
+	/**
+	 * @required
+	 * @var string[]
+	 * @phpstan-var list<string>
+	 */
+	public array $shape;
+
+	/**
+	 * @required
+	 * @var RecipeIngredientData[]
+	 * @phpstan-var array<string, RecipeIngredientData>
+	 */
+	public array $input;
+
+	/**
+	 * @required
+	 * @var ItemStackData[]
+	 * @phpstan-var list<ItemStackData>
+	 */
+	public array $output;
+
+	/** @required */
+	public string $block;
+
+	/** @required */
+	public int $priority;
+
+	/** @var RecipeIngredientData[] */
+	public array $unlockingIngredients = [];
+
+	/**
+	 * TODO: convert this to use promoted properties - avoiding them for now since it would break JsonMapper
+	 *
+	 * @param string[]               $shape
+	 * @param RecipeIngredientData[] $input
+	 * @param ItemStackData[]        $output
+	 * @param RecipeIngredientData[] $unlockingIngredients
+	 *
+	 * @phpstan-param list<string> $shape
+	 * @phpstan-param array<string, RecipeIngredientData> $input
+	 * @phpstan-param list<ItemStackData> $output
+	 * @phpstan-param list<RecipeIngredientData> $unlockingIngredients
+	 */
+	public function __construct(array $shape, array $input, array $output, string $block, int $priority, array $unlockingIngredients = []){
+		$this->block = $block;
+		$this->priority = $priority;
+		$this->shape = $shape;
+		$this->input = $input;
+		$this->output = $output;
+		$this->unlockingIngredients = $unlockingIngredients;
+	}
+
+	/**
+	 * @return mixed[]
+	 */
+	public function jsonSerialize() : array{
+		$result = (array) $this;
+		if(count($this->unlockingIngredients) === 0){
+			unset($result["unlockingIngredients"]);
+		}
+		return $result;
+	}
+}
diff --git a/src/crafting/json/ShapelessRecipeData.php b/src/crafting/json/ShapelessRecipeData.php
new file mode 100644
index 0000000000..23cfebde0b
--- /dev/null
+++ b/src/crafting/json/ShapelessRecipeData.php
@@ -0,0 +1,80 @@
+<?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\crafting\json;
+
+use function count;
+
+final class ShapelessRecipeData implements \JsonSerializable{
+
+	/**
+	 * @required
+	 * @var RecipeIngredientData[]
+	 * @phpstan-var list<RecipeIngredientData>
+	 */
+	public array $input;
+
+	/**
+	 * @required
+	 * @var ItemStackData[]
+	 * @phpstan-var list<ItemStackData>
+	 */
+	public array $output;
+
+	/** @required */
+	public string $block;
+
+	/** @required */
+	public int $priority;
+
+	/** @var RecipeIngredientData[] */
+	public array $unlockingIngredients = [];
+
+	/**
+	 * @param RecipeIngredientData[] $input
+	 * @param ItemStackData[]        $output
+	 * @param RecipeIngredientData[] $unlockingIngredients
+	 *
+	 * @phpstan-param list<RecipeIngredientData> $input
+	 * @phpstan-param list<ItemStackData> $output
+	 * @phpstan-param list<RecipeIngredientData> $unlockingIngredients
+	 */
+	public function __construct(array $input, array $output, string $block, int $priority, array $unlockingIngredients = []){
+		$this->block = $block;
+		$this->priority = $priority;
+		$this->input = $input;
+		$this->output = $output;
+		$this->unlockingIngredients = $unlockingIngredients;
+	}
+
+	/**
+	 * @return mixed[]
+	 */
+	public function jsonSerialize() : array{
+		$result = (array) $this;
+		if(count($this->unlockingIngredients) === 0){
+			unset($result["unlockingIngredients"]);
+		}
+		return $result;
+	}
+}
diff --git a/src/crafting/json/SmithingTransformRecipeData.php b/src/crafting/json/SmithingTransformRecipeData.php
new file mode 100644
index 0000000000..17cdab54b4
--- /dev/null
+++ b/src/crafting/json/SmithingTransformRecipeData.php
@@ -0,0 +1,46 @@
+<?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\crafting\json;
+
+final class SmithingTransformRecipeData{
+
+	/** @required */
+	public RecipeIngredientData $template;
+	/** @required */
+	public RecipeIngredientData $input;
+	/** @required */
+	public RecipeIngredientData $addition;
+	/** @required */
+	public ItemStackData $output;
+	/** @required */
+	public string $block;
+
+	public function __construct(RecipeIngredientData $template, RecipeIngredientData $input, RecipeIngredientData $addition, ItemStackData $output, string $block){
+		$this->template = $template;
+		$this->input = $input;
+		$this->addition = $addition;
+		$this->output = $output;
+		$this->block = $block;
+	}
+}
diff --git a/src/crafting/json/SmithingTrimRecipeData.php b/src/crafting/json/SmithingTrimRecipeData.php
new file mode 100644
index 0000000000..9e385984b0
--- /dev/null
+++ b/src/crafting/json/SmithingTrimRecipeData.php
@@ -0,0 +1,43 @@
+<?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\crafting\json;
+
+final class SmithingTrimRecipeData{
+
+	/** @required */
+	public RecipeIngredientData $template;
+	/** @required */
+	public RecipeIngredientData $input;
+	/** @required */
+	public RecipeIngredientData $addition;
+	/** @required */
+	public string $block;
+
+	public function __construct(RecipeIngredientData $template, RecipeIngredientData $input, RecipeIngredientData $addition, string $block){
+		$this->template = $template;
+		$this->input = $input;
+		$this->addition = $addition;
+		$this->block = $block;
+	}
+}
diff --git a/src/crash/CrashDump.php b/src/crash/CrashDump.php
index 388550ac35..49a587c34c 100644
--- a/src/crash/CrashDump.php
+++ b/src/crash/CrashDump.php
@@ -29,11 +29,14 @@ use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\plugin\PluginBase;
 use pocketmine\plugin\PluginManager;
 use pocketmine\Server;
+use pocketmine\thread\ThreadCrashInfoFrame;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Filesystem;
 use pocketmine\utils\Utils;
 use pocketmine\VersionInfo;
+use pocketmine\YmlServerProperties;
 use Symfony\Component\Filesystem\Path;
+use function array_map;
 use function base64_encode;
 use function error_get_last;
 use function file;
@@ -60,6 +63,12 @@ use function strpos;
 use function substr;
 use function zend_version;
 use function zlib_encode;
+use const E_COMPILE_ERROR;
+use const E_CORE_ERROR;
+use const E_ERROR;
+use const E_PARSE;
+use const E_RECOVERABLE_ERROR;
+use const E_USER_ERROR;
 use const FILE_IGNORE_NEW_LINES;
 use const JSON_THROW_ON_ERROR;
 use const JSON_UNESCAPED_SLASHES;
@@ -82,6 +91,9 @@ class CrashDump{
 	public const PLUGIN_INVOLVEMENT_DIRECT = "direct";
 	public const PLUGIN_INVOLVEMENT_INDIRECT = "indirect";
 
+	public const FATAL_ERROR_MASK =
+		E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR;
+
 	private CrashDumpData $data;
 	private string $encodedData;
 
@@ -140,7 +152,7 @@ class CrashDump{
 					depends: $d->getDepend(),
 					softDepends: $d->getSoftDepend(),
 					main: $d->getMain(),
-					load: mb_strtoupper($d->getOrder()->name()),
+					load: mb_strtoupper($d->getOrder()->name),
 					website: $d->getWebsite()
 				);
 			}
@@ -150,7 +162,7 @@ class CrashDump{
 	private function extraData() : void{
 		global $argv;
 
-		if($this->server->getConfigGroup()->getPropertyBool("auto-report.send-settings", true)){
+		if($this->server->getConfigGroup()->getPropertyBool(YmlServerProperties::AUTO_REPORT_SEND_SETTINGS, true)){
 			$this->data->parameters = (array) $argv;
 			if(($serverDotProperties = @file_get_contents(Path::join($this->server->getDataPath(), "server.properties"))) !== false){
 				$this->data->serverDotProperties = preg_replace("#^rcon\\.password=(.*)$#m", "rcon.password=******", $serverDotProperties) ?? throw new AssumptionFailedError("Pattern is valid");
@@ -168,7 +180,7 @@ class CrashDump{
 
 		$this->data->jit_mode = Utils::getOpcacheJitMode();
 
-		if($this->server->getConfigGroup()->getPropertyBool("auto-report.send-phpinfo", true)){
+		if($this->server->getConfigGroup()->getPropertyBool(YmlServerProperties::AUTO_REPORT_SEND_PHPINFO, true)){
 			ob_start();
 			phpinfo();
 			$this->data->phpinfo = ob_get_contents(); // @phpstan-ignore-line
@@ -183,10 +195,10 @@ class CrashDump{
 			$error = $lastExceptionError;
 		}else{
 			$error = error_get_last();
-			if($error === null){
+			if($error === null || ($error["type"] & self::FATAL_ERROR_MASK) === 0){
 				throw new \RuntimeException("Crash error information missing - did something use exit()?");
 			}
-			$error["trace"] = Utils::currentTrace(3); //Skipping CrashDump->baseCrash, CrashDump->construct, Server->crashDump
+			$error["trace"] = Utils::printableTrace(Utils::currentTrace(3)); //Skipping CrashDump->baseCrash, CrashDump->construct, Server->crashDump
 			$error["fullFile"] = $error["file"];
 			$error["file"] = Filesystem::cleanPath($error["file"]);
 			try{
@@ -197,15 +209,14 @@ class CrashDump{
 			if(($pos = strpos($error["message"], "\n")) !== false){
 				$error["message"] = substr($error["message"], 0, $pos);
 			}
+			$error["thread"] = "Main";
 		}
 		$error["message"] = mb_scrub($error["message"], 'UTF-8');
 
 		if(isset($lastError)){
-			if(isset($lastError["trace"])){
-				$lastError["trace"] = Utils::printableTrace($lastError["trace"]);
-			}
 			$this->data->lastError = $lastError;
 			$this->data->lastError["message"] = mb_scrub($this->data->lastError["message"], 'UTF-8');
+			$this->data->lastError["trace"] = array_map(array: $lastError["trace"], callback: fn(ThreadCrashInfoFrame $frame) => $frame->getPrintableFrame());
 		}
 
 		$this->data->error = $error;
@@ -215,16 +226,17 @@ class CrashDump{
 		$this->data->plugin_involvement = self::PLUGIN_INVOLVEMENT_NONE;
 		if(!$this->determinePluginFromFile($error["fullFile"], true)){ //fatal errors won't leave any stack trace
 			foreach($error["trace"] as $frame){
-				if(!isset($frame["file"])){
+				$frameFile = $frame->getFile();
+				if($frameFile === null){
 					continue; //PHP core
 				}
-				if($this->determinePluginFromFile($frame["file"], false)){
+				if($this->determinePluginFromFile($frameFile, false)){
 					break;
 				}
 			}
 		}
 
-		if($this->server->getConfigGroup()->getPropertyBool("auto-report.send-code", true) && file_exists($error["fullFile"])){
+		if($this->server->getConfigGroup()->getPropertyBool(YmlServerProperties::AUTO_REPORT_SEND_CODE, true) && file_exists($error["fullFile"])){
 			$file = @file($error["fullFile"], FILE_IGNORE_NEW_LINES);
 			if($file !== false){
 				for($l = max(0, $error["line"] - 10); $l < $error["line"] + 10 && isset($file[$l]); ++$l){
@@ -233,7 +245,8 @@ class CrashDump{
 			}
 		}
 
-		$this->data->trace = Utils::printableTrace($error["trace"]);
+		$this->data->trace = array_map(array: $error["trace"], callback: fn(ThreadCrashInfoFrame $frame) => $frame->getPrintableFrame());
+		$this->data->thread = $error["thread"];
 	}
 
 	private function determinePluginFromFile(string $filePath, bool $crashFrame) : bool{
@@ -248,7 +261,6 @@ class CrashDump{
 			if(file_exists($filePath)){
 				$reflection = new \ReflectionClass(PluginBase::class);
 				$file = $reflection->getProperty("file");
-				$file->setAccessible(true);
 				foreach($this->server->getPluginManager()->getPlugins() as $plugin){
 					$filePath = Filesystem::cleanPath($file->getValue($plugin));
 					if(str_starts_with($frameCleanPath, $filePath)){
diff --git a/src/crash/CrashDumpData.php b/src/crash/CrashDumpData.php
index 0f5358be5c..f8a20abd5b 100644
--- a/src/crash/CrashDumpData.php
+++ b/src/crash/CrashDumpData.php
@@ -37,11 +37,16 @@ final class CrashDumpData implements \JsonSerializable{
 	/** @var mixed[] */
 	public array $error;
 
+	public string $thread;
+
 	public string $plugin_involvement;
 
 	public string $plugin = "";
 
-	/** @var string[] */
+	/**
+	 * @var string[]
+	 * @phpstan-var array<int, string>
+	 */
 	public array $code = [];
 
 	/** @var string[] */
@@ -53,7 +58,10 @@ final class CrashDumpData implements \JsonSerializable{
 	 */
 	public array $plugins = [];
 
-	/** @var string[] */
+	/**
+	 * @var string[]
+	 * @phpstan-var list<string>
+	 */
 	public array $parameters = [];
 
 	public string $serverDotProperties = "";
diff --git a/src/crash/CrashDumpRenderer.php b/src/crash/CrashDumpRenderer.php
index 2858f43ec1..617dcb7aba 100644
--- a/src/crash/CrashDumpRenderer.php
+++ b/src/crash/CrashDumpRenderer.php
@@ -64,6 +64,7 @@ final class CrashDumpRenderer{
 
 		$this->addLine();
 
+		$this->addLine("Thread: " . $this->data->thread);
 		$this->addLine("Error: " . $this->data->error["message"]);
 		$this->addLine("File: " . $this->data->error["file"]);
 		$this->addLine("Line: " . $this->data->error["line"]);
diff --git a/src/data/bedrock/BannerPatternTypeIdMap.php b/src/data/bedrock/BannerPatternTypeIdMap.php
index 293f8ec387..7d4353d4f2 100644
--- a/src/data/bedrock/BannerPatternTypeIdMap.php
+++ b/src/data/bedrock/BannerPatternTypeIdMap.php
@@ -26,6 +26,7 @@ namespace pocketmine\data\bedrock;
 use pocketmine\block\utils\BannerPatternType;
 use pocketmine\utils\SingletonTrait;
 use function array_key_exists;
+use function spl_object_id;
 
 final class BannerPatternTypeIdMap{
 	use SingletonTrait;
@@ -42,49 +43,57 @@ final class BannerPatternTypeIdMap{
 	private array $enumToId = [];
 
 	public function __construct(){
-		$this->register("bo", BannerPatternType::BORDER());
-		$this->register("bri", BannerPatternType::BRICKS());
-		$this->register("mc", BannerPatternType::CIRCLE());
-		$this->register("cre", BannerPatternType::CREEPER());
-		$this->register("cr", BannerPatternType::CROSS());
-		$this->register("cbo", BannerPatternType::CURLY_BORDER());
-		$this->register("lud", BannerPatternType::DIAGONAL_LEFT());
-		$this->register("rd", BannerPatternType::DIAGONAL_RIGHT());
-		$this->register("ld", BannerPatternType::DIAGONAL_UP_LEFT());
-		$this->register("rud", BannerPatternType::DIAGONAL_UP_RIGHT());
-		$this->register("flo", BannerPatternType::FLOWER());
-		$this->register("gra", BannerPatternType::GRADIENT());
-		$this->register("gru", BannerPatternType::GRADIENT_UP());
-		$this->register("hh", BannerPatternType::HALF_HORIZONTAL());
-		$this->register("hhb", BannerPatternType::HALF_HORIZONTAL_BOTTOM());
-		$this->register("vh", BannerPatternType::HALF_VERTICAL());
-		$this->register("vhr", BannerPatternType::HALF_VERTICAL_RIGHT());
-		$this->register("moj", BannerPatternType::MOJANG());
-		$this->register("mr", BannerPatternType::RHOMBUS());
-		$this->register("sku", BannerPatternType::SKULL());
-		$this->register("ss", BannerPatternType::SMALL_STRIPES());
-		$this->register("bl", BannerPatternType::SQUARE_BOTTOM_LEFT());
-		$this->register("br", BannerPatternType::SQUARE_BOTTOM_RIGHT());
-		$this->register("tl", BannerPatternType::SQUARE_TOP_LEFT());
-		$this->register("tr", BannerPatternType::SQUARE_TOP_RIGHT());
-		$this->register("sc", BannerPatternType::STRAIGHT_CROSS());
-		$this->register("bs", BannerPatternType::STRIPE_BOTTOM());
-		$this->register("cs", BannerPatternType::STRIPE_CENTER());
-		$this->register("dls", BannerPatternType::STRIPE_DOWNLEFT());
-		$this->register("drs", BannerPatternType::STRIPE_DOWNRIGHT());
-		$this->register("ls", BannerPatternType::STRIPE_LEFT());
-		$this->register("ms", BannerPatternType::STRIPE_MIDDLE());
-		$this->register("rs", BannerPatternType::STRIPE_RIGHT());
-		$this->register("ts", BannerPatternType::STRIPE_TOP());
-		$this->register("bt", BannerPatternType::TRIANGLE_BOTTOM());
-		$this->register("tt", BannerPatternType::TRIANGLE_TOP());
-		$this->register("bts", BannerPatternType::TRIANGLES_BOTTOM());
-		$this->register("tts", BannerPatternType::TRIANGLES_TOP());
+		foreach(BannerPatternType::cases() as $case){
+			$this->register(match($case){
+				BannerPatternType::BORDER => "bo",
+				BannerPatternType::BRICKS => "bri",
+				BannerPatternType::CIRCLE => "mc",
+				BannerPatternType::CREEPER => "cre",
+				BannerPatternType::CROSS => "cr",
+				BannerPatternType::CURLY_BORDER => "cbo",
+				BannerPatternType::DIAGONAL_LEFT => "lud",
+				BannerPatternType::DIAGONAL_RIGHT => "rd",
+				BannerPatternType::DIAGONAL_UP_LEFT => "ld",
+				BannerPatternType::DIAGONAL_UP_RIGHT => "rud",
+				BannerPatternType::FLOWER => "flo",
+				BannerPatternType::FLOW => "flw",
+				BannerPatternType::GLOBE => "glb",
+				BannerPatternType::GRADIENT => "gra",
+				BannerPatternType::GRADIENT_UP => "gru",
+				BannerPatternType::GUSTER => "gus",
+				BannerPatternType::HALF_HORIZONTAL => "hh",
+				BannerPatternType::HALF_HORIZONTAL_BOTTOM => "hhb",
+				BannerPatternType::HALF_VERTICAL => "vh",
+				BannerPatternType::HALF_VERTICAL_RIGHT => "vhr",
+				BannerPatternType::MOJANG => "moj",
+				BannerPatternType::PIGLIN => "pig",
+				BannerPatternType::RHOMBUS => "mr",
+				BannerPatternType::SKULL => "sku",
+				BannerPatternType::SMALL_STRIPES => "ss",
+				BannerPatternType::SQUARE_BOTTOM_LEFT => "bl",
+				BannerPatternType::SQUARE_BOTTOM_RIGHT => "br",
+				BannerPatternType::SQUARE_TOP_LEFT => "tl",
+				BannerPatternType::SQUARE_TOP_RIGHT => "tr",
+				BannerPatternType::STRAIGHT_CROSS => "sc",
+				BannerPatternType::STRIPE_BOTTOM => "bs",
+				BannerPatternType::STRIPE_CENTER => "cs",
+				BannerPatternType::STRIPE_DOWNLEFT => "dls",
+				BannerPatternType::STRIPE_DOWNRIGHT => "drs",
+				BannerPatternType::STRIPE_LEFT => "ls",
+				BannerPatternType::STRIPE_MIDDLE => "ms",
+				BannerPatternType::STRIPE_RIGHT => "rs",
+				BannerPatternType::STRIPE_TOP => "ts",
+				BannerPatternType::TRIANGLE_BOTTOM => "bt",
+				BannerPatternType::TRIANGLE_TOP => "tt",
+				BannerPatternType::TRIANGLES_BOTTOM => "bts",
+				BannerPatternType::TRIANGLES_TOP => "tts",
+			}, $case);
+		}
 	}
 
 	public function register(string $stringId, BannerPatternType $type) : void{
 		$this->idToEnum[$stringId] = $type;
-		$this->enumToId[$type->id()] = $stringId;
+		$this->enumToId[spl_object_id($type)] = $stringId;
 	}
 
 	public function fromId(string $id) : ?BannerPatternType{
@@ -92,9 +101,10 @@ final class BannerPatternTypeIdMap{
 	}
 
 	public function toId(BannerPatternType $type) : string{
-		if(!array_key_exists($type->id(), $this->enumToId)){
-			throw new \InvalidArgumentException("Missing mapping for banner pattern type " . $type->name());
+		$k = spl_object_id($type);
+		if(!array_key_exists($k, $this->enumToId)){
+			throw new \InvalidArgumentException("Missing mapping for banner pattern type " . $type->name);
 		}
-		return $this->enumToId[$type->id()];
+		return $this->enumToId[$k];
 	}
 }
diff --git a/src/data/bedrock/BedrockDataFiles.php b/src/data/bedrock/BedrockDataFiles.php
new file mode 100644
index 0000000000..5c476ca1c6
--- /dev/null
+++ b/src/data/bedrock/BedrockDataFiles.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock;
+
+use const pocketmine\BEDROCK_DATA_PATH;
+
+final class BedrockDataFiles{
+	private function __construct(){
+		//NOOP
+	}
+
+	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_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';
+	public const BLOCK_STATE_META_MAP_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map.json';
+	public const CANONICAL_BLOCK_STATES_NBT = BEDROCK_DATA_PATH . '/canonical_block_states.nbt';
+	public const COMMAND_ARG_TYPES_JSON = BEDROCK_DATA_PATH . '/command_arg_types.json';
+	public const CREATIVEITEMS_JSON = BEDROCK_DATA_PATH . '/creativeitems.json';
+	public const ENTITY_ID_MAP_JSON = BEDROCK_DATA_PATH . '/entity_id_map.json';
+	public const ENTITY_IDENTIFIERS_NBT = BEDROCK_DATA_PATH . '/entity_identifiers.nbt';
+	public const ITEM_TAGS_JSON = BEDROCK_DATA_PATH . '/item_tags.json';
+	public const LEVEL_SOUND_ID_MAP_JSON = BEDROCK_DATA_PATH . '/level_sound_id_map.json';
+	public const PARTICLE_ID_MAP_JSON = BEDROCK_DATA_PATH . '/particle_id_map.json';
+	public const R12_TO_CURRENT_BLOCK_MAP_BIN = BEDROCK_DATA_PATH . '/r12_to_current_block_map.bin';
+	public const R16_TO_CURRENT_ITEM_MAP_JSON = BEDROCK_DATA_PATH . '/r16_to_current_item_map.json';
+	public const REQUIRED_ITEM_LIST_JSON = BEDROCK_DATA_PATH . '/required_item_list.json';
+}
diff --git a/src/data/bedrock/BiomeIds.php b/src/data/bedrock/BiomeIds.php
index ac95552780..1169a51eae 100644
--- a/src/data/bedrock/BiomeIds.php
+++ b/src/data/bedrock/BiomeIds.php
@@ -111,4 +111,15 @@ final class BiomeIds{
 	public const CRIMSON_FOREST = 179;
 	public const WARPED_FOREST = 180;
 	public const BASALT_DELTAS = 181;
+	public const JAGGED_PEAKS = 182;
+	public const FROZEN_PEAKS = 183;
+	public const SNOWY_SLOPES = 184;
+	public const GROVE = 185;
+	public const MEADOW = 186;
+	public const LUSH_CAVES = 187;
+	public const DRIPSTONE_CAVES = 188;
+	public const STONY_PEAKS = 189;
+	public const DEEP_DARK = 190;
+	public const MANGROVE_SWAMP = 191;
+	public const CHERRY_GROVE = 192;
 }
diff --git a/src/data/bedrock/CoralTypeIdMap.php b/src/data/bedrock/CoralTypeIdMap.php
deleted file mode 100644
index 134c0053b8..0000000000
--- a/src/data/bedrock/CoralTypeIdMap.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\data\bedrock;
-
-use pocketmine\block\BlockLegacyMetadata;
-use pocketmine\block\utils\CoralType;
-use pocketmine\utils\SingletonTrait;
-use function array_key_exists;
-
-final class CoralTypeIdMap{
-	use SingletonTrait;
-
-	/**
-	 * @var CoralType[]
-	 * @phpstan-var array<int, CoralType>
-	 */
-	private array $idToEnum = [];
-	/**
-	 * @var int[]
-	 * @phpstan-var array<int, int>
-	 */
-	private array $enumToId = [];
-
-	public function __construct(){
-		$this->register(BlockLegacyMetadata::CORAL_VARIANT_TUBE, CoralType::TUBE());
-		$this->register(BlockLegacyMetadata::CORAL_VARIANT_BRAIN, CoralType::BRAIN());
-		$this->register(BlockLegacyMetadata::CORAL_VARIANT_BUBBLE, CoralType::BUBBLE());
-		$this->register(BlockLegacyMetadata::CORAL_VARIANT_FIRE, CoralType::FIRE());
-		$this->register(BlockLegacyMetadata::CORAL_VARIANT_HORN, CoralType::HORN());
-	}
-
-	public function register(int $id, CoralType $type) : void{
-		$this->idToEnum[$id] = $type;
-		$this->enumToId[$type->id()] = $id;
-	}
-
-	public function fromId(int $id) : ?CoralType{
-		return $this->idToEnum[$id] ?? null;
-	}
-
-	public function toId(CoralType $type) : int{
-		if(!array_key_exists($type->id(), $this->enumToId)){
-			throw new \InvalidArgumentException("Coral type does not have a mapped ID"); //this should never happen
-		}
-		return $this->enumToId[$type->id()];
-	}
-}
diff --git a/src/data/bedrock/DyeColorIdMap.php b/src/data/bedrock/DyeColorIdMap.php
index 279c90ebbb..60c5097059 100644
--- a/src/data/bedrock/DyeColorIdMap.php
+++ b/src/data/bedrock/DyeColorIdMap.php
@@ -24,60 +24,73 @@ declare(strict_types=1);
 namespace pocketmine\data\bedrock;
 
 use pocketmine\block\utils\DyeColor;
+use pocketmine\data\bedrock\item\ItemTypeNames;
 use pocketmine\utils\SingletonTrait;
+use function spl_object_id;
 
 final class DyeColorIdMap{
 	use SingletonTrait;
+	/** @phpstan-use IntSaveIdMapTrait<DyeColor> */
+	use IntSaveIdMapTrait {
+		register as registerInt;
+	}
 
 	/**
 	 * @var DyeColor[]
-	 * @phpstan-var array<int, DyeColor>
+	 * @phpstan-var array<string, DyeColor>
 	 */
-	private array $idToEnum = [];
+	private array $itemIdToEnum = [];
 
 	/**
-	 * @var int[]
-	 * @phpstan-var array<int, int>
+	 * @var string[]
+	 * @phpstan-var array<int, string>
 	 */
-	private array $enumToId = [];
+	private array $enumToItemId = [];
 
 	private function __construct(){
-		$this->register(0, DyeColor::WHITE());
-		$this->register(1, DyeColor::ORANGE());
-		$this->register(2, DyeColor::MAGENTA());
-		$this->register(3, DyeColor::LIGHT_BLUE());
-		$this->register(4, DyeColor::YELLOW());
-		$this->register(5, DyeColor::LIME());
-		$this->register(6, DyeColor::PINK());
-		$this->register(7, DyeColor::GRAY());
-		$this->register(8, DyeColor::LIGHT_GRAY());
-		$this->register(9, DyeColor::CYAN());
-		$this->register(10, DyeColor::PURPLE());
-		$this->register(11, DyeColor::BLUE());
-		$this->register(12, DyeColor::BROWN());
-		$this->register(13, DyeColor::GREEN());
-		$this->register(14, DyeColor::RED());
-		$this->register(15, DyeColor::BLACK());
+		foreach(DyeColor::cases() as $case){
+			[$colorId, $dyeItemId] = match($case){
+				DyeColor::WHITE => [0, ItemTypeNames::WHITE_DYE],
+				DyeColor::ORANGE => [1, ItemTypeNames::ORANGE_DYE],
+				DyeColor::MAGENTA => [2, ItemTypeNames::MAGENTA_DYE],
+				DyeColor::LIGHT_BLUE => [3, ItemTypeNames::LIGHT_BLUE_DYE],
+				DyeColor::YELLOW => [4, ItemTypeNames::YELLOW_DYE],
+				DyeColor::LIME => [5, ItemTypeNames::LIME_DYE],
+				DyeColor::PINK => [6, ItemTypeNames::PINK_DYE],
+				DyeColor::GRAY => [7, ItemTypeNames::GRAY_DYE],
+				DyeColor::LIGHT_GRAY => [8, ItemTypeNames::LIGHT_GRAY_DYE],
+				DyeColor::CYAN => [9, ItemTypeNames::CYAN_DYE],
+				DyeColor::PURPLE => [10, ItemTypeNames::PURPLE_DYE],
+				DyeColor::BLUE => [11, ItemTypeNames::BLUE_DYE],
+				DyeColor::BROWN => [12, ItemTypeNames::BROWN_DYE],
+				DyeColor::GREEN => [13, ItemTypeNames::GREEN_DYE],
+				DyeColor::RED => [14, ItemTypeNames::RED_DYE],
+				DyeColor::BLACK => [15, ItemTypeNames::BLACK_DYE],
+			};
+
+			$this->register($colorId, $dyeItemId, $case);
+		}
 	}
 
-	private function register(int $id, DyeColor $color) : void{
-		$this->idToEnum[$id] = $color;
-		$this->enumToId[$color->id()] = $id;
-	}
-
-	public function toId(DyeColor $color) : int{
-		return $this->enumToId[$color->id()]; //TODO: is it possible for this to be missing?
+	private function register(int $id, string $itemId, DyeColor $color) : void{
+		$this->registerInt($id, $color);
+		$this->itemIdToEnum[$itemId] = $color;
+		$this->enumToItemId[spl_object_id($color)] = $itemId;
 	}
 
 	public function toInvertedId(DyeColor $color) : int{
 		return ~$this->toId($color) & 0xf;
 	}
 
-	public function fromId(int $id) : ?DyeColor{
-		return $this->idToEnum[$id] ?? null;
+	public function toItemId(DyeColor $color) : string{
+		return $this->enumToItemId[spl_object_id($color)];
 	}
 
 	public function fromInvertedId(int $id) : ?DyeColor{
 		return $this->fromId(~$id & 0xf);
 	}
+
+	public function fromItemId(string $itemId) : ?DyeColor{
+		return $this->itemIdToEnum[$itemId] ?? null;
+	}
 }
diff --git a/src/data/bedrock/EffectIdMap.php b/src/data/bedrock/EffectIdMap.php
index 6dce86d9b9..cadd8c397c 100644
--- a/src/data/bedrock/EffectIdMap.php
+++ b/src/data/bedrock/EffectIdMap.php
@@ -26,23 +26,11 @@ namespace pocketmine\data\bedrock;
 use pocketmine\entity\effect\Effect;
 use pocketmine\entity\effect\VanillaEffects;
 use pocketmine\utils\SingletonTrait;
-use function array_key_exists;
-use function spl_object_id;
 
 final class EffectIdMap{
 	use SingletonTrait;
-
-	/**
-	 * @var Effect[]
-	 * @phpstan-var array<int, Effect>
-	 */
-	private array $idToEffect = [];
-
-	/**
-	 * @var int[]
-	 * @phpstan-var array<int, int>
-	 */
-	private array $effectToId = [];
+	/** @phpstan-use IntSaveIdMapTrait<Effect> */
+	use IntSaveIdMapTrait;
 
 	private function __construct(){
 		$this->register(EffectIds::SPEED, VanillaEffects::SPEED());
@@ -76,24 +64,4 @@ final class EffectIdMap{
 		//TODO: VILLAGE_HERO
 		$this->register(EffectIds::DARKNESS, VanillaEffects::DARKNESS());
 	}
-
-	//TODO: not a big fan of the code duplication here :(
-
-	public function register(int $mcpeId, Effect $effect) : void{
-		$this->idToEffect[$mcpeId] = $effect;
-		$this->effectToId[spl_object_id($effect)] = $mcpeId;
-	}
-
-	public function fromId(int $id) : ?Effect{
-		//we might not have all the effect IDs registered
-		return $this->idToEffect[$id] ?? null;
-	}
-
-	public function toId(Effect $effect) : int{
-		if(!array_key_exists(spl_object_id($effect), $this->effectToId)){
-			//this should never happen, so we treat it as an exceptional condition
-			throw new \InvalidArgumentException("Effect does not have a mapped ID");
-		}
-		return $this->effectToId[spl_object_id($effect)];
-	}
 }
diff --git a/src/data/bedrock/EnchantmentIdMap.php b/src/data/bedrock/EnchantmentIdMap.php
index d7f436fa38..e3d652b19c 100644
--- a/src/data/bedrock/EnchantmentIdMap.php
+++ b/src/data/bedrock/EnchantmentIdMap.php
@@ -26,25 +26,14 @@ namespace pocketmine\data\bedrock;
 use pocketmine\item\enchantment\Enchantment;
 use pocketmine\item\enchantment\VanillaEnchantments;
 use pocketmine\utils\SingletonTrait;
-use function array_key_exists;
-use function spl_object_id;
 
 /**
  * Handles translation of internal enchantment types to and from Minecraft: Bedrock IDs.
  */
 final class EnchantmentIdMap{
 	use SingletonTrait;
-
-	/**
-	 * @var Enchantment[]
-	 * @phpstan-var array<int, Enchantment>
-	 */
-	private array $idToEnch = [];
-	/**
-	 * @var int[]
-	 * @phpstan-var array<int, int>
-	 */
-	private array $enchToId = [];
+	/** @phpstan-use IntSaveIdMapTrait<Enchantment> */
+	use IntSaveIdMapTrait;
 
 	private function __construct(){
 		$this->register(EnchantmentIds::PROTECTION, VanillaEnchantments::PROTECTION());
@@ -54,6 +43,7 @@ final class EnchantmentIdMap{
 		$this->register(EnchantmentIds::PROJECTILE_PROTECTION, VanillaEnchantments::PROJECTILE_PROTECTION());
 		$this->register(EnchantmentIds::THORNS, VanillaEnchantments::THORNS());
 		$this->register(EnchantmentIds::RESPIRATION, VanillaEnchantments::RESPIRATION());
+		$this->register(EnchantmentIds::AQUA_AFFINITY, VanillaEnchantments::AQUA_AFFINITY());
 
 		$this->register(EnchantmentIds::SHARPNESS, VanillaEnchantments::SHARPNESS());
 		//TODO: smite, bane of arthropods (these don't make sense now because their applicable mobs don't exist yet)
@@ -62,6 +52,7 @@ final class EnchantmentIdMap{
 		$this->register(EnchantmentIds::FIRE_ASPECT, VanillaEnchantments::FIRE_ASPECT());
 
 		$this->register(EnchantmentIds::EFFICIENCY, VanillaEnchantments::EFFICIENCY());
+		$this->register(EnchantmentIds::FORTUNE, VanillaEnchantments::FORTUNE());
 		$this->register(EnchantmentIds::SILK_TOUCH, VanillaEnchantments::SILK_TOUCH());
 		$this->register(EnchantmentIds::UNBREAKING, VanillaEnchantments::UNBREAKING());
 
@@ -76,22 +67,4 @@ final class EnchantmentIdMap{
 
 		$this->register(EnchantmentIds::SWIFT_SNEAK, VanillaEnchantments::SWIFT_SNEAK());
 	}
-
-	public function register(int $mcpeId, Enchantment $enchantment) : void{
-		$this->idToEnch[$mcpeId] = $enchantment;
-		$this->enchToId[spl_object_id($enchantment)] = $mcpeId;
-	}
-
-	public function fromId(int $id) : ?Enchantment{
-		//we might not have all the enchantment IDs registered
-		return $this->idToEnch[$id] ?? null;
-	}
-
-	public function toId(Enchantment $enchantment) : int{
-		if(!array_key_exists(spl_object_id($enchantment), $this->enchToId)){
-			//this should never happen, so we treat it as an exceptional condition
-			throw new \InvalidArgumentException("Enchantment does not have a mapped ID");
-		}
-		return $this->enchToId[spl_object_id($enchantment)];
-	}
 }
diff --git a/src/data/bedrock/EntityLegacyIds.php b/src/data/bedrock/EntityLegacyIds.php
deleted file mode 100644
index 8e60ef0e97..0000000000
--- a/src/data/bedrock/EntityLegacyIds.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\data\bedrock;
-
-final class EntityLegacyIds{
-
-	public const CHICKEN = 10;
-	public const COW = 11;
-	public const PIG = 12;
-	public const SHEEP = 13;
-	public const WOLF = 14;
-	public const VILLAGER = 15;
-	public const MOOSHROOM = 16;
-	public const SQUID = 17;
-	public const RABBIT = 18;
-	public const BAT = 19;
-	public const IRON_GOLEM = 20;
-	public const SNOW_GOLEM = 21;
-	public const OCELOT = 22;
-	public const HORSE = 23;
-	public const DONKEY = 24;
-	public const MULE = 25;
-	public const SKELETON_HORSE = 26;
-	public const ZOMBIE_HORSE = 27;
-	public const POLAR_BEAR = 28;
-	public const LLAMA = 29;
-	public const PARROT = 30;
-	public const DOLPHIN = 31;
-	public const ZOMBIE = 32;
-	public const CREEPER = 33;
-	public const SKELETON = 34;
-	public const SPIDER = 35;
-	public const ZOMBIE_PIGMAN = 36;
-	public const SLIME = 37;
-	public const ENDERMAN = 38;
-	public const SILVERFISH = 39;
-	public const CAVE_SPIDER = 40;
-	public const GHAST = 41;
-	public const MAGMA_CUBE = 42;
-	public const BLAZE = 43;
-	public const ZOMBIE_VILLAGER = 44;
-	public const WITCH = 45;
-	public const STRAY = 46;
-	public const HUSK = 47;
-	public const WITHER_SKELETON = 48;
-	public const GUARDIAN = 49;
-	public const ELDER_GUARDIAN = 50;
-	public const NPC = 51;
-	public const WITHER = 52;
-	public const ENDER_DRAGON = 53;
-	public const SHULKER = 54;
-	public const ENDERMITE = 55;
-	public const AGENT = 56, LEARN_TO_CODE_MASCOT = 56;
-	public const VINDICATOR = 57;
-	public const PHANTOM = 58;
-
-	public const ARMOR_STAND = 61;
-	public const TRIPOD_CAMERA = 62;
-	public const PLAYER = 63;
-	public const ITEM = 64;
-	public const TNT = 65;
-	public const FALLING_BLOCK = 66;
-	public const MOVING_BLOCK = 67;
-	public const XP_BOTTLE = 68;
-	public const XP_ORB = 69;
-	public const EYE_OF_ENDER_SIGNAL = 70;
-	public const ENDER_CRYSTAL = 71;
-	public const FIREWORKS_ROCKET = 72;
-	public const THROWN_TRIDENT = 73, TRIDENT = 73;
-	public const TURTLE = 74;
-	public const CAT = 75;
-	public const SHULKER_BULLET = 76;
-	public const FISHING_HOOK = 77;
-	public const CHALKBOARD = 78;
-	public const DRAGON_FIREBALL = 79;
-	public const ARROW = 80;
-	public const SNOWBALL = 81;
-	public const EGG = 82;
-	public const PAINTING = 83;
-	public const MINECART = 84;
-	public const FIREBALL = 85, LARGE_FIREBALL = 85;
-	public const SPLASH_POTION = 86;
-	public const ENDER_PEARL = 87;
-	public const LEASH_KNOT = 88;
-	public const WITHER_SKULL = 89;
-	public const BOAT = 90;
-	public const WITHER_SKULL_DANGEROUS = 91;
-	public const LIGHTNING_BOLT = 93;
-	public const SMALL_FIREBALL = 94;
-	public const AREA_EFFECT_CLOUD = 95;
-	public const HOPPER_MINECART = 96;
-	public const TNT_MINECART = 97;
-	public const CHEST_MINECART = 98;
-
-	public const COMMAND_BLOCK_MINECART = 100;
-	public const LINGERING_POTION = 101;
-	public const LLAMA_SPIT = 102;
-	public const EVOCATION_FANG = 103;
-	public const EVOCATION_ILLAGER = 104;
-	public const VEX = 105;
-	public const ICE_BOMB = 106;
-	public const BALLOON = 107;
-	public const PUFFERFISH = 108;
-	public const SALMON = 109;
-	public const DROWNED = 110;
-	public const TROPICALFISH = 111, TROPICAL_FISH = 111;
-	public const COD = 112, FISH = 112;
-	public const PANDA = 113;
-
-	private function __construct(){
-		//NOOP
-	}
-}
diff --git a/src/data/bedrock/GoatHornTypeIdMap.php b/src/data/bedrock/GoatHornTypeIdMap.php
new file mode 100644
index 0000000000..0510a09cee
--- /dev/null
+++ b/src/data/bedrock/GoatHornTypeIdMap.php
@@ -0,0 +1,48 @@
+<?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\item\GoatHornType;
+use pocketmine\utils\SingletonTrait;
+
+final class GoatHornTypeIdMap{
+	use SingletonTrait;
+	/** @phpstan-use IntSaveIdMapTrait<GoatHornType> */
+	use IntSaveIdMapTrait;
+
+	private function __construct(){
+		foreach(GoatHornType::cases() as $case){
+			$this->register(match($case){
+				GoatHornType::PONDER => GoatHornTypeIds::PONDER,
+				GoatHornType::SING => GoatHornTypeIds::SING,
+				GoatHornType::SEEK => GoatHornTypeIds::SEEK,
+				GoatHornType::FEEL => GoatHornTypeIds::FEEL,
+				GoatHornType::ADMIRE => GoatHornTypeIds::ADMIRE,
+				GoatHornType::CALL => GoatHornTypeIds::CALL,
+				GoatHornType::YEARN => GoatHornTypeIds::YEARN,
+				GoatHornType::DREAM => GoatHornTypeIds::DREAM
+			}, $case);
+		}
+	}
+}
diff --git a/tests/phpunit/data/bedrock/DyeColorIdMapTest.php b/src/data/bedrock/GoatHornTypeIds.php
similarity index 66%
rename from tests/phpunit/data/bedrock/DyeColorIdMapTest.php
rename to src/data/bedrock/GoatHornTypeIds.php
index b5561019fa..048d246fe0 100644
--- a/tests/phpunit/data/bedrock/DyeColorIdMapTest.php
+++ b/src/data/bedrock/GoatHornTypeIds.php
@@ -23,16 +23,13 @@ declare(strict_types=1);
 
 namespace pocketmine\data\bedrock;
 
-use PHPUnit\Framework\TestCase;
-use pocketmine\block\utils\DyeColor;
-
-class DyeColorIdMapTest extends TestCase{
-
-	public function testAllColorsMapped() : void{
-		foreach(DyeColor::getAll() as $color){
-			$id = DyeColorIdMap::getInstance()->toId($color);
-			$color2 = DyeColorIdMap::getInstance()->fromId($id);
-			self::assertTrue($color2 !== null && $color->equals($color2));
-		}
-	}
+final class GoatHornTypeIds{
+	public const PONDER = 0;
+	public const SING = 1;
+	public const SEEK = 2;
+	public const FEEL = 3;
+	public const ADMIRE = 4;
+	public const CALL = 5;
+	public const YEARN = 6;
+	public const DREAM = 7;
 }
diff --git a/src/data/bedrock/IntSaveIdMapTrait.php b/src/data/bedrock/IntSaveIdMapTrait.php
new file mode 100644
index 0000000000..cf1631fd5f
--- /dev/null
+++ b/src/data/bedrock/IntSaveIdMapTrait.php
@@ -0,0 +1,81 @@
+<?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 function array_key_exists;
+use function spl_object_id;
+
+/**
+ * @phpstan-template TObject of object
+ */
+trait IntSaveIdMapTrait{
+
+	/**
+	 * @var object[]
+	 * @phpstan-var array<int, TObject>
+	 */
+	private array $idToEnum = [];
+
+	/**
+	 * @var int[]
+	 * @phpstan-var array<int, int>
+	 */
+	private array $enumToId = [];
+
+	/**
+	 * @phpstan-param TObject $enum
+	 */
+	protected function getRuntimeId(object $enum) : int{
+		//this is fine for enums and non-cloning object registries
+		return spl_object_id($enum);
+	}
+
+	/**
+	 * @phpstan-param TObject $enum
+	 */
+	public function register(int $saveId, object $enum) : void{
+		$this->idToEnum[$saveId] = $enum;
+		$this->enumToId[$this->getRuntimeId($enum)] = $saveId;
+	}
+
+	/**
+	 * @phpstan-return TObject|null
+	 */
+	public function fromId(int $id) : ?object{
+		//we might not have all the effect IDs registered
+		return $this->idToEnum[$id] ?? null;
+	}
+
+	/**
+	 * @phpstan-param TObject $enum
+	 */
+	public function toId(object $enum) : int{
+		$runtimeId = $this->getRuntimeId($enum);
+		if(!array_key_exists($runtimeId, $this->enumToId)){
+			//this should never happen, so we treat it as an exceptional condition
+			throw new \InvalidArgumentException("Object does not have a mapped save ID");
+		}
+		return $this->enumToId[$runtimeId];
+	}
+}
diff --git a/src/data/bedrock/ItemTagToIdMap.php b/src/data/bedrock/ItemTagToIdMap.php
new file mode 100644
index 0000000000..af9cb3ce55
--- /dev/null
+++ b/src/data/bedrock/ItemTagToIdMap.php
@@ -0,0 +1,106 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock;
+
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Filesystem;
+use pocketmine\utils\SingletonTrait;
+use pocketmine\utils\Utils;
+use function array_keys;
+use function gettype;
+use function is_array;
+use function is_string;
+use function json_decode;
+use const JSON_THROW_ON_ERROR;
+
+/**
+ * Tracks Minecraft Bedrock item tags, and the item IDs which belong to them
+ *
+ * @internal
+ */
+final class ItemTagToIdMap{
+	use SingletonTrait;
+
+	private static function make() : self{
+		$map = json_decode(Filesystem::fileGetContents(BedrockDataFiles::ITEM_TAGS_JSON), true, flags: JSON_THROW_ON_ERROR);
+		if(!is_array($map)){
+			throw new AssumptionFailedError("Invalid item tag map, expected array");
+		}
+		$cleanMap = [];
+		foreach(Utils::promoteKeys($map) as $tagName => $ids){
+			if(!is_string($tagName)){
+				throw new AssumptionFailedError("Invalid item tag name $tagName, expected string as key");
+			}
+			if(!is_array($ids)){
+				throw new AssumptionFailedError("Invalid item tag $tagName, expected array of IDs as value");
+			}
+			$cleanIds = [];
+			foreach($ids as $id){
+				if(!is_string($id)){
+					throw new AssumptionFailedError("Invalid item tag $tagName, expected string as ID, got " . gettype($id));
+				}
+				$cleanIds[] = $id;
+			}
+			$cleanMap[$tagName] = $cleanIds;
+		}
+
+		return new self($cleanMap);
+	}
+
+	/**
+	 * @var true[][]
+	 * @phpstan-var array<string, array<string, true>>
+	 */
+	private array $tagToIdsMap = [];
+
+	/**
+	 * @param string[][] $tagToIds
+	 * @phpstan-param array<string, list<string>> $tagToIds
+	 */
+	public function __construct(
+		array $tagToIds
+	){
+		foreach(Utils::stringifyKeys($tagToIds) as $tag => $ids){
+			foreach($ids as $id){
+				$this->tagToIdsMap[$tag][$id] = true;
+			}
+		}
+	}
+
+	/**
+	 * @return string[]
+	 * @phpstan-return list<string>
+	 */
+	public function getIdsForTag(string $tag) : array{
+		return array_keys($this->tagToIdsMap[$tag] ?? []);
+	}
+
+	public function tagContainsId(string $tag, string $id) : bool{
+		return isset($this->tagToIdsMap[$tag][$id]);
+	}
+
+	public function addIdToTag(string $tag, string $id) : void{
+		$this->tagToIdsMap[$tag][$id] = true;
+	}
+}
diff --git a/src/data/bedrock/LegacyBiomeIdToStringIdMap.php b/src/data/bedrock/LegacyBiomeIdToStringIdMap.php
index eba0034e84..5cfe30371b 100644
--- a/src/data/bedrock/LegacyBiomeIdToStringIdMap.php
+++ b/src/data/bedrock/LegacyBiomeIdToStringIdMap.php
@@ -24,12 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\data\bedrock;
 
 use pocketmine\utils\SingletonTrait;
-use Symfony\Component\Filesystem\Path;
 
-final class LegacyBiomeIdToStringIdMap extends LegacyToStringBidirectionalIdMap{
+final class LegacyBiomeIdToStringIdMap extends LegacyToStringIdMap{
 	use SingletonTrait;
 
 	public function __construct(){
-		parent::__construct(Path::join(\pocketmine\BEDROCK_DATA_PATH, 'biome_id_map.json'));
+		parent::__construct(BedrockDataFiles::BIOME_ID_MAP_JSON);
 	}
 }
diff --git a/src/data/bedrock/LegacyEntityIdToStringIdMap.php b/src/data/bedrock/LegacyEntityIdToStringIdMap.php
index 8427e4594c..c278dc4ed0 100644
--- a/src/data/bedrock/LegacyEntityIdToStringIdMap.php
+++ b/src/data/bedrock/LegacyEntityIdToStringIdMap.php
@@ -24,12 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\data\bedrock;
 
 use pocketmine\utils\SingletonTrait;
-use Symfony\Component\Filesystem\Path;
 
-final class LegacyEntityIdToStringIdMap extends LegacyToStringBidirectionalIdMap{
+final class LegacyEntityIdToStringIdMap extends LegacyToStringIdMap{
 	use SingletonTrait;
 
 	public function __construct(){
-		parent::__construct(Path::join(\pocketmine\BEDROCK_DATA_PATH, 'entity_id_map.json'));
+		parent::__construct(BedrockDataFiles::ENTITY_ID_MAP_JSON);
 	}
 }
diff --git a/src/data/bedrock/LegacyToStringBidirectionalIdMap.php b/src/data/bedrock/LegacyToStringIdMap.php
similarity index 77%
rename from src/data/bedrock/LegacyToStringBidirectionalIdMap.php
rename to src/data/bedrock/LegacyToStringIdMap.php
index c5fa272c20..1a92f2b6b8 100644
--- a/src/data/bedrock/LegacyToStringBidirectionalIdMap.php
+++ b/src/data/bedrock/LegacyToStringIdMap.php
@@ -25,35 +25,30 @@ namespace pocketmine\data\bedrock;
 
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Filesystem;
+use pocketmine\utils\Utils;
 use function is_array;
 use function is_int;
 use function is_string;
 use function json_decode;
 
-abstract class LegacyToStringBidirectionalIdMap{
+abstract class LegacyToStringIdMap{
 
 	/**
 	 * @var string[]
 	 * @phpstan-var array<int, string>
 	 */
 	private array $legacyToString = [];
-	/**
-	 * @var int[]
-	 * @phpstan-var array<string, int>
-	 */
-	private array $stringToLegacy = [];
 
 	public function __construct(string $file){
 		$stringToLegacyId = json_decode(Filesystem::fileGetContents($file), true);
 		if(!is_array($stringToLegacyId)){
 			throw new AssumptionFailedError("Invalid format of ID map");
 		}
-		foreach($stringToLegacyId as $stringId => $legacyId){
+		foreach(Utils::promoteKeys($stringToLegacyId) as $stringId => $legacyId){
 			if(!is_string($stringId) || !is_int($legacyId)){
 				throw new AssumptionFailedError("ID map should have string keys and int values");
 			}
 			$this->legacyToString[$legacyId] = $stringId;
-			$this->stringToLegacy[$stringId] = $legacyId;
 		}
 	}
 
@@ -61,10 +56,6 @@ abstract class LegacyToStringBidirectionalIdMap{
 		return $this->legacyToString[$legacy] ?? null;
 	}
 
-	public function stringToLegacy(string $string) : ?int{
-		return $this->stringToLegacy[$string] ?? null;
-	}
-
 	/**
 	 * @return string[]
 	 * @phpstan-return array<int, string>
@@ -73,11 +64,13 @@ abstract class LegacyToStringBidirectionalIdMap{
 		return $this->legacyToString;
 	}
 
-	/**
-	 * @return int[]
-	 * @phpstan-return array<string, int>
-	 */
-	public function getStringToLegacyMap() : array{
-		return $this->stringToLegacy;
+	public function add(string $string, int $legacy) : void{
+		if(isset($this->legacyToString[$legacy])){
+			if($this->legacyToString[$legacy] === $string){
+				return;
+			}
+			throw new \InvalidArgumentException("Legacy ID $legacy is already mapped to string " . $this->legacyToString[$legacy]);
+		}
+		$this->legacyToString[$legacy] = $string;
 	}
 }
diff --git a/src/data/bedrock/MedicineTypeIdMap.php b/src/data/bedrock/MedicineTypeIdMap.php
new file mode 100644
index 0000000000..90fd835509
--- /dev/null
+++ b/src/data/bedrock/MedicineTypeIdMap.php
@@ -0,0 +1,44 @@
+<?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\item\MedicineType;
+use pocketmine\utils\SingletonTrait;
+
+final class MedicineTypeIdMap{
+	use SingletonTrait;
+	/** @phpstan-use IntSaveIdMapTrait<MedicineType> */
+	use IntSaveIdMapTrait;
+
+	private function __construct(){
+		foreach(MedicineType::cases() as $case){
+			$this->register(match($case){
+				MedicineType::ANTIDOTE => MedicineTypeIds::ANTIDOTE,
+				MedicineType::ELIXIR => MedicineTypeIds::ELIXIR,
+				MedicineType::EYE_DROPS => MedicineTypeIds::EYE_DROPS,
+				MedicineType::TONIC => MedicineTypeIds::TONIC,
+			}, $case);
+		}
+	}
+}
diff --git a/tests/phpunit/data/bedrock/CoralTypeIdMapTest.php b/src/data/bedrock/MedicineTypeIds.php
similarity index 66%
rename from tests/phpunit/data/bedrock/CoralTypeIdMapTest.php
rename to src/data/bedrock/MedicineTypeIds.php
index edd686cd0e..8c0110ec32 100644
--- a/tests/phpunit/data/bedrock/CoralTypeIdMapTest.php
+++ b/src/data/bedrock/MedicineTypeIds.php
@@ -23,16 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\data\bedrock;
 
-use PHPUnit\Framework\TestCase;
-use pocketmine\block\utils\CoralType;
-
-class CoralTypeIdMapTest extends TestCase{
-
-	public function testFromIdExhaustiveness() : void{
-		foreach(CoralType::getAll() as $type){
-			$id = CoralTypeIdMap::getInstance()->toId($type);
-			$type2 = CoralTypeIdMap::getInstance()->fromId($id);
-			self::assertTrue($type2 !== null && $type->equals($type2));
-		}
-	}
+final class MedicineTypeIds{
+	public const EYE_DROPS = 0;
+	public const TONIC = 1;
+	public const ANTIDOTE = 2;
+	public const ELIXIR = 3;
 }
diff --git a/src/data/bedrock/MobHeadTypeIdMap.php b/src/data/bedrock/MobHeadTypeIdMap.php
new file mode 100644
index 0000000000..bf16e6eba0
--- /dev/null
+++ b/src/data/bedrock/MobHeadTypeIdMap.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock;
+
+use pocketmine\block\utils\MobHeadType;
+use pocketmine\utils\SingletonTrait;
+
+final class MobHeadTypeIdMap{
+	use SingletonTrait;
+	/** @phpstan-use IntSaveIdMapTrait<MobHeadType> */
+	use IntSaveIdMapTrait;
+
+	private function __construct(){
+		foreach(MobHeadType::cases() as $case){
+			$this->register(match($case){
+				MobHeadType::SKELETON => 0,
+				MobHeadType::WITHER_SKELETON => 1,
+				MobHeadType::ZOMBIE => 2,
+				MobHeadType::PLAYER => 3,
+				MobHeadType::CREEPER => 4,
+				MobHeadType::DRAGON => 5,
+				MobHeadType::PIGLIN => 6,
+			}, $case);
+		}
+	}
+}
diff --git a/src/data/bedrock/MushroomBlockTypeIdMap.php b/src/data/bedrock/MushroomBlockTypeIdMap.php
index 1e288cb840..a25336d897 100644
--- a/src/data/bedrock/MushroomBlockTypeIdMap.php
+++ b/src/data/bedrock/MushroomBlockTypeIdMap.php
@@ -23,52 +23,30 @@ declare(strict_types=1);
 
 namespace pocketmine\data\bedrock;
 
-use pocketmine\block\BlockLegacyMetadata as LegacyMeta;
 use pocketmine\block\utils\MushroomBlockType;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata as LegacyMeta;
 use pocketmine\utils\SingletonTrait;
-use function array_key_exists;
 
 final class MushroomBlockTypeIdMap{
 	use SingletonTrait;
-
-	/**
-	 * @var MushroomBlockType[]
-	 * @phpstan-var array<int, MushroomBlockType>
-	 */
-	private array $idToEnum = [];
-	/**
-	 * @var int[]
-	 * @phpstan-var array<int, int>
-	 */
-	private array $enumToId = [];
+	/** @phpstan-use IntSaveIdMapTrait<MushroomBlockType> */
+	use IntSaveIdMapTrait;
 
 	public function __construct(){
-		$this->register(LegacyMeta::MUSHROOM_BLOCK_ALL_PORES, MushroomBlockType::PORES());
-		$this->register(LegacyMeta::MUSHROOM_BLOCK_CAP_NORTHWEST_CORNER, MushroomBlockType::CAP_NORTHWEST());
-		$this->register(LegacyMeta::MUSHROOM_BLOCK_CAP_NORTH_SIDE, MushroomBlockType::CAP_NORTH());
-		$this->register(LegacyMeta::MUSHROOM_BLOCK_CAP_NORTHEAST_CORNER, MushroomBlockType::CAP_NORTHEAST());
-		$this->register(LegacyMeta::MUSHROOM_BLOCK_CAP_WEST_SIDE, MushroomBlockType::CAP_WEST());
-		$this->register(LegacyMeta::MUSHROOM_BLOCK_CAP_TOP_ONLY, MushroomBlockType::CAP_MIDDLE());
-		$this->register(LegacyMeta::MUSHROOM_BLOCK_CAP_EAST_SIDE, MushroomBlockType::CAP_EAST());
-		$this->register(LegacyMeta::MUSHROOM_BLOCK_CAP_SOUTHWEST_CORNER, MushroomBlockType::CAP_SOUTHWEST());
-		$this->register(LegacyMeta::MUSHROOM_BLOCK_CAP_SOUTH_SIDE, MushroomBlockType::CAP_SOUTH());
-		$this->register(LegacyMeta::MUSHROOM_BLOCK_CAP_SOUTHEAST_CORNER, MushroomBlockType::CAP_SOUTHEAST());
-		$this->register(LegacyMeta::MUSHROOM_BLOCK_ALL_CAP, MushroomBlockType::ALL_CAP());
-	}
-
-	public function register(int $id, MushroomBlockType $type) : void{
-		$this->idToEnum[$id] = $type;
-		$this->enumToId[$type->id()] = $id;
-	}
-
-	public function fromId(int $id) : ?MushroomBlockType{
-		return $this->idToEnum[$id] ?? null;
-	}
-
-	public function toId(MushroomBlockType $type) : int{
-		if(!array_key_exists($type->id(), $this->enumToId)){
-			throw new \InvalidArgumentException("Mushroom block type does not have a mapped ID"); //this should never happen
+		foreach(MushroomBlockType::cases() as $case){
+			$this->register(match($case){
+				MushroomBlockType::PORES => LegacyMeta::MUSHROOM_BLOCK_ALL_PORES,
+				MushroomBlockType::CAP_NORTHWEST => LegacyMeta::MUSHROOM_BLOCK_CAP_NORTHWEST_CORNER,
+				MushroomBlockType::CAP_NORTH => LegacyMeta::MUSHROOM_BLOCK_CAP_NORTH_SIDE,
+				MushroomBlockType::CAP_NORTHEAST => LegacyMeta::MUSHROOM_BLOCK_CAP_NORTHEAST_CORNER,
+				MushroomBlockType::CAP_WEST => LegacyMeta::MUSHROOM_BLOCK_CAP_WEST_SIDE,
+				MushroomBlockType::CAP_MIDDLE => LegacyMeta::MUSHROOM_BLOCK_CAP_TOP_ONLY,
+				MushroomBlockType::CAP_EAST => LegacyMeta::MUSHROOM_BLOCK_CAP_EAST_SIDE,
+				MushroomBlockType::CAP_SOUTHWEST => LegacyMeta::MUSHROOM_BLOCK_CAP_SOUTHWEST_CORNER,
+				MushroomBlockType::CAP_SOUTH => LegacyMeta::MUSHROOM_BLOCK_CAP_SOUTH_SIDE,
+				MushroomBlockType::CAP_SOUTHEAST => LegacyMeta::MUSHROOM_BLOCK_CAP_SOUTHEAST_CORNER,
+				MushroomBlockType::ALL_CAP => LegacyMeta::MUSHROOM_BLOCK_ALL_CAP,
+			}, $case);
 		}
-		return $this->enumToId[$type->id()];
 	}
 }
diff --git a/src/data/bedrock/NoteInstrumentIdMap.php b/src/data/bedrock/NoteInstrumentIdMap.php
new file mode 100644
index 0000000000..c847ecd98c
--- /dev/null
+++ b/src/data/bedrock/NoteInstrumentIdMap.php
@@ -0,0 +1,56 @@
+<?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\utils\SingletonTrait;
+use pocketmine\world\sound\NoteInstrument;
+
+final class NoteInstrumentIdMap{
+	use SingletonTrait;
+	/** @phpstan-use IntSaveIdMapTrait<NoteInstrument> */
+	use IntSaveIdMapTrait;
+
+	private function __construct(){
+		foreach(NoteInstrument::cases() as $case){
+			$this->register(match($case){
+				NoteInstrument::PIANO => 0,
+				NoteInstrument::BASS_DRUM => 1,
+				NoteInstrument::SNARE => 2,
+				NoteInstrument::CLICKS_AND_STICKS => 3,
+				NoteInstrument::DOUBLE_BASS => 4,
+				NoteInstrument::BELL => 5,
+				NoteInstrument::FLUTE => 6,
+				NoteInstrument::CHIME => 7,
+				NoteInstrument::GUITAR => 8,
+				NoteInstrument::XYLOPHONE => 9,
+				NoteInstrument::IRON_XYLOPHONE => 10,
+				NoteInstrument::COW_BELL => 11,
+				NoteInstrument::DIDGERIDOO => 12,
+				NoteInstrument::BIT => 13,
+				NoteInstrument::BANJO => 14,
+				NoteInstrument::PLING => 15,
+			}, $case);
+		}
+	}
+}
diff --git a/src/data/bedrock/PotionTypeIdMap.php b/src/data/bedrock/PotionTypeIdMap.php
index 2e6fef3cc8..4e7d8d4c79 100644
--- a/src/data/bedrock/PotionTypeIdMap.php
+++ b/src/data/bedrock/PotionTypeIdMap.php
@@ -28,77 +28,56 @@ use pocketmine\utils\SingletonTrait;
 
 final class PotionTypeIdMap{
 	use SingletonTrait;
-
-	/**
-	 * @var PotionType[]
-	 * @phpstan-var array<int, PotionType>
-	 */
-	private array $idToEnum = [];
-
-	/**
-	 * @var int[]
-	 * @phpstan-var array<int, int>
-	 */
-	private array $enumToId = [];
+	/** @phpstan-use IntSaveIdMapTrait<PotionType> */
+	use IntSaveIdMapTrait;
 
 	private function __construct(){
-		$this->register(PotionTypeIds::WATER, PotionType::WATER());
-		$this->register(PotionTypeIds::MUNDANE, PotionType::MUNDANE());
-		$this->register(PotionTypeIds::LONG_MUNDANE, PotionType::LONG_MUNDANE());
-		$this->register(PotionTypeIds::THICK, PotionType::THICK());
-		$this->register(PotionTypeIds::AWKWARD, PotionType::AWKWARD());
-		$this->register(PotionTypeIds::NIGHT_VISION, PotionType::NIGHT_VISION());
-		$this->register(PotionTypeIds::LONG_NIGHT_VISION, PotionType::LONG_NIGHT_VISION());
-		$this->register(PotionTypeIds::INVISIBILITY, PotionType::INVISIBILITY());
-		$this->register(PotionTypeIds::LONG_INVISIBILITY, PotionType::LONG_INVISIBILITY());
-		$this->register(PotionTypeIds::LEAPING, PotionType::LEAPING());
-		$this->register(PotionTypeIds::LONG_LEAPING, PotionType::LONG_LEAPING());
-		$this->register(PotionTypeIds::STRONG_LEAPING, PotionType::STRONG_LEAPING());
-		$this->register(PotionTypeIds::FIRE_RESISTANCE, PotionType::FIRE_RESISTANCE());
-		$this->register(PotionTypeIds::LONG_FIRE_RESISTANCE, PotionType::LONG_FIRE_RESISTANCE());
-		$this->register(PotionTypeIds::SWIFTNESS, PotionType::SWIFTNESS());
-		$this->register(PotionTypeIds::LONG_SWIFTNESS, PotionType::LONG_SWIFTNESS());
-		$this->register(PotionTypeIds::STRONG_SWIFTNESS, PotionType::STRONG_SWIFTNESS());
-		$this->register(PotionTypeIds::SLOWNESS, PotionType::SLOWNESS());
-		$this->register(PotionTypeIds::LONG_SLOWNESS, PotionType::LONG_SLOWNESS());
-		$this->register(PotionTypeIds::WATER_BREATHING, PotionType::WATER_BREATHING());
-		$this->register(PotionTypeIds::LONG_WATER_BREATHING, PotionType::LONG_WATER_BREATHING());
-		$this->register(PotionTypeIds::HEALING, PotionType::HEALING());
-		$this->register(PotionTypeIds::STRONG_HEALING, PotionType::STRONG_HEALING());
-		$this->register(PotionTypeIds::HARMING, PotionType::HARMING());
-		$this->register(PotionTypeIds::STRONG_HARMING, PotionType::STRONG_HARMING());
-		$this->register(PotionTypeIds::POISON, PotionType::POISON());
-		$this->register(PotionTypeIds::LONG_POISON, PotionType::LONG_POISON());
-		$this->register(PotionTypeIds::STRONG_POISON, PotionType::STRONG_POISON());
-		$this->register(PotionTypeIds::REGENERATION, PotionType::REGENERATION());
-		$this->register(PotionTypeIds::LONG_REGENERATION, PotionType::LONG_REGENERATION());
-		$this->register(PotionTypeIds::STRONG_REGENERATION, PotionType::STRONG_REGENERATION());
-		$this->register(PotionTypeIds::STRENGTH, PotionType::STRENGTH());
-		$this->register(PotionTypeIds::LONG_STRENGTH, PotionType::LONG_STRENGTH());
-		$this->register(PotionTypeIds::STRONG_STRENGTH, PotionType::STRONG_STRENGTH());
-		$this->register(PotionTypeIds::WEAKNESS, PotionType::WEAKNESS());
-		$this->register(PotionTypeIds::LONG_WEAKNESS, PotionType::LONG_WEAKNESS());
-		$this->register(PotionTypeIds::WITHER, PotionType::WITHER());
-		$this->register(PotionTypeIds::TURTLE_MASTER, PotionType::TURTLE_MASTER());
-		$this->register(PotionTypeIds::LONG_TURTLE_MASTER, PotionType::LONG_TURTLE_MASTER());
-		$this->register(PotionTypeIds::STRONG_TURTLE_MASTER, PotionType::STRONG_TURTLE_MASTER());
-		$this->register(PotionTypeIds::SLOW_FALLING, PotionType::SLOW_FALLING());
-		$this->register(PotionTypeIds::LONG_SLOW_FALLING, PotionType::LONG_SLOW_FALLING());
-	}
-
-	private function register(int $id, PotionType $type) : void{
-		$this->idToEnum[$id] = $type;
-		$this->enumToId[$type->id()] = $id;
-	}
-
-	public function fromId(int $id) : ?PotionType{
-		return $this->idToEnum[$id] ?? null;
-	}
-
-	public function toId(PotionType $type) : int{
-		if(!isset($this->enumToId[$type->id()])){
-			throw new \InvalidArgumentException("Type does not have a mapped ID");
+		foreach(PotionType::cases() as $case){
+			$this->register(match($case){
+				PotionType::WATER => PotionTypeIds::WATER,
+				PotionType::MUNDANE => PotionTypeIds::MUNDANE,
+				PotionType::LONG_MUNDANE => PotionTypeIds::LONG_MUNDANE,
+				PotionType::THICK => PotionTypeIds::THICK,
+				PotionType::AWKWARD => PotionTypeIds::AWKWARD,
+				PotionType::NIGHT_VISION => PotionTypeIds::NIGHT_VISION,
+				PotionType::LONG_NIGHT_VISION => PotionTypeIds::LONG_NIGHT_VISION,
+				PotionType::INVISIBILITY => PotionTypeIds::INVISIBILITY,
+				PotionType::LONG_INVISIBILITY => PotionTypeIds::LONG_INVISIBILITY,
+				PotionType::LEAPING => PotionTypeIds::LEAPING,
+				PotionType::LONG_LEAPING => PotionTypeIds::LONG_LEAPING,
+				PotionType::STRONG_LEAPING => PotionTypeIds::STRONG_LEAPING,
+				PotionType::FIRE_RESISTANCE => PotionTypeIds::FIRE_RESISTANCE,
+				PotionType::LONG_FIRE_RESISTANCE => PotionTypeIds::LONG_FIRE_RESISTANCE,
+				PotionType::SWIFTNESS => PotionTypeIds::SWIFTNESS,
+				PotionType::LONG_SWIFTNESS => PotionTypeIds::LONG_SWIFTNESS,
+				PotionType::STRONG_SWIFTNESS => PotionTypeIds::STRONG_SWIFTNESS,
+				PotionType::SLOWNESS => PotionTypeIds::SLOWNESS,
+				PotionType::LONG_SLOWNESS => PotionTypeIds::LONG_SLOWNESS,
+				PotionType::WATER_BREATHING => PotionTypeIds::WATER_BREATHING,
+				PotionType::LONG_WATER_BREATHING => PotionTypeIds::LONG_WATER_BREATHING,
+				PotionType::HEALING => PotionTypeIds::HEALING,
+				PotionType::STRONG_HEALING => PotionTypeIds::STRONG_HEALING,
+				PotionType::HARMING => PotionTypeIds::HARMING,
+				PotionType::STRONG_HARMING => PotionTypeIds::STRONG_HARMING,
+				PotionType::POISON => PotionTypeIds::POISON,
+				PotionType::LONG_POISON => PotionTypeIds::LONG_POISON,
+				PotionType::STRONG_POISON => PotionTypeIds::STRONG_POISON,
+				PotionType::REGENERATION => PotionTypeIds::REGENERATION,
+				PotionType::LONG_REGENERATION => PotionTypeIds::LONG_REGENERATION,
+				PotionType::STRONG_REGENERATION => PotionTypeIds::STRONG_REGENERATION,
+				PotionType::STRENGTH => PotionTypeIds::STRENGTH,
+				PotionType::LONG_STRENGTH => PotionTypeIds::LONG_STRENGTH,
+				PotionType::STRONG_STRENGTH => PotionTypeIds::STRONG_STRENGTH,
+				PotionType::WEAKNESS => PotionTypeIds::WEAKNESS,
+				PotionType::LONG_WEAKNESS => PotionTypeIds::LONG_WEAKNESS,
+				PotionType::WITHER => PotionTypeIds::WITHER,
+				PotionType::TURTLE_MASTER => PotionTypeIds::TURTLE_MASTER,
+				PotionType::LONG_TURTLE_MASTER => PotionTypeIds::LONG_TURTLE_MASTER,
+				PotionType::STRONG_TURTLE_MASTER => PotionTypeIds::STRONG_TURTLE_MASTER,
+				PotionType::SLOW_FALLING => PotionTypeIds::SLOW_FALLING,
+				PotionType::LONG_SLOW_FALLING => PotionTypeIds::LONG_SLOW_FALLING,
+				PotionType::STRONG_SLOWNESS => PotionTypeIds::STRONG_SLOWNESS,
+			}, $case);
 		}
-		return $this->enumToId[$type->id()];
 	}
 }
diff --git a/src/data/bedrock/PotionTypeIds.php b/src/data/bedrock/PotionTypeIds.php
index aa69461cef..f2d82f39f5 100644
--- a/src/data/bedrock/PotionTypeIds.php
+++ b/src/data/bedrock/PotionTypeIds.php
@@ -66,4 +66,5 @@ final class PotionTypeIds{
 	public const STRONG_TURTLE_MASTER = 39;
 	public const SLOW_FALLING = 40;
 	public const LONG_SLOW_FALLING = 41;
+	public const STRONG_SLOWNESS = 42;
 }
diff --git a/src/data/bedrock/SuspiciousStewTypeIdMap.php b/src/data/bedrock/SuspiciousStewTypeIdMap.php
new file mode 100644
index 0000000000..d6a31f0ea7
--- /dev/null
+++ b/src/data/bedrock/SuspiciousStewTypeIdMap.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock;
+
+use pocketmine\item\SuspiciousStewType;
+use pocketmine\utils\SingletonTrait;
+
+final class SuspiciousStewTypeIdMap{
+	use SingletonTrait;
+	/** @phpstan-use IntSaveIdMapTrait<SuspiciousStewType> */
+	use IntSaveIdMapTrait;
+
+	private function __construct(){
+		foreach(SuspiciousStewType::cases() as $case){
+			$this->register(match($case){
+				SuspiciousStewType::POPPY => SuspiciousStewTypeIds::POPPY,
+				SuspiciousStewType::CORNFLOWER => SuspiciousStewTypeIds::CORNFLOWER,
+				SuspiciousStewType::TULIP => SuspiciousStewTypeIds::TULIP,
+				SuspiciousStewType::AZURE_BLUET => SuspiciousStewTypeIds::AZURE_BLUET,
+				SuspiciousStewType::LILY_OF_THE_VALLEY => SuspiciousStewTypeIds::LILY_OF_THE_VALLEY,
+				SuspiciousStewType::DANDELION => SuspiciousStewTypeIds::DANDELION,
+				SuspiciousStewType::BLUE_ORCHID => SuspiciousStewTypeIds::BLUE_ORCHID,
+				SuspiciousStewType::ALLIUM => SuspiciousStewTypeIds::ALLIUM,
+				SuspiciousStewType::OXEYE_DAISY => SuspiciousStewTypeIds::OXEYE_DAISY,
+				SuspiciousStewType::WITHER_ROSE => SuspiciousStewTypeIds::WITHER_ROSE,
+			}, $case);
+		}
+
+	}
+}
diff --git a/src/data/bedrock/SuspiciousStewTypeIds.php b/src/data/bedrock/SuspiciousStewTypeIds.php
new file mode 100644
index 0000000000..15025abdee
--- /dev/null
+++ b/src/data/bedrock/SuspiciousStewTypeIds.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock;
+
+final class SuspiciousStewTypeIds{
+	public const POPPY = 0;
+	public const CORNFLOWER = 1;
+	public const TULIP = 2;
+	public const AZURE_BLUET = 3;
+	public const LILY_OF_THE_VALLEY = 4;
+	public const DANDELION = 5;
+	public const BLUE_ORCHID = 6;
+	public const ALLIUM = 7;
+	public const OXEYE_DAISY = 8;
+	public const WITHER_ROSE = 9;
+}
diff --git a/src/data/bedrock/block/BlockLegacyMetadata.php b/src/data/bedrock/block/BlockLegacyMetadata.php
new file mode 100644
index 0000000000..e094bd3bd5
--- /dev/null
+++ b/src/data/bedrock/block/BlockLegacyMetadata.php
@@ -0,0 +1,78 @@
+<?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\block;
+
+/**
+ * Constants for legacy metadata for various blocks.
+ */
+final class BlockLegacyMetadata{
+
+	private function __construct(){
+		//NOOP
+	}
+
+	public const CORAL_VARIANT_TUBE = 0;
+	public const CORAL_VARIANT_BRAIN = 1;
+	public const CORAL_VARIANT_BUBBLE = 2;
+	public const CORAL_VARIANT_FIRE = 3;
+	public const CORAL_VARIANT_HORN = 4;
+
+	public const MULTI_FACE_DIRECTION_FLAG_DOWN = 0x01;
+	public const MULTI_FACE_DIRECTION_FLAG_UP = 0x02;
+	public const MULTI_FACE_DIRECTION_FLAG_SOUTH = 0x04;
+	public const MULTI_FACE_DIRECTION_FLAG_WEST = 0x08;
+	public const MULTI_FACE_DIRECTION_FLAG_NORTH = 0x10;
+	public const MULTI_FACE_DIRECTION_FLAG_EAST = 0x20;
+
+	public const MUSHROOM_BLOCK_ALL_PORES = 0;
+	public const MUSHROOM_BLOCK_CAP_NORTHWEST_CORNER = 1;
+	public const MUSHROOM_BLOCK_CAP_NORTH_SIDE = 2;
+	public const MUSHROOM_BLOCK_CAP_NORTHEAST_CORNER = 3;
+	public const MUSHROOM_BLOCK_CAP_WEST_SIDE = 4;
+	public const MUSHROOM_BLOCK_CAP_TOP_ONLY = 5;
+	public const MUSHROOM_BLOCK_CAP_EAST_SIDE = 6;
+	public const MUSHROOM_BLOCK_CAP_SOUTHWEST_CORNER = 7;
+	public const MUSHROOM_BLOCK_CAP_SOUTH_SIDE = 8;
+	public const MUSHROOM_BLOCK_CAP_SOUTHEAST_CORNER = 9;
+	public const MUSHROOM_BLOCK_STEM = 10;
+	//11, 12 and 13 appear the same as 0
+	public const MUSHROOM_BLOCK_ALL_CAP = 14;
+	public const MUSHROOM_BLOCK_ALL_STEM = 15;
+
+	public const RAIL_STRAIGHT_NORTH_SOUTH = 0;
+	public const RAIL_STRAIGHT_EAST_WEST = 1;
+	public const RAIL_ASCENDING_EAST = 2;
+	public const RAIL_ASCENDING_WEST = 3;
+	public const RAIL_ASCENDING_NORTH = 4;
+	public const RAIL_ASCENDING_SOUTH = 5;
+	public const RAIL_CURVE_SOUTHEAST = 6;
+	public const RAIL_CURVE_SOUTHWEST = 7;
+	public const RAIL_CURVE_NORTHWEST = 8;
+	public const RAIL_CURVE_NORTHEAST = 9;
+
+	public const VINE_FLAG_SOUTH = 0x01;
+	public const VINE_FLAG_WEST = 0x02;
+	public const VINE_FLAG_NORTH = 0x04;
+	public const VINE_FLAG_EAST = 0x08;
+}
diff --git a/src/data/bedrock/block/BlockStateData.php b/src/data/bedrock/block/BlockStateData.php
new file mode 100644
index 0000000000..6624c4ae06
--- /dev/null
+++ b/src/data/bedrock/block/BlockStateData.php
@@ -0,0 +1,152 @@
+<?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\block;
+
+use pocketmine\nbt\NbtException;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\Tag;
+use pocketmine\utils\Utils;
+use pocketmine\VersionInfo;
+use function array_keys;
+use function count;
+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
+		(40 << 8) | //patch
+		(1); //revision
+
+	public const TAG_NAME = "name";
+	public const TAG_STATES = "states";
+	public const TAG_VERSION = "version";
+
+	/**
+	 * @param Tag[] $states
+	 * @phpstan-param array<string, Tag> $states
+	 */
+	public function __construct(
+		private string $name,
+		private array $states,
+		private int $version
+	){}
+
+	/**
+	 * @param Tag[] $states
+	 * @phpstan-param array<string, Tag> $states
+	 */
+	public static function current(string $name, array $states) : self{
+		return new self($name, $states, self::CURRENT_VERSION);
+	}
+
+	public function getName() : string{ return $this->name; }
+
+	/**
+	 * @return Tag[]
+	 * @phpstan-return array<string, Tag>
+	 */
+	public function getStates() : array{ return $this->states; }
+
+	public function getState(string $name) : ?Tag{
+		return $this->states[$name] ?? null;
+	}
+
+	public function getVersion() : int{ return $this->version; }
+
+	public function getVersionAsString() : string{
+		$major = ($this->version >> 24) & 0xff;
+		$minor = ($this->version >> 16) & 0xff;
+		$patch = ($this->version >> 8) & 0xff;
+		$revision = $this->version & 0xff;
+		return "$major.$minor.$patch.$revision";
+	}
+
+	/**
+	 * @throws BlockStateDeserializeException
+	 */
+	public static function fromNbt(CompoundTag $nbt) : self{
+		try{
+			$name = $nbt->getString(self::TAG_NAME);
+			$states = $nbt->getCompoundTag(self::TAG_STATES) ?? throw new BlockStateDeserializeException("Missing tag \"" . self::TAG_STATES . "\"");
+			$version = $nbt->getInt(self::TAG_VERSION, 0);
+			//TODO: read version from VersionInfo::TAG_WORLD_DATA_VERSION - we may need it to fix up old blockstates
+		}catch(NbtException $e){
+			throw new BlockStateDeserializeException($e->getMessage(), 0, $e);
+		}
+
+		$allKeys = $nbt->getValue();
+		unset($allKeys[self::TAG_NAME], $allKeys[self::TAG_STATES], $allKeys[self::TAG_VERSION], $allKeys[VersionInfo::TAG_WORLD_DATA_VERSION]);
+		if(count($allKeys) !== 0){
+			throw new BlockStateDeserializeException("Unexpected extra keys: " . implode(", ", array_keys($allKeys)));
+		}
+
+		return new self($name, $states->getValue(), $version);
+	}
+
+	/**
+	 * Encodes the blockstate as a TAG_Compound, exactly as it would be in vanilla Bedrock.
+	 */
+	public function toVanillaNbt() : CompoundTag{
+		$statesTag = CompoundTag::create();
+		foreach(Utils::stringifyKeys($this->states) as $key => $value){
+			$statesTag->setTag($key, $value);
+		}
+		return CompoundTag::create()
+			->setString(self::TAG_NAME, $this->name)
+			->setInt(self::TAG_VERSION, $this->version)
+			->setTag(self::TAG_STATES, $statesTag);
+	}
+
+	/**
+	 * Encodes the blockstate as a TAG_Compound, but with extra PM-specific metadata, used for fixing bugs in old saved
+	 * data. This should be used for anything saved to disk.
+	 */
+	public function toNbt() : CompoundTag{
+		return $this->toVanillaNbt()
+			->setLong(VersionInfo::TAG_WORLD_DATA_VERSION, VersionInfo::WORLD_DATA_VERSION);
+	}
+
+	public function equals(self $that) : bool{
+		if($this->name !== $that->name || count($this->states) !== count($that->states)){
+			return false;
+		}
+		foreach(Utils::stringifyKeys($this->states) as $k => $v){
+			if(!isset($that->states[$k]) || !$that->states[$k]->equals($v)){
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/src/data/bedrock/block/BlockStateDeserializeException.php b/src/data/bedrock/block/BlockStateDeserializeException.php
new file mode 100644
index 0000000000..fe6b42a7fd
--- /dev/null
+++ b/src/data/bedrock/block/BlockStateDeserializeException.php
@@ -0,0 +1,28 @@
+<?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\block;
+
+class BlockStateDeserializeException extends \RuntimeException{
+
+}
diff --git a/src/data/bedrock/block/BlockStateDeserializer.php b/src/data/bedrock/block/BlockStateDeserializer.php
new file mode 100644
index 0000000000..48bc5ce9f2
--- /dev/null
+++ b/src/data/bedrock/block/BlockStateDeserializer.php
@@ -0,0 +1,40 @@
+<?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\block;
+
+/**
+ * Implementors of this interface decide how a block should be deserialized and represented at runtime. This is used by
+ * world providers when decoding blockstates into block IDs.
+ *
+ * @phpstan-type BlockStateId int
+ */
+interface BlockStateDeserializer{
+	/**
+	 * Deserializes blockstate NBT into an implementation-defined blockstate ID, for runtime paletted storage.
+	 *
+	 * @phpstan-return BlockStateId
+	 * @throws BlockStateDeserializeException
+	 */
+	public function deserialize(BlockStateData $stateData) : int;
+}
diff --git a/src/data/bedrock/block/BlockStateNames.php b/src/data/bedrock/block/BlockStateNames.php
new file mode 100644
index 0000000000..0f4b874261
--- /dev/null
+++ b/src/data/bedrock/block/BlockStateNames.php
@@ -0,0 +1,137 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock\block;
+
+/**
+ * This class is generated automatically from the block palette for the current version. Do not edit it manually.
+ */
+final class BlockStateNames{
+	private function __construct(){
+		//NOOP
+	}
+
+	public const ACTIVE = "active";
+	public const AGE = "age";
+	public const AGE_BIT = "age_bit";
+	public const ATTACHED_BIT = "attached_bit";
+	public const ATTACHMENT = "attachment";
+	public const BAMBOO_LEAF_SIZE = "bamboo_leaf_size";
+	public const BAMBOO_STALK_THICKNESS = "bamboo_stalk_thickness";
+	public const BIG_DRIPLEAF_HEAD = "big_dripleaf_head";
+	public const BIG_DRIPLEAF_TILT = "big_dripleaf_tilt";
+	public const BITE_COUNTER = "bite_counter";
+	public const BLOOM = "bloom";
+	public const BOOKS_STORED = "books_stored";
+	public const BREWING_STAND_SLOT_A_BIT = "brewing_stand_slot_a_bit";
+	public const BREWING_STAND_SLOT_B_BIT = "brewing_stand_slot_b_bit";
+	public const BREWING_STAND_SLOT_C_BIT = "brewing_stand_slot_c_bit";
+	public const BRUSHED_PROGRESS = "brushed_progress";
+	public const BUTTON_PRESSED_BIT = "button_pressed_bit";
+	public const CAN_SUMMON = "can_summon";
+	public const CANDLES = "candles";
+	public const CAULDRON_LIQUID = "cauldron_liquid";
+	public const CLUSTER_COUNT = "cluster_count";
+	public const COMPOSTER_FILL_LEVEL = "composter_fill_level";
+	public const CONDITIONAL_BIT = "conditional_bit";
+	public const CORAL_DIRECTION = "coral_direction";
+	public const CORAL_FAN_DIRECTION = "coral_fan_direction";
+	public const COVERED_BIT = "covered_bit";
+	public const CRACKED_STATE = "cracked_state";
+	public const CRAFTING = "crafting";
+	public const DEAD_BIT = "dead_bit";
+	public const DEPRECATED = "deprecated";
+	public const DIRECTION = "direction";
+	public const DISARMED_BIT = "disarmed_bit";
+	public const DOOR_HINGE_BIT = "door_hinge_bit";
+	public const DRAG_DOWN = "drag_down";
+	public const DRIPSTONE_THICKNESS = "dripstone_thickness";
+	public const END_PORTAL_EYE_BIT = "end_portal_eye_bit";
+	public const EXPLODE_BIT = "explode_bit";
+	public const EXTINGUISHED = "extinguished";
+	public const FACING_DIRECTION = "facing_direction";
+	public const FILL_LEVEL = "fill_level";
+	public const GROUND_SIGN_DIRECTION = "ground_sign_direction";
+	public const GROWING_PLANT_AGE = "growing_plant_age";
+	public const GROWTH = "growth";
+	public const HANGING = "hanging";
+	public const HEAD_PIECE_BIT = "head_piece_bit";
+	public const HEIGHT = "height";
+	public const HONEY_LEVEL = "honey_level";
+	public const HUGE_MUSHROOM_BITS = "huge_mushroom_bits";
+	public const IN_WALL_BIT = "in_wall_bit";
+	public const INFINIBURN_BIT = "infiniburn_bit";
+	public const ITEM_FRAME_MAP_BIT = "item_frame_map_bit";
+	public const ITEM_FRAME_PHOTO_BIT = "item_frame_photo_bit";
+	public const KELP_AGE = "kelp_age";
+	public const LEVER_DIRECTION = "lever_direction";
+	public const LIQUID_DEPTH = "liquid_depth";
+	public const LIT = "lit";
+	public const MC_BLOCK_FACE = "minecraft:block_face";
+	public const MC_CARDINAL_DIRECTION = "minecraft:cardinal_direction";
+	public const MC_FACING_DIRECTION = "minecraft:facing_direction";
+	public const MC_VERTICAL_HALF = "minecraft:vertical_half";
+	public const MOISTURIZED_AMOUNT = "moisturized_amount";
+	public const MULTI_FACE_DIRECTION_BITS = "multi_face_direction_bits";
+	public const OCCUPIED_BIT = "occupied_bit";
+	public const OMINOUS = "ominous";
+	public const OPEN_BIT = "open_bit";
+	public const ORIENTATION = "orientation";
+	public const OUTPUT_LIT_BIT = "output_lit_bit";
+	public const OUTPUT_SUBTRACT_BIT = "output_subtract_bit";
+	public const PERSISTENT_BIT = "persistent_bit";
+	public const PILLAR_AXIS = "pillar_axis";
+	public const PORTAL_AXIS = "portal_axis";
+	public const POWERED_BIT = "powered_bit";
+	public const PROPAGULE_STAGE = "propagule_stage";
+	public const RAIL_DATA_BIT = "rail_data_bit";
+	public const RAIL_DIRECTION = "rail_direction";
+	public const REDSTONE_SIGNAL = "redstone_signal";
+	public const REPEATER_DELAY = "repeater_delay";
+	public const RESPAWN_ANCHOR_CHARGE = "respawn_anchor_charge";
+	public const ROTATION = "rotation";
+	public const SCULK_SENSOR_PHASE = "sculk_sensor_phase";
+	public const SEA_GRASS_TYPE = "sea_grass_type";
+	public const STABILITY = "stability";
+	public const STABILITY_CHECK = "stability_check";
+	public const STRUCTURE_BLOCK_TYPE = "structure_block_type";
+	public const SUSPENDED_BIT = "suspended_bit";
+	public const TOGGLE_BIT = "toggle_bit";
+	public const TORCH_FACING_DIRECTION = "torch_facing_direction";
+	public const TRIAL_SPAWNER_STATE = "trial_spawner_state";
+	public const TRIGGERED_BIT = "triggered_bit";
+	public const TURTLE_EGG_COUNT = "turtle_egg_count";
+	public const TWISTING_VINES_AGE = "twisting_vines_age";
+	public const UPDATE_BIT = "update_bit";
+	public const UPPER_BLOCK_BIT = "upper_block_bit";
+	public const UPSIDE_DOWN_BIT = "upside_down_bit";
+	public const VAULT_STATE = "vault_state";
+	public const VINE_DIRECTION_BITS = "vine_direction_bits";
+	public const WALL_CONNECTION_TYPE_EAST = "wall_connection_type_east";
+	public const WALL_CONNECTION_TYPE_NORTH = "wall_connection_type_north";
+	public const WALL_CONNECTION_TYPE_SOUTH = "wall_connection_type_south";
+	public const WALL_CONNECTION_TYPE_WEST = "wall_connection_type_west";
+	public const WALL_POST_BIT = "wall_post_bit";
+	public const WEEPING_VINES_AGE = "weeping_vines_age";
+	public const WEIRDO_DIRECTION = "weirdo_direction";
+}
diff --git a/src/data/bedrock/block/BlockStateSerializeException.php b/src/data/bedrock/block/BlockStateSerializeException.php
new file mode 100644
index 0000000000..8ae1385acc
--- /dev/null
+++ b/src/data/bedrock/block/BlockStateSerializeException.php
@@ -0,0 +1,28 @@
+<?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\block;
+
+final class BlockStateSerializeException extends \LogicException{
+
+}
diff --git a/src/data/bedrock/block/BlockStateSerializer.php b/src/data/bedrock/block/BlockStateSerializer.php
new file mode 100644
index 0000000000..226c117945
--- /dev/null
+++ b/src/data/bedrock/block/BlockStateSerializer.php
@@ -0,0 +1,40 @@
+<?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\block;
+
+/**
+ * Implementors of this interface decide how blockstate IDs will be represented as NBT.
+ *
+ * @phpstan-type BlockStateId int
+ */
+interface BlockStateSerializer{
+
+	/**
+	 * Serializes an implementation-defined blockstate ID to NBT for storage.
+	 *
+	 * @phpstan-param BlockStateId $stateId
+	 * @throws BlockStateSerializeException
+	 */
+	public function serialize(int $stateId) : BlockStateData;
+}
diff --git a/src/data/bedrock/block/BlockStateStringValues.php b/src/data/bedrock/block/BlockStateStringValues.php
new file mode 100644
index 0000000000..9dfdcfb634
--- /dev/null
+++ b/src/data/bedrock/block/BlockStateStringValues.php
@@ -0,0 +1,161 @@
+<?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\block;
+
+/**
+ * This class is generated automatically from the block palette for the current version. Do not edit it manually.
+ */
+final class BlockStateStringValues{
+	private function __construct(){
+		//NOOP
+	}
+
+	public const ATTACHMENT_HANGING = "hanging";
+	public const ATTACHMENT_MULTIPLE = "multiple";
+	public const ATTACHMENT_SIDE = "side";
+	public const ATTACHMENT_STANDING = "standing";
+
+	public const BAMBOO_LEAF_SIZE_LARGE_LEAVES = "large_leaves";
+	public const BAMBOO_LEAF_SIZE_NO_LEAVES = "no_leaves";
+	public const BAMBOO_LEAF_SIZE_SMALL_LEAVES = "small_leaves";
+
+	public const BAMBOO_STALK_THICKNESS_THICK = "thick";
+	public const BAMBOO_STALK_THICKNESS_THIN = "thin";
+
+	public const BIG_DRIPLEAF_TILT_FULL_TILT = "full_tilt";
+	public const BIG_DRIPLEAF_TILT_NONE = "none";
+	public const BIG_DRIPLEAF_TILT_PARTIAL_TILT = "partial_tilt";
+	public const BIG_DRIPLEAF_TILT_UNSTABLE = "unstable";
+
+	public const CAULDRON_LIQUID_LAVA = "lava";
+	public const CAULDRON_LIQUID_POWDER_SNOW = "powder_snow";
+	public const CAULDRON_LIQUID_WATER = "water";
+
+	public const CRACKED_STATE_CRACKED = "cracked";
+	public const CRACKED_STATE_MAX_CRACKED = "max_cracked";
+	public const CRACKED_STATE_NO_CRACKS = "no_cracks";
+
+	public const DRIPSTONE_THICKNESS_BASE = "base";
+	public const DRIPSTONE_THICKNESS_FRUSTUM = "frustum";
+	public const DRIPSTONE_THICKNESS_MERGE = "merge";
+	public const DRIPSTONE_THICKNESS_MIDDLE = "middle";
+	public const DRIPSTONE_THICKNESS_TIP = "tip";
+
+	public const LEVER_DIRECTION_DOWN_EAST_WEST = "down_east_west";
+	public const LEVER_DIRECTION_DOWN_NORTH_SOUTH = "down_north_south";
+	public const LEVER_DIRECTION_EAST = "east";
+	public const LEVER_DIRECTION_NORTH = "north";
+	public const LEVER_DIRECTION_SOUTH = "south";
+	public const LEVER_DIRECTION_UP_EAST_WEST = "up_east_west";
+	public const LEVER_DIRECTION_UP_NORTH_SOUTH = "up_north_south";
+	public const LEVER_DIRECTION_WEST = "west";
+
+	public const MC_BLOCK_FACE_DOWN = "down";
+	public const MC_BLOCK_FACE_EAST = "east";
+	public const MC_BLOCK_FACE_NORTH = "north";
+	public const MC_BLOCK_FACE_SOUTH = "south";
+	public const MC_BLOCK_FACE_UP = "up";
+	public const MC_BLOCK_FACE_WEST = "west";
+
+	public const MC_CARDINAL_DIRECTION_EAST = "east";
+	public const MC_CARDINAL_DIRECTION_NORTH = "north";
+	public const MC_CARDINAL_DIRECTION_SOUTH = "south";
+	public const MC_CARDINAL_DIRECTION_WEST = "west";
+
+	public const MC_FACING_DIRECTION_DOWN = "down";
+	public const MC_FACING_DIRECTION_EAST = "east";
+	public const MC_FACING_DIRECTION_NORTH = "north";
+	public const MC_FACING_DIRECTION_SOUTH = "south";
+	public const MC_FACING_DIRECTION_UP = "up";
+	public const MC_FACING_DIRECTION_WEST = "west";
+
+	public const MC_VERTICAL_HALF_BOTTOM = "bottom";
+	public const MC_VERTICAL_HALF_TOP = "top";
+
+	public const ORIENTATION_DOWN_EAST = "down_east";
+	public const ORIENTATION_DOWN_NORTH = "down_north";
+	public const ORIENTATION_DOWN_SOUTH = "down_south";
+	public const ORIENTATION_DOWN_WEST = "down_west";
+	public const ORIENTATION_EAST_UP = "east_up";
+	public const ORIENTATION_NORTH_UP = "north_up";
+	public const ORIENTATION_SOUTH_UP = "south_up";
+	public const ORIENTATION_UP_EAST = "up_east";
+	public const ORIENTATION_UP_NORTH = "up_north";
+	public const ORIENTATION_UP_SOUTH = "up_south";
+	public const ORIENTATION_UP_WEST = "up_west";
+	public const ORIENTATION_WEST_UP = "west_up";
+
+	public const PILLAR_AXIS_X = "x";
+	public const PILLAR_AXIS_Y = "y";
+	public const PILLAR_AXIS_Z = "z";
+
+	public const PORTAL_AXIS_UNKNOWN = "unknown";
+	public const PORTAL_AXIS_X = "x";
+	public const PORTAL_AXIS_Z = "z";
+
+	public const SEA_GRASS_TYPE_DEFAULT = "default";
+	public const SEA_GRASS_TYPE_DOUBLE_BOT = "double_bot";
+	public const SEA_GRASS_TYPE_DOUBLE_TOP = "double_top";
+
+	public const STRUCTURE_BLOCK_TYPE_CORNER = "corner";
+	public const STRUCTURE_BLOCK_TYPE_DATA = "data";
+	public const STRUCTURE_BLOCK_TYPE_EXPORT = "export";
+	public const STRUCTURE_BLOCK_TYPE_INVALID = "invalid";
+	public const STRUCTURE_BLOCK_TYPE_LOAD = "load";
+	public const STRUCTURE_BLOCK_TYPE_SAVE = "save";
+
+	public const TORCH_FACING_DIRECTION_EAST = "east";
+	public const TORCH_FACING_DIRECTION_NORTH = "north";
+	public const TORCH_FACING_DIRECTION_SOUTH = "south";
+	public const TORCH_FACING_DIRECTION_TOP = "top";
+	public const TORCH_FACING_DIRECTION_UNKNOWN = "unknown";
+	public const TORCH_FACING_DIRECTION_WEST = "west";
+
+	public const TURTLE_EGG_COUNT_FOUR_EGG = "four_egg";
+	public const TURTLE_EGG_COUNT_ONE_EGG = "one_egg";
+	public const TURTLE_EGG_COUNT_THREE_EGG = "three_egg";
+	public const TURTLE_EGG_COUNT_TWO_EGG = "two_egg";
+
+	public const VAULT_STATE_ACTIVE = "active";
+	public const VAULT_STATE_EJECTING = "ejecting";
+	public const VAULT_STATE_INACTIVE = "inactive";
+	public const VAULT_STATE_UNLOCKING = "unlocking";
+
+	public const WALL_CONNECTION_TYPE_EAST_NONE = "none";
+	public const WALL_CONNECTION_TYPE_EAST_SHORT = "short";
+	public const WALL_CONNECTION_TYPE_EAST_TALL = "tall";
+
+	public const WALL_CONNECTION_TYPE_NORTH_NONE = "none";
+	public const WALL_CONNECTION_TYPE_NORTH_SHORT = "short";
+	public const WALL_CONNECTION_TYPE_NORTH_TALL = "tall";
+
+	public const WALL_CONNECTION_TYPE_SOUTH_NONE = "none";
+	public const WALL_CONNECTION_TYPE_SOUTH_SHORT = "short";
+	public const WALL_CONNECTION_TYPE_SOUTH_TALL = "tall";
+
+	public const WALL_CONNECTION_TYPE_WEST_NONE = "none";
+	public const WALL_CONNECTION_TYPE_WEST_SHORT = "short";
+	public const WALL_CONNECTION_TYPE_WEST_TALL = "tall";
+
+}
diff --git a/src/data/bedrock/block/BlockTypeNames.php b/src/data/bedrock/block/BlockTypeNames.php
new file mode 100644
index 0000000000..029a5f6aad
--- /dev/null
+++ b/src/data/bedrock/block/BlockTypeNames.php
@@ -0,0 +1,1253 @@
+<?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\block;
+
+/**
+ * This class is generated automatically from the block palette for the current version. Do not edit it manually.
+ */
+final class BlockTypeNames{
+	private function __construct(){
+		//NOOP
+	}
+
+	public const ACACIA_BUTTON = "minecraft:acacia_button";
+	public const ACACIA_DOOR = "minecraft:acacia_door";
+	public const ACACIA_DOUBLE_SLAB = "minecraft:acacia_double_slab";
+	public const ACACIA_FENCE = "minecraft:acacia_fence";
+	public const ACACIA_FENCE_GATE = "minecraft:acacia_fence_gate";
+	public const ACACIA_HANGING_SIGN = "minecraft:acacia_hanging_sign";
+	public const ACACIA_LEAVES = "minecraft:acacia_leaves";
+	public const ACACIA_LOG = "minecraft:acacia_log";
+	public const ACACIA_PLANKS = "minecraft:acacia_planks";
+	public const ACACIA_PRESSURE_PLATE = "minecraft:acacia_pressure_plate";
+	public const ACACIA_SAPLING = "minecraft:acacia_sapling";
+	public const ACACIA_SLAB = "minecraft:acacia_slab";
+	public const ACACIA_STAIRS = "minecraft:acacia_stairs";
+	public const ACACIA_STANDING_SIGN = "minecraft:acacia_standing_sign";
+	public const ACACIA_TRAPDOOR = "minecraft:acacia_trapdoor";
+	public const ACACIA_WALL_SIGN = "minecraft:acacia_wall_sign";
+	public const ACACIA_WOOD = "minecraft:acacia_wood";
+	public const ACTIVATOR_RAIL = "minecraft:activator_rail";
+	public const AIR = "minecraft:air";
+	public const ALLIUM = "minecraft:allium";
+	public const ALLOW = "minecraft:allow";
+	public const AMETHYST_BLOCK = "minecraft:amethyst_block";
+	public const AMETHYST_CLUSTER = "minecraft:amethyst_cluster";
+	public const ANCIENT_DEBRIS = "minecraft:ancient_debris";
+	public const ANDESITE = "minecraft:andesite";
+	public const ANDESITE_DOUBLE_SLAB = "minecraft:andesite_double_slab";
+	public const ANDESITE_SLAB = "minecraft:andesite_slab";
+	public const ANDESITE_STAIRS = "minecraft:andesite_stairs";
+	public const ANDESITE_WALL = "minecraft:andesite_wall";
+	public const ANVIL = "minecraft:anvil";
+	public const AZALEA = "minecraft:azalea";
+	public const AZALEA_LEAVES = "minecraft:azalea_leaves";
+	public const AZALEA_LEAVES_FLOWERED = "minecraft:azalea_leaves_flowered";
+	public const AZURE_BLUET = "minecraft:azure_bluet";
+	public const BAMBOO = "minecraft:bamboo";
+	public const BAMBOO_BLOCK = "minecraft:bamboo_block";
+	public const BAMBOO_BUTTON = "minecraft:bamboo_button";
+	public const BAMBOO_DOOR = "minecraft:bamboo_door";
+	public const BAMBOO_DOUBLE_SLAB = "minecraft:bamboo_double_slab";
+	public const BAMBOO_FENCE = "minecraft:bamboo_fence";
+	public const BAMBOO_FENCE_GATE = "minecraft:bamboo_fence_gate";
+	public const BAMBOO_HANGING_SIGN = "minecraft:bamboo_hanging_sign";
+	public const BAMBOO_MOSAIC = "minecraft:bamboo_mosaic";
+	public const BAMBOO_MOSAIC_DOUBLE_SLAB = "minecraft:bamboo_mosaic_double_slab";
+	public const BAMBOO_MOSAIC_SLAB = "minecraft:bamboo_mosaic_slab";
+	public const BAMBOO_MOSAIC_STAIRS = "minecraft:bamboo_mosaic_stairs";
+	public const BAMBOO_PLANKS = "minecraft:bamboo_planks";
+	public const BAMBOO_PRESSURE_PLATE = "minecraft:bamboo_pressure_plate";
+	public const BAMBOO_SAPLING = "minecraft:bamboo_sapling";
+	public const BAMBOO_SLAB = "minecraft:bamboo_slab";
+	public const BAMBOO_STAIRS = "minecraft:bamboo_stairs";
+	public const BAMBOO_STANDING_SIGN = "minecraft:bamboo_standing_sign";
+	public const BAMBOO_TRAPDOOR = "minecraft:bamboo_trapdoor";
+	public const BAMBOO_WALL_SIGN = "minecraft:bamboo_wall_sign";
+	public const BARREL = "minecraft:barrel";
+	public const BARRIER = "minecraft:barrier";
+	public const BASALT = "minecraft:basalt";
+	public const BEACON = "minecraft:beacon";
+	public const BED = "minecraft:bed";
+	public const BEDROCK = "minecraft:bedrock";
+	public const BEE_NEST = "minecraft:bee_nest";
+	public const BEEHIVE = "minecraft:beehive";
+	public const BEETROOT = "minecraft:beetroot";
+	public const BELL = "minecraft:bell";
+	public const BIG_DRIPLEAF = "minecraft:big_dripleaf";
+	public const BIRCH_BUTTON = "minecraft:birch_button";
+	public const BIRCH_DOOR = "minecraft:birch_door";
+	public const BIRCH_DOUBLE_SLAB = "minecraft:birch_double_slab";
+	public const BIRCH_FENCE = "minecraft:birch_fence";
+	public const BIRCH_FENCE_GATE = "minecraft:birch_fence_gate";
+	public const BIRCH_HANGING_SIGN = "minecraft:birch_hanging_sign";
+	public const BIRCH_LEAVES = "minecraft:birch_leaves";
+	public const BIRCH_LOG = "minecraft:birch_log";
+	public const BIRCH_PLANKS = "minecraft:birch_planks";
+	public const BIRCH_PRESSURE_PLATE = "minecraft:birch_pressure_plate";
+	public const BIRCH_SAPLING = "minecraft:birch_sapling";
+	public const BIRCH_SLAB = "minecraft:birch_slab";
+	public const BIRCH_STAIRS = "minecraft:birch_stairs";
+	public const BIRCH_STANDING_SIGN = "minecraft:birch_standing_sign";
+	public const BIRCH_TRAPDOOR = "minecraft:birch_trapdoor";
+	public const BIRCH_WALL_SIGN = "minecraft:birch_wall_sign";
+	public const BIRCH_WOOD = "minecraft:birch_wood";
+	public const BLACK_CANDLE = "minecraft:black_candle";
+	public const BLACK_CANDLE_CAKE = "minecraft:black_candle_cake";
+	public const BLACK_CARPET = "minecraft:black_carpet";
+	public const BLACK_CONCRETE = "minecraft:black_concrete";
+	public const BLACK_CONCRETE_POWDER = "minecraft:black_concrete_powder";
+	public const BLACK_GLAZED_TERRACOTTA = "minecraft:black_glazed_terracotta";
+	public const BLACK_SHULKER_BOX = "minecraft:black_shulker_box";
+	public const BLACK_STAINED_GLASS = "minecraft:black_stained_glass";
+	public const BLACK_STAINED_GLASS_PANE = "minecraft:black_stained_glass_pane";
+	public const BLACK_TERRACOTTA = "minecraft:black_terracotta";
+	public const BLACK_WOOL = "minecraft:black_wool";
+	public const BLACKSTONE = "minecraft:blackstone";
+	public const BLACKSTONE_DOUBLE_SLAB = "minecraft:blackstone_double_slab";
+	public const BLACKSTONE_SLAB = "minecraft:blackstone_slab";
+	public const BLACKSTONE_STAIRS = "minecraft:blackstone_stairs";
+	public const BLACKSTONE_WALL = "minecraft:blackstone_wall";
+	public const BLAST_FURNACE = "minecraft:blast_furnace";
+	public const BLUE_CANDLE = "minecraft:blue_candle";
+	public const BLUE_CANDLE_CAKE = "minecraft:blue_candle_cake";
+	public const BLUE_CARPET = "minecraft:blue_carpet";
+	public const BLUE_CONCRETE = "minecraft:blue_concrete";
+	public const BLUE_CONCRETE_POWDER = "minecraft:blue_concrete_powder";
+	public const BLUE_GLAZED_TERRACOTTA = "minecraft:blue_glazed_terracotta";
+	public const BLUE_ICE = "minecraft:blue_ice";
+	public const BLUE_ORCHID = "minecraft:blue_orchid";
+	public const BLUE_SHULKER_BOX = "minecraft:blue_shulker_box";
+	public const BLUE_STAINED_GLASS = "minecraft:blue_stained_glass";
+	public const BLUE_STAINED_GLASS_PANE = "minecraft:blue_stained_glass_pane";
+	public const BLUE_TERRACOTTA = "minecraft:blue_terracotta";
+	public const BLUE_WOOL = "minecraft:blue_wool";
+	public const BONE_BLOCK = "minecraft:bone_block";
+	public const BOOKSHELF = "minecraft:bookshelf";
+	public const BORDER_BLOCK = "minecraft:border_block";
+	public const BRAIN_CORAL = "minecraft:brain_coral";
+	public const BRAIN_CORAL_BLOCK = "minecraft:brain_coral_block";
+	public const BRAIN_CORAL_FAN = "minecraft:brain_coral_fan";
+	public const BRAIN_CORAL_WALL_FAN = "minecraft:brain_coral_wall_fan";
+	public const BREWING_STAND = "minecraft:brewing_stand";
+	public const BRICK_BLOCK = "minecraft:brick_block";
+	public const BRICK_DOUBLE_SLAB = "minecraft:brick_double_slab";
+	public const BRICK_SLAB = "minecraft:brick_slab";
+	public const BRICK_STAIRS = "minecraft:brick_stairs";
+	public const BRICK_WALL = "minecraft:brick_wall";
+	public const BROWN_CANDLE = "minecraft:brown_candle";
+	public const BROWN_CANDLE_CAKE = "minecraft:brown_candle_cake";
+	public const BROWN_CARPET = "minecraft:brown_carpet";
+	public const BROWN_CONCRETE = "minecraft:brown_concrete";
+	public const BROWN_CONCRETE_POWDER = "minecraft:brown_concrete_powder";
+	public const BROWN_GLAZED_TERRACOTTA = "minecraft:brown_glazed_terracotta";
+	public const BROWN_MUSHROOM = "minecraft:brown_mushroom";
+	public const BROWN_MUSHROOM_BLOCK = "minecraft:brown_mushroom_block";
+	public const BROWN_SHULKER_BOX = "minecraft:brown_shulker_box";
+	public const BROWN_STAINED_GLASS = "minecraft:brown_stained_glass";
+	public const BROWN_STAINED_GLASS_PANE = "minecraft:brown_stained_glass_pane";
+	public const BROWN_TERRACOTTA = "minecraft:brown_terracotta";
+	public const BROWN_WOOL = "minecraft:brown_wool";
+	public const BUBBLE_COLUMN = "minecraft:bubble_column";
+	public const BUBBLE_CORAL = "minecraft:bubble_coral";
+	public const BUBBLE_CORAL_BLOCK = "minecraft:bubble_coral_block";
+	public const BUBBLE_CORAL_FAN = "minecraft:bubble_coral_fan";
+	public const BUBBLE_CORAL_WALL_FAN = "minecraft:bubble_coral_wall_fan";
+	public const BUDDING_AMETHYST = "minecraft:budding_amethyst";
+	public const CACTUS = "minecraft:cactus";
+	public const CAKE = "minecraft:cake";
+	public const CALCITE = "minecraft:calcite";
+	public const CALIBRATED_SCULK_SENSOR = "minecraft:calibrated_sculk_sensor";
+	public const CAMERA = "minecraft:camera";
+	public const CAMPFIRE = "minecraft:campfire";
+	public const CANDLE = "minecraft:candle";
+	public const CANDLE_CAKE = "minecraft:candle_cake";
+	public const CARROTS = "minecraft:carrots";
+	public const CARTOGRAPHY_TABLE = "minecraft:cartography_table";
+	public const CARVED_PUMPKIN = "minecraft:carved_pumpkin";
+	public const CAULDRON = "minecraft:cauldron";
+	public const CAVE_VINES = "minecraft:cave_vines";
+	public const CAVE_VINES_BODY_WITH_BERRIES = "minecraft:cave_vines_body_with_berries";
+	public const CAVE_VINES_HEAD_WITH_BERRIES = "minecraft:cave_vines_head_with_berries";
+	public const CHAIN = "minecraft:chain";
+	public const CHAIN_COMMAND_BLOCK = "minecraft:chain_command_block";
+	public const CHEMICAL_HEAT = "minecraft:chemical_heat";
+	public const CHERRY_BUTTON = "minecraft:cherry_button";
+	public const CHERRY_DOOR = "minecraft:cherry_door";
+	public const CHERRY_DOUBLE_SLAB = "minecraft:cherry_double_slab";
+	public const CHERRY_FENCE = "minecraft:cherry_fence";
+	public const CHERRY_FENCE_GATE = "minecraft:cherry_fence_gate";
+	public const CHERRY_HANGING_SIGN = "minecraft:cherry_hanging_sign";
+	public const CHERRY_LEAVES = "minecraft:cherry_leaves";
+	public const CHERRY_LOG = "minecraft:cherry_log";
+	public const CHERRY_PLANKS = "minecraft:cherry_planks";
+	public const CHERRY_PRESSURE_PLATE = "minecraft:cherry_pressure_plate";
+	public const CHERRY_SAPLING = "minecraft:cherry_sapling";
+	public const CHERRY_SLAB = "minecraft:cherry_slab";
+	public const CHERRY_STAIRS = "minecraft:cherry_stairs";
+	public const CHERRY_STANDING_SIGN = "minecraft:cherry_standing_sign";
+	public const CHERRY_TRAPDOOR = "minecraft:cherry_trapdoor";
+	public const CHERRY_WALL_SIGN = "minecraft:cherry_wall_sign";
+	public const CHERRY_WOOD = "minecraft:cherry_wood";
+	public const CHEST = "minecraft:chest";
+	public const CHIPPED_ANVIL = "minecraft:chipped_anvil";
+	public const CHISELED_BOOKSHELF = "minecraft:chiseled_bookshelf";
+	public const CHISELED_COPPER = "minecraft:chiseled_copper";
+	public const CHISELED_DEEPSLATE = "minecraft:chiseled_deepslate";
+	public const CHISELED_NETHER_BRICKS = "minecraft:chiseled_nether_bricks";
+	public const CHISELED_POLISHED_BLACKSTONE = "minecraft:chiseled_polished_blackstone";
+	public const CHISELED_QUARTZ_BLOCK = "minecraft:chiseled_quartz_block";
+	public const CHISELED_RED_SANDSTONE = "minecraft:chiseled_red_sandstone";
+	public const CHISELED_SANDSTONE = "minecraft:chiseled_sandstone";
+	public const CHISELED_STONE_BRICKS = "minecraft:chiseled_stone_bricks";
+	public const CHISELED_TUFF = "minecraft:chiseled_tuff";
+	public const CHISELED_TUFF_BRICKS = "minecraft:chiseled_tuff_bricks";
+	public const CHORUS_FLOWER = "minecraft:chorus_flower";
+	public const CHORUS_PLANT = "minecraft:chorus_plant";
+	public const CLAY = "minecraft:clay";
+	public const CLIENT_REQUEST_PLACEHOLDER_BLOCK = "minecraft:client_request_placeholder_block";
+	public const COAL_BLOCK = "minecraft:coal_block";
+	public const COAL_ORE = "minecraft:coal_ore";
+	public const COARSE_DIRT = "minecraft:coarse_dirt";
+	public const COBBLED_DEEPSLATE = "minecraft:cobbled_deepslate";
+	public const COBBLED_DEEPSLATE_DOUBLE_SLAB = "minecraft:cobbled_deepslate_double_slab";
+	public const COBBLED_DEEPSLATE_SLAB = "minecraft:cobbled_deepslate_slab";
+	public const COBBLED_DEEPSLATE_STAIRS = "minecraft:cobbled_deepslate_stairs";
+	public const COBBLED_DEEPSLATE_WALL = "minecraft:cobbled_deepslate_wall";
+	public const COBBLESTONE = "minecraft:cobblestone";
+	public const COBBLESTONE_DOUBLE_SLAB = "minecraft:cobblestone_double_slab";
+	public const COBBLESTONE_SLAB = "minecraft:cobblestone_slab";
+	public const COBBLESTONE_WALL = "minecraft:cobblestone_wall";
+	public const COCOA = "minecraft:cocoa";
+	public const COLORED_TORCH_BLUE = "minecraft:colored_torch_blue";
+	public const COLORED_TORCH_GREEN = "minecraft:colored_torch_green";
+	public const COLORED_TORCH_PURPLE = "minecraft:colored_torch_purple";
+	public const COLORED_TORCH_RED = "minecraft:colored_torch_red";
+	public const COMMAND_BLOCK = "minecraft:command_block";
+	public const COMPOSTER = "minecraft:composter";
+	public const COMPOUND_CREATOR = "minecraft:compound_creator";
+	public const CONDUIT = "minecraft:conduit";
+	public const COPPER_BLOCK = "minecraft:copper_block";
+	public const COPPER_BULB = "minecraft:copper_bulb";
+	public const COPPER_DOOR = "minecraft:copper_door";
+	public const COPPER_GRATE = "minecraft:copper_grate";
+	public const COPPER_ORE = "minecraft:copper_ore";
+	public const COPPER_TRAPDOOR = "minecraft:copper_trapdoor";
+	public const CORNFLOWER = "minecraft:cornflower";
+	public const CRACKED_DEEPSLATE_BRICKS = "minecraft:cracked_deepslate_bricks";
+	public const CRACKED_DEEPSLATE_TILES = "minecraft:cracked_deepslate_tiles";
+	public const CRACKED_NETHER_BRICKS = "minecraft:cracked_nether_bricks";
+	public const CRACKED_POLISHED_BLACKSTONE_BRICKS = "minecraft:cracked_polished_blackstone_bricks";
+	public const CRACKED_STONE_BRICKS = "minecraft:cracked_stone_bricks";
+	public const CRAFTER = "minecraft:crafter";
+	public const CRAFTING_TABLE = "minecraft:crafting_table";
+	public const CREEPER_HEAD = "minecraft:creeper_head";
+	public const CRIMSON_BUTTON = "minecraft:crimson_button";
+	public const CRIMSON_DOOR = "minecraft:crimson_door";
+	public const CRIMSON_DOUBLE_SLAB = "minecraft:crimson_double_slab";
+	public const CRIMSON_FENCE = "minecraft:crimson_fence";
+	public const CRIMSON_FENCE_GATE = "minecraft:crimson_fence_gate";
+	public const CRIMSON_FUNGUS = "minecraft:crimson_fungus";
+	public const CRIMSON_HANGING_SIGN = "minecraft:crimson_hanging_sign";
+	public const CRIMSON_HYPHAE = "minecraft:crimson_hyphae";
+	public const CRIMSON_NYLIUM = "minecraft:crimson_nylium";
+	public const CRIMSON_PLANKS = "minecraft:crimson_planks";
+	public const CRIMSON_PRESSURE_PLATE = "minecraft:crimson_pressure_plate";
+	public const CRIMSON_ROOTS = "minecraft:crimson_roots";
+	public const CRIMSON_SLAB = "minecraft:crimson_slab";
+	public const CRIMSON_STAIRS = "minecraft:crimson_stairs";
+	public const CRIMSON_STANDING_SIGN = "minecraft:crimson_standing_sign";
+	public const CRIMSON_STEM = "minecraft:crimson_stem";
+	public const CRIMSON_TRAPDOOR = "minecraft:crimson_trapdoor";
+	public const CRIMSON_WALL_SIGN = "minecraft:crimson_wall_sign";
+	public const CRYING_OBSIDIAN = "minecraft:crying_obsidian";
+	public const CUT_COPPER = "minecraft:cut_copper";
+	public const CUT_COPPER_SLAB = "minecraft:cut_copper_slab";
+	public const CUT_COPPER_STAIRS = "minecraft:cut_copper_stairs";
+	public const CUT_RED_SANDSTONE = "minecraft:cut_red_sandstone";
+	public const CUT_RED_SANDSTONE_DOUBLE_SLAB = "minecraft:cut_red_sandstone_double_slab";
+	public const CUT_RED_SANDSTONE_SLAB = "minecraft:cut_red_sandstone_slab";
+	public const CUT_SANDSTONE = "minecraft:cut_sandstone";
+	public const CUT_SANDSTONE_DOUBLE_SLAB = "minecraft:cut_sandstone_double_slab";
+	public const CUT_SANDSTONE_SLAB = "minecraft:cut_sandstone_slab";
+	public const CYAN_CANDLE = "minecraft:cyan_candle";
+	public const CYAN_CANDLE_CAKE = "minecraft:cyan_candle_cake";
+	public const CYAN_CARPET = "minecraft:cyan_carpet";
+	public const CYAN_CONCRETE = "minecraft:cyan_concrete";
+	public const CYAN_CONCRETE_POWDER = "minecraft:cyan_concrete_powder";
+	public const CYAN_GLAZED_TERRACOTTA = "minecraft:cyan_glazed_terracotta";
+	public const CYAN_SHULKER_BOX = "minecraft:cyan_shulker_box";
+	public const CYAN_STAINED_GLASS = "minecraft:cyan_stained_glass";
+	public const CYAN_STAINED_GLASS_PANE = "minecraft:cyan_stained_glass_pane";
+	public const CYAN_TERRACOTTA = "minecraft:cyan_terracotta";
+	public const CYAN_WOOL = "minecraft:cyan_wool";
+	public const DAMAGED_ANVIL = "minecraft:damaged_anvil";
+	public const DANDELION = "minecraft:dandelion";
+	public const DARK_OAK_BUTTON = "minecraft:dark_oak_button";
+	public const DARK_OAK_DOOR = "minecraft:dark_oak_door";
+	public const DARK_OAK_DOUBLE_SLAB = "minecraft:dark_oak_double_slab";
+	public const DARK_OAK_FENCE = "minecraft:dark_oak_fence";
+	public const DARK_OAK_FENCE_GATE = "minecraft:dark_oak_fence_gate";
+	public const DARK_OAK_HANGING_SIGN = "minecraft:dark_oak_hanging_sign";
+	public const DARK_OAK_LEAVES = "minecraft:dark_oak_leaves";
+	public const DARK_OAK_LOG = "minecraft:dark_oak_log";
+	public const DARK_OAK_PLANKS = "minecraft:dark_oak_planks";
+	public const DARK_OAK_PRESSURE_PLATE = "minecraft:dark_oak_pressure_plate";
+	public const DARK_OAK_SAPLING = "minecraft:dark_oak_sapling";
+	public const DARK_OAK_SLAB = "minecraft:dark_oak_slab";
+	public const DARK_OAK_STAIRS = "minecraft:dark_oak_stairs";
+	public const DARK_OAK_TRAPDOOR = "minecraft:dark_oak_trapdoor";
+	public const DARK_OAK_WOOD = "minecraft:dark_oak_wood";
+	public const DARK_PRISMARINE = "minecraft:dark_prismarine";
+	public const DARK_PRISMARINE_DOUBLE_SLAB = "minecraft:dark_prismarine_double_slab";
+	public const DARK_PRISMARINE_SLAB = "minecraft:dark_prismarine_slab";
+	public const DARK_PRISMARINE_STAIRS = "minecraft:dark_prismarine_stairs";
+	public const DARKOAK_STANDING_SIGN = "minecraft:darkoak_standing_sign";
+	public const DARKOAK_WALL_SIGN = "minecraft:darkoak_wall_sign";
+	public const DAYLIGHT_DETECTOR = "minecraft:daylight_detector";
+	public const DAYLIGHT_DETECTOR_INVERTED = "minecraft:daylight_detector_inverted";
+	public const DEAD_BRAIN_CORAL = "minecraft:dead_brain_coral";
+	public const DEAD_BRAIN_CORAL_BLOCK = "minecraft:dead_brain_coral_block";
+	public const DEAD_BRAIN_CORAL_FAN = "minecraft:dead_brain_coral_fan";
+	public const DEAD_BRAIN_CORAL_WALL_FAN = "minecraft:dead_brain_coral_wall_fan";
+	public const DEAD_BUBBLE_CORAL = "minecraft:dead_bubble_coral";
+	public const DEAD_BUBBLE_CORAL_BLOCK = "minecraft:dead_bubble_coral_block";
+	public const DEAD_BUBBLE_CORAL_FAN = "minecraft:dead_bubble_coral_fan";
+	public const DEAD_BUBBLE_CORAL_WALL_FAN = "minecraft:dead_bubble_coral_wall_fan";
+	public const DEAD_FIRE_CORAL = "minecraft:dead_fire_coral";
+	public const DEAD_FIRE_CORAL_BLOCK = "minecraft:dead_fire_coral_block";
+	public const DEAD_FIRE_CORAL_FAN = "minecraft:dead_fire_coral_fan";
+	public const DEAD_FIRE_CORAL_WALL_FAN = "minecraft:dead_fire_coral_wall_fan";
+	public const DEAD_HORN_CORAL = "minecraft:dead_horn_coral";
+	public const DEAD_HORN_CORAL_BLOCK = "minecraft:dead_horn_coral_block";
+	public const DEAD_HORN_CORAL_FAN = "minecraft:dead_horn_coral_fan";
+	public const DEAD_HORN_CORAL_WALL_FAN = "minecraft:dead_horn_coral_wall_fan";
+	public const DEAD_TUBE_CORAL = "minecraft:dead_tube_coral";
+	public const DEAD_TUBE_CORAL_BLOCK = "minecraft:dead_tube_coral_block";
+	public const DEAD_TUBE_CORAL_FAN = "minecraft:dead_tube_coral_fan";
+	public const DEAD_TUBE_CORAL_WALL_FAN = "minecraft:dead_tube_coral_wall_fan";
+	public const DEADBUSH = "minecraft:deadbush";
+	public const DECORATED_POT = "minecraft:decorated_pot";
+	public const DEEPSLATE = "minecraft:deepslate";
+	public const DEEPSLATE_BRICK_DOUBLE_SLAB = "minecraft:deepslate_brick_double_slab";
+	public const DEEPSLATE_BRICK_SLAB = "minecraft:deepslate_brick_slab";
+	public const DEEPSLATE_BRICK_STAIRS = "minecraft:deepslate_brick_stairs";
+	public const DEEPSLATE_BRICK_WALL = "minecraft:deepslate_brick_wall";
+	public const DEEPSLATE_BRICKS = "minecraft:deepslate_bricks";
+	public const DEEPSLATE_COAL_ORE = "minecraft:deepslate_coal_ore";
+	public const DEEPSLATE_COPPER_ORE = "minecraft:deepslate_copper_ore";
+	public const DEEPSLATE_DIAMOND_ORE = "minecraft:deepslate_diamond_ore";
+	public const DEEPSLATE_EMERALD_ORE = "minecraft:deepslate_emerald_ore";
+	public const DEEPSLATE_GOLD_ORE = "minecraft:deepslate_gold_ore";
+	public const DEEPSLATE_IRON_ORE = "minecraft:deepslate_iron_ore";
+	public const DEEPSLATE_LAPIS_ORE = "minecraft:deepslate_lapis_ore";
+	public const DEEPSLATE_REDSTONE_ORE = "minecraft:deepslate_redstone_ore";
+	public const DEEPSLATE_TILE_DOUBLE_SLAB = "minecraft:deepslate_tile_double_slab";
+	public const DEEPSLATE_TILE_SLAB = "minecraft:deepslate_tile_slab";
+	public const DEEPSLATE_TILE_STAIRS = "minecraft:deepslate_tile_stairs";
+	public const DEEPSLATE_TILE_WALL = "minecraft:deepslate_tile_wall";
+	public const DEEPSLATE_TILES = "minecraft:deepslate_tiles";
+	public const DENY = "minecraft:deny";
+	public const DEPRECATED_ANVIL = "minecraft:deprecated_anvil";
+	public const DEPRECATED_PURPUR_BLOCK_1 = "minecraft:deprecated_purpur_block_1";
+	public const DEPRECATED_PURPUR_BLOCK_2 = "minecraft:deprecated_purpur_block_2";
+	public const DETECTOR_RAIL = "minecraft:detector_rail";
+	public const DIAMOND_BLOCK = "minecraft:diamond_block";
+	public const DIAMOND_ORE = "minecraft:diamond_ore";
+	public const DIORITE = "minecraft:diorite";
+	public const DIORITE_DOUBLE_SLAB = "minecraft:diorite_double_slab";
+	public const DIORITE_SLAB = "minecraft:diorite_slab";
+	public const DIORITE_STAIRS = "minecraft:diorite_stairs";
+	public const DIORITE_WALL = "minecraft:diorite_wall";
+	public const DIRT = "minecraft:dirt";
+	public const DIRT_WITH_ROOTS = "minecraft:dirt_with_roots";
+	public const DISPENSER = "minecraft:dispenser";
+	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_KELP_BLOCK = "minecraft:dried_kelp_block";
+	public const DRIPSTONE_BLOCK = "minecraft:dripstone_block";
+	public const DROPPER = "minecraft:dropper";
+	public const ELEMENT_0 = "minecraft:element_0";
+	public const ELEMENT_1 = "minecraft:element_1";
+	public const ELEMENT_10 = "minecraft:element_10";
+	public const ELEMENT_100 = "minecraft:element_100";
+	public const ELEMENT_101 = "minecraft:element_101";
+	public const ELEMENT_102 = "minecraft:element_102";
+	public const ELEMENT_103 = "minecraft:element_103";
+	public const ELEMENT_104 = "minecraft:element_104";
+	public const ELEMENT_105 = "minecraft:element_105";
+	public const ELEMENT_106 = "minecraft:element_106";
+	public const ELEMENT_107 = "minecraft:element_107";
+	public const ELEMENT_108 = "minecraft:element_108";
+	public const ELEMENT_109 = "minecraft:element_109";
+	public const ELEMENT_11 = "minecraft:element_11";
+	public const ELEMENT_110 = "minecraft:element_110";
+	public const ELEMENT_111 = "minecraft:element_111";
+	public const ELEMENT_112 = "minecraft:element_112";
+	public const ELEMENT_113 = "minecraft:element_113";
+	public const ELEMENT_114 = "minecraft:element_114";
+	public const ELEMENT_115 = "minecraft:element_115";
+	public const ELEMENT_116 = "minecraft:element_116";
+	public const ELEMENT_117 = "minecraft:element_117";
+	public const ELEMENT_118 = "minecraft:element_118";
+	public const ELEMENT_12 = "minecraft:element_12";
+	public const ELEMENT_13 = "minecraft:element_13";
+	public const ELEMENT_14 = "minecraft:element_14";
+	public const ELEMENT_15 = "minecraft:element_15";
+	public const ELEMENT_16 = "minecraft:element_16";
+	public const ELEMENT_17 = "minecraft:element_17";
+	public const ELEMENT_18 = "minecraft:element_18";
+	public const ELEMENT_19 = "minecraft:element_19";
+	public const ELEMENT_2 = "minecraft:element_2";
+	public const ELEMENT_20 = "minecraft:element_20";
+	public const ELEMENT_21 = "minecraft:element_21";
+	public const ELEMENT_22 = "minecraft:element_22";
+	public const ELEMENT_23 = "minecraft:element_23";
+	public const ELEMENT_24 = "minecraft:element_24";
+	public const ELEMENT_25 = "minecraft:element_25";
+	public const ELEMENT_26 = "minecraft:element_26";
+	public const ELEMENT_27 = "minecraft:element_27";
+	public const ELEMENT_28 = "minecraft:element_28";
+	public const ELEMENT_29 = "minecraft:element_29";
+	public const ELEMENT_3 = "minecraft:element_3";
+	public const ELEMENT_30 = "minecraft:element_30";
+	public const ELEMENT_31 = "minecraft:element_31";
+	public const ELEMENT_32 = "minecraft:element_32";
+	public const ELEMENT_33 = "minecraft:element_33";
+	public const ELEMENT_34 = "minecraft:element_34";
+	public const ELEMENT_35 = "minecraft:element_35";
+	public const ELEMENT_36 = "minecraft:element_36";
+	public const ELEMENT_37 = "minecraft:element_37";
+	public const ELEMENT_38 = "minecraft:element_38";
+	public const ELEMENT_39 = "minecraft:element_39";
+	public const ELEMENT_4 = "minecraft:element_4";
+	public const ELEMENT_40 = "minecraft:element_40";
+	public const ELEMENT_41 = "minecraft:element_41";
+	public const ELEMENT_42 = "minecraft:element_42";
+	public const ELEMENT_43 = "minecraft:element_43";
+	public const ELEMENT_44 = "minecraft:element_44";
+	public const ELEMENT_45 = "minecraft:element_45";
+	public const ELEMENT_46 = "minecraft:element_46";
+	public const ELEMENT_47 = "minecraft:element_47";
+	public const ELEMENT_48 = "minecraft:element_48";
+	public const ELEMENT_49 = "minecraft:element_49";
+	public const ELEMENT_5 = "minecraft:element_5";
+	public const ELEMENT_50 = "minecraft:element_50";
+	public const ELEMENT_51 = "minecraft:element_51";
+	public const ELEMENT_52 = "minecraft:element_52";
+	public const ELEMENT_53 = "minecraft:element_53";
+	public const ELEMENT_54 = "minecraft:element_54";
+	public const ELEMENT_55 = "minecraft:element_55";
+	public const ELEMENT_56 = "minecraft:element_56";
+	public const ELEMENT_57 = "minecraft:element_57";
+	public const ELEMENT_58 = "minecraft:element_58";
+	public const ELEMENT_59 = "minecraft:element_59";
+	public const ELEMENT_6 = "minecraft:element_6";
+	public const ELEMENT_60 = "minecraft:element_60";
+	public const ELEMENT_61 = "minecraft:element_61";
+	public const ELEMENT_62 = "minecraft:element_62";
+	public const ELEMENT_63 = "minecraft:element_63";
+	public const ELEMENT_64 = "minecraft:element_64";
+	public const ELEMENT_65 = "minecraft:element_65";
+	public const ELEMENT_66 = "minecraft:element_66";
+	public const ELEMENT_67 = "minecraft:element_67";
+	public const ELEMENT_68 = "minecraft:element_68";
+	public const ELEMENT_69 = "minecraft:element_69";
+	public const ELEMENT_7 = "minecraft:element_7";
+	public const ELEMENT_70 = "minecraft:element_70";
+	public const ELEMENT_71 = "minecraft:element_71";
+	public const ELEMENT_72 = "minecraft:element_72";
+	public const ELEMENT_73 = "minecraft:element_73";
+	public const ELEMENT_74 = "minecraft:element_74";
+	public const ELEMENT_75 = "minecraft:element_75";
+	public const ELEMENT_76 = "minecraft:element_76";
+	public const ELEMENT_77 = "minecraft:element_77";
+	public const ELEMENT_78 = "minecraft:element_78";
+	public const ELEMENT_79 = "minecraft:element_79";
+	public const ELEMENT_8 = "minecraft:element_8";
+	public const ELEMENT_80 = "minecraft:element_80";
+	public const ELEMENT_81 = "minecraft:element_81";
+	public const ELEMENT_82 = "minecraft:element_82";
+	public const ELEMENT_83 = "minecraft:element_83";
+	public const ELEMENT_84 = "minecraft:element_84";
+	public const ELEMENT_85 = "minecraft:element_85";
+	public const ELEMENT_86 = "minecraft:element_86";
+	public const ELEMENT_87 = "minecraft:element_87";
+	public const ELEMENT_88 = "minecraft:element_88";
+	public const ELEMENT_89 = "minecraft:element_89";
+	public const ELEMENT_9 = "minecraft:element_9";
+	public const ELEMENT_90 = "minecraft:element_90";
+	public const ELEMENT_91 = "minecraft:element_91";
+	public const ELEMENT_92 = "minecraft:element_92";
+	public const ELEMENT_93 = "minecraft:element_93";
+	public const ELEMENT_94 = "minecraft:element_94";
+	public const ELEMENT_95 = "minecraft:element_95";
+	public const ELEMENT_96 = "minecraft:element_96";
+	public const ELEMENT_97 = "minecraft:element_97";
+	public const ELEMENT_98 = "minecraft:element_98";
+	public const ELEMENT_99 = "minecraft:element_99";
+	public const ELEMENT_CONSTRUCTOR = "minecraft:element_constructor";
+	public const EMERALD_BLOCK = "minecraft:emerald_block";
+	public const EMERALD_ORE = "minecraft:emerald_ore";
+	public const ENCHANTING_TABLE = "minecraft:enchanting_table";
+	public const END_BRICK_STAIRS = "minecraft:end_brick_stairs";
+	public const END_BRICKS = "minecraft:end_bricks";
+	public const END_GATEWAY = "minecraft:end_gateway";
+	public const END_PORTAL = "minecraft:end_portal";
+	public const END_PORTAL_FRAME = "minecraft:end_portal_frame";
+	public const END_ROD = "minecraft:end_rod";
+	public const END_STONE = "minecraft:end_stone";
+	public const END_STONE_BRICK_DOUBLE_SLAB = "minecraft:end_stone_brick_double_slab";
+	public const END_STONE_BRICK_SLAB = "minecraft:end_stone_brick_slab";
+	public const END_STONE_BRICK_WALL = "minecraft:end_stone_brick_wall";
+	public const ENDER_CHEST = "minecraft:ender_chest";
+	public const EXPOSED_CHISELED_COPPER = "minecraft:exposed_chiseled_copper";
+	public const EXPOSED_COPPER = "minecraft:exposed_copper";
+	public const EXPOSED_COPPER_BULB = "minecraft:exposed_copper_bulb";
+	public const EXPOSED_COPPER_DOOR = "minecraft:exposed_copper_door";
+	public const EXPOSED_COPPER_GRATE = "minecraft:exposed_copper_grate";
+	public const EXPOSED_COPPER_TRAPDOOR = "minecraft:exposed_copper_trapdoor";
+	public const EXPOSED_CUT_COPPER = "minecraft:exposed_cut_copper";
+	public const EXPOSED_CUT_COPPER_SLAB = "minecraft:exposed_cut_copper_slab";
+	public const EXPOSED_CUT_COPPER_STAIRS = "minecraft:exposed_cut_copper_stairs";
+	public const EXPOSED_DOUBLE_CUT_COPPER_SLAB = "minecraft:exposed_double_cut_copper_slab";
+	public const FARMLAND = "minecraft:farmland";
+	public const FENCE_GATE = "minecraft:fence_gate";
+	public const FERN = "minecraft:fern";
+	public const FIRE = "minecraft:fire";
+	public const FIRE_CORAL = "minecraft:fire_coral";
+	public const FIRE_CORAL_BLOCK = "minecraft:fire_coral_block";
+	public const FIRE_CORAL_FAN = "minecraft:fire_coral_fan";
+	public const FIRE_CORAL_WALL_FAN = "minecraft:fire_coral_wall_fan";
+	public const FLETCHING_TABLE = "minecraft:fletching_table";
+	public const FLOWER_POT = "minecraft:flower_pot";
+	public const FLOWERING_AZALEA = "minecraft:flowering_azalea";
+	public const FLOWING_LAVA = "minecraft:flowing_lava";
+	public const FLOWING_WATER = "minecraft:flowing_water";
+	public const FRAME = "minecraft:frame";
+	public const FROG_SPAWN = "minecraft:frog_spawn";
+	public const FROSTED_ICE = "minecraft:frosted_ice";
+	public const FURNACE = "minecraft:furnace";
+	public const GILDED_BLACKSTONE = "minecraft:gilded_blackstone";
+	public const GLASS = "minecraft:glass";
+	public const GLASS_PANE = "minecraft:glass_pane";
+	public const GLOW_FRAME = "minecraft:glow_frame";
+	public const GLOW_LICHEN = "minecraft:glow_lichen";
+	public const GLOWINGOBSIDIAN = "minecraft:glowingobsidian";
+	public const GLOWSTONE = "minecraft:glowstone";
+	public const GOLD_BLOCK = "minecraft:gold_block";
+	public const GOLD_ORE = "minecraft:gold_ore";
+	public const GOLDEN_RAIL = "minecraft:golden_rail";
+	public const GRANITE = "minecraft:granite";
+	public const GRANITE_DOUBLE_SLAB = "minecraft:granite_double_slab";
+	public const GRANITE_SLAB = "minecraft:granite_slab";
+	public const GRANITE_STAIRS = "minecraft:granite_stairs";
+	public const GRANITE_WALL = "minecraft:granite_wall";
+	public const GRASS_BLOCK = "minecraft:grass_block";
+	public const GRASS_PATH = "minecraft:grass_path";
+	public const GRAVEL = "minecraft:gravel";
+	public const GRAY_CANDLE = "minecraft:gray_candle";
+	public const GRAY_CANDLE_CAKE = "minecraft:gray_candle_cake";
+	public const GRAY_CARPET = "minecraft:gray_carpet";
+	public const GRAY_CONCRETE = "minecraft:gray_concrete";
+	public const GRAY_CONCRETE_POWDER = "minecraft:gray_concrete_powder";
+	public const GRAY_GLAZED_TERRACOTTA = "minecraft:gray_glazed_terracotta";
+	public const GRAY_SHULKER_BOX = "minecraft:gray_shulker_box";
+	public const GRAY_STAINED_GLASS = "minecraft:gray_stained_glass";
+	public const GRAY_STAINED_GLASS_PANE = "minecraft:gray_stained_glass_pane";
+	public const GRAY_TERRACOTTA = "minecraft:gray_terracotta";
+	public const GRAY_WOOL = "minecraft:gray_wool";
+	public const GREEN_CANDLE = "minecraft:green_candle";
+	public const GREEN_CANDLE_CAKE = "minecraft:green_candle_cake";
+	public const GREEN_CARPET = "minecraft:green_carpet";
+	public const GREEN_CONCRETE = "minecraft:green_concrete";
+	public const GREEN_CONCRETE_POWDER = "minecraft:green_concrete_powder";
+	public const GREEN_GLAZED_TERRACOTTA = "minecraft:green_glazed_terracotta";
+	public const GREEN_SHULKER_BOX = "minecraft:green_shulker_box";
+	public const GREEN_STAINED_GLASS = "minecraft:green_stained_glass";
+	public const GREEN_STAINED_GLASS_PANE = "minecraft:green_stained_glass_pane";
+	public const GREEN_TERRACOTTA = "minecraft:green_terracotta";
+	public const GREEN_WOOL = "minecraft:green_wool";
+	public const GRINDSTONE = "minecraft:grindstone";
+	public const HANGING_ROOTS = "minecraft:hanging_roots";
+	public const HARD_BLACK_STAINED_GLASS = "minecraft:hard_black_stained_glass";
+	public const HARD_BLACK_STAINED_GLASS_PANE = "minecraft:hard_black_stained_glass_pane";
+	public const HARD_BLUE_STAINED_GLASS = "minecraft:hard_blue_stained_glass";
+	public const HARD_BLUE_STAINED_GLASS_PANE = "minecraft:hard_blue_stained_glass_pane";
+	public const HARD_BROWN_STAINED_GLASS = "minecraft:hard_brown_stained_glass";
+	public const HARD_BROWN_STAINED_GLASS_PANE = "minecraft:hard_brown_stained_glass_pane";
+	public const HARD_CYAN_STAINED_GLASS = "minecraft:hard_cyan_stained_glass";
+	public const HARD_CYAN_STAINED_GLASS_PANE = "minecraft:hard_cyan_stained_glass_pane";
+	public const HARD_GLASS = "minecraft:hard_glass";
+	public const HARD_GLASS_PANE = "minecraft:hard_glass_pane";
+	public const HARD_GRAY_STAINED_GLASS = "minecraft:hard_gray_stained_glass";
+	public const HARD_GRAY_STAINED_GLASS_PANE = "minecraft:hard_gray_stained_glass_pane";
+	public const HARD_GREEN_STAINED_GLASS = "minecraft:hard_green_stained_glass";
+	public const HARD_GREEN_STAINED_GLASS_PANE = "minecraft:hard_green_stained_glass_pane";
+	public const HARD_LIGHT_BLUE_STAINED_GLASS = "minecraft:hard_light_blue_stained_glass";
+	public const HARD_LIGHT_BLUE_STAINED_GLASS_PANE = "minecraft:hard_light_blue_stained_glass_pane";
+	public const HARD_LIGHT_GRAY_STAINED_GLASS = "minecraft:hard_light_gray_stained_glass";
+	public const HARD_LIGHT_GRAY_STAINED_GLASS_PANE = "minecraft:hard_light_gray_stained_glass_pane";
+	public const HARD_LIME_STAINED_GLASS = "minecraft:hard_lime_stained_glass";
+	public const HARD_LIME_STAINED_GLASS_PANE = "minecraft:hard_lime_stained_glass_pane";
+	public const HARD_MAGENTA_STAINED_GLASS = "minecraft:hard_magenta_stained_glass";
+	public const HARD_MAGENTA_STAINED_GLASS_PANE = "minecraft:hard_magenta_stained_glass_pane";
+	public const HARD_ORANGE_STAINED_GLASS = "minecraft:hard_orange_stained_glass";
+	public const HARD_ORANGE_STAINED_GLASS_PANE = "minecraft:hard_orange_stained_glass_pane";
+	public const HARD_PINK_STAINED_GLASS = "minecraft:hard_pink_stained_glass";
+	public const HARD_PINK_STAINED_GLASS_PANE = "minecraft:hard_pink_stained_glass_pane";
+	public const HARD_PURPLE_STAINED_GLASS = "minecraft:hard_purple_stained_glass";
+	public const HARD_PURPLE_STAINED_GLASS_PANE = "minecraft:hard_purple_stained_glass_pane";
+	public const HARD_RED_STAINED_GLASS = "minecraft:hard_red_stained_glass";
+	public const HARD_RED_STAINED_GLASS_PANE = "minecraft:hard_red_stained_glass_pane";
+	public const HARD_WHITE_STAINED_GLASS = "minecraft:hard_white_stained_glass";
+	public const HARD_WHITE_STAINED_GLASS_PANE = "minecraft:hard_white_stained_glass_pane";
+	public const HARD_YELLOW_STAINED_GLASS = "minecraft:hard_yellow_stained_glass";
+	public const HARD_YELLOW_STAINED_GLASS_PANE = "minecraft:hard_yellow_stained_glass_pane";
+	public const HARDENED_CLAY = "minecraft:hardened_clay";
+	public const HAY_BLOCK = "minecraft:hay_block";
+	public const HEAVY_CORE = "minecraft:heavy_core";
+	public const HEAVY_WEIGHTED_PRESSURE_PLATE = "minecraft:heavy_weighted_pressure_plate";
+	public const HONEY_BLOCK = "minecraft:honey_block";
+	public const HONEYCOMB_BLOCK = "minecraft:honeycomb_block";
+	public const HOPPER = "minecraft:hopper";
+	public const HORN_CORAL = "minecraft:horn_coral";
+	public const HORN_CORAL_BLOCK = "minecraft:horn_coral_block";
+	public const HORN_CORAL_FAN = "minecraft:horn_coral_fan";
+	public const HORN_CORAL_WALL_FAN = "minecraft:horn_coral_wall_fan";
+	public const ICE = "minecraft:ice";
+	public const INFESTED_CHISELED_STONE_BRICKS = "minecraft:infested_chiseled_stone_bricks";
+	public const INFESTED_COBBLESTONE = "minecraft:infested_cobblestone";
+	public const INFESTED_CRACKED_STONE_BRICKS = "minecraft:infested_cracked_stone_bricks";
+	public const INFESTED_DEEPSLATE = "minecraft:infested_deepslate";
+	public const INFESTED_MOSSY_STONE_BRICKS = "minecraft:infested_mossy_stone_bricks";
+	public const INFESTED_STONE = "minecraft:infested_stone";
+	public const INFESTED_STONE_BRICKS = "minecraft:infested_stone_bricks";
+	public const INFO_UPDATE = "minecraft:info_update";
+	public const INFO_UPDATE2 = "minecraft:info_update2";
+	public const INVISIBLE_BEDROCK = "minecraft:invisible_bedrock";
+	public const IRON_BARS = "minecraft:iron_bars";
+	public const IRON_BLOCK = "minecraft:iron_block";
+	public const IRON_DOOR = "minecraft:iron_door";
+	public const IRON_ORE = "minecraft:iron_ore";
+	public const IRON_TRAPDOOR = "minecraft:iron_trapdoor";
+	public const JIGSAW = "minecraft:jigsaw";
+	public const JUKEBOX = "minecraft:jukebox";
+	public const JUNGLE_BUTTON = "minecraft:jungle_button";
+	public const JUNGLE_DOOR = "minecraft:jungle_door";
+	public const JUNGLE_DOUBLE_SLAB = "minecraft:jungle_double_slab";
+	public const JUNGLE_FENCE = "minecraft:jungle_fence";
+	public const JUNGLE_FENCE_GATE = "minecraft:jungle_fence_gate";
+	public const JUNGLE_HANGING_SIGN = "minecraft:jungle_hanging_sign";
+	public const JUNGLE_LEAVES = "minecraft:jungle_leaves";
+	public const JUNGLE_LOG = "minecraft:jungle_log";
+	public const JUNGLE_PLANKS = "minecraft:jungle_planks";
+	public const JUNGLE_PRESSURE_PLATE = "minecraft:jungle_pressure_plate";
+	public const JUNGLE_SAPLING = "minecraft:jungle_sapling";
+	public const JUNGLE_SLAB = "minecraft:jungle_slab";
+	public const JUNGLE_STAIRS = "minecraft:jungle_stairs";
+	public const JUNGLE_STANDING_SIGN = "minecraft:jungle_standing_sign";
+	public const JUNGLE_TRAPDOOR = "minecraft:jungle_trapdoor";
+	public const JUNGLE_WALL_SIGN = "minecraft:jungle_wall_sign";
+	public const JUNGLE_WOOD = "minecraft:jungle_wood";
+	public const KELP = "minecraft:kelp";
+	public const LAB_TABLE = "minecraft:lab_table";
+	public const LADDER = "minecraft:ladder";
+	public const LANTERN = "minecraft:lantern";
+	public const LAPIS_BLOCK = "minecraft:lapis_block";
+	public const LAPIS_ORE = "minecraft:lapis_ore";
+	public const LARGE_AMETHYST_BUD = "minecraft:large_amethyst_bud";
+	public const LARGE_FERN = "minecraft:large_fern";
+	public const LAVA = "minecraft:lava";
+	public const LECTERN = "minecraft:lectern";
+	public const LEVER = "minecraft:lever";
+	public const LIGHT_BLOCK_0 = "minecraft:light_block_0";
+	public const LIGHT_BLOCK_1 = "minecraft:light_block_1";
+	public const LIGHT_BLOCK_10 = "minecraft:light_block_10";
+	public const LIGHT_BLOCK_11 = "minecraft:light_block_11";
+	public const LIGHT_BLOCK_12 = "minecraft:light_block_12";
+	public const LIGHT_BLOCK_13 = "minecraft:light_block_13";
+	public const LIGHT_BLOCK_14 = "minecraft:light_block_14";
+	public const LIGHT_BLOCK_15 = "minecraft:light_block_15";
+	public const LIGHT_BLOCK_2 = "minecraft:light_block_2";
+	public const LIGHT_BLOCK_3 = "minecraft:light_block_3";
+	public const LIGHT_BLOCK_4 = "minecraft:light_block_4";
+	public const LIGHT_BLOCK_5 = "minecraft:light_block_5";
+	public const LIGHT_BLOCK_6 = "minecraft:light_block_6";
+	public const LIGHT_BLOCK_7 = "minecraft:light_block_7";
+	public const LIGHT_BLOCK_8 = "minecraft:light_block_8";
+	public const LIGHT_BLOCK_9 = "minecraft:light_block_9";
+	public const LIGHT_BLUE_CANDLE = "minecraft:light_blue_candle";
+	public const LIGHT_BLUE_CANDLE_CAKE = "minecraft:light_blue_candle_cake";
+	public const LIGHT_BLUE_CARPET = "minecraft:light_blue_carpet";
+	public const LIGHT_BLUE_CONCRETE = "minecraft:light_blue_concrete";
+	public const LIGHT_BLUE_CONCRETE_POWDER = "minecraft:light_blue_concrete_powder";
+	public const LIGHT_BLUE_GLAZED_TERRACOTTA = "minecraft:light_blue_glazed_terracotta";
+	public const LIGHT_BLUE_SHULKER_BOX = "minecraft:light_blue_shulker_box";
+	public const LIGHT_BLUE_STAINED_GLASS = "minecraft:light_blue_stained_glass";
+	public const LIGHT_BLUE_STAINED_GLASS_PANE = "minecraft:light_blue_stained_glass_pane";
+	public const LIGHT_BLUE_TERRACOTTA = "minecraft:light_blue_terracotta";
+	public const LIGHT_BLUE_WOOL = "minecraft:light_blue_wool";
+	public const LIGHT_GRAY_CANDLE = "minecraft:light_gray_candle";
+	public const LIGHT_GRAY_CANDLE_CAKE = "minecraft:light_gray_candle_cake";
+	public const LIGHT_GRAY_CARPET = "minecraft:light_gray_carpet";
+	public const LIGHT_GRAY_CONCRETE = "minecraft:light_gray_concrete";
+	public const LIGHT_GRAY_CONCRETE_POWDER = "minecraft:light_gray_concrete_powder";
+	public const LIGHT_GRAY_SHULKER_BOX = "minecraft:light_gray_shulker_box";
+	public const LIGHT_GRAY_STAINED_GLASS = "minecraft:light_gray_stained_glass";
+	public const LIGHT_GRAY_STAINED_GLASS_PANE = "minecraft:light_gray_stained_glass_pane";
+	public const LIGHT_GRAY_TERRACOTTA = "minecraft:light_gray_terracotta";
+	public const LIGHT_GRAY_WOOL = "minecraft:light_gray_wool";
+	public const LIGHT_WEIGHTED_PRESSURE_PLATE = "minecraft:light_weighted_pressure_plate";
+	public const LIGHTNING_ROD = "minecraft:lightning_rod";
+	public const LILAC = "minecraft:lilac";
+	public const LILY_OF_THE_VALLEY = "minecraft:lily_of_the_valley";
+	public const LIME_CANDLE = "minecraft:lime_candle";
+	public const LIME_CANDLE_CAKE = "minecraft:lime_candle_cake";
+	public const LIME_CARPET = "minecraft:lime_carpet";
+	public const LIME_CONCRETE = "minecraft:lime_concrete";
+	public const LIME_CONCRETE_POWDER = "minecraft:lime_concrete_powder";
+	public const LIME_GLAZED_TERRACOTTA = "minecraft:lime_glazed_terracotta";
+	public const LIME_SHULKER_BOX = "minecraft:lime_shulker_box";
+	public const LIME_STAINED_GLASS = "minecraft:lime_stained_glass";
+	public const LIME_STAINED_GLASS_PANE = "minecraft:lime_stained_glass_pane";
+	public const LIME_TERRACOTTA = "minecraft:lime_terracotta";
+	public const LIME_WOOL = "minecraft:lime_wool";
+	public const LIT_BLAST_FURNACE = "minecraft:lit_blast_furnace";
+	public const LIT_DEEPSLATE_REDSTONE_ORE = "minecraft:lit_deepslate_redstone_ore";
+	public const LIT_FURNACE = "minecraft:lit_furnace";
+	public const LIT_PUMPKIN = "minecraft:lit_pumpkin";
+	public const LIT_REDSTONE_LAMP = "minecraft:lit_redstone_lamp";
+	public const LIT_REDSTONE_ORE = "minecraft:lit_redstone_ore";
+	public const LIT_SMOKER = "minecraft:lit_smoker";
+	public const LODESTONE = "minecraft:lodestone";
+	public const LOOM = "minecraft:loom";
+	public const MAGENTA_CANDLE = "minecraft:magenta_candle";
+	public const MAGENTA_CANDLE_CAKE = "minecraft:magenta_candle_cake";
+	public const MAGENTA_CARPET = "minecraft:magenta_carpet";
+	public const MAGENTA_CONCRETE = "minecraft:magenta_concrete";
+	public const MAGENTA_CONCRETE_POWDER = "minecraft:magenta_concrete_powder";
+	public const MAGENTA_GLAZED_TERRACOTTA = "minecraft:magenta_glazed_terracotta";
+	public const MAGENTA_SHULKER_BOX = "minecraft:magenta_shulker_box";
+	public const MAGENTA_STAINED_GLASS = "minecraft:magenta_stained_glass";
+	public const MAGENTA_STAINED_GLASS_PANE = "minecraft:magenta_stained_glass_pane";
+	public const MAGENTA_TERRACOTTA = "minecraft:magenta_terracotta";
+	public const MAGENTA_WOOL = "minecraft:magenta_wool";
+	public const MAGMA = "minecraft:magma";
+	public const MANGROVE_BUTTON = "minecraft:mangrove_button";
+	public const MANGROVE_DOOR = "minecraft:mangrove_door";
+	public const MANGROVE_DOUBLE_SLAB = "minecraft:mangrove_double_slab";
+	public const MANGROVE_FENCE = "minecraft:mangrove_fence";
+	public const MANGROVE_FENCE_GATE = "minecraft:mangrove_fence_gate";
+	public const MANGROVE_HANGING_SIGN = "minecraft:mangrove_hanging_sign";
+	public const MANGROVE_LEAVES = "minecraft:mangrove_leaves";
+	public const MANGROVE_LOG = "minecraft:mangrove_log";
+	public const MANGROVE_PLANKS = "minecraft:mangrove_planks";
+	public const MANGROVE_PRESSURE_PLATE = "minecraft:mangrove_pressure_plate";
+	public const MANGROVE_PROPAGULE = "minecraft:mangrove_propagule";
+	public const MANGROVE_ROOTS = "minecraft:mangrove_roots";
+	public const MANGROVE_SLAB = "minecraft:mangrove_slab";
+	public const MANGROVE_STAIRS = "minecraft:mangrove_stairs";
+	public const MANGROVE_STANDING_SIGN = "minecraft:mangrove_standing_sign";
+	public const MANGROVE_TRAPDOOR = "minecraft:mangrove_trapdoor";
+	public const MANGROVE_WALL_SIGN = "minecraft:mangrove_wall_sign";
+	public const MANGROVE_WOOD = "minecraft:mangrove_wood";
+	public const MATERIAL_REDUCER = "minecraft:material_reducer";
+	public const MEDIUM_AMETHYST_BUD = "minecraft:medium_amethyst_bud";
+	public const MELON_BLOCK = "minecraft:melon_block";
+	public const MELON_STEM = "minecraft:melon_stem";
+	public const MOB_SPAWNER = "minecraft:mob_spawner";
+	public const MOSS_BLOCK = "minecraft:moss_block";
+	public const MOSS_CARPET = "minecraft:moss_carpet";
+	public const MOSSY_COBBLESTONE = "minecraft:mossy_cobblestone";
+	public const MOSSY_COBBLESTONE_DOUBLE_SLAB = "minecraft:mossy_cobblestone_double_slab";
+	public const MOSSY_COBBLESTONE_SLAB = "minecraft:mossy_cobblestone_slab";
+	public const MOSSY_COBBLESTONE_STAIRS = "minecraft:mossy_cobblestone_stairs";
+	public const MOSSY_COBBLESTONE_WALL = "minecraft:mossy_cobblestone_wall";
+	public const MOSSY_STONE_BRICK_DOUBLE_SLAB = "minecraft:mossy_stone_brick_double_slab";
+	public const MOSSY_STONE_BRICK_SLAB = "minecraft:mossy_stone_brick_slab";
+	public const MOSSY_STONE_BRICK_STAIRS = "minecraft:mossy_stone_brick_stairs";
+	public const MOSSY_STONE_BRICK_WALL = "minecraft:mossy_stone_brick_wall";
+	public const MOSSY_STONE_BRICKS = "minecraft:mossy_stone_bricks";
+	public const MOVING_BLOCK = "minecraft:moving_block";
+	public const MUD = "minecraft:mud";
+	public const MUD_BRICK_DOUBLE_SLAB = "minecraft:mud_brick_double_slab";
+	public const MUD_BRICK_SLAB = "minecraft:mud_brick_slab";
+	public const MUD_BRICK_STAIRS = "minecraft:mud_brick_stairs";
+	public const MUD_BRICK_WALL = "minecraft:mud_brick_wall";
+	public const MUD_BRICKS = "minecraft:mud_bricks";
+	public const MUDDY_MANGROVE_ROOTS = "minecraft:muddy_mangrove_roots";
+	public const MUSHROOM_STEM = "minecraft:mushroom_stem";
+	public const MYCELIUM = "minecraft:mycelium";
+	public const NETHER_BRICK = "minecraft:nether_brick";
+	public const NETHER_BRICK_DOUBLE_SLAB = "minecraft:nether_brick_double_slab";
+	public const NETHER_BRICK_FENCE = "minecraft:nether_brick_fence";
+	public const NETHER_BRICK_SLAB = "minecraft:nether_brick_slab";
+	public const NETHER_BRICK_STAIRS = "minecraft:nether_brick_stairs";
+	public const NETHER_BRICK_WALL = "minecraft:nether_brick_wall";
+	public const NETHER_GOLD_ORE = "minecraft:nether_gold_ore";
+	public const NETHER_SPROUTS = "minecraft:nether_sprouts";
+	public const NETHER_WART = "minecraft:nether_wart";
+	public const NETHER_WART_BLOCK = "minecraft:nether_wart_block";
+	public const NETHERITE_BLOCK = "minecraft:netherite_block";
+	public const NETHERRACK = "minecraft:netherrack";
+	public const NETHERREACTOR = "minecraft:netherreactor";
+	public const NORMAL_STONE_DOUBLE_SLAB = "minecraft:normal_stone_double_slab";
+	public const NORMAL_STONE_SLAB = "minecraft:normal_stone_slab";
+	public const NORMAL_STONE_STAIRS = "minecraft:normal_stone_stairs";
+	public const NOTEBLOCK = "minecraft:noteblock";
+	public const OAK_DOUBLE_SLAB = "minecraft:oak_double_slab";
+	public const OAK_FENCE = "minecraft:oak_fence";
+	public const OAK_HANGING_SIGN = "minecraft:oak_hanging_sign";
+	public const OAK_LEAVES = "minecraft:oak_leaves";
+	public const OAK_LOG = "minecraft:oak_log";
+	public const OAK_PLANKS = "minecraft:oak_planks";
+	public const OAK_SAPLING = "minecraft:oak_sapling";
+	public const OAK_SLAB = "minecraft:oak_slab";
+	public const OAK_STAIRS = "minecraft:oak_stairs";
+	public const OAK_WOOD = "minecraft:oak_wood";
+	public const OBSERVER = "minecraft:observer";
+	public const OBSIDIAN = "minecraft:obsidian";
+	public const OCHRE_FROGLIGHT = "minecraft:ochre_froglight";
+	public const ORANGE_CANDLE = "minecraft:orange_candle";
+	public const ORANGE_CANDLE_CAKE = "minecraft:orange_candle_cake";
+	public const ORANGE_CARPET = "minecraft:orange_carpet";
+	public const ORANGE_CONCRETE = "minecraft:orange_concrete";
+	public const ORANGE_CONCRETE_POWDER = "minecraft:orange_concrete_powder";
+	public const ORANGE_GLAZED_TERRACOTTA = "minecraft:orange_glazed_terracotta";
+	public const ORANGE_SHULKER_BOX = "minecraft:orange_shulker_box";
+	public const ORANGE_STAINED_GLASS = "minecraft:orange_stained_glass";
+	public const ORANGE_STAINED_GLASS_PANE = "minecraft:orange_stained_glass_pane";
+	public const ORANGE_TERRACOTTA = "minecraft:orange_terracotta";
+	public const ORANGE_TULIP = "minecraft:orange_tulip";
+	public const ORANGE_WOOL = "minecraft:orange_wool";
+	public const OXEYE_DAISY = "minecraft:oxeye_daisy";
+	public const OXIDIZED_CHISELED_COPPER = "minecraft:oxidized_chiseled_copper";
+	public const OXIDIZED_COPPER = "minecraft:oxidized_copper";
+	public const OXIDIZED_COPPER_BULB = "minecraft:oxidized_copper_bulb";
+	public const OXIDIZED_COPPER_DOOR = "minecraft:oxidized_copper_door";
+	public const OXIDIZED_COPPER_GRATE = "minecraft:oxidized_copper_grate";
+	public const OXIDIZED_COPPER_TRAPDOOR = "minecraft:oxidized_copper_trapdoor";
+	public const OXIDIZED_CUT_COPPER = "minecraft:oxidized_cut_copper";
+	public const OXIDIZED_CUT_COPPER_SLAB = "minecraft:oxidized_cut_copper_slab";
+	public const OXIDIZED_CUT_COPPER_STAIRS = "minecraft:oxidized_cut_copper_stairs";
+	public const OXIDIZED_DOUBLE_CUT_COPPER_SLAB = "minecraft:oxidized_double_cut_copper_slab";
+	public const PACKED_ICE = "minecraft:packed_ice";
+	public const PACKED_MUD = "minecraft:packed_mud";
+	public const PEARLESCENT_FROGLIGHT = "minecraft:pearlescent_froglight";
+	public const PEONY = "minecraft:peony";
+	public const PETRIFIED_OAK_DOUBLE_SLAB = "minecraft:petrified_oak_double_slab";
+	public const PETRIFIED_OAK_SLAB = "minecraft:petrified_oak_slab";
+	public const PIGLIN_HEAD = "minecraft:piglin_head";
+	public const PINK_CANDLE = "minecraft:pink_candle";
+	public const PINK_CANDLE_CAKE = "minecraft:pink_candle_cake";
+	public const PINK_CARPET = "minecraft:pink_carpet";
+	public const PINK_CONCRETE = "minecraft:pink_concrete";
+	public const PINK_CONCRETE_POWDER = "minecraft:pink_concrete_powder";
+	public const PINK_GLAZED_TERRACOTTA = "minecraft:pink_glazed_terracotta";
+	public const PINK_PETALS = "minecraft:pink_petals";
+	public const PINK_SHULKER_BOX = "minecraft:pink_shulker_box";
+	public const PINK_STAINED_GLASS = "minecraft:pink_stained_glass";
+	public const PINK_STAINED_GLASS_PANE = "minecraft:pink_stained_glass_pane";
+	public const PINK_TERRACOTTA = "minecraft:pink_terracotta";
+	public const PINK_TULIP = "minecraft:pink_tulip";
+	public const PINK_WOOL = "minecraft:pink_wool";
+	public const PISTON = "minecraft:piston";
+	public const PISTON_ARM_COLLISION = "minecraft:piston_arm_collision";
+	public const PITCHER_CROP = "minecraft:pitcher_crop";
+	public const PITCHER_PLANT = "minecraft:pitcher_plant";
+	public const PLAYER_HEAD = "minecraft:player_head";
+	public const PODZOL = "minecraft:podzol";
+	public const POINTED_DRIPSTONE = "minecraft:pointed_dripstone";
+	public const POLISHED_ANDESITE = "minecraft:polished_andesite";
+	public const POLISHED_ANDESITE_DOUBLE_SLAB = "minecraft:polished_andesite_double_slab";
+	public const POLISHED_ANDESITE_SLAB = "minecraft:polished_andesite_slab";
+	public const POLISHED_ANDESITE_STAIRS = "minecraft:polished_andesite_stairs";
+	public const POLISHED_BASALT = "minecraft:polished_basalt";
+	public const POLISHED_BLACKSTONE = "minecraft:polished_blackstone";
+	public const POLISHED_BLACKSTONE_BRICK_DOUBLE_SLAB = "minecraft:polished_blackstone_brick_double_slab";
+	public const POLISHED_BLACKSTONE_BRICK_SLAB = "minecraft:polished_blackstone_brick_slab";
+	public const POLISHED_BLACKSTONE_BRICK_STAIRS = "minecraft:polished_blackstone_brick_stairs";
+	public const POLISHED_BLACKSTONE_BRICK_WALL = "minecraft:polished_blackstone_brick_wall";
+	public const POLISHED_BLACKSTONE_BRICKS = "minecraft:polished_blackstone_bricks";
+	public const POLISHED_BLACKSTONE_BUTTON = "minecraft:polished_blackstone_button";
+	public const POLISHED_BLACKSTONE_DOUBLE_SLAB = "minecraft:polished_blackstone_double_slab";
+	public const POLISHED_BLACKSTONE_PRESSURE_PLATE = "minecraft:polished_blackstone_pressure_plate";
+	public const POLISHED_BLACKSTONE_SLAB = "minecraft:polished_blackstone_slab";
+	public const POLISHED_BLACKSTONE_STAIRS = "minecraft:polished_blackstone_stairs";
+	public const POLISHED_BLACKSTONE_WALL = "minecraft:polished_blackstone_wall";
+	public const POLISHED_DEEPSLATE = "minecraft:polished_deepslate";
+	public const POLISHED_DEEPSLATE_DOUBLE_SLAB = "minecraft:polished_deepslate_double_slab";
+	public const POLISHED_DEEPSLATE_SLAB = "minecraft:polished_deepslate_slab";
+	public const POLISHED_DEEPSLATE_STAIRS = "minecraft:polished_deepslate_stairs";
+	public const POLISHED_DEEPSLATE_WALL = "minecraft:polished_deepslate_wall";
+	public const POLISHED_DIORITE = "minecraft:polished_diorite";
+	public const POLISHED_DIORITE_DOUBLE_SLAB = "minecraft:polished_diorite_double_slab";
+	public const POLISHED_DIORITE_SLAB = "minecraft:polished_diorite_slab";
+	public const POLISHED_DIORITE_STAIRS = "minecraft:polished_diorite_stairs";
+	public const POLISHED_GRANITE = "minecraft:polished_granite";
+	public const POLISHED_GRANITE_DOUBLE_SLAB = "minecraft:polished_granite_double_slab";
+	public const POLISHED_GRANITE_SLAB = "minecraft:polished_granite_slab";
+	public const POLISHED_GRANITE_STAIRS = "minecraft:polished_granite_stairs";
+	public const POLISHED_TUFF = "minecraft:polished_tuff";
+	public const POLISHED_TUFF_DOUBLE_SLAB = "minecraft:polished_tuff_double_slab";
+	public const POLISHED_TUFF_SLAB = "minecraft:polished_tuff_slab";
+	public const POLISHED_TUFF_STAIRS = "minecraft:polished_tuff_stairs";
+	public const POLISHED_TUFF_WALL = "minecraft:polished_tuff_wall";
+	public const POPPY = "minecraft:poppy";
+	public const PORTAL = "minecraft:portal";
+	public const POTATOES = "minecraft:potatoes";
+	public const POWDER_SNOW = "minecraft:powder_snow";
+	public const POWERED_COMPARATOR = "minecraft:powered_comparator";
+	public const POWERED_REPEATER = "minecraft:powered_repeater";
+	public const PRISMARINE = "minecraft:prismarine";
+	public const PRISMARINE_BRICK_DOUBLE_SLAB = "minecraft:prismarine_brick_double_slab";
+	public const PRISMARINE_BRICK_SLAB = "minecraft:prismarine_brick_slab";
+	public const PRISMARINE_BRICKS = "minecraft:prismarine_bricks";
+	public const PRISMARINE_BRICKS_STAIRS = "minecraft:prismarine_bricks_stairs";
+	public const PRISMARINE_DOUBLE_SLAB = "minecraft:prismarine_double_slab";
+	public const PRISMARINE_SLAB = "minecraft:prismarine_slab";
+	public const PRISMARINE_STAIRS = "minecraft:prismarine_stairs";
+	public const PRISMARINE_WALL = "minecraft:prismarine_wall";
+	public const PUMPKIN = "minecraft:pumpkin";
+	public const PUMPKIN_STEM = "minecraft:pumpkin_stem";
+	public const PURPLE_CANDLE = "minecraft:purple_candle";
+	public const PURPLE_CANDLE_CAKE = "minecraft:purple_candle_cake";
+	public const PURPLE_CARPET = "minecraft:purple_carpet";
+	public const PURPLE_CONCRETE = "minecraft:purple_concrete";
+	public const PURPLE_CONCRETE_POWDER = "minecraft:purple_concrete_powder";
+	public const PURPLE_GLAZED_TERRACOTTA = "minecraft:purple_glazed_terracotta";
+	public const PURPLE_SHULKER_BOX = "minecraft:purple_shulker_box";
+	public const PURPLE_STAINED_GLASS = "minecraft:purple_stained_glass";
+	public const PURPLE_STAINED_GLASS_PANE = "minecraft:purple_stained_glass_pane";
+	public const PURPLE_TERRACOTTA = "minecraft:purple_terracotta";
+	public const PURPLE_WOOL = "minecraft:purple_wool";
+	public const PURPUR_BLOCK = "minecraft:purpur_block";
+	public const PURPUR_DOUBLE_SLAB = "minecraft:purpur_double_slab";
+	public const PURPUR_PILLAR = "minecraft:purpur_pillar";
+	public const PURPUR_SLAB = "minecraft:purpur_slab";
+	public const PURPUR_STAIRS = "minecraft:purpur_stairs";
+	public const QUARTZ_BLOCK = "minecraft:quartz_block";
+	public const QUARTZ_BRICKS = "minecraft:quartz_bricks";
+	public const QUARTZ_DOUBLE_SLAB = "minecraft:quartz_double_slab";
+	public const QUARTZ_ORE = "minecraft:quartz_ore";
+	public const QUARTZ_PILLAR = "minecraft:quartz_pillar";
+	public const QUARTZ_SLAB = "minecraft:quartz_slab";
+	public const QUARTZ_STAIRS = "minecraft:quartz_stairs";
+	public const RAIL = "minecraft:rail";
+	public const RAW_COPPER_BLOCK = "minecraft:raw_copper_block";
+	public const RAW_GOLD_BLOCK = "minecraft:raw_gold_block";
+	public const RAW_IRON_BLOCK = "minecraft:raw_iron_block";
+	public const RED_CANDLE = "minecraft:red_candle";
+	public const RED_CANDLE_CAKE = "minecraft:red_candle_cake";
+	public const RED_CARPET = "minecraft:red_carpet";
+	public const RED_CONCRETE = "minecraft:red_concrete";
+	public const RED_CONCRETE_POWDER = "minecraft:red_concrete_powder";
+	public const RED_GLAZED_TERRACOTTA = "minecraft:red_glazed_terracotta";
+	public const RED_MUSHROOM = "minecraft:red_mushroom";
+	public const RED_MUSHROOM_BLOCK = "minecraft:red_mushroom_block";
+	public const RED_NETHER_BRICK = "minecraft:red_nether_brick";
+	public const RED_NETHER_BRICK_DOUBLE_SLAB = "minecraft:red_nether_brick_double_slab";
+	public const RED_NETHER_BRICK_SLAB = "minecraft:red_nether_brick_slab";
+	public const RED_NETHER_BRICK_STAIRS = "minecraft:red_nether_brick_stairs";
+	public const RED_NETHER_BRICK_WALL = "minecraft:red_nether_brick_wall";
+	public const RED_SAND = "minecraft:red_sand";
+	public const RED_SANDSTONE = "minecraft:red_sandstone";
+	public const RED_SANDSTONE_DOUBLE_SLAB = "minecraft:red_sandstone_double_slab";
+	public const RED_SANDSTONE_SLAB = "minecraft:red_sandstone_slab";
+	public const RED_SANDSTONE_STAIRS = "minecraft:red_sandstone_stairs";
+	public const RED_SANDSTONE_WALL = "minecraft:red_sandstone_wall";
+	public const RED_SHULKER_BOX = "minecraft:red_shulker_box";
+	public const RED_STAINED_GLASS = "minecraft:red_stained_glass";
+	public const RED_STAINED_GLASS_PANE = "minecraft:red_stained_glass_pane";
+	public const RED_TERRACOTTA = "minecraft:red_terracotta";
+	public const RED_TULIP = "minecraft:red_tulip";
+	public const RED_WOOL = "minecraft:red_wool";
+	public const REDSTONE_BLOCK = "minecraft:redstone_block";
+	public const REDSTONE_LAMP = "minecraft:redstone_lamp";
+	public const REDSTONE_ORE = "minecraft:redstone_ore";
+	public const REDSTONE_TORCH = "minecraft:redstone_torch";
+	public const REDSTONE_WIRE = "minecraft:redstone_wire";
+	public const REEDS = "minecraft:reeds";
+	public const REINFORCED_DEEPSLATE = "minecraft:reinforced_deepslate";
+	public const REPEATING_COMMAND_BLOCK = "minecraft:repeating_command_block";
+	public const RESERVED6 = "minecraft:reserved6";
+	public const RESPAWN_ANCHOR = "minecraft:respawn_anchor";
+	public const ROSE_BUSH = "minecraft:rose_bush";
+	public const SAND = "minecraft:sand";
+	public const SANDSTONE = "minecraft:sandstone";
+	public const SANDSTONE_DOUBLE_SLAB = "minecraft:sandstone_double_slab";
+	public const SANDSTONE_SLAB = "minecraft:sandstone_slab";
+	public const SANDSTONE_STAIRS = "minecraft:sandstone_stairs";
+	public const SANDSTONE_WALL = "minecraft:sandstone_wall";
+	public const SCAFFOLDING = "minecraft:scaffolding";
+	public const SCULK = "minecraft:sculk";
+	public const SCULK_CATALYST = "minecraft:sculk_catalyst";
+	public const SCULK_SENSOR = "minecraft:sculk_sensor";
+	public const SCULK_SHRIEKER = "minecraft:sculk_shrieker";
+	public const SCULK_VEIN = "minecraft:sculk_vein";
+	public const SEA_LANTERN = "minecraft:sea_lantern";
+	public const SEA_PICKLE = "minecraft:sea_pickle";
+	public const SEAGRASS = "minecraft:seagrass";
+	public const SHORT_GRASS = "minecraft:short_grass";
+	public const SHROOMLIGHT = "minecraft:shroomlight";
+	public const SILVER_GLAZED_TERRACOTTA = "minecraft:silver_glazed_terracotta";
+	public const SKELETON_SKULL = "minecraft:skeleton_skull";
+	public const SLIME = "minecraft:slime";
+	public const SMALL_AMETHYST_BUD = "minecraft:small_amethyst_bud";
+	public const SMALL_DRIPLEAF_BLOCK = "minecraft:small_dripleaf_block";
+	public const SMITHING_TABLE = "minecraft:smithing_table";
+	public const SMOKER = "minecraft:smoker";
+	public const SMOOTH_BASALT = "minecraft:smooth_basalt";
+	public const SMOOTH_QUARTZ = "minecraft:smooth_quartz";
+	public const SMOOTH_QUARTZ_DOUBLE_SLAB = "minecraft:smooth_quartz_double_slab";
+	public const SMOOTH_QUARTZ_SLAB = "minecraft:smooth_quartz_slab";
+	public const SMOOTH_QUARTZ_STAIRS = "minecraft:smooth_quartz_stairs";
+	public const SMOOTH_RED_SANDSTONE = "minecraft:smooth_red_sandstone";
+	public const SMOOTH_RED_SANDSTONE_DOUBLE_SLAB = "minecraft:smooth_red_sandstone_double_slab";
+	public const SMOOTH_RED_SANDSTONE_SLAB = "minecraft:smooth_red_sandstone_slab";
+	public const SMOOTH_RED_SANDSTONE_STAIRS = "minecraft:smooth_red_sandstone_stairs";
+	public const SMOOTH_SANDSTONE = "minecraft:smooth_sandstone";
+	public const SMOOTH_SANDSTONE_DOUBLE_SLAB = "minecraft:smooth_sandstone_double_slab";
+	public const SMOOTH_SANDSTONE_SLAB = "minecraft:smooth_sandstone_slab";
+	public const SMOOTH_SANDSTONE_STAIRS = "minecraft:smooth_sandstone_stairs";
+	public const SMOOTH_STONE = "minecraft:smooth_stone";
+	public const SMOOTH_STONE_DOUBLE_SLAB = "minecraft:smooth_stone_double_slab";
+	public const SMOOTH_STONE_SLAB = "minecraft:smooth_stone_slab";
+	public const SNIFFER_EGG = "minecraft:sniffer_egg";
+	public const SNOW = "minecraft:snow";
+	public const SNOW_LAYER = "minecraft:snow_layer";
+	public const SOUL_CAMPFIRE = "minecraft:soul_campfire";
+	public const SOUL_FIRE = "minecraft:soul_fire";
+	public const SOUL_LANTERN = "minecraft:soul_lantern";
+	public const SOUL_SAND = "minecraft:soul_sand";
+	public const SOUL_SOIL = "minecraft:soul_soil";
+	public const SOUL_TORCH = "minecraft:soul_torch";
+	public const SPONGE = "minecraft:sponge";
+	public const SPORE_BLOSSOM = "minecraft:spore_blossom";
+	public const SPRUCE_BUTTON = "minecraft:spruce_button";
+	public const SPRUCE_DOOR = "minecraft:spruce_door";
+	public const SPRUCE_DOUBLE_SLAB = "minecraft:spruce_double_slab";
+	public const SPRUCE_FENCE = "minecraft:spruce_fence";
+	public const SPRUCE_FENCE_GATE = "minecraft:spruce_fence_gate";
+	public const SPRUCE_HANGING_SIGN = "minecraft:spruce_hanging_sign";
+	public const SPRUCE_LEAVES = "minecraft:spruce_leaves";
+	public const SPRUCE_LOG = "minecraft:spruce_log";
+	public const SPRUCE_PLANKS = "minecraft:spruce_planks";
+	public const SPRUCE_PRESSURE_PLATE = "minecraft:spruce_pressure_plate";
+	public const SPRUCE_SAPLING = "minecraft:spruce_sapling";
+	public const SPRUCE_SLAB = "minecraft:spruce_slab";
+	public const SPRUCE_STAIRS = "minecraft:spruce_stairs";
+	public const SPRUCE_STANDING_SIGN = "minecraft:spruce_standing_sign";
+	public const SPRUCE_TRAPDOOR = "minecraft:spruce_trapdoor";
+	public const SPRUCE_WALL_SIGN = "minecraft:spruce_wall_sign";
+	public const SPRUCE_WOOD = "minecraft:spruce_wood";
+	public const STANDING_BANNER = "minecraft:standing_banner";
+	public const STANDING_SIGN = "minecraft:standing_sign";
+	public const STICKY_PISTON = "minecraft:sticky_piston";
+	public const STICKY_PISTON_ARM_COLLISION = "minecraft:sticky_piston_arm_collision";
+	public const STONE = "minecraft:stone";
+	public const STONE_BRICK_DOUBLE_SLAB = "minecraft:stone_brick_double_slab";
+	public const STONE_BRICK_SLAB = "minecraft:stone_brick_slab";
+	public const STONE_BRICK_STAIRS = "minecraft:stone_brick_stairs";
+	public const STONE_BRICK_WALL = "minecraft:stone_brick_wall";
+	public const STONE_BRICKS = "minecraft:stone_bricks";
+	public const STONE_BUTTON = "minecraft:stone_button";
+	public const STONE_PRESSURE_PLATE = "minecraft:stone_pressure_plate";
+	public const STONE_STAIRS = "minecraft:stone_stairs";
+	public const STONECUTTER = "minecraft:stonecutter";
+	public const STONECUTTER_BLOCK = "minecraft:stonecutter_block";
+	public const STRIPPED_ACACIA_LOG = "minecraft:stripped_acacia_log";
+	public const STRIPPED_ACACIA_WOOD = "minecraft:stripped_acacia_wood";
+	public const STRIPPED_BAMBOO_BLOCK = "minecraft:stripped_bamboo_block";
+	public const STRIPPED_BIRCH_LOG = "minecraft:stripped_birch_log";
+	public const STRIPPED_BIRCH_WOOD = "minecraft:stripped_birch_wood";
+	public const STRIPPED_CHERRY_LOG = "minecraft:stripped_cherry_log";
+	public const STRIPPED_CHERRY_WOOD = "minecraft:stripped_cherry_wood";
+	public const STRIPPED_CRIMSON_HYPHAE = "minecraft:stripped_crimson_hyphae";
+	public const STRIPPED_CRIMSON_STEM = "minecraft:stripped_crimson_stem";
+	public const STRIPPED_DARK_OAK_LOG = "minecraft:stripped_dark_oak_log";
+	public const STRIPPED_DARK_OAK_WOOD = "minecraft:stripped_dark_oak_wood";
+	public const STRIPPED_JUNGLE_LOG = "minecraft:stripped_jungle_log";
+	public const STRIPPED_JUNGLE_WOOD = "minecraft:stripped_jungle_wood";
+	public const STRIPPED_MANGROVE_LOG = "minecraft:stripped_mangrove_log";
+	public const STRIPPED_MANGROVE_WOOD = "minecraft:stripped_mangrove_wood";
+	public const STRIPPED_OAK_LOG = "minecraft:stripped_oak_log";
+	public const STRIPPED_OAK_WOOD = "minecraft:stripped_oak_wood";
+	public const STRIPPED_SPRUCE_LOG = "minecraft:stripped_spruce_log";
+	public const STRIPPED_SPRUCE_WOOD = "minecraft:stripped_spruce_wood";
+	public const STRIPPED_WARPED_HYPHAE = "minecraft:stripped_warped_hyphae";
+	public const STRIPPED_WARPED_STEM = "minecraft:stripped_warped_stem";
+	public const STRUCTURE_BLOCK = "minecraft:structure_block";
+	public const STRUCTURE_VOID = "minecraft:structure_void";
+	public const SUNFLOWER = "minecraft:sunflower";
+	public const SUSPICIOUS_GRAVEL = "minecraft:suspicious_gravel";
+	public const SUSPICIOUS_SAND = "minecraft:suspicious_sand";
+	public const SWEET_BERRY_BUSH = "minecraft:sweet_berry_bush";
+	public const TALL_GRASS = "minecraft:tall_grass";
+	public const TARGET = "minecraft:target";
+	public const TINTED_GLASS = "minecraft:tinted_glass";
+	public const TNT = "minecraft:tnt";
+	public const TORCH = "minecraft:torch";
+	public const TORCHFLOWER = "minecraft:torchflower";
+	public const TORCHFLOWER_CROP = "minecraft:torchflower_crop";
+	public const TRAPDOOR = "minecraft:trapdoor";
+	public const TRAPPED_CHEST = "minecraft:trapped_chest";
+	public const TRIAL_SPAWNER = "minecraft:trial_spawner";
+	public const TRIP_WIRE = "minecraft:trip_wire";
+	public const TRIPWIRE_HOOK = "minecraft:tripwire_hook";
+	public const TUBE_CORAL = "minecraft:tube_coral";
+	public const TUBE_CORAL_BLOCK = "minecraft:tube_coral_block";
+	public const TUBE_CORAL_FAN = "minecraft:tube_coral_fan";
+	public const TUBE_CORAL_WALL_FAN = "minecraft:tube_coral_wall_fan";
+	public const TUFF = "minecraft:tuff";
+	public const TUFF_BRICK_DOUBLE_SLAB = "minecraft:tuff_brick_double_slab";
+	public const TUFF_BRICK_SLAB = "minecraft:tuff_brick_slab";
+	public const TUFF_BRICK_STAIRS = "minecraft:tuff_brick_stairs";
+	public const TUFF_BRICK_WALL = "minecraft:tuff_brick_wall";
+	public const TUFF_BRICKS = "minecraft:tuff_bricks";
+	public const TUFF_DOUBLE_SLAB = "minecraft:tuff_double_slab";
+	public const TUFF_SLAB = "minecraft:tuff_slab";
+	public const TUFF_STAIRS = "minecraft:tuff_stairs";
+	public const TUFF_WALL = "minecraft:tuff_wall";
+	public const TURTLE_EGG = "minecraft:turtle_egg";
+	public const TWISTING_VINES = "minecraft:twisting_vines";
+	public const UNDERWATER_TNT = "minecraft:underwater_tnt";
+	public const UNDERWATER_TORCH = "minecraft:underwater_torch";
+	public const UNDYED_SHULKER_BOX = "minecraft:undyed_shulker_box";
+	public const UNKNOWN = "minecraft:unknown";
+	public const UNLIT_REDSTONE_TORCH = "minecraft:unlit_redstone_torch";
+	public const UNPOWERED_COMPARATOR = "minecraft:unpowered_comparator";
+	public const UNPOWERED_REPEATER = "minecraft:unpowered_repeater";
+	public const VAULT = "minecraft:vault";
+	public const VERDANT_FROGLIGHT = "minecraft:verdant_froglight";
+	public const VINE = "minecraft:vine";
+	public const WALL_BANNER = "minecraft:wall_banner";
+	public const WALL_SIGN = "minecraft:wall_sign";
+	public const WARPED_BUTTON = "minecraft:warped_button";
+	public const WARPED_DOOR = "minecraft:warped_door";
+	public const WARPED_DOUBLE_SLAB = "minecraft:warped_double_slab";
+	public const WARPED_FENCE = "minecraft:warped_fence";
+	public const WARPED_FENCE_GATE = "minecraft:warped_fence_gate";
+	public const WARPED_FUNGUS = "minecraft:warped_fungus";
+	public const WARPED_HANGING_SIGN = "minecraft:warped_hanging_sign";
+	public const WARPED_HYPHAE = "minecraft:warped_hyphae";
+	public const WARPED_NYLIUM = "minecraft:warped_nylium";
+	public const WARPED_PLANKS = "minecraft:warped_planks";
+	public const WARPED_PRESSURE_PLATE = "minecraft:warped_pressure_plate";
+	public const WARPED_ROOTS = "minecraft:warped_roots";
+	public const WARPED_SLAB = "minecraft:warped_slab";
+	public const WARPED_STAIRS = "minecraft:warped_stairs";
+	public const WARPED_STANDING_SIGN = "minecraft:warped_standing_sign";
+	public const WARPED_STEM = "minecraft:warped_stem";
+	public const WARPED_TRAPDOOR = "minecraft:warped_trapdoor";
+	public const WARPED_WALL_SIGN = "minecraft:warped_wall_sign";
+	public const WARPED_WART_BLOCK = "minecraft:warped_wart_block";
+	public const WATER = "minecraft:water";
+	public const WATERLILY = "minecraft:waterlily";
+	public const WAXED_CHISELED_COPPER = "minecraft:waxed_chiseled_copper";
+	public const WAXED_COPPER = "minecraft:waxed_copper";
+	public const WAXED_COPPER_BULB = "minecraft:waxed_copper_bulb";
+	public const WAXED_COPPER_DOOR = "minecraft:waxed_copper_door";
+	public const WAXED_COPPER_GRATE = "minecraft:waxed_copper_grate";
+	public const WAXED_COPPER_TRAPDOOR = "minecraft:waxed_copper_trapdoor";
+	public const WAXED_CUT_COPPER = "minecraft:waxed_cut_copper";
+	public const WAXED_CUT_COPPER_SLAB = "minecraft:waxed_cut_copper_slab";
+	public const WAXED_CUT_COPPER_STAIRS = "minecraft:waxed_cut_copper_stairs";
+	public const WAXED_DOUBLE_CUT_COPPER_SLAB = "minecraft:waxed_double_cut_copper_slab";
+	public const WAXED_EXPOSED_CHISELED_COPPER = "minecraft:waxed_exposed_chiseled_copper";
+	public const WAXED_EXPOSED_COPPER = "minecraft:waxed_exposed_copper";
+	public const WAXED_EXPOSED_COPPER_BULB = "minecraft:waxed_exposed_copper_bulb";
+	public const WAXED_EXPOSED_COPPER_DOOR = "minecraft:waxed_exposed_copper_door";
+	public const WAXED_EXPOSED_COPPER_GRATE = "minecraft:waxed_exposed_copper_grate";
+	public const WAXED_EXPOSED_COPPER_TRAPDOOR = "minecraft:waxed_exposed_copper_trapdoor";
+	public const WAXED_EXPOSED_CUT_COPPER = "minecraft:waxed_exposed_cut_copper";
+	public const WAXED_EXPOSED_CUT_COPPER_SLAB = "minecraft:waxed_exposed_cut_copper_slab";
+	public const WAXED_EXPOSED_CUT_COPPER_STAIRS = "minecraft:waxed_exposed_cut_copper_stairs";
+	public const WAXED_EXPOSED_DOUBLE_CUT_COPPER_SLAB = "minecraft:waxed_exposed_double_cut_copper_slab";
+	public const WAXED_OXIDIZED_CHISELED_COPPER = "minecraft:waxed_oxidized_chiseled_copper";
+	public const WAXED_OXIDIZED_COPPER = "minecraft:waxed_oxidized_copper";
+	public const WAXED_OXIDIZED_COPPER_BULB = "minecraft:waxed_oxidized_copper_bulb";
+	public const WAXED_OXIDIZED_COPPER_DOOR = "minecraft:waxed_oxidized_copper_door";
+	public const WAXED_OXIDIZED_COPPER_GRATE = "minecraft:waxed_oxidized_copper_grate";
+	public const WAXED_OXIDIZED_COPPER_TRAPDOOR = "minecraft:waxed_oxidized_copper_trapdoor";
+	public const WAXED_OXIDIZED_CUT_COPPER = "minecraft:waxed_oxidized_cut_copper";
+	public const WAXED_OXIDIZED_CUT_COPPER_SLAB = "minecraft:waxed_oxidized_cut_copper_slab";
+	public const WAXED_OXIDIZED_CUT_COPPER_STAIRS = "minecraft:waxed_oxidized_cut_copper_stairs";
+	public const WAXED_OXIDIZED_DOUBLE_CUT_COPPER_SLAB = "minecraft:waxed_oxidized_double_cut_copper_slab";
+	public const WAXED_WEATHERED_CHISELED_COPPER = "minecraft:waxed_weathered_chiseled_copper";
+	public const WAXED_WEATHERED_COPPER = "minecraft:waxed_weathered_copper";
+	public const WAXED_WEATHERED_COPPER_BULB = "minecraft:waxed_weathered_copper_bulb";
+	public const WAXED_WEATHERED_COPPER_DOOR = "minecraft:waxed_weathered_copper_door";
+	public const WAXED_WEATHERED_COPPER_GRATE = "minecraft:waxed_weathered_copper_grate";
+	public const WAXED_WEATHERED_COPPER_TRAPDOOR = "minecraft:waxed_weathered_copper_trapdoor";
+	public const WAXED_WEATHERED_CUT_COPPER = "minecraft:waxed_weathered_cut_copper";
+	public const WAXED_WEATHERED_CUT_COPPER_SLAB = "minecraft:waxed_weathered_cut_copper_slab";
+	public const WAXED_WEATHERED_CUT_COPPER_STAIRS = "minecraft:waxed_weathered_cut_copper_stairs";
+	public const WAXED_WEATHERED_DOUBLE_CUT_COPPER_SLAB = "minecraft:waxed_weathered_double_cut_copper_slab";
+	public const WEATHERED_CHISELED_COPPER = "minecraft:weathered_chiseled_copper";
+	public const WEATHERED_COPPER = "minecraft:weathered_copper";
+	public const WEATHERED_COPPER_BULB = "minecraft:weathered_copper_bulb";
+	public const WEATHERED_COPPER_DOOR = "minecraft:weathered_copper_door";
+	public const WEATHERED_COPPER_GRATE = "minecraft:weathered_copper_grate";
+	public const WEATHERED_COPPER_TRAPDOOR = "minecraft:weathered_copper_trapdoor";
+	public const WEATHERED_CUT_COPPER = "minecraft:weathered_cut_copper";
+	public const WEATHERED_CUT_COPPER_SLAB = "minecraft:weathered_cut_copper_slab";
+	public const WEATHERED_CUT_COPPER_STAIRS = "minecraft:weathered_cut_copper_stairs";
+	public const WEATHERED_DOUBLE_CUT_COPPER_SLAB = "minecraft:weathered_double_cut_copper_slab";
+	public const WEB = "minecraft:web";
+	public const WEEPING_VINES = "minecraft:weeping_vines";
+	public const WET_SPONGE = "minecraft:wet_sponge";
+	public const WHEAT = "minecraft:wheat";
+	public const WHITE_CANDLE = "minecraft:white_candle";
+	public const WHITE_CANDLE_CAKE = "minecraft:white_candle_cake";
+	public const WHITE_CARPET = "minecraft:white_carpet";
+	public const WHITE_CONCRETE = "minecraft:white_concrete";
+	public const WHITE_CONCRETE_POWDER = "minecraft:white_concrete_powder";
+	public const WHITE_GLAZED_TERRACOTTA = "minecraft:white_glazed_terracotta";
+	public const WHITE_SHULKER_BOX = "minecraft:white_shulker_box";
+	public const WHITE_STAINED_GLASS = "minecraft:white_stained_glass";
+	public const WHITE_STAINED_GLASS_PANE = "minecraft:white_stained_glass_pane";
+	public const WHITE_TERRACOTTA = "minecraft:white_terracotta";
+	public const WHITE_TULIP = "minecraft:white_tulip";
+	public const WHITE_WOOL = "minecraft:white_wool";
+	public const WITHER_ROSE = "minecraft:wither_rose";
+	public const WITHER_SKELETON_SKULL = "minecraft:wither_skeleton_skull";
+	public const WOODEN_BUTTON = "minecraft:wooden_button";
+	public const WOODEN_DOOR = "minecraft:wooden_door";
+	public const WOODEN_PRESSURE_PLATE = "minecraft:wooden_pressure_plate";
+	public const YELLOW_CANDLE = "minecraft:yellow_candle";
+	public const YELLOW_CANDLE_CAKE = "minecraft:yellow_candle_cake";
+	public const YELLOW_CARPET = "minecraft:yellow_carpet";
+	public const YELLOW_CONCRETE = "minecraft:yellow_concrete";
+	public const YELLOW_CONCRETE_POWDER = "minecraft:yellow_concrete_powder";
+	public const YELLOW_GLAZED_TERRACOTTA = "minecraft:yellow_glazed_terracotta";
+	public const YELLOW_SHULKER_BOX = "minecraft:yellow_shulker_box";
+	public const YELLOW_STAINED_GLASS = "minecraft:yellow_stained_glass";
+	public const YELLOW_STAINED_GLASS_PANE = "minecraft:yellow_stained_glass_pane";
+	public const YELLOW_TERRACOTTA = "minecraft:yellow_terracotta";
+	public const YELLOW_WOOL = "minecraft:yellow_wool";
+	public const ZOMBIE_HEAD = "minecraft:zombie_head";
+}
diff --git a/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php b/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
new file mode 100644
index 0000000000..aebfd67ffa
--- /dev/null
+++ b/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
@@ -0,0 +1,1852 @@
+<?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\block\convert;
+
+use pocketmine\block\ActivatorRail;
+use pocketmine\block\AmethystCluster;
+use pocketmine\block\Anvil;
+use pocketmine\block\Bamboo;
+use pocketmine\block\BambooSapling;
+use pocketmine\block\Barrel;
+use pocketmine\block\Bed;
+use pocketmine\block\Beetroot;
+use pocketmine\block\Bell;
+use pocketmine\block\BigDripleafHead;
+use pocketmine\block\BigDripleafStem;
+use pocketmine\block\Block;
+use pocketmine\block\BoneBlock;
+use pocketmine\block\BrewingStand;
+use pocketmine\block\BrownMushroomBlock;
+use pocketmine\block\Button;
+use pocketmine\block\Cactus;
+use pocketmine\block\Cake;
+use pocketmine\block\CakeWithCandle;
+use pocketmine\block\CakeWithDyedCandle;
+use pocketmine\block\Campfire;
+use pocketmine\block\Candle;
+use pocketmine\block\Carpet;
+use pocketmine\block\Carrot;
+use pocketmine\block\CarvedPumpkin;
+use pocketmine\block\CaveVines;
+use pocketmine\block\Chain;
+use pocketmine\block\ChemistryTable;
+use pocketmine\block\Chest;
+use pocketmine\block\ChiseledBookshelf;
+use pocketmine\block\ChorusFlower;
+use pocketmine\block\CocoaBlock;
+use pocketmine\block\Concrete;
+use pocketmine\block\ConcretePowder;
+use pocketmine\block\Copper;
+use pocketmine\block\CopperBulb;
+use pocketmine\block\CopperDoor;
+use pocketmine\block\CopperGrate;
+use pocketmine\block\CopperSlab;
+use pocketmine\block\CopperStairs;
+use pocketmine\block\CopperTrapdoor;
+use pocketmine\block\Coral;
+use pocketmine\block\CoralBlock;
+use pocketmine\block\DaylightSensor;
+use pocketmine\block\DetectorRail;
+use pocketmine\block\Dirt;
+use pocketmine\block\Door;
+use pocketmine\block\DoublePitcherCrop;
+use pocketmine\block\DoublePlant;
+use pocketmine\block\DoubleTallGrass;
+use pocketmine\block\DyedCandle;
+use pocketmine\block\DyedShulkerBox;
+use pocketmine\block\EnderChest;
+use pocketmine\block\EndPortalFrame;
+use pocketmine\block\EndRod;
+use pocketmine\block\Farmland;
+use pocketmine\block\FenceGate;
+use pocketmine\block\FillableCauldron;
+use pocketmine\block\Fire;
+use pocketmine\block\FloorBanner;
+use pocketmine\block\FloorCoralFan;
+use pocketmine\block\FloorSign;
+use pocketmine\block\Froglight;
+use pocketmine\block\FrostedIce;
+use pocketmine\block\Furnace;
+use pocketmine\block\GlazedTerracotta;
+use pocketmine\block\GlowLichen;
+use pocketmine\block\HayBale;
+use pocketmine\block\Hopper;
+use pocketmine\block\ItemFrame;
+use pocketmine\block\Ladder;
+use pocketmine\block\Lantern;
+use pocketmine\block\Lava;
+use pocketmine\block\Leaves;
+use pocketmine\block\Lectern;
+use pocketmine\block\Lever;
+use pocketmine\block\Light;
+use pocketmine\block\LightningRod;
+use pocketmine\block\LitPumpkin;
+use pocketmine\block\Loom;
+use pocketmine\block\MelonStem;
+use pocketmine\block\MobHead;
+use pocketmine\block\NetherPortal;
+use pocketmine\block\NetherVines;
+use pocketmine\block\NetherWartPlant;
+use pocketmine\block\PinkPetals;
+use pocketmine\block\PitcherCrop;
+use pocketmine\block\Potato;
+use pocketmine\block\PoweredRail;
+use pocketmine\block\PumpkinStem;
+use pocketmine\block\Rail;
+use pocketmine\block\RedMushroomBlock;
+use pocketmine\block\RedstoneComparator;
+use pocketmine\block\RedstoneLamp;
+use pocketmine\block\RedstoneOre;
+use pocketmine\block\RedstoneRepeater;
+use pocketmine\block\RedstoneTorch;
+use pocketmine\block\RedstoneWire;
+use pocketmine\block\RuntimeBlockStateRegistry;
+use pocketmine\block\Sapling;
+use pocketmine\block\SeaPickle;
+use pocketmine\block\SimplePillar;
+use pocketmine\block\SimplePressurePlate;
+use pocketmine\block\Slab;
+use pocketmine\block\SmallDripleaf;
+use pocketmine\block\SnowLayer;
+use pocketmine\block\SoulCampfire;
+use pocketmine\block\Sponge;
+use pocketmine\block\StainedGlass;
+use pocketmine\block\StainedGlassPane;
+use pocketmine\block\StainedHardenedClay;
+use pocketmine\block\StainedHardenedGlass;
+use pocketmine\block\StainedHardenedGlassPane;
+use pocketmine\block\Stair;
+use pocketmine\block\StoneButton;
+use pocketmine\block\Stonecutter;
+use pocketmine\block\StonePressurePlate;
+use pocketmine\block\Sugarcane;
+use pocketmine\block\SweetBerryBush;
+use pocketmine\block\TNT;
+use pocketmine\block\Torch;
+use pocketmine\block\TorchflowerCrop;
+use pocketmine\block\Trapdoor;
+use pocketmine\block\TrappedChest;
+use pocketmine\block\Tripwire;
+use pocketmine\block\TripwireHook;
+use pocketmine\block\UnderwaterTorch;
+use pocketmine\block\utils\BrewingStandSlot;
+use pocketmine\block\utils\CoralType;
+use pocketmine\block\utils\DirtType;
+use pocketmine\block\utils\DripleafState;
+use pocketmine\block\utils\DyeColor;
+use pocketmine\block\utils\FroglightType;
+use pocketmine\block\utils\LeverFacing;
+use pocketmine\block\utils\MobHeadType;
+use pocketmine\block\VanillaBlocks as Blocks;
+use pocketmine\block\Vine;
+use pocketmine\block\Wall;
+use pocketmine\block\WallBanner;
+use pocketmine\block\WallCoralFan;
+use pocketmine\block\WallSign;
+use pocketmine\block\Water;
+use pocketmine\block\WeightedPressurePlateHeavy;
+use pocketmine\block\WeightedPressurePlateLight;
+use pocketmine\block\Wheat;
+use pocketmine\block\Wood;
+use pocketmine\block\WoodenButton;
+use pocketmine\block\WoodenDoor;
+use pocketmine\block\WoodenPressurePlate;
+use pocketmine\block\WoodenStairs;
+use pocketmine\block\WoodenTrapdoor;
+use pocketmine\block\Wool;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\data\bedrock\block\BlockStateNames as StateNames;
+use pocketmine\data\bedrock\block\BlockStateSerializeException;
+use pocketmine\data\bedrock\block\BlockStateSerializer;
+use pocketmine\data\bedrock\block\BlockStateStringValues as StringValues;
+use pocketmine\data\bedrock\block\BlockTypeNames as Ids;
+use pocketmine\data\bedrock\block\convert\BlockStateSerializerHelper as Helper;
+use pocketmine\data\bedrock\block\convert\BlockStateWriter as Writer;
+use pocketmine\math\Axis;
+use pocketmine\math\Facing;
+use function get_class;
+
+final class BlockObjectToStateSerializer implements BlockStateSerializer{
+	/**
+	 * These callables actually accept Block, but for the sake of type completeness, it has to be never, since we can't
+	 * describe the bottom type of a type hierarchy only containing Block.
+	 *
+	 * @var \Closure[]
+	 * @phpstan-var array<int, \Closure(never) : Writer>
+	 */
+	private array $serializers = [];
+
+	/**
+	 * @var BlockStateData[]
+	 * @phpstan-var array<int, BlockStateData>
+	 */
+	private array $cache = [];
+
+	public function __construct(){
+		$this->registerCandleSerializers();
+		$this->registerFlatColorBlockSerializers();
+		$this->registerFlatCoralSerializers();
+		$this->registerCauldronSerializers();
+		$this->registerFlatWoodBlockSerializers();
+		$this->registerLeavesSerializers();
+		$this->registerSaplingSerializers();
+		$this->registerMobHeadSerializers();
+		$this->registerSimpleSerializers();
+		$this->registerSerializers();
+	}
+
+	public function serialize(int $stateId) : BlockStateData{
+		//TODO: singleton usage not ideal
+		//TODO: we may want to deduplicate cache entries to avoid wasting memory
+		return $this->cache[$stateId] ??= $this->serializeBlock(RuntimeBlockStateRegistry::getInstance()->fromStateId($stateId));
+	}
+
+	/**
+	 * @phpstan-template TBlockType of Block
+	 * @phpstan-param TBlockType $block
+	 * @phpstan-param \Closure(TBlockType) : Writer $serializer
+	 */
+	public function map(Block $block, \Closure $serializer) : void{
+		if(isset($this->serializers[$block->getTypeId()])){
+			throw new \InvalidArgumentException("Block type ID " . $block->getTypeId() . " already has a serializer registered");
+		}
+		$this->serializers[$block->getTypeId()] = $serializer;
+	}
+
+	public function mapSimple(Block $block, string $id) : void{
+		$this->map($block, fn() => Writer::create($id));
+	}
+
+	public function mapSlab(Slab $block, string $singleId, string $doubleId) : void{
+		$this->map($block, fn(Slab $block) => Helper::encodeSlab($block, $singleId, $doubleId));
+	}
+
+	public function mapStairs(Stair $block, string $id) : void{
+		$this->map($block, fn(Stair $block) => Helper::encodeStairs($block, Writer::create($id)));
+	}
+
+	public function mapLog(Wood $block, string $unstrippedId, string $strippedId) : void{
+		$this->map($block, fn(Wood $block) => Helper::encodeLog($block, $unstrippedId, $strippedId));
+	}
+
+	/**
+	 * @phpstan-template TBlockType of Block
+	 * @phpstan-param TBlockType $blockState
+	 *
+	 * @throws BlockStateSerializeException
+	 */
+	public function serializeBlock(Block $blockState) : BlockStateData{
+		$typeId = $blockState->getTypeId();
+
+		$locatedSerializer = $this->serializers[$typeId] ?? null;
+		if($locatedSerializer === null){
+			throw new BlockStateSerializeException("No serializer registered for " . get_class($blockState) . " with type ID $typeId");
+		}
+
+		/**
+		 * TODO: there is no guarantee that this type actually matches that of $blockState - a plugin may have stolen
+		 * the type ID of the block (which never makes sense, even in a world where overriding block types is a thing).
+		 * In the future we'll need some way to guarantee that type IDs are never reused (perhaps spl_object_id()?)
+		 *
+		 * @var \Closure $serializer
+		 * @phpstan-var \Closure(TBlockType) : Writer $serializer
+		 */
+		$serializer = $locatedSerializer;
+
+		/** @var Writer $writer */
+		$writer = $serializer($blockState);
+		return $writer->getBlockStateData();
+	}
+
+	private function registerCandleSerializers() : void{
+		$this->map(Blocks::CANDLE(), fn(Candle $block) => Helper::encodeCandle($block, new Writer(Ids::CANDLE)));
+		$this->map(Blocks::DYED_CANDLE(), fn(DyedCandle $block) => Helper::encodeCandle($block, new Writer(match($block->getColor()){
+			DyeColor::BLACK => Ids::BLACK_CANDLE,
+			DyeColor::BLUE => Ids::BLUE_CANDLE,
+			DyeColor::BROWN => Ids::BROWN_CANDLE,
+			DyeColor::CYAN => Ids::CYAN_CANDLE,
+			DyeColor::GRAY => Ids::GRAY_CANDLE,
+			DyeColor::GREEN => Ids::GREEN_CANDLE,
+			DyeColor::LIGHT_BLUE => Ids::LIGHT_BLUE_CANDLE,
+			DyeColor::LIGHT_GRAY => Ids::LIGHT_GRAY_CANDLE,
+			DyeColor::LIME => Ids::LIME_CANDLE,
+			DyeColor::MAGENTA => Ids::MAGENTA_CANDLE,
+			DyeColor::ORANGE => Ids::ORANGE_CANDLE,
+			DyeColor::PINK => Ids::PINK_CANDLE,
+			DyeColor::PURPLE => Ids::PURPLE_CANDLE,
+			DyeColor::RED => Ids::RED_CANDLE,
+			DyeColor::WHITE => Ids::WHITE_CANDLE,
+			DyeColor::YELLOW => Ids::YELLOW_CANDLE,
+		})));
+		$this->map(Blocks::CAKE_WITH_CANDLE(), fn(CakeWithCandle $block) => Writer::create(Ids::CANDLE_CAKE)
+			->writeBool(StateNames::LIT, $block->isLit()));
+		$this->map(Blocks::CAKE_WITH_DYED_CANDLE(), fn(CakeWithDyedCandle $block) => Writer::create(match($block->getColor()){
+			DyeColor::BLACK => Ids::BLACK_CANDLE_CAKE,
+			DyeColor::BLUE => Ids::BLUE_CANDLE_CAKE,
+			DyeColor::BROWN => Ids::BROWN_CANDLE_CAKE,
+			DyeColor::CYAN => Ids::CYAN_CANDLE_CAKE,
+			DyeColor::GRAY => Ids::GRAY_CANDLE_CAKE,
+			DyeColor::GREEN => Ids::GREEN_CANDLE_CAKE,
+			DyeColor::LIGHT_BLUE => Ids::LIGHT_BLUE_CANDLE_CAKE,
+			DyeColor::LIGHT_GRAY => Ids::LIGHT_GRAY_CANDLE_CAKE,
+			DyeColor::LIME => Ids::LIME_CANDLE_CAKE,
+			DyeColor::MAGENTA => Ids::MAGENTA_CANDLE_CAKE,
+			DyeColor::ORANGE => Ids::ORANGE_CANDLE_CAKE,
+			DyeColor::PINK => Ids::PINK_CANDLE_CAKE,
+			DyeColor::PURPLE => Ids::PURPLE_CANDLE_CAKE,
+			DyeColor::RED => Ids::RED_CANDLE_CAKE,
+			DyeColor::WHITE => Ids::WHITE_CANDLE_CAKE,
+			DyeColor::YELLOW => Ids::YELLOW_CANDLE_CAKE,
+		})->writeBool(StateNames::LIT, $block->isLit()));
+	}
+
+	public function registerFlatColorBlockSerializers() : void{
+		$this->map(Blocks::STAINED_HARDENED_GLASS(), fn(StainedHardenedGlass $block) => Writer::create(match($block->getColor()){
+			DyeColor::BLACK => Ids::HARD_BLACK_STAINED_GLASS,
+			DyeColor::BLUE => Ids::HARD_BLUE_STAINED_GLASS,
+			DyeColor::BROWN => Ids::HARD_BROWN_STAINED_GLASS,
+			DyeColor::CYAN => Ids::HARD_CYAN_STAINED_GLASS,
+			DyeColor::GRAY => Ids::HARD_GRAY_STAINED_GLASS,
+			DyeColor::GREEN => Ids::HARD_GREEN_STAINED_GLASS,
+			DyeColor::LIGHT_BLUE => Ids::HARD_LIGHT_BLUE_STAINED_GLASS,
+			DyeColor::LIGHT_GRAY => Ids::HARD_LIGHT_GRAY_STAINED_GLASS,
+			DyeColor::LIME => Ids::HARD_LIME_STAINED_GLASS,
+			DyeColor::MAGENTA => Ids::HARD_MAGENTA_STAINED_GLASS,
+			DyeColor::ORANGE => Ids::HARD_ORANGE_STAINED_GLASS,
+			DyeColor::PINK => Ids::HARD_PINK_STAINED_GLASS,
+			DyeColor::PURPLE => Ids::HARD_PURPLE_STAINED_GLASS,
+			DyeColor::RED => Ids::HARD_RED_STAINED_GLASS,
+			DyeColor::WHITE => Ids::HARD_WHITE_STAINED_GLASS,
+			DyeColor::YELLOW => Ids::HARD_YELLOW_STAINED_GLASS,
+		}));
+
+		$this->map(Blocks::STAINED_HARDENED_GLASS_PANE(), fn(StainedHardenedGlassPane $block) => Writer::create(match($block->getColor()){
+			DyeColor::BLACK => Ids::HARD_BLACK_STAINED_GLASS_PANE,
+			DyeColor::BLUE => Ids::HARD_BLUE_STAINED_GLASS_PANE,
+			DyeColor::BROWN => Ids::HARD_BROWN_STAINED_GLASS_PANE,
+			DyeColor::CYAN => Ids::HARD_CYAN_STAINED_GLASS_PANE,
+			DyeColor::GRAY => Ids::HARD_GRAY_STAINED_GLASS_PANE,
+			DyeColor::GREEN => Ids::HARD_GREEN_STAINED_GLASS_PANE,
+			DyeColor::LIGHT_BLUE => Ids::HARD_LIGHT_BLUE_STAINED_GLASS_PANE,
+			DyeColor::LIGHT_GRAY => Ids::HARD_LIGHT_GRAY_STAINED_GLASS_PANE,
+			DyeColor::LIME => Ids::HARD_LIME_STAINED_GLASS_PANE,
+			DyeColor::MAGENTA => Ids::HARD_MAGENTA_STAINED_GLASS_PANE,
+			DyeColor::ORANGE => Ids::HARD_ORANGE_STAINED_GLASS_PANE,
+			DyeColor::PINK => Ids::HARD_PINK_STAINED_GLASS_PANE,
+			DyeColor::PURPLE => Ids::HARD_PURPLE_STAINED_GLASS_PANE,
+			DyeColor::RED => Ids::HARD_RED_STAINED_GLASS_PANE,
+			DyeColor::WHITE => Ids::HARD_WHITE_STAINED_GLASS_PANE,
+			DyeColor::YELLOW => Ids::HARD_YELLOW_STAINED_GLASS_PANE,
+		}));
+
+		$this->map(Blocks::GLAZED_TERRACOTTA(), function(GlazedTerracotta $block) : Writer{
+			return Writer::create(match($block->getColor()){
+				DyeColor::BLACK => Ids::BLACK_GLAZED_TERRACOTTA,
+				DyeColor::BLUE => Ids::BLUE_GLAZED_TERRACOTTA,
+				DyeColor::BROWN => Ids::BROWN_GLAZED_TERRACOTTA,
+				DyeColor::CYAN => Ids::CYAN_GLAZED_TERRACOTTA,
+				DyeColor::GRAY => Ids::GRAY_GLAZED_TERRACOTTA,
+				DyeColor::GREEN => Ids::GREEN_GLAZED_TERRACOTTA,
+				DyeColor::LIGHT_BLUE => Ids::LIGHT_BLUE_GLAZED_TERRACOTTA,
+				DyeColor::LIGHT_GRAY => Ids::SILVER_GLAZED_TERRACOTTA,
+				DyeColor::LIME => Ids::LIME_GLAZED_TERRACOTTA,
+				DyeColor::MAGENTA => Ids::MAGENTA_GLAZED_TERRACOTTA,
+				DyeColor::ORANGE => Ids::ORANGE_GLAZED_TERRACOTTA,
+				DyeColor::PINK => Ids::PINK_GLAZED_TERRACOTTA,
+				DyeColor::PURPLE => Ids::PURPLE_GLAZED_TERRACOTTA,
+				DyeColor::RED => Ids::RED_GLAZED_TERRACOTTA,
+				DyeColor::WHITE => Ids::WHITE_GLAZED_TERRACOTTA,
+				DyeColor::YELLOW => Ids::YELLOW_GLAZED_TERRACOTTA,
+			})
+				->writeHorizontalFacing($block->getFacing());
+		});
+
+		$this->map(Blocks::WOOL(), fn(Wool $block) => Writer::create(match($block->getColor()){
+			DyeColor::BLACK => Ids::BLACK_WOOL,
+			DyeColor::BLUE => Ids::BLUE_WOOL,
+			DyeColor::BROWN => Ids::BROWN_WOOL,
+			DyeColor::CYAN => Ids::CYAN_WOOL,
+			DyeColor::GRAY => Ids::GRAY_WOOL,
+			DyeColor::GREEN => Ids::GREEN_WOOL,
+			DyeColor::LIGHT_BLUE => Ids::LIGHT_BLUE_WOOL,
+			DyeColor::LIGHT_GRAY => Ids::LIGHT_GRAY_WOOL,
+			DyeColor::LIME => Ids::LIME_WOOL,
+			DyeColor::MAGENTA => Ids::MAGENTA_WOOL,
+			DyeColor::ORANGE => Ids::ORANGE_WOOL,
+			DyeColor::PINK => Ids::PINK_WOOL,
+			DyeColor::PURPLE => Ids::PURPLE_WOOL,
+			DyeColor::RED => Ids::RED_WOOL,
+			DyeColor::WHITE => Ids::WHITE_WOOL,
+			DyeColor::YELLOW => Ids::YELLOW_WOOL,
+		}));
+
+		$this->map(Blocks::CARPET(), fn(Carpet $block) => Writer::create(match($block->getColor()){
+			DyeColor::BLACK => Ids::BLACK_CARPET,
+			DyeColor::BLUE => Ids::BLUE_CARPET,
+			DyeColor::BROWN => Ids::BROWN_CARPET,
+			DyeColor::CYAN => Ids::CYAN_CARPET,
+			DyeColor::GRAY => Ids::GRAY_CARPET,
+			DyeColor::GREEN => Ids::GREEN_CARPET,
+			DyeColor::LIGHT_BLUE => Ids::LIGHT_BLUE_CARPET,
+			DyeColor::LIGHT_GRAY => Ids::LIGHT_GRAY_CARPET,
+			DyeColor::LIME => Ids::LIME_CARPET,
+			DyeColor::MAGENTA => Ids::MAGENTA_CARPET,
+			DyeColor::ORANGE => Ids::ORANGE_CARPET,
+			DyeColor::PINK => Ids::PINK_CARPET,
+			DyeColor::PURPLE => Ids::PURPLE_CARPET,
+			DyeColor::RED => Ids::RED_CARPET,
+			DyeColor::WHITE => Ids::WHITE_CARPET,
+			DyeColor::YELLOW => Ids::YELLOW_CARPET,
+		}));
+
+		$this->map(Blocks::DYED_SHULKER_BOX(), fn(DyedShulkerBox $block) => Writer::create(match($block->getColor()){
+			DyeColor::BLACK => Ids::BLACK_SHULKER_BOX,
+			DyeColor::BLUE => Ids::BLUE_SHULKER_BOX,
+			DyeColor::BROWN => Ids::BROWN_SHULKER_BOX,
+			DyeColor::CYAN => Ids::CYAN_SHULKER_BOX,
+			DyeColor::GRAY => Ids::GRAY_SHULKER_BOX,
+			DyeColor::GREEN => Ids::GREEN_SHULKER_BOX,
+			DyeColor::LIGHT_BLUE => Ids::LIGHT_BLUE_SHULKER_BOX,
+			DyeColor::LIGHT_GRAY => Ids::LIGHT_GRAY_SHULKER_BOX,
+			DyeColor::LIME => Ids::LIME_SHULKER_BOX,
+			DyeColor::MAGENTA => Ids::MAGENTA_SHULKER_BOX,
+			DyeColor::ORANGE => Ids::ORANGE_SHULKER_BOX,
+			DyeColor::PINK => Ids::PINK_SHULKER_BOX,
+			DyeColor::PURPLE => Ids::PURPLE_SHULKER_BOX,
+			DyeColor::RED => Ids::RED_SHULKER_BOX,
+			DyeColor::WHITE => Ids::WHITE_SHULKER_BOX,
+			DyeColor::YELLOW => Ids::YELLOW_SHULKER_BOX,
+		}));
+
+		$this->map(Blocks::CONCRETE(), fn(Concrete $block) => Writer::create(match($block->getColor()){
+			DyeColor::BLACK => Ids::BLACK_CONCRETE,
+			DyeColor::BLUE => Ids::BLUE_CONCRETE,
+			DyeColor::BROWN => Ids::BROWN_CONCRETE,
+			DyeColor::CYAN => Ids::CYAN_CONCRETE,
+			DyeColor::GRAY => Ids::GRAY_CONCRETE,
+			DyeColor::GREEN => Ids::GREEN_CONCRETE,
+			DyeColor::LIGHT_BLUE => Ids::LIGHT_BLUE_CONCRETE,
+			DyeColor::LIGHT_GRAY => Ids::LIGHT_GRAY_CONCRETE,
+			DyeColor::LIME => Ids::LIME_CONCRETE,
+			DyeColor::MAGENTA => Ids::MAGENTA_CONCRETE,
+			DyeColor::ORANGE => Ids::ORANGE_CONCRETE,
+			DyeColor::PINK => Ids::PINK_CONCRETE,
+			DyeColor::PURPLE => Ids::PURPLE_CONCRETE,
+			DyeColor::RED => Ids::RED_CONCRETE,
+			DyeColor::WHITE => Ids::WHITE_CONCRETE,
+			DyeColor::YELLOW => Ids::YELLOW_CONCRETE,
+		}));
+
+		$this->map(Blocks::CONCRETE_POWDER(), fn(ConcretePowder $block) => Writer::create(match($block->getColor()){
+			DyeColor::BLACK => Ids::BLACK_CONCRETE_POWDER,
+			DyeColor::BLUE => Ids::BLUE_CONCRETE_POWDER,
+			DyeColor::BROWN => Ids::BROWN_CONCRETE_POWDER,
+			DyeColor::CYAN => Ids::CYAN_CONCRETE_POWDER,
+			DyeColor::GRAY => Ids::GRAY_CONCRETE_POWDER,
+			DyeColor::GREEN => Ids::GREEN_CONCRETE_POWDER,
+			DyeColor::LIGHT_BLUE => Ids::LIGHT_BLUE_CONCRETE_POWDER,
+			DyeColor::LIGHT_GRAY => Ids::LIGHT_GRAY_CONCRETE_POWDER,
+			DyeColor::LIME => Ids::LIME_CONCRETE_POWDER,
+			DyeColor::MAGENTA => Ids::MAGENTA_CONCRETE_POWDER,
+			DyeColor::ORANGE => Ids::ORANGE_CONCRETE_POWDER,
+			DyeColor::PINK => Ids::PINK_CONCRETE_POWDER,
+			DyeColor::PURPLE => Ids::PURPLE_CONCRETE_POWDER,
+			DyeColor::RED => Ids::RED_CONCRETE_POWDER,
+			DyeColor::WHITE => Ids::WHITE_CONCRETE_POWDER,
+			DyeColor::YELLOW => Ids::YELLOW_CONCRETE_POWDER,
+		}));
+
+		$this->map(Blocks::STAINED_CLAY(), fn(StainedHardenedClay $block) => Writer::create(match($block->getColor()){
+			DyeColor::BLACK => Ids::BLACK_TERRACOTTA,
+			DyeColor::BLUE => Ids::BLUE_TERRACOTTA,
+			DyeColor::BROWN => Ids::BROWN_TERRACOTTA,
+			DyeColor::CYAN => Ids::CYAN_TERRACOTTA,
+			DyeColor::GRAY => Ids::GRAY_TERRACOTTA,
+			DyeColor::GREEN => Ids::GREEN_TERRACOTTA,
+			DyeColor::LIGHT_BLUE => Ids::LIGHT_BLUE_TERRACOTTA,
+			DyeColor::LIGHT_GRAY => Ids::LIGHT_GRAY_TERRACOTTA,
+			DyeColor::LIME => Ids::LIME_TERRACOTTA,
+			DyeColor::MAGENTA => Ids::MAGENTA_TERRACOTTA,
+			DyeColor::ORANGE => Ids::ORANGE_TERRACOTTA,
+			DyeColor::PINK => Ids::PINK_TERRACOTTA,
+			DyeColor::PURPLE => Ids::PURPLE_TERRACOTTA,
+			DyeColor::RED => Ids::RED_TERRACOTTA,
+			DyeColor::WHITE => Ids::WHITE_TERRACOTTA,
+			DyeColor::YELLOW => Ids::YELLOW_TERRACOTTA,
+		}));
+
+		$this->map(Blocks::STAINED_GLASS(), fn(StainedGlass $block) => Writer::create(match($block->getColor()){
+			DyeColor::BLACK => Ids::BLACK_STAINED_GLASS,
+			DyeColor::BLUE => Ids::BLUE_STAINED_GLASS,
+			DyeColor::BROWN => Ids::BROWN_STAINED_GLASS,
+			DyeColor::CYAN => Ids::CYAN_STAINED_GLASS,
+			DyeColor::GRAY => Ids::GRAY_STAINED_GLASS,
+			DyeColor::GREEN => Ids::GREEN_STAINED_GLASS,
+			DyeColor::LIGHT_BLUE => Ids::LIGHT_BLUE_STAINED_GLASS,
+			DyeColor::LIGHT_GRAY => Ids::LIGHT_GRAY_STAINED_GLASS,
+			DyeColor::LIME => Ids::LIME_STAINED_GLASS,
+			DyeColor::MAGENTA => Ids::MAGENTA_STAINED_GLASS,
+			DyeColor::ORANGE => Ids::ORANGE_STAINED_GLASS,
+			DyeColor::PINK => Ids::PINK_STAINED_GLASS,
+			DyeColor::PURPLE => Ids::PURPLE_STAINED_GLASS,
+			DyeColor::RED => Ids::RED_STAINED_GLASS,
+			DyeColor::WHITE => Ids::WHITE_STAINED_GLASS,
+			DyeColor::YELLOW => Ids::YELLOW_STAINED_GLASS,
+		}));
+
+		$this->map(Blocks::STAINED_GLASS_PANE(), fn(StainedGlassPane $block) => Writer::create(match($block->getColor()){
+			DyeColor::BLACK => Ids::BLACK_STAINED_GLASS_PANE,
+			DyeColor::BLUE => Ids::BLUE_STAINED_GLASS_PANE,
+			DyeColor::BROWN => Ids::BROWN_STAINED_GLASS_PANE,
+			DyeColor::CYAN => Ids::CYAN_STAINED_GLASS_PANE,
+			DyeColor::GRAY => Ids::GRAY_STAINED_GLASS_PANE,
+			DyeColor::GREEN => Ids::GREEN_STAINED_GLASS_PANE,
+			DyeColor::LIGHT_BLUE => Ids::LIGHT_BLUE_STAINED_GLASS_PANE,
+			DyeColor::LIGHT_GRAY => Ids::LIGHT_GRAY_STAINED_GLASS_PANE,
+			DyeColor::LIME => Ids::LIME_STAINED_GLASS_PANE,
+			DyeColor::MAGENTA => Ids::MAGENTA_STAINED_GLASS_PANE,
+			DyeColor::ORANGE => Ids::ORANGE_STAINED_GLASS_PANE,
+			DyeColor::PINK => Ids::PINK_STAINED_GLASS_PANE,
+			DyeColor::PURPLE => Ids::PURPLE_STAINED_GLASS_PANE,
+			DyeColor::RED => Ids::RED_STAINED_GLASS_PANE,
+			DyeColor::WHITE => Ids::WHITE_STAINED_GLASS_PANE,
+			DyeColor::YELLOW => Ids::YELLOW_STAINED_GLASS_PANE,
+		}));
+	}
+
+	private function registerFlatCoralSerializers() : void{
+		$this->map(Blocks::CORAL(), fn(Coral $block) => Writer::create(
+			match($block->getCoralType()){
+				CoralType::BRAIN => $block->isDead() ? Ids::DEAD_BRAIN_CORAL : Ids::BRAIN_CORAL,
+				CoralType::BUBBLE => $block->isDead() ? Ids::DEAD_BUBBLE_CORAL : Ids::BUBBLE_CORAL,
+				CoralType::FIRE => $block->isDead() ? Ids::DEAD_FIRE_CORAL : Ids::FIRE_CORAL,
+				CoralType::HORN => $block->isDead() ? Ids::DEAD_HORN_CORAL : Ids::HORN_CORAL,
+				CoralType::TUBE => $block->isDead() ? Ids::DEAD_TUBE_CORAL : Ids::TUBE_CORAL,
+			}
+		));
+
+		$this->map(Blocks::CORAL_FAN(), fn(FloorCoralFan $block) => Writer::create(
+			match($block->getCoralType()){
+				CoralType::BRAIN => $block->isDead() ? Ids::DEAD_BRAIN_CORAL_FAN : Ids::BRAIN_CORAL_FAN,
+				CoralType::BUBBLE => $block->isDead() ? Ids::DEAD_BUBBLE_CORAL_FAN : Ids::BUBBLE_CORAL_FAN,
+				CoralType::FIRE => $block->isDead() ? Ids::DEAD_FIRE_CORAL_FAN : Ids::FIRE_CORAL_FAN,
+				CoralType::HORN => $block->isDead() ? Ids::DEAD_HORN_CORAL_FAN : Ids::HORN_CORAL_FAN,
+				CoralType::TUBE => $block->isDead() ? Ids::DEAD_TUBE_CORAL_FAN : Ids::TUBE_CORAL_FAN,
+			})
+			->writeInt(StateNames::CORAL_FAN_DIRECTION, match($axis = $block->getAxis()){
+				Axis::X => 0,
+				Axis::Z => 1,
+				default => throw new BlockStateSerializeException("Invalid axis {$axis}"),
+			}));
+
+		$this->map(Blocks::CORAL_BLOCK(), fn(CoralBlock $block) => Writer::create(
+			match($block->getCoralType()){
+				CoralType::BRAIN => $block->isDead() ? Ids::DEAD_BRAIN_CORAL_BLOCK : Ids::BRAIN_CORAL_BLOCK,
+				CoralType::BUBBLE => $block->isDead() ? Ids::DEAD_BUBBLE_CORAL_BLOCK : Ids::BUBBLE_CORAL_BLOCK,
+				CoralType::FIRE => $block->isDead() ? Ids::DEAD_FIRE_CORAL_BLOCK : Ids::FIRE_CORAL_BLOCK,
+				CoralType::HORN => $block->isDead() ? Ids::DEAD_HORN_CORAL_BLOCK : Ids::HORN_CORAL_BLOCK,
+				CoralType::TUBE => $block->isDead() ? Ids::DEAD_TUBE_CORAL_BLOCK : Ids::TUBE_CORAL_BLOCK,
+			}
+		));
+
+		$this->map(Blocks::WALL_CORAL_FAN(), fn(WallCoralFan $block) => Writer::create(
+			match($block->getCoralType()){
+				CoralType::TUBE => $block->isDead() ? Ids::DEAD_TUBE_CORAL_WALL_FAN : Ids::TUBE_CORAL_WALL_FAN,
+				CoralType::BRAIN => $block->isDead() ? Ids::DEAD_BRAIN_CORAL_WALL_FAN : Ids::BRAIN_CORAL_WALL_FAN,
+				CoralType::BUBBLE => $block->isDead() ? Ids::DEAD_BUBBLE_CORAL_WALL_FAN : Ids::BUBBLE_CORAL_WALL_FAN,
+				CoralType::FIRE => $block->isDead() ? Ids::DEAD_FIRE_CORAL_WALL_FAN : Ids::FIRE_CORAL_WALL_FAN,
+				CoralType::HORN => $block->isDead() ? Ids::DEAD_HORN_CORAL_WALL_FAN : Ids::HORN_CORAL_WALL_FAN,
+			})
+			->writeCoralFacing($block->getFacing())
+		);
+	}
+
+	private function registerCauldronSerializers() : void{
+		$this->map(Blocks::CAULDRON(), fn() => Helper::encodeCauldron(StringValues::CAULDRON_LIQUID_WATER, 0));
+		$this->map(Blocks::LAVA_CAULDRON(), fn(FillableCauldron $b) => Helper::encodeCauldron(StringValues::CAULDRON_LIQUID_LAVA, $b->getFillLevel()));
+		//potion cauldrons store their real information in the block actor data
+		$this->map(Blocks::POTION_CAULDRON(), fn(FillableCauldron $b) => Helper::encodeCauldron(StringValues::CAULDRON_LIQUID_WATER, $b->getFillLevel()));
+		$this->map(Blocks::WATER_CAULDRON(), fn(FillableCauldron $b) => Helper::encodeCauldron(StringValues::CAULDRON_LIQUID_WATER, $b->getFillLevel()));
+	}
+
+	private function registerFlatWoodBlockSerializers() : void{
+		$this->map(Blocks::ACACIA_BUTTON(), fn(WoodenButton $block) => Helper::encodeButton($block, new Writer(Ids::ACACIA_BUTTON)));
+		$this->map(Blocks::ACACIA_DOOR(), fn(WoodenDoor $block) => Helper::encodeDoor($block, new Writer(Ids::ACACIA_DOOR)));
+		$this->map(Blocks::ACACIA_FENCE_GATE(), fn(FenceGate $block) => Helper::encodeFenceGate($block, new Writer(Ids::ACACIA_FENCE_GATE)));
+		$this->map(Blocks::ACACIA_PRESSURE_PLATE(), fn(WoodenPressurePlate $block) => Helper::encodeSimplePressurePlate($block, new Writer(Ids::ACACIA_PRESSURE_PLATE)));
+		$this->map(Blocks::ACACIA_SIGN(), fn(FloorSign $block) => Helper::encodeFloorSign($block, new Writer(Ids::ACACIA_STANDING_SIGN)));
+		$this->map(Blocks::ACACIA_STAIRS(), fn(WoodenStairs $block) => Helper::encodeStairs($block, new Writer(Ids::ACACIA_STAIRS)));
+		$this->map(Blocks::ACACIA_TRAPDOOR(), fn(WoodenTrapdoor $block) => Helper::encodeTrapdoor($block, new Writer(Ids::ACACIA_TRAPDOOR)));
+		$this->map(Blocks::ACACIA_WALL_SIGN(), fn(WallSign $block) => Helper::encodeWallSign($block, new Writer(Ids::ACACIA_WALL_SIGN)));
+		$this->mapLog(Blocks::ACACIA_LOG(), Ids::ACACIA_LOG, Ids::STRIPPED_ACACIA_LOG);
+		$this->mapLog(Blocks::ACACIA_WOOD(), Ids::ACACIA_WOOD, Ids::STRIPPED_ACACIA_WOOD);
+		$this->mapSimple(Blocks::ACACIA_FENCE(), Ids::ACACIA_FENCE);
+		$this->mapSimple(Blocks::ACACIA_PLANKS(), Ids::ACACIA_PLANKS);
+		$this->mapSlab(Blocks::ACACIA_SLAB(), Ids::ACACIA_SLAB, Ids::ACACIA_DOUBLE_SLAB);
+
+		$this->map(Blocks::BIRCH_BUTTON(), fn(WoodenButton $block) => Helper::encodeButton($block, new Writer(Ids::BIRCH_BUTTON)));
+		$this->map(Blocks::BIRCH_DOOR(), fn(WoodenDoor $block) => Helper::encodeDoor($block, new Writer(Ids::BIRCH_DOOR)));
+		$this->map(Blocks::BIRCH_FENCE_GATE(), fn(FenceGate $block) => Helper::encodeFenceGate($block, new Writer(Ids::BIRCH_FENCE_GATE)));
+		$this->map(Blocks::BIRCH_PRESSURE_PLATE(), fn(WoodenPressurePlate $block) => Helper::encodeSimplePressurePlate($block, new Writer(Ids::BIRCH_PRESSURE_PLATE)));
+		$this->map(Blocks::BIRCH_SIGN(), fn(FloorSign $block) => Helper::encodeFloorSign($block, new Writer(Ids::BIRCH_STANDING_SIGN)));
+		$this->map(Blocks::BIRCH_TRAPDOOR(), fn(WoodenTrapdoor $block) => Helper::encodeTrapdoor($block, new Writer(Ids::BIRCH_TRAPDOOR)));
+		$this->map(Blocks::BIRCH_WALL_SIGN(), fn(WallSign $block) => Helper::encodeWallSign($block, new Writer(Ids::BIRCH_WALL_SIGN)));
+		$this->mapLog(Blocks::BIRCH_LOG(), Ids::BIRCH_LOG, Ids::STRIPPED_BIRCH_LOG);
+		$this->mapLog(Blocks::BIRCH_WOOD(), Ids::BIRCH_WOOD, Ids::STRIPPED_BIRCH_WOOD);
+		$this->mapSimple(Blocks::BIRCH_FENCE(), Ids::BIRCH_FENCE);
+		$this->mapSimple(Blocks::BIRCH_PLANKS(), Ids::BIRCH_PLANKS);
+		$this->mapSlab(Blocks::BIRCH_SLAB(), Ids::BIRCH_SLAB, Ids::BIRCH_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::BIRCH_STAIRS(), Ids::BIRCH_STAIRS);
+
+		$this->map(Blocks::CHERRY_BUTTON(), fn(Button $block) => Helper::encodeButton($block, new Writer(Ids::CHERRY_BUTTON)));
+		$this->map(Blocks::CHERRY_DOOR(), fn(Door $block) => Helper::encodeDoor($block, new Writer(Ids::CHERRY_DOOR)));
+		$this->map(Blocks::CHERRY_FENCE_GATE(), fn(FenceGate $block) => Helper::encodeFenceGate($block, new Writer(Ids::CHERRY_FENCE_GATE)));
+		$this->map(Blocks::CHERRY_LOG(), fn(Wood $block) => Helper::encodeLog($block, Ids::CHERRY_LOG, Ids::STRIPPED_CHERRY_LOG));
+		$this->map(Blocks::CHERRY_PRESSURE_PLATE(), fn(SimplePressurePlate $block) => Helper::encodeSimplePressurePlate($block, new Writer(Ids::CHERRY_PRESSURE_PLATE)));
+		$this->map(Blocks::CHERRY_SIGN(), fn(FloorSign $block) => Helper::encodeFloorSign($block, new Writer(Ids::CHERRY_STANDING_SIGN)));
+		$this->map(Blocks::CHERRY_TRAPDOOR(), fn(Trapdoor $block) => Helper::encodeTrapdoor($block, new Writer(Ids::CHERRY_TRAPDOOR)));
+		$this->map(Blocks::CHERRY_WALL_SIGN(), fn(WallSign $block) => Helper::encodeWallSign($block, new Writer(Ids::CHERRY_WALL_SIGN)));
+		$this->mapSimple(Blocks::CHERRY_FENCE(), Ids::CHERRY_FENCE);
+		$this->mapSimple(Blocks::CHERRY_PLANKS(), Ids::CHERRY_PLANKS);
+		$this->mapSlab(Blocks::CHERRY_SLAB(), Ids::CHERRY_SLAB, Ids::CHERRY_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::CHERRY_STAIRS(), Ids::CHERRY_STAIRS);
+		$this->mapLog(Blocks::CHERRY_WOOD(), Ids::CHERRY_WOOD, Ids::STRIPPED_CHERRY_WOOD);
+
+		$this->map(Blocks::CRIMSON_BUTTON(), fn(Button $block) => Helper::encodeButton($block, new Writer(Ids::CRIMSON_BUTTON)));
+		$this->map(Blocks::CRIMSON_DOOR(), fn(Door $block) => Helper::encodeDoor($block, new Writer(Ids::CRIMSON_DOOR)));
+		$this->map(Blocks::CRIMSON_FENCE_GATE(), fn(FenceGate $block) => Helper::encodeFenceGate($block, new Writer(Ids::CRIMSON_FENCE_GATE)));
+		$this->map(Blocks::CRIMSON_HYPHAE(), fn(Wood $block) => Helper::encodeLog($block, Ids::CRIMSON_HYPHAE, Ids::STRIPPED_CRIMSON_HYPHAE));
+		$this->map(Blocks::CRIMSON_PRESSURE_PLATE(), fn(SimplePressurePlate $block) => Helper::encodeSimplePressurePlate($block, new Writer(Ids::CRIMSON_PRESSURE_PLATE)));
+		$this->map(Blocks::CRIMSON_SIGN(), fn(FloorSign $block) => Helper::encodeFloorSign($block, new Writer(Ids::CRIMSON_STANDING_SIGN)));
+		$this->map(Blocks::CRIMSON_STEM(), fn(Wood $block) => Helper::encodeLog($block, Ids::CRIMSON_STEM, Ids::STRIPPED_CRIMSON_STEM));
+		$this->map(Blocks::CRIMSON_TRAPDOOR(), fn(Trapdoor $block) => Helper::encodeTrapdoor($block, new Writer(Ids::CRIMSON_TRAPDOOR)));
+		$this->map(Blocks::CRIMSON_WALL_SIGN(), fn(WallSign $block) => Helper::encodeWallSign($block, new Writer(Ids::CRIMSON_WALL_SIGN)));
+		$this->mapSimple(Blocks::CRIMSON_FENCE(), Ids::CRIMSON_FENCE);
+		$this->mapSimple(Blocks::CRIMSON_PLANKS(), Ids::CRIMSON_PLANKS);
+		$this->mapSlab(Blocks::CRIMSON_SLAB(), Ids::CRIMSON_SLAB, Ids::CRIMSON_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::CRIMSON_STAIRS(), Ids::CRIMSON_STAIRS);
+
+		$this->map(Blocks::DARK_OAK_BUTTON(), fn(WoodenButton $block) => Helper::encodeButton($block, new Writer(Ids::DARK_OAK_BUTTON)));
+		$this->map(Blocks::DARK_OAK_DOOR(), fn(WoodenDoor $block) => Helper::encodeDoor($block, new Writer(Ids::DARK_OAK_DOOR)));
+		$this->map(Blocks::DARK_OAK_FENCE_GATE(), fn(FenceGate $block) => Helper::encodeFenceGate($block, new Writer(Ids::DARK_OAK_FENCE_GATE)));
+		$this->map(Blocks::DARK_OAK_PRESSURE_PLATE(), fn(WoodenPressurePlate $block) => Helper::encodeSimplePressurePlate($block, new Writer(Ids::DARK_OAK_PRESSURE_PLATE)));
+		$this->map(Blocks::DARK_OAK_SIGN(), fn(FloorSign $block) => Helper::encodeFloorSign($block, new Writer(Ids::DARKOAK_STANDING_SIGN)));
+		$this->map(Blocks::DARK_OAK_TRAPDOOR(), fn(WoodenTrapdoor $block) => Helper::encodeTrapdoor($block, new Writer(Ids::DARK_OAK_TRAPDOOR)));
+		$this->map(Blocks::DARK_OAK_WALL_SIGN(), fn(WallSign $block) => Helper::encodeWallSign($block, new Writer(Ids::DARKOAK_WALL_SIGN)));
+		$this->mapLog(Blocks::DARK_OAK_LOG(), Ids::DARK_OAK_LOG, Ids::STRIPPED_DARK_OAK_LOG);
+		$this->mapLog(Blocks::DARK_OAK_WOOD(), Ids::DARK_OAK_WOOD, Ids::STRIPPED_DARK_OAK_WOOD);
+		$this->mapSimple(Blocks::DARK_OAK_FENCE(), Ids::DARK_OAK_FENCE);
+		$this->mapSimple(Blocks::DARK_OAK_PLANKS(), Ids::DARK_OAK_PLANKS);
+		$this->mapSlab(Blocks::DARK_OAK_SLAB(), Ids::DARK_OAK_SLAB, Ids::DARK_OAK_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::DARK_OAK_STAIRS(), Ids::DARK_OAK_STAIRS);
+
+		$this->map(Blocks::JUNGLE_BUTTON(), fn(WoodenButton $block) => Helper::encodeButton($block, new Writer(Ids::JUNGLE_BUTTON)));
+		$this->map(Blocks::JUNGLE_DOOR(), fn(WoodenDoor $block) => Helper::encodeDoor($block, new Writer(Ids::JUNGLE_DOOR)));
+		$this->map(Blocks::JUNGLE_FENCE_GATE(), fn(FenceGate $block) => Helper::encodeFenceGate($block, new Writer(Ids::JUNGLE_FENCE_GATE)));
+		$this->map(Blocks::JUNGLE_PRESSURE_PLATE(), fn(WoodenPressurePlate $block) => Helper::encodeSimplePressurePlate($block, new Writer(Ids::JUNGLE_PRESSURE_PLATE)));
+		$this->map(Blocks::JUNGLE_SIGN(), fn(FloorSign $block) => Helper::encodeFloorSign($block, new Writer(Ids::JUNGLE_STANDING_SIGN)));
+		$this->map(Blocks::JUNGLE_TRAPDOOR(), fn(WoodenTrapdoor $block) => Helper::encodeTrapdoor($block, new Writer(Ids::JUNGLE_TRAPDOOR)));
+		$this->map(Blocks::JUNGLE_WALL_SIGN(), fn(WallSign $block) => Helper::encodeWallSign($block, new Writer(Ids::JUNGLE_WALL_SIGN)));
+		$this->mapLog(Blocks::JUNGLE_LOG(), Ids::JUNGLE_LOG, Ids::STRIPPED_JUNGLE_LOG);
+		$this->mapLog(Blocks::JUNGLE_WOOD(), Ids::JUNGLE_WOOD, Ids::STRIPPED_JUNGLE_WOOD);
+		$this->mapSimple(Blocks::JUNGLE_FENCE(), Ids::JUNGLE_FENCE);
+		$this->mapSimple(Blocks::JUNGLE_PLANKS(), Ids::JUNGLE_PLANKS);
+		$this->mapSlab(Blocks::JUNGLE_SLAB(), Ids::JUNGLE_SLAB, Ids::JUNGLE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::JUNGLE_STAIRS(), Ids::JUNGLE_STAIRS);
+
+		$this->map(Blocks::MANGROVE_BUTTON(), fn(Button $block) => Helper::encodeButton($block, new Writer(Ids::MANGROVE_BUTTON)));
+		$this->map(Blocks::MANGROVE_DOOR(), fn(Door $block) => Helper::encodeDoor($block, new Writer(Ids::MANGROVE_DOOR)));
+		$this->map(Blocks::MANGROVE_FENCE_GATE(), fn(FenceGate $block) => Helper::encodeFenceGate($block, new Writer(Ids::MANGROVE_FENCE_GATE)));
+		$this->map(Blocks::MANGROVE_LOG(), fn(Wood $block) => Helper::encodeLog($block, Ids::MANGROVE_LOG, Ids::STRIPPED_MANGROVE_LOG));
+		$this->map(Blocks::MANGROVE_PRESSURE_PLATE(), fn(SimplePressurePlate $block) => Helper::encodeSimplePressurePlate($block, new Writer(Ids::MANGROVE_PRESSURE_PLATE)));
+		$this->map(Blocks::MANGROVE_SIGN(), fn(FloorSign $block) => Helper::encodeFloorSign($block, new Writer(Ids::MANGROVE_STANDING_SIGN)));
+		$this->map(Blocks::MANGROVE_TRAPDOOR(), fn(Trapdoor $block) => Helper::encodeTrapdoor($block, new Writer(Ids::MANGROVE_TRAPDOOR)));
+		$this->map(Blocks::MANGROVE_WALL_SIGN(), fn(WallSign $block) => Helper::encodeWallSign($block, new Writer(Ids::MANGROVE_WALL_SIGN)));
+		$this->mapSimple(Blocks::MANGROVE_FENCE(), Ids::MANGROVE_FENCE);
+		$this->mapSimple(Blocks::MANGROVE_PLANKS(), Ids::MANGROVE_PLANKS);
+		$this->mapSlab(Blocks::MANGROVE_SLAB(), Ids::MANGROVE_SLAB, Ids::MANGROVE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::MANGROVE_STAIRS(), Ids::MANGROVE_STAIRS);
+		$this->mapLog(Blocks::MANGROVE_WOOD(), Ids::MANGROVE_WOOD, Ids::STRIPPED_MANGROVE_WOOD);
+
+		$this->map(Blocks::OAK_BUTTON(), fn(WoodenButton $block) => Helper::encodeButton($block, new Writer(Ids::WOODEN_BUTTON)));
+		$this->map(Blocks::OAK_DOOR(), fn(WoodenDoor $block) => Helper::encodeDoor($block, new Writer(Ids::WOODEN_DOOR)));
+		$this->map(Blocks::OAK_FENCE_GATE(), fn(FenceGate $block) => Helper::encodeFenceGate($block, new Writer(Ids::FENCE_GATE)));
+		$this->map(Blocks::OAK_PRESSURE_PLATE(), fn(WoodenPressurePlate $block) => Helper::encodeSimplePressurePlate($block, new Writer(Ids::WOODEN_PRESSURE_PLATE)));
+		$this->map(Blocks::OAK_SIGN(), fn(FloorSign $block) => Helper::encodeFloorSign($block, new Writer(Ids::STANDING_SIGN)));
+		$this->map(Blocks::OAK_TRAPDOOR(), fn(WoodenTrapdoor $block) => Helper::encodeTrapdoor($block, new Writer(Ids::TRAPDOOR)));
+		$this->map(Blocks::OAK_WALL_SIGN(), fn(WallSign $block) => Helper::encodeWallSign($block, new Writer(Ids::WALL_SIGN)));
+		$this->mapLog(Blocks::OAK_LOG(), Ids::OAK_LOG, Ids::STRIPPED_OAK_LOG);
+		$this->mapLog(Blocks::OAK_WOOD(), Ids::OAK_WOOD, Ids::STRIPPED_OAK_WOOD);
+		$this->mapSimple(Blocks::OAK_FENCE(), Ids::OAK_FENCE);
+		$this->mapSimple(Blocks::OAK_PLANKS(), Ids::OAK_PLANKS);
+		$this->mapSlab(Blocks::OAK_SLAB(), Ids::OAK_SLAB, Ids::OAK_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::OAK_STAIRS(), Ids::OAK_STAIRS);
+
+		$this->map(Blocks::SPRUCE_BUTTON(), fn(WoodenButton $block) => Helper::encodeButton($block, new Writer(Ids::SPRUCE_BUTTON)));
+		$this->map(Blocks::SPRUCE_DOOR(), fn(WoodenDoor $block) => Helper::encodeDoor($block, new Writer(Ids::SPRUCE_DOOR)));
+		$this->map(Blocks::SPRUCE_FENCE_GATE(), fn(FenceGate $block) => Helper::encodeFenceGate($block, new Writer(Ids::SPRUCE_FENCE_GATE)));
+		$this->map(Blocks::SPRUCE_PRESSURE_PLATE(), fn(WoodenPressurePlate $block) => Helper::encodeSimplePressurePlate($block, new Writer(Ids::SPRUCE_PRESSURE_PLATE)));
+		$this->map(Blocks::SPRUCE_SIGN(), fn(FloorSign $block) => Helper::encodeFloorSign($block, new Writer(Ids::SPRUCE_STANDING_SIGN)));
+		$this->map(Blocks::SPRUCE_TRAPDOOR(), fn(WoodenTrapdoor $block) => Helper::encodeTrapdoor($block, new Writer(Ids::SPRUCE_TRAPDOOR)));
+		$this->map(Blocks::SPRUCE_WALL_SIGN(), fn(WallSign $block) => Helper::encodeWallSign($block, new Writer(Ids::SPRUCE_WALL_SIGN)));
+		$this->mapLog(Blocks::SPRUCE_LOG(), Ids::SPRUCE_LOG, Ids::STRIPPED_SPRUCE_LOG);
+		$this->mapLog(Blocks::SPRUCE_WOOD(), Ids::SPRUCE_WOOD, Ids::STRIPPED_SPRUCE_WOOD);
+		$this->mapSimple(Blocks::SPRUCE_FENCE(), Ids::SPRUCE_FENCE);
+		$this->mapSimple(Blocks::SPRUCE_PLANKS(), Ids::SPRUCE_PLANKS);
+		$this->mapSlab(Blocks::SPRUCE_SLAB(), Ids::SPRUCE_SLAB, Ids::SPRUCE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::SPRUCE_STAIRS(), Ids::SPRUCE_STAIRS);
+		//wood and slabs still use the old way of storing wood type
+
+		$this->map(Blocks::WARPED_BUTTON(), fn(Button $block) => Helper::encodeButton($block, new Writer(Ids::WARPED_BUTTON)));
+		$this->map(Blocks::WARPED_DOOR(), fn(Door $block) => Helper::encodeDoor($block, new Writer(Ids::WARPED_DOOR)));
+		$this->map(Blocks::WARPED_FENCE_GATE(), fn(FenceGate $block) => Helper::encodeFenceGate($block, new Writer(Ids::WARPED_FENCE_GATE)));
+		$this->map(Blocks::WARPED_HYPHAE(), fn(Wood $block) => Helper::encodeLog($block, Ids::WARPED_HYPHAE, Ids::STRIPPED_WARPED_HYPHAE));
+		$this->map(Blocks::WARPED_PRESSURE_PLATE(), fn(SimplePressurePlate $block) => Helper::encodeSimplePressurePlate($block, new Writer(Ids::WARPED_PRESSURE_PLATE)));
+		$this->map(Blocks::WARPED_SIGN(), fn(FloorSign $block) => Helper::encodeFloorSign($block, new Writer(Ids::WARPED_STANDING_SIGN)));
+		$this->map(Blocks::WARPED_STEM(), fn(Wood $block) => Helper::encodeLog($block, Ids::WARPED_STEM, Ids::STRIPPED_WARPED_STEM));
+		$this->map(Blocks::WARPED_TRAPDOOR(), fn(Trapdoor $block) => Helper::encodeTrapdoor($block, new Writer(Ids::WARPED_TRAPDOOR)));
+		$this->map(Blocks::WARPED_WALL_SIGN(), fn(WallSign $block) => Helper::encodeWallSign($block, new Writer(Ids::WARPED_WALL_SIGN)));
+		$this->mapSimple(Blocks::WARPED_FENCE(), Ids::WARPED_FENCE);
+		$this->mapSimple(Blocks::WARPED_PLANKS(), Ids::WARPED_PLANKS);
+		$this->mapSlab(Blocks::WARPED_SLAB(), Ids::WARPED_SLAB, Ids::WARPED_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::WARPED_STAIRS(), Ids::WARPED_STAIRS);
+	}
+
+	private function registerLeavesSerializers() : void{
+		//flattened IDs
+		$this->map(Blocks::AZALEA_LEAVES(), fn(Leaves $block) => Helper::encodeLeaves($block, new Writer(Ids::AZALEA_LEAVES)));
+		$this->map(Blocks::CHERRY_LEAVES(), fn(Leaves $block) => Helper::encodeLeaves($block, new Writer(Ids::CHERRY_LEAVES)));
+		$this->map(Blocks::FLOWERING_AZALEA_LEAVES(), fn(Leaves $block) => Helper::encodeLeaves($block, new Writer(Ids::AZALEA_LEAVES_FLOWERED)));
+		$this->map(Blocks::MANGROVE_LEAVES(), fn(Leaves $block) => Helper::encodeLeaves($block, new Writer(Ids::MANGROVE_LEAVES)));
+
+		//legacy mess
+		$this->map(Blocks::ACACIA_LEAVES(), fn(Leaves $block) => Helper::encodeLeaves($block, new Writer(Ids::ACACIA_LEAVES)));
+		$this->map(Blocks::BIRCH_LEAVES(), fn(Leaves $block) => Helper::encodeLeaves($block, new Writer(Ids::BIRCH_LEAVES)));
+		$this->map(Blocks::DARK_OAK_LEAVES(), fn(Leaves $block) => Helper::encodeLeaves($block, new Writer(Ids::DARK_OAK_LEAVES)));
+		$this->map(Blocks::JUNGLE_LEAVES(), fn(Leaves $block) => Helper::encodeLeaves($block, new Writer(Ids::JUNGLE_LEAVES)));
+		$this->map(Blocks::OAK_LEAVES(), fn(Leaves $block) => Helper::encodeLeaves($block, new Writer(Ids::OAK_LEAVES)));
+		$this->map(Blocks::SPRUCE_LEAVES(), fn(Leaves $block) => Helper::encodeLeaves($block, new Writer(Ids::SPRUCE_LEAVES)));
+	}
+
+	private function registerSaplingSerializers() : void{
+		foreach([
+			Ids::ACACIA_SAPLING => Blocks::ACACIA_SAPLING(),
+			Ids::BIRCH_SAPLING => Blocks::BIRCH_SAPLING(),
+			Ids::DARK_OAK_SAPLING => Blocks::DARK_OAK_SAPLING(),
+			Ids::JUNGLE_SAPLING => Blocks::JUNGLE_SAPLING(),
+			Ids::OAK_SAPLING => Blocks::OAK_SAPLING(),
+			Ids::SPRUCE_SAPLING => Blocks::SPRUCE_SAPLING(),
+		] as $id => $block){
+			$this->map($block, fn(Sapling $block) => Helper::encodeSapling($block, new Writer($id)));
+		}
+	}
+
+	private function registerMobHeadSerializers() : void{
+		$this->map(Blocks::MOB_HEAD(), fn(MobHead $block) => Writer::create(match ($block->getMobHeadType()){
+			MobHeadType::CREEPER => Ids::CREEPER_HEAD,
+			MobHeadType::DRAGON => Ids::DRAGON_HEAD,
+			MobHeadType::PIGLIN => Ids::PIGLIN_HEAD,
+			MobHeadType::PLAYER => Ids::PLAYER_HEAD,
+			MobHeadType::SKELETON => Ids::SKELETON_SKULL,
+			MobHeadType::WITHER_SKELETON => Ids::WITHER_SKELETON_SKULL,
+			MobHeadType::ZOMBIE => Ids::ZOMBIE_HEAD,
+		})->writeFacingWithoutDown($block->getFacing()));
+	}
+
+	private function registerSimpleSerializers() : void{
+		$this->mapSimple(Blocks::AIR(), Ids::AIR);
+		$this->mapSimple(Blocks::AMETHYST(), Ids::AMETHYST_BLOCK);
+		$this->mapSimple(Blocks::ANCIENT_DEBRIS(), Ids::ANCIENT_DEBRIS);
+		$this->mapSimple(Blocks::ANDESITE(), Ids::ANDESITE);
+		$this->mapSimple(Blocks::BARRIER(), Ids::BARRIER);
+		$this->mapSimple(Blocks::BEACON(), Ids::BEACON);
+		$this->mapSimple(Blocks::BLACKSTONE(), Ids::BLACKSTONE);
+		$this->mapSimple(Blocks::BLUE_ICE(), Ids::BLUE_ICE);
+		$this->mapSimple(Blocks::BOOKSHELF(), Ids::BOOKSHELF);
+		$this->mapSimple(Blocks::BRICKS(), Ids::BRICK_BLOCK);
+		$this->mapSimple(Blocks::BROWN_MUSHROOM(), Ids::BROWN_MUSHROOM);
+		$this->mapSimple(Blocks::BUDDING_AMETHYST(), Ids::BUDDING_AMETHYST);
+		$this->mapSimple(Blocks::CALCITE(), Ids::CALCITE);
+		$this->mapSimple(Blocks::CARTOGRAPHY_TABLE(), Ids::CARTOGRAPHY_TABLE);
+		$this->mapSimple(Blocks::CHEMICAL_HEAT(), Ids::CHEMICAL_HEAT);
+		$this->mapSimple(Blocks::CHISELED_DEEPSLATE(), Ids::CHISELED_DEEPSLATE);
+		$this->mapSimple(Blocks::CHISELED_NETHER_BRICKS(), Ids::CHISELED_NETHER_BRICKS);
+		$this->mapSimple(Blocks::CHISELED_POLISHED_BLACKSTONE(), Ids::CHISELED_POLISHED_BLACKSTONE);
+		$this->mapSimple(Blocks::CHISELED_RED_SANDSTONE(), Ids::CHISELED_RED_SANDSTONE);
+		$this->mapSimple(Blocks::CHISELED_SANDSTONE(), Ids::CHISELED_SANDSTONE);
+		$this->mapSimple(Blocks::CHISELED_STONE_BRICKS(), Ids::CHISELED_STONE_BRICKS);
+		$this->mapSimple(Blocks::CHISELED_TUFF(), Ids::CHISELED_TUFF);
+		$this->mapSimple(Blocks::CHISELED_TUFF_BRICKS(), Ids::CHISELED_TUFF_BRICKS);
+		$this->mapSimple(Blocks::CHORUS_PLANT(), Ids::CHORUS_PLANT);
+		$this->mapSimple(Blocks::CLAY(), Ids::CLAY);
+		$this->mapSimple(Blocks::COAL(), Ids::COAL_BLOCK);
+		$this->mapSimple(Blocks::COAL_ORE(), Ids::COAL_ORE);
+		$this->mapSimple(Blocks::COBBLED_DEEPSLATE(), Ids::COBBLED_DEEPSLATE);
+		$this->mapSimple(Blocks::COBBLESTONE(), Ids::COBBLESTONE);
+		$this->mapSimple(Blocks::COBWEB(), Ids::WEB);
+		$this->mapSimple(Blocks::COPPER_ORE(), Ids::COPPER_ORE);
+		$this->mapSimple(Blocks::CRACKED_DEEPSLATE_BRICKS(), Ids::CRACKED_DEEPSLATE_BRICKS);
+		$this->mapSimple(Blocks::CRACKED_DEEPSLATE_TILES(), Ids::CRACKED_DEEPSLATE_TILES);
+		$this->mapSimple(Blocks::CRACKED_NETHER_BRICKS(), Ids::CRACKED_NETHER_BRICKS);
+		$this->mapSimple(Blocks::CRACKED_POLISHED_BLACKSTONE_BRICKS(), Ids::CRACKED_POLISHED_BLACKSTONE_BRICKS);
+		$this->mapSimple(Blocks::CRACKED_STONE_BRICKS(), Ids::CRACKED_STONE_BRICKS);
+		$this->mapSimple(Blocks::CRAFTING_TABLE(), Ids::CRAFTING_TABLE);
+		$this->mapSimple(Blocks::CRIMSON_ROOTS(), Ids::CRIMSON_ROOTS);
+		$this->mapSimple(Blocks::CRYING_OBSIDIAN(), Ids::CRYING_OBSIDIAN);
+		$this->mapSimple(Blocks::DANDELION(), Ids::DANDELION);
+		$this->mapSimple(Blocks::CUT_RED_SANDSTONE(), Ids::CUT_RED_SANDSTONE);
+		$this->mapSimple(Blocks::CUT_SANDSTONE(), Ids::CUT_SANDSTONE);
+		$this->mapSimple(Blocks::DARK_PRISMARINE(), Ids::DARK_PRISMARINE);
+		$this->mapSimple(Blocks::DEAD_BUSH(), Ids::DEADBUSH);
+		$this->mapSimple(Blocks::DEEPSLATE_BRICKS(), Ids::DEEPSLATE_BRICKS);
+		$this->mapSimple(Blocks::DEEPSLATE_COAL_ORE(), Ids::DEEPSLATE_COAL_ORE);
+		$this->mapSimple(Blocks::DEEPSLATE_COPPER_ORE(), Ids::DEEPSLATE_COPPER_ORE);
+		$this->mapSimple(Blocks::DEEPSLATE_DIAMOND_ORE(), Ids::DEEPSLATE_DIAMOND_ORE);
+		$this->mapSimple(Blocks::DEEPSLATE_EMERALD_ORE(), Ids::DEEPSLATE_EMERALD_ORE);
+		$this->mapSimple(Blocks::DEEPSLATE_GOLD_ORE(), Ids::DEEPSLATE_GOLD_ORE);
+		$this->mapSimple(Blocks::DEEPSLATE_IRON_ORE(), Ids::DEEPSLATE_IRON_ORE);
+		$this->mapSimple(Blocks::DEEPSLATE_LAPIS_LAZULI_ORE(), Ids::DEEPSLATE_LAPIS_ORE);
+		$this->mapSimple(Blocks::DEEPSLATE_TILES(), Ids::DEEPSLATE_TILES);
+		$this->mapSimple(Blocks::DIAMOND(), Ids::DIAMOND_BLOCK);
+		$this->mapSimple(Blocks::DIAMOND_ORE(), Ids::DIAMOND_ORE);
+		$this->mapSimple(Blocks::DIORITE(), Ids::DIORITE);
+		$this->mapSimple(Blocks::DRAGON_EGG(), Ids::DRAGON_EGG);
+		$this->mapSimple(Blocks::DRIED_KELP(), Ids::DRIED_KELP_BLOCK);
+		$this->mapSimple(Blocks::ELEMENT_ACTINIUM(), Ids::ELEMENT_89);
+		$this->mapSimple(Blocks::ELEMENT_ALUMINUM(), Ids::ELEMENT_13);
+		$this->mapSimple(Blocks::ELEMENT_AMERICIUM(), Ids::ELEMENT_95);
+		$this->mapSimple(Blocks::ELEMENT_ANTIMONY(), Ids::ELEMENT_51);
+		$this->mapSimple(Blocks::ELEMENT_ARGON(), Ids::ELEMENT_18);
+		$this->mapSimple(Blocks::ELEMENT_ARSENIC(), Ids::ELEMENT_33);
+		$this->mapSimple(Blocks::ELEMENT_ASTATINE(), Ids::ELEMENT_85);
+		$this->mapSimple(Blocks::ELEMENT_BARIUM(), Ids::ELEMENT_56);
+		$this->mapSimple(Blocks::ELEMENT_BERKELIUM(), Ids::ELEMENT_97);
+		$this->mapSimple(Blocks::ELEMENT_BERYLLIUM(), Ids::ELEMENT_4);
+		$this->mapSimple(Blocks::ELEMENT_BISMUTH(), Ids::ELEMENT_83);
+		$this->mapSimple(Blocks::ELEMENT_BOHRIUM(), Ids::ELEMENT_107);
+		$this->mapSimple(Blocks::ELEMENT_BORON(), Ids::ELEMENT_5);
+		$this->mapSimple(Blocks::ELEMENT_BROMINE(), Ids::ELEMENT_35);
+		$this->mapSimple(Blocks::ELEMENT_CADMIUM(), Ids::ELEMENT_48);
+		$this->mapSimple(Blocks::ELEMENT_CALCIUM(), Ids::ELEMENT_20);
+		$this->mapSimple(Blocks::ELEMENT_CALIFORNIUM(), Ids::ELEMENT_98);
+		$this->mapSimple(Blocks::ELEMENT_CARBON(), Ids::ELEMENT_6);
+		$this->mapSimple(Blocks::ELEMENT_CERIUM(), Ids::ELEMENT_58);
+		$this->mapSimple(Blocks::ELEMENT_CESIUM(), Ids::ELEMENT_55);
+		$this->mapSimple(Blocks::ELEMENT_CHLORINE(), Ids::ELEMENT_17);
+		$this->mapSimple(Blocks::ELEMENT_CHROMIUM(), Ids::ELEMENT_24);
+		$this->mapSimple(Blocks::ELEMENT_COBALT(), Ids::ELEMENT_27);
+		$this->mapSimple(Blocks::ELEMENT_COPERNICIUM(), Ids::ELEMENT_112);
+		$this->mapSimple(Blocks::ELEMENT_COPPER(), Ids::ELEMENT_29);
+		$this->mapSimple(Blocks::ELEMENT_CURIUM(), Ids::ELEMENT_96);
+		$this->mapSimple(Blocks::ELEMENT_DARMSTADTIUM(), Ids::ELEMENT_110);
+		$this->mapSimple(Blocks::ELEMENT_DUBNIUM(), Ids::ELEMENT_105);
+		$this->mapSimple(Blocks::ELEMENT_DYSPROSIUM(), Ids::ELEMENT_66);
+		$this->mapSimple(Blocks::ELEMENT_EINSTEINIUM(), Ids::ELEMENT_99);
+		$this->mapSimple(Blocks::ELEMENT_ERBIUM(), Ids::ELEMENT_68);
+		$this->mapSimple(Blocks::ELEMENT_EUROPIUM(), Ids::ELEMENT_63);
+		$this->mapSimple(Blocks::ELEMENT_FERMIUM(), Ids::ELEMENT_100);
+		$this->mapSimple(Blocks::ELEMENT_FLEROVIUM(), Ids::ELEMENT_114);
+		$this->mapSimple(Blocks::ELEMENT_FLUORINE(), Ids::ELEMENT_9);
+		$this->mapSimple(Blocks::ELEMENT_FRANCIUM(), Ids::ELEMENT_87);
+		$this->mapSimple(Blocks::ELEMENT_GADOLINIUM(), Ids::ELEMENT_64);
+		$this->mapSimple(Blocks::ELEMENT_GALLIUM(), Ids::ELEMENT_31);
+		$this->mapSimple(Blocks::ELEMENT_GERMANIUM(), Ids::ELEMENT_32);
+		$this->mapSimple(Blocks::ELEMENT_GOLD(), Ids::ELEMENT_79);
+		$this->mapSimple(Blocks::ELEMENT_HAFNIUM(), Ids::ELEMENT_72);
+		$this->mapSimple(Blocks::ELEMENT_HASSIUM(), Ids::ELEMENT_108);
+		$this->mapSimple(Blocks::ELEMENT_HELIUM(), Ids::ELEMENT_2);
+		$this->mapSimple(Blocks::ELEMENT_HOLMIUM(), Ids::ELEMENT_67);
+		$this->mapSimple(Blocks::ELEMENT_HYDROGEN(), Ids::ELEMENT_1);
+		$this->mapSimple(Blocks::ELEMENT_INDIUM(), Ids::ELEMENT_49);
+		$this->mapSimple(Blocks::ELEMENT_IODINE(), Ids::ELEMENT_53);
+		$this->mapSimple(Blocks::ELEMENT_IRIDIUM(), Ids::ELEMENT_77);
+		$this->mapSimple(Blocks::ELEMENT_IRON(), Ids::ELEMENT_26);
+		$this->mapSimple(Blocks::ELEMENT_KRYPTON(), Ids::ELEMENT_36);
+		$this->mapSimple(Blocks::ELEMENT_LANTHANUM(), Ids::ELEMENT_57);
+		$this->mapSimple(Blocks::ELEMENT_LAWRENCIUM(), Ids::ELEMENT_103);
+		$this->mapSimple(Blocks::ELEMENT_LEAD(), Ids::ELEMENT_82);
+		$this->mapSimple(Blocks::ELEMENT_LITHIUM(), Ids::ELEMENT_3);
+		$this->mapSimple(Blocks::ELEMENT_LIVERMORIUM(), Ids::ELEMENT_116);
+		$this->mapSimple(Blocks::ELEMENT_LUTETIUM(), Ids::ELEMENT_71);
+		$this->mapSimple(Blocks::ELEMENT_MAGNESIUM(), Ids::ELEMENT_12);
+		$this->mapSimple(Blocks::ELEMENT_MANGANESE(), Ids::ELEMENT_25);
+		$this->mapSimple(Blocks::ELEMENT_MEITNERIUM(), Ids::ELEMENT_109);
+		$this->mapSimple(Blocks::ELEMENT_MENDELEVIUM(), Ids::ELEMENT_101);
+		$this->mapSimple(Blocks::ELEMENT_MERCURY(), Ids::ELEMENT_80);
+		$this->mapSimple(Blocks::ELEMENT_MOLYBDENUM(), Ids::ELEMENT_42);
+		$this->mapSimple(Blocks::ELEMENT_MOSCOVIUM(), Ids::ELEMENT_115);
+		$this->mapSimple(Blocks::ELEMENT_NEODYMIUM(), Ids::ELEMENT_60);
+		$this->mapSimple(Blocks::ELEMENT_NEON(), Ids::ELEMENT_10);
+		$this->mapSimple(Blocks::ELEMENT_NEPTUNIUM(), Ids::ELEMENT_93);
+		$this->mapSimple(Blocks::ELEMENT_NICKEL(), Ids::ELEMENT_28);
+		$this->mapSimple(Blocks::ELEMENT_NIHONIUM(), Ids::ELEMENT_113);
+		$this->mapSimple(Blocks::ELEMENT_NIOBIUM(), Ids::ELEMENT_41);
+		$this->mapSimple(Blocks::ELEMENT_NITROGEN(), Ids::ELEMENT_7);
+		$this->mapSimple(Blocks::ELEMENT_NOBELIUM(), Ids::ELEMENT_102);
+		$this->mapSimple(Blocks::ELEMENT_OGANESSON(), Ids::ELEMENT_118);
+		$this->mapSimple(Blocks::ELEMENT_OSMIUM(), Ids::ELEMENT_76);
+		$this->mapSimple(Blocks::ELEMENT_OXYGEN(), Ids::ELEMENT_8);
+		$this->mapSimple(Blocks::ELEMENT_PALLADIUM(), Ids::ELEMENT_46);
+		$this->mapSimple(Blocks::ELEMENT_PHOSPHORUS(), Ids::ELEMENT_15);
+		$this->mapSimple(Blocks::ELEMENT_PLATINUM(), Ids::ELEMENT_78);
+		$this->mapSimple(Blocks::ELEMENT_PLUTONIUM(), Ids::ELEMENT_94);
+		$this->mapSimple(Blocks::ELEMENT_POLONIUM(), Ids::ELEMENT_84);
+		$this->mapSimple(Blocks::ELEMENT_POTASSIUM(), Ids::ELEMENT_19);
+		$this->mapSimple(Blocks::ELEMENT_PRASEODYMIUM(), Ids::ELEMENT_59);
+		$this->mapSimple(Blocks::ELEMENT_PROMETHIUM(), Ids::ELEMENT_61);
+		$this->mapSimple(Blocks::ELEMENT_PROTACTINIUM(), Ids::ELEMENT_91);
+		$this->mapSimple(Blocks::ELEMENT_RADIUM(), Ids::ELEMENT_88);
+		$this->mapSimple(Blocks::ELEMENT_RADON(), Ids::ELEMENT_86);
+		$this->mapSimple(Blocks::ELEMENT_RHENIUM(), Ids::ELEMENT_75);
+		$this->mapSimple(Blocks::ELEMENT_RHODIUM(), Ids::ELEMENT_45);
+		$this->mapSimple(Blocks::ELEMENT_ROENTGENIUM(), Ids::ELEMENT_111);
+		$this->mapSimple(Blocks::ELEMENT_RUBIDIUM(), Ids::ELEMENT_37);
+		$this->mapSimple(Blocks::ELEMENT_RUTHENIUM(), Ids::ELEMENT_44);
+		$this->mapSimple(Blocks::ELEMENT_RUTHERFORDIUM(), Ids::ELEMENT_104);
+		$this->mapSimple(Blocks::ELEMENT_SAMARIUM(), Ids::ELEMENT_62);
+		$this->mapSimple(Blocks::ELEMENT_SCANDIUM(), Ids::ELEMENT_21);
+		$this->mapSimple(Blocks::ELEMENT_SEABORGIUM(), Ids::ELEMENT_106);
+		$this->mapSimple(Blocks::ELEMENT_SELENIUM(), Ids::ELEMENT_34);
+		$this->mapSimple(Blocks::ELEMENT_SILICON(), Ids::ELEMENT_14);
+		$this->mapSimple(Blocks::ELEMENT_SILVER(), Ids::ELEMENT_47);
+		$this->mapSimple(Blocks::ELEMENT_SODIUM(), Ids::ELEMENT_11);
+		$this->mapSimple(Blocks::ELEMENT_STRONTIUM(), Ids::ELEMENT_38);
+		$this->mapSimple(Blocks::ELEMENT_SULFUR(), Ids::ELEMENT_16);
+		$this->mapSimple(Blocks::ELEMENT_TANTALUM(), Ids::ELEMENT_73);
+		$this->mapSimple(Blocks::ELEMENT_TECHNETIUM(), Ids::ELEMENT_43);
+		$this->mapSimple(Blocks::ELEMENT_TELLURIUM(), Ids::ELEMENT_52);
+		$this->mapSimple(Blocks::ELEMENT_TENNESSINE(), Ids::ELEMENT_117);
+		$this->mapSimple(Blocks::ELEMENT_TERBIUM(), Ids::ELEMENT_65);
+		$this->mapSimple(Blocks::ELEMENT_THALLIUM(), Ids::ELEMENT_81);
+		$this->mapSimple(Blocks::ELEMENT_THORIUM(), Ids::ELEMENT_90);
+		$this->mapSimple(Blocks::ELEMENT_THULIUM(), Ids::ELEMENT_69);
+		$this->mapSimple(Blocks::ELEMENT_TIN(), Ids::ELEMENT_50);
+		$this->mapSimple(Blocks::ELEMENT_TITANIUM(), Ids::ELEMENT_22);
+		$this->mapSimple(Blocks::ELEMENT_TUNGSTEN(), Ids::ELEMENT_74);
+		$this->mapSimple(Blocks::ELEMENT_URANIUM(), Ids::ELEMENT_92);
+		$this->mapSimple(Blocks::ELEMENT_VANADIUM(), Ids::ELEMENT_23);
+		$this->mapSimple(Blocks::ELEMENT_XENON(), Ids::ELEMENT_54);
+		$this->mapSimple(Blocks::ELEMENT_YTTERBIUM(), Ids::ELEMENT_70);
+		$this->mapSimple(Blocks::ELEMENT_YTTRIUM(), Ids::ELEMENT_39);
+		$this->mapSimple(Blocks::ELEMENT_ZERO(), Ids::ELEMENT_0);
+		$this->mapSimple(Blocks::ELEMENT_ZINC(), Ids::ELEMENT_30);
+		$this->mapSimple(Blocks::ELEMENT_ZIRCONIUM(), Ids::ELEMENT_40);
+		$this->mapSimple(Blocks::EMERALD(), Ids::EMERALD_BLOCK);
+		$this->mapSimple(Blocks::EMERALD_ORE(), Ids::EMERALD_ORE);
+		$this->mapSimple(Blocks::ENCHANTING_TABLE(), Ids::ENCHANTING_TABLE);
+		$this->mapSimple(Blocks::END_STONE(), Ids::END_STONE);
+		$this->mapSimple(Blocks::END_STONE_BRICKS(), Ids::END_BRICKS);
+		$this->mapSimple(Blocks::FERN(), Ids::FERN);
+		$this->mapSimple(Blocks::FLETCHING_TABLE(), Ids::FLETCHING_TABLE);
+		$this->mapSimple(Blocks::GILDED_BLACKSTONE(), Ids::GILDED_BLACKSTONE);
+		$this->mapSimple(Blocks::GLASS(), Ids::GLASS);
+		$this->mapSimple(Blocks::GLASS_PANE(), Ids::GLASS_PANE);
+		$this->mapSimple(Blocks::GLOWING_OBSIDIAN(), Ids::GLOWINGOBSIDIAN);
+		$this->mapSimple(Blocks::GLOWSTONE(), Ids::GLOWSTONE);
+		$this->mapSimple(Blocks::GOLD(), Ids::GOLD_BLOCK);
+		$this->mapSimple(Blocks::GOLD_ORE(), Ids::GOLD_ORE);
+		$this->mapSimple(Blocks::GRANITE(), Ids::GRANITE);
+		$this->mapSimple(Blocks::GRASS(), Ids::GRASS_BLOCK);
+		$this->mapSimple(Blocks::GRASS_PATH(), Ids::GRASS_PATH);
+		$this->mapSimple(Blocks::GRAVEL(), Ids::GRAVEL);
+		$this->mapSimple(Blocks::HANGING_ROOTS(), Ids::HANGING_ROOTS);
+		$this->mapSimple(Blocks::HARDENED_CLAY(), Ids::HARDENED_CLAY);
+		$this->mapSimple(Blocks::HARDENED_GLASS(), Ids::HARD_GLASS);
+		$this->mapSimple(Blocks::HARDENED_GLASS_PANE(), Ids::HARD_GLASS_PANE);
+		$this->mapSimple(Blocks::HONEYCOMB(), Ids::HONEYCOMB_BLOCK);
+		$this->mapSimple(Blocks::ICE(), Ids::ICE);
+		$this->mapSimple(Blocks::INFESTED_CHISELED_STONE_BRICK(), Ids::INFESTED_CHISELED_STONE_BRICKS);
+		$this->mapSimple(Blocks::INFESTED_COBBLESTONE(), Ids::INFESTED_COBBLESTONE);
+		$this->mapSimple(Blocks::INFESTED_CRACKED_STONE_BRICK(), Ids::INFESTED_CRACKED_STONE_BRICKS);
+		$this->mapSimple(Blocks::INFESTED_MOSSY_STONE_BRICK(), Ids::INFESTED_MOSSY_STONE_BRICKS);
+		$this->mapSimple(Blocks::INFESTED_STONE(), Ids::INFESTED_STONE);
+		$this->mapSimple(Blocks::INFESTED_STONE_BRICK(), Ids::INFESTED_STONE_BRICKS);
+		$this->mapSimple(Blocks::INFO_UPDATE(), Ids::INFO_UPDATE);
+		$this->mapSimple(Blocks::INFO_UPDATE2(), Ids::INFO_UPDATE2);
+		$this->mapSimple(Blocks::INVISIBLE_BEDROCK(), Ids::INVISIBLE_BEDROCK);
+		$this->mapSimple(Blocks::IRON(), Ids::IRON_BLOCK);
+		$this->mapSimple(Blocks::IRON_BARS(), Ids::IRON_BARS);
+		$this->mapSimple(Blocks::IRON_ORE(), Ids::IRON_ORE);
+		$this->mapSimple(Blocks::JUKEBOX(), Ids::JUKEBOX);
+		$this->mapSimple(Blocks::LAPIS_LAZULI(), Ids::LAPIS_BLOCK);
+		$this->mapSimple(Blocks::LAPIS_LAZULI_ORE(), Ids::LAPIS_ORE);
+		$this->mapSimple(Blocks::LEGACY_STONECUTTER(), Ids::STONECUTTER);
+		$this->mapSimple(Blocks::LILY_PAD(), Ids::WATERLILY);
+		$this->mapSimple(Blocks::MAGMA(), Ids::MAGMA);
+		$this->mapSimple(Blocks::MANGROVE_ROOTS(), Ids::MANGROVE_ROOTS);
+		$this->mapSimple(Blocks::MELON(), Ids::MELON_BLOCK);
+		$this->mapSimple(Blocks::MONSTER_SPAWNER(), Ids::MOB_SPAWNER);
+		$this->mapSimple(Blocks::MOSSY_COBBLESTONE(), Ids::MOSSY_COBBLESTONE);
+		$this->mapSimple(Blocks::MOSSY_STONE_BRICKS(), Ids::MOSSY_STONE_BRICKS);
+		$this->mapSimple(Blocks::MUD(), Ids::MUD);
+		$this->mapSimple(Blocks::MUD_BRICKS(), Ids::MUD_BRICKS);
+		$this->mapSimple(Blocks::MYCELIUM(), Ids::MYCELIUM);
+		$this->mapSimple(Blocks::NETHERITE(), Ids::NETHERITE_BLOCK);
+		$this->mapSimple(Blocks::NETHERRACK(), Ids::NETHERRACK);
+		$this->mapSimple(Blocks::NETHER_BRICKS(), Ids::NETHER_BRICK);
+		$this->mapSimple(Blocks::NETHER_BRICK_FENCE(), Ids::NETHER_BRICK_FENCE);
+		$this->mapSimple(Blocks::NETHER_GOLD_ORE(), Ids::NETHER_GOLD_ORE);
+		$this->mapSimple(Blocks::NETHER_QUARTZ_ORE(), Ids::QUARTZ_ORE);
+		$this->mapSimple(Blocks::NETHER_REACTOR_CORE(), Ids::NETHERREACTOR);
+		$this->mapSimple(Blocks::NETHER_WART_BLOCK(), Ids::NETHER_WART_BLOCK);
+		$this->mapSimple(Blocks::NOTE_BLOCK(), Ids::NOTEBLOCK);
+		$this->mapSimple(Blocks::OBSIDIAN(), Ids::OBSIDIAN);
+		$this->mapSimple(Blocks::PACKED_ICE(), Ids::PACKED_ICE);
+		$this->mapSimple(Blocks::PACKED_MUD(), Ids::PACKED_MUD);
+		$this->mapSimple(Blocks::PODZOL(), Ids::PODZOL);
+		$this->mapSimple(Blocks::POLISHED_ANDESITE(), Ids::POLISHED_ANDESITE);
+		$this->mapSimple(Blocks::POLISHED_BLACKSTONE(), Ids::POLISHED_BLACKSTONE);
+		$this->mapSimple(Blocks::POLISHED_BLACKSTONE_BRICKS(), Ids::POLISHED_BLACKSTONE_BRICKS);
+		$this->mapSimple(Blocks::POLISHED_DEEPSLATE(), Ids::POLISHED_DEEPSLATE);
+		$this->mapSimple(Blocks::POLISHED_DIORITE(), Ids::POLISHED_DIORITE);
+		$this->mapSimple(Blocks::POLISHED_GRANITE(), Ids::POLISHED_GRANITE);
+		$this->mapSimple(Blocks::POLISHED_TUFF(), Ids::POLISHED_TUFF);
+		$this->mapSimple(Blocks::PRISMARINE(), Ids::PRISMARINE);
+		$this->mapSimple(Blocks::PRISMARINE_BRICKS(), Ids::PRISMARINE_BRICKS);
+		$this->mapSimple(Blocks::QUARTZ_BRICKS(), Ids::QUARTZ_BRICKS);
+		$this->mapSimple(Blocks::RAW_COPPER(), Ids::RAW_COPPER_BLOCK);
+		$this->mapSimple(Blocks::RAW_GOLD(), Ids::RAW_GOLD_BLOCK);
+		$this->mapSimple(Blocks::RAW_IRON(), Ids::RAW_IRON_BLOCK);
+		$this->mapSimple(Blocks::REDSTONE(), Ids::REDSTONE_BLOCK);
+		$this->mapSimple(Blocks::RED_MUSHROOM(), Ids::RED_MUSHROOM);
+		$this->mapSimple(Blocks::RED_NETHER_BRICKS(), Ids::RED_NETHER_BRICK);
+		$this->mapSimple(Blocks::RED_SAND(), Ids::RED_SAND);
+		$this->mapSimple(Blocks::RED_SANDSTONE(), Ids::RED_SANDSTONE);
+		$this->mapSimple(Blocks::REINFORCED_DEEPSLATE(), Ids::REINFORCED_DEEPSLATE);
+		$this->mapSimple(Blocks::RESERVED6(), Ids::RESERVED6);
+		$this->mapSimple(Blocks::SAND(), Ids::SAND);
+		$this->mapSimple(Blocks::SANDSTONE(), Ids::SANDSTONE);
+		$this->mapSimple(Blocks::SCULK(), Ids::SCULK);
+		$this->mapSimple(Blocks::SEA_LANTERN(), Ids::SEA_LANTERN);
+		$this->mapSimple(Blocks::SHROOMLIGHT(), Ids::SHROOMLIGHT);
+		$this->mapSimple(Blocks::SHULKER_BOX(), Ids::UNDYED_SHULKER_BOX);
+		$this->mapSimple(Blocks::SLIME(), Ids::SLIME);
+		$this->mapSimple(Blocks::SMITHING_TABLE(), Ids::SMITHING_TABLE);
+		$this->mapSimple(Blocks::SMOOTH_BASALT(), Ids::SMOOTH_BASALT);
+		$this->mapSimple(Blocks::SMOOTH_RED_SANDSTONE(), Ids::SMOOTH_RED_SANDSTONE);
+		$this->mapSimple(Blocks::SMOOTH_SANDSTONE(), Ids::SMOOTH_SANDSTONE);
+		$this->mapSimple(Blocks::SMOOTH_STONE(), Ids::SMOOTH_STONE);
+		$this->mapSimple(Blocks::SNOW(), Ids::SNOW);
+		$this->mapSimple(Blocks::SOUL_SAND(), Ids::SOUL_SAND);
+		$this->mapSimple(Blocks::SOUL_SOIL(), Ids::SOUL_SOIL);
+		$this->mapSimple(Blocks::SPORE_BLOSSOM(), Ids::SPORE_BLOSSOM);
+		$this->mapSimple(Blocks::STONE(), Ids::STONE);
+		$this->mapSimple(Blocks::STONE_BRICKS(), Ids::STONE_BRICKS);
+		$this->mapSimple(Blocks::TALL_GRASS(), Ids::SHORT_GRASS);  //no, this is not a typo - tall_grass is now the double block, just to be confusing :(
+		$this->mapSimple(Blocks::TINTED_GLASS(), Ids::TINTED_GLASS);
+		$this->mapSimple(Blocks::TORCHFLOWER(), Ids::TORCHFLOWER);
+		$this->mapSimple(Blocks::TUFF(), Ids::TUFF);
+		$this->mapSimple(Blocks::TUFF_BRICKS(), Ids::TUFF_BRICKS);
+		$this->mapSimple(Blocks::WARPED_WART_BLOCK(), Ids::WARPED_WART_BLOCK);
+		$this->mapSimple(Blocks::WARPED_ROOTS(), Ids::WARPED_ROOTS);
+		$this->mapSimple(Blocks::WITHER_ROSE(), Ids::WITHER_ROSE);
+
+		$this->mapSimple(Blocks::ALLIUM(), Ids::ALLIUM);
+		$this->mapSimple(Blocks::CORNFLOWER(), Ids::CORNFLOWER);
+		$this->mapSimple(Blocks::AZURE_BLUET(), Ids::AZURE_BLUET);
+		$this->mapSimple(Blocks::LILY_OF_THE_VALLEY(), Ids::LILY_OF_THE_VALLEY);
+		$this->mapSimple(Blocks::BLUE_ORCHID(), Ids::BLUE_ORCHID);
+		$this->mapSimple(Blocks::OXEYE_DAISY(), Ids::OXEYE_DAISY);
+		$this->mapSimple(Blocks::POPPY(), Ids::POPPY);
+		$this->mapSimple(Blocks::ORANGE_TULIP(), Ids::ORANGE_TULIP);
+		$this->mapSimple(Blocks::PINK_TULIP(), Ids::PINK_TULIP);
+		$this->mapSimple(Blocks::RED_TULIP(), Ids::RED_TULIP);
+		$this->mapSimple(Blocks::WHITE_TULIP(), Ids::WHITE_TULIP);
+	}
+
+	private function registerSerializers() : void{
+		$this->map(Blocks::ACTIVATOR_RAIL(), function(ActivatorRail $block) : Writer{
+			return Writer::create(Ids::ACTIVATOR_RAIL)
+				->writeBool(StateNames::RAIL_DATA_BIT, $block->isPowered())
+				->writeInt(StateNames::RAIL_DIRECTION, $block->getShape());
+		});
+		$this->map(Blocks::ALL_SIDED_MUSHROOM_STEM(), fn() => Writer::create(Ids::MUSHROOM_STEM)
+				->writeInt(StateNames::HUGE_MUSHROOM_BITS, BlockLegacyMetadata::MUSHROOM_BLOCK_ALL_STEM));
+		$this->map(Blocks::AMETHYST_CLUSTER(), fn(AmethystCluster $block) => Writer::create(
+			match($stage = $block->getStage()){
+				AmethystCluster::STAGE_SMALL_BUD => Ids::SMALL_AMETHYST_BUD,
+				AmethystCluster::STAGE_MEDIUM_BUD => Ids::MEDIUM_AMETHYST_BUD,
+				AmethystCluster::STAGE_LARGE_BUD => Ids::LARGE_AMETHYST_BUD,
+				AmethystCluster::STAGE_CLUSTER => Ids::AMETHYST_CLUSTER,
+				default => throw new BlockStateSerializeException("Invalid Amethyst Cluster stage $stage"),
+			})
+			->writeBlockFace($block->getFacing())
+		);
+		$this->mapSlab(Blocks::ANDESITE_SLAB(), Ids::ANDESITE_SLAB, Ids::ANDESITE_DOUBLE_SLAB);
+		$this->map(Blocks::ANDESITE_STAIRS(), fn(Stair $block) => Helper::encodeStairs($block, new Writer(Ids::ANDESITE_STAIRS)));
+		$this->map(Blocks::ANDESITE_WALL(), fn(Wall $block) => Helper::encodeWall($block, Writer::create(Ids::ANDESITE_WALL)));
+		$this->map(Blocks::ANVIL(), fn(Anvil $block) : Writer => Writer::create(
+			match($damage = $block->getDamage()){
+				0 => Ids::ANVIL,
+				1 => Ids::CHIPPED_ANVIL,
+				2 => Ids::DAMAGED_ANVIL,
+				default => throw new BlockStateSerializeException("Invalid Anvil damage {$damage}"),
+			})
+			->writeCardinalHorizontalFacing($block->getFacing())
+		);
+		$this->map(Blocks::BAMBOO(), function(Bamboo $block) : Writer{
+			return Writer::create(Ids::BAMBOO)
+				->writeBool(StateNames::AGE_BIT, $block->isReady())
+				->writeString(StateNames::BAMBOO_LEAF_SIZE, match($block->getLeafSize()){
+					Bamboo::NO_LEAVES => StringValues::BAMBOO_LEAF_SIZE_NO_LEAVES,
+					Bamboo::SMALL_LEAVES => StringValues::BAMBOO_LEAF_SIZE_SMALL_LEAVES,
+					Bamboo::LARGE_LEAVES => StringValues::BAMBOO_LEAF_SIZE_LARGE_LEAVES,
+					default => throw new BlockStateSerializeException("Invalid Bamboo leaf thickness " . $block->getLeafSize()),
+				})
+				->writeString(StateNames::BAMBOO_STALK_THICKNESS, $block->isThick() ? StringValues::BAMBOO_STALK_THICKNESS_THICK : StringValues::BAMBOO_STALK_THICKNESS_THIN);
+		});
+		$this->map(Blocks::BAMBOO_SAPLING(), function(BambooSapling $block) : Writer{
+			return Writer::create(Ids::BAMBOO_SAPLING)
+				->writeBool(StateNames::AGE_BIT, $block->isReady());
+		});
+		$this->map(Blocks::BANNER(), function(FloorBanner $block) : Writer{
+			return Writer::create(Ids::STANDING_BANNER)
+				->writeInt(StateNames::GROUND_SIGN_DIRECTION, $block->getRotation());
+		});
+		$this->map(Blocks::BARREL(), function(Barrel $block) : Writer{
+			return Writer::create(Ids::BARREL)
+				->writeBool(StateNames::OPEN_BIT, $block->isOpen())
+				->writeFacingDirection($block->getFacing());
+		});
+		$this->map(Blocks::BASALT(), function(SimplePillar $block) : Writer{
+			return Writer::create(Ids::BASALT)
+				->writePillarAxis($block->getAxis());
+		});
+		$this->map(Blocks::BED(), function(Bed $block) : Writer{
+			return Writer::create(Ids::BED)
+				->writeBool(StateNames::HEAD_PIECE_BIT, $block->isHeadPart())
+				->writeBool(StateNames::OCCUPIED_BIT, $block->isOccupied())
+				->writeLegacyHorizontalFacing($block->getFacing());
+		});
+		$this->map(Blocks::BEDROCK(), function(Block $block) : Writer{
+			return Writer::create(Ids::BEDROCK)
+				->writeBool(StateNames::INFINIBURN_BIT, $block->burnsForever());
+		});
+		$this->map(Blocks::BEETROOTS(), fn(Beetroot $block) => Helper::encodeCrops($block, new Writer(Ids::BEETROOT)));
+		$this->map(Blocks::BELL(), function(Bell $block) : Writer{
+			return Writer::create(Ids::BELL)
+				->writeBellAttachmentType($block->getAttachmentType())
+				->writeBool(StateNames::TOGGLE_BIT, false) //we don't care about this; it's just to keep MCPE happy
+				->writeLegacyHorizontalFacing($block->getFacing());
+
+		});
+		$this->map(Blocks::BIG_DRIPLEAF_HEAD(), function(BigDripleafHead $block) : Writer{
+			return Writer::create(Ids::BIG_DRIPLEAF)
+				->writeCardinalHorizontalFacing($block->getFacing())
+				->writeString(StateNames::BIG_DRIPLEAF_TILT, match($block->getLeafState()){
+					DripleafState::STABLE => StringValues::BIG_DRIPLEAF_TILT_NONE,
+					DripleafState::UNSTABLE => StringValues::BIG_DRIPLEAF_TILT_UNSTABLE,
+					DripleafState::PARTIAL_TILT => StringValues::BIG_DRIPLEAF_TILT_PARTIAL_TILT,
+					DripleafState::FULL_TILT => StringValues::BIG_DRIPLEAF_TILT_FULL_TILT,
+				})
+				->writeBool(StateNames::BIG_DRIPLEAF_HEAD, true);
+		});
+		$this->map(Blocks::BIG_DRIPLEAF_STEM(), function(BigDripleafStem $block) : Writer{
+			return Writer::create(Ids::BIG_DRIPLEAF)
+				->writeCardinalHorizontalFacing($block->getFacing())
+				->writeString(StateNames::BIG_DRIPLEAF_TILT, StringValues::BIG_DRIPLEAF_TILT_NONE)
+				->writeBool(StateNames::BIG_DRIPLEAF_HEAD, false);
+		});
+		$this->mapSlab(Blocks::BLACKSTONE_SLAB(), Ids::BLACKSTONE_SLAB, Ids::BLACKSTONE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::BLACKSTONE_STAIRS(), Ids::BLACKSTONE_STAIRS);
+		$this->map(Blocks::BLACKSTONE_WALL(), fn(Wall $block) => Helper::encodeWall($block, new Writer(Ids::BLACKSTONE_WALL)));
+		$this->map(Blocks::BLAST_FURNACE(), fn(Furnace $block) => Helper::encodeFurnace($block, Ids::BLAST_FURNACE, Ids::LIT_BLAST_FURNACE));
+		$this->map(Blocks::BLUE_TORCH(), fn(Torch $block) => Helper::encodeTorch($block, Writer::create(Ids::COLORED_TORCH_BLUE)));
+		$this->map(Blocks::BONE_BLOCK(), function(BoneBlock $block) : Writer{
+			return Writer::create(Ids::BONE_BLOCK)
+				->writeInt(StateNames::DEPRECATED, 0)
+				->writePillarAxis($block->getAxis());
+		});
+		$this->map(Blocks::BREWING_STAND(), function(BrewingStand $block) : Writer{
+			return Writer::create(Ids::BREWING_STAND)
+				->writeBool(StateNames::BREWING_STAND_SLOT_A_BIT, $block->hasSlot(BrewingStandSlot::EAST))
+				->writeBool(StateNames::BREWING_STAND_SLOT_B_BIT, $block->hasSlot(BrewingStandSlot::SOUTHWEST))
+				->writeBool(StateNames::BREWING_STAND_SLOT_C_BIT, $block->hasSlot(BrewingStandSlot::NORTHWEST));
+		});
+		$this->mapSlab(Blocks::BRICK_SLAB(), Ids::BRICK_SLAB, Ids::BRICK_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::BRICK_STAIRS(), Ids::BRICK_STAIRS);
+		$this->map(Blocks::BRICK_WALL(), fn(Wall $block) => Helper::encodeWall($block, Writer::create(Ids::BRICK_WALL)));
+		$this->map(Blocks::BROWN_MUSHROOM_BLOCK(), fn(BrownMushroomBlock $block) => Helper::encodeMushroomBlock($block, new Writer(Ids::BROWN_MUSHROOM_BLOCK)));
+		$this->map(Blocks::CACTUS(), function(Cactus $block) : Writer{
+			return Writer::create(Ids::CACTUS)
+				->writeInt(StateNames::AGE, $block->getAge());
+		});
+		$this->map(Blocks::CAKE(), function(Cake $block) : Writer{
+			return Writer::create(Ids::CAKE)
+				->writeInt(StateNames::BITE_COUNTER, $block->getBites());
+		});
+		$this->map(Blocks::CAMPFIRE(), function(Campfire $block) : Writer{
+			return Writer::create(Ids::CAMPFIRE)
+				->writeCardinalHorizontalFacing($block->getFacing())
+				->writeBool(StateNames::EXTINGUISHED, !$block->isLit());
+		});
+		$this->map(Blocks::CARROTS(), fn(Carrot $block) => Helper::encodeCrops($block, new Writer(Ids::CARROTS)));
+		$this->map(Blocks::CARVED_PUMPKIN(), function(CarvedPumpkin $block) : Writer{
+			return Writer::create(Ids::CARVED_PUMPKIN)
+				->writeCardinalHorizontalFacing($block->getFacing());
+		});
+		$this->map(Blocks::CAVE_VINES(), function(CaveVines $block) : Writer{
+			//I have no idea why this only has 3 IDs - there are 4 in Java and 4 visually distinct states in Bedrock
+			return Writer::create($block->hasBerries() ?
+				($block->isHead() ?
+					Ids::CAVE_VINES_HEAD_WITH_BERRIES :
+					Ids::CAVE_VINES_BODY_WITH_BERRIES
+				) :
+				Ids::CAVE_VINES
+			)
+				->writeInt(StateNames::GROWING_PLANT_AGE, $block->getAge());
+		});
+		$this->map(Blocks::CHAIN(), function(Chain $block) : Writer{
+			return Writer::create(Ids::CHAIN)
+				->writePillarAxis($block->getAxis());
+		});
+		$this->map(Blocks::CHEST(), function(Chest $block) : Writer{
+			return Writer::create(Ids::CHEST)
+				->writeCardinalHorizontalFacing($block->getFacing());
+		});
+		$this->map(Blocks::CHISELED_BOOKSHELF(), function(ChiseledBookshelf $block) : Writer{
+			$flags = 0;
+			foreach($block->getSlots() as $slot){
+				$flags |= 1 << $slot->value;
+			}
+			return Writer::create(Ids::CHISELED_BOOKSHELF)
+				->writeLegacyHorizontalFacing($block->getFacing())
+				->writeInt(StateNames::BOOKS_STORED, $flags);
+		});
+		$this->map(Blocks::CHISELED_QUARTZ(), fn(SimplePillar $block) => Helper::encodeQuartz($block->getAxis(), Writer::create(Ids::CHISELED_QUARTZ_BLOCK)));
+		$this->map(Blocks::CHORUS_FLOWER(), function(ChorusFlower $block) : Writer{
+			return Writer::create(Ids::CHORUS_FLOWER)
+				->writeInt(StateNames::AGE, $block->getAge());
+		});
+		$this->mapSlab(Blocks::COBBLED_DEEPSLATE_SLAB(), Ids::COBBLED_DEEPSLATE_SLAB, Ids::COBBLED_DEEPSLATE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::COBBLED_DEEPSLATE_STAIRS(), Ids::COBBLED_DEEPSLATE_STAIRS);
+		$this->map(Blocks::COBBLED_DEEPSLATE_WALL(), fn(Wall $block) => Helper::encodeWall($block, new Writer(Ids::COBBLED_DEEPSLATE_WALL)));
+		$this->mapSlab(Blocks::COBBLESTONE_SLAB(), Ids::COBBLESTONE_SLAB, Ids::COBBLESTONE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::COBBLESTONE_STAIRS(), Ids::STONE_STAIRS);
+		$this->map(Blocks::COBBLESTONE_WALL(), fn(Wall $block) => Helper::encodeWall($block, Writer::create(Ids::COBBLESTONE_WALL)));
+		$this->map(Blocks::COPPER(), function(Copper $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return new Writer($block->isWaxed() ?
+				Helper::selectCopperId($oxidation, Ids::WAXED_COPPER, Ids::WAXED_EXPOSED_COPPER, Ids::WAXED_WEATHERED_COPPER, Ids::WAXED_OXIDIZED_COPPER) :
+				Helper::selectCopperId($oxidation, Ids::COPPER_BLOCK, Ids::EXPOSED_COPPER, Ids::WEATHERED_COPPER, Ids::OXIDIZED_COPPER)
+			);
+		});
+		$this->map(Blocks::CHISELED_COPPER(), function(Copper $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return new Writer($block->isWaxed() ?
+				Helper::selectCopperId($oxidation,
+					Ids::WAXED_CHISELED_COPPER,
+					Ids::WAXED_EXPOSED_CHISELED_COPPER,
+					Ids::WAXED_WEATHERED_CHISELED_COPPER,
+					Ids::WAXED_OXIDIZED_CHISELED_COPPER
+				) :
+				Helper::selectCopperId($oxidation,
+					Ids::CHISELED_COPPER,
+					Ids::EXPOSED_CHISELED_COPPER,
+					Ids::WEATHERED_CHISELED_COPPER,
+					Ids::OXIDIZED_CHISELED_COPPER
+				)
+			);
+		});
+		$this->map(Blocks::COPPER_GRATE(), function(CopperGrate $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return new Writer($block->isWaxed() ?
+				Helper::selectCopperId($oxidation,
+					Ids::WAXED_COPPER_GRATE,
+					Ids::WAXED_EXPOSED_COPPER_GRATE,
+					Ids::WAXED_WEATHERED_COPPER_GRATE,
+					Ids::WAXED_OXIDIZED_COPPER_GRATE
+				) :
+				Helper::selectCopperId($oxidation,
+					Ids::COPPER_GRATE,
+					Ids::EXPOSED_COPPER_GRATE,
+					Ids::WEATHERED_COPPER_GRATE,
+					Ids::OXIDIZED_COPPER_GRATE
+				)
+			);
+		});
+		$this->map(Blocks::CUT_COPPER(), function(Copper $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return new Writer($block->isWaxed() ?
+				Helper::selectCopperId($oxidation, Ids::WAXED_CUT_COPPER, Ids::WAXED_EXPOSED_CUT_COPPER, Ids::WAXED_WEATHERED_CUT_COPPER, Ids::WAXED_OXIDIZED_CUT_COPPER) :
+				Helper::selectCopperId($oxidation, Ids::CUT_COPPER, Ids::EXPOSED_CUT_COPPER, Ids::WEATHERED_CUT_COPPER, Ids::OXIDIZED_CUT_COPPER)
+			);
+		});
+		$this->map(Blocks::CUT_COPPER_SLAB(), function(CopperSlab $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return Helper::encodeSlab(
+				$block,
+				($block->isWaxed() ?
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::WAXED_CUT_COPPER_SLAB,
+						Ids::WAXED_EXPOSED_CUT_COPPER_SLAB,
+						Ids::WAXED_WEATHERED_CUT_COPPER_SLAB,
+						Ids::WAXED_OXIDIZED_CUT_COPPER_SLAB
+					) :
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::CUT_COPPER_SLAB,
+						Ids::EXPOSED_CUT_COPPER_SLAB,
+						Ids::WEATHERED_CUT_COPPER_SLAB,
+						Ids::OXIDIZED_CUT_COPPER_SLAB
+					)
+				),
+				($block->isWaxed() ?
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::WAXED_DOUBLE_CUT_COPPER_SLAB,
+						Ids::WAXED_EXPOSED_DOUBLE_CUT_COPPER_SLAB,
+						Ids::WAXED_WEATHERED_DOUBLE_CUT_COPPER_SLAB,
+						Ids::WAXED_OXIDIZED_DOUBLE_CUT_COPPER_SLAB
+					) :
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::DOUBLE_CUT_COPPER_SLAB,
+						Ids::EXPOSED_DOUBLE_CUT_COPPER_SLAB,
+						Ids::WEATHERED_DOUBLE_CUT_COPPER_SLAB,
+						Ids::OXIDIZED_DOUBLE_CUT_COPPER_SLAB
+					)
+				)
+			);
+		});
+		$this->map(Blocks::CUT_COPPER_STAIRS(), function(CopperStairs $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return Helper::encodeStairs(
+				$block,
+				new Writer($block->isWaxed() ?
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::WAXED_CUT_COPPER_STAIRS,
+						Ids::WAXED_EXPOSED_CUT_COPPER_STAIRS,
+						Ids::WAXED_WEATHERED_CUT_COPPER_STAIRS,
+						Ids::WAXED_OXIDIZED_CUT_COPPER_STAIRS
+					) :
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::CUT_COPPER_STAIRS,
+						Ids::EXPOSED_CUT_COPPER_STAIRS,
+						Ids::WEATHERED_CUT_COPPER_STAIRS,
+						Ids::OXIDIZED_CUT_COPPER_STAIRS
+					)
+				)
+			);
+		});
+		$this->map(Blocks::COPPER_BULB(), function(CopperBulb $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return Writer::create($block->isWaxed() ?
+				Helper::selectCopperId($oxidation,
+					Ids::WAXED_COPPER_BULB,
+					Ids::WAXED_EXPOSED_COPPER_BULB,
+					Ids::WAXED_WEATHERED_COPPER_BULB,
+					Ids::WAXED_OXIDIZED_COPPER_BULB) :
+				Helper::selectCopperId($oxidation,
+					Ids::COPPER_BULB,
+					Ids::EXPOSED_COPPER_BULB,
+					Ids::WEATHERED_COPPER_BULB,
+					Ids::OXIDIZED_COPPER_BULB
+				))
+				->writeBool(StateNames::LIT, $block->isLit())
+				->writeBool(StateNames::POWERED_BIT, $block->isPowered());
+		});
+		$this->map(Blocks::COPPER_DOOR(), function(CopperDoor $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return Helper::encodeDoor(
+				$block,
+				new Writer($block->isWaxed() ?
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::WAXED_COPPER_DOOR,
+						Ids::WAXED_EXPOSED_COPPER_DOOR,
+						Ids::WAXED_WEATHERED_COPPER_DOOR,
+						Ids::WAXED_OXIDIZED_COPPER_DOOR
+					) :
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::COPPER_DOOR,
+						Ids::EXPOSED_COPPER_DOOR,
+						Ids::WEATHERED_COPPER_DOOR,
+						Ids::OXIDIZED_COPPER_DOOR
+					)
+				)
+			);
+		});
+		$this->map(Blocks::COPPER_TRAPDOOR(), function(CopperTrapdoor $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return Helper::encodeTrapdoor(
+				$block,
+				new Writer($block->isWaxed() ?
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::WAXED_COPPER_TRAPDOOR,
+						Ids::WAXED_EXPOSED_COPPER_TRAPDOOR,
+						Ids::WAXED_WEATHERED_COPPER_TRAPDOOR,
+						Ids::WAXED_OXIDIZED_COPPER_TRAPDOOR
+					) :
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::COPPER_TRAPDOOR,
+						Ids::EXPOSED_COPPER_TRAPDOOR,
+						Ids::WEATHERED_COPPER_TRAPDOOR,
+						Ids::OXIDIZED_COPPER_TRAPDOOR
+					)
+				)
+			);
+		});
+		$this->map(Blocks::COCOA_POD(), function(CocoaBlock $block) : Writer{
+			return Writer::create(Ids::COCOA)
+				->writeInt(StateNames::AGE, $block->getAge())
+				->writeLegacyHorizontalFacing(Facing::opposite($block->getFacing()));
+		});
+		$this->map(Blocks::COMPOUND_CREATOR(), fn(ChemistryTable $block) => Helper::encodeChemistryTable($block, Writer::create(Ids::COMPOUND_CREATOR)));
+		$this->mapSlab(Blocks::CUT_RED_SANDSTONE_SLAB(), Ids::CUT_RED_SANDSTONE_SLAB, Ids::CUT_RED_SANDSTONE_DOUBLE_SLAB);
+		$this->mapSlab(Blocks::CUT_SANDSTONE_SLAB(), Ids::CUT_SANDSTONE_SLAB, Ids::CUT_SANDSTONE_DOUBLE_SLAB);
+		$this->mapSlab(Blocks::DARK_PRISMARINE_SLAB(), Ids::DARK_PRISMARINE_SLAB, Ids::DARK_PRISMARINE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::DARK_PRISMARINE_STAIRS(), Ids::DARK_PRISMARINE_STAIRS);
+		$this->map(Blocks::DAYLIGHT_SENSOR(), function(DaylightSensor $block) : Writer{
+			return Writer::create($block->isInverted() ? Ids::DAYLIGHT_DETECTOR_INVERTED : Ids::DAYLIGHT_DETECTOR)
+				->writeInt(StateNames::REDSTONE_SIGNAL, $block->getOutputSignalStrength());
+		});
+		$this->map(Blocks::DEEPSLATE(), function(SimplePillar $block) : Writer{
+			return Writer::create(Ids::DEEPSLATE)
+				->writePillarAxis($block->getAxis());
+		});
+		$this->mapSlab(Blocks::DEEPSLATE_BRICK_SLAB(), Ids::DEEPSLATE_BRICK_SLAB, Ids::DEEPSLATE_BRICK_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::DEEPSLATE_BRICK_STAIRS(), Ids::DEEPSLATE_BRICK_STAIRS);
+		$this->map(Blocks::DEEPSLATE_BRICK_WALL(), fn(Wall $block) => Helper::encodeWall($block, new Writer(Ids::DEEPSLATE_BRICK_WALL)));
+		$this->map(Blocks::DEEPSLATE_REDSTONE_ORE(), fn(RedstoneOre $block) => new Writer($block->isLit() ? Ids::LIT_DEEPSLATE_REDSTONE_ORE : Ids::DEEPSLATE_REDSTONE_ORE));
+		$this->mapSlab(Blocks::DEEPSLATE_TILE_SLAB(), Ids::DEEPSLATE_TILE_SLAB, Ids::DEEPSLATE_TILE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::DEEPSLATE_TILE_STAIRS(), Ids::DEEPSLATE_TILE_STAIRS);
+		$this->map(Blocks::DEEPSLATE_TILE_WALL(), fn(Wall $block) => Helper::encodeWall($block, new Writer(Ids::DEEPSLATE_TILE_WALL)));
+		$this->map(Blocks::DETECTOR_RAIL(), function(DetectorRail $block) : Writer{
+			return Writer::create(Ids::DETECTOR_RAIL)
+				->writeBool(StateNames::RAIL_DATA_BIT, $block->isActivated())
+				->writeInt(StateNames::RAIL_DIRECTION, $block->getShape());
+		});
+		$this->mapSlab(Blocks::DIORITE_SLAB(), Ids::DIORITE_SLAB, Ids::DIORITE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::DIORITE_STAIRS(), Ids::DIORITE_STAIRS);
+		$this->map(Blocks::DIORITE_WALL(), fn(Wall $block) => Helper::encodeWall($block, Writer::create(Ids::DIORITE_WALL)));
+		$this->map(Blocks::DIRT(), function(Dirt $block) : Writer{
+			return Writer::create(match($block->getDirtType()){
+				DirtType::NORMAL => Ids::DIRT,
+				DirtType::COARSE => Ids::COARSE_DIRT,
+				DirtType::ROOTED => Ids::DIRT_WITH_ROOTS,
+			});
+		});
+		$this->map(Blocks::DOUBLE_TALLGRASS(), fn(DoubleTallGrass $block) => Helper::encodeDoublePlant($block, Writer::create(Ids::TALL_GRASS)));
+		$this->map(Blocks::ELEMENT_CONSTRUCTOR(), fn(ChemistryTable $block) => Helper::encodeChemistryTable($block, Writer::create(Ids::ELEMENT_CONSTRUCTOR)));
+		$this->map(Blocks::ENDER_CHEST(), function(EnderChest $block) : Writer{
+			return Writer::create(Ids::ENDER_CHEST)
+				->writeCardinalHorizontalFacing($block->getFacing());
+		});
+		$this->map(Blocks::END_PORTAL_FRAME(), function(EndPortalFrame $block) : Writer{
+			return Writer::create(Ids::END_PORTAL_FRAME)
+				->writeBool(StateNames::END_PORTAL_EYE_BIT, $block->hasEye())
+				->writeCardinalHorizontalFacing($block->getFacing());
+		});
+		$this->map(Blocks::END_ROD(), function(EndRod $block) : Writer{
+			return Writer::create(Ids::END_ROD)
+				->writeEndRodFacingDirection($block->getFacing());
+		});
+		$this->mapSlab(Blocks::END_STONE_BRICK_SLAB(), Ids::END_STONE_BRICK_SLAB, Ids::END_STONE_BRICK_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::END_STONE_BRICK_STAIRS(), Ids::END_BRICK_STAIRS);
+		$this->map(Blocks::END_STONE_BRICK_WALL(), fn(Wall $block) => Helper::encodeWall($block, Writer::create(Ids::END_STONE_BRICK_WALL)));
+		$this->mapSlab(Blocks::FAKE_WOODEN_SLAB(), Ids::PETRIFIED_OAK_SLAB, Ids::PETRIFIED_OAK_DOUBLE_SLAB);
+		$this->map(Blocks::FARMLAND(), function(Farmland $block) : Writer{
+			return Writer::create(Ids::FARMLAND)
+				->writeInt(StateNames::MOISTURIZED_AMOUNT, $block->getWetness());
+		});
+		$this->map(Blocks::FIRE(), function(Fire $block) : Writer{
+			return Writer::create(Ids::FIRE)
+				->writeInt(StateNames::AGE, $block->getAge());
+		});
+		$this->map(Blocks::FLOWER_POT(), function() : Writer{
+			return Writer::create(Ids::FLOWER_POT)
+				->writeBool(StateNames::UPDATE_BIT, false); //to keep MCPE happy
+		});
+		$this->map(Blocks::FROGLIGHT(), function(Froglight $block){
+			return Writer::create(match($block->getFroglightType()){
+				FroglightType::OCHRE => Ids::OCHRE_FROGLIGHT,
+				FroglightType::PEARLESCENT => Ids::PEARLESCENT_FROGLIGHT,
+				FroglightType::VERDANT => Ids::VERDANT_FROGLIGHT,
+			})
+				->writePillarAxis($block->getAxis());
+		});
+		$this->map(Blocks::FROSTED_ICE(), function(FrostedIce $block) : Writer{
+			return Writer::create(Ids::FROSTED_ICE)
+				->writeInt(StateNames::AGE, $block->getAge());
+		});
+		$this->map(Blocks::FURNACE(), fn(Furnace $block) => Helper::encodeFurnace($block, Ids::FURNACE, Ids::LIT_FURNACE));
+		$this->map(Blocks::GLOW_LICHEN(), function(GlowLichen $block) : Writer{
+			return Writer::create(Ids::GLOW_LICHEN)
+				->writeFacingFlags($block->getFaces());
+		});
+		$this->map(Blocks::GLOWING_ITEM_FRAME(), fn(ItemFrame $block) => Helper::encodeItemFrame($block, Ids::GLOW_FRAME));
+		$this->mapSlab(Blocks::GRANITE_SLAB(), Ids::GRANITE_SLAB, Ids::GRANITE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::GRANITE_STAIRS(), Ids::GRANITE_STAIRS);
+		$this->map(Blocks::GRANITE_WALL(), fn(Wall $block) => Helper::encodeWall($block, Writer::create(Ids::GRANITE_WALL)));
+		$this->map(Blocks::GREEN_TORCH(), fn(Torch $block) => Helper::encodeTorch($block, Writer::create(Ids::COLORED_TORCH_GREEN)));
+		$this->map(Blocks::HAY_BALE(), function(HayBale $block) : Writer{
+			return Writer::create(Ids::HAY_BLOCK)
+				->writeInt(StateNames::DEPRECATED, 0)
+				->writePillarAxis($block->getAxis());
+		});
+		$this->map(Blocks::HOPPER(), function(Hopper $block) : Writer{
+			return Writer::create(Ids::HOPPER)
+				->writeBool(StateNames::TOGGLE_BIT, $block->isPowered())
+				->writeFacingWithoutUp($block->getFacing());
+		});
+		$this->map(Blocks::IRON_DOOR(), fn(Door $block) => Helper::encodeDoor($block, new Writer(Ids::IRON_DOOR)));
+		$this->map(Blocks::IRON_TRAPDOOR(), fn(Trapdoor $block) => Helper::encodeTrapdoor($block, new Writer(Ids::IRON_TRAPDOOR)));
+		$this->map(Blocks::ITEM_FRAME(), fn(ItemFrame $block) => Helper::encodeItemFrame($block, Ids::FRAME));
+		$this->map(Blocks::LAB_TABLE(), fn(ChemistryTable $block) => Helper::encodeChemistryTable($block, Writer::create(Ids::LAB_TABLE)));
+		$this->map(Blocks::LADDER(), function(Ladder $block) : Writer{
+			return Writer::create(Ids::LADDER)
+				->writeHorizontalFacing($block->getFacing());
+		});
+		$this->map(Blocks::LANTERN(), function(Lantern $block) : Writer{
+			return Writer::create(Ids::LANTERN)
+				->writeBool(StateNames::HANGING, $block->isHanging());
+		});
+		$this->map(Blocks::LARGE_FERN(), fn(DoubleTallGrass $block) => Helper::encodeDoublePlant($block, Writer::create(Ids::LARGE_FERN)));
+		$this->map(Blocks::LAVA(), fn(Lava $block) => Helper::encodeLiquid($block, Ids::LAVA, Ids::FLOWING_LAVA));
+		$this->map(Blocks::LECTERN(), function(Lectern $block) : Writer{
+			return Writer::create(Ids::LECTERN)
+				->writeBool(StateNames::POWERED_BIT, $block->isProducingSignal())
+				->writeCardinalHorizontalFacing($block->getFacing());
+		});
+		$this->map(Blocks::LEVER(), function(Lever $block) : Writer{
+			return Writer::create(Ids::LEVER)
+				->writeBool(StateNames::OPEN_BIT, $block->isActivated())
+				->writeString(StateNames::LEVER_DIRECTION, match($block->getFacing()){
+					LeverFacing::DOWN_AXIS_Z => StringValues::LEVER_DIRECTION_DOWN_NORTH_SOUTH,
+					LeverFacing::DOWN_AXIS_X => StringValues::LEVER_DIRECTION_DOWN_EAST_WEST,
+					LeverFacing::UP_AXIS_Z => StringValues::LEVER_DIRECTION_UP_NORTH_SOUTH,
+					LeverFacing::UP_AXIS_X => StringValues::LEVER_DIRECTION_UP_EAST_WEST,
+					LeverFacing::NORTH => StringValues::LEVER_DIRECTION_NORTH,
+					LeverFacing::SOUTH => StringValues::LEVER_DIRECTION_SOUTH,
+					LeverFacing::WEST => StringValues::LEVER_DIRECTION_WEST,
+					LeverFacing::EAST => StringValues::LEVER_DIRECTION_EAST,
+				});
+		});
+		$this->map(Blocks::LIGHT(), function(Light $block) : Writer{
+			return Writer::create(match($block->getLightLevel()){
+				0 => Ids::LIGHT_BLOCK_0,
+				1 => Ids::LIGHT_BLOCK_1,
+				2 => Ids::LIGHT_BLOCK_2,
+				3 => Ids::LIGHT_BLOCK_3,
+				4 => Ids::LIGHT_BLOCK_4,
+				5 => Ids::LIGHT_BLOCK_5,
+				6 => Ids::LIGHT_BLOCK_6,
+				7 => Ids::LIGHT_BLOCK_7,
+				8 => Ids::LIGHT_BLOCK_8,
+				9 => Ids::LIGHT_BLOCK_9,
+				10 => Ids::LIGHT_BLOCK_10,
+				11 => Ids::LIGHT_BLOCK_11,
+				12 => Ids::LIGHT_BLOCK_12,
+				13 => Ids::LIGHT_BLOCK_13,
+				14 => Ids::LIGHT_BLOCK_14,
+				15 => Ids::LIGHT_BLOCK_15,
+				default => throw new BlockStateSerializeException("Invalid light level " . $block->getLightLevel()),
+			});
+		});
+		$this->map(Blocks::LIGHTNING_ROD(), function(LightningRod $block) : Writer{
+			return Writer::create(Ids::LIGHTNING_ROD)
+				->writeFacingDirection($block->getFacing());
+		});
+		$this->map(Blocks::LILAC(), fn(DoublePlant $block) => Helper::encodeDoublePlant($block, Writer::create(Ids::LILAC)));
+		$this->map(Blocks::LIT_PUMPKIN(), function(LitPumpkin $block) : Writer{
+			return Writer::create(Ids::LIT_PUMPKIN)
+				->writeCardinalHorizontalFacing($block->getFacing());
+		});
+		$this->map(Blocks::LOOM(), function(Loom $block) : Writer{
+			return Writer::create(Ids::LOOM)
+				->writeLegacyHorizontalFacing($block->getFacing());
+		});
+		$this->map(Blocks::MATERIAL_REDUCER(), fn(ChemistryTable $block) => Helper::encodeChemistryTable($block, Writer::create(Ids::MATERIAL_REDUCER)));
+		$this->map(Blocks::MELON_STEM(), fn(MelonStem $block) => Helper::encodeStem($block, new Writer(Ids::MELON_STEM)));
+		$this->mapSlab(Blocks::MOSSY_COBBLESTONE_SLAB(), Ids::MOSSY_COBBLESTONE_SLAB, Ids::MOSSY_COBBLESTONE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::MOSSY_COBBLESTONE_STAIRS(), Ids::MOSSY_COBBLESTONE_STAIRS);
+		$this->map(Blocks::MOSSY_COBBLESTONE_WALL(), fn(Wall $block) => Helper::encodeWall($block, Writer::create(Ids::MOSSY_COBBLESTONE_WALL)));
+		$this->mapSlab(Blocks::MOSSY_STONE_BRICK_SLAB(), Ids::MOSSY_STONE_BRICK_SLAB, Ids::MOSSY_STONE_BRICK_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::MOSSY_STONE_BRICK_STAIRS(), Ids::MOSSY_STONE_BRICK_STAIRS);
+		$this->map(Blocks::MOSSY_STONE_BRICK_WALL(), fn(Wall $block) => Helper::encodeWall($block, Writer::create(Ids::MOSSY_STONE_BRICK_WALL)));
+		$this->mapSlab(Blocks::MUD_BRICK_SLAB(), Ids::MUD_BRICK_SLAB, Ids::MUD_BRICK_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::MUD_BRICK_STAIRS(), Ids::MUD_BRICK_STAIRS);
+		$this->map(Blocks::MUD_BRICK_WALL(), fn(Wall $block) => Helper::encodeWall($block, new Writer(Ids::MUD_BRICK_WALL)));
+		$this->map(Blocks::MUDDY_MANGROVE_ROOTS(), fn(SimplePillar $block) => Writer::create(Ids::MUDDY_MANGROVE_ROOTS)
+				->writePillarAxis($block->getAxis()));
+		$this->map(Blocks::MUSHROOM_STEM(), fn() => Writer::create(Ids::MUSHROOM_STEM)
+				->writeInt(StateNames::HUGE_MUSHROOM_BITS, BlockLegacyMetadata::MUSHROOM_BLOCK_STEM));
+		$this->mapSlab(Blocks::NETHER_BRICK_SLAB(), Ids::NETHER_BRICK_SLAB, Ids::NETHER_BRICK_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::NETHER_BRICK_STAIRS(), Ids::NETHER_BRICK_STAIRS);
+		$this->map(Blocks::NETHER_BRICK_WALL(), fn(Wall $block) => Helper::encodeWall($block, Writer::create(Ids::NETHER_BRICK_WALL)));
+		$this->map(Blocks::NETHER_PORTAL(), function(NetherPortal $block) : Writer{
+			return Writer::create(Ids::PORTAL)
+				->writeString(StateNames::PORTAL_AXIS, match($block->getAxis()){
+					Axis::X => StringValues::PORTAL_AXIS_X,
+					Axis::Z => StringValues::PORTAL_AXIS_Z,
+					default => throw new BlockStateSerializeException("Invalid Nether Portal axis " . $block->getAxis()),
+				});
+		});
+		$this->map(Blocks::NETHER_WART(), function(NetherWartPlant $block) : Writer{
+			return Writer::create(Ids::NETHER_WART)
+				->writeInt(StateNames::AGE, $block->getAge());
+		});
+		$this->map(Blocks::PEONY(), fn(DoublePlant $block) => Helper::encodeDoublePlant($block, Writer::create(Ids::PEONY)));
+		$this->map(Blocks::PINK_PETALS(), function(PinkPetals $block) : Writer{
+			return Writer::create(Ids::PINK_PETALS)
+				->writeCardinalHorizontalFacing($block->getFacing())
+				->writeInt(StateNames::GROWTH, $block->getCount() - 1);
+		});
+		$this->map(Blocks::PITCHER_PLANT(), function(DoublePlant $block) : Writer{
+			return Writer::create(Ids::PITCHER_PLANT)
+				->writeBool(StateNames::UPPER_BLOCK_BIT, $block->isTop());
+		});
+		$this->map(Blocks::PITCHER_CROP(), function(PitcherCrop $block) : Writer{
+			return Writer::create(Ids::PITCHER_CROP)
+				->writeInt(StateNames::GROWTH, $block->getAge())
+				->writeBool(StateNames::UPPER_BLOCK_BIT, false);
+		});
+		$this->map(Blocks::DOUBLE_PITCHER_CROP(), function(DoublePitcherCrop $block) : Writer{
+			return Writer::create(Ids::PITCHER_CROP)
+				->writeInt(StateNames::GROWTH, $block->getAge() + 1 + PitcherCrop::MAX_AGE)
+				->writeBool(StateNames::UPPER_BLOCK_BIT, $block->isTop());
+		});
+		$this->mapSlab(Blocks::POLISHED_ANDESITE_SLAB(), Ids::POLISHED_ANDESITE_SLAB, Ids::POLISHED_ANDESITE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::POLISHED_ANDESITE_STAIRS(), Ids::POLISHED_ANDESITE_STAIRS);
+		$this->map(Blocks::POLISHED_BASALT(), function(SimplePillar $block) : Writer{
+			return Writer::create(Ids::POLISHED_BASALT)
+				->writePillarAxis($block->getAxis());
+		});
+		$this->mapSlab(Blocks::POLISHED_BLACKSTONE_BRICK_SLAB(), Ids::POLISHED_BLACKSTONE_BRICK_SLAB, Ids::POLISHED_BLACKSTONE_BRICK_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::POLISHED_BLACKSTONE_BRICK_STAIRS(), Ids::POLISHED_BLACKSTONE_BRICK_STAIRS);
+		$this->map(Blocks::POLISHED_BLACKSTONE_BRICK_WALL(), fn(Wall $block) => Helper::encodeWall($block, new Writer(Ids::POLISHED_BLACKSTONE_BRICK_WALL)));
+		$this->map(Blocks::POLISHED_BLACKSTONE_BUTTON(), fn(Button $block) => Helper::encodeButton($block, new Writer(Ids::POLISHED_BLACKSTONE_BUTTON)));
+		$this->map(Blocks::POLISHED_BLACKSTONE_PRESSURE_PLATE(), fn(SimplePressurePlate $block) => Helper::encodeSimplePressurePlate($block, new Writer(Ids::POLISHED_BLACKSTONE_PRESSURE_PLATE)));
+		$this->mapSlab(Blocks::POLISHED_BLACKSTONE_SLAB(), Ids::POLISHED_BLACKSTONE_SLAB, Ids::POLISHED_BLACKSTONE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::POLISHED_BLACKSTONE_STAIRS(), Ids::POLISHED_BLACKSTONE_STAIRS);
+		$this->map(Blocks::POLISHED_BLACKSTONE_WALL(), fn(Wall $block) => Helper::encodeWall($block, new Writer(Ids::POLISHED_BLACKSTONE_WALL)));
+		$this->mapSlab(Blocks::POLISHED_DEEPSLATE_SLAB(), Ids::POLISHED_DEEPSLATE_SLAB, Ids::POLISHED_DEEPSLATE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::POLISHED_DEEPSLATE_STAIRS(), Ids::POLISHED_DEEPSLATE_STAIRS);
+		$this->map(Blocks::POLISHED_DEEPSLATE_WALL(), fn(Wall $block) => Helper::encodeWall($block, new Writer(Ids::POLISHED_DEEPSLATE_WALL)));
+		$this->mapSlab(Blocks::POLISHED_DIORITE_SLAB(), Ids::POLISHED_DIORITE_SLAB, Ids::POLISHED_DIORITE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::POLISHED_DIORITE_STAIRS(), Ids::POLISHED_DIORITE_STAIRS);
+		$this->mapSlab(Blocks::POLISHED_GRANITE_SLAB(), Ids::POLISHED_GRANITE_SLAB, Ids::POLISHED_GRANITE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::POLISHED_GRANITE_STAIRS(), Ids::POLISHED_GRANITE_STAIRS);
+		$this->mapSlab(Blocks::POLISHED_TUFF_SLAB(), Ids::POLISHED_TUFF_SLAB, Ids::POLISHED_TUFF_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::POLISHED_TUFF_STAIRS(), Ids::POLISHED_TUFF_STAIRS);
+		$this->map(Blocks::POLISHED_TUFF_WALL(), fn(Wall $block) => Helper::encodeWall($block, new Writer(Ids::POLISHED_TUFF_WALL)));
+		$this->map(Blocks::POTATOES(), fn(Potato $block) => Helper::encodeCrops($block, new Writer(Ids::POTATOES)));
+		$this->map(Blocks::POWERED_RAIL(), function(PoweredRail $block) : Writer{
+			return Writer::create(Ids::GOLDEN_RAIL)
+				->writeBool(StateNames::RAIL_DATA_BIT, $block->isPowered())
+				->writeInt(StateNames::RAIL_DIRECTION, $block->getShape());
+		});
+		$this->mapSlab(Blocks::PRISMARINE_BRICKS_SLAB(), Ids::PRISMARINE_BRICK_SLAB, Ids::PRISMARINE_BRICK_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::PRISMARINE_BRICKS_STAIRS(), Ids::PRISMARINE_BRICKS_STAIRS);
+		$this->mapSlab(Blocks::PRISMARINE_SLAB(), Ids::PRISMARINE_SLAB, Ids::PRISMARINE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::PRISMARINE_STAIRS(), Ids::PRISMARINE_STAIRS);
+		$this->map(Blocks::PRISMARINE_WALL(), fn(Wall $block) => Helper::encodeWall($block, Writer::create(Ids::PRISMARINE_WALL)));
+		$this->map(Blocks::PUMPKIN(), function() : Writer{
+			return Writer::create(Ids::PUMPKIN)
+				->writeCardinalHorizontalFacing(Facing::SOUTH); //no longer used
+		});
+		$this->map(Blocks::PUMPKIN_STEM(), fn(PumpkinStem $block) => Helper::encodeStem($block, new Writer(Ids::PUMPKIN_STEM)));
+		$this->map(Blocks::PURPUR(), fn() => Writer::create(Ids::PURPUR_BLOCK)->writePillarAxis(Axis::Y));
+		$this->map(Blocks::PURPLE_TORCH(), fn(Torch $block) => Helper::encodeTorch($block, Writer::create(Ids::COLORED_TORCH_PURPLE)));
+		$this->map(Blocks::PURPUR_PILLAR(), function(SimplePillar $block) : Writer{
+			return Writer::create(Ids::PURPUR_PILLAR)
+				->writePillarAxis($block->getAxis());
+		});
+		$this->mapSlab(Blocks::PURPUR_SLAB(), Ids::PURPUR_SLAB, Ids::PURPUR_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::PURPUR_STAIRS(), Ids::PURPUR_STAIRS);
+		$this->map(Blocks::QUARTZ(), fn() => Helper::encodeQuartz(Axis::Y, Writer::create(Ids::QUARTZ_BLOCK)));
+		$this->map(Blocks::QUARTZ_PILLAR(), fn(SimplePillar $block) => Helper::encodeQuartz($block->getAxis(), Writer::create(Ids::QUARTZ_PILLAR)));
+		$this->mapSlab(Blocks::QUARTZ_SLAB(), Ids::QUARTZ_SLAB, Ids::QUARTZ_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::QUARTZ_STAIRS(), Ids::QUARTZ_STAIRS);
+		$this->map(Blocks::RAIL(), function(Rail $block) : Writer{
+			return Writer::create(Ids::RAIL)
+				->writeInt(StateNames::RAIL_DIRECTION, $block->getShape());
+		});
+		$this->map(Blocks::REDSTONE_COMPARATOR(), function(RedstoneComparator $block) : Writer{
+			return Writer::create($block->isPowered() ? Ids::POWERED_COMPARATOR : Ids::UNPOWERED_COMPARATOR)
+				->writeBool(StateNames::OUTPUT_LIT_BIT, $block->isPowered())
+				->writeBool(StateNames::OUTPUT_SUBTRACT_BIT, $block->isSubtractMode())
+				->writeCardinalHorizontalFacing($block->getFacing());
+		});
+		$this->map(Blocks::REDSTONE_LAMP(), fn(RedstoneLamp $block) => new Writer($block->isPowered() ? Ids::LIT_REDSTONE_LAMP : Ids::REDSTONE_LAMP));
+		$this->map(Blocks::REDSTONE_ORE(), fn(RedstoneOre $block) => new Writer($block->isLit() ? Ids::LIT_REDSTONE_ORE : Ids::REDSTONE_ORE));
+		$this->map(Blocks::REDSTONE_REPEATER(), function(RedstoneRepeater $block) : Writer{
+			return Writer::create($block->isPowered() ? Ids::POWERED_REPEATER : Ids::UNPOWERED_REPEATER)
+				->writeCardinalHorizontalFacing($block->getFacing())
+				->writeInt(StateNames::REPEATER_DELAY, $block->getDelay() - 1);
+		});
+		$this->map(Blocks::REDSTONE_TORCH(), function(RedstoneTorch $block) : Writer{
+			return Writer::create($block->isLit() ? Ids::REDSTONE_TORCH : Ids::UNLIT_REDSTONE_TORCH)
+				->writeTorchFacing($block->getFacing());
+		});
+		$this->map(Blocks::REDSTONE_WIRE(), function(RedstoneWire $block) : Writer{
+			return Writer::create(Ids::REDSTONE_WIRE)
+				->writeInt(StateNames::REDSTONE_SIGNAL, $block->getOutputSignalStrength());
+		});
+		$this->map(Blocks::RED_MUSHROOM_BLOCK(), fn(RedMushroomBlock $block) => Helper::encodeMushroomBlock($block, new Writer(Ids::RED_MUSHROOM_BLOCK)));
+		$this->mapSlab(Blocks::RED_NETHER_BRICK_SLAB(), Ids::RED_NETHER_BRICK_SLAB, Ids::RED_NETHER_BRICK_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::RED_NETHER_BRICK_STAIRS(), Ids::RED_NETHER_BRICK_STAIRS);
+		$this->map(Blocks::RED_NETHER_BRICK_WALL(), fn(Wall $block) => Helper::encodeWall($block, Writer::create(Ids::RED_NETHER_BRICK_WALL)));
+		$this->mapSlab(Blocks::RED_SANDSTONE_SLAB(), Ids::RED_SANDSTONE_SLAB, Ids::RED_SANDSTONE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::RED_SANDSTONE_STAIRS(), Ids::RED_SANDSTONE_STAIRS);
+		$this->map(Blocks::RED_SANDSTONE_WALL(), fn(Wall $block) => Helper::encodeWall($block, Writer::create(Ids::RED_SANDSTONE_WALL)));
+		$this->map(Blocks::RED_TORCH(), fn(Torch $block) => Helper::encodeTorch($block, Writer::create(Ids::COLORED_TORCH_RED)));
+		$this->map(Blocks::ROSE_BUSH(), fn(DoublePlant $block) => Helper::encodeDoublePlant($block, Writer::create(Ids::ROSE_BUSH)));
+		$this->mapSlab(Blocks::SANDSTONE_SLAB(), Ids::SANDSTONE_SLAB, Ids::SANDSTONE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::SANDSTONE_STAIRS(), Ids::SANDSTONE_STAIRS);
+		$this->map(Blocks::SANDSTONE_WALL(), fn(Wall $block) => Helper::encodeWall($block, Writer::create(Ids::SANDSTONE_WALL)));
+		$this->map(Blocks::SEA_PICKLE(), function(SeaPickle $block) : Writer{
+			return Writer::create(Ids::SEA_PICKLE)
+				->writeBool(StateNames::DEAD_BIT, !$block->isUnderwater())
+				->writeInt(StateNames::CLUSTER_COUNT, $block->getCount() - 1);
+		});
+		$this->map(Blocks::SMALL_DRIPLEAF(), function(SmallDripleaf $block) : Writer{
+			return Writer::create(Ids::SMALL_DRIPLEAF_BLOCK)
+				->writeCardinalHorizontalFacing($block->getFacing())
+				->writeBool(StateNames::UPPER_BLOCK_BIT, $block->isTop());
+		});
+		$this->map(Blocks::SMOKER(), fn(Furnace $block) => Helper::encodeFurnace($block, Ids::SMOKER, Ids::LIT_SMOKER));
+		$this->map(Blocks::SMOOTH_QUARTZ(), fn() => Helper::encodeQuartz(Axis::Y, Writer::create(Ids::SMOOTH_QUARTZ)));
+		$this->mapSlab(Blocks::SMOOTH_QUARTZ_SLAB(), Ids::SMOOTH_QUARTZ_SLAB, Ids::SMOOTH_QUARTZ_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::SMOOTH_QUARTZ_STAIRS(), Ids::SMOOTH_QUARTZ_STAIRS);
+		$this->mapSlab(Blocks::SMOOTH_RED_SANDSTONE_SLAB(), Ids::SMOOTH_RED_SANDSTONE_SLAB, Ids::SMOOTH_RED_SANDSTONE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::SMOOTH_RED_SANDSTONE_STAIRS(), Ids::SMOOTH_RED_SANDSTONE_STAIRS);
+		$this->mapSlab(Blocks::SMOOTH_SANDSTONE_SLAB(), Ids::SMOOTH_SANDSTONE_SLAB, Ids::SMOOTH_SANDSTONE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::SMOOTH_SANDSTONE_STAIRS(), Ids::SMOOTH_SANDSTONE_STAIRS);
+		$this->mapSlab(Blocks::SMOOTH_STONE_SLAB(), Ids::SMOOTH_STONE_SLAB, Ids::SMOOTH_STONE_DOUBLE_SLAB);
+		$this->map(Blocks::SNOW_LAYER(), function(SnowLayer $block) : Writer{
+			return Writer::create(Ids::SNOW_LAYER)
+				->writeBool(StateNames::COVERED_BIT, false)
+				->writeInt(StateNames::HEIGHT, $block->getLayers() - 1);
+		});
+		$this->map(Blocks::SOUL_CAMPFIRE(), function(SoulCampfire $block) : Writer{
+			return Writer::create(Ids::SOUL_CAMPFIRE)
+				->writeCardinalHorizontalFacing($block->getFacing())
+				->writeBool(StateNames::EXTINGUISHED, !$block->isLit());
+		});
+		$this->map(Blocks::SOUL_FIRE(), function() : Writer{
+			return Writer::create(Ids::SOUL_FIRE)
+				->writeInt(StateNames::AGE, 0); //useless for soul fire, we don't track it
+		});
+		$this->map(Blocks::SOUL_LANTERN(), function(Lantern $block) : Writer{
+			return Writer::create(Ids::SOUL_LANTERN)
+				->writeBool(StateNames::HANGING, $block->isHanging());
+		});
+		$this->map(Blocks::SOUL_TORCH(), function(Torch $block) : Writer{
+			return Writer::create(Ids::SOUL_TORCH)
+				->writeTorchFacing($block->getFacing());
+		});
+		$this->map(Blocks::SPONGE(), fn(Sponge $block) => Writer::create($block->isWet() ? Ids::WET_SPONGE : Ids::SPONGE));
+		$this->map(Blocks::STONECUTTER(), fn(Stonecutter $block) => Writer::create(Ids::STONECUTTER_BLOCK)
+			->writeCardinalHorizontalFacing($block->getFacing()));
+		$this->mapSlab(Blocks::STONE_BRICK_SLAB(), Ids::STONE_BRICK_SLAB, Ids::STONE_BRICK_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::STONE_BRICK_STAIRS(), Ids::STONE_BRICK_STAIRS);
+		$this->map(Blocks::STONE_BRICK_WALL(), fn(Wall $block) => Helper::encodeWall($block, Writer::create(Ids::STONE_BRICK_WALL)));
+		$this->map(Blocks::STONE_BUTTON(), fn(StoneButton $block) => Helper::encodeButton($block, new Writer(Ids::STONE_BUTTON)));
+		$this->map(Blocks::STONE_PRESSURE_PLATE(), fn(StonePressurePlate $block) => Helper::encodeSimplePressurePlate($block, new Writer(Ids::STONE_PRESSURE_PLATE)));
+		$this->mapSlab(Blocks::STONE_SLAB(), Ids::NORMAL_STONE_SLAB, Ids::NORMAL_STONE_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::STONE_STAIRS(), Ids::NORMAL_STONE_STAIRS);
+		$this->map(Blocks::SUGARCANE(), function(Sugarcane $block) : Writer{
+			return Writer::create(Ids::REEDS)
+				->writeInt(StateNames::AGE, $block->getAge());
+		});
+		$this->map(Blocks::SUNFLOWER(), fn(DoublePlant $block) => Helper::encodeDoublePlant($block, Writer::create(Ids::SUNFLOWER)));
+		$this->map(Blocks::SWEET_BERRY_BUSH(), function(SweetBerryBush $block) : Writer{
+			return Writer::create(Ids::SWEET_BERRY_BUSH)
+				->writeInt(StateNames::GROWTH, $block->getAge());
+		});
+		$this->map(Blocks::TNT(), fn(TNT $block) => Writer::create($block->worksUnderwater() ? Ids::UNDERWATER_TNT : Ids::TNT)
+				->writeBool(StateNames::EXPLODE_BIT, $block->isUnstable())
+		);
+		$this->map(Blocks::TORCH(), function(Torch $block) : Writer{
+			return Writer::create(Ids::TORCH)
+				->writeTorchFacing($block->getFacing());
+		});
+		$this->map(Blocks::TORCHFLOWER_CROP(), function(TorchflowerCrop $block){
+			return Writer::create(Ids::TORCHFLOWER_CROP)
+				->writeInt(StateNames::GROWTH, $block->isReady() ? 1 : 0);
+		});
+		$this->map(Blocks::TRAPPED_CHEST(), function(TrappedChest $block) : Writer{
+			return Writer::create(Ids::TRAPPED_CHEST)
+				->writeCardinalHorizontalFacing($block->getFacing());
+		});
+		$this->map(Blocks::TRIPWIRE(), function(Tripwire $block) : Writer{
+			return Writer::create(Ids::TRIP_WIRE)
+				->writeBool(StateNames::ATTACHED_BIT, $block->isConnected())
+				->writeBool(StateNames::DISARMED_BIT, $block->isDisarmed())
+				->writeBool(StateNames::POWERED_BIT, $block->isTriggered())
+				->writeBool(StateNames::SUSPENDED_BIT, $block->isSuspended());
+		});
+		$this->map(Blocks::TRIPWIRE_HOOK(), function(TripwireHook $block) : Writer{
+			return Writer::create(Ids::TRIPWIRE_HOOK)
+				->writeBool(StateNames::ATTACHED_BIT, $block->isConnected())
+				->writeBool(StateNames::POWERED_BIT, $block->isPowered())
+				->writeLegacyHorizontalFacing($block->getFacing());
+		});
+		$this->mapSlab(Blocks::TUFF_BRICK_SLAB(), Ids::TUFF_BRICK_SLAB, Ids::TUFF_BRICK_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::TUFF_BRICK_STAIRS(), Ids::TUFF_BRICK_STAIRS);
+		$this->map(Blocks::TUFF_BRICK_WALL(), fn(Wall $block) => Helper::encodeWall($block, new Writer(Ids::TUFF_BRICK_WALL)));
+		$this->mapSlab(Blocks::TUFF_SLAB(), Ids::TUFF_SLAB, Ids::TUFF_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::TUFF_STAIRS(), Ids::TUFF_STAIRS);
+		$this->map(Blocks::TUFF_WALL(), fn(Wall $block) => Helper::encodeWall($block, new Writer(Ids::TUFF_WALL)));
+		$this->map(Blocks::TWISTING_VINES(), function(NetherVines $block) : Writer{
+			return Writer::create(Ids::TWISTING_VINES)
+				->writeInt(StateNames::TWISTING_VINES_AGE, $block->getAge());
+		});
+		$this->map(Blocks::UNDERWATER_TORCH(), function(UnderwaterTorch $block) : Writer{
+			return Writer::create(Ids::UNDERWATER_TORCH)
+				->writeTorchFacing($block->getFacing());
+		});
+		$this->map(Blocks::VINES(), function(Vine $block) : Writer{
+			return Writer::create(Ids::VINE)
+				->writeInt(StateNames::VINE_DIRECTION_BITS, ($block->hasFace(Facing::NORTH) ? BlockLegacyMetadata::VINE_FLAG_NORTH : 0) | ($block->hasFace(Facing::SOUTH) ? BlockLegacyMetadata::VINE_FLAG_SOUTH : 0) | ($block->hasFace(Facing::WEST) ? BlockLegacyMetadata::VINE_FLAG_WEST : 0) | ($block->hasFace(Facing::EAST) ? BlockLegacyMetadata::VINE_FLAG_EAST : 0));
+		});
+		$this->map(Blocks::WALL_BANNER(), function(WallBanner $block) : Writer{
+			return Writer::create(Ids::WALL_BANNER)
+				->writeHorizontalFacing($block->getFacing());
+		});
+		$this->map(Blocks::WATER(), fn(Water $block) => Helper::encodeLiquid($block, Ids::WATER, Ids::FLOWING_WATER));
+		$this->map(Blocks::WEEPING_VINES(), function(NetherVines $block) : Writer{
+			return Writer::create(Ids::WEEPING_VINES)
+				->writeInt(StateNames::WEEPING_VINES_AGE, $block->getAge());
+		});
+		$this->map(Blocks::WEIGHTED_PRESSURE_PLATE_HEAVY(), function(WeightedPressurePlateHeavy $block) : Writer{
+			return Writer::create(Ids::HEAVY_WEIGHTED_PRESSURE_PLATE)
+				->writeInt(StateNames::REDSTONE_SIGNAL, $block->getOutputSignalStrength());
+		});
+		$this->map(Blocks::WEIGHTED_PRESSURE_PLATE_LIGHT(), function(WeightedPressurePlateLight $block) : Writer{
+			return Writer::create(Ids::LIGHT_WEIGHTED_PRESSURE_PLATE)
+				->writeInt(StateNames::REDSTONE_SIGNAL, $block->getOutputSignalStrength());
+		});
+		$this->map(Blocks::WHEAT(), fn(Wheat $block) => Helper::encodeCrops($block, new Writer(Ids::WHEAT)));
+	}
+}
diff --git a/src/data/bedrock/block/convert/BlockStateDeserializerHelper.php b/src/data/bedrock/block/convert/BlockStateDeserializerHelper.php
new file mode 100644
index 0000000000..fda0455aa3
--- /dev/null
+++ b/src/data/bedrock/block/convert/BlockStateDeserializerHelper.php
@@ -0,0 +1,296 @@
+<?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\block\convert;
+
+use pocketmine\block\Block;
+use pocketmine\block\Button;
+use pocketmine\block\Candle;
+use pocketmine\block\Crops;
+use pocketmine\block\DaylightSensor;
+use pocketmine\block\Door;
+use pocketmine\block\DoublePlant;
+use pocketmine\block\FenceGate;
+use pocketmine\block\FloorCoralFan;
+use pocketmine\block\FloorSign;
+use pocketmine\block\ItemFrame;
+use pocketmine\block\Leaves;
+use pocketmine\block\Liquid;
+use pocketmine\block\RedMushroomBlock;
+use pocketmine\block\RedstoneComparator;
+use pocketmine\block\RedstoneRepeater;
+use pocketmine\block\Sapling;
+use pocketmine\block\SimplePressurePlate;
+use pocketmine\block\Slab;
+use pocketmine\block\Stair;
+use pocketmine\block\Stem;
+use pocketmine\block\Trapdoor;
+use pocketmine\block\utils\CopperMaterial;
+use pocketmine\block\utils\CopperOxidation;
+use pocketmine\block\utils\SlabType;
+use pocketmine\block\Wall;
+use pocketmine\block\WallSign;
+use pocketmine\block\WeightedPressurePlate;
+use pocketmine\block\Wood;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
+use pocketmine\data\bedrock\block\BlockStateDeserializeException;
+use pocketmine\data\bedrock\block\BlockStateNames;
+use pocketmine\data\bedrock\block\BlockStateNames as StateNames;
+use pocketmine\data\bedrock\MushroomBlockTypeIdMap;
+use pocketmine\math\Axis;
+use pocketmine\math\Facing;
+use pocketmine\utils\AssumptionFailedError;
+
+final class BlockStateDeserializerHelper{
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeButton(Button $block, BlockStateReader $in) : Button{
+		return $block
+			->setFacing($in->readFacingDirection())
+			->setPressed($in->readBool(BlockStateNames::BUTTON_PRESSED_BIT));
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeCandle(Candle $block, BlockStateReader $in) : Candle{
+		return $block
+			->setCount($in->readBoundedInt(StateNames::CANDLES, 0, 3) + 1)
+			->setLit($in->readBool(StateNames::LIT));
+	}
+
+	/**
+	 * @phpstan-template TCrops of Crops
+	 * @phpstan-param TCrops $block
+	 * @phpstan-return TCrops
+	 *
+	 * @throws BlockStateDeserializeException
+	 */
+	public static function decodeCrops(Crops $block, BlockStateReader $in) : Crops{
+		return $block->setAge($in->readBoundedInt(BlockStateNames::GROWTH, 0, 7));
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeComparator(RedstoneComparator $block, BlockStateReader $in) : RedstoneComparator{
+		return $block
+			->setFacing($in->readCardinalHorizontalFacing())
+			->setPowered($in->readBool(BlockStateNames::OUTPUT_LIT_BIT))
+			->setSubtractMode($in->readBool(BlockStateNames::OUTPUT_SUBTRACT_BIT));
+	}
+
+	/**
+	 * @phpstan-template TBlock of CopperMaterial
+	 *
+	 * @phpstan-param TBlock $block
+	 * @phpstan-return TBlock
+	 */
+	public static function decodeCopper(CopperMaterial $block, CopperOxidation $oxidation) : CopperMaterial{
+		$block->setOxidation($oxidation);
+		$block->setWaxed(false);
+		return $block;
+	}
+
+	/**
+	 * @phpstan-template TBlock of CopperMaterial
+	 *
+	 * @phpstan-param TBlock $block
+	 * @phpstan-return TBlock
+	 */
+	public static function decodeWaxedCopper(CopperMaterial $block, CopperOxidation $oxidation) : CopperMaterial{
+		$block->setOxidation($oxidation);
+		$block->setWaxed(true);
+		return $block;
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeDaylightSensor(DaylightSensor $block, BlockStateReader $in) : DaylightSensor{
+		return $block
+			->setOutputSignalStrength($in->readBoundedInt(BlockStateNames::REDSTONE_SIGNAL, 0, 15));
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeDoor(Door $block, BlockStateReader $in) : Door{
+		//TODO: check if these need any special treatment to get the appropriate data to both halves of the door
+		return $block
+			->setTop($in->readBool(BlockStateNames::UPPER_BLOCK_BIT))
+			->setFacing(Facing::rotateY($in->readLegacyHorizontalFacing(), false))
+			->setHingeRight($in->readBool(BlockStateNames::DOOR_HINGE_BIT))
+			->setOpen($in->readBool(BlockStateNames::OPEN_BIT));
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeDoublePlant(DoublePlant $block, BlockStateReader $in) : DoublePlant{
+		return $block
+			->setTop($in->readBool(BlockStateNames::UPPER_BLOCK_BIT));
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeFenceGate(FenceGate $block, BlockStateReader $in) : FenceGate{
+		return $block
+			->setFacing($in->readLegacyHorizontalFacing())
+			->setInWall($in->readBool(BlockStateNames::IN_WALL_BIT))
+			->setOpen($in->readBool(BlockStateNames::OPEN_BIT));
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeFloorCoralFan(FloorCoralFan $block, BlockStateReader $in) : FloorCoralFan{
+		return $block
+			->setAxis(match($in->readBoundedInt(BlockStateNames::CORAL_FAN_DIRECTION, 0, 1)){
+				0 => Axis::X,
+				1 => Axis::Z,
+				default => throw new AssumptionFailedError("readBoundedInt() should have prevented this"),
+			});
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeFloorSign(FloorSign $block, BlockStateReader $in) : FloorSign{
+		return $block
+			->setRotation($in->readBoundedInt(BlockStateNames::GROUND_SIGN_DIRECTION, 0, 15));
+	}
+
+	public static function decodeItemFrame(ItemFrame $block, BlockStateReader $in) : ItemFrame{
+		$in->todo(StateNames::ITEM_FRAME_PHOTO_BIT); //TODO: not sure what the point of this is
+		return $block
+			->setFacing($in->readFacingDirection())
+			->setHasMap($in->readBool(StateNames::ITEM_FRAME_MAP_BIT));
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeLeaves(Leaves $block, BlockStateReader $in) : Leaves{
+		return $block
+			->setNoDecay($in->readBool(StateNames::PERSISTENT_BIT))
+			->setCheckDecay($in->readBool(StateNames::UPDATE_BIT));
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeLiquid(Liquid $block, BlockStateReader $in, bool $still) : Liquid{
+		$fluidHeightState = $in->readBoundedInt(BlockStateNames::LIQUID_DEPTH, 0, 15);
+		return $block
+			->setDecay($fluidHeightState & 0x7)
+			->setFalling(($fluidHeightState & 0x8) !== 0)
+			->setStill($still);
+	}
+
+	public static function decodeFlowingLiquid(Liquid $block, BlockStateReader $in) : Liquid{
+		return self::decodeLiquid($block, $in, false);
+	}
+
+	public static function decodeStillLiquid(Liquid $block, BlockStateReader $in) : Liquid{
+		return self::decodeLiquid($block, $in, true);
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeLog(Wood $block, bool $stripped, BlockStateReader $in) : Wood{
+		return $block
+			->setAxis($in->readPillarAxis())
+			->setStripped($stripped);
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeMushroomBlock(RedMushroomBlock $block, BlockStateReader $in) : Block{
+		switch($type = $in->readBoundedInt(BlockStateNames::HUGE_MUSHROOM_BITS, 0, 15)){
+			case BlockLegacyMetadata::MUSHROOM_BLOCK_ALL_STEM:
+			case BlockLegacyMetadata::MUSHROOM_BLOCK_STEM: throw new BlockStateDeserializeException("This state does not exist");
+			default:
+				//invalid types get left as default
+				$type = MushroomBlockTypeIdMap::getInstance()->fromId($type);
+				return $type !== null ? $block->setMushroomBlockType($type) : $block;
+		}
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeRepeater(RedstoneRepeater $block, BlockStateReader $in) : RedstoneRepeater{
+		return $block
+			->setFacing($in->readCardinalHorizontalFacing())
+			->setDelay($in->readBoundedInt(BlockStateNames::REPEATER_DELAY, 0, 3) + 1);
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeSapling(Sapling $block, BlockStateReader $in) : Sapling{
+		return $block
+			->setReady($in->readBool(BlockStateNames::AGE_BIT));
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeSimplePressurePlate(SimplePressurePlate $block, BlockStateReader $in) : SimplePressurePlate{
+		//TODO: not sure what the deal is here ... seems like a mojang bug / artifact of bad implementation?
+		//best to keep this separate from weighted plates anyway...
+		return $block->setPressed($in->readBoundedInt(BlockStateNames::REDSTONE_SIGNAL, 0, 15) !== 0);
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeSingleSlab(Slab $block, BlockStateReader $in) : Slab{
+		return $block->setSlabType($in->readSlabPosition());
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeDoubleSlab(Slab $block, BlockStateReader $in) : Slab{
+		$in->ignored(StateNames::MC_VERTICAL_HALF);
+		return $block->setSlabType(SlabType::DOUBLE);
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeStairs(Stair $block, BlockStateReader $in) : Stair{
+		return $block
+			->setUpsideDown($in->readBool(BlockStateNames::UPSIDE_DOWN_BIT))
+			->setFacing($in->readWeirdoHorizontalFacing());
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeStem(Stem $block, BlockStateReader $in) : Stem{
+		//In PM, we use Facing::UP to indicate that the stem is not attached to a pumpkin/melon, since this makes the
+		//most intuitive sense (the stem is pointing at the sky). However, Bedrock uses the DOWN state for this, which
+		//is absurd, and I refuse to make our API similarly absurd.
+		$facing = $in->readFacingWithoutUp();
+		return self::decodeCrops($block, $in)
+			->setFacing($facing === Facing::DOWN ? Facing::UP : $facing);
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeTrapdoor(Trapdoor $block, BlockStateReader $in) : Trapdoor{
+		return $block
+			->setFacing($in->read5MinusHorizontalFacing())
+			->setTop($in->readBool(BlockStateNames::UPSIDE_DOWN_BIT))
+			->setOpen($in->readBool(BlockStateNames::OPEN_BIT));
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeWall(Wall $block, BlockStateReader $in) : Wall{
+		$block->setPost($in->readBool(BlockStateNames::WALL_POST_BIT));
+		$block->setConnection(Facing::NORTH, $in->readWallConnectionType(BlockStateNames::WALL_CONNECTION_TYPE_NORTH));
+		$block->setConnection(Facing::SOUTH, $in->readWallConnectionType(BlockStateNames::WALL_CONNECTION_TYPE_SOUTH));
+		$block->setConnection(Facing::WEST, $in->readWallConnectionType(BlockStateNames::WALL_CONNECTION_TYPE_WEST));
+		$block->setConnection(Facing::EAST, $in->readWallConnectionType(BlockStateNames::WALL_CONNECTION_TYPE_EAST));
+
+		return $block;
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public static function decodeWallSign(WallSign $block, BlockStateReader $in) : WallSign{
+		return $block
+			->setFacing($in->readHorizontalFacing());
+	}
+
+	public static function decodeWeightedPressurePlate(WeightedPressurePlate $block, BlockStateReader $in) : WeightedPressurePlate{
+		return $block
+			->setOutputSignalStrength($in->readBoundedInt(BlockStateNames::REDSTONE_SIGNAL, 0, 15));
+	}
+}
diff --git a/src/data/bedrock/block/convert/BlockStateReader.php b/src/data/bedrock/block/convert/BlockStateReader.php
new file mode 100644
index 0000000000..e3a02885f0
--- /dev/null
+++ b/src/data/bedrock/block/convert/BlockStateReader.php
@@ -0,0 +1,361 @@
+<?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\block\convert;
+
+use pocketmine\block\utils\BellAttachmentType;
+use pocketmine\block\utils\SlabType;
+use pocketmine\block\utils\WallConnectionType;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\data\bedrock\block\BlockStateDeserializeException;
+use pocketmine\data\bedrock\block\BlockStateNames;
+use pocketmine\data\bedrock\block\BlockStateStringValues as StringValues;
+use pocketmine\math\Axis;
+use pocketmine\math\Facing;
+use pocketmine\nbt\tag\ByteTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\StringTag;
+use pocketmine\nbt\tag\Tag;
+use function array_keys;
+use function count;
+use function get_class;
+use function implode;
+
+final class BlockStateReader{
+
+	/**
+	 * @var Tag[]
+	 * @phpstan-var array<string, Tag>
+	 */
+	private array $unusedStates;
+
+	public function __construct(
+		private BlockStateData $data
+	){
+		$this->unusedStates = $this->data->getStates();
+	}
+
+	public function missingOrWrongTypeException(string $name, ?Tag $tag) : BlockStateDeserializeException{
+		return new BlockStateDeserializeException("Property \"$name\" " . ($tag !== null ? "has unexpected type " . get_class($tag) : "is missing"));
+	}
+
+	public function badValueException(string $name, string $stringifiedValue, ?string $reason = null) : BlockStateDeserializeException{
+		return new BlockStateDeserializeException(
+			"Property \"$name\" has unexpected value \"$stringifiedValue\"" . (
+			$reason !== null ? " ($reason)" : ""
+		));
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function readBool(string $name) : bool{
+		unset($this->unusedStates[$name]);
+		$tag = $this->data->getState($name);
+		if($tag instanceof ByteTag){
+			switch($tag->getValue()){
+				case 0: return false;
+				case 1: return true;
+				default: throw $this->badValueException($name, (string) $tag->getValue());
+			}
+		}
+		throw $this->missingOrWrongTypeException($name, $tag);
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function readInt(string $name) : int{
+		unset($this->unusedStates[$name]);
+		$tag = $this->data->getState($name);
+		if($tag instanceof IntTag){
+			return $tag->getValue();
+		}
+		throw $this->missingOrWrongTypeException($name, $tag);
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function readBoundedInt(string $name, int $min, int $max) : int{
+		$result = $this->readInt($name);
+		if($result < $min || $result > $max){
+			throw $this->badValueException($name, (string) $result, "Must be inside the range $min ... $max");
+		}
+		return $result;
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function readString(string $name) : string{
+		unset($this->unusedStates[$name]);
+		//TODO: only allow a specific set of values (strings are primarily used for enums)
+		$tag = $this->data->getState($name);
+		if($tag instanceof StringTag){
+			return $tag->getValue();
+		}
+		throw $this->missingOrWrongTypeException($name, $tag);
+	}
+
+	/**
+	 * @param int[] $mapping
+	 * @phpstan-param array<int, int> $mapping
+	 * @phpstan-return int
+	 * @throws BlockStateDeserializeException
+	 */
+	private function parseFacingValue(int $value, array $mapping) : int{
+		$result = $mapping[$value] ?? null;
+		if($result === null){
+			throw new BlockStateDeserializeException("Unmapped facing value " . $value);
+		}
+		return $result;
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function readFacingDirection() : int{
+		return $this->parseFacingValue($this->readInt(BlockStateNames::FACING_DIRECTION), [
+			0 => Facing::DOWN,
+			1 => Facing::UP,
+			2 => Facing::NORTH,
+			3 => Facing::SOUTH,
+			4 => Facing::WEST,
+			5 => Facing::EAST
+		]);
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function readBlockFace() : int{
+		return match($raw = $this->readString(BlockStateNames::MC_BLOCK_FACE)){
+			StringValues::MC_BLOCK_FACE_DOWN => Facing::DOWN,
+			StringValues::MC_BLOCK_FACE_UP => Facing::UP,
+			StringValues::MC_BLOCK_FACE_NORTH => Facing::NORTH,
+			StringValues::MC_BLOCK_FACE_SOUTH => Facing::SOUTH,
+			StringValues::MC_BLOCK_FACE_WEST => Facing::WEST,
+			StringValues::MC_BLOCK_FACE_EAST => Facing::EAST,
+			default => throw $this->badValueException(BlockStateNames::MC_BLOCK_FACE, $raw)
+		};
+	}
+
+	/**
+	 * @return int[]
+	 * @phpstan-return array<int, int>
+	 */
+	public function readFacingFlags() : array{
+		$result = [];
+		$flags = $this->readBoundedInt(BlockStateNames::MULTI_FACE_DIRECTION_BITS, 0, 63);
+		foreach([
+			BlockLegacyMetadata::MULTI_FACE_DIRECTION_FLAG_DOWN => Facing::DOWN,
+			BlockLegacyMetadata::MULTI_FACE_DIRECTION_FLAG_UP => Facing::UP,
+			BlockLegacyMetadata::MULTI_FACE_DIRECTION_FLAG_NORTH => Facing::NORTH,
+			BlockLegacyMetadata::MULTI_FACE_DIRECTION_FLAG_SOUTH => Facing::SOUTH,
+			BlockLegacyMetadata::MULTI_FACE_DIRECTION_FLAG_WEST => Facing::WEST,
+			BlockLegacyMetadata::MULTI_FACE_DIRECTION_FLAG_EAST => Facing::EAST
+		] as $flag => $facing){
+			if(($flags & $flag) !== 0){
+				$result[$facing] = $facing;
+			}
+		}
+
+		return $result;
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function readEndRodFacingDirection() : int{
+		$result = $this->readFacingDirection();
+		return Facing::axis($result) !== Axis::Y ? Facing::opposite($result) : $result;
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function readHorizontalFacing() : int{
+		return $this->parseFacingValue($this->readInt(BlockStateNames::FACING_DIRECTION), [
+			0 => Facing::NORTH, //should be illegal, but 1.13 allows it
+			1 => Facing::NORTH, //also should be illegal
+			2 => Facing::NORTH,
+			3 => Facing::SOUTH,
+			4 => Facing::WEST,
+			5 => Facing::EAST
+		]);
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function readWeirdoHorizontalFacing() : int{
+		return $this->parseFacingValue($this->readInt(BlockStateNames::WEIRDO_DIRECTION), [
+			0 => Facing::EAST,
+			1 => Facing::WEST,
+			2 => Facing::SOUTH,
+			3 => Facing::NORTH
+		]);
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function readLegacyHorizontalFacing() : int{
+		return $this->parseFacingValue($this->readInt(BlockStateNames::DIRECTION), [
+			0 => Facing::SOUTH,
+			1 => Facing::WEST,
+			2 => Facing::NORTH,
+			3 => Facing::EAST
+		]);
+	}
+
+	/**
+	 * This is for trapdoors, because Mojang botched the conversion in 1.13
+	 * @throws BlockStateDeserializeException
+	 */
+	public function read5MinusHorizontalFacing() : int{
+		return $this->parseFacingValue($this->readInt(BlockStateNames::DIRECTION), [
+			0 => Facing::EAST,
+			1 => Facing::WEST,
+			2 => Facing::SOUTH,
+			3 => Facing::NORTH
+		]);
+	}
+
+	/**
+	 * Used by pumpkins as of 1.20.0.23 beta
+	 * @throws BlockStateDeserializeException
+	 */
+	public function readCardinalHorizontalFacing() : int{
+		return match($raw = $this->readString(BlockStateNames::MC_CARDINAL_DIRECTION)){
+			StringValues::MC_CARDINAL_DIRECTION_NORTH => Facing::NORTH,
+			StringValues::MC_CARDINAL_DIRECTION_SOUTH => Facing::SOUTH,
+			StringValues::MC_CARDINAL_DIRECTION_WEST => Facing::WEST,
+			StringValues::MC_CARDINAL_DIRECTION_EAST => Facing::EAST,
+			default => throw $this->badValueException(BlockStateNames::MC_CARDINAL_DIRECTION, $raw)
+		};
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function readCoralFacing() : int{
+		return $this->parseFacingValue($this->readInt(BlockStateNames::CORAL_DIRECTION), [
+			0 => Facing::WEST,
+			1 => Facing::EAST,
+			2 => Facing::NORTH,
+			3 => Facing::SOUTH
+		]);
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function readFacingWithoutDown() : int{
+		$result = $this->readFacingDirection();
+		if($result === Facing::DOWN){ //shouldn't be legal, but 1.13 allows it
+			$result = Facing::UP;
+		}
+		return $result;
+	}
+
+	public function readFacingWithoutUp() : int{
+		$result = $this->readFacingDirection();
+		if($result === Facing::UP){
+			$result = Facing::DOWN; //shouldn't be legal, but 1.13 allows it
+		}
+		return $result;
+	}
+
+	/**
+	 * @phpstan-return Axis::*
+	 * @throws BlockStateDeserializeException
+	 */
+	public function readPillarAxis() : int{
+		$rawValue = $this->readString(BlockStateNames::PILLAR_AXIS);
+		$value = [
+			StringValues::PILLAR_AXIS_X => Axis::X,
+			StringValues::PILLAR_AXIS_Y => Axis::Y,
+			StringValues::PILLAR_AXIS_Z => Axis::Z
+		][$rawValue] ?? null;
+		if($value === null){
+			throw $this->badValueException(BlockStateNames::PILLAR_AXIS, $rawValue, "Invalid axis value");
+		}
+		return $value;
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function readSlabPosition() : SlabType{
+		return match($rawValue = $this->readString(BlockStateNames::MC_VERTICAL_HALF)){
+			StringValues::MC_VERTICAL_HALF_BOTTOM => SlabType::BOTTOM,
+			StringValues::MC_VERTICAL_HALF_TOP => SlabType::TOP,
+			default => throw $this->badValueException(BlockStateNames::MC_VERTICAL_HALF, $rawValue, "Invalid slab position"),
+		};
+	}
+
+	/**
+	 * @phpstan-return Facing::UP|Facing::NORTH|Facing::SOUTH|Facing::WEST|Facing::EAST
+	 * @throws BlockStateDeserializeException
+	 */
+	public function readTorchFacing() : int{
+		//TODO: horizontal directions are flipped (MCPE bug: https://bugs.mojang.com/browse/MCPE-152036)
+		return match($rawValue = $this->readString(BlockStateNames::TORCH_FACING_DIRECTION)){
+			StringValues::TORCH_FACING_DIRECTION_EAST => Facing::WEST,
+			StringValues::TORCH_FACING_DIRECTION_NORTH => Facing::SOUTH,
+			StringValues::TORCH_FACING_DIRECTION_SOUTH => Facing::NORTH,
+			StringValues::TORCH_FACING_DIRECTION_TOP => Facing::UP,
+			StringValues::TORCH_FACING_DIRECTION_UNKNOWN => Facing::UP, //should be illegal, but 1.13 allows it
+			StringValues::TORCH_FACING_DIRECTION_WEST => Facing::EAST,
+			default => throw $this->badValueException(BlockStateNames::TORCH_FACING_DIRECTION, $rawValue, "Invalid torch facing"),
+		};
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function readBellAttachmentType() : BellAttachmentType{
+		return match($type = $this->readString(BlockStateNames::ATTACHMENT)){
+			StringValues::ATTACHMENT_HANGING => BellAttachmentType::CEILING,
+			StringValues::ATTACHMENT_STANDING => BellAttachmentType::FLOOR,
+			StringValues::ATTACHMENT_SIDE => BellAttachmentType::ONE_WALL,
+			StringValues::ATTACHMENT_MULTIPLE => BellAttachmentType::TWO_WALLS,
+			default => throw $this->badValueException(BlockStateNames::ATTACHMENT, $type),
+		};
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function readWallConnectionType(string $name) : ?WallConnectionType{
+		return match($type = $this->readString($name)){
+			//TODO: this looks a bit confusing due to use of EAST, but the values are the same for all connections
+			//we need to find a better way to auto-generate the constant names when they are reused
+			//for now, using these constants is better than nothing since it still gives static analysability
+			StringValues::WALL_CONNECTION_TYPE_EAST_NONE => null,
+			StringValues::WALL_CONNECTION_TYPE_EAST_SHORT => WallConnectionType::SHORT,
+			StringValues::WALL_CONNECTION_TYPE_EAST_TALL => WallConnectionType::TALL,
+			default => throw $this->badValueException($name, $type),
+		};
+	}
+
+	/**
+	 * Explicitly mark a property as unused, so it doesn't get flagged as an error when debug mode is enabled
+	 */
+	public function ignored(string $name) : void{
+		if($this->data->getState($name) !== null){
+			unset($this->unusedStates[$name]);
+		}else{
+			throw $this->missingOrWrongTypeException($name, null);
+		}
+	}
+
+	/**
+	 * Used to mark unused properties that haven't been implemented yet
+	 */
+	public function todo(string $name) : void{
+		$this->ignored($name);
+	}
+
+	/**
+	 * @throws BlockStateDeserializeException
+	 */
+	public function checkUnreadProperties() : void{
+		if(count($this->unusedStates) > 0){
+			throw new BlockStateDeserializeException("Unread properties: " . implode(", ", array_keys($this->unusedStates)));
+		}
+	}
+}
diff --git a/src/data/bedrock/block/convert/BlockStateSerializerHelper.php b/src/data/bedrock/block/convert/BlockStateSerializerHelper.php
new file mode 100644
index 0000000000..3e22157461
--- /dev/null
+++ b/src/data/bedrock/block/convert/BlockStateSerializerHelper.php
@@ -0,0 +1,230 @@
+<?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\block\convert;
+
+use pocketmine\block\Button;
+use pocketmine\block\Candle;
+use pocketmine\block\ChemistryTable;
+use pocketmine\block\Crops;
+use pocketmine\block\Door;
+use pocketmine\block\DoublePlant;
+use pocketmine\block\FenceGate;
+use pocketmine\block\FloorSign;
+use pocketmine\block\Furnace;
+use pocketmine\block\ItemFrame;
+use pocketmine\block\Leaves;
+use pocketmine\block\Liquid;
+use pocketmine\block\RedMushroomBlock;
+use pocketmine\block\Sapling;
+use pocketmine\block\SimplePressurePlate;
+use pocketmine\block\Slab;
+use pocketmine\block\Stair;
+use pocketmine\block\Stem;
+use pocketmine\block\Torch;
+use pocketmine\block\Trapdoor;
+use pocketmine\block\utils\CopperOxidation;
+use pocketmine\block\utils\SlabType;
+use pocketmine\block\Wall;
+use pocketmine\block\WallSign;
+use pocketmine\block\Wood;
+use pocketmine\data\bedrock\block\BlockStateNames;
+use pocketmine\data\bedrock\block\BlockStateNames as StateNames;
+use pocketmine\data\bedrock\block\BlockTypeNames as Ids;
+use pocketmine\data\bedrock\block\convert\BlockStateWriter as Writer;
+use pocketmine\data\bedrock\MushroomBlockTypeIdMap;
+use pocketmine\math\Facing;
+
+final class BlockStateSerializerHelper{
+	public static function encodeButton(Button $block, Writer $out) : Writer{
+		return $out
+			->writeFacingDirection($block->getFacing())
+			->writeBool(BlockStateNames::BUTTON_PRESSED_BIT, $block->isPressed());
+	}
+
+	public static function encodeCandle(Candle $block, Writer $out) : Writer{
+		return $out
+			->writeBool(StateNames::LIT, $block->isLit())
+			->writeInt(StateNames::CANDLES, $block->getCount() - 1);
+	}
+
+	public static function encodeChemistryTable(ChemistryTable $block, Writer $out) : Writer{
+		return $out
+			->writeLegacyHorizontalFacing(Facing::opposite($block->getFacing()));
+	}
+
+	public static function encodeCrops(Crops $block, Writer $out) : Writer{
+		return $out->writeInt(BlockStateNames::GROWTH, $block->getAge());
+	}
+
+	public static function encodeTorch(Torch $block, Writer $out) : Writer{
+		return $out
+			->writeTorchFacing($block->getFacing());
+	}
+
+	public static function encodeCauldron(string $liquid, int $fillLevel) : Writer{
+		return Writer::create(Ids::CAULDRON)
+			->writeString(BlockStateNames::CAULDRON_LIQUID, $liquid)
+			->writeInt(BlockStateNames::FILL_LEVEL, $fillLevel);
+	}
+
+	public static function selectCopperId(CopperOxidation $oxidation, string $noneId, string $exposedId, string $weatheredId, string $oxidizedId) : string{
+		return match($oxidation){
+			CopperOxidation::NONE => $noneId,
+			CopperOxidation::EXPOSED => $exposedId,
+			CopperOxidation::WEATHERED => $weatheredId,
+			CopperOxidation::OXIDIZED => $oxidizedId,
+		};
+	}
+
+	public static function encodeDoor(Door $block, Writer $out) : Writer{
+		return $out
+			->writeBool(BlockStateNames::UPPER_BLOCK_BIT, $block->isTop())
+			->writeLegacyHorizontalFacing(Facing::rotateY($block->getFacing(), true))
+			->writeBool(BlockStateNames::DOOR_HINGE_BIT, $block->isHingeRight())
+			->writeBool(BlockStateNames::OPEN_BIT, $block->isOpen());
+	}
+
+	public static function encodeDoublePlant(DoublePlant $block, Writer $out) : Writer{
+		return $out
+			->writeBool(BlockStateNames::UPPER_BLOCK_BIT, $block->isTop());
+	}
+
+	public static function encodeFenceGate(FenceGate $block, Writer $out) : Writer{
+		return $out
+			->writeLegacyHorizontalFacing($block->getFacing())
+			->writeBool(BlockStateNames::IN_WALL_BIT, $block->isInWall())
+			->writeBool(BlockStateNames::OPEN_BIT, $block->isOpen());
+	}
+
+	public static function encodeFloorSign(FloorSign $block, Writer $out) : Writer{
+		return $out
+			->writeInt(BlockStateNames::GROUND_SIGN_DIRECTION, $block->getRotation());
+	}
+
+	public static function encodeFurnace(Furnace $block, string $unlitId, string $litId) : Writer{
+		return Writer::create($block->isLit() ? $litId : $unlitId)
+			->writeCardinalHorizontalFacing($block->getFacing());
+	}
+
+	public static function encodeItemFrame(ItemFrame $block, string $id) : Writer{
+		return Writer::create($id)
+			->writeBool(StateNames::ITEM_FRAME_MAP_BIT, $block->hasMap())
+			->writeBool(StateNames::ITEM_FRAME_PHOTO_BIT, false)
+			->writeFacingDirection($block->getFacing());
+	}
+
+	public static function encodeLeaves(Leaves $block, Writer $out) : Writer{
+		return $out
+			->writeBool(BlockStateNames::PERSISTENT_BIT, $block->isNoDecay())
+			->writeBool(BlockStateNames::UPDATE_BIT, $block->isCheckDecay());
+	}
+
+	public static function encodeLiquid(Liquid $block, string $stillId, string $flowingId) : Writer{
+		return Writer::create($block->isStill() ? $stillId : $flowingId)
+			->writeInt(BlockStateNames::LIQUID_DEPTH, $block->getDecay() | ($block->isFalling() ? 0x8 : 0));
+	}
+
+	public static function encodeLog(Wood $block, string $unstrippedId, string $strippedId) : Writer{
+		$out = $block->isStripped() ?
+			Writer::create($strippedId) :
+			Writer::create($unstrippedId);
+		return $out
+			->writePillarAxis($block->getAxis());
+	}
+
+	public static function encodeMushroomBlock(RedMushroomBlock $block, Writer $out) : Writer{
+		return $out
+			->writeInt(BlockStateNames::HUGE_MUSHROOM_BITS, MushroomBlockTypeIdMap::getInstance()->toId($block->getMushroomBlockType()));
+	}
+
+	public static function encodeQuartz(int $axis, Writer $out) : Writer{
+		return $out
+			->writePillarAxis($axis); //this isn't needed for all types, but we have to write it anyway
+	}
+
+	public static function encodeSapling(Sapling $block, Writer $out) : Writer{
+		return $out
+			->writeBool(BlockStateNames::AGE_BIT, $block->isReady());
+	}
+
+	public static function encodeSimplePressurePlate(SimplePressurePlate $block, Writer $out) : Writer{
+		//TODO: not sure what the deal is here ... seems like a mojang bug / artifact of bad implementation?
+		//best to keep this separate from weighted plates anyway...
+		return $out
+			->writeInt(BlockStateNames::REDSTONE_SIGNAL, $block->isPressed() ? 15 : 0);
+	}
+
+	private static function encodeSingleSlab(Slab $block, string $id) : Writer{
+		return Writer::create($id)
+			->writeSlabPosition($block->getSlabType());
+	}
+
+	private static function encodeDoubleSlab(Slab $block, string $id) : Writer{
+		return Writer::create($id)
+			//this is (intentionally) also written for double slabs (as zero) to maintain bug parity with MCPE
+			->writeSlabPosition(SlabType::BOTTOM);
+	}
+
+	public static function encodeSlab(Slab $block, string $singleId, string $doubleId) : Writer{
+		return $block->getSlabType() === SlabType::DOUBLE ?
+			self::encodeDoubleSlab($block, $doubleId) :
+			self::encodeSingleSlab($block, $singleId);
+	}
+
+	public static function encodeStairs(Stair $block, Writer $out) : Writer{
+		return $out
+			->writeBool(BlockStateNames::UPSIDE_DOWN_BIT, $block->isUpsideDown())
+			->writeWeirdoHorizontalFacing($block->getFacing());
+	}
+
+	public static function encodeStem(Stem $block, Writer $out) : Writer{
+		//In PM, we use Facing::UP to indicate that the stem is not attached to a pumpkin/melon, since this makes the
+		//most intuitive sense (the stem is pointing at the sky). However, Bedrock uses the DOWN state for this, which
+		//is absurd, and I refuse to make our API similarly absurd.
+		$facing = $block->getFacing();
+		return self::encodeCrops($block, $out)
+			->writeFacingWithoutUp($facing === Facing::UP ? Facing::DOWN : $facing);
+	}
+
+	public static function encodeTrapdoor(Trapdoor $block, Writer $out) : Writer{
+		return $out
+			->write5MinusHorizontalFacing($block->getFacing())
+			->writeBool(BlockStateNames::UPSIDE_DOWN_BIT, $block->isTop())
+			->writeBool(BlockStateNames::OPEN_BIT, $block->isOpen());
+	}
+
+	public static function encodeWall(Wall $block, Writer $out) : Writer{
+		return $out
+			->writeBool(BlockStateNames::WALL_POST_BIT, $block->isPost())
+			->writeWallConnectionType(BlockStateNames::WALL_CONNECTION_TYPE_EAST, $block->getConnection(Facing::EAST))
+			->writeWallConnectionType(BlockStateNames::WALL_CONNECTION_TYPE_NORTH, $block->getConnection(Facing::NORTH))
+			->writeWallConnectionType(BlockStateNames::WALL_CONNECTION_TYPE_SOUTH, $block->getConnection(Facing::SOUTH))
+			->writeWallConnectionType(BlockStateNames::WALL_CONNECTION_TYPE_WEST, $block->getConnection(Facing::WEST));
+	}
+
+	public static function encodeWallSign(WallSign $block, Writer $out) : Writer{
+		return $out
+			->writeHorizontalFacing($block->getFacing());
+	}
+}
diff --git a/src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php b/src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php
new file mode 100644
index 0000000000..5c0a427cc7
--- /dev/null
+++ b/src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php
@@ -0,0 +1,1800 @@
+<?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\block\convert;
+
+use pocketmine\block\AmethystCluster;
+use pocketmine\block\Anvil;
+use pocketmine\block\Bamboo;
+use pocketmine\block\Block;
+use pocketmine\block\CaveVines;
+use pocketmine\block\ChorusFlower;
+use pocketmine\block\DoublePitcherCrop;
+use pocketmine\block\Opaque;
+use pocketmine\block\PinkPetals;
+use pocketmine\block\PitcherCrop;
+use pocketmine\block\Slab;
+use pocketmine\block\Stair;
+use pocketmine\block\SweetBerryBush;
+use pocketmine\block\utils\BrewingStandSlot;
+use pocketmine\block\utils\ChiseledBookshelfSlot;
+use pocketmine\block\utils\CopperOxidation;
+use pocketmine\block\utils\CoralType;
+use pocketmine\block\utils\DirtType;
+use pocketmine\block\utils\DripleafState;
+use pocketmine\block\utils\DyeColor;
+use pocketmine\block\utils\FroglightType;
+use pocketmine\block\utils\LeverFacing;
+use pocketmine\block\utils\MobHeadType;
+use pocketmine\block\VanillaBlocks as Blocks;
+use pocketmine\block\Wood;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\data\bedrock\block\BlockStateDeserializeException;
+use pocketmine\data\bedrock\block\BlockStateDeserializer;
+use pocketmine\data\bedrock\block\BlockStateNames as StateNames;
+use pocketmine\data\bedrock\block\BlockStateStringValues as StringValues;
+use pocketmine\data\bedrock\block\BlockTypeNames as Ids;
+use pocketmine\data\bedrock\block\convert\BlockStateDeserializerHelper as Helper;
+use pocketmine\data\bedrock\block\convert\BlockStateReader as Reader;
+use pocketmine\math\Axis;
+use pocketmine\math\Facing;
+use function array_key_exists;
+use function count;
+use function min;
+
+final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
+
+	/**
+	 * @var \Closure[]
+	 * @phpstan-var array<string, \Closure(Reader $in) : Block>
+	 */
+	private array $deserializeFuncs = [];
+
+	/**
+	 * @var int[]
+	 * @phpstan-var array<string, int>
+	 */
+	private array $simpleCache = [];
+
+	public function __construct(){
+		$this->registerCandleDeserializers();
+		$this->registerFlatColorBlockDeserializers();
+		$this->registerFlatCoralDeserializers();
+		$this->registerCauldronDeserializers();
+		$this->registerFlatWoodBlockDeserializers();
+		$this->registerLeavesDeserializers();
+		$this->registerSaplingDeserializers();
+		$this->registerLightDeserializers();
+		$this->registerMobHeadDeserializers();
+		$this->registerSimpleDeserializers();
+		$this->registerDeserializers();
+	}
+
+	public function deserialize(BlockStateData $stateData) : int{
+		if(count($stateData->getStates()) === 0){
+			//if a block has zero properties, we can keep a map of string ID -> internal blockstate ID
+			return $this->simpleCache[$stateData->getName()] ??= $this->deserializeBlock($stateData)->getStateId();
+		}
+
+		//we can't cache blocks that have properties - go ahead and deserialize the slow way
+		return $this->deserializeBlock($stateData)->getStateId();
+	}
+
+	/** @phpstan-param \Closure(Reader) : Block $c */
+	public function map(string $id, \Closure $c) : void{
+		if(array_key_exists($id, $this->deserializeFuncs)){
+			throw new \InvalidArgumentException("Deserializer is already assigned for \"$id\"");
+		}
+		$this->deserializeFuncs[$id] = $c;
+	}
+
+	/** @phpstan-param \Closure() : Block $getBlock */
+	public function mapSimple(string $id, \Closure $getBlock) : void{
+		$this->map($id, $getBlock);
+	}
+
+	/**
+	 * @phpstan-param \Closure(Reader) : Slab $getBlock
+	 */
+	public function mapSlab(string $singleId, string $doubleId, \Closure $getBlock) : void{
+		$this->map($singleId, fn(Reader $in) => Helper::decodeSingleSlab($getBlock($in), $in));
+		$this->map($doubleId, fn(Reader $in) => Helper::decodeDoubleSlab($getBlock($in), $in));
+	}
+
+	/**
+	 * @phpstan-param \Closure() : Stair $getBlock
+	 */
+	public function mapStairs(string $id, \Closure $getBlock) : void{
+		$this->map($id, fn(Reader $in) : Stair => Helper::decodeStairs($getBlock(), $in));
+	}
+
+	/** @phpstan-param \Closure() : Wood $getBlock */
+	public function mapLog(string $unstrippedId, string $strippedId, \Closure $getBlock) : void{
+		$this->map($unstrippedId, fn(Reader $in) => Helper::decodeLog($getBlock(), false, $in));
+		$this->map($strippedId, fn(Reader $in) => Helper::decodeLog($getBlock(), true, $in));
+	}
+
+	private function registerCandleDeserializers() : void{
+		$this->map(Ids::CANDLE, fn(Reader $in) => Helper::decodeCandle(Blocks::CANDLE(), $in));
+		foreach([
+			Ids::BLACK_CANDLE => DyeColor::BLACK,
+			Ids::BLUE_CANDLE => DyeColor::BLUE,
+			Ids::BROWN_CANDLE => DyeColor::BROWN,
+			Ids::CYAN_CANDLE => DyeColor::CYAN,
+			Ids::GRAY_CANDLE => DyeColor::GRAY,
+			Ids::GREEN_CANDLE => DyeColor::GREEN,
+			Ids::LIGHT_BLUE_CANDLE => DyeColor::LIGHT_BLUE,
+			Ids::LIGHT_GRAY_CANDLE => DyeColor::LIGHT_GRAY,
+			Ids::LIME_CANDLE => DyeColor::LIME,
+			Ids::MAGENTA_CANDLE => DyeColor::MAGENTA,
+			Ids::ORANGE_CANDLE => DyeColor::ORANGE,
+			Ids::PINK_CANDLE => DyeColor::PINK,
+			Ids::PURPLE_CANDLE => DyeColor::PURPLE,
+			Ids::RED_CANDLE => DyeColor::RED,
+			Ids::WHITE_CANDLE => DyeColor::WHITE,
+			Ids::YELLOW_CANDLE => DyeColor::YELLOW,
+		] as $id => $color){
+			$this->map($id, fn(Reader $in) => Helper::decodeCandle(Blocks::DYED_CANDLE()->setColor($color), $in));
+		}
+
+		$this->map(Ids::CANDLE_CAKE, fn(Reader $in) => Blocks::CAKE_WITH_CANDLE()->setLit($in->readBool(StateNames::LIT)));
+		foreach([
+			Ids::BLACK_CANDLE_CAKE => DyeColor::BLACK,
+			Ids::BLUE_CANDLE_CAKE => DyeColor::BLUE,
+			Ids::BROWN_CANDLE_CAKE => DyeColor::BROWN,
+			Ids::CYAN_CANDLE_CAKE => DyeColor::CYAN,
+			Ids::GRAY_CANDLE_CAKE => DyeColor::GRAY,
+			Ids::GREEN_CANDLE_CAKE => DyeColor::GREEN,
+			Ids::LIGHT_BLUE_CANDLE_CAKE => DyeColor::LIGHT_BLUE,
+			Ids::LIGHT_GRAY_CANDLE_CAKE => DyeColor::LIGHT_GRAY,
+			Ids::LIME_CANDLE_CAKE => DyeColor::LIME,
+			Ids::MAGENTA_CANDLE_CAKE => DyeColor::MAGENTA,
+			Ids::ORANGE_CANDLE_CAKE => DyeColor::ORANGE,
+			Ids::PINK_CANDLE_CAKE => DyeColor::PINK,
+			Ids::PURPLE_CANDLE_CAKE => DyeColor::PURPLE,
+			Ids::RED_CANDLE_CAKE => DyeColor::RED,
+			Ids::WHITE_CANDLE_CAKE => DyeColor::WHITE,
+			Ids::YELLOW_CANDLE_CAKE => DyeColor::YELLOW,
+		] as $id => $color){
+			$this->map($id, fn(Reader $in) => Blocks::CAKE_WITH_DYED_CANDLE()
+				->setColor($color)
+				->setLit($in->readBool(StateNames::LIT))
+			);
+		}
+	}
+
+	private function registerFlatColorBlockDeserializers() : void{
+		foreach([
+			Ids::HARD_BLACK_STAINED_GLASS => DyeColor::BLACK,
+			Ids::HARD_BLUE_STAINED_GLASS => DyeColor::BLUE,
+			Ids::HARD_BROWN_STAINED_GLASS => DyeColor::BROWN,
+			Ids::HARD_CYAN_STAINED_GLASS => DyeColor::CYAN,
+			Ids::HARD_GRAY_STAINED_GLASS => DyeColor::GRAY,
+			Ids::HARD_GREEN_STAINED_GLASS => DyeColor::GREEN,
+			Ids::HARD_LIGHT_BLUE_STAINED_GLASS => DyeColor::LIGHT_BLUE,
+			Ids::HARD_LIGHT_GRAY_STAINED_GLASS => DyeColor::LIGHT_GRAY,
+			Ids::HARD_LIME_STAINED_GLASS => DyeColor::LIME,
+			Ids::HARD_MAGENTA_STAINED_GLASS => DyeColor::MAGENTA,
+			Ids::HARD_ORANGE_STAINED_GLASS => DyeColor::ORANGE,
+			Ids::HARD_PINK_STAINED_GLASS => DyeColor::PINK,
+			Ids::HARD_PURPLE_STAINED_GLASS => DyeColor::PURPLE,
+			Ids::HARD_RED_STAINED_GLASS => DyeColor::RED,
+			Ids::HARD_WHITE_STAINED_GLASS => DyeColor::WHITE,
+			Ids::HARD_YELLOW_STAINED_GLASS => DyeColor::YELLOW,
+		] as $id => $color){
+			$this->map($id, fn(Reader $in) => Blocks::STAINED_HARDENED_GLASS()->setColor($color));
+		}
+
+		foreach([
+			Ids::HARD_BLACK_STAINED_GLASS_PANE => DyeColor::BLACK,
+			Ids::HARD_BLUE_STAINED_GLASS_PANE => DyeColor::BLUE,
+			Ids::HARD_BROWN_STAINED_GLASS_PANE => DyeColor::BROWN,
+			Ids::HARD_CYAN_STAINED_GLASS_PANE => DyeColor::CYAN,
+			Ids::HARD_GRAY_STAINED_GLASS_PANE => DyeColor::GRAY,
+			Ids::HARD_GREEN_STAINED_GLASS_PANE => DyeColor::GREEN,
+			Ids::HARD_LIGHT_BLUE_STAINED_GLASS_PANE => DyeColor::LIGHT_BLUE,
+			Ids::HARD_LIGHT_GRAY_STAINED_GLASS_PANE => DyeColor::LIGHT_GRAY,
+			Ids::HARD_LIME_STAINED_GLASS_PANE => DyeColor::LIME,
+			Ids::HARD_MAGENTA_STAINED_GLASS_PANE => DyeColor::MAGENTA,
+			Ids::HARD_ORANGE_STAINED_GLASS_PANE => DyeColor::ORANGE,
+			Ids::HARD_PINK_STAINED_GLASS_PANE => DyeColor::PINK,
+			Ids::HARD_PURPLE_STAINED_GLASS_PANE => DyeColor::PURPLE,
+			Ids::HARD_RED_STAINED_GLASS_PANE => DyeColor::RED,
+			Ids::HARD_WHITE_STAINED_GLASS_PANE => DyeColor::WHITE,
+			Ids::HARD_YELLOW_STAINED_GLASS_PANE => DyeColor::YELLOW,
+		] as $id => $color){
+			$this->map($id, fn(Reader $in) => Blocks::STAINED_HARDENED_GLASS_PANE()->setColor($color));
+		}
+
+		foreach([
+			Ids::BLACK_GLAZED_TERRACOTTA => DyeColor::BLACK,
+			Ids::BLUE_GLAZED_TERRACOTTA => DyeColor::BLUE,
+			Ids::BROWN_GLAZED_TERRACOTTA => DyeColor::BROWN,
+			Ids::CYAN_GLAZED_TERRACOTTA => DyeColor::CYAN,
+			Ids::GRAY_GLAZED_TERRACOTTA => DyeColor::GRAY,
+			Ids::GREEN_GLAZED_TERRACOTTA => DyeColor::GREEN,
+			Ids::LIGHT_BLUE_GLAZED_TERRACOTTA => DyeColor::LIGHT_BLUE,
+			Ids::SILVER_GLAZED_TERRACOTTA => DyeColor::LIGHT_GRAY,
+			Ids::LIME_GLAZED_TERRACOTTA => DyeColor::LIME,
+			Ids::MAGENTA_GLAZED_TERRACOTTA => DyeColor::MAGENTA,
+			Ids::ORANGE_GLAZED_TERRACOTTA => DyeColor::ORANGE,
+			Ids::PINK_GLAZED_TERRACOTTA => DyeColor::PINK,
+			Ids::PURPLE_GLAZED_TERRACOTTA => DyeColor::PURPLE,
+			Ids::RED_GLAZED_TERRACOTTA => DyeColor::RED,
+			Ids::WHITE_GLAZED_TERRACOTTA => DyeColor::WHITE,
+			Ids::YELLOW_GLAZED_TERRACOTTA => DyeColor::YELLOW,
+		] as $id => $color){
+			$this->map($id, fn(Reader $in) => Blocks::GLAZED_TERRACOTTA()
+				->setColor($color)
+				->setFacing($in->readHorizontalFacing())
+			);
+		}
+
+		foreach([
+			Ids::BLACK_WOOL => DyeColor::BLACK,
+			Ids::BLUE_WOOL => DyeColor::BLUE,
+			Ids::BROWN_WOOL => DyeColor::BROWN,
+			Ids::CYAN_WOOL => DyeColor::CYAN,
+			Ids::GRAY_WOOL => DyeColor::GRAY,
+			Ids::GREEN_WOOL => DyeColor::GREEN,
+			Ids::LIGHT_BLUE_WOOL => DyeColor::LIGHT_BLUE,
+			Ids::LIGHT_GRAY_WOOL => DyeColor::LIGHT_GRAY,
+			Ids::LIME_WOOL => DyeColor::LIME,
+			Ids::MAGENTA_WOOL => DyeColor::MAGENTA,
+			Ids::ORANGE_WOOL => DyeColor::ORANGE,
+			Ids::PINK_WOOL => DyeColor::PINK,
+			Ids::PURPLE_WOOL => DyeColor::PURPLE,
+			Ids::RED_WOOL => DyeColor::RED,
+			Ids::WHITE_WOOL => DyeColor::WHITE,
+			Ids::YELLOW_WOOL => DyeColor::YELLOW,
+		] as $id => $color){
+			$this->mapSimple($id, fn() => Blocks::WOOL()->setColor($color));
+		}
+
+		foreach([
+			Ids::BLACK_CARPET => DyeColor::BLACK,
+			Ids::BLUE_CARPET => DyeColor::BLUE,
+			Ids::BROWN_CARPET => DyeColor::BROWN,
+			Ids::CYAN_CARPET => DyeColor::CYAN,
+			Ids::GRAY_CARPET => DyeColor::GRAY,
+			Ids::GREEN_CARPET => DyeColor::GREEN,
+			Ids::LIGHT_BLUE_CARPET => DyeColor::LIGHT_BLUE,
+			Ids::LIGHT_GRAY_CARPET => DyeColor::LIGHT_GRAY,
+			Ids::LIME_CARPET => DyeColor::LIME,
+			Ids::MAGENTA_CARPET => DyeColor::MAGENTA,
+			Ids::ORANGE_CARPET => DyeColor::ORANGE,
+			Ids::PINK_CARPET => DyeColor::PINK,
+			Ids::PURPLE_CARPET => DyeColor::PURPLE,
+			Ids::RED_CARPET => DyeColor::RED,
+			Ids::WHITE_CARPET => DyeColor::WHITE,
+			Ids::YELLOW_CARPET => DyeColor::YELLOW,
+		] as $id => $color){
+			$this->mapSimple($id, fn() => Blocks::CARPET()->setColor($color));
+		}
+
+		foreach([
+			Ids::BLACK_SHULKER_BOX => DyeColor::BLACK,
+			Ids::BLUE_SHULKER_BOX => DyeColor::BLUE,
+			Ids::BROWN_SHULKER_BOX => DyeColor::BROWN,
+			Ids::CYAN_SHULKER_BOX => DyeColor::CYAN,
+			Ids::GRAY_SHULKER_BOX => DyeColor::GRAY,
+			Ids::GREEN_SHULKER_BOX => DyeColor::GREEN,
+			Ids::LIGHT_BLUE_SHULKER_BOX => DyeColor::LIGHT_BLUE,
+			Ids::LIGHT_GRAY_SHULKER_BOX => DyeColor::LIGHT_GRAY,
+			Ids::LIME_SHULKER_BOX => DyeColor::LIME,
+			Ids::MAGENTA_SHULKER_BOX => DyeColor::MAGENTA,
+			Ids::ORANGE_SHULKER_BOX => DyeColor::ORANGE,
+			Ids::PINK_SHULKER_BOX => DyeColor::PINK,
+			Ids::PURPLE_SHULKER_BOX => DyeColor::PURPLE,
+			Ids::RED_SHULKER_BOX => DyeColor::RED,
+			Ids::WHITE_SHULKER_BOX => DyeColor::WHITE,
+			Ids::YELLOW_SHULKER_BOX => DyeColor::YELLOW,
+		] as $id => $color){
+			$this->mapSimple($id, fn() => Blocks::DYED_SHULKER_BOX()->setColor($color));
+		}
+
+		foreach([
+			Ids::BLACK_CONCRETE => DyeColor::BLACK,
+			Ids::BLUE_CONCRETE => DyeColor::BLUE,
+			Ids::BROWN_CONCRETE => DyeColor::BROWN,
+			Ids::CYAN_CONCRETE => DyeColor::CYAN,
+			Ids::GRAY_CONCRETE => DyeColor::GRAY,
+			Ids::GREEN_CONCRETE => DyeColor::GREEN,
+			Ids::LIGHT_BLUE_CONCRETE => DyeColor::LIGHT_BLUE,
+			Ids::LIGHT_GRAY_CONCRETE => DyeColor::LIGHT_GRAY,
+			Ids::LIME_CONCRETE => DyeColor::LIME,
+			Ids::MAGENTA_CONCRETE => DyeColor::MAGENTA,
+			Ids::ORANGE_CONCRETE => DyeColor::ORANGE,
+			Ids::PINK_CONCRETE => DyeColor::PINK,
+			Ids::PURPLE_CONCRETE => DyeColor::PURPLE,
+			Ids::RED_CONCRETE => DyeColor::RED,
+			Ids::WHITE_CONCRETE => DyeColor::WHITE,
+			Ids::YELLOW_CONCRETE => DyeColor::YELLOW,
+		] as $id => $color){
+			$this->mapSimple($id, fn() => Blocks::CONCRETE()->setColor($color));
+		}
+
+		foreach([
+			Ids::BLACK_CONCRETE_POWDER => DyeColor::BLACK,
+			Ids::BLUE_CONCRETE_POWDER => DyeColor::BLUE,
+			Ids::BROWN_CONCRETE_POWDER => DyeColor::BROWN,
+			Ids::CYAN_CONCRETE_POWDER => DyeColor::CYAN,
+			Ids::GRAY_CONCRETE_POWDER => DyeColor::GRAY,
+			Ids::GREEN_CONCRETE_POWDER => DyeColor::GREEN,
+			Ids::LIGHT_BLUE_CONCRETE_POWDER => DyeColor::LIGHT_BLUE,
+			Ids::LIGHT_GRAY_CONCRETE_POWDER => DyeColor::LIGHT_GRAY,
+			Ids::LIME_CONCRETE_POWDER => DyeColor::LIME,
+			Ids::MAGENTA_CONCRETE_POWDER => DyeColor::MAGENTA,
+			Ids::ORANGE_CONCRETE_POWDER => DyeColor::ORANGE,
+			Ids::PINK_CONCRETE_POWDER => DyeColor::PINK,
+			Ids::PURPLE_CONCRETE_POWDER => DyeColor::PURPLE,
+			Ids::RED_CONCRETE_POWDER => DyeColor::RED,
+			Ids::WHITE_CONCRETE_POWDER => DyeColor::WHITE,
+			Ids::YELLOW_CONCRETE_POWDER => DyeColor::YELLOW,
+		] as $id => $color){
+			$this->mapSimple($id, fn() => Blocks::CONCRETE_POWDER()->setColor($color));
+		}
+
+		foreach([
+			Ids::BLACK_TERRACOTTA => DyeColor::BLACK,
+			Ids::BLUE_TERRACOTTA => DyeColor::BLUE,
+			Ids::BROWN_TERRACOTTA => DyeColor::BROWN,
+			Ids::CYAN_TERRACOTTA => DyeColor::CYAN,
+			Ids::GRAY_TERRACOTTA => DyeColor::GRAY,
+			Ids::GREEN_TERRACOTTA => DyeColor::GREEN,
+			Ids::LIGHT_BLUE_TERRACOTTA => DyeColor::LIGHT_BLUE,
+			Ids::LIGHT_GRAY_TERRACOTTA => DyeColor::LIGHT_GRAY,
+			Ids::LIME_TERRACOTTA => DyeColor::LIME,
+			Ids::MAGENTA_TERRACOTTA => DyeColor::MAGENTA,
+			Ids::ORANGE_TERRACOTTA => DyeColor::ORANGE,
+			Ids::PINK_TERRACOTTA => DyeColor::PINK,
+			Ids::PURPLE_TERRACOTTA => DyeColor::PURPLE,
+			Ids::RED_TERRACOTTA => DyeColor::RED,
+			Ids::WHITE_TERRACOTTA => DyeColor::WHITE,
+			Ids::YELLOW_TERRACOTTA => DyeColor::YELLOW,
+		] as $id => $color){
+			$this->mapSimple($id, fn() => Blocks::STAINED_CLAY()->setColor($color));
+		}
+
+		foreach([
+			Ids::BLACK_STAINED_GLASS => DyeColor::BLACK,
+			Ids::BLUE_STAINED_GLASS => DyeColor::BLUE,
+			Ids::BROWN_STAINED_GLASS => DyeColor::BROWN,
+			Ids::CYAN_STAINED_GLASS => DyeColor::CYAN,
+			Ids::GRAY_STAINED_GLASS => DyeColor::GRAY,
+			Ids::GREEN_STAINED_GLASS => DyeColor::GREEN,
+			Ids::LIGHT_BLUE_STAINED_GLASS => DyeColor::LIGHT_BLUE,
+			Ids::LIGHT_GRAY_STAINED_GLASS => DyeColor::LIGHT_GRAY,
+			Ids::LIME_STAINED_GLASS => DyeColor::LIME,
+			Ids::MAGENTA_STAINED_GLASS => DyeColor::MAGENTA,
+			Ids::ORANGE_STAINED_GLASS => DyeColor::ORANGE,
+			Ids::PINK_STAINED_GLASS => DyeColor::PINK,
+			Ids::PURPLE_STAINED_GLASS => DyeColor::PURPLE,
+			Ids::RED_STAINED_GLASS => DyeColor::RED,
+			Ids::WHITE_STAINED_GLASS => DyeColor::WHITE,
+			Ids::YELLOW_STAINED_GLASS => DyeColor::YELLOW,
+		] as $id => $color){
+			$this->mapSimple($id, fn() => Blocks::STAINED_GLASS()->setColor($color));
+		}
+
+		foreach([
+			Ids::BLACK_STAINED_GLASS_PANE => DyeColor::BLACK,
+			Ids::BLUE_STAINED_GLASS_PANE => DyeColor::BLUE,
+			Ids::BROWN_STAINED_GLASS_PANE => DyeColor::BROWN,
+			Ids::CYAN_STAINED_GLASS_PANE => DyeColor::CYAN,
+			Ids::GRAY_STAINED_GLASS_PANE => DyeColor::GRAY,
+			Ids::GREEN_STAINED_GLASS_PANE => DyeColor::GREEN,
+			Ids::LIGHT_BLUE_STAINED_GLASS_PANE => DyeColor::LIGHT_BLUE,
+			Ids::LIGHT_GRAY_STAINED_GLASS_PANE => DyeColor::LIGHT_GRAY,
+			Ids::LIME_STAINED_GLASS_PANE => DyeColor::LIME,
+			Ids::MAGENTA_STAINED_GLASS_PANE => DyeColor::MAGENTA,
+			Ids::ORANGE_STAINED_GLASS_PANE => DyeColor::ORANGE,
+			Ids::PINK_STAINED_GLASS_PANE => DyeColor::PINK,
+			Ids::PURPLE_STAINED_GLASS_PANE => DyeColor::PURPLE,
+			Ids::RED_STAINED_GLASS_PANE => DyeColor::RED,
+			Ids::WHITE_STAINED_GLASS_PANE => DyeColor::WHITE,
+			Ids::YELLOW_STAINED_GLASS_PANE => DyeColor::YELLOW,
+		] as $id => $color){
+			$this->mapSimple($id, fn() => Blocks::STAINED_GLASS_PANE()->setColor($color));
+		}
+	}
+
+	private function registerFlatCoralDeserializers() : void{
+		foreach([
+			Ids::BRAIN_CORAL => CoralType::BRAIN,
+			Ids::BUBBLE_CORAL => CoralType::BUBBLE,
+			Ids::FIRE_CORAL => CoralType::FIRE,
+			Ids::HORN_CORAL => CoralType::HORN,
+			Ids::TUBE_CORAL => CoralType::TUBE,
+		] as $id => $coralType){
+			$this->mapSimple($id, fn() => Blocks::CORAL()->setCoralType($coralType)->setDead(false));
+		}
+		foreach([
+			Ids::DEAD_BRAIN_CORAL => CoralType::BRAIN,
+			Ids::DEAD_BUBBLE_CORAL => CoralType::BUBBLE,
+			Ids::DEAD_FIRE_CORAL => CoralType::FIRE,
+			Ids::DEAD_HORN_CORAL => CoralType::HORN,
+			Ids::DEAD_TUBE_CORAL => CoralType::TUBE,
+		] as $id => $coralType){
+			$this->mapSimple($id, fn() => Blocks::CORAL()->setCoralType($coralType)->setDead(true));
+		}
+
+		foreach([
+			[CoralType::BRAIN, Ids::BRAIN_CORAL_FAN, Ids::DEAD_BRAIN_CORAL_FAN],
+			[CoralType::BUBBLE, Ids::BUBBLE_CORAL_FAN, Ids::DEAD_BUBBLE_CORAL_FAN],
+			[CoralType::FIRE, Ids::FIRE_CORAL_FAN, Ids::DEAD_FIRE_CORAL_FAN],
+			[CoralType::HORN, Ids::HORN_CORAL_FAN, Ids::DEAD_HORN_CORAL_FAN],
+			[CoralType::TUBE, Ids::TUBE_CORAL_FAN, Ids::DEAD_TUBE_CORAL_FAN],
+		] as [$coralType, $aliveId, $deadId]){
+			$this->map($aliveId, fn(Reader $in) => Helper::decodeFloorCoralFan(Blocks::CORAL_FAN()->setCoralType($coralType)->setDead(false), $in));
+			$this->map($deadId, fn(Reader $in) => Helper::decodeFloorCoralFan(Blocks::CORAL_FAN()->setCoralType($coralType)->setDead(true), $in));
+		}
+
+		foreach([
+			[CoralType::BRAIN, Ids::BRAIN_CORAL_BLOCK, Ids::DEAD_BRAIN_CORAL_BLOCK],
+			[CoralType::BUBBLE, Ids::BUBBLE_CORAL_BLOCK, Ids::DEAD_BUBBLE_CORAL_BLOCK],
+			[CoralType::FIRE, Ids::FIRE_CORAL_BLOCK, Ids::DEAD_FIRE_CORAL_BLOCK],
+			[CoralType::HORN, Ids::HORN_CORAL_BLOCK, Ids::DEAD_HORN_CORAL_BLOCK],
+			[CoralType::TUBE, Ids::TUBE_CORAL_BLOCK, Ids::DEAD_TUBE_CORAL_BLOCK],
+		] as [$coralType, $aliveId, $deadId]){
+			$this->map($aliveId, fn(Reader $in) => Blocks::CORAL_BLOCK()->setCoralType($coralType)->setDead(false));
+			$this->map($deadId, fn(Reader $in) => Blocks::CORAL_BLOCK()->setCoralType($coralType)->setDead(true));
+		}
+
+		foreach([
+			[CoralType::BRAIN, Ids::BRAIN_CORAL_WALL_FAN, Ids::DEAD_BRAIN_CORAL_WALL_FAN],
+			[CoralType::BUBBLE, Ids::BUBBLE_CORAL_WALL_FAN, Ids::DEAD_BUBBLE_CORAL_WALL_FAN],
+			[CoralType::FIRE, Ids::FIRE_CORAL_WALL_FAN, Ids::DEAD_FIRE_CORAL_WALL_FAN],
+			[CoralType::HORN, Ids::HORN_CORAL_WALL_FAN, Ids::DEAD_HORN_CORAL_WALL_FAN],
+			[CoralType::TUBE, Ids::TUBE_CORAL_WALL_FAN, Ids::DEAD_TUBE_CORAL_WALL_FAN],
+		] as [$coralType, $aliveId, $deadId]){
+			$this->map($aliveId, fn(Reader $in) => Blocks::WALL_CORAL_FAN()->setFacing($in->readCoralFacing())->setCoralType($coralType)->setDead(false));
+			$this->map($deadId, fn(Reader $in) => Blocks::WALL_CORAL_FAN()->setFacing($in->readCoralFacing())->setCoralType($coralType)->setDead(true));
+		}
+	}
+
+	private function registerCauldronDeserializers() : void{
+		$deserializer = function(Reader $in) : Block{
+			$level = $in->readBoundedInt(StateNames::FILL_LEVEL, 0, 6);
+			if($level === 0){
+				$in->ignored(StateNames::CAULDRON_LIQUID);
+				return Blocks::CAULDRON();
+			}
+
+			return (match($liquid = $in->readString(StateNames::CAULDRON_LIQUID)){
+				StringValues::CAULDRON_LIQUID_WATER => Blocks::WATER_CAULDRON(),
+				StringValues::CAULDRON_LIQUID_LAVA => Blocks::LAVA_CAULDRON(),
+				StringValues::CAULDRON_LIQUID_POWDER_SNOW => throw new UnsupportedBlockStateException("Powder snow is not supported yet"),
+				default => throw $in->badValueException(StateNames::CAULDRON_LIQUID, $liquid)
+			})->setFillLevel($level);
+		};
+		$this->map(Ids::CAULDRON, $deserializer);
+	}
+
+	private function registerFlatWoodBlockDeserializers() : void{
+		$this->map(Ids::ACACIA_BUTTON, fn(Reader $in) => Helper::decodeButton(Blocks::ACACIA_BUTTON(), $in));
+		$this->map(Ids::ACACIA_DOOR, fn(Reader $in) => Helper::decodeDoor(Blocks::ACACIA_DOOR(), $in));
+		$this->map(Ids::ACACIA_FENCE_GATE, fn(Reader $in) => Helper::decodeFenceGate(Blocks::ACACIA_FENCE_GATE(), $in));
+		$this->map(Ids::ACACIA_PRESSURE_PLATE, fn(Reader $in) => Helper::decodeSimplePressurePlate(Blocks::ACACIA_PRESSURE_PLATE(), $in));
+		$this->map(Ids::ACACIA_STANDING_SIGN, fn(Reader $in) => Helper::decodeFloorSign(Blocks::ACACIA_SIGN(), $in));
+		$this->map(Ids::ACACIA_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Blocks::ACACIA_TRAPDOOR(), $in));
+		$this->map(Ids::ACACIA_WALL_SIGN, fn(Reader $in) => Helper::decodeWallSign(Blocks::ACACIA_WALL_SIGN(), $in));
+		$this->mapLog(Ids::ACACIA_LOG, Ids::STRIPPED_ACACIA_LOG, fn() => Blocks::ACACIA_LOG());
+		$this->mapLog(Ids::ACACIA_WOOD, Ids::STRIPPED_ACACIA_WOOD, fn() => Blocks::ACACIA_WOOD());
+		$this->mapSimple(Ids::ACACIA_FENCE, fn() => Blocks::ACACIA_FENCE());
+		$this->mapSimple(Ids::ACACIA_PLANKS, fn() => Blocks::ACACIA_PLANKS());
+		$this->mapSlab(Ids::ACACIA_SLAB, Ids::ACACIA_DOUBLE_SLAB, fn() => Blocks::ACACIA_SLAB());
+		$this->mapStairs(Ids::ACACIA_STAIRS, fn() => Blocks::ACACIA_STAIRS());
+
+		$this->map(Ids::BIRCH_BUTTON, fn(Reader $in) => Helper::decodeButton(Blocks::BIRCH_BUTTON(), $in));
+		$this->map(Ids::BIRCH_DOOR, fn(Reader $in) => Helper::decodeDoor(Blocks::BIRCH_DOOR(), $in));
+		$this->map(Ids::BIRCH_FENCE_GATE, fn(Reader $in) => Helper::decodeFenceGate(Blocks::BIRCH_FENCE_GATE(), $in));
+		$this->map(Ids::BIRCH_PRESSURE_PLATE, fn(Reader $in) => Helper::decodeSimplePressurePlate(Blocks::BIRCH_PRESSURE_PLATE(), $in));
+		$this->map(Ids::BIRCH_STANDING_SIGN, fn(Reader $in) => Helper::decodeFloorSign(Blocks::BIRCH_SIGN(), $in));
+		$this->map(Ids::BIRCH_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Blocks::BIRCH_TRAPDOOR(), $in));
+		$this->map(Ids::BIRCH_WALL_SIGN, fn(Reader $in) => Helper::decodeWallSign(Blocks::BIRCH_WALL_SIGN(), $in));
+		$this->mapLog(Ids::BIRCH_LOG, Ids::STRIPPED_BIRCH_LOG, fn() => Blocks::BIRCH_LOG());
+		$this->mapLog(Ids::BIRCH_WOOD, Ids::STRIPPED_BIRCH_WOOD, fn() => Blocks::BIRCH_WOOD());
+		$this->mapSimple(Ids::BIRCH_FENCE, fn() => Blocks::BIRCH_FENCE());
+		$this->mapSimple(Ids::BIRCH_PLANKS, fn() => Blocks::BIRCH_PLANKS());
+		$this->mapSlab(Ids::BIRCH_SLAB, Ids::BIRCH_DOUBLE_SLAB, fn() => Blocks::BIRCH_SLAB());
+		$this->mapStairs(Ids::BIRCH_STAIRS, fn() => Blocks::BIRCH_STAIRS());
+
+		$this->map(Ids::CHERRY_BUTTON, fn(Reader $in) => Helper::decodeButton(Blocks::CHERRY_BUTTON(), $in));
+		$this->map(Ids::CHERRY_DOOR, fn(Reader $in) => Helper::decodeDoor(Blocks::CHERRY_DOOR(), $in));
+		$this->map(Ids::CHERRY_FENCE_GATE, fn(Reader $in) => Helper::decodeFenceGate(Blocks::CHERRY_FENCE_GATE(), $in));
+		$this->map(Ids::CHERRY_PRESSURE_PLATE, fn(Reader $in) => Helper::decodeSimplePressurePlate(Blocks::CHERRY_PRESSURE_PLATE(), $in));
+		$this->map(Ids::CHERRY_STANDING_SIGN, fn(Reader $in) => Helper::decodeFloorSign(Blocks::CHERRY_SIGN(), $in));
+		$this->map(Ids::CHERRY_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Blocks::CHERRY_TRAPDOOR(), $in));
+		$this->map(Ids::CHERRY_WALL_SIGN, fn(Reader $in) => Helper::decodeWallSign(Blocks::CHERRY_WALL_SIGN(), $in));
+		$this->mapLog(Ids::CHERRY_LOG, Ids::STRIPPED_CHERRY_LOG, fn() => Blocks::CHERRY_LOG());
+		$this->mapSimple(Ids::CHERRY_FENCE, fn() => Blocks::CHERRY_FENCE());
+		$this->mapSimple(Ids::CHERRY_PLANKS, fn() => Blocks::CHERRY_PLANKS());
+		$this->mapSlab(Ids::CHERRY_SLAB, Ids::CHERRY_DOUBLE_SLAB, fn() => Blocks::CHERRY_SLAB());
+		$this->mapStairs(Ids::CHERRY_STAIRS, fn() => Blocks::CHERRY_STAIRS());
+		$this->map(Ids::CHERRY_WOOD, fn(Reader $in) => Helper::decodeLog(Blocks::CHERRY_WOOD(), false, $in));
+		$this->map(Ids::STRIPPED_CHERRY_WOOD, fn(Reader $in) => Helper::decodeLog(Blocks::CHERRY_WOOD(), true, $in));
+
+		$this->map(Ids::CRIMSON_BUTTON, fn(Reader $in) => Helper::decodeButton(Blocks::CRIMSON_BUTTON(), $in));
+		$this->map(Ids::CRIMSON_DOOR, fn(Reader $in) => Helper::decodeDoor(Blocks::CRIMSON_DOOR(), $in));
+		$this->map(Ids::CRIMSON_FENCE_GATE, fn(Reader $in) => Helper::decodeFenceGate(Blocks::CRIMSON_FENCE_GATE(), $in));
+		$this->map(Ids::CRIMSON_PRESSURE_PLATE, fn(Reader $in) => Helper::decodeSimplePressurePlate(Blocks::CRIMSON_PRESSURE_PLATE(), $in));
+		$this->map(Ids::CRIMSON_STANDING_SIGN, fn(Reader $in) => Helper::decodeFloorSign(Blocks::CRIMSON_SIGN(), $in));
+		$this->map(Ids::CRIMSON_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Blocks::CRIMSON_TRAPDOOR(), $in));
+		$this->map(Ids::CRIMSON_WALL_SIGN, fn(Reader $in) => Helper::decodeWallSign(Blocks::CRIMSON_WALL_SIGN(), $in));
+		$this->mapLog(Ids::CRIMSON_HYPHAE, Ids::STRIPPED_CRIMSON_HYPHAE, fn() => Blocks::CRIMSON_HYPHAE());
+		$this->mapLog(Ids::CRIMSON_STEM, Ids::STRIPPED_CRIMSON_STEM, fn() => Blocks::CRIMSON_STEM());
+		$this->mapSimple(Ids::CRIMSON_FENCE, fn() => Blocks::CRIMSON_FENCE());
+		$this->mapSimple(Ids::CRIMSON_PLANKS, fn() => Blocks::CRIMSON_PLANKS());
+		$this->mapSlab(Ids::CRIMSON_SLAB, Ids::CRIMSON_DOUBLE_SLAB, fn() => Blocks::CRIMSON_SLAB());
+		$this->mapStairs(Ids::CRIMSON_STAIRS, fn() => Blocks::CRIMSON_STAIRS());
+
+		$this->map(Ids::DARKOAK_STANDING_SIGN, fn(Reader $in) => Helper::decodeFloorSign(Blocks::DARK_OAK_SIGN(), $in));
+		$this->map(Ids::DARKOAK_WALL_SIGN, fn(Reader $in) => Helper::decodeWallSign(Blocks::DARK_OAK_WALL_SIGN(), $in));
+		$this->map(Ids::DARK_OAK_BUTTON, fn(Reader $in) => Helper::decodeButton(Blocks::DARK_OAK_BUTTON(), $in));
+		$this->map(Ids::DARK_OAK_DOOR, fn(Reader $in) => Helper::decodeDoor(Blocks::DARK_OAK_DOOR(), $in));
+		$this->map(Ids::DARK_OAK_FENCE_GATE, fn(Reader $in) => Helper::decodeFenceGate(Blocks::DARK_OAK_FENCE_GATE(), $in));
+		$this->map(Ids::DARK_OAK_PRESSURE_PLATE, fn(Reader $in) => Helper::decodeSimplePressurePlate(Blocks::DARK_OAK_PRESSURE_PLATE(), $in));
+		$this->map(Ids::DARK_OAK_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Blocks::DARK_OAK_TRAPDOOR(), $in));
+		$this->mapLog(Ids::DARK_OAK_LOG, Ids::STRIPPED_DARK_OAK_LOG, fn() => Blocks::DARK_OAK_LOG());
+		$this->mapLog(Ids::DARK_OAK_WOOD, Ids::STRIPPED_DARK_OAK_WOOD, fn() => Blocks::DARK_OAK_WOOD());
+		$this->mapSimple(Ids::DARK_OAK_FENCE, fn() => Blocks::DARK_OAK_FENCE());
+		$this->mapSimple(Ids::DARK_OAK_PLANKS, fn() => Blocks::DARK_OAK_PLANKS());
+		$this->mapSlab(Ids::DARK_OAK_SLAB, Ids::DARK_OAK_DOUBLE_SLAB, fn() => Blocks::DARK_OAK_SLAB());
+		$this->mapStairs(Ids::DARK_OAK_STAIRS, fn() => Blocks::DARK_OAK_STAIRS());
+
+		$this->map(Ids::JUNGLE_BUTTON, fn(Reader $in) => Helper::decodeButton(Blocks::JUNGLE_BUTTON(), $in));
+		$this->map(Ids::JUNGLE_DOOR, fn(Reader $in) => Helper::decodeDoor(Blocks::JUNGLE_DOOR(), $in));
+		$this->map(Ids::JUNGLE_FENCE_GATE, fn(Reader $in) => Helper::decodeFenceGate(Blocks::JUNGLE_FENCE_GATE(), $in));
+		$this->map(Ids::JUNGLE_PRESSURE_PLATE, fn(Reader $in) => Helper::decodeSimplePressurePlate(Blocks::JUNGLE_PRESSURE_PLATE(), $in));
+		$this->map(Ids::JUNGLE_STANDING_SIGN, fn(Reader $in) => Helper::decodeFloorSign(Blocks::JUNGLE_SIGN(), $in));
+		$this->map(Ids::JUNGLE_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Blocks::JUNGLE_TRAPDOOR(), $in));
+		$this->map(Ids::JUNGLE_WALL_SIGN, fn(Reader $in) => Helper::decodeWallSign(Blocks::JUNGLE_WALL_SIGN(), $in));
+		$this->mapLog(Ids::JUNGLE_LOG, Ids::STRIPPED_JUNGLE_LOG, fn() => Blocks::JUNGLE_LOG());
+		$this->mapLog(Ids::JUNGLE_WOOD, Ids::STRIPPED_JUNGLE_WOOD, fn() => Blocks::JUNGLE_WOOD());
+		$this->mapSimple(Ids::JUNGLE_FENCE, fn() => Blocks::JUNGLE_FENCE());
+		$this->mapSimple(Ids::JUNGLE_PLANKS, fn() => Blocks::JUNGLE_PLANKS());
+		$this->mapSlab(Ids::JUNGLE_SLAB, Ids::JUNGLE_DOUBLE_SLAB, fn() => Blocks::JUNGLE_SLAB());
+		$this->mapStairs(Ids::JUNGLE_STAIRS, fn() => Blocks::JUNGLE_STAIRS());
+
+		$this->map(Ids::MANGROVE_BUTTON, fn(Reader $in) => Helper::decodeButton(Blocks::MANGROVE_BUTTON(), $in));
+		$this->map(Ids::MANGROVE_DOOR, fn(Reader $in) => Helper::decodeDoor(Blocks::MANGROVE_DOOR(), $in));
+		$this->map(Ids::MANGROVE_FENCE_GATE, fn(Reader $in) => Helper::decodeFenceGate(Blocks::MANGROVE_FENCE_GATE(), $in));
+		$this->map(Ids::MANGROVE_PRESSURE_PLATE, fn(Reader $in) => Helper::decodeSimplePressurePlate(Blocks::MANGROVE_PRESSURE_PLATE(), $in));
+		$this->map(Ids::MANGROVE_STANDING_SIGN, fn(Reader $in) => Helper::decodeFloorSign(Blocks::MANGROVE_SIGN(), $in));
+		$this->map(Ids::MANGROVE_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Blocks::MANGROVE_TRAPDOOR(), $in));
+		$this->map(Ids::MANGROVE_WALL_SIGN, fn(Reader $in) => Helper::decodeWallSign(Blocks::MANGROVE_WALL_SIGN(), $in));
+		$this->mapLog(Ids::MANGROVE_LOG, Ids::STRIPPED_MANGROVE_LOG, fn() => Blocks::MANGROVE_LOG());
+		$this->mapSimple(Ids::MANGROVE_FENCE, fn() => Blocks::MANGROVE_FENCE());
+		$this->mapSimple(Ids::MANGROVE_PLANKS, fn() => Blocks::MANGROVE_PLANKS());
+		$this->mapSlab(Ids::MANGROVE_SLAB, Ids::MANGROVE_DOUBLE_SLAB, fn() => Blocks::MANGROVE_SLAB());
+		$this->mapStairs(Ids::MANGROVE_STAIRS, fn() => Blocks::MANGROVE_STAIRS());
+		$this->map(Ids::MANGROVE_WOOD, fn(Reader $in) => Helper::decodeLog(Blocks::MANGROVE_WOOD(), false, $in));
+		$this->map(Ids::STRIPPED_MANGROVE_WOOD, fn(Reader $in) => Helper::decodeLog(Blocks::MANGROVE_WOOD(), true, $in));
+
+		//oak - due to age, many of these don't specify "oak", making for confusing reading
+		$this->map(Ids::WOODEN_BUTTON, fn(Reader $in) => Helper::decodeButton(Blocks::OAK_BUTTON(), $in));
+		$this->map(Ids::WOODEN_DOOR, fn(Reader $in) => Helper::decodeDoor(Blocks::OAK_DOOR(), $in));
+		$this->map(Ids::FENCE_GATE, fn(Reader $in) => Helper::decodeFenceGate(Blocks::OAK_FENCE_GATE(), $in));
+		$this->map(Ids::WOODEN_PRESSURE_PLATE, fn(Reader $in) => Helper::decodeSimplePressurePlate(Blocks::OAK_PRESSURE_PLATE(), $in));
+		$this->map(Ids::STANDING_SIGN, fn(Reader $in) => Helper::decodeFloorSign(Blocks::OAK_SIGN(), $in));
+		$this->map(Ids::TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Blocks::OAK_TRAPDOOR(), $in));
+		$this->map(Ids::WALL_SIGN, fn(Reader $in) => Helper::decodeWallSign(Blocks::OAK_WALL_SIGN(), $in));
+		$this->mapLog(Ids::OAK_LOG, Ids::STRIPPED_OAK_LOG, fn() => Blocks::OAK_LOG());
+		$this->mapLog(Ids::OAK_WOOD, Ids::STRIPPED_OAK_WOOD, fn() => Blocks::OAK_WOOD());
+		$this->mapSimple(Ids::OAK_FENCE, fn() => Blocks::OAK_FENCE());
+		$this->mapSimple(Ids::OAK_PLANKS, fn() => Blocks::OAK_PLANKS());
+		$this->mapSlab(Ids::OAK_SLAB, Ids::OAK_DOUBLE_SLAB, fn() => Blocks::OAK_SLAB());
+		$this->mapStairs(Ids::OAK_STAIRS, fn() => Blocks::OAK_STAIRS());
+
+		$this->map(Ids::SPRUCE_BUTTON, fn(Reader $in) => Helper::decodeButton(Blocks::SPRUCE_BUTTON(), $in));
+		$this->map(Ids::SPRUCE_DOOR, fn(Reader $in) => Helper::decodeDoor(Blocks::SPRUCE_DOOR(), $in));
+		$this->map(Ids::SPRUCE_FENCE_GATE, fn(Reader $in) => Helper::decodeFenceGate(Blocks::SPRUCE_FENCE_GATE(), $in));
+		$this->map(Ids::SPRUCE_PRESSURE_PLATE, fn(Reader $in) => Helper::decodeSimplePressurePlate(Blocks::SPRUCE_PRESSURE_PLATE(), $in));
+		$this->map(Ids::SPRUCE_STANDING_SIGN, fn(Reader $in) => Helper::decodeFloorSign(Blocks::SPRUCE_SIGN(), $in));
+		$this->map(Ids::SPRUCE_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Blocks::SPRUCE_TRAPDOOR(), $in));
+		$this->map(Ids::SPRUCE_WALL_SIGN, fn(Reader $in) => Helper::decodeWallSign(Blocks::SPRUCE_WALL_SIGN(), $in));
+		$this->mapLog(Ids::SPRUCE_LOG, Ids::STRIPPED_SPRUCE_LOG, fn() => Blocks::SPRUCE_LOG());
+		$this->mapLog(Ids::SPRUCE_WOOD, Ids::STRIPPED_SPRUCE_WOOD, fn() => Blocks::SPRUCE_WOOD());
+		$this->mapSimple(Ids::SPRUCE_FENCE, fn() => Blocks::SPRUCE_FENCE());
+		$this->mapSimple(Ids::SPRUCE_PLANKS, fn() => Blocks::SPRUCE_PLANKS());
+		$this->mapSlab(Ids::SPRUCE_SLAB, Ids::SPRUCE_DOUBLE_SLAB, fn() => Blocks::SPRUCE_SLAB());
+		$this->mapStairs(Ids::SPRUCE_STAIRS, fn() => Blocks::SPRUCE_STAIRS());
+
+		$this->map(Ids::WARPED_BUTTON, fn(Reader $in) => Helper::decodeButton(Blocks::WARPED_BUTTON(), $in));
+		$this->map(Ids::WARPED_DOOR, fn(Reader $in) => Helper::decodeDoor(Blocks::WARPED_DOOR(), $in));
+		$this->map(Ids::WARPED_FENCE_GATE, fn(Reader $in) => Helper::decodeFenceGate(Blocks::WARPED_FENCE_GATE(), $in));
+		$this->map(Ids::WARPED_PRESSURE_PLATE, fn(Reader $in) => Helper::decodeSimplePressurePlate(Blocks::WARPED_PRESSURE_PLATE(), $in));
+		$this->map(Ids::WARPED_STANDING_SIGN, fn(Reader $in) => Helper::decodeFloorSign(Blocks::WARPED_SIGN(), $in));
+		$this->map(Ids::WARPED_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Blocks::WARPED_TRAPDOOR(), $in));
+		$this->map(Ids::WARPED_WALL_SIGN, fn(Reader $in) => Helper::decodeWallSign(Blocks::WARPED_WALL_SIGN(), $in));
+		$this->mapLog(Ids::WARPED_HYPHAE, Ids::STRIPPED_WARPED_HYPHAE, fn() => Blocks::WARPED_HYPHAE());
+		$this->mapLog(Ids::WARPED_STEM, Ids::STRIPPED_WARPED_STEM, fn() => Blocks::WARPED_STEM());
+		$this->mapSimple(Ids::WARPED_FENCE, fn() => Blocks::WARPED_FENCE());
+		$this->mapSimple(Ids::WARPED_PLANKS, fn() => Blocks::WARPED_PLANKS());
+		$this->mapSlab(Ids::WARPED_SLAB, Ids::WARPED_DOUBLE_SLAB, fn() => Blocks::WARPED_SLAB());
+		$this->mapStairs(Ids::WARPED_STAIRS, fn() => Blocks::WARPED_STAIRS());
+	}
+
+	private function registerLeavesDeserializers() : void{
+		$this->map(Ids::ACACIA_LEAVES, fn(Reader $in) => Helper::decodeLeaves(Blocks::ACACIA_LEAVES(), $in));
+		$this->map(Ids::AZALEA_LEAVES, fn(Reader $in) => Helper::decodeLeaves(Blocks::AZALEA_LEAVES(), $in));
+		$this->map(Ids::AZALEA_LEAVES_FLOWERED, fn(Reader $in) => Helper::decodeLeaves(Blocks::FLOWERING_AZALEA_LEAVES(), $in));
+		$this->map(Ids::BIRCH_LEAVES, fn(Reader $in) => Helper::decodeLeaves(Blocks::BIRCH_LEAVES(), $in));
+		$this->map(Ids::CHERRY_LEAVES, fn(Reader $in) => Helper::decodeLeaves(Blocks::CHERRY_LEAVES(), $in));
+		$this->map(Ids::DARK_OAK_LEAVES, fn(Reader $in) => Helper::decodeLeaves(Blocks::DARK_OAK_LEAVES(), $in));
+		$this->map(Ids::JUNGLE_LEAVES, fn(Reader $in) => Helper::decodeLeaves(Blocks::JUNGLE_LEAVES(), $in));
+		$this->map(Ids::MANGROVE_LEAVES, fn(Reader $in) => Helper::decodeLeaves(Blocks::MANGROVE_LEAVES(), $in));
+		$this->map(Ids::OAK_LEAVES, fn(Reader $in) => Helper::decodeLeaves(Blocks::OAK_LEAVES(), $in));
+		$this->map(Ids::SPRUCE_LEAVES, fn(Reader $in) => Helper::decodeLeaves(Blocks::SPRUCE_LEAVES(), $in));
+	}
+
+	private function registerSaplingDeserializers() : void{
+		foreach([
+			Ids::ACACIA_SAPLING => fn() => Blocks::ACACIA_SAPLING(),
+			Ids::BIRCH_SAPLING => fn() => Blocks::BIRCH_SAPLING(),
+			Ids::DARK_OAK_SAPLING => fn() => Blocks::DARK_OAK_SAPLING(),
+			Ids::JUNGLE_SAPLING => fn() => Blocks::JUNGLE_SAPLING(),
+			Ids::OAK_SAPLING => fn() => Blocks::OAK_SAPLING(),
+			Ids::SPRUCE_SAPLING => fn() => Blocks::SPRUCE_SAPLING(),
+		] as $id => $getBlock){
+			$this->map($id, fn(Reader $in) => Helper::decodeSapling($getBlock(), $in));
+		}
+	}
+
+	private function registerLightDeserializers() : void{
+		foreach([
+			Ids::LIGHT_BLOCK_0 => 0,
+			Ids::LIGHT_BLOCK_1 => 1,
+			Ids::LIGHT_BLOCK_2 => 2,
+			Ids::LIGHT_BLOCK_3 => 3,
+			Ids::LIGHT_BLOCK_4 => 4,
+			Ids::LIGHT_BLOCK_5 => 5,
+			Ids::LIGHT_BLOCK_6 => 6,
+			Ids::LIGHT_BLOCK_7 => 7,
+			Ids::LIGHT_BLOCK_8 => 8,
+			Ids::LIGHT_BLOCK_9 => 9,
+			Ids::LIGHT_BLOCK_10 => 10,
+			Ids::LIGHT_BLOCK_11 => 11,
+			Ids::LIGHT_BLOCK_12 => 12,
+			Ids::LIGHT_BLOCK_13 => 13,
+			Ids::LIGHT_BLOCK_14 => 14,
+			Ids::LIGHT_BLOCK_15 => 15,
+		] as $id => $level){
+			$this->mapSimple($id, fn() => Blocks::LIGHT()->setLightLevel($level));
+		}
+	}
+
+	private function registerMobHeadDeserializers() : void{
+		foreach([
+			Ids::CREEPER_HEAD => MobHeadType::CREEPER,
+			Ids::DRAGON_HEAD => MobHeadType::DRAGON,
+			Ids::PIGLIN_HEAD => MobHeadType::PIGLIN,
+			Ids::PLAYER_HEAD => MobHeadType::PLAYER,
+			Ids::SKELETON_SKULL => MobHeadType::SKELETON,
+			Ids::WITHER_SKELETON_SKULL => MobHeadType::WITHER_SKELETON,
+			Ids::ZOMBIE_HEAD => MobHeadType::ZOMBIE
+		] as $id => $mobHeadType){
+			$this->map($id, fn(Reader $in) => Blocks::MOB_HEAD()->setMobHeadType($mobHeadType)->setFacing($in->readFacingWithoutDown()));
+		}
+	}
+
+	private function registerSimpleDeserializers() : void{
+		$this->mapSimple(Ids::AIR, fn() => Blocks::AIR());
+		$this->mapSimple(Ids::AMETHYST_BLOCK, fn() => Blocks::AMETHYST());
+		$this->mapSimple(Ids::ANCIENT_DEBRIS, fn() => Blocks::ANCIENT_DEBRIS());
+		$this->mapSimple(Ids::ANDESITE, fn() => Blocks::ANDESITE());
+		$this->mapSimple(Ids::BARRIER, fn() => Blocks::BARRIER());
+		$this->mapSimple(Ids::BEACON, fn() => Blocks::BEACON());
+		$this->mapSimple(Ids::BLACKSTONE, fn() => Blocks::BLACKSTONE());
+		$this->mapSimple(Ids::BLUE_ICE, fn() => Blocks::BLUE_ICE());
+		$this->mapSimple(Ids::BOOKSHELF, fn() => Blocks::BOOKSHELF());
+		$this->mapSimple(Ids::BRICK_BLOCK, fn() => Blocks::BRICKS());
+		$this->mapSimple(Ids::BROWN_MUSHROOM, fn() => Blocks::BROWN_MUSHROOM());
+		$this->mapSimple(Ids::BUDDING_AMETHYST, fn() => Blocks::BUDDING_AMETHYST());
+		$this->mapSimple(Ids::CALCITE, fn() => Blocks::CALCITE());
+		$this->mapSimple(Ids::CARTOGRAPHY_TABLE, fn() => Blocks::CARTOGRAPHY_TABLE());
+		$this->mapSimple(Ids::CHEMICAL_HEAT, fn() => Blocks::CHEMICAL_HEAT());
+		$this->mapSimple(Ids::CHISELED_DEEPSLATE, fn() => Blocks::CHISELED_DEEPSLATE());
+		$this->mapSimple(Ids::CHISELED_NETHER_BRICKS, fn() => Blocks::CHISELED_NETHER_BRICKS());
+		$this->mapSimple(Ids::CHISELED_POLISHED_BLACKSTONE, fn() => Blocks::CHISELED_POLISHED_BLACKSTONE());
+		$this->mapSimple(Ids::CHISELED_RED_SANDSTONE, fn() => Blocks::CHISELED_RED_SANDSTONE());
+		$this->mapSimple(Ids::CHISELED_SANDSTONE, fn() => Blocks::CHISELED_SANDSTONE());
+		$this->mapSimple(Ids::CHISELED_STONE_BRICKS, fn() => Blocks::CHISELED_STONE_BRICKS());
+		$this->mapSimple(Ids::CHISELED_TUFF, fn() => Blocks::CHISELED_TUFF());
+		$this->mapSimple(Ids::CHISELED_TUFF_BRICKS, fn() => Blocks::CHISELED_TUFF_BRICKS());
+		$this->mapSimple(Ids::CHORUS_PLANT, fn() => Blocks::CHORUS_PLANT());
+		$this->mapSimple(Ids::CLAY, fn() => Blocks::CLAY());
+		$this->mapSimple(Ids::COAL_BLOCK, fn() => Blocks::COAL());
+		$this->mapSimple(Ids::COAL_ORE, fn() => Blocks::COAL_ORE());
+		$this->mapSimple(Ids::COBBLED_DEEPSLATE, fn() => Blocks::COBBLED_DEEPSLATE());
+		$this->mapSimple(Ids::COBBLESTONE, fn() => Blocks::COBBLESTONE());
+		$this->mapSimple(Ids::COPPER_ORE, fn() => Blocks::COPPER_ORE());
+		$this->mapSimple(Ids::CRACKED_DEEPSLATE_BRICKS, fn() => Blocks::CRACKED_DEEPSLATE_BRICKS());
+		$this->mapSimple(Ids::CRACKED_DEEPSLATE_TILES, fn() => Blocks::CRACKED_DEEPSLATE_TILES());
+		$this->mapSimple(Ids::CRACKED_NETHER_BRICKS, fn() => Blocks::CRACKED_NETHER_BRICKS());
+		$this->mapSimple(Ids::CRACKED_POLISHED_BLACKSTONE_BRICKS, fn() => Blocks::CRACKED_POLISHED_BLACKSTONE_BRICKS());
+		$this->mapSimple(Ids::CRACKED_STONE_BRICKS, fn() => Blocks::CRACKED_STONE_BRICKS());
+		$this->mapSimple(Ids::CRAFTING_TABLE, fn() => Blocks::CRAFTING_TABLE());
+		$this->mapSimple(Ids::CRIMSON_ROOTS, fn() => Blocks::CRIMSON_ROOTS());
+		$this->mapSimple(Ids::CRYING_OBSIDIAN, fn() => Blocks::CRYING_OBSIDIAN());
+		$this->mapSimple(Ids::CUT_RED_SANDSTONE, fn() => Blocks::CUT_RED_SANDSTONE());
+		$this->mapSimple(Ids::CUT_SANDSTONE, fn() => Blocks::CUT_SANDSTONE());
+		$this->mapSimple(Ids::DARK_PRISMARINE, fn() => Blocks::DARK_PRISMARINE());
+		$this->mapSimple(Ids::DEADBUSH, fn() => Blocks::DEAD_BUSH());
+		$this->mapSimple(Ids::DEEPSLATE_BRICKS, fn() => Blocks::DEEPSLATE_BRICKS());
+		$this->mapSimple(Ids::DEEPSLATE_COAL_ORE, fn() => Blocks::DEEPSLATE_COAL_ORE());
+		$this->mapSimple(Ids::DEEPSLATE_COPPER_ORE, fn() => Blocks::DEEPSLATE_COPPER_ORE());
+		$this->mapSimple(Ids::DEEPSLATE_DIAMOND_ORE, fn() => Blocks::DEEPSLATE_DIAMOND_ORE());
+		$this->mapSimple(Ids::DEEPSLATE_EMERALD_ORE, fn() => Blocks::DEEPSLATE_EMERALD_ORE());
+		$this->mapSimple(Ids::DEEPSLATE_GOLD_ORE, fn() => Blocks::DEEPSLATE_GOLD_ORE());
+		$this->mapSimple(Ids::DEEPSLATE_IRON_ORE, fn() => Blocks::DEEPSLATE_IRON_ORE());
+		$this->mapSimple(Ids::DEEPSLATE_LAPIS_ORE, fn() => Blocks::DEEPSLATE_LAPIS_LAZULI_ORE());
+		$this->mapSimple(Ids::DEEPSLATE_TILES, fn() => Blocks::DEEPSLATE_TILES());
+		$this->mapSimple(Ids::DIAMOND_BLOCK, fn() => Blocks::DIAMOND());
+		$this->mapSimple(Ids::DIAMOND_ORE, fn() => Blocks::DIAMOND_ORE());
+		$this->mapSimple(Ids::DIORITE, fn() => Blocks::DIORITE());
+		$this->mapSimple(Ids::DRAGON_EGG, fn() => Blocks::DRAGON_EGG());
+		$this->mapSimple(Ids::DRIED_KELP_BLOCK, fn() => Blocks::DRIED_KELP());
+		$this->mapSimple(Ids::ELEMENT_0, fn() => Blocks::ELEMENT_ZERO());
+		$this->mapSimple(Ids::ELEMENT_1, fn() => Blocks::ELEMENT_HYDROGEN());
+		$this->mapSimple(Ids::ELEMENT_10, fn() => Blocks::ELEMENT_NEON());
+		$this->mapSimple(Ids::ELEMENT_100, fn() => Blocks::ELEMENT_FERMIUM());
+		$this->mapSimple(Ids::ELEMENT_101, fn() => Blocks::ELEMENT_MENDELEVIUM());
+		$this->mapSimple(Ids::ELEMENT_102, fn() => Blocks::ELEMENT_NOBELIUM());
+		$this->mapSimple(Ids::ELEMENT_103, fn() => Blocks::ELEMENT_LAWRENCIUM());
+		$this->mapSimple(Ids::ELEMENT_104, fn() => Blocks::ELEMENT_RUTHERFORDIUM());
+		$this->mapSimple(Ids::ELEMENT_105, fn() => Blocks::ELEMENT_DUBNIUM());
+		$this->mapSimple(Ids::ELEMENT_106, fn() => Blocks::ELEMENT_SEABORGIUM());
+		$this->mapSimple(Ids::ELEMENT_107, fn() => Blocks::ELEMENT_BOHRIUM());
+		$this->mapSimple(Ids::ELEMENT_108, fn() => Blocks::ELEMENT_HASSIUM());
+		$this->mapSimple(Ids::ELEMENT_109, fn() => Blocks::ELEMENT_MEITNERIUM());
+		$this->mapSimple(Ids::ELEMENT_11, fn() => Blocks::ELEMENT_SODIUM());
+		$this->mapSimple(Ids::ELEMENT_110, fn() => Blocks::ELEMENT_DARMSTADTIUM());
+		$this->mapSimple(Ids::ELEMENT_111, fn() => Blocks::ELEMENT_ROENTGENIUM());
+		$this->mapSimple(Ids::ELEMENT_112, fn() => Blocks::ELEMENT_COPERNICIUM());
+		$this->mapSimple(Ids::ELEMENT_113, fn() => Blocks::ELEMENT_NIHONIUM());
+		$this->mapSimple(Ids::ELEMENT_114, fn() => Blocks::ELEMENT_FLEROVIUM());
+		$this->mapSimple(Ids::ELEMENT_115, fn() => Blocks::ELEMENT_MOSCOVIUM());
+		$this->mapSimple(Ids::ELEMENT_116, fn() => Blocks::ELEMENT_LIVERMORIUM());
+		$this->mapSimple(Ids::ELEMENT_117, fn() => Blocks::ELEMENT_TENNESSINE());
+		$this->mapSimple(Ids::ELEMENT_118, fn() => Blocks::ELEMENT_OGANESSON());
+		$this->mapSimple(Ids::ELEMENT_12, fn() => Blocks::ELEMENT_MAGNESIUM());
+		$this->mapSimple(Ids::ELEMENT_13, fn() => Blocks::ELEMENT_ALUMINUM());
+		$this->mapSimple(Ids::ELEMENT_14, fn() => Blocks::ELEMENT_SILICON());
+		$this->mapSimple(Ids::ELEMENT_15, fn() => Blocks::ELEMENT_PHOSPHORUS());
+		$this->mapSimple(Ids::ELEMENT_16, fn() => Blocks::ELEMENT_SULFUR());
+		$this->mapSimple(Ids::ELEMENT_17, fn() => Blocks::ELEMENT_CHLORINE());
+		$this->mapSimple(Ids::ELEMENT_18, fn() => Blocks::ELEMENT_ARGON());
+		$this->mapSimple(Ids::ELEMENT_19, fn() => Blocks::ELEMENT_POTASSIUM());
+		$this->mapSimple(Ids::ELEMENT_2, fn() => Blocks::ELEMENT_HELIUM());
+		$this->mapSimple(Ids::ELEMENT_20, fn() => Blocks::ELEMENT_CALCIUM());
+		$this->mapSimple(Ids::ELEMENT_21, fn() => Blocks::ELEMENT_SCANDIUM());
+		$this->mapSimple(Ids::ELEMENT_22, fn() => Blocks::ELEMENT_TITANIUM());
+		$this->mapSimple(Ids::ELEMENT_23, fn() => Blocks::ELEMENT_VANADIUM());
+		$this->mapSimple(Ids::ELEMENT_24, fn() => Blocks::ELEMENT_CHROMIUM());
+		$this->mapSimple(Ids::ELEMENT_25, fn() => Blocks::ELEMENT_MANGANESE());
+		$this->mapSimple(Ids::ELEMENT_26, fn() => Blocks::ELEMENT_IRON());
+		$this->mapSimple(Ids::ELEMENT_27, fn() => Blocks::ELEMENT_COBALT());
+		$this->mapSimple(Ids::ELEMENT_28, fn() => Blocks::ELEMENT_NICKEL());
+		$this->mapSimple(Ids::ELEMENT_29, fn() => Blocks::ELEMENT_COPPER());
+		$this->mapSimple(Ids::ELEMENT_3, fn() => Blocks::ELEMENT_LITHIUM());
+		$this->mapSimple(Ids::ELEMENT_30, fn() => Blocks::ELEMENT_ZINC());
+		$this->mapSimple(Ids::ELEMENT_31, fn() => Blocks::ELEMENT_GALLIUM());
+		$this->mapSimple(Ids::ELEMENT_32, fn() => Blocks::ELEMENT_GERMANIUM());
+		$this->mapSimple(Ids::ELEMENT_33, fn() => Blocks::ELEMENT_ARSENIC());
+		$this->mapSimple(Ids::ELEMENT_34, fn() => Blocks::ELEMENT_SELENIUM());
+		$this->mapSimple(Ids::ELEMENT_35, fn() => Blocks::ELEMENT_BROMINE());
+		$this->mapSimple(Ids::ELEMENT_36, fn() => Blocks::ELEMENT_KRYPTON());
+		$this->mapSimple(Ids::ELEMENT_37, fn() => Blocks::ELEMENT_RUBIDIUM());
+		$this->mapSimple(Ids::ELEMENT_38, fn() => Blocks::ELEMENT_STRONTIUM());
+		$this->mapSimple(Ids::ELEMENT_39, fn() => Blocks::ELEMENT_YTTRIUM());
+		$this->mapSimple(Ids::ELEMENT_4, fn() => Blocks::ELEMENT_BERYLLIUM());
+		$this->mapSimple(Ids::ELEMENT_40, fn() => Blocks::ELEMENT_ZIRCONIUM());
+		$this->mapSimple(Ids::ELEMENT_41, fn() => Blocks::ELEMENT_NIOBIUM());
+		$this->mapSimple(Ids::ELEMENT_42, fn() => Blocks::ELEMENT_MOLYBDENUM());
+		$this->mapSimple(Ids::ELEMENT_43, fn() => Blocks::ELEMENT_TECHNETIUM());
+		$this->mapSimple(Ids::ELEMENT_44, fn() => Blocks::ELEMENT_RUTHENIUM());
+		$this->mapSimple(Ids::ELEMENT_45, fn() => Blocks::ELEMENT_RHODIUM());
+		$this->mapSimple(Ids::ELEMENT_46, fn() => Blocks::ELEMENT_PALLADIUM());
+		$this->mapSimple(Ids::ELEMENT_47, fn() => Blocks::ELEMENT_SILVER());
+		$this->mapSimple(Ids::ELEMENT_48, fn() => Blocks::ELEMENT_CADMIUM());
+		$this->mapSimple(Ids::ELEMENT_49, fn() => Blocks::ELEMENT_INDIUM());
+		$this->mapSimple(Ids::ELEMENT_5, fn() => Blocks::ELEMENT_BORON());
+		$this->mapSimple(Ids::ELEMENT_50, fn() => Blocks::ELEMENT_TIN());
+		$this->mapSimple(Ids::ELEMENT_51, fn() => Blocks::ELEMENT_ANTIMONY());
+		$this->mapSimple(Ids::ELEMENT_52, fn() => Blocks::ELEMENT_TELLURIUM());
+		$this->mapSimple(Ids::ELEMENT_53, fn() => Blocks::ELEMENT_IODINE());
+		$this->mapSimple(Ids::ELEMENT_54, fn() => Blocks::ELEMENT_XENON());
+		$this->mapSimple(Ids::ELEMENT_55, fn() => Blocks::ELEMENT_CESIUM());
+		$this->mapSimple(Ids::ELEMENT_56, fn() => Blocks::ELEMENT_BARIUM());
+		$this->mapSimple(Ids::ELEMENT_57, fn() => Blocks::ELEMENT_LANTHANUM());
+		$this->mapSimple(Ids::ELEMENT_58, fn() => Blocks::ELEMENT_CERIUM());
+		$this->mapSimple(Ids::ELEMENT_59, fn() => Blocks::ELEMENT_PRASEODYMIUM());
+		$this->mapSimple(Ids::ELEMENT_6, fn() => Blocks::ELEMENT_CARBON());
+		$this->mapSimple(Ids::ELEMENT_60, fn() => Blocks::ELEMENT_NEODYMIUM());
+		$this->mapSimple(Ids::ELEMENT_61, fn() => Blocks::ELEMENT_PROMETHIUM());
+		$this->mapSimple(Ids::ELEMENT_62, fn() => Blocks::ELEMENT_SAMARIUM());
+		$this->mapSimple(Ids::ELEMENT_63, fn() => Blocks::ELEMENT_EUROPIUM());
+		$this->mapSimple(Ids::ELEMENT_64, fn() => Blocks::ELEMENT_GADOLINIUM());
+		$this->mapSimple(Ids::ELEMENT_65, fn() => Blocks::ELEMENT_TERBIUM());
+		$this->mapSimple(Ids::ELEMENT_66, fn() => Blocks::ELEMENT_DYSPROSIUM());
+		$this->mapSimple(Ids::ELEMENT_67, fn() => Blocks::ELEMENT_HOLMIUM());
+		$this->mapSimple(Ids::ELEMENT_68, fn() => Blocks::ELEMENT_ERBIUM());
+		$this->mapSimple(Ids::ELEMENT_69, fn() => Blocks::ELEMENT_THULIUM());
+		$this->mapSimple(Ids::ELEMENT_7, fn() => Blocks::ELEMENT_NITROGEN());
+		$this->mapSimple(Ids::ELEMENT_70, fn() => Blocks::ELEMENT_YTTERBIUM());
+		$this->mapSimple(Ids::ELEMENT_71, fn() => Blocks::ELEMENT_LUTETIUM());
+		$this->mapSimple(Ids::ELEMENT_72, fn() => Blocks::ELEMENT_HAFNIUM());
+		$this->mapSimple(Ids::ELEMENT_73, fn() => Blocks::ELEMENT_TANTALUM());
+		$this->mapSimple(Ids::ELEMENT_74, fn() => Blocks::ELEMENT_TUNGSTEN());
+		$this->mapSimple(Ids::ELEMENT_75, fn() => Blocks::ELEMENT_RHENIUM());
+		$this->mapSimple(Ids::ELEMENT_76, fn() => Blocks::ELEMENT_OSMIUM());
+		$this->mapSimple(Ids::ELEMENT_77, fn() => Blocks::ELEMENT_IRIDIUM());
+		$this->mapSimple(Ids::ELEMENT_78, fn() => Blocks::ELEMENT_PLATINUM());
+		$this->mapSimple(Ids::ELEMENT_79, fn() => Blocks::ELEMENT_GOLD());
+		$this->mapSimple(Ids::ELEMENT_8, fn() => Blocks::ELEMENT_OXYGEN());
+		$this->mapSimple(Ids::ELEMENT_80, fn() => Blocks::ELEMENT_MERCURY());
+		$this->mapSimple(Ids::ELEMENT_81, fn() => Blocks::ELEMENT_THALLIUM());
+		$this->mapSimple(Ids::ELEMENT_82, fn() => Blocks::ELEMENT_LEAD());
+		$this->mapSimple(Ids::ELEMENT_83, fn() => Blocks::ELEMENT_BISMUTH());
+		$this->mapSimple(Ids::ELEMENT_84, fn() => Blocks::ELEMENT_POLONIUM());
+		$this->mapSimple(Ids::ELEMENT_85, fn() => Blocks::ELEMENT_ASTATINE());
+		$this->mapSimple(Ids::ELEMENT_86, fn() => Blocks::ELEMENT_RADON());
+		$this->mapSimple(Ids::ELEMENT_87, fn() => Blocks::ELEMENT_FRANCIUM());
+		$this->mapSimple(Ids::ELEMENT_88, fn() => Blocks::ELEMENT_RADIUM());
+		$this->mapSimple(Ids::ELEMENT_89, fn() => Blocks::ELEMENT_ACTINIUM());
+		$this->mapSimple(Ids::ELEMENT_9, fn() => Blocks::ELEMENT_FLUORINE());
+		$this->mapSimple(Ids::ELEMENT_90, fn() => Blocks::ELEMENT_THORIUM());
+		$this->mapSimple(Ids::ELEMENT_91, fn() => Blocks::ELEMENT_PROTACTINIUM());
+		$this->mapSimple(Ids::ELEMENT_92, fn() => Blocks::ELEMENT_URANIUM());
+		$this->mapSimple(Ids::ELEMENT_93, fn() => Blocks::ELEMENT_NEPTUNIUM());
+		$this->mapSimple(Ids::ELEMENT_94, fn() => Blocks::ELEMENT_PLUTONIUM());
+		$this->mapSimple(Ids::ELEMENT_95, fn() => Blocks::ELEMENT_AMERICIUM());
+		$this->mapSimple(Ids::ELEMENT_96, fn() => Blocks::ELEMENT_CURIUM());
+		$this->mapSimple(Ids::ELEMENT_97, fn() => Blocks::ELEMENT_BERKELIUM());
+		$this->mapSimple(Ids::ELEMENT_98, fn() => Blocks::ELEMENT_CALIFORNIUM());
+		$this->mapSimple(Ids::ELEMENT_99, fn() => Blocks::ELEMENT_EINSTEINIUM());
+		$this->mapSimple(Ids::EMERALD_BLOCK, fn() => Blocks::EMERALD());
+		$this->mapSimple(Ids::EMERALD_ORE, fn() => Blocks::EMERALD_ORE());
+		$this->mapSimple(Ids::ENCHANTING_TABLE, fn() => Blocks::ENCHANTING_TABLE());
+		$this->mapSimple(Ids::END_BRICKS, fn() => Blocks::END_STONE_BRICKS());
+		$this->mapSimple(Ids::END_STONE, fn() => Blocks::END_STONE());
+		$this->mapSimple(Ids::FERN, fn() => Blocks::FERN());
+		$this->mapSimple(Ids::FLETCHING_TABLE, fn() => Blocks::FLETCHING_TABLE());
+		$this->mapSimple(Ids::GILDED_BLACKSTONE, fn() => Blocks::GILDED_BLACKSTONE());
+		$this->mapSimple(Ids::GLASS, fn() => Blocks::GLASS());
+		$this->mapSimple(Ids::GLASS_PANE, fn() => Blocks::GLASS_PANE());
+		$this->mapSimple(Ids::GLOWINGOBSIDIAN, fn() => Blocks::GLOWING_OBSIDIAN());
+		$this->mapSimple(Ids::GLOWSTONE, fn() => Blocks::GLOWSTONE());
+		$this->mapSimple(Ids::GOLD_BLOCK, fn() => Blocks::GOLD());
+		$this->mapSimple(Ids::GOLD_ORE, fn() => Blocks::GOLD_ORE());
+		$this->mapSimple(Ids::GRANITE, fn() => Blocks::GRANITE());
+		$this->mapSimple(Ids::GRASS_BLOCK, fn() => Blocks::GRASS());
+		$this->mapSimple(Ids::GRASS_PATH, fn() => Blocks::GRASS_PATH());
+		$this->mapSimple(Ids::GRAVEL, fn() => Blocks::GRAVEL());
+		$this->mapSimple(Ids::HANGING_ROOTS, fn() => Blocks::HANGING_ROOTS());
+		$this->mapSimple(Ids::HARD_GLASS, fn() => Blocks::HARDENED_GLASS());
+		$this->mapSimple(Ids::HARD_GLASS_PANE, fn() => Blocks::HARDENED_GLASS_PANE());
+		$this->mapSimple(Ids::HARDENED_CLAY, fn() => Blocks::HARDENED_CLAY());
+		$this->mapSimple(Ids::HONEYCOMB_BLOCK, fn() => Blocks::HONEYCOMB());
+		$this->mapSimple(Ids::ICE, fn() => Blocks::ICE());
+		$this->mapSimple(Ids::INFESTED_CHISELED_STONE_BRICKS, fn() => Blocks::INFESTED_CHISELED_STONE_BRICK());
+		$this->mapSimple(Ids::INFESTED_COBBLESTONE, fn() => Blocks::INFESTED_COBBLESTONE());
+		$this->mapSimple(Ids::INFESTED_CRACKED_STONE_BRICKS, fn() => Blocks::INFESTED_CRACKED_STONE_BRICK());
+		$this->mapSimple(Ids::INFESTED_MOSSY_STONE_BRICKS, fn() => Blocks::INFESTED_MOSSY_STONE_BRICK());
+		$this->mapSimple(Ids::INFESTED_STONE, fn() => Blocks::INFESTED_STONE());
+		$this->mapSimple(Ids::INFESTED_STONE_BRICKS, fn() => Blocks::INFESTED_STONE_BRICK());
+		$this->mapSimple(Ids::INFO_UPDATE, fn() => Blocks::INFO_UPDATE());
+		$this->mapSimple(Ids::INFO_UPDATE2, fn() => Blocks::INFO_UPDATE2());
+		$this->mapSimple(Ids::INVISIBLE_BEDROCK, fn() => Blocks::INVISIBLE_BEDROCK());
+		$this->mapSimple(Ids::IRON_BARS, fn() => Blocks::IRON_BARS());
+		$this->mapSimple(Ids::IRON_BLOCK, fn() => Blocks::IRON());
+		$this->mapSimple(Ids::IRON_ORE, fn() => Blocks::IRON_ORE());
+		$this->mapSimple(Ids::JUKEBOX, fn() => Blocks::JUKEBOX());
+		$this->mapSimple(Ids::LAPIS_BLOCK, fn() => Blocks::LAPIS_LAZULI());
+		$this->mapSimple(Ids::LAPIS_ORE, fn() => Blocks::LAPIS_LAZULI_ORE());
+		$this->mapSimple(Ids::MAGMA, fn() => Blocks::MAGMA());
+		$this->mapSimple(Ids::MANGROVE_ROOTS, fn() => Blocks::MANGROVE_ROOTS());
+		$this->mapSimple(Ids::MELON_BLOCK, fn() => Blocks::MELON());
+		$this->mapSimple(Ids::MOB_SPAWNER, fn() => Blocks::MONSTER_SPAWNER());
+		$this->mapSimple(Ids::MOSSY_COBBLESTONE, fn() => Blocks::MOSSY_COBBLESTONE());
+		$this->mapSimple(Ids::MOSSY_STONE_BRICKS, fn() => Blocks::MOSSY_STONE_BRICKS());
+		$this->mapSimple(Ids::MUD, fn() => Blocks::MUD());
+		$this->mapSimple(Ids::MUD_BRICKS, fn() => Blocks::MUD_BRICKS());
+		$this->mapSimple(Ids::MYCELIUM, fn() => Blocks::MYCELIUM());
+		$this->mapSimple(Ids::NETHER_BRICK, fn() => Blocks::NETHER_BRICKS());
+		$this->mapSimple(Ids::NETHER_BRICK_FENCE, fn() => Blocks::NETHER_BRICK_FENCE());
+		$this->mapSimple(Ids::NETHER_GOLD_ORE, fn() => Blocks::NETHER_GOLD_ORE());
+		$this->mapSimple(Ids::NETHER_WART_BLOCK, fn() => Blocks::NETHER_WART_BLOCK());
+		$this->mapSimple(Ids::NETHERITE_BLOCK, fn() => Blocks::NETHERITE());
+		$this->mapSimple(Ids::NETHERRACK, fn() => Blocks::NETHERRACK());
+		$this->mapSimple(Ids::NETHERREACTOR, fn() => Blocks::NETHER_REACTOR_CORE());
+		$this->mapSimple(Ids::NOTEBLOCK, fn() => Blocks::NOTE_BLOCK());
+		$this->mapSimple(Ids::OBSIDIAN, fn() => Blocks::OBSIDIAN());
+		$this->mapSimple(Ids::PACKED_ICE, fn() => Blocks::PACKED_ICE());
+		$this->mapSimple(Ids::PACKED_MUD, fn() => Blocks::PACKED_MUD());
+		$this->mapSimple(Ids::PODZOL, fn() => Blocks::PODZOL());
+		$this->mapSimple(Ids::POLISHED_ANDESITE, fn() => Blocks::POLISHED_ANDESITE());
+		$this->mapSimple(Ids::POLISHED_BLACKSTONE, fn() => Blocks::POLISHED_BLACKSTONE());
+		$this->mapSimple(Ids::POLISHED_BLACKSTONE_BRICKS, fn() => Blocks::POLISHED_BLACKSTONE_BRICKS());
+		$this->mapSimple(Ids::POLISHED_DEEPSLATE, fn() => Blocks::POLISHED_DEEPSLATE());
+		$this->mapSimple(Ids::POLISHED_DIORITE, fn() => Blocks::POLISHED_DIORITE());
+		$this->mapSimple(Ids::POLISHED_GRANITE, fn() => Blocks::POLISHED_GRANITE());
+		$this->mapSimple(Ids::POLISHED_TUFF, fn() => Blocks::POLISHED_TUFF());
+		$this->mapSimple(Ids::PRISMARINE, fn() => Blocks::PRISMARINE());
+		$this->mapSimple(Ids::PRISMARINE_BRICKS, fn() => Blocks::PRISMARINE_BRICKS());
+		$this->mapSimple(Ids::QUARTZ_BRICKS, fn() => Blocks::QUARTZ_BRICKS());
+		$this->mapSimple(Ids::QUARTZ_ORE, fn() => Blocks::NETHER_QUARTZ_ORE());
+		$this->mapSimple(Ids::RAW_COPPER_BLOCK, fn() => Blocks::RAW_COPPER());
+		$this->mapSimple(Ids::RAW_GOLD_BLOCK, fn() => Blocks::RAW_GOLD());
+		$this->mapSimple(Ids::RAW_IRON_BLOCK, fn() => Blocks::RAW_IRON());
+		$this->mapSimple(Ids::RED_MUSHROOM, fn() => Blocks::RED_MUSHROOM());
+		$this->mapSimple(Ids::RED_NETHER_BRICK, fn() => Blocks::RED_NETHER_BRICKS());
+		$this->mapSimple(Ids::RED_SAND, fn() => Blocks::RED_SAND());
+		$this->mapSimple(Ids::RED_SANDSTONE, fn() => Blocks::RED_SANDSTONE());
+		$this->mapSimple(Ids::REDSTONE_BLOCK, fn() => Blocks::REDSTONE());
+		$this->mapSimple(Ids::REINFORCED_DEEPSLATE, fn() => Blocks::REINFORCED_DEEPSLATE());
+		$this->mapSimple(Ids::RESERVED6, fn() => Blocks::RESERVED6());
+		$this->mapSimple(Ids::SAND, fn() => Blocks::SAND());
+		$this->mapSimple(Ids::SANDSTONE, fn() => Blocks::SANDSTONE());
+		$this->mapSimple(Ids::SCULK, fn() => Blocks::SCULK());
+		$this->mapSimple(Ids::SEA_LANTERN, fn() => Blocks::SEA_LANTERN());
+		$this->mapSimple(Ids::SHORT_GRASS, fn() => Blocks::TALL_GRASS()); //no, this is not a typo - tall_grass is now the double block, just to be confusing :(
+		$this->mapSimple(Ids::SHROOMLIGHT, fn() => Blocks::SHROOMLIGHT());
+		$this->mapSimple(Ids::SLIME, fn() => Blocks::SLIME());
+		$this->mapSimple(Ids::SMITHING_TABLE, fn() => Blocks::SMITHING_TABLE());
+		$this->mapSimple(Ids::SMOOTH_BASALT, fn() => Blocks::SMOOTH_BASALT());
+		$this->mapSimple(Ids::SMOOTH_RED_SANDSTONE, fn() => Blocks::SMOOTH_RED_SANDSTONE());
+		$this->mapSimple(Ids::SMOOTH_SANDSTONE, fn() => Blocks::SMOOTH_SANDSTONE());
+		$this->mapSimple(Ids::SMOOTH_STONE, fn() => Blocks::SMOOTH_STONE());
+		$this->mapSimple(Ids::SNOW, fn() => Blocks::SNOW());
+		$this->mapSimple(Ids::SOUL_SAND, fn() => Blocks::SOUL_SAND());
+		$this->mapSimple(Ids::SOUL_SOIL, fn() => Blocks::SOUL_SOIL());
+		$this->mapSimple(Ids::SPORE_BLOSSOM, fn() => Blocks::SPORE_BLOSSOM());
+		$this->mapSimple(Ids::SPONGE, fn() => Blocks::SPONGE());
+		$this->mapSimple(Ids::STONE, fn() => Blocks::STONE());
+		$this->mapSimple(Ids::STONECUTTER, fn() => Blocks::LEGACY_STONECUTTER());
+		$this->mapSimple(Ids::STONE_BRICKS, fn() => Blocks::STONE_BRICKS());
+		$this->mapSimple(Ids::TINTED_GLASS, fn() => Blocks::TINTED_GLASS());
+		$this->mapSimple(Ids::TORCHFLOWER, fn() => Blocks::TORCHFLOWER());
+		$this->mapSimple(Ids::TUFF, fn() => Blocks::TUFF());
+		$this->mapSimple(Ids::TUFF_BRICKS, fn() => Blocks::TUFF_BRICKS());
+		$this->mapSimple(Ids::UNDYED_SHULKER_BOX, fn() => Blocks::SHULKER_BOX());
+		$this->mapSimple(Ids::WARPED_WART_BLOCK, fn() => Blocks::WARPED_WART_BLOCK());
+		$this->mapSimple(Ids::WARPED_ROOTS, fn() => Blocks::WARPED_ROOTS());
+		$this->mapSimple(Ids::WATERLILY, fn() => Blocks::LILY_PAD());
+		$this->mapSimple(Ids::WEB, fn() => Blocks::COBWEB());
+		$this->mapSimple(Ids::WET_SPONGE, fn() => Blocks::SPONGE()->setWet(true));
+		$this->mapSimple(Ids::WITHER_ROSE, fn() => Blocks::WITHER_ROSE());
+		$this->mapSimple(Ids::DANDELION, fn() => Blocks::DANDELION());
+
+		$this->mapSimple(Ids::ALLIUM, fn() => Blocks::ALLIUM());
+		$this->mapSimple(Ids::CORNFLOWER, fn() => Blocks::CORNFLOWER());
+		$this->mapSimple(Ids::AZURE_BLUET, fn() => Blocks::AZURE_BLUET());
+		$this->mapSimple(Ids::LILY_OF_THE_VALLEY, fn() => Blocks::LILY_OF_THE_VALLEY());
+		$this->mapSimple(Ids::BLUE_ORCHID, fn() => Blocks::BLUE_ORCHID());
+		$this->mapSimple(Ids::OXEYE_DAISY, fn() => Blocks::OXEYE_DAISY());
+		$this->mapSimple(Ids::POPPY, fn() => Blocks::POPPY());
+		$this->mapSimple(Ids::ORANGE_TULIP, fn() => Blocks::ORANGE_TULIP());
+		$this->mapSimple(Ids::PINK_TULIP, fn() => Blocks::PINK_TULIP());
+		$this->mapSimple(Ids::RED_TULIP, fn() => Blocks::RED_TULIP());
+		$this->mapSimple(Ids::WHITE_TULIP, fn() => Blocks::WHITE_TULIP());
+	}
+
+	private function registerDeserializers() : void{
+		$this->map(Ids::ACTIVATOR_RAIL, function(Reader $in) : Block{
+			return Blocks::ACTIVATOR_RAIL()
+				->setPowered($in->readBool(StateNames::RAIL_DATA_BIT))
+				->setShape($in->readBoundedInt(StateNames::RAIL_DIRECTION, 0, 5));
+		});
+		$this->map(Ids::AMETHYST_CLUSTER, function(Reader $in) : Block{
+			return Blocks::AMETHYST_CLUSTER()
+				->setStage(AmethystCluster::STAGE_CLUSTER)
+				->setFacing($in->readBlockFace());
+		});
+		$this->mapSlab(Ids::ANDESITE_SLAB, Ids::ANDESITE_DOUBLE_SLAB, fn() => Blocks::ANDESITE_SLAB());
+		$this->mapStairs(Ids::ANDESITE_STAIRS, fn() => Blocks::ANDESITE_STAIRS());
+		$this->map(Ids::ANDESITE_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::ANDESITE_WALL(), $in));
+		$this->map(Ids::ANVIL, function(Reader $in) : Block{
+			return Blocks::ANVIL()
+				->setDamage(Anvil::UNDAMAGED)
+				->setFacing($in->readCardinalHorizontalFacing());
+		});
+		$this->map(Ids::CHIPPED_ANVIL, function(Reader $in) : Block{
+			return Blocks::ANVIL()
+				->setDamage(Anvil::SLIGHTLY_DAMAGED)
+				->setFacing($in->readCardinalHorizontalFacing());
+		});
+		$this->map(Ids::DAMAGED_ANVIL, function(Reader $in) : Block{
+			return Blocks::ANVIL()
+				->setDamage(Anvil::VERY_DAMAGED)
+				->setFacing($in->readCardinalHorizontalFacing());
+		});
+		$this->map(Ids::BAMBOO, function(Reader $in) : Block{
+			return Blocks::BAMBOO()
+				->setLeafSize(match($value = $in->readString(StateNames::BAMBOO_LEAF_SIZE)){
+					StringValues::BAMBOO_LEAF_SIZE_NO_LEAVES => Bamboo::NO_LEAVES,
+					StringValues::BAMBOO_LEAF_SIZE_SMALL_LEAVES => Bamboo::SMALL_LEAVES,
+					StringValues::BAMBOO_LEAF_SIZE_LARGE_LEAVES => Bamboo::LARGE_LEAVES,
+					default => throw $in->badValueException(StateNames::BAMBOO_LEAF_SIZE, $value),
+				})
+				->setReady($in->readBool(StateNames::AGE_BIT))
+				->setThick(match($value = $in->readString(StateNames::BAMBOO_STALK_THICKNESS)){
+					StringValues::BAMBOO_STALK_THICKNESS_THIN => false,
+					StringValues::BAMBOO_STALK_THICKNESS_THICK => true,
+					default => throw $in->badValueException(StateNames::BAMBOO_STALK_THICKNESS, $value),
+				});
+		});
+		$this->map(Ids::BAMBOO_SAPLING, function(Reader $in) : Block{
+			return Blocks::BAMBOO_SAPLING()->setReady($in->readBool(StateNames::AGE_BIT));
+		});
+		$this->map(Ids::BARREL, function(Reader $in) : Block{
+			return Blocks::BARREL()
+				->setFacing($in->readFacingDirection())
+				->setOpen($in->readBool(StateNames::OPEN_BIT));
+		});
+		$this->map(Ids::BASALT, function(Reader $in){
+			return Blocks::BASALT()
+				->setAxis($in->readPillarAxis());
+		});
+		$this->map(Ids::BED, function(Reader $in) : Block{
+			return Blocks::BED()
+				->setFacing($in->readLegacyHorizontalFacing())
+				->setHead($in->readBool(StateNames::HEAD_PIECE_BIT))
+				->setOccupied($in->readBool(StateNames::OCCUPIED_BIT));
+		});
+		$this->map(Ids::BEDROCK, function(Reader $in) : Block{
+			return Blocks::BEDROCK()
+				->setBurnsForever($in->readBool(StateNames::INFINIBURN_BIT));
+		});
+		$this->map(Ids::BEETROOT, fn(Reader $in) => Helper::decodeCrops(Blocks::BEETROOTS(), $in));
+		$this->map(Ids::BELL, function(Reader $in) : Block{
+			$in->ignored(StateNames::TOGGLE_BIT); //only useful at runtime
+			return Blocks::BELL()
+				->setFacing($in->readLegacyHorizontalFacing())
+				->setAttachmentType($in->readBellAttachmentType());
+		});
+		$this->map(Ids::BIG_DRIPLEAF, function(Reader $in) : Block{
+			if($in->readBool(StateNames::BIG_DRIPLEAF_HEAD)){
+				return Blocks::BIG_DRIPLEAF_HEAD()
+					->setFacing($in->readCardinalHorizontalFacing())
+					->setLeafState(match($type = $in->readString(StateNames::BIG_DRIPLEAF_TILT)){
+						StringValues::BIG_DRIPLEAF_TILT_NONE => DripleafState::STABLE,
+						StringValues::BIG_DRIPLEAF_TILT_UNSTABLE => DripleafState::UNSTABLE,
+						StringValues::BIG_DRIPLEAF_TILT_PARTIAL_TILT => DripleafState::PARTIAL_TILT,
+						StringValues::BIG_DRIPLEAF_TILT_FULL_TILT => DripleafState::FULL_TILT,
+						default => throw $in->badValueException(StateNames::BIG_DRIPLEAF_TILT, $type),
+					});
+			}else{
+				$in->ignored(StateNames::BIG_DRIPLEAF_TILT);
+				return Blocks::BIG_DRIPLEAF_STEM()->setFacing($in->readCardinalHorizontalFacing());
+			}
+		});
+		$this->mapSlab(Ids::BLACKSTONE_SLAB, Ids::BLACKSTONE_DOUBLE_SLAB, fn() => Blocks::BLACKSTONE_SLAB());
+		$this->mapStairs(Ids::BLACKSTONE_STAIRS, fn() => Blocks::BLACKSTONE_STAIRS());
+		$this->map(Ids::BLACKSTONE_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::BLACKSTONE_WALL(), $in));
+		$this->map(Ids::BLAST_FURNACE, function(Reader $in) : Block{
+			return Blocks::BLAST_FURNACE()
+				->setFacing($in->readCardinalHorizontalFacing())
+				->setLit(false);
+		});
+		$this->map(Ids::BONE_BLOCK, function(Reader $in) : Block{
+			$in->ignored(StateNames::DEPRECATED);
+			return Blocks::BONE_BLOCK()->setAxis($in->readPillarAxis());
+		});
+		$this->map(Ids::BREWING_STAND, function(Reader $in) : Block{
+			return Blocks::BREWING_STAND()
+				->setSlot(BrewingStandSlot::EAST, $in->readBool(StateNames::BREWING_STAND_SLOT_A_BIT))
+				->setSlot(BrewingStandSlot::SOUTHWEST, $in->readBool(StateNames::BREWING_STAND_SLOT_B_BIT))
+				->setSlot(BrewingStandSlot::NORTHWEST, $in->readBool(StateNames::BREWING_STAND_SLOT_C_BIT));
+		});
+		$this->mapSlab(Ids::BRICK_SLAB, Ids::BRICK_DOUBLE_SLAB, fn() => Blocks::BRICK_SLAB());
+		$this->mapStairs(Ids::BRICK_STAIRS, fn() => Blocks::BRICK_STAIRS());
+		$this->map(Ids::BRICK_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::BRICK_WALL(), $in));
+		$this->map(Ids::MUSHROOM_STEM, fn(Reader $in) => match($in->readBoundedInt(StateNames::HUGE_MUSHROOM_BITS, 0, 15)){
+			BlockLegacyMetadata::MUSHROOM_BLOCK_ALL_STEM => Blocks::ALL_SIDED_MUSHROOM_STEM(),
+			BlockLegacyMetadata::MUSHROOM_BLOCK_STEM => Blocks::MUSHROOM_STEM(),
+			default => throw new BlockStateDeserializeException("This state does not exist"),
+		});
+		$this->map(Ids::BROWN_MUSHROOM_BLOCK, fn(Reader $in) => Helper::decodeMushroomBlock(Blocks::BROWN_MUSHROOM_BLOCK(), $in));
+		$this->map(Ids::CACTUS, function(Reader $in) : Block{
+			return Blocks::CACTUS()
+				->setAge($in->readBoundedInt(StateNames::AGE, 0, 15));
+		});
+		$this->map(Ids::CAKE, function(Reader $in) : Block{
+			return Blocks::CAKE()
+				->setBites($in->readBoundedInt(StateNames::BITE_COUNTER, 0, 6));
+		});
+		$this->map(Ids::CAMPFIRE, function(Reader $in) : Block{
+			return Blocks::CAMPFIRE()
+				->setFacing($in->readCardinalHorizontalFacing())
+				->setLit(!$in->readBool(StateNames::EXTINGUISHED));
+		});
+		$this->map(Ids::CARROTS, fn(Reader $in) => Helper::decodeCrops(Blocks::CARROTS(), $in));
+		$this->map(Ids::CARVED_PUMPKIN, function(Reader $in) : Block{
+			return Blocks::CARVED_PUMPKIN()
+				->setFacing($in->readCardinalHorizontalFacing());
+		});
+		$this->map(Ids::CAVE_VINES, function(Reader $in) : CaveVines{
+			return Blocks::CAVE_VINES()
+				->setBerries(false)
+				->setHead(false)
+				->setAge($in->readBoundedInt(StateNames::GROWING_PLANT_AGE, 0, 25));
+		});
+		$this->map(Ids::CAVE_VINES_BODY_WITH_BERRIES, function(Reader $in) : CaveVines{
+			return Blocks::CAVE_VINES()
+				->setBerries(true)
+				->setHead(false)
+				->setAge($in->readBoundedInt(StateNames::GROWING_PLANT_AGE, 0, 25));
+		});
+		$this->map(Ids::CAVE_VINES_HEAD_WITH_BERRIES, function(Reader $in) : CaveVines{
+			return Blocks::CAVE_VINES()
+				->setBerries(true)
+				->setHead(true)
+				->setAge($in->readBoundedInt(StateNames::GROWING_PLANT_AGE, 0, 25));
+		});
+		$this->map(Ids::CHAIN, function(Reader $in) : Block{
+			return Blocks::CHAIN()
+				->setAxis($in->readPillarAxis());
+		});
+		$this->map(Ids::CHISELED_BOOKSHELF, function(Reader $in) : Block{
+			$block = Blocks::CHISELED_BOOKSHELF()
+				->setFacing($in->readLegacyHorizontalFacing());
+
+			//we don't use API constant for bounds here as the data bounds might be different to what we support internally
+			$flags = $in->readBoundedInt(StateNames::BOOKS_STORED, 0, (1 << 6) - 1);
+			foreach(ChiseledBookshelfSlot::cases() as $slot){
+				$block->setSlot($slot, ($flags & (1 << $slot->value)) !== 0);
+			}
+
+			return $block;
+		});
+		$this->map(Ids::CHISELED_COPPER, fn() => Helper::decodeCopper(Blocks::CHISELED_COPPER(), CopperOxidation::NONE));
+		$this->map(Ids::CHISELED_QUARTZ_BLOCK, function(Reader $in) : Block{
+			return Blocks::CHISELED_QUARTZ()
+				->setAxis($in->readPillarAxis());
+		});
+		$this->map(Ids::CHEST, function(Reader $in) : Block{
+			return Blocks::CHEST()
+				->setFacing($in->readCardinalHorizontalFacing());
+		});
+		$this->map(Ids::CHORUS_FLOWER, function(Reader $in) : Block{
+			return Blocks::CHORUS_FLOWER()
+				->setAge($in->readBoundedInt(StateNames::AGE, ChorusFlower::MIN_AGE, ChorusFlower::MAX_AGE));
+		});
+		$this->map(Ids::COARSE_DIRT, fn() => Blocks::DIRT()->setDirtType(DirtType::COARSE));
+		$this->mapSlab(Ids::COBBLED_DEEPSLATE_SLAB, Ids::COBBLED_DEEPSLATE_DOUBLE_SLAB, fn() => Blocks::COBBLED_DEEPSLATE_SLAB());
+		$this->mapStairs(Ids::COBBLED_DEEPSLATE_STAIRS, fn() => Blocks::COBBLED_DEEPSLATE_STAIRS());
+		$this->map(Ids::COBBLED_DEEPSLATE_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::COBBLED_DEEPSLATE_WALL(), $in));
+		$this->mapSlab(Ids::COBBLESTONE_SLAB, Ids::COBBLESTONE_DOUBLE_SLAB, fn() => Blocks::COBBLESTONE_SLAB());
+		$this->map(Ids::COBBLESTONE_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::COBBLESTONE_WALL(), $in));
+		$this->map(Ids::COCOA, function(Reader $in) : Block{
+			return Blocks::COCOA_POD()
+				->setAge($in->readBoundedInt(StateNames::AGE, 0, 2))
+				->setFacing(Facing::opposite($in->readLegacyHorizontalFacing()));
+		});
+		$this->map(Ids::COLORED_TORCH_BLUE, fn(Reader $in) => Blocks::BLUE_TORCH()->setFacing($in->readTorchFacing()));
+		$this->map(Ids::COLORED_TORCH_GREEN, fn(Reader $in) => Blocks::GREEN_TORCH()->setFacing($in->readTorchFacing()));
+		$this->map(Ids::COLORED_TORCH_PURPLE, fn(Reader $in) => Blocks::PURPLE_TORCH()->setFacing($in->readTorchFacing()));
+		$this->map(Ids::COLORED_TORCH_RED, fn(Reader $in) => Blocks::RED_TORCH()->setFacing($in->readTorchFacing()));
+		$this->map(Ids::COMPOUND_CREATOR, fn(Reader $in) => Blocks::COMPOUND_CREATOR()
+			->setFacing(Facing::opposite($in->readLegacyHorizontalFacing()))
+		);
+		$this->map(Ids::COPPER_BLOCK, fn() => Helper::decodeCopper(Blocks::COPPER(), CopperOxidation::NONE));
+		$this->map(Ids::COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeCopper(Blocks::COPPER_BULB(), CopperOxidation::NONE)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeCopper(Blocks::COPPER_DOOR(), CopperOxidation::NONE), $in));
+		$this->map(Ids::COPPER_GRATE, fn() => Helper::decodeCopper(Blocks::COPPER_GRATE(), CopperOxidation::NONE));
+		$this->map(Ids::COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::NONE), $in));
+		$this->map(Ids::CUT_COPPER, fn() => Helper::decodeCopper(Blocks::CUT_COPPER(), CopperOxidation::NONE));
+		$this->mapSlab(Ids::CUT_COPPER_SLAB, Ids::DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::NONE));
+		$this->mapStairs(Ids::CUT_COPPER_STAIRS, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::NONE));
+		$this->mapSlab(Ids::CUT_RED_SANDSTONE_SLAB, Ids::CUT_RED_SANDSTONE_DOUBLE_SLAB, fn() => Blocks::CUT_RED_SANDSTONE_SLAB());
+		$this->mapSlab(Ids::CUT_SANDSTONE_SLAB, Ids::CUT_SANDSTONE_DOUBLE_SLAB, fn() => Blocks::CUT_SANDSTONE_SLAB());
+		$this->mapSlab(Ids::DARK_PRISMARINE_SLAB, Ids::DARK_PRISMARINE_DOUBLE_SLAB, fn() => Blocks::DARK_PRISMARINE_SLAB());
+		$this->mapStairs(Ids::DARK_PRISMARINE_STAIRS, fn() => Blocks::DARK_PRISMARINE_STAIRS());
+		$this->map(Ids::DAYLIGHT_DETECTOR, fn(Reader $in) => Helper::decodeDaylightSensor(Blocks::DAYLIGHT_SENSOR(), $in)
+				->setInverted(false));
+		$this->map(Ids::DAYLIGHT_DETECTOR_INVERTED, fn(Reader $in) => Helper::decodeDaylightSensor(Blocks::DAYLIGHT_SENSOR(), $in)
+				->setInverted(true));
+		$this->map(Ids::DEEPSLATE, function(Reader $in) : Block{
+			return Blocks::DEEPSLATE()
+				->setAxis($in->readPillarAxis());
+		});
+		$this->mapSlab(Ids::DEEPSLATE_BRICK_SLAB, Ids::DEEPSLATE_BRICK_DOUBLE_SLAB, fn() => Blocks::DEEPSLATE_BRICK_SLAB());
+		$this->mapStairs(Ids::DEEPSLATE_BRICK_STAIRS, fn() => Blocks::DEEPSLATE_BRICK_STAIRS());
+		$this->map(Ids::DEEPSLATE_BRICK_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::DEEPSLATE_BRICK_WALL(), $in));
+		$this->map(Ids::DEEPSLATE_REDSTONE_ORE, fn() => Blocks::DEEPSLATE_REDSTONE_ORE()->setLit(false));
+		$this->mapSlab(Ids::DEEPSLATE_TILE_SLAB, Ids::DEEPSLATE_TILE_DOUBLE_SLAB, fn() => Blocks::DEEPSLATE_TILE_SLAB());
+		$this->mapStairs(Ids::DEEPSLATE_TILE_STAIRS, fn() => Blocks::DEEPSLATE_TILE_STAIRS());
+		$this->map(Ids::DEEPSLATE_TILE_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::DEEPSLATE_TILE_WALL(), $in));
+		$this->map(Ids::DETECTOR_RAIL, function(Reader $in) : Block{
+			return Blocks::DETECTOR_RAIL()
+				->setActivated($in->readBool(StateNames::RAIL_DATA_BIT))
+				->setShape($in->readBoundedInt(StateNames::RAIL_DIRECTION, 0, 5));
+		});
+		$this->mapSlab(Ids::DIORITE_SLAB, Ids::DIORITE_DOUBLE_SLAB, fn() => Blocks::DIORITE_SLAB());
+		$this->mapStairs(Ids::DIORITE_STAIRS, fn() => Blocks::DIORITE_STAIRS());
+		$this->map(Ids::DIORITE_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::DIORITE_WALL(), $in));
+		$this->map(Ids::DIRT, fn() => Blocks::DIRT()->setDirtType(DirtType::NORMAL));
+		$this->map(Ids::DIRT_WITH_ROOTS, fn() => Blocks::DIRT()->setDirtType(DirtType::ROOTED));
+		$this->map(Ids::LARGE_FERN, fn(Reader $in) => Helper::decodeDoublePlant(Blocks::LARGE_FERN(), $in));
+		$this->map(Ids::TALL_GRASS, fn(Reader $in) => Helper::decodeDoublePlant(Blocks::DOUBLE_TALLGRASS(), $in));
+		$this->map(Ids::PEONY, fn(Reader $in) => Helper::decodeDoublePlant(Blocks::PEONY(), $in));
+		$this->map(Ids::ROSE_BUSH, fn(Reader $in) => Helper::decodeDoublePlant(Blocks::ROSE_BUSH(), $in));
+		$this->map(Ids::SUNFLOWER, fn(Reader $in) => Helper::decodeDoublePlant(Blocks::SUNFLOWER(), $in));
+		$this->map(Ids::LILAC, fn(Reader $in) => Helper::decodeDoublePlant(Blocks::LILAC(), $in));
+		$this->map(Ids::ELEMENT_CONSTRUCTOR, fn(Reader $in) => Blocks::ELEMENT_CONSTRUCTOR()
+			->setFacing(Facing::opposite($in->readLegacyHorizontalFacing()))
+		);
+		$this->mapStairs(Ids::END_BRICK_STAIRS, fn() => Blocks::END_STONE_BRICK_STAIRS());
+		$this->map(Ids::END_STONE_BRICK_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::END_STONE_BRICK_WALL(), $in));
+		$this->map(Ids::END_PORTAL_FRAME, function(Reader $in) : Block{
+			return Blocks::END_PORTAL_FRAME()
+				->setEye($in->readBool(StateNames::END_PORTAL_EYE_BIT))
+				->setFacing($in->readCardinalHorizontalFacing());
+		});
+		$this->map(Ids::END_ROD, function(Reader $in) : Block{
+			return Blocks::END_ROD()
+				->setFacing($in->readEndRodFacingDirection());
+		});
+		$this->mapSlab(Ids::END_STONE_BRICK_SLAB, Ids::END_STONE_BRICK_DOUBLE_SLAB, fn() => Blocks::END_STONE_BRICK_SLAB());
+		$this->map(Ids::ENDER_CHEST, function(Reader $in) : Block{
+			return Blocks::ENDER_CHEST()
+				->setFacing($in->readCardinalHorizontalFacing());
+		});
+		$this->map(Ids::EXPOSED_COPPER, fn() => Helper::decodeCopper(Blocks::COPPER(), CopperOxidation::EXPOSED));
+		$this->map(Ids::EXPOSED_CHISELED_COPPER, fn() => Helper::decodeCopper(Blocks::CHISELED_COPPER(), CopperOxidation::EXPOSED));
+		$this->map(Ids::EXPOSED_COPPER_GRATE, fn() => Helper::decodeCopper(Blocks::COPPER_GRATE(), CopperOxidation::EXPOSED));
+		$this->map(Ids::EXPOSED_CUT_COPPER, fn() => Helper::decodeCopper(Blocks::CUT_COPPER(), CopperOxidation::EXPOSED));
+		$this->mapSlab(Ids::EXPOSED_CUT_COPPER_SLAB, Ids::EXPOSED_DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::EXPOSED));
+		$this->mapStairs(Ids::EXPOSED_CUT_COPPER_STAIRS, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::EXPOSED));
+		$this->map(Ids::EXPOSED_COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeCopper(Blocks::COPPER_BULB(), CopperOxidation::EXPOSED)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::EXPOSED_COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeCopper(Blocks::COPPER_DOOR(), CopperOxidation::EXPOSED), $in));
+		$this->map(Ids::EXPOSED_COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::EXPOSED), $in));
+		$this->map(Ids::FARMLAND, function(Reader $in) : Block{
+			return Blocks::FARMLAND()
+				->setWetness($in->readBoundedInt(StateNames::MOISTURIZED_AMOUNT, 0, 7));
+		});
+		$this->map(Ids::FIRE, function(Reader $in) : Block{
+			return Blocks::FIRE()
+				->setAge($in->readBoundedInt(StateNames::AGE, 0, 15));
+		});
+		$this->map(Ids::FLOWER_POT, function(Reader $in) : Block{
+			$in->ignored(StateNames::UPDATE_BIT);
+			return Blocks::FLOWER_POT();
+		});
+		$this->map(Ids::FLOWING_LAVA, fn(Reader $in) => Helper::decodeFlowingLiquid(Blocks::LAVA(), $in));
+		$this->map(Ids::FLOWING_WATER, fn(Reader $in) => Helper::decodeFlowingLiquid(Blocks::WATER(), $in));
+		$this->map(Ids::FRAME, fn(Reader $in) => Helper::decodeItemFrame(Blocks::ITEM_FRAME(), $in));
+		$this->map(Ids::FROSTED_ICE, function(Reader $in) : Block{
+			return Blocks::FROSTED_ICE()
+				->setAge($in->readBoundedInt(StateNames::AGE, 0, 3));
+		});
+		$this->map(Ids::FURNACE, function(Reader $in) : Block{
+			return Blocks::FURNACE()
+				->setFacing($in->readCardinalHorizontalFacing())
+				->setLit(false);
+		});
+		$this->map(Ids::GLOW_LICHEN, fn(Reader $in) => Blocks::GLOW_LICHEN()->setFaces($in->readFacingFlags()));
+		$this->map(Ids::GLOW_FRAME, fn(Reader $in) => Helper::decodeItemFrame(Blocks::GLOWING_ITEM_FRAME(), $in));
+		$this->map(Ids::GOLDEN_RAIL, function(Reader $in) : Block{
+			return Blocks::POWERED_RAIL()
+				->setPowered($in->readBool(StateNames::RAIL_DATA_BIT))
+				->setShape($in->readBoundedInt(StateNames::RAIL_DIRECTION, 0, 5));
+		});
+		$this->mapSlab(Ids::GRANITE_SLAB, Ids::GRANITE_DOUBLE_SLAB, fn() => Blocks::GRANITE_SLAB());
+		$this->mapStairs(Ids::GRANITE_STAIRS, fn() => Blocks::GRANITE_STAIRS());
+		$this->map(Ids::GRANITE_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::GRANITE_WALL(), $in));
+		$this->map(Ids::HAY_BLOCK, function(Reader $in) : Block{
+			$in->ignored(StateNames::DEPRECATED);
+			return Blocks::HAY_BALE()->setAxis($in->readPillarAxis());
+		});
+		$this->map(Ids::HEAVY_WEIGHTED_PRESSURE_PLATE, fn(Reader $in) => Helper::decodeWeightedPressurePlate(Blocks::WEIGHTED_PRESSURE_PLATE_HEAVY(), $in));
+		$this->map(Ids::HOPPER, function(Reader $in) : Block{
+			return Blocks::HOPPER()
+				->setFacing($in->readFacingWithoutUp())
+				->setPowered($in->readBool(StateNames::TOGGLE_BIT));
+		});
+		$this->map(Ids::IRON_DOOR, fn(Reader $in) => Helper::decodeDoor(Blocks::IRON_DOOR(), $in));
+		$this->map(Ids::IRON_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Blocks::IRON_TRAPDOOR(), $in));
+		$this->map(Ids::LAB_TABLE, fn(Reader $in) => Blocks::LAB_TABLE()
+			->setFacing(Facing::opposite($in->readLegacyHorizontalFacing()))
+		);
+		$this->map(Ids::LADDER, function(Reader $in) : Block{
+			return Blocks::LADDER()
+				->setFacing($in->readHorizontalFacing());
+		});
+		$this->map(Ids::LANTERN, function(Reader $in) : Block{
+			return Blocks::LANTERN()
+				->setHanging($in->readBool(StateNames::HANGING));
+		});
+		$this->map(Ids::LARGE_AMETHYST_BUD, function(Reader $in) : Block{
+			return Blocks::AMETHYST_CLUSTER()
+				->setStage(AmethystCluster::STAGE_LARGE_BUD)
+				->setFacing($in->readBlockFace());
+		});
+		$this->map(Ids::LAVA, fn(Reader $in) => Helper::decodeStillLiquid(Blocks::LAVA(), $in));
+		$this->map(Ids::LECTERN, function(Reader $in) : Block{
+			return Blocks::LECTERN()
+				->setFacing($in->readCardinalHorizontalFacing())
+				->setProducingSignal($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::LEVER, function(Reader $in) : Block{
+			return Blocks::LEVER()
+				->setActivated($in->readBool(StateNames::OPEN_BIT))
+				->setFacing(match($value = $in->readString(StateNames::LEVER_DIRECTION)){
+					StringValues::LEVER_DIRECTION_DOWN_NORTH_SOUTH => LeverFacing::DOWN_AXIS_Z,
+					StringValues::LEVER_DIRECTION_DOWN_EAST_WEST => LeverFacing::DOWN_AXIS_X,
+					StringValues::LEVER_DIRECTION_UP_NORTH_SOUTH => LeverFacing::UP_AXIS_Z,
+					StringValues::LEVER_DIRECTION_UP_EAST_WEST => LeverFacing::UP_AXIS_X,
+					StringValues::LEVER_DIRECTION_NORTH => LeverFacing::NORTH,
+					StringValues::LEVER_DIRECTION_SOUTH => LeverFacing::SOUTH,
+					StringValues::LEVER_DIRECTION_WEST => LeverFacing::WEST,
+					StringValues::LEVER_DIRECTION_EAST => LeverFacing::EAST,
+					default => throw $in->badValueException(StateNames::LEVER_DIRECTION, $value),
+				});
+		});
+		$this->map(Ids::LIGHTNING_ROD, function(Reader $in) : Block{
+			return Blocks::LIGHTNING_ROD()
+				->setFacing($in->readFacingDirection());
+		});
+		$this->map(Ids::LIGHT_WEIGHTED_PRESSURE_PLATE, fn(Reader $in) => Helper::decodeWeightedPressurePlate(Blocks::WEIGHTED_PRESSURE_PLATE_LIGHT(), $in));
+		$this->map(Ids::LIT_BLAST_FURNACE, function(Reader $in) : Block{
+			return Blocks::BLAST_FURNACE()
+				->setFacing($in->readCardinalHorizontalFacing())
+				->setLit(true);
+		});
+		$this->map(Ids::LIT_DEEPSLATE_REDSTONE_ORE, fn() => Blocks::DEEPSLATE_REDSTONE_ORE()->setLit(true));
+		$this->map(Ids::LIT_FURNACE, function(Reader $in) : Block{
+			return Blocks::FURNACE()
+				->setFacing($in->readCardinalHorizontalFacing())
+				->setLit(true);
+		});
+		$this->map(Ids::LIT_PUMPKIN, function(Reader $in) : Block{
+			return Blocks::LIT_PUMPKIN()
+				->setFacing($in->readCardinalHorizontalFacing());
+		});
+		$this->map(Ids::LIT_REDSTONE_LAMP, function() : Block{
+			return Blocks::REDSTONE_LAMP()
+				->setPowered(true);
+		});
+		$this->map(Ids::LIT_REDSTONE_ORE, function() : Block{
+			return Blocks::REDSTONE_ORE()
+				->setLit(true);
+		});
+		$this->map(Ids::LIT_SMOKER, function(Reader $in) : Block{
+			return Blocks::SMOKER()
+				->setFacing($in->readCardinalHorizontalFacing())
+				->setLit(true);
+		});
+		$this->map(Ids::LOOM, function(Reader $in) : Block{
+			return Blocks::LOOM()
+				->setFacing($in->readLegacyHorizontalFacing());
+		});
+		$this->map(Ids::MATERIAL_REDUCER, fn(Reader $in) => Blocks::MATERIAL_REDUCER()
+			->setFacing(Facing::opposite($in->readLegacyHorizontalFacing()))
+		);
+		$this->map(Ids::MEDIUM_AMETHYST_BUD, function(Reader $in) : Block{
+			return Blocks::AMETHYST_CLUSTER()
+				->setStage(AmethystCluster::STAGE_MEDIUM_BUD)
+				->setFacing($in->readBlockFace());
+		});
+		$this->map(Ids::MELON_STEM, fn(Reader $in) => Helper::decodeStem(Blocks::MELON_STEM(), $in));
+		$this->mapSlab(Ids::MOSSY_COBBLESTONE_SLAB, Ids::MOSSY_COBBLESTONE_DOUBLE_SLAB, fn() => Blocks::MOSSY_COBBLESTONE_SLAB());
+		$this->mapStairs(Ids::MOSSY_COBBLESTONE_STAIRS, fn() => Blocks::MOSSY_COBBLESTONE_STAIRS());
+		$this->map(Ids::MOSSY_COBBLESTONE_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::MOSSY_COBBLESTONE_WALL(), $in));
+		$this->mapSlab(Ids::MOSSY_STONE_BRICK_SLAB, Ids::MOSSY_STONE_BRICK_DOUBLE_SLAB, fn() => Blocks::MOSSY_STONE_BRICK_SLAB());
+		$this->mapStairs(Ids::MOSSY_STONE_BRICK_STAIRS, fn() => Blocks::MOSSY_STONE_BRICK_STAIRS());
+		$this->map(Ids::MOSSY_STONE_BRICK_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::MOSSY_STONE_BRICK_WALL(), $in));
+		$this->mapSlab(Ids::MUD_BRICK_SLAB, Ids::MUD_BRICK_DOUBLE_SLAB, fn() => Blocks::MUD_BRICK_SLAB());
+		$this->mapStairs(Ids::MUD_BRICK_STAIRS, fn() => Blocks::MUD_BRICK_STAIRS());
+		$this->map(Ids::MUD_BRICK_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::MUD_BRICK_WALL(), $in));
+		$this->map(Ids::MUDDY_MANGROVE_ROOTS, function(Reader $in) : Block{
+			return Blocks::MUDDY_MANGROVE_ROOTS()
+				->setAxis($in->readPillarAxis());
+		});
+		$this->mapSlab(Ids::NETHER_BRICK_SLAB, Ids::NETHER_BRICK_DOUBLE_SLAB, fn() => Blocks::NETHER_BRICK_SLAB());
+		$this->mapStairs(Ids::NETHER_BRICK_STAIRS, fn() => Blocks::NETHER_BRICK_STAIRS());
+		$this->map(Ids::NETHER_BRICK_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::NETHER_BRICK_WALL(), $in));
+		$this->map(Ids::NETHER_WART, function(Reader $in) : Block{
+			return Blocks::NETHER_WART()
+				->setAge($in->readBoundedInt(StateNames::AGE, 0, 3));
+		});
+		$this->mapSlab(Ids::NORMAL_STONE_SLAB, Ids::NORMAL_STONE_DOUBLE_SLAB, fn() => Blocks::STONE_SLAB());
+		$this->mapStairs(Ids::NORMAL_STONE_STAIRS, fn() => Blocks::STONE_STAIRS());
+		$this->map(Ids::OCHRE_FROGLIGHT, fn(Reader $in) => Blocks::FROGLIGHT()->setFroglightType(FroglightType::OCHRE)->setAxis($in->readPillarAxis()));
+		$this->map(Ids::OXIDIZED_COPPER, fn() => Helper::decodeCopper(Blocks::COPPER(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::OXIDIZED_CHISELED_COPPER, fn() => Helper::decodeCopper(Blocks::CHISELED_COPPER(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::OXIDIZED_COPPER_GRATE, fn() => Helper::decodeCopper(Blocks::COPPER_GRATE(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::OXIDIZED_CUT_COPPER, fn() => Helper::decodeCopper(Blocks::CUT_COPPER(), CopperOxidation::OXIDIZED));
+		$this->mapSlab(Ids::OXIDIZED_CUT_COPPER_SLAB, Ids::OXIDIZED_DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::OXIDIZED));
+		$this->mapStairs(Ids::OXIDIZED_CUT_COPPER_STAIRS, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::OXIDIZED_COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeCopper(Blocks::COPPER_BULB(), CopperOxidation::OXIDIZED)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::OXIDIZED_COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeCopper(Blocks::COPPER_DOOR(), CopperOxidation::OXIDIZED), $in));
+		$this->map(Ids::OXIDIZED_COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::OXIDIZED), $in));
+		$this->map(Ids::PEARLESCENT_FROGLIGHT, fn(Reader $in) => Blocks::FROGLIGHT()->setFroglightType(FroglightType::PEARLESCENT)->setAxis($in->readPillarAxis()));
+		$this->mapSlab(Ids::PETRIFIED_OAK_SLAB, Ids::PETRIFIED_OAK_DOUBLE_SLAB, fn() => Blocks::FAKE_WOODEN_SLAB());
+		$this->map(Ids::PINK_PETALS, function(Reader $in) : Block{
+			//Pink petals only uses 0-3, but GROWTH state can go up to 7
+			$growth = $in->readBoundedInt(StateNames::GROWTH, 0, 7);
+			return Blocks::PINK_PETALS()
+				->setFacing($in->readCardinalHorizontalFacing())
+				->setCount(min($growth + 1, PinkPetals::MAX_COUNT));
+		});
+		$this->map(Ids::PITCHER_CROP, function(Reader $in) : Block{
+			$growth = $in->readBoundedInt(StateNames::GROWTH, 0, 7);
+			$top = $in->readBool(StateNames::UPPER_BLOCK_BIT);
+			if($growth <= PitcherCrop::MAX_AGE){
+				//top pitcher crop with age 0-2 is an invalid state
+				//only the bottom half should exist in this case
+				return $top ? Blocks::AIR() : Blocks::PITCHER_CROP()->setAge($growth);
+			}
+			return Blocks::DOUBLE_PITCHER_CROP()
+				->setAge(min($growth - PitcherCrop::MAX_AGE - 1, DoublePitcherCrop::MAX_AGE))
+				->setTop($top);
+		});
+		$this->map(Ids::PITCHER_PLANT, function(Reader $in) : Block{
+			return Blocks::PITCHER_PLANT()
+				->setTop($in->readBool(StateNames::UPPER_BLOCK_BIT));
+		});
+		$this->mapSlab(Ids::POLISHED_ANDESITE_SLAB, Ids::POLISHED_ANDESITE_DOUBLE_SLAB, fn() => Blocks::POLISHED_ANDESITE_SLAB());
+		$this->mapStairs(Ids::POLISHED_ANDESITE_STAIRS, fn() => Blocks::POLISHED_ANDESITE_STAIRS());
+		$this->map(Ids::POLISHED_BASALT, function(Reader $in) : Block{
+			return Blocks::POLISHED_BASALT()
+				->setAxis($in->readPillarAxis());
+		});
+		$this->map(Ids::POLISHED_BLACKSTONE_BUTTON, fn(Reader $in) => Helper::decodeButton(Blocks::POLISHED_BLACKSTONE_BUTTON(), $in));
+		$this->mapSlab(Ids::POLISHED_BLACKSTONE_SLAB, Ids::POLISHED_BLACKSTONE_DOUBLE_SLAB, fn() => Blocks::POLISHED_BLACKSTONE_SLAB());
+		$this->map(Ids::POLISHED_BLACKSTONE_PRESSURE_PLATE, fn(Reader $in) => Helper::decodeSimplePressurePlate(Blocks::POLISHED_BLACKSTONE_PRESSURE_PLATE(), $in));
+		$this->mapStairs(Ids::POLISHED_BLACKSTONE_STAIRS, fn() => Blocks::POLISHED_BLACKSTONE_STAIRS());
+		$this->map(Ids::POLISHED_BLACKSTONE_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::POLISHED_BLACKSTONE_WALL(), $in));
+		$this->mapSlab(Ids::POLISHED_BLACKSTONE_BRICK_SLAB, Ids::POLISHED_BLACKSTONE_BRICK_DOUBLE_SLAB, fn() => Blocks::POLISHED_BLACKSTONE_BRICK_SLAB());
+		$this->mapStairs(Ids::POLISHED_BLACKSTONE_BRICK_STAIRS, fn() => Blocks::POLISHED_BLACKSTONE_BRICK_STAIRS());
+		$this->map(Ids::POLISHED_BLACKSTONE_BRICK_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::POLISHED_BLACKSTONE_BRICK_WALL(), $in));
+		$this->mapSlab(Ids::POLISHED_DEEPSLATE_SLAB, Ids::POLISHED_DEEPSLATE_DOUBLE_SLAB, fn() => Blocks::POLISHED_DEEPSLATE_SLAB());
+		$this->mapStairs(Ids::POLISHED_DEEPSLATE_STAIRS, fn() => Blocks::POLISHED_DEEPSLATE_STAIRS());
+		$this->map(Ids::POLISHED_DEEPSLATE_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::POLISHED_DEEPSLATE_WALL(), $in));
+		$this->mapSlab(Ids::POLISHED_DIORITE_SLAB, Ids::POLISHED_DIORITE_DOUBLE_SLAB, fn() => Blocks::POLISHED_DIORITE_SLAB());
+		$this->mapStairs(Ids::POLISHED_DIORITE_STAIRS, fn() => Blocks::POLISHED_DIORITE_STAIRS());
+		$this->mapSlab(Ids::POLISHED_GRANITE_SLAB, Ids::POLISHED_GRANITE_DOUBLE_SLAB, fn() => Blocks::POLISHED_GRANITE_SLAB());
+		$this->mapStairs(Ids::POLISHED_GRANITE_STAIRS, fn() => Blocks::POLISHED_GRANITE_STAIRS());
+		$this->mapSlab(Ids::POLISHED_TUFF_SLAB, Ids::POLISHED_TUFF_DOUBLE_SLAB, fn() => Blocks::POLISHED_TUFF_SLAB());
+		$this->mapStairs(Ids::POLISHED_TUFF_STAIRS, fn() => Blocks::POLISHED_TUFF_STAIRS());
+		$this->map(Ids::POLISHED_TUFF_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::POLISHED_TUFF_WALL(), $in));
+		$this->map(Ids::PORTAL, function(Reader $in) : Block{
+			return Blocks::NETHER_PORTAL()
+				->setAxis(match($value = $in->readString(StateNames::PORTAL_AXIS)){
+					StringValues::PORTAL_AXIS_UNKNOWN => Axis::X,
+					StringValues::PORTAL_AXIS_X => Axis::X,
+					StringValues::PORTAL_AXIS_Z => Axis::Z,
+					default => throw $in->badValueException(StateNames::PORTAL_AXIS, $value),
+				});
+		});
+		$this->map(Ids::POTATOES, fn(Reader $in) => Helper::decodeCrops(Blocks::POTATOES(), $in));
+		$this->map(Ids::POWERED_COMPARATOR, fn(Reader $in) => Helper::decodeComparator(Blocks::REDSTONE_COMPARATOR(), $in));
+		$this->map(Ids::POWERED_REPEATER, fn(Reader $in) => Helper::decodeRepeater(Blocks::REDSTONE_REPEATER(), $in)
+				->setPowered(true));
+		$this->mapSlab(Ids::PRISMARINE_BRICK_SLAB, Ids::PRISMARINE_BRICK_DOUBLE_SLAB, fn() => Blocks::PRISMARINE_BRICKS_SLAB());
+		$this->mapStairs(Ids::PRISMARINE_BRICKS_STAIRS, fn() => Blocks::PRISMARINE_BRICKS_STAIRS());
+		$this->map(Ids::PRISMARINE_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::PRISMARINE_WALL(), $in));
+		$this->mapSlab(Ids::PRISMARINE_SLAB, Ids::PRISMARINE_DOUBLE_SLAB, fn() => Blocks::PRISMARINE_SLAB());
+		$this->mapStairs(Ids::PRISMARINE_STAIRS, fn() => Blocks::PRISMARINE_STAIRS());
+		$this->map(Ids::PUMPKIN, function(Reader $in) : Block{
+			$in->ignored(StateNames::MC_CARDINAL_DIRECTION); //obsolete
+			return Blocks::PUMPKIN();
+		});
+		$this->map(Ids::PUMPKIN_STEM, fn(Reader $in) => Helper::decodeStem(Blocks::PUMPKIN_STEM(), $in));
+		$this->map(Ids::PURPUR_BLOCK, function(Reader $in) : Block{
+			$in->ignored(StateNames::PILLAR_AXIS); //???
+			return Blocks::PURPUR();
+		});
+		$this->map(Ids::PURPUR_PILLAR, fn(Reader $in) => Blocks::PURPUR_PILLAR()->setAxis($in->readPillarAxis()));
+		$this->mapSlab(Ids::PURPUR_SLAB, Ids::PURPUR_DOUBLE_SLAB, fn() => Blocks::PURPUR_SLAB());
+		$this->mapStairs(Ids::PURPUR_STAIRS, fn() => Blocks::PURPUR_STAIRS());
+		$this->map(Ids::QUARTZ_BLOCK, function(Reader $in) : Opaque{
+			$in->ignored(StateNames::PILLAR_AXIS);
+			return Blocks::QUARTZ();
+		});
+		$this->map(Ids::QUARTZ_PILLAR, function(Reader $in) : Block{
+			return Blocks::QUARTZ_PILLAR()
+				->setAxis($in->readPillarAxis());
+		});
+		$this->mapSlab(Ids::QUARTZ_SLAB, Ids::QUARTZ_DOUBLE_SLAB, fn() => Blocks::QUARTZ_SLAB());
+		$this->mapStairs(Ids::QUARTZ_STAIRS, fn() => Blocks::QUARTZ_STAIRS());
+		$this->map(Ids::RAIL, function(Reader $in) : Block{
+			return Blocks::RAIL()
+				->setShape($in->readBoundedInt(StateNames::RAIL_DIRECTION, 0, 9));
+		});
+		$this->map(Ids::RED_MUSHROOM_BLOCK, fn(Reader $in) => Helper::decodeMushroomBlock(Blocks::RED_MUSHROOM_BLOCK(), $in));
+		$this->mapSlab(Ids::RED_NETHER_BRICK_SLAB, Ids::RED_NETHER_BRICK_DOUBLE_SLAB, fn() => Blocks::RED_NETHER_BRICK_SLAB());
+		$this->mapStairs(Ids::RED_NETHER_BRICK_STAIRS, fn() => Blocks::RED_NETHER_BRICK_STAIRS());
+		$this->map(Ids::RED_NETHER_BRICK_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::RED_NETHER_BRICK_WALL(), $in));
+		$this->mapSlab(Ids::RED_SANDSTONE_SLAB, Ids::RED_SANDSTONE_DOUBLE_SLAB, fn() => Blocks::RED_SANDSTONE_SLAB());
+		$this->mapStairs(Ids::RED_SANDSTONE_STAIRS, fn() => Blocks::RED_SANDSTONE_STAIRS());
+		$this->map(Ids::RED_SANDSTONE_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::RED_SANDSTONE_WALL(), $in));
+		$this->map(Ids::REDSTONE_LAMP, function() : Block{
+			return Blocks::REDSTONE_LAMP()
+				->setPowered(false);
+		});
+		$this->map(Ids::REDSTONE_ORE, function() : Block{
+			return Blocks::REDSTONE_ORE()
+				->setLit(false);
+		});
+		$this->map(Ids::REDSTONE_TORCH, function(Reader $in) : Block{
+			return Blocks::REDSTONE_TORCH()
+				->setFacing($in->readTorchFacing())
+				->setLit(true);
+		});
+		$this->map(Ids::REDSTONE_WIRE, function(Reader $in) : Block{
+			return Blocks::REDSTONE_WIRE()
+				->setOutputSignalStrength($in->readBoundedInt(StateNames::REDSTONE_SIGNAL, 0, 15));
+		});
+		$this->map(Ids::REEDS, function(Reader $in) : Block{
+			return Blocks::SUGARCANE()
+				->setAge($in->readBoundedInt(StateNames::AGE, 0, 15));
+		});
+		$this->mapSlab(Ids::SANDSTONE_SLAB, Ids::SANDSTONE_DOUBLE_SLAB, fn() => Blocks::SANDSTONE_SLAB());
+		$this->mapStairs(Ids::SANDSTONE_STAIRS, fn() => Blocks::SANDSTONE_STAIRS());
+		$this->map(Ids::SANDSTONE_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::SANDSTONE_WALL(), $in));
+		$this->map(Ids::SEA_PICKLE, function(Reader $in) : Block{
+			return Blocks::SEA_PICKLE()
+				->setCount($in->readBoundedInt(StateNames::CLUSTER_COUNT, 0, 3) + 1)
+				->setUnderwater(!$in->readBool(StateNames::DEAD_BIT));
+		});
+		$this->map(Ids::SMOKER, function(Reader $in) : Block{
+			return Blocks::SMOKER()
+				->setFacing($in->readCardinalHorizontalFacing())
+				->setLit(false);
+		});
+		$this->map(Ids::SMALL_AMETHYST_BUD, function(Reader $in) : Block{
+			return Blocks::AMETHYST_CLUSTER()
+				->setStage(AmethystCluster::STAGE_SMALL_BUD)
+				->setFacing($in->readBlockFace());
+		});
+		$this->map(Ids::SMALL_DRIPLEAF_BLOCK, function(Reader $in) : Block{
+			return Blocks::SMALL_DRIPLEAF()
+				->setFacing($in->readCardinalHorizontalFacing())
+				->setTop($in->readBool(StateNames::UPPER_BLOCK_BIT));
+		});
+		$this->map(Ids::SMOOTH_QUARTZ, function(Reader $in) : Block{
+			$in->ignored(StateNames::PILLAR_AXIS);
+			return Blocks::SMOOTH_QUARTZ();
+		});
+		$this->mapSlab(Ids::SMOOTH_QUARTZ_SLAB, Ids::SMOOTH_QUARTZ_DOUBLE_SLAB, fn() => Blocks::SMOOTH_QUARTZ_SLAB());
+		$this->mapStairs(Ids::SMOOTH_QUARTZ_STAIRS, fn() => Blocks::SMOOTH_QUARTZ_STAIRS());
+		$this->mapSlab(Ids::SMOOTH_RED_SANDSTONE_SLAB, Ids::SMOOTH_RED_SANDSTONE_DOUBLE_SLAB, fn() => Blocks::SMOOTH_RED_SANDSTONE_SLAB());
+		$this->mapStairs(Ids::SMOOTH_RED_SANDSTONE_STAIRS, fn() => Blocks::SMOOTH_RED_SANDSTONE_STAIRS());
+		$this->mapSlab(Ids::SMOOTH_SANDSTONE_SLAB, Ids::SMOOTH_SANDSTONE_DOUBLE_SLAB, fn() => Blocks::SMOOTH_SANDSTONE_SLAB());
+		$this->mapStairs(Ids::SMOOTH_SANDSTONE_STAIRS, fn() => Blocks::SMOOTH_SANDSTONE_STAIRS());
+		$this->mapSlab(Ids::SMOOTH_STONE_SLAB, Ids::SMOOTH_STONE_DOUBLE_SLAB, fn() => Blocks::SMOOTH_STONE_SLAB());
+		$this->map(Ids::SNOW_LAYER, function(Reader $in) : Block{
+			$in->ignored(StateNames::COVERED_BIT); //seems to be useless
+			return Blocks::SNOW_LAYER()->setLayers($in->readBoundedInt(StateNames::HEIGHT, 0, 7) + 1);
+		});
+		$this->map(Ids::SOUL_CAMPFIRE, function(Reader $in) : Block{
+			return Blocks::SOUL_CAMPFIRE()
+				->setFacing($in->readCardinalHorizontalFacing())
+				->setLit(!$in->readBool(StateNames::EXTINGUISHED));
+		});
+		$this->map(Ids::SOUL_FIRE, function(Reader $in) : Block{
+			$in->ignored(StateNames::AGE); //this is useless for soul fire, since it doesn't have the logic associated
+			return Blocks::SOUL_FIRE();
+		});
+		$this->map(Ids::SOUL_LANTERN, function(Reader $in) : Block{
+			return Blocks::SOUL_LANTERN()
+				->setHanging($in->readBool(StateNames::HANGING));
+		});
+		$this->map(Ids::SOUL_TORCH, function(Reader $in) : Block{
+			return Blocks::SOUL_TORCH()
+				->setFacing($in->readTorchFacing());
+		});
+		$this->map(Ids::STANDING_BANNER, function(Reader $in) : Block{
+			return Blocks::BANNER()
+				->setRotation($in->readBoundedInt(StateNames::GROUND_SIGN_DIRECTION, 0, 15));
+		});
+		$this->mapSlab(Ids::STONE_BRICK_SLAB, Ids::STONE_BRICK_DOUBLE_SLAB, fn() => Blocks::STONE_BRICK_SLAB());
+		$this->mapStairs(Ids::STONE_BRICK_STAIRS, fn() => Blocks::STONE_BRICK_STAIRS());
+		$this->map(Ids::STONE_BRICK_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::STONE_BRICK_WALL(), $in));
+		$this->map(Ids::STONE_BUTTON, fn(Reader $in) => Helper::decodeButton(Blocks::STONE_BUTTON(), $in));
+		$this->map(Ids::STONE_PRESSURE_PLATE, fn(Reader $in) => Helper::decodeSimplePressurePlate(Blocks::STONE_PRESSURE_PLATE(), $in));
+		$this->mapStairs(Ids::STONE_STAIRS, fn() => Blocks::COBBLESTONE_STAIRS());
+		$this->map(Ids::STONECUTTER_BLOCK, function(Reader $in) : Block{
+			return Blocks::STONECUTTER()
+				->setFacing($in->readCardinalHorizontalFacing());
+		});
+		$this->map(Ids::SWEET_BERRY_BUSH, function(Reader $in) : Block{
+			//berry bush only wants 0-3, but it can be bigger in MCPE due to misuse of GROWTH state which goes up to 7
+			$growth = $in->readBoundedInt(StateNames::GROWTH, 0, 7);
+			return Blocks::SWEET_BERRY_BUSH()
+				->setAge(min($growth, SweetBerryBush::STAGE_MATURE));
+		});
+		$this->map(Ids::TNT, function(Reader $in) : Block{
+			return Blocks::TNT()
+				->setUnstable($in->readBool(StateNames::EXPLODE_BIT))
+				->setWorksUnderwater(false);
+		});
+		$this->map(Ids::TORCH, function(Reader $in) : Block{
+			return Blocks::TORCH()
+				->setFacing($in->readTorchFacing());
+		});
+		$this->map(Ids::TORCHFLOWER_CROP, function(Reader $in) : Block{
+			return Blocks::TORCHFLOWER_CROP()
+				//this property can have values 0-7, but only 0-1 are valid
+				->setReady($in->readBoundedInt(StateNames::GROWTH, 0, 7) !== 0);
+		});
+		$this->map(Ids::TRAPPED_CHEST, function(Reader $in) : Block{
+			return Blocks::TRAPPED_CHEST()
+				->setFacing($in->readCardinalHorizontalFacing());
+		});
+		$this->map(Ids::TRIP_WIRE, function(Reader $in) : Block{
+			return Blocks::TRIPWIRE()
+				->setConnected($in->readBool(StateNames::ATTACHED_BIT))
+				->setDisarmed($in->readBool(StateNames::DISARMED_BIT))
+				->setSuspended($in->readBool(StateNames::SUSPENDED_BIT))
+				->setTriggered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::TRIPWIRE_HOOK, function(Reader $in) : Block{
+			return Blocks::TRIPWIRE_HOOK()
+				->setConnected($in->readBool(StateNames::ATTACHED_BIT))
+				->setFacing($in->readLegacyHorizontalFacing())
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->mapSlab(Ids::TUFF_BRICK_SLAB, Ids::TUFF_BRICK_DOUBLE_SLAB, fn() => Blocks::TUFF_BRICK_SLAB());
+		$this->mapStairs(Ids::TUFF_BRICK_STAIRS, fn() => Blocks::TUFF_BRICK_STAIRS());
+		$this->map(Ids::TUFF_BRICK_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::TUFF_BRICK_WALL(), $in));
+		$this->mapSlab(Ids::TUFF_SLAB, Ids::TUFF_DOUBLE_SLAB, fn() => Blocks::TUFF_SLAB());
+		$this->mapStairs(Ids::TUFF_STAIRS, fn() => Blocks::TUFF_STAIRS());
+		$this->map(Ids::TUFF_WALL, fn(Reader $in) => Helper::decodeWall(Blocks::TUFF_WALL(), $in));
+		$this->map(Ids::TWISTING_VINES, function(Reader $in) : Block{
+			return Blocks::TWISTING_VINES()
+				->setAge($in->readBoundedInt(StateNames::TWISTING_VINES_AGE, 0, 25));
+		});
+		$this->map(Ids::UNDERWATER_TNT, function(Reader $in) : Block{
+			return Blocks::TNT()
+				->setUnstable($in->readBool(StateNames::EXPLODE_BIT))
+				->setWorksUnderwater(true);
+		});
+		$this->map(Ids::UNDERWATER_TORCH, function(Reader $in) : Block{
+			return Blocks::UNDERWATER_TORCH()
+				->setFacing($in->readTorchFacing());
+		});
+		$this->map(Ids::UNLIT_REDSTONE_TORCH, function(Reader $in) : Block{
+			return Blocks::REDSTONE_TORCH()
+				->setFacing($in->readTorchFacing())
+				->setLit(false);
+		});
+		$this->map(Ids::UNPOWERED_COMPARATOR, fn(Reader $in) => Helper::decodeComparator(Blocks::REDSTONE_COMPARATOR(), $in));
+		$this->map(Ids::UNPOWERED_REPEATER, fn(Reader $in) => Helper::decodeRepeater(Blocks::REDSTONE_REPEATER(), $in)
+				->setPowered(false));
+		$this->map(Ids::VERDANT_FROGLIGHT, fn(Reader $in) => Blocks::FROGLIGHT()->setFroglightType(FroglightType::VERDANT)->setAxis($in->readPillarAxis()));
+		$this->map(Ids::VINE, function(Reader $in) : Block{
+			$vineDirectionFlags = $in->readBoundedInt(StateNames::VINE_DIRECTION_BITS, 0, 15);
+			return Blocks::VINES()
+				->setFace(Facing::NORTH, ($vineDirectionFlags & BlockLegacyMetadata::VINE_FLAG_NORTH) !== 0)
+				->setFace(Facing::SOUTH, ($vineDirectionFlags & BlockLegacyMetadata::VINE_FLAG_SOUTH) !== 0)
+				->setFace(Facing::WEST, ($vineDirectionFlags & BlockLegacyMetadata::VINE_FLAG_WEST) !== 0)
+				->setFace(Facing::EAST, ($vineDirectionFlags & BlockLegacyMetadata::VINE_FLAG_EAST) !== 0);
+		});
+		$this->map(Ids::WALL_BANNER, function(Reader $in) : Block{
+			return Blocks::WALL_BANNER()
+				->setFacing($in->readHorizontalFacing());
+		});
+		$this->map(Ids::WATER, fn(Reader $in) => Helper::decodeStillLiquid(Blocks::WATER(), $in));
+		$this->map(Ids::WAXED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::COPPER(), CopperOxidation::NONE));
+		$this->map(Ids::WAXED_CHISELED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CHISELED_COPPER(), CopperOxidation::NONE));
+		$this->map(Ids::WAXED_COPPER_GRATE, fn() => Helper::decodeWaxedCopper(Blocks::COPPER_GRATE(), CopperOxidation::NONE));
+		$this->map(Ids::WAXED_CUT_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER(), CopperOxidation::NONE));
+		$this->mapSlab(Ids::WAXED_CUT_COPPER_SLAB, Ids::WAXED_DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::NONE));
+		$this->mapStairs(Ids::WAXED_CUT_COPPER_STAIRS, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::NONE));
+		$this->map(Ids::WAXED_COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeWaxedCopper(Blocks::COPPER_BULB(), CopperOxidation::NONE)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::WAXED_COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeWaxedCopper(Blocks::COPPER_DOOR(), CopperOxidation::NONE), $in));
+		$this->map(Ids::WAXED_COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeWaxedCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::NONE), $in));
+		$this->map(Ids::WAXED_EXPOSED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::COPPER(), CopperOxidation::EXPOSED));
+		$this->map(Ids::WAXED_EXPOSED_CHISELED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CHISELED_COPPER(), CopperOxidation::EXPOSED));
+		$this->map(Ids::WAXED_EXPOSED_COPPER_GRATE, fn() => Helper::decodeWaxedCopper(Blocks::COPPER_GRATE(), CopperOxidation::EXPOSED));
+		$this->map(Ids::WAXED_EXPOSED_CUT_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER(), CopperOxidation::EXPOSED));
+		$this->mapSlab(Ids::WAXED_EXPOSED_CUT_COPPER_SLAB, Ids::WAXED_EXPOSED_DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::EXPOSED));
+		$this->mapStairs(Ids::WAXED_EXPOSED_CUT_COPPER_STAIRS, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::EXPOSED));
+		$this->map(Ids::WAXED_EXPOSED_COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeWaxedCopper(Blocks::COPPER_BULB(), CopperOxidation::EXPOSED)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::WAXED_EXPOSED_COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeWaxedCopper(Blocks::COPPER_DOOR(), CopperOxidation::EXPOSED), $in));
+		$this->map(Ids::WAXED_EXPOSED_COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeWaxedCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::EXPOSED), $in));
+		$this->map(Ids::WAXED_OXIDIZED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::COPPER(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::WAXED_OXIDIZED_CHISELED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CHISELED_COPPER(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::WAXED_OXIDIZED_COPPER_GRATE, fn() => Helper::decodeWaxedCopper(Blocks::COPPER_GRATE(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::WAXED_OXIDIZED_CUT_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER(), CopperOxidation::OXIDIZED));
+		$this->mapSlab(Ids::WAXED_OXIDIZED_CUT_COPPER_SLAB, Ids::WAXED_OXIDIZED_DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::OXIDIZED));
+		$this->mapStairs(Ids::WAXED_OXIDIZED_CUT_COPPER_STAIRS, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::WAXED_OXIDIZED_COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeWaxedCopper(Blocks::COPPER_BULB(), CopperOxidation::OXIDIZED)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::WAXED_OXIDIZED_COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeWaxedCopper(Blocks::COPPER_DOOR(), CopperOxidation::OXIDIZED), $in));
+		$this->map(Ids::WAXED_OXIDIZED_COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeWaxedCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::OXIDIZED), $in));
+		$this->map(Ids::WAXED_WEATHERED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::COPPER(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WAXED_WEATHERED_CHISELED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CHISELED_COPPER(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WAXED_WEATHERED_COPPER_GRATE, fn() => Helper::decodeWaxedCopper(Blocks::COPPER_GRATE(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WAXED_WEATHERED_CUT_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER(), CopperOxidation::WEATHERED));
+		$this->mapSlab(Ids::WAXED_WEATHERED_CUT_COPPER_SLAB, Ids::WAXED_WEATHERED_DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::WEATHERED));
+		$this->mapStairs(Ids::WAXED_WEATHERED_CUT_COPPER_STAIRS, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WAXED_WEATHERED_COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeWaxedCopper(Blocks::COPPER_BULB(), CopperOxidation::WEATHERED)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::WAXED_WEATHERED_COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeWaxedCopper(Blocks::COPPER_DOOR(), CopperOxidation::WEATHERED), $in));
+		$this->map(Ids::WAXED_WEATHERED_COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeWaxedCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::WEATHERED), $in));
+		$this->map(Ids::WEATHERED_COPPER, fn() => Helper::decodeCopper(Blocks::COPPER(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WEATHERED_CHISELED_COPPER, fn() => Helper::decodeCopper(Blocks::CHISELED_COPPER(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WEATHERED_COPPER_GRATE, fn() => Helper::decodeCopper(Blocks::COPPER_GRATE(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WEATHERED_CUT_COPPER, fn() => Helper::decodeCopper(Blocks::CUT_COPPER(), CopperOxidation::WEATHERED));
+		$this->mapSlab(Ids::WEATHERED_CUT_COPPER_SLAB, Ids::WEATHERED_DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::WEATHERED));
+		$this->mapStairs(Ids::WEATHERED_CUT_COPPER_STAIRS, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WEATHERED_COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeCopper(Blocks::COPPER_BULB(), CopperOxidation::WEATHERED)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::WEATHERED_COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeCopper(Blocks::COPPER_DOOR(), CopperOxidation::WEATHERED), $in));
+		$this->map(Ids::WEATHERED_COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::WEATHERED), $in));
+		$this->map(Ids::WEEPING_VINES, function(Reader $in) : Block{
+			return Blocks::WEEPING_VINES()
+				->setAge($in->readBoundedInt(StateNames::WEEPING_VINES_AGE, 0, 25));
+		});
+		$this->map(Ids::WHEAT, fn(Reader $in) => Helper::decodeCrops(Blocks::WHEAT(), $in));
+	}
+
+	/** @throws BlockStateDeserializeException */
+	public function deserializeBlock(BlockStateData $blockStateData) : Block{
+		$id = $blockStateData->getName();
+		if(!array_key_exists($id, $this->deserializeFuncs)){
+			throw new UnsupportedBlockStateException("Unknown block ID \"$id\"");
+		}
+		$reader = new Reader($blockStateData);
+		$block = $this->deserializeFuncs[$id]($reader);
+		$reader->checkUnreadProperties();
+		return $block;
+	}
+}
diff --git a/src/data/bedrock/block/convert/BlockStateWriter.php b/src/data/bedrock/block/convert/BlockStateWriter.php
new file mode 100644
index 0000000000..63af92d100
--- /dev/null
+++ b/src/data/bedrock/block/convert/BlockStateWriter.php
@@ -0,0 +1,282 @@
+<?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\block\convert;
+
+use pocketmine\block\utils\BellAttachmentType;
+use pocketmine\block\utils\SlabType;
+use pocketmine\block\utils\WallConnectionType;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\data\bedrock\block\BlockStateNames;
+use pocketmine\data\bedrock\block\BlockStateSerializeException;
+use pocketmine\data\bedrock\block\BlockStateStringValues as StringValues;
+use pocketmine\math\Axis;
+use pocketmine\math\Facing;
+use pocketmine\nbt\tag\ByteTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\StringTag;
+use pocketmine\nbt\tag\Tag;
+use pocketmine\utils\AssumptionFailedError;
+
+final class BlockStateWriter{
+
+	/**
+	 * @var Tag[]
+	 * @phpstan-var array<string, Tag>
+	 */
+	private array $states = [];
+
+	public function __construct(
+		private string $id
+	){}
+
+	public static function create(string $id) : self{
+		return new self($id);
+	}
+
+	/** @return $this */
+	public function writeBool(string $name, bool $value) : self{
+		$this->states[$name] = new ByteTag($value ? 1 : 0);
+		return $this;
+	}
+
+	/** @return $this */
+	public function writeInt(string $name, int $value) : self{
+		$this->states[$name] = new IntTag($value);
+		return $this;
+	}
+
+	/** @return $this */
+	public function writeString(string $name, string $value) : self{
+		$this->states[$name] = new StringTag($value);
+		return $this;
+	}
+
+	/** @return $this */
+	public function writeFacingDirection(int $value) : self{
+		$this->writeInt(BlockStateNames::FACING_DIRECTION, match($value){
+			Facing::DOWN => 0,
+			Facing::UP => 1,
+			Facing::NORTH => 2,
+			Facing::SOUTH => 3,
+			Facing::WEST => 4,
+			Facing::EAST => 5,
+			default => throw new BlockStateSerializeException("Invalid Facing $value")
+		});
+		return $this;
+	}
+
+	/** @return $this */
+	public function writeBlockFace(int $value) : self{
+		$this->writeString(BlockStateNames::MC_BLOCK_FACE, match($value){
+			Facing::DOWN => StringValues::MC_BLOCK_FACE_DOWN,
+			Facing::UP => StringValues::MC_BLOCK_FACE_UP,
+			Facing::NORTH => StringValues::MC_BLOCK_FACE_NORTH,
+			Facing::SOUTH => StringValues::MC_BLOCK_FACE_SOUTH,
+			Facing::WEST => StringValues::MC_BLOCK_FACE_WEST,
+			Facing::EAST => StringValues::MC_BLOCK_FACE_EAST,
+			default => throw new BlockStateSerializeException("Invalid Facing $value")
+		});
+		return $this;
+	}
+
+	/**
+	 * @param int[] $faces
+	 * @phpstan-param array<int, int> $faces
+	 * @return $this
+	 */
+	public function writeFacingFlags(array $faces) : self{
+		$result = 0;
+		foreach($faces as $face){
+			$result |= match($face){
+				Facing::DOWN => BlockLegacyMetadata::MULTI_FACE_DIRECTION_FLAG_DOWN,
+				Facing::UP => BlockLegacyMetadata::MULTI_FACE_DIRECTION_FLAG_UP,
+				Facing::NORTH => BlockLegacyMetadata::MULTI_FACE_DIRECTION_FLAG_NORTH,
+				Facing::SOUTH => BlockLegacyMetadata::MULTI_FACE_DIRECTION_FLAG_SOUTH,
+				Facing::WEST => BlockLegacyMetadata::MULTI_FACE_DIRECTION_FLAG_WEST,
+				Facing::EAST => BlockLegacyMetadata::MULTI_FACE_DIRECTION_FLAG_EAST,
+				default => throw new AssumptionFailedError("Unhandled face $face")
+			};
+		}
+
+		return $this->writeInt(BlockStateNames::MULTI_FACE_DIRECTION_BITS, $result);
+	}
+
+	/** @return $this */
+	public function writeEndRodFacingDirection(int $value) : self{
+		//end rods are stupid in bedrock and have everything except up/down the wrong way round
+		return $this->writeFacingDirection(Facing::axis($value) !== Axis::Y ? Facing::opposite($value) : $value);
+	}
+
+	/** @return $this */
+	public function writeHorizontalFacing(int $value) : self{
+		if($value === Facing::UP || $value === Facing::DOWN){
+			throw new BlockStateSerializeException("Y-axis facing is not allowed");
+		}
+
+		return $this->writeFacingDirection($value);
+	}
+
+	/** @return $this */
+	public function writeWeirdoHorizontalFacing(int $value) : self{
+		$this->writeInt(BlockStateNames::WEIRDO_DIRECTION, match($value){
+			Facing::EAST => 0,
+			Facing::WEST => 1,
+			Facing::SOUTH => 2,
+			Facing::NORTH => 3,
+			default => throw new BlockStateSerializeException("Invalid horizontal facing $value")
+		});
+		return $this;
+	}
+
+	/** @return $this */
+	public function writeLegacyHorizontalFacing(int $value) : self{
+		$this->writeInt(BlockStateNames::DIRECTION, match($value){
+			Facing::SOUTH => 0,
+			Facing::WEST => 1,
+			Facing::NORTH => 2,
+			Facing::EAST => 3,
+			default => throw new BlockStateSerializeException("Invalid horizontal facing $value")
+		});
+		return $this;
+	}
+
+	/**
+	 * This is for trapdoors, because Mojang botched the conversion in 1.13
+	 * @return $this
+	 */
+	public function write5MinusHorizontalFacing(int $value) : self{
+		return $this->writeInt(BlockStateNames::DIRECTION, match($value){
+			Facing::EAST => 0,
+			Facing::WEST => 1,
+			Facing::SOUTH => 2,
+			Facing::NORTH => 3,
+			default => throw new BlockStateSerializeException("Invalid horizontal facing $value")
+		});
+	}
+
+	/**
+	 * Used by pumpkins as of 1.20.0.23 beta
+	 * @return $this
+	 */
+	public function writeCardinalHorizontalFacing(int $value) : self{
+		return $this->writeString(BlockStateNames::MC_CARDINAL_DIRECTION, match($value){
+			Facing::SOUTH => StringValues::MC_CARDINAL_DIRECTION_SOUTH,
+			Facing::WEST => StringValues::MC_CARDINAL_DIRECTION_WEST,
+			Facing::NORTH => StringValues::MC_CARDINAL_DIRECTION_NORTH,
+			Facing::EAST => StringValues::MC_CARDINAL_DIRECTION_EAST,
+			default => throw new BlockStateSerializeException("Invalid horizontal facing $value")
+		});
+	}
+
+	/** @return $this */
+	public function writeCoralFacing(int $value) : self{
+		$this->writeInt(BlockStateNames::CORAL_DIRECTION, match($value){
+			Facing::WEST => 0,
+			Facing::EAST => 1,
+			Facing::NORTH => 2,
+			Facing::SOUTH => 3,
+			default => throw new BlockStateSerializeException("Invalid horizontal facing $value")
+		});
+		return $this;
+	}
+
+	/** @return $this */
+	public function writeFacingWithoutDown(int $value) : self{
+		if($value === Facing::DOWN){
+			throw new BlockStateSerializeException("Invalid facing DOWN");
+		}
+		$this->writeFacingDirection($value);
+		return $this;
+	}
+
+	/** @return $this */
+	public function writeFacingWithoutUp(int $value) : self{
+		if($value === Facing::UP){
+			throw new BlockStateSerializeException("Invalid facing UP");
+		}
+		$this->writeFacingDirection($value);
+		return $this;
+	}
+
+	/** @return $this */
+	public function writePillarAxis(int $axis) : self{
+		$this->writeString(BlockStateNames::PILLAR_AXIS, match($axis){
+			Axis::X => StringValues::PILLAR_AXIS_X,
+			Axis::Y => StringValues::PILLAR_AXIS_Y,
+			Axis::Z => StringValues::PILLAR_AXIS_Z,
+			default => throw new BlockStateSerializeException("Invalid axis $axis")
+		});
+		return $this;
+	}
+
+	/** @return $this */
+	public function writeSlabPosition(SlabType $slabType) : self{
+		$this->writeString(BlockStateNames::MC_VERTICAL_HALF, match($slabType){
+			SlabType::TOP => StringValues::MC_VERTICAL_HALF_TOP,
+			SlabType::BOTTOM => StringValues::MC_VERTICAL_HALF_BOTTOM,
+			default => throw new BlockStateSerializeException("Invalid slab type " . $slabType->name)
+		});
+		return $this;
+	}
+
+	/** @return $this */
+	public function writeTorchFacing(int $facing) : self{
+		//TODO: horizontal directions are flipped (MCPE bug: https://bugs.mojang.com/browse/MCPE-152036)
+		$this->writeString(BlockStateNames::TORCH_FACING_DIRECTION, match($facing){
+			Facing::UP => StringValues::TORCH_FACING_DIRECTION_TOP,
+			Facing::SOUTH => StringValues::TORCH_FACING_DIRECTION_NORTH,
+			Facing::NORTH => StringValues::TORCH_FACING_DIRECTION_SOUTH,
+			Facing::EAST => StringValues::TORCH_FACING_DIRECTION_WEST,
+			Facing::WEST => StringValues::TORCH_FACING_DIRECTION_EAST,
+			default => throw new BlockStateSerializeException("Invalid Torch facing $facing")
+		});
+		return $this;
+	}
+
+	/** @return $this */
+	public function writeBellAttachmentType(BellAttachmentType $attachmentType) : self{
+		$this->writeString(BlockStateNames::ATTACHMENT, match($attachmentType){
+			BellAttachmentType::FLOOR => StringValues::ATTACHMENT_STANDING,
+			BellAttachmentType::CEILING => StringValues::ATTACHMENT_HANGING,
+			BellAttachmentType::ONE_WALL => StringValues::ATTACHMENT_SIDE,
+			BellAttachmentType::TWO_WALLS => StringValues::ATTACHMENT_MULTIPLE,
+		});
+		return $this;
+	}
+
+	/** @return $this */
+	public function writeWallConnectionType(string $name, ?WallConnectionType $wallConnectionType) : self{
+		$this->writeString($name, match($wallConnectionType){
+			null => StringValues::WALL_CONNECTION_TYPE_EAST_NONE,
+			WallConnectionType::SHORT => StringValues::WALL_CONNECTION_TYPE_EAST_SHORT,
+			WallConnectionType::TALL => StringValues::WALL_CONNECTION_TYPE_EAST_TALL,
+		});
+		return $this;
+	}
+
+	public function getBlockStateData() : BlockStateData{
+		return BlockStateData::current($this->id, $this->states);
+	}
+}
diff --git a/src/data/bedrock/block/convert/UnsupportedBlockStateException.php b/src/data/bedrock/block/convert/UnsupportedBlockStateException.php
new file mode 100644
index 0000000000..5350f45cf7
--- /dev/null
+++ b/src/data/bedrock/block/convert/UnsupportedBlockStateException.php
@@ -0,0 +1,30 @@
+<?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\block\convert;
+
+use pocketmine\data\bedrock\block\BlockStateDeserializeException;
+
+final class UnsupportedBlockStateException extends BlockStateDeserializeException{
+
+}
diff --git a/src/data/bedrock/block/upgrade/BlockDataUpgrader.php b/src/data/bedrock/block/upgrade/BlockDataUpgrader.php
new file mode 100644
index 0000000000..4b6c6abc42
--- /dev/null
+++ b/src/data/bedrock/block/upgrade/BlockDataUpgrader.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\data\bedrock\block\upgrade;
+
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\data\bedrock\block\BlockStateDeserializeException;
+use pocketmine\nbt\tag\CompoundTag;
+
+final class BlockDataUpgrader{
+
+	public function __construct(
+		private BlockIdMetaUpgrader $blockIdMetaUpgrader,
+		private BlockStateUpgrader $blockStateUpgrader
+	){}
+
+	/**
+	 * @throws BlockStateDeserializeException
+	 */
+	public function upgradeIntIdMeta(int $id, int $meta) : BlockStateData{
+		return $this->blockIdMetaUpgrader->fromIntIdMeta($id, $meta);
+	}
+
+	/**
+	 * @throws BlockStateDeserializeException
+	 */
+	public function upgradeStringIdMeta(string $id, int $meta) : BlockStateData{
+		return $this->blockIdMetaUpgrader->fromStringIdMeta($id, $meta);
+	}
+
+	/**
+	 * @throws BlockStateDeserializeException
+	 */
+	public function upgradeBlockStateNbt(CompoundTag $tag) : BlockStateData{
+		if($tag->getTag("name") !== null && $tag->getTag("val") !== null){
+			//Legacy (pre-1.13) blockstate - upgrade it to a version we understand
+			$id = $tag->getString("name");
+			$data = $tag->getShort("val");
+
+			$blockStateData = $this->upgradeStringIdMeta($id, $data);
+		}else{
+			//Modern (post-1.13) blockstate
+			$blockStateData = BlockStateData::fromNbt($tag);
+		}
+
+		return $this->blockStateUpgrader->upgrade($blockStateData);
+	}
+
+	public function getBlockStateUpgrader() : BlockStateUpgrader{ return $this->blockStateUpgrader; }
+
+	public function getBlockIdMetaUpgrader() : BlockIdMetaUpgrader{ return $this->blockIdMetaUpgrader; }
+}
diff --git a/src/data/bedrock/block/upgrade/BlockIdMetaUpgrader.php b/src/data/bedrock/block/upgrade/BlockIdMetaUpgrader.php
new file mode 100644
index 0000000000..1c339bd46c
--- /dev/null
+++ b/src/data/bedrock/block/upgrade/BlockIdMetaUpgrader.php
@@ -0,0 +1,110 @@
+<?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\block\upgrade;
+
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\data\bedrock\block\BlockStateDeserializeException;
+use pocketmine\nbt\LittleEndianNbtSerializer;
+use pocketmine\utils\BinaryDataException;
+use pocketmine\utils\BinaryStream;
+
+/**
+ * Handles translating legacy 1.12 block ID/meta into modern blockstates.
+ */
+final class BlockIdMetaUpgrader{
+	/**
+	 * @param BlockStateData[][] $mappingTable
+	 * @phpstan-param array<string, array<int, BlockStateData>> $mappingTable
+	 */
+	public function __construct(
+		private array $mappingTable,
+		private LegacyBlockIdToStringIdMap $legacyNumericIdMap
+	){}
+
+	/**
+	 * @throws BlockStateDeserializeException
+	 */
+	public function fromStringIdMeta(string $id, int $meta) : BlockStateData{
+		return $this->mappingTable[$id][$meta] ??
+			$this->mappingTable[$id][0] ??
+			throw new BlockStateDeserializeException("Unknown legacy block string ID $id");
+	}
+
+	/**
+	 * @throws BlockStateDeserializeException
+	 */
+	public function fromIntIdMeta(int $id, int $meta) : BlockStateData{
+		$stringId = $this->legacyNumericIdMap->legacyToString($id);
+		if($stringId === null){
+			throw new BlockStateDeserializeException("Unknown legacy block numeric ID $id");
+		}
+		return $this->fromStringIdMeta($stringId, $meta);
+	}
+
+	/**
+	 * Adds a mapping of legacy block numeric ID to modern string ID. This is used for upgrading blocks from pre-1.2.13
+	 * worlds (PM3). It's also needed for upgrading flower pot contents and falling blocks from PM4 worlds.
+	 */
+	public function addIntIdToStringIdMapping(int $intId, string $stringId) : void{
+		$this->legacyNumericIdMap->add($stringId, $intId);
+	}
+
+	/**
+	 * Adds a mapping of legacy block ID and meta to modern blockstate data. This may be needed for upgrading data from
+	 * stored custom blocks from older versions of PocketMine-MP.
+	 */
+	public function addIdMetaToStateMapping(string $stringId, int $meta, BlockStateData $stateData) : void{
+		if(isset($this->mappingTable[$stringId][$meta])){
+			throw new \InvalidArgumentException("A mapping for $stringId:$meta already exists");
+		}
+		$this->mappingTable[$stringId][$meta] = $stateData;
+	}
+
+	public static function loadFromString(string $data, LegacyBlockIdToStringIdMap $idMap, BlockStateUpgrader $blockStateUpgrader) : self{
+		$mappingTable = [];
+
+		$legacyStateMapReader = new BinaryStream($data);
+		$nbtReader = new LittleEndianNbtSerializer();
+
+		$idCount = $legacyStateMapReader->getUnsignedVarInt();
+		for($idIndex = 0; $idIndex < $idCount; $idIndex++){
+			$id = $legacyStateMapReader->get($legacyStateMapReader->getUnsignedVarInt());
+
+			$metaCount = $legacyStateMapReader->getUnsignedVarInt();
+			for($metaIndex = 0; $metaIndex < $metaCount; $metaIndex++){
+				$meta = $legacyStateMapReader->getUnsignedVarInt();
+
+				$offset = $legacyStateMapReader->getOffset();
+				$state = $nbtReader->read($legacyStateMapReader->getBuffer(), $offset)->mustGetCompoundTag();
+				$legacyStateMapReader->setOffset($offset);
+				$mappingTable[$id][$meta] = $blockStateUpgrader->upgrade(BlockStateData::fromNbt($state));
+			}
+		}
+		if(!$legacyStateMapReader->feof()){
+			throw new BinaryDataException("Unexpected trailing data in legacy state map data");
+		}
+
+		return new self($mappingTable, $idMap);
+	}
+}
diff --git a/src/data/bedrock/block/upgrade/BlockStateUpgradeSchema.php b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchema.php
new file mode 100644
index 0000000000..f8894cfd27
--- /dev/null
+++ b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchema.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock\block\upgrade;
+
+use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaFlattenInfo as FlattenInfo;
+use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaValueRemap as ValueRemap;
+use pocketmine\nbt\tag\Tag;
+use function count;
+
+final class BlockStateUpgradeSchema{
+	/**
+	 * @var string[]
+	 * @phpstan-var array<string, string>
+	 */
+	public array $renamedIds = [];
+
+	/**
+	 * @var Tag[][]
+	 * @phpstan-var array<string, array<string, Tag>>
+	 */
+	public array $addedProperties = [];
+
+	/**
+	 * @var string[][]
+	 * @phpstan-var array<string, list<string>>
+	 */
+	public array $removedProperties = [];
+
+	/**
+	 * @var string[][]
+	 * @phpstan-var array<string, array<string, string>>
+	 */
+	public array $renamedProperties = [];
+
+	/**
+	 * @var ValueRemap[][][]
+	 * @phpstan-var array<string, array<string, list<ValueRemap>>>
+	 */
+	public array $remappedPropertyValues = [];
+
+	/**
+	 * @var FlattenInfo[]
+	 * @phpstan-var array<string, FlattenInfo>
+	 */
+	public array $flattenedProperties = [];
+
+	/**
+	 * @var BlockStateUpgradeSchemaBlockRemap[][]
+	 * @phpstan-var array<string, list<BlockStateUpgradeSchemaBlockRemap>>
+	 */
+	public array $remappedStates = [];
+
+	public readonly int $versionId;
+
+	public function __construct(
+		public readonly int $maxVersionMajor,
+		public readonly int $maxVersionMinor,
+		public readonly int $maxVersionPatch,
+		public readonly int $maxVersionRevision,
+		private int $schemaId
+	){
+		$this->versionId = ($this->maxVersionMajor << 24) | ($this->maxVersionMinor << 16) | ($this->maxVersionPatch << 8) | $this->maxVersionRevision;
+	}
+
+	/**
+	 * @deprecated This is defined by Mojang, and therefore cannot be relied on. Use getSchemaId() instead for
+	 * internal version management.
+	 */
+	public function getVersionId() : int{
+		return $this->versionId;
+	}
+
+	public function getSchemaId() : int{ return $this->schemaId; }
+
+	public function isEmpty() : bool{
+		foreach([
+			$this->renamedIds,
+			$this->addedProperties,
+			$this->removedProperties,
+			$this->renamedProperties,
+			$this->remappedPropertyValues,
+			$this->flattenedProperties,
+			$this->remappedStates,
+		] as $list){
+			if(count($list) !== 0){
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaBlockRemap.php b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaBlockRemap.php
new file mode 100644
index 0000000000..676afbaf4e
--- /dev/null
+++ b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaBlockRemap.php
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock\block\upgrade;
+
+use pocketmine\nbt\tag\Tag;
+use pocketmine\utils\Utils;
+use function array_diff;
+use function count;
+
+final class BlockStateUpgradeSchemaBlockRemap{
+	/**
+	 * @param Tag[]    $oldState
+	 * @param Tag[]    $newState
+	 * @param string[] $copiedState
+	 *
+	 * @phpstan-param array<string, Tag> $oldState
+	 * @phpstan-param array<string, Tag> $newState
+	 * @phpstan-param list<string>       $copiedState
+	 */
+	public function __construct(
+		public array $oldState,
+		public string|BlockStateUpgradeSchemaFlattenInfo $newName,
+		public array $newState,
+		public array $copiedState
+	){}
+
+	public function equals(self $that) : bool{
+		$sameName = $this->newName === $that->newName ||
+			(
+				$this->newName instanceof BlockStateUpgradeSchemaFlattenInfo &&
+				$that->newName instanceof BlockStateUpgradeSchemaFlattenInfo &&
+				$this->newName->equals($that->newName)
+			);
+		if(!$sameName){
+			return false;
+		}
+
+		if(
+			count($this->oldState) !== count($that->oldState) ||
+			count($this->newState) !== count($that->newState) ||
+			count($this->copiedState) !== count($that->copiedState) ||
+			count(array_diff($this->copiedState, $that->copiedState)) !== 0
+		){
+			return false;
+		}
+		foreach(Utils::stringifyKeys($this->oldState) as $propertyName => $propertyValue){
+			if(!isset($that->oldState[$propertyName]) || !$that->oldState[$propertyName]->equals($propertyValue)){
+				//different filter value
+				return false;
+			}
+		}
+		foreach(Utils::stringifyKeys($this->newState) as $propertyName => $propertyValue){
+			if(!isset($that->newState[$propertyName]) || !$that->newState[$propertyName]->equals($propertyValue)){
+				//different replacement value
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaFlattenInfo.php b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaFlattenInfo.php
new file mode 100644
index 0000000000..4a14a1291f
--- /dev/null
+++ b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaFlattenInfo.php
@@ -0,0 +1,56 @@
+<?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\block\upgrade;
+
+use pocketmine\nbt\tag\ByteTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\StringTag;
+use function ksort;
+use const SORT_STRING;
+
+final class BlockStateUpgradeSchemaFlattenInfo{
+
+	/**
+	 * @param string[] $flattenedValueRemaps
+	 * @phpstan-param array<string, string> $flattenedValueRemaps
+	 * @phpstan-param ?class-string<ByteTag|IntTag|StringTag> $flattenedPropertyType
+	 */
+	public function __construct(
+		public string $prefix,
+		public string $flattenedProperty,
+		public string $suffix,
+		public array $flattenedValueRemaps,
+		public ?string $flattenedPropertyType = null
+	){
+		ksort($this->flattenedValueRemaps, SORT_STRING);
+	}
+
+	public function equals(self $that) : bool{
+		return $this->prefix === $that->prefix &&
+			$this->flattenedProperty === $that->flattenedProperty &&
+			$this->suffix === $that->suffix &&
+			$this->flattenedValueRemaps === $that->flattenedValueRemaps &&
+			$this->flattenedPropertyType === $that->flattenedPropertyType;
+	}
+}
diff --git a/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaUtils.php b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaUtils.php
new file mode 100644
index 0000000000..08eba89785
--- /dev/null
+++ b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaUtils.php
@@ -0,0 +1,439 @@
+<?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\block\upgrade;
+
+use pocketmine\data\bedrock\block\upgrade\model\BlockStateUpgradeSchemaModel;
+use pocketmine\data\bedrock\block\upgrade\model\BlockStateUpgradeSchemaModelBlockRemap;
+use pocketmine\data\bedrock\block\upgrade\model\BlockStateUpgradeSchemaModelFlattenInfo;
+use pocketmine\data\bedrock\block\upgrade\model\BlockStateUpgradeSchemaModelTag;
+use pocketmine\data\bedrock\block\upgrade\model\BlockStateUpgradeSchemaModelValueRemap;
+use pocketmine\nbt\tag\ByteTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\StringTag;
+use pocketmine\nbt\tag\Tag;
+use pocketmine\utils\Filesystem;
+use pocketmine\utils\Utils;
+use Symfony\Component\Filesystem\Path;
+use function array_key_last;
+use function array_map;
+use function array_values;
+use function assert;
+use function count;
+use function get_debug_type;
+use function gettype;
+use function implode;
+use function is_object;
+use function is_string;
+use function json_decode;
+use function json_encode;
+use function ksort;
+use function sort;
+use function str_pad;
+use function strval;
+use function usort;
+use const JSON_THROW_ON_ERROR;
+use const SORT_NUMERIC;
+use const STR_PAD_LEFT;
+
+final class BlockStateUpgradeSchemaUtils{
+
+	public static function describe(BlockStateUpgradeSchema $schema) : string{
+		$lines = [];
+		$lines[] = "Renames:";
+		foreach($schema->renamedIds as $rename){
+			$lines[] = "- $rename";
+		}
+		$lines[] = "Added properties:";
+		foreach(Utils::stringifyKeys($schema->addedProperties) as $blockName => $tags){
+			foreach(Utils::stringifyKeys($tags) as $k => $v){
+				$lines[] = "- $blockName has $k added: $v";
+			}
+		}
+
+		$lines[] = "Removed properties:";
+		foreach(Utils::stringifyKeys($schema->removedProperties) as $blockName => $tagNames){
+			foreach($tagNames as $tagName){
+				$lines[] = "- $blockName has $tagName removed";
+			}
+		}
+		$lines[] = "Renamed properties:";
+		foreach(Utils::stringifyKeys($schema->renamedProperties) as $blockName => $tagNames){
+			foreach(Utils::stringifyKeys($tagNames) as $oldTagName => $newTagName){
+				$lines[] = "- $blockName has $oldTagName renamed to $newTagName";
+			}
+		}
+		$lines[] = "Remapped property values:";
+		foreach(Utils::stringifyKeys($schema->remappedPropertyValues) as $blockName => $remaps){
+			foreach(Utils::stringifyKeys($remaps) as $tagName => $oldNewList){
+				foreach($oldNewList as $oldNew){
+					$lines[] = "- $blockName has $tagName value changed from $oldNew->old to $oldNew->new";
+				}
+			}
+		}
+		return implode("\n", $lines);
+	}
+
+	public static function tagToJsonModel(Tag $tag) : BlockStateUpgradeSchemaModelTag{
+		$model = new BlockStateUpgradeSchemaModelTag();
+		if($tag instanceof IntTag){
+			$model->int = $tag->getValue();
+		}elseif($tag instanceof StringTag){
+			$model->string = $tag->getValue();
+		}elseif($tag instanceof ByteTag){
+			$model->byte = $tag->getValue();
+		}else{
+			throw new \UnexpectedValueException("Unexpected value type " . get_debug_type($tag));
+		}
+
+		return $model;
+	}
+
+	private static function jsonModelToTag(BlockStateUpgradeSchemaModelTag $model) : Tag{
+		return match(true){
+			isset($model->byte) && !isset($model->int) && !isset($model->string) => new ByteTag($model->byte),
+			!isset($model->byte) && isset($model->int) && !isset($model->string) => new IntTag($model->int),
+			!isset($model->byte) && !isset($model->int) && isset($model->string) => new StringTag($model->string),
+			default => throw new \UnexpectedValueException("Malformed JSON model tag, expected exactly one of 'byte', 'int' or 'string' properties")
+		};
+	}
+
+	public static function fromJsonModel(BlockStateUpgradeSchemaModel $model, int $schemaId) : BlockStateUpgradeSchema{
+		$result = new BlockStateUpgradeSchema(
+			$model->maxVersionMajor,
+			$model->maxVersionMinor,
+			$model->maxVersionPatch,
+			$model->maxVersionRevision,
+			$schemaId
+		);
+		$result->renamedIds = $model->renamedIds ?? [];
+		$result->renamedProperties = $model->renamedProperties ?? [];
+		$result->removedProperties = $model->removedProperties ?? [];
+
+		foreach(Utils::stringifyKeys($model->addedProperties ?? []) as $blockName => $properties){
+			foreach(Utils::stringifyKeys($properties) as $propertyName => $propertyValue){
+				$result->addedProperties[$blockName][$propertyName] = self::jsonModelToTag($propertyValue);
+			}
+		}
+
+		$convertedRemappedValuesIndex = [];
+		foreach(Utils::stringifyKeys($model->remappedPropertyValuesIndex ?? []) as $mappingKey => $mappingValues){
+			foreach($mappingValues as $k => $oldNew){
+				$convertedRemappedValuesIndex[$mappingKey][$k] = new BlockStateUpgradeSchemaValueRemap(
+					self::jsonModelToTag($oldNew->old),
+					self::jsonModelToTag($oldNew->new)
+				);
+			}
+		}
+
+		foreach(Utils::stringifyKeys($model->remappedPropertyValues ?? []) as $blockName => $properties){
+			foreach(Utils::stringifyKeys($properties) as $property => $mappedValuesKey){
+				if(!isset($convertedRemappedValuesIndex[$mappedValuesKey])){
+					throw new \UnexpectedValueException("Missing key from schema values index $mappedValuesKey");
+				}
+				$result->remappedPropertyValues[$blockName][$property] = $convertedRemappedValuesIndex[$mappedValuesKey];
+			}
+		}
+
+		foreach(Utils::stringifyKeys($model->flattenedProperties ?? []) as $blockName => $flattenRule){
+			$result->flattenedProperties[$blockName] = self::jsonModelToFlattenRule($flattenRule);
+		}
+
+		foreach(Utils::stringifyKeys($model->remappedStates ?? []) as $oldBlockName => $remaps){
+			foreach($remaps as $remap){
+				if(isset($remap->newName)){
+					$remapName = $remap->newName;
+				}elseif(isset($remap->newFlattenedName)){
+					$flattenRule = $remap->newFlattenedName;
+					$remapName = self::jsonModelToFlattenRule($flattenRule);
+				}else{
+					throw new \UnexpectedValueException("Expected exactly one of 'newName' or 'newFlattenedName' properties to be set");
+				}
+
+				$result->remappedStates[$oldBlockName][] = new BlockStateUpgradeSchemaBlockRemap(
+					array_map(fn(BlockStateUpgradeSchemaModelTag $tag) => self::jsonModelToTag($tag), $remap->oldState ?? []),
+					$remapName,
+					array_map(fn(BlockStateUpgradeSchemaModelTag $tag) => self::jsonModelToTag($tag), $remap->newState ?? []),
+					$remap->copiedState ?? []
+				);
+			}
+		}
+
+		return $result;
+	}
+
+	private static function buildRemappedValuesIndex(BlockStateUpgradeSchema $schema, BlockStateUpgradeSchemaModel $model) : void{
+		if(count($schema->remappedPropertyValues) === 0){
+			return;
+		}
+		$dedupMapping = [];
+		$dedupTableMap = [];
+
+		$orderedRemappedValues = $schema->remappedPropertyValues;
+		ksort($orderedRemappedValues);
+		foreach(Utils::stringifyKeys($orderedRemappedValues) as $blockName => $remaps){
+			ksort($remaps);
+			foreach(Utils::stringifyKeys($remaps) as $propertyName => $remappedValues){
+				$remappedValuesMap = [];
+				foreach($remappedValues as $oldNew){
+					$remappedValuesMap[$oldNew->old->toString()] = $oldNew;
+				}
+				ksort($remappedValuesMap);
+
+				if(isset($dedupTableMap[$propertyName])){
+					foreach($dedupTableMap[$propertyName] as $k => $dedupValuesMap){
+						if(count($remappedValuesMap) !== count($dedupValuesMap)){
+							continue;
+						}
+
+						foreach(Utils::stringifyKeys($remappedValuesMap) as $oldHash => $remappedOldNew){
+							if(
+								!isset($dedupValuesMap[$oldHash]) ||
+								!$remappedOldNew->old->equals($dedupValuesMap[$oldHash]->old) ||
+								!$remappedOldNew->new->equals($dedupValuesMap[$oldHash]->new)
+							){
+								continue 2;
+							}
+						}
+
+						//we found a match
+						$dedupMapping[$blockName][$propertyName] = $k;
+						continue 2;
+					}
+				}
+
+				//no match, add the values to the table
+				$dedupTableMap[$propertyName][] = $remappedValuesMap;
+				$dedupMapping[$blockName][$propertyName] = array_key_last($dedupTableMap[$propertyName]);
+			}
+		}
+
+		$modelTable = [];
+		foreach(Utils::stringifyKeys($dedupTableMap) as $propertyName => $mappingSet){
+			foreach($mappingSet as $setId => $valuePairs){
+				$newDedupName = $propertyName . "_" . str_pad(strval($setId), 2, "0", STR_PAD_LEFT);
+				foreach($valuePairs as $pair){
+					$modelTable[$newDedupName][] = new BlockStateUpgradeSchemaModelValueRemap(
+						BlockStateUpgradeSchemaUtils::tagToJsonModel($pair->old),
+						BlockStateUpgradeSchemaUtils::tagToJsonModel($pair->new),
+					);
+				}
+			}
+		}
+		$modelDedupMapping = [];
+		foreach(Utils::stringifyKeys($dedupMapping) as $blockName => $properties){
+			foreach(Utils::stringifyKeys($properties) as $propertyName => $dedupTableIndex){
+				$modelDedupMapping[$blockName][$propertyName] = $propertyName . "_" . str_pad(strval($dedupTableIndex), 2, "0", STR_PAD_LEFT);
+			}
+		}
+
+		ksort($modelTable);
+		ksort($modelDedupMapping);
+		foreach(Utils::stringifyKeys($dedupMapping) as $blockName => $properties){
+			ksort($properties);
+			$dedupMapping[$blockName] = $properties;
+		}
+
+		$model->remappedPropertyValuesIndex = $modelTable;
+		$model->remappedPropertyValues = $modelDedupMapping;
+	}
+
+	private static function flattenRuleToJsonModel(BlockStateUpgradeSchemaFlattenInfo $flattenRule) : BlockStateUpgradeSchemaModelFlattenInfo{
+		return new BlockStateUpgradeSchemaModelFlattenInfo(
+			$flattenRule->prefix,
+			$flattenRule->flattenedProperty,
+			$flattenRule->suffix,
+			$flattenRule->flattenedValueRemaps,
+			match($flattenRule->flattenedPropertyType){
+				StringTag::class => null, //omit for TAG_String, as this is the common case
+				ByteTag::class => "byte",
+				IntTag::class => "int",
+				default => throw new \LogicException("Unexpected tag type " . $flattenRule->flattenedPropertyType . " in flattened property type")
+			}
+		);
+	}
+
+	private static function jsonModelToFlattenRule(BlockStateUpgradeSchemaModelFlattenInfo $flattenRule) : BlockStateUpgradeSchemaFlattenInfo{
+		return new BlockStateUpgradeSchemaFlattenInfo(
+			$flattenRule->prefix,
+			$flattenRule->flattenedProperty,
+			$flattenRule->suffix,
+			$flattenRule->flattenedValueRemaps ?? [],
+			match ($flattenRule->flattenedPropertyType) {
+				"string", null => StringTag::class,
+				"int" => IntTag::class,
+				"byte" => ByteTag::class,
+				default => throw new \UnexpectedValueException("Unexpected flattened property type $flattenRule->flattenedPropertyType, expected 'string', 'int' or 'byte'")
+			}
+		);
+	}
+
+	public static function toJsonModel(BlockStateUpgradeSchema $schema) : BlockStateUpgradeSchemaModel{
+		$result = new BlockStateUpgradeSchemaModel();
+		$result->maxVersionMajor = $schema->maxVersionMajor;
+		$result->maxVersionMinor = $schema->maxVersionMinor;
+		$result->maxVersionPatch = $schema->maxVersionPatch;
+		$result->maxVersionRevision = $schema->maxVersionRevision;
+
+		$result->renamedIds = $schema->renamedIds;
+		ksort($result->renamedIds);
+
+		$result->renamedProperties = $schema->renamedProperties;
+		ksort($result->renamedProperties);
+		foreach(Utils::stringifyKeys($result->renamedProperties) as $blockName => $properties){
+			ksort($properties);
+			$result->renamedProperties[$blockName] = $properties;
+		}
+
+		$result->removedProperties = $schema->removedProperties;
+		ksort($result->removedProperties);
+		foreach(Utils::stringifyKeys($result->removedProperties) as $blockName => $properties){
+			sort($properties); //yes, this is intended to sort(), not ksort()
+			$result->removedProperties[$blockName] = $properties;
+		}
+
+		foreach(Utils::stringifyKeys($schema->addedProperties) as $blockName => $properties){
+			$addedProperties = [];
+			foreach(Utils::stringifyKeys($properties) as $propertyName => $propertyValue){
+				$addedProperties[$propertyName] = self::tagToJsonModel($propertyValue);
+			}
+			ksort($addedProperties);
+			$result->addedProperties[$blockName] = $addedProperties;
+		}
+		if(isset($result->addedProperties)){
+			ksort($result->addedProperties);
+		}
+
+		self::buildRemappedValuesIndex($schema, $result);
+
+		foreach(Utils::stringifyKeys($schema->flattenedProperties) as $blockName => $flattenRule){
+			$result->flattenedProperties[$blockName] = self::flattenRuleToJsonModel($flattenRule);
+		}
+		if(isset($result->flattenedProperties)){
+			ksort($result->flattenedProperties);
+		}
+
+		foreach(Utils::stringifyKeys($schema->remappedStates) as $oldBlockName => $remaps){
+			$keyedRemaps = [];
+			foreach($remaps as $remap){
+				$modelRemap = new BlockStateUpgradeSchemaModelBlockRemap(
+					array_map(fn(Tag $tag) => self::tagToJsonModel($tag), $remap->oldState),
+					is_string($remap->newName) ? $remap->newName : self::flattenRuleToJsonModel($remap->newName),
+					array_map(fn(Tag $tag) => self::tagToJsonModel($tag), $remap->newState),
+					$remap->copiedState
+				);
+				if(count($modelRemap->copiedState) === 0){
+					unset($modelRemap->copiedState); //avoid polluting the JSON
+				}
+				$key = json_encode($modelRemap);
+				assert(!isset($keyedRemaps[$key]));
+				if(isset($keyedRemaps[$key])){
+					continue;
+				}
+				$keyedRemaps[$key] = $modelRemap;
+			}
+			usort($keyedRemaps, function(BlockStateUpgradeSchemaModelBlockRemap $a, BlockStateUpgradeSchemaModelBlockRemap $b) : int{
+				//remaps with more specific criteria must come first
+				$filterSizeCompare = count($b->oldState ?? []) <=> count($a->oldState ?? []);
+				if($filterSizeCompare !== 0){
+					return $filterSizeCompare;
+				}
+				//remaps with the same number of criteria should be sorted alphabetically, but this is not strictly necessary
+				return json_encode($a->oldState ?? []) <=> json_encode($b->oldState ?? []);
+			});
+			$result->remappedStates[$oldBlockName] = array_values($keyedRemaps);
+		}
+		if(isset($result->remappedStates)){
+			ksort($result->remappedStates);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Returns a list of schemas ordered by schema ID. Oldest schemas appear first.
+	 *
+	 * @return BlockStateUpgradeSchema[]
+	 */
+	public static function loadSchemas(string $path, int $maxSchemaId) : array{
+		$iterator = new \RegexIterator(
+			new \FilesystemIterator(
+				$path,
+				\FilesystemIterator::KEY_AS_FILENAME | \FilesystemIterator::SKIP_DOTS
+			),
+			'/^(\d{4}).*\.json$/',
+			\RegexIterator::GET_MATCH,
+			\RegexIterator::USE_KEY
+		);
+
+		$result = [];
+
+		/** @var string[] $matches */
+		foreach($iterator as $matches){
+			$filename = $matches[0];
+			$schemaId = (int) $matches[1];
+
+			if($schemaId > $maxSchemaId){
+				continue;
+			}
+
+			$fullPath = Path::join($path, $filename);
+
+			$raw = Filesystem::fileGetContents($fullPath);
+
+			try{
+				$schema = self::loadSchemaFromString($raw, $schemaId);
+			}catch(\RuntimeException $e){
+				throw new \RuntimeException("Loading schema file $fullPath: " . $e->getMessage(), 0, $e);
+			}
+
+			$result[$schemaId] = $schema;
+		}
+
+		ksort($result, SORT_NUMERIC);
+		return $result;
+	}
+
+	public static function loadSchemaFromString(string $raw, int $schemaId) : BlockStateUpgradeSchema{
+		try{
+			$json = json_decode($raw, false, flags: JSON_THROW_ON_ERROR);
+		}catch(\JsonException $e){
+			throw new \RuntimeException($e->getMessage(), 0, $e);
+		}
+		if(!is_object($json)){
+			throw new \RuntimeException("Unexpected root type of schema file " . gettype($json) . ", expected object");
+		}
+
+		$jsonMapper = new \JsonMapper();
+		$jsonMapper->bExceptionOnMissingData = true;
+		$jsonMapper->bExceptionOnUndefinedProperty = true;
+		$jsonMapper->bStrictObjectTypeChecking = true;
+		try{
+			$model = $jsonMapper->map($json, new BlockStateUpgradeSchemaModel());
+		}catch(\JsonMapper_Exception $e){
+			throw new \RuntimeException($e->getMessage(), 0, $e);
+		}
+
+		return self::fromJsonModel($model, $schemaId);
+	}
+}
diff --git a/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaValueRemap.php b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaValueRemap.php
new file mode 100644
index 0000000000..80e451de9c
--- /dev/null
+++ b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaValueRemap.php
@@ -0,0 +1,34 @@
+<?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\block\upgrade;
+
+use pocketmine\nbt\tag\Tag;
+
+final class BlockStateUpgradeSchemaValueRemap{
+
+	public function __construct(
+		public Tag $old,
+		public Tag $new
+	){}
+}
diff --git a/src/data/bedrock/block/upgrade/BlockStateUpgrader.php b/src/data/bedrock/block/upgrade/BlockStateUpgrader.php
new file mode 100644
index 0000000000..2dce762b8d
--- /dev/null
+++ b/src/data/bedrock/block/upgrade/BlockStateUpgrader.php
@@ -0,0 +1,307 @@
+<?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\block\upgrade;
+
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\nbt\tag\ByteTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\StringTag;
+use pocketmine\nbt\tag\Tag;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Utils;
+use function count;
+use function get_class;
+use function is_string;
+use function ksort;
+use function max;
+use function sprintf;
+use const SORT_NUMERIC;
+
+final class BlockStateUpgrader{
+	/**
+	 * @var BlockStateUpgradeSchema[][] versionId => [schemaId => schema]
+	 * @phpstan-var array<int, array<int, BlockStateUpgradeSchema>>
+	 */
+	private array $upgradeSchemas = [];
+
+	private int $outputVersion = 0;
+
+	/**
+	 * @param BlockStateUpgradeSchema[] $upgradeSchemas
+	 * @phpstan-param array<int, BlockStateUpgradeSchema> $upgradeSchemas
+	 */
+	public function __construct(array $upgradeSchemas){
+		foreach($upgradeSchemas as $schema){
+			$this->addSchema($schema);
+		}
+	}
+
+	public function addSchema(BlockStateUpgradeSchema $schema) : void{
+		$schemaId = $schema->getSchemaId();
+		$versionId = $schema->getVersionId();
+		if(isset($this->upgradeSchemas[$versionId][$schemaId])){
+			throw new \InvalidArgumentException("Cannot add two schemas with the same schema ID and version ID");
+		}
+
+		//schema ID tells us the order when multiple schemas use the same version ID
+		$this->upgradeSchemas[$versionId][$schemaId] = $schema;
+
+		ksort($this->upgradeSchemas, SORT_NUMERIC);
+		ksort($this->upgradeSchemas[$versionId], SORT_NUMERIC);
+
+		$this->outputVersion = max($this->outputVersion, $schema->getVersionId());
+	}
+
+	public function upgrade(BlockStateData $blockStateData) : BlockStateData{
+		$version = $blockStateData->getVersion();
+		foreach($this->upgradeSchemas as $resultVersion => $schemaList){
+			/*
+			 * Sometimes Mojang made changes without bumping the version ID.
+			 * A notable example is 0131_1.18.20.27_beta_to_1.18.30.json, which renamed a bunch of blockIDs.
+			 * When this happens, all the schemas must be applied even if the version is the same, because the input
+			 * version doesn't tell us which of the schemas have already been applied.
+			 * If there's only one schema for a version (the norm), we can safely assume it's already been applied if
+			 * the version is the same, and skip over it.
+			 * TODO: this causes issues when testing isolated schemas since there will only be one schema for a version.
+			 * The second check should be disabled for that case.
+			 */
+			if($version > $resultVersion || (count($schemaList) === 1 && $version === $resultVersion)){
+				continue;
+			}
+
+			foreach($schemaList as $schema){
+				$blockStateData = $this->applySchema($schema, $blockStateData);
+			}
+		}
+
+		if($this->outputVersion > $version){
+			//always update the version number of the blockstate, even if it didn't change - this is needed for
+			//external tools
+			$blockStateData = new BlockStateData($blockStateData->getName(), $blockStateData->getStates(), $this->outputVersion);
+		}
+		return $blockStateData;
+	}
+
+	private function applySchema(BlockStateUpgradeSchema $schema, BlockStateData $blockStateData) : BlockStateData{
+		$newStateData = $this->applyStateRemapped($schema, $blockStateData);
+		if($newStateData !== null){
+			return $newStateData;
+		}
+
+		$oldName = $blockStateData->getName();
+		$states = $blockStateData->getStates();
+
+		if(isset($schema->renamedIds[$oldName]) && isset($schema->flattenedProperties[$oldName])){
+			//TODO: this probably ought to be validated when the schema is constructed
+			throw new AssumptionFailedError("Both renamedIds and flattenedProperties are set for the same block ID \"$oldName\" - don't know what to do");
+		}
+		if(isset($schema->renamedIds[$oldName])){
+			$newName = $schema->renamedIds[$oldName] ?? null;
+		}elseif(isset($schema->flattenedProperties[$oldName])){
+			[$newName, $states] = $this->applyPropertyFlattened($schema->flattenedProperties[$oldName], $oldName, $states);
+		}else{
+			$newName = null;
+		}
+
+		$stateChanges = 0;
+
+		$states = $this->applyPropertyAdded($schema, $oldName, $states, $stateChanges);
+		$states = $this->applyPropertyRemoved($schema, $oldName, $states, $stateChanges);
+		$states = $this->applyPropertyRenamedOrValueChanged($schema, $oldName, $states, $stateChanges);
+		$states = $this->applyPropertyValueChanged($schema, $oldName, $states, $stateChanges);
+
+		if($newName !== null || $stateChanges > 0){
+			return new BlockStateData($newName ?? $oldName, $states, $schema->getVersionId());
+		}
+
+		return $blockStateData;
+	}
+
+	private function applyStateRemapped(BlockStateUpgradeSchema $schema, BlockStateData $blockStateData) : ?BlockStateData{
+		$oldName = $blockStateData->getName();
+		$oldState = $blockStateData->getStates();
+
+		if(isset($schema->remappedStates[$oldName])){
+			foreach($schema->remappedStates[$oldName] as $remap){
+				if(count($remap->oldState) > count($oldState)){
+					//match criteria has more requirements than we have state properties
+					continue; //try next state
+				}
+				foreach(Utils::stringifyKeys($remap->oldState) as $k => $v){
+					if(!isset($oldState[$k]) || !$oldState[$k]->equals($v)){
+						continue 2; //try next state
+					}
+				}
+
+				if(is_string($remap->newName)){
+					$newName = $remap->newName;
+				}else{
+					//discard flatten modifications to state - the remap newState and copiedState will take care of it
+					[$newName, ] = $this->applyPropertyFlattened($remap->newName, $oldName, $oldState);
+				}
+
+				$newState = $remap->newState;
+				foreach($remap->copiedState as $stateName){
+					if(isset($oldState[$stateName])){
+						$newState[$stateName] = $oldState[$stateName];
+					}
+				}
+
+				return new BlockStateData($newName, $newState, $schema->getVersionId());
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * @param Tag[] $states
+	 * @phpstan-param array<string, Tag> $states
+	 *
+	 * @return Tag[]
+	 * @phpstan-return array<string, Tag>
+	 */
+	private function applyPropertyAdded(BlockStateUpgradeSchema $schema, string $oldName, array $states, int &$stateChanges) : array{
+		if(isset($schema->addedProperties[$oldName])){
+			foreach(Utils::stringifyKeys($schema->addedProperties[$oldName]) as $propertyName => $value){
+				if(!isset($states[$propertyName])){
+					$stateChanges++;
+					$states[$propertyName] = $value;
+				}
+			}
+		}
+
+		return $states;
+	}
+
+	/**
+	 * @param Tag[] $states
+	 * @phpstan-param array<string, Tag> $states
+	 *
+	 * @return Tag[]
+	 * @phpstan-return array<string, Tag>
+	 */
+	private function applyPropertyRemoved(BlockStateUpgradeSchema $schema, string $oldName, array $states, int &$stateChanges) : array{
+		if(isset($schema->removedProperties[$oldName])){
+			foreach($schema->removedProperties[$oldName] as $propertyName){
+				if(isset($states[$propertyName])){
+					$stateChanges++;
+					unset($states[$propertyName]);
+				}
+			}
+		}
+
+		return $states;
+	}
+
+	private function locateNewPropertyValue(BlockStateUpgradeSchema $schema, string $oldName, string $oldPropertyName, Tag $oldValue) : Tag{
+		if(isset($schema->remappedPropertyValues[$oldName][$oldPropertyName])){
+			foreach($schema->remappedPropertyValues[$oldName][$oldPropertyName] as $mappedPair){
+				if($mappedPair->old->equals($oldValue)){
+					return $mappedPair->new;
+				}
+			}
+		}
+
+		return $oldValue;
+	}
+
+	/**
+	 * @param Tag[] $states
+	 * @phpstan-param array<string, Tag> $states
+	 *
+	 * @return Tag[]
+	 * @phpstan-return array<string, Tag>
+	 */
+	private function applyPropertyRenamedOrValueChanged(BlockStateUpgradeSchema $schema, string $oldName, array $states, int &$stateChanges) : array{
+		if(isset($schema->renamedProperties[$oldName])){
+			foreach(Utils::stringifyKeys($schema->renamedProperties[$oldName]) as $oldPropertyName => $newPropertyName){
+				$oldValue = $states[$oldPropertyName] ?? null;
+				if($oldValue !== null){
+					$stateChanges++;
+					unset($states[$oldPropertyName]);
+
+					//If a value remap is needed, we need to do it here, since we won't be able to locate the property
+					//after it's been renamed - value remaps are always indexed by old property name for the sake of
+					//being able to do changes in any order.
+					$states[$newPropertyName] = $this->locateNewPropertyValue($schema, $oldName, $oldPropertyName, $oldValue);
+				}
+			}
+		}
+
+		return $states;
+	}
+
+	/**
+	 * @param Tag[] $states
+	 * @phpstan-param array<string, Tag> $states
+	 *
+	 * @return Tag[]
+	 * @phpstan-return array<string, Tag>
+	 */
+	private function applyPropertyValueChanged(BlockStateUpgradeSchema $schema, string $oldName, array $states, int &$stateChanges) : array{
+		if(isset($schema->remappedPropertyValues[$oldName])){
+			foreach(Utils::stringifyKeys($schema->remappedPropertyValues[$oldName]) as $oldPropertyName => $remappedValues){
+				$oldValue = $states[$oldPropertyName] ?? null;
+				if($oldValue !== null){
+					$newValue = $this->locateNewPropertyValue($schema, $oldName, $oldPropertyName, $oldValue);
+					if($newValue !== $oldValue){
+						$stateChanges++;
+						$states[$oldPropertyName] = $newValue;
+					}
+				}
+			}
+		}
+
+		return $states;
+	}
+
+	/**
+	 * @param Tag[] $states
+	 * @phpstan-param array<string, Tag> $states
+	 *
+	 * @return (string|Tag[])[]
+	 * @phpstan-return array{0: string, 1: array<string, Tag>}
+	 */
+	private function applyPropertyFlattened(BlockStateUpgradeSchemaFlattenInfo $flattenInfo, string $oldName, array $states) : array{
+		$flattenedValue = $states[$flattenInfo->flattenedProperty] ?? null;
+		$expectedType = $flattenInfo->flattenedPropertyType;
+		if(!$flattenedValue instanceof $expectedType){
+			//flattened property is not of the expected type, so this transformation is not applicable
+			return [$oldName, $states];
+		}
+		$embedKey = match(get_class($flattenedValue)){
+			StringTag::class => $flattenedValue->getValue(),
+			ByteTag::class => (string) $flattenedValue->getValue(),
+			IntTag::class => (string) $flattenedValue->getValue(),
+			//flattenedPropertyType is always one of these three types, but PHPStan doesn't know that
+			default => throw new AssumptionFailedError("flattenedPropertyType should be one of these three types, but have " . get_class($flattenedValue)),
+		};
+		$embedValue = $flattenInfo->flattenedValueRemaps[$embedKey] ?? $embedKey;
+		$newName = sprintf("%s%s%s", $flattenInfo->prefix, $embedValue, $flattenInfo->suffix);
+		unset($states[$flattenInfo->flattenedProperty]);
+
+		return [$newName, $states];
+	}
+}
diff --git a/src/data/bedrock/LegacyBlockIdToStringIdMap.php b/src/data/bedrock/block/upgrade/LegacyBlockIdToStringIdMap.php
similarity index 75%
rename from src/data/bedrock/LegacyBlockIdToStringIdMap.php
rename to src/data/bedrock/block/upgrade/LegacyBlockIdToStringIdMap.php
index 35c24caf9a..f42dc6d8a5 100644
--- a/src/data/bedrock/LegacyBlockIdToStringIdMap.php
+++ b/src/data/bedrock/block/upgrade/LegacyBlockIdToStringIdMap.php
@@ -21,15 +21,16 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\data\bedrock;
+namespace pocketmine\data\bedrock\block\upgrade;
 
+use pocketmine\data\bedrock\LegacyToStringIdMap;
 use pocketmine\utils\SingletonTrait;
 use Symfony\Component\Filesystem\Path;
 
-final class LegacyBlockIdToStringIdMap extends LegacyToStringBidirectionalIdMap{
+final class LegacyBlockIdToStringIdMap extends LegacyToStringIdMap{
 	use SingletonTrait;
 
 	public function __construct(){
-		parent::__construct(Path::join(\pocketmine\BEDROCK_DATA_PATH, 'block_id_map.json'));
+		parent::__construct(Path::join(\pocketmine\BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH, 'block_legacy_id_map.json'));
 	}
 }
diff --git a/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModel.php b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModel.php
new file mode 100644
index 0000000000..7d91438e4f
--- /dev/null
+++ b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModel.php
@@ -0,0 +1,104 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock\block\upgrade\model;
+
+use function count;
+use function is_array;
+
+/**
+ * Model for loading upgrade schema data from JSON.
+ */
+final class BlockStateUpgradeSchemaModel implements \JsonSerializable{
+	/** @required */
+	public int $maxVersionMajor;
+	/** @required */
+	public int $maxVersionMinor;
+	/** @required */
+	public int $maxVersionPatch;
+	/** @required */
+	public int $maxVersionRevision;
+
+	/**
+	 * @var string[]
+	 * @phpstan-var array<string, string>
+	 */
+	public array $renamedIds;
+
+	/**
+	 * @var BlockStateUpgradeSchemaModelTag[][]
+	 * @phpstan-var array<string, array<string, BlockStateUpgradeSchemaModelTag>>
+	 */
+	public array $addedProperties;
+
+	/**
+	 * @var string[][]
+	 * @phpstan-var array<string, list<string>>
+	 */
+	public array $removedProperties;
+
+	/**
+	 * @var string[][]
+	 * @phpstan-var array<string, array<string, string>>
+	 */
+	public array $renamedProperties;
+
+	/**
+	 * @var string[][]
+	 * @phpstan-var array<string, array<string, string>>
+	 */
+	public array $remappedPropertyValues;
+
+	/**
+	 * @var BlockStateUpgradeSchemaModelValueRemap[][]
+	 * @phpstan-var array<string, list<BlockStateUpgradeSchemaModelValueRemap>>
+	 */
+	public array $remappedPropertyValuesIndex;
+
+	/**
+	 * @var BlockStateUpgradeSchemaModelFlattenInfo[]
+	 * @phpstan-var array<string, BlockStateUpgradeSchemaModelFlattenInfo>
+	 */
+	public array $flattenedProperties;
+
+	/**
+	 * @var BlockStateUpgradeSchemaModelBlockRemap[][]
+	 * @phpstan-var array<string, list<BlockStateUpgradeSchemaModelBlockRemap>>
+	 */
+	public array $remappedStates;
+
+	/**
+	 * @return mixed[]
+	 */
+	public function jsonSerialize() : array{
+		$result = (array) $this;
+
+		foreach($result as $k => $v){
+			if(is_array($v) && count($v) === 0){
+				unset($result[$k]);
+			}
+		}
+
+		return $result;
+	}
+}
diff --git a/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelBlockRemap.php b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelBlockRemap.php
new file mode 100644
index 0000000000..6accf1f021
--- /dev/null
+++ b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelBlockRemap.php
@@ -0,0 +1,80 @@
+<?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\block\upgrade\model;
+
+use function count;
+
+final class BlockStateUpgradeSchemaModelBlockRemap{
+
+	/**
+	 * @var BlockStateUpgradeSchemaModelTag[]|null
+	 * @phpstan-var array<string, BlockStateUpgradeSchemaModelTag>|null
+	 * @required
+	 */
+	public ?array $oldState;
+
+	/**
+	 * Either this or newFlattenedName must be present
+	 * Due to technical limitations of jsonmapper, we can't use a union type here
+	 */
+	public string $newName;
+	/**
+	 * Either this or newName must be present
+	 * Due to technical limitations of jsonmapper, we can't use a union type here
+	 */
+	public BlockStateUpgradeSchemaModelFlattenInfo $newFlattenedName;
+
+	/**
+	 * @var BlockStateUpgradeSchemaModelTag[]|null
+	 * @phpstan-var array<string, BlockStateUpgradeSchemaModelTag>|null
+	 * @required
+	 */
+	public ?array $newState;
+
+	/**
+	 * @var string[]
+	 * @phpstan-var list<string>
+	 * May not be present in older schemas
+	 */
+	public array $copiedState;
+
+	/**
+	 * @param BlockStateUpgradeSchemaModelTag[] $oldState
+	 * @param BlockStateUpgradeSchemaModelTag[] $newState
+	 * @param string[]                          $copiedState
+	 * @phpstan-param array<string, BlockStateUpgradeSchemaModelTag> $oldState
+	 * @phpstan-param array<string, BlockStateUpgradeSchemaModelTag> $newState
+	 * @phpstan-param list<string> $copiedState
+	 */
+	public function __construct(array $oldState, string|BlockStateUpgradeSchemaModelFlattenInfo $newNameRule, array $newState, array $copiedState){
+		$this->oldState = count($oldState) === 0 ? null : $oldState;
+		if($newNameRule instanceof BlockStateUpgradeSchemaModelFlattenInfo){
+			$this->newFlattenedName = $newNameRule;
+		}else{
+			$this->newName = $newNameRule;
+		}
+		$this->newState = count($newState) === 0 ? null : $newState;
+		$this->copiedState = $copiedState;
+	}
+}
diff --git a/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelFlattenInfo.php b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelFlattenInfo.php
new file mode 100644
index 0000000000..6da590287b
--- /dev/null
+++ b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelFlattenInfo.php
@@ -0,0 +1,68 @@
+<?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\block\upgrade\model;
+
+use function count;
+
+final class BlockStateUpgradeSchemaModelFlattenInfo implements \JsonSerializable{
+
+	/** @required */
+	public string $prefix;
+	/** @required */
+	public string $flattenedProperty;
+	public ?string $flattenedPropertyType = null;
+	/** @required */
+	public string $suffix;
+	/**
+	 * @var string[]
+	 * @phpstan-var array<string, string>
+	 */
+	public array $flattenedValueRemaps;
+
+	/**
+	 * @param string[] $flattenedValueRemaps
+	 * @phpstan-param array<string, string> $flattenedValueRemaps
+	 */
+	public function __construct(string $prefix, string $flattenedProperty, string $suffix, array $flattenedValueRemaps, ?string $flattenedPropertyType = null){
+		$this->prefix = $prefix;
+		$this->flattenedProperty = $flattenedProperty;
+		$this->suffix = $suffix;
+		$this->flattenedValueRemaps = $flattenedValueRemaps;
+		$this->flattenedPropertyType = $flattenedPropertyType;
+	}
+
+	/**
+	 * @return mixed[]
+	 */
+	public function jsonSerialize() : array{
+		$result = (array) $this;
+		if(count($this->flattenedValueRemaps) === 0){
+			unset($result["flattenedValueRemaps"]);
+		}
+		if($this->flattenedPropertyType === null){
+			unset($result["flattenedPropertyType"]);
+		}
+		return $result;
+	}
+}
diff --git a/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelTag.php b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelTag.php
new file mode 100644
index 0000000000..f7eaa9d8ad
--- /dev/null
+++ b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelTag.php
@@ -0,0 +1,30 @@
+<?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\block\upgrade\model;
+
+final class BlockStateUpgradeSchemaModelTag{
+	public int $byte;
+	public int $int;
+	public string $string;
+}
diff --git a/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelValueRemap.php b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelValueRemap.php
new file mode 100644
index 0000000000..eeda335097
--- /dev/null
+++ b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelValueRemap.php
@@ -0,0 +1,36 @@
+<?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\block\upgrade\model;
+
+final class BlockStateUpgradeSchemaModelValueRemap{
+	/** @required */
+	public BlockStateUpgradeSchemaModelTag $old;
+	/** @required */
+	public BlockStateUpgradeSchemaModelTag $new;
+
+	public function __construct(BlockStateUpgradeSchemaModelTag $old, BlockStateUpgradeSchemaModelTag $new){
+		$this->old = $old;
+		$this->new = $new;
+	}
+}
diff --git a/src/data/bedrock/item/BlockItemIdMap.php b/src/data/bedrock/item/BlockItemIdMap.php
new file mode 100644
index 0000000000..6a993f60d5
--- /dev/null
+++ b/src/data/bedrock/item/BlockItemIdMap.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\data\bedrock\item;
+
+use pocketmine\data\bedrock\BedrockDataFiles;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Filesystem;
+use pocketmine\utils\SingletonTrait;
+use function array_flip;
+use function is_array;
+use function json_decode;
+use const JSON_THROW_ON_ERROR;
+
+/**
+ * Bidirectional map of block IDs to their corresponding blockitem IDs, used for storing items on disk
+ */
+final class BlockItemIdMap{
+	use SingletonTrait;
+
+	private static function make() : self{
+		$map = json_decode(
+			Filesystem::fileGetContents(BedrockDataFiles::BLOCK_ID_TO_ITEM_ID_MAP_JSON),
+			associative: true,
+			flags: JSON_THROW_ON_ERROR
+		);
+		if(!is_array($map)){
+			throw new AssumptionFailedError("Invalid blockitem ID mapping table, expected array as root type");
+		}
+
+		return new self($map);
+	}
+
+	/**
+	 * @var string[]
+	 * @phpstan-var array<string, string>
+	 */
+	private array $itemToBlockId;
+
+	/**
+	 * @param string[] $blockToItemId
+	 * @phpstan-param array<string, string> $blockToItemId
+	 */
+	public function __construct(private array $blockToItemId){
+		$this->itemToBlockId = array_flip($this->blockToItemId);
+	}
+
+	public function lookupItemId(string $blockId) : ?string{
+		return $this->blockToItemId[$blockId] ?? null;
+	}
+
+	public function lookupBlockId(string $itemId) : ?string{
+		return $this->itemToBlockId[$itemId] ?? null;
+	}
+}
diff --git a/src/data/bedrock/item/ItemDeserializer.php b/src/data/bedrock/item/ItemDeserializer.php
new file mode 100644
index 0000000000..f7854313fc
--- /dev/null
+++ b/src/data/bedrock/item/ItemDeserializer.php
@@ -0,0 +1,116 @@
+<?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\item;
+
+use pocketmine\block\Block;
+use pocketmine\block\RuntimeBlockStateRegistry;
+use pocketmine\data\bedrock\block\BlockStateDeserializeException;
+use pocketmine\data\bedrock\block\BlockStateDeserializer;
+use pocketmine\data\bedrock\block\convert\UnsupportedBlockStateException;
+use pocketmine\data\bedrock\item\SavedItemData as Data;
+use pocketmine\item\Durable;
+use pocketmine\item\Item;
+use pocketmine\nbt\NbtException;
+use function min;
+
+final class ItemDeserializer{
+	/**
+	 * @var \Closure[]
+	 * @phpstan-var array<string, \Closure(Data) : Item>
+	 */
+	private array $deserializers = [];
+
+	public function __construct(
+		private BlockStateDeserializer $blockStateDeserializer
+	){
+		new ItemSerializerDeserializerRegistrar($this, null);
+	}
+
+	/**
+	 * @phpstan-param \Closure(Data) : Item $deserializer
+	 */
+	public function map(string $id, \Closure $deserializer) : void{
+		if(isset($this->deserializers[$id])){
+			throw new \InvalidArgumentException("Deserializer is already assigned for \"$id\"");
+		}
+		$this->deserializers[$id] = $deserializer;
+	}
+
+	/**
+	 * @phpstan-param \Closure(Data) : Block $deserializer
+	 */
+	public function mapBlock(string $id, \Closure $deserializer) : void{
+		$this->map($id, fn(Data $data) => $deserializer($data)->asItem());
+	}
+
+	/**
+	 * @throws ItemTypeDeserializeException
+	 */
+	public function deserializeType(Data $data) : Item{
+		if(($blockData = $data->getBlock()) !== null){
+			//TODO: this is rough duct tape; we need a better way to deal with this
+			try{
+				$block = $this->blockStateDeserializer->deserialize($blockData);
+			}catch(UnsupportedBlockStateException $e){
+				throw new UnsupportedItemTypeException($e->getMessage(), 0, $e);
+			}catch(BlockStateDeserializeException $e){
+				throw new ItemTypeDeserializeException("Failed to deserialize item data: " . $e->getMessage(), 0, $e);
+			}
+
+			//TODO: worth caching this or not?
+			return RuntimeBlockStateRegistry::getInstance()->fromStateId($block)->asItem();
+		}
+		$id = $data->getName();
+		if(!isset($this->deserializers[$id])){
+			throw new UnsupportedItemTypeException("No deserializer found for ID $id");
+		}
+
+		return ($this->deserializers[$id])($data);
+	}
+
+	/**
+	 * @throws ItemTypeDeserializeException
+	 */
+	public function deserializeStack(SavedItemStackData $data) : Item{
+		$itemStack = $this->deserializeType($data->getTypeData());
+
+		$itemStack->setCount($data->getCount());
+		if(($tagTag = $data->getTypeData()->getTag()) !== null){
+			try{
+				$itemStack->setNamedTag(clone $tagTag);
+			}catch(NbtException $e){
+				throw new ItemTypeDeserializeException("Invalid item saved NBT: " . $e->getMessage(), 0, $e);
+			}
+		}
+
+		//TODO: this hack is necessary to get legacy tools working - we need a better way to handle this kind of stuff
+		if($itemStack instanceof Durable && $itemStack->getDamage() === 0 && ($damage = $data->getTypeData()->getMeta()) > 0){
+			$itemStack->setDamage(min($damage, $itemStack->getMaxDurability()));
+		}
+
+		//TODO: canDestroy, canPlaceOn, wasPickedUp are currently unused
+
+		return $itemStack;
+	}
+}
diff --git a/src/data/bedrock/item/ItemSerializer.php b/src/data/bedrock/item/ItemSerializer.php
new file mode 100644
index 0000000000..845d5bc5ff
--- /dev/null
+++ b/src/data/bedrock/item/ItemSerializer.php
@@ -0,0 +1,192 @@
+<?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\item;
+
+use pocketmine\block\Block;
+use pocketmine\block\VanillaBlocks as Blocks;
+use pocketmine\data\bedrock\block\BlockStateSerializeException;
+use pocketmine\data\bedrock\block\BlockStateSerializer;
+use pocketmine\data\bedrock\item\SavedItemData as Data;
+use pocketmine\item\CoralFan;
+use pocketmine\item\Item;
+use pocketmine\item\ItemBlock;
+use pocketmine\item\VanillaItems as Items;
+use function get_class;
+
+final class ItemSerializer{
+	/**
+	 * These callables actually accept Item, but for the sake of type completeness, it has to be never, since we can't
+	 * describe the bottom type of a type hierarchy only containing Item.
+	 *
+	 * @var \Closure[]
+	 * @phpstan-var array<int, \Closure(never) : Data>
+	 */
+	private array $itemSerializers = [];
+
+	/**
+	 * @var \Closure[]
+	 * @phpstan-var array<int, \Closure(never) : Data>
+	 */
+	private array $blockItemSerializers = [];
+
+	public function __construct(
+		private BlockStateSerializer $blockStateSerializer
+	){
+		$this->registerSpecialBlockSerializers();
+		new ItemSerializerDeserializerRegistrar(null, $this);
+	}
+
+	/**
+	 * @phpstan-template TItemType of Item
+	 * @phpstan-param TItemType $item
+	 * @phpstan-param \Closure(TItemType) : Data $serializer
+	 */
+	public function map(Item $item, \Closure $serializer) : void{
+		$index = $item->getTypeId();
+		if(isset($this->itemSerializers[$index])){
+			throw new \InvalidArgumentException("Item type ID " . $index . " already has a serializer registered");
+		}
+		$this->itemSerializers[$index] = $serializer;
+	}
+
+	/**
+	 * @phpstan-template TBlockType of Block
+	 * @phpstan-param TBlockType $block
+	 * @phpstan-param \Closure(TBlockType) : Data $serializer
+	 */
+	public function mapBlock(Block $block, \Closure $serializer) : void{
+		$index = $block->getTypeId();
+		if(isset($this->blockItemSerializers[$index])){
+			throw new \InvalidArgumentException("Block type ID " . $index . " already has a serializer registered");
+		}
+		$this->blockItemSerializers[$index] = $serializer;
+	}
+
+	/**
+	 * @phpstan-template TItemType of Item
+	 * @phpstan-param TItemType $item
+	 *
+	 * @throws ItemTypeSerializeException
+	 */
+	public function serializeType(Item $item) : Data{
+		if($item->isNull()){
+			throw new \InvalidArgumentException("Cannot serialize a null itemstack");
+		}
+		if($item instanceof ItemBlock){
+			$data = $this->serializeBlockItem($item->getBlock());
+		}else{
+			$index = $item->getTypeId();
+
+			$locatedSerializer = $this->itemSerializers[$index] ?? null;
+			if($locatedSerializer === null){
+				throw new ItemTypeSerializeException("No serializer registered for " . get_class($item) . " ($index) " . $item->getName());
+			}
+
+			/**
+			 * TODO: there is no guarantee that this type actually matches that of $item - a plugin may have stolen
+			 * the type ID of the item (which never makes sense, even in a world where overriding item types is a thing).
+			 * In the future we'll need some way to guarantee that type IDs are never reused (perhaps spl_object_id()?)
+			 *
+			 * @var \Closure $serializer
+			 * @phpstan-var \Closure(TItemType) : Data $serializer
+			 */
+			$serializer = $locatedSerializer;
+
+			/** @var Data $data */
+			$data = $serializer($item);
+		}
+
+		if($item->hasNamedTag()){
+			$resultTag = $item->getNamedTag();
+			$extraTag = $data->getTag();
+			if($extraTag !== null){
+				$resultTag = $resultTag->merge($extraTag);
+			}
+			$data = new Data($data->getName(), $data->getMeta(), $data->getBlock(), $resultTag);
+		}
+
+		return $data;
+	}
+
+	public function serializeStack(Item $item, ?int $slot = null) : SavedItemStackData{
+		return new SavedItemStackData(
+			$this->serializeType($item),
+			$item->getCount(),
+			$slot,
+			null,
+			[], //we currently represent canDestroy and canPlaceOn via NBT, like PC
+			[]
+		);
+	}
+
+	/**
+	 * @phpstan-template TBlockType of Block
+	 * @phpstan-param TBlockType $block
+	 *
+	 * @throws ItemTypeSerializeException
+	 */
+	private function serializeBlockItem(Block $block) : Data{
+		$index = $block->getTypeId();
+
+		$locatedSerializer = $this->blockItemSerializers[$index] ?? null;
+		if($locatedSerializer !== null){
+			/**
+			 * TODO: there is no guarantee that this type actually matches that of $block - a plugin may have stolen
+			 * the type ID of the block (which never makes sense, even in a world where overriding block types is a thing).
+			 * In the future we'll need some way to guarantee that type IDs are never reused (perhaps spl_object_id()?)
+			 *
+			 * @phpstan-var \Closure(TBlockType) : Data $serializer
+			 */
+			$serializer = $locatedSerializer;
+			$data = $serializer($block);
+		}else{
+			$data = $this->standardBlock($block);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * @throws ItemTypeSerializeException
+	 */
+	private function standardBlock(Block $block) : Data{
+		try{
+			$blockStateData = $this->blockStateSerializer->serialize($block->getStateId());
+		}catch(BlockStateSerializeException $e){
+			throw new ItemTypeSerializeException($e->getMessage(), 0, $e);
+		}
+
+		//TODO: this really ought to throw if there's no blockitem ID
+		$itemNameId = BlockItemIdMap::getInstance()->lookupItemId($blockStateData->getName()) ?? $blockStateData->getName();
+
+		return new Data($itemNameId, 0, $blockStateData);
+	}
+
+	private function registerSpecialBlockSerializers() : void{
+		//these are encoded as regular blocks, but they have to be accounted for explicitly since they don't use ItemBlock
+		//Bamboo->getBlock() returns BambooSapling :(
+		$this->map(Items::BAMBOO(), fn() => $this->standardBlock(Blocks::BAMBOO()));
+		$this->map(Items::CORAL_FAN(), fn(CoralFan $item) => $this->standardBlock($item->getBlock()));
+	}
+}
diff --git a/src/data/bedrock/item/ItemSerializerDeserializerRegistrar.php b/src/data/bedrock/item/ItemSerializerDeserializerRegistrar.php
new file mode 100644
index 0000000000..8240bf0634
--- /dev/null
+++ b/src/data/bedrock/item/ItemSerializerDeserializerRegistrar.php
@@ -0,0 +1,571 @@
+<?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\item;
+
+use pocketmine\block\Bed;
+use pocketmine\block\Block;
+use pocketmine\block\CopperDoor;
+use pocketmine\block\utils\CopperOxidation;
+use pocketmine\block\utils\DyeColor;
+use pocketmine\block\VanillaBlocks as Blocks;
+use pocketmine\data\bedrock\CompoundTypeIds;
+use pocketmine\data\bedrock\DyeColorIdMap;
+use pocketmine\data\bedrock\GoatHornTypeIdMap;
+use pocketmine\data\bedrock\item\ItemTypeNames as Ids;
+use pocketmine\data\bedrock\item\SavedItemData as Data;
+use pocketmine\data\bedrock\MedicineTypeIdMap;
+use pocketmine\data\bedrock\PotionTypeIdMap;
+use pocketmine\data\bedrock\SuspiciousStewTypeIdMap;
+use pocketmine\item\Banner;
+use pocketmine\item\Dye;
+use pocketmine\item\GoatHorn;
+use pocketmine\item\Item;
+use pocketmine\item\Medicine;
+use pocketmine\item\Potion;
+use pocketmine\item\SplashPotion;
+use pocketmine\item\SuspiciousStew;
+use pocketmine\item\VanillaItems as Items;
+
+final class ItemSerializerDeserializerRegistrar{
+
+	public function __construct(
+		private ?ItemDeserializer $deserializer,
+		private ?ItemSerializer $serializer
+	){
+		$this->register1to1BlockMappings();
+		$this->register1to1ItemMappings();
+		$this->register1to1BlockWithMetaMappings();
+		$this->register1to1ItemWithMetaMappings();
+		$this->register1ToNItemMappings();
+		$this->registerMiscBlockMappings();
+		$this->registerMiscItemMappings();
+	}
+
+	public function map1to1Item(string $id, Item $item) : void{
+		$this->deserializer?->map($id, fn() => clone $item);
+		$this->serializer?->map($item, fn() => new Data($id));
+	}
+
+	/**
+	 * @phpstan-template TItem of Item
+	 * @phpstan-param TItem                       $item
+	 * @phpstan-param \Closure(TItem, int) : void $deserializeMeta
+	 * @phpstan-param \Closure(TItem) : int       $serializeMeta
+	 */
+	public function map1to1ItemWithMeta(string $id, Item $item, \Closure $deserializeMeta, \Closure $serializeMeta) : void{
+		$this->deserializer?->map($id, function(Data $data) use ($item, $deserializeMeta) : Item{
+			$result = clone $item;
+			$deserializeMeta($result, $data->getMeta());
+			return $result;
+		});
+		$this->serializer?->map($item, function(Item $item) use ($id, $serializeMeta) : Data{
+			/** @phpstan-var TItem $item */
+			$meta = $serializeMeta($item);
+			return new Data($id, $meta);
+		});
+	}
+
+	public function map1to1Block(string $id, Block $block) : void{
+		$this->deserializer?->mapBlock($id, fn() => $block);
+		$this->serializer?->mapBlock($block, fn() => new Data($id));
+	}
+
+	/**
+	 * @phpstan-template TBlock of Block
+	 * @phpstan-param TBlock                       $block
+	 * @phpstan-param \Closure(TBlock, int) : void $deserializeMeta
+	 * @phpstan-param \Closure(TBlock) : int       $serializeMeta
+	 */
+	public function map1to1BlockWithMeta(string $id, Block $block, \Closure $deserializeMeta, \Closure $serializeMeta) : void{
+		$this->deserializer?->mapBlock($id, function(Data $data) use ($block, $deserializeMeta) : Block{
+			$result = clone $block;
+			$deserializeMeta($result, $data->getMeta());
+			return $result;
+		});
+		$this->serializer?->mapBlock($block, function(Block $block) use ($id, $serializeMeta) : Data{
+			$meta = $serializeMeta($block);
+			return new Data($id, $meta);
+		});
+	}
+
+	/**
+	 * @param Item[] $items
+	 * @phpstan-param array<int, Item> $items
+	 */
+	public function map1ToNItem(string $id, array $items) : void{
+		$this->deserializer?->map($id, function(Data $data) use ($items) : Item{
+			$result = $items[$data->getMeta()] ?? null;
+			if($result === null){
+				throw new ItemTypeDeserializeException("Unhandled meta value " . $data->getMeta() . " for item ID " . $data->getName());
+			}
+			return clone $result;
+		});
+		foreach($items as $meta => $item){
+			$this->serializer?->map($item, fn() => new Data($id, $meta));
+		}
+	}
+
+	/**
+	 * Registers mappings for item IDs which directly correspond to PocketMine-MP blockitems.
+	 * Mappings here are only necessary when the item has a dedicated item ID; in these cases, the blockstate is not
+	 * included in the itemstack, and the item ID may be different from the block ID.
+	 */
+	private function register1to1BlockMappings() : void{
+		$this->map1to1Block(Ids::ACACIA_DOOR, Blocks::ACACIA_DOOR());
+		$this->map1to1Block(Ids::BIRCH_DOOR, Blocks::BIRCH_DOOR());
+		$this->map1to1Block(Ids::BREWING_STAND, Blocks::BREWING_STAND());
+		$this->map1to1Block(Ids::CAKE, Blocks::CAKE());
+		$this->map1to1Block(Ids::CAMPFIRE, Blocks::CAMPFIRE());
+		$this->map1to1Block(Ids::CAULDRON, Blocks::CAULDRON());
+		$this->map1to1Block(Ids::CHAIN, Blocks::CHAIN());
+		$this->map1to1Block(Ids::CHERRY_DOOR, Blocks::CHERRY_DOOR());
+		$this->map1to1Block(Ids::COMPARATOR, Blocks::REDSTONE_COMPARATOR());
+		$this->map1to1Block(Ids::CRIMSON_DOOR, Blocks::CRIMSON_DOOR());
+		$this->map1to1Block(Ids::DARK_OAK_DOOR, Blocks::DARK_OAK_DOOR());
+		$this->map1to1Block(Ids::FLOWER_POT, Blocks::FLOWER_POT());
+		$this->map1to1Block(Ids::FRAME, Blocks::ITEM_FRAME());
+		$this->map1to1Block(Ids::GLOW_FRAME, Blocks::GLOWING_ITEM_FRAME());
+		$this->map1to1Block(Ids::HOPPER, Blocks::HOPPER());
+		$this->map1to1Block(Ids::IRON_DOOR, Blocks::IRON_DOOR());
+		$this->map1to1Block(Ids::JUNGLE_DOOR, Blocks::JUNGLE_DOOR());
+		$this->map1to1Block(Ids::MANGROVE_DOOR, Blocks::MANGROVE_DOOR());
+		$this->map1to1Block(Ids::NETHER_WART, Blocks::NETHER_WART());
+		$this->map1to1Block(Ids::REPEATER, Blocks::REDSTONE_REPEATER());
+		$this->map1to1Block(Ids::SOUL_CAMPFIRE, Blocks::SOUL_CAMPFIRE());
+		$this->map1to1Block(Ids::SPRUCE_DOOR, Blocks::SPRUCE_DOOR());
+		$this->map1to1Block(Ids::SUGAR_CANE, Blocks::SUGARCANE());
+		$this->map1to1Block(Ids::WARPED_DOOR, Blocks::WARPED_DOOR());
+		$this->map1to1Block(Ids::WOODEN_DOOR, Blocks::OAK_DOOR());
+	}
+
+	/**
+	 * Registers mappings for item IDs which directly correspond to PocketMine-MP items.
+	 */
+	private function register1to1ItemMappings() : void{
+		$this->map1to1Item(Ids::ACACIA_BOAT, Items::ACACIA_BOAT());
+		$this->map1to1Item(Ids::ACACIA_SIGN, Items::ACACIA_SIGN());
+		$this->map1to1Item(Ids::AMETHYST_SHARD, Items::AMETHYST_SHARD());
+		$this->map1to1Item(Ids::APPLE, Items::APPLE());
+		$this->map1to1Item(Ids::BAKED_POTATO, Items::BAKED_POTATO());
+		$this->map1to1Item(Ids::BEEF, Items::RAW_BEEF());
+		$this->map1to1Item(Ids::BEETROOT, Items::BEETROOT());
+		$this->map1to1Item(Ids::BEETROOT_SEEDS, Items::BEETROOT_SEEDS());
+		$this->map1to1Item(Ids::BEETROOT_SOUP, Items::BEETROOT_SOUP());
+		$this->map1to1Item(Ids::BIRCH_BOAT, Items::BIRCH_BOAT());
+		$this->map1to1Item(Ids::BIRCH_SIGN, Items::BIRCH_SIGN());
+		$this->map1to1Item(Ids::BLAZE_POWDER, Items::BLAZE_POWDER());
+		$this->map1to1Item(Ids::BLAZE_ROD, Items::BLAZE_ROD());
+		$this->map1to1Item(Ids::BLEACH, Items::BLEACH());
+		$this->map1to1Item(Ids::BONE, Items::BONE());
+		$this->map1to1Item(Ids::BONE_MEAL, Items::BONE_MEAL());
+		$this->map1to1Item(Ids::BOOK, Items::BOOK());
+		$this->map1to1Item(Ids::BOW, Items::BOW());
+		$this->map1to1Item(Ids::BOWL, Items::BOWL());
+		$this->map1to1Item(Ids::BREAD, Items::BREAD());
+		$this->map1to1Item(Ids::BRICK, Items::BRICK());
+		$this->map1to1Item(Ids::BUCKET, Items::BUCKET());
+		$this->map1to1Item(Ids::CARROT, Items::CARROT());
+		$this->map1to1Item(Ids::CHAINMAIL_BOOTS, Items::CHAINMAIL_BOOTS());
+		$this->map1to1Item(Ids::CHAINMAIL_CHESTPLATE, Items::CHAINMAIL_CHESTPLATE());
+		$this->map1to1Item(Ids::CHAINMAIL_HELMET, Items::CHAINMAIL_HELMET());
+		$this->map1to1Item(Ids::CHAINMAIL_LEGGINGS, Items::CHAINMAIL_LEGGINGS());
+		$this->map1to1Item(Ids::CHARCOAL, Items::CHARCOAL());
+		$this->map1to1Item(Ids::CHERRY_SIGN, Items::CHERRY_SIGN());
+		$this->map1to1Item(Ids::CHICKEN, Items::RAW_CHICKEN());
+		$this->map1to1Item(Ids::CHORUS_FRUIT, Items::CHORUS_FRUIT());
+		$this->map1to1Item(Ids::CLAY_BALL, Items::CLAY());
+		$this->map1to1Item(Ids::CLOCK, Items::CLOCK());
+		$this->map1to1Item(Ids::COAL, Items::COAL());
+		$this->map1to1Item(Ids::COAST_ARMOR_TRIM_SMITHING_TEMPLATE, Items::COAST_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::COCOA_BEANS, Items::COCOA_BEANS());
+		$this->map1to1Item(Ids::COD, Items::RAW_FISH());
+		$this->map1to1Item(Ids::COMPASS, Items::COMPASS());
+		$this->map1to1Item(Ids::COOKED_BEEF, Items::STEAK());
+		$this->map1to1Item(Ids::COOKED_CHICKEN, Items::COOKED_CHICKEN());
+		$this->map1to1Item(Ids::COOKED_COD, Items::COOKED_FISH());
+		$this->map1to1Item(Ids::COOKED_MUTTON, Items::COOKED_MUTTON());
+		$this->map1to1Item(Ids::COOKED_PORKCHOP, Items::COOKED_PORKCHOP());
+		$this->map1to1Item(Ids::COOKED_RABBIT, Items::COOKED_RABBIT());
+		$this->map1to1Item(Ids::COOKED_SALMON, Items::COOKED_SALMON());
+		$this->map1to1Item(Ids::COOKIE, Items::COOKIE());
+		$this->map1to1Item(Ids::COPPER_INGOT, Items::COPPER_INGOT());
+		$this->map1to1Item(Ids::CRIMSON_SIGN, Items::CRIMSON_SIGN());
+		$this->map1to1Item(Ids::DARK_OAK_BOAT, Items::DARK_OAK_BOAT());
+		$this->map1to1Item(Ids::DARK_OAK_SIGN, Items::DARK_OAK_SIGN());
+		$this->map1to1Item(Ids::DIAMOND, Items::DIAMOND());
+		$this->map1to1Item(Ids::DIAMOND_AXE, Items::DIAMOND_AXE());
+		$this->map1to1Item(Ids::DIAMOND_BOOTS, Items::DIAMOND_BOOTS());
+		$this->map1to1Item(Ids::DIAMOND_CHESTPLATE, Items::DIAMOND_CHESTPLATE());
+		$this->map1to1Item(Ids::DIAMOND_HELMET, Items::DIAMOND_HELMET());
+		$this->map1to1Item(Ids::DIAMOND_HOE, Items::DIAMOND_HOE());
+		$this->map1to1Item(Ids::DIAMOND_LEGGINGS, Items::DIAMOND_LEGGINGS());
+		$this->map1to1Item(Ids::DIAMOND_PICKAXE, Items::DIAMOND_PICKAXE());
+		$this->map1to1Item(Ids::DIAMOND_SHOVEL, Items::DIAMOND_SHOVEL());
+		$this->map1to1Item(Ids::DIAMOND_SWORD, Items::DIAMOND_SWORD());
+		$this->map1to1Item(Ids::DISC_FRAGMENT_5, Items::DISC_FRAGMENT_5());
+		$this->map1to1Item(Ids::DRAGON_BREATH, Items::DRAGON_BREATH());
+		$this->map1to1Item(Ids::DRIED_KELP, Items::DRIED_KELP());
+		$this->map1to1Item(Ids::DUNE_ARMOR_TRIM_SMITHING_TEMPLATE, Items::DUNE_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::ECHO_SHARD, Items::ECHO_SHARD());
+		$this->map1to1Item(Ids::EGG, Items::EGG());
+		$this->map1to1Item(Ids::EMERALD, Items::EMERALD());
+		$this->map1to1Item(Ids::ENCHANTED_BOOK, Items::ENCHANTED_BOOK());
+		$this->map1to1Item(Ids::ENCHANTED_GOLDEN_APPLE, Items::ENCHANTED_GOLDEN_APPLE());
+		$this->map1to1Item(Ids::END_CRYSTAL, Items::END_CRYSTAL());
+		$this->map1to1Item(Ids::ENDER_PEARL, Items::ENDER_PEARL());
+		$this->map1to1Item(Ids::EXPERIENCE_BOTTLE, Items::EXPERIENCE_BOTTLE());
+		$this->map1to1Item(Ids::EYE_ARMOR_TRIM_SMITHING_TEMPLATE, Items::EYE_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::FEATHER, Items::FEATHER());
+		$this->map1to1Item(Ids::FERMENTED_SPIDER_EYE, Items::FERMENTED_SPIDER_EYE());
+		$this->map1to1Item(Ids::FIRE_CHARGE, Items::FIRE_CHARGE());
+		$this->map1to1Item(Ids::FISHING_ROD, Items::FISHING_ROD());
+		$this->map1to1Item(Ids::FLINT, Items::FLINT());
+		$this->map1to1Item(Ids::FLINT_AND_STEEL, Items::FLINT_AND_STEEL());
+		$this->map1to1Item(Ids::GHAST_TEAR, Items::GHAST_TEAR());
+		$this->map1to1Item(Ids::GLASS_BOTTLE, Items::GLASS_BOTTLE());
+		$this->map1to1Item(Ids::GLISTERING_MELON_SLICE, Items::GLISTERING_MELON());
+		$this->map1to1Item(Ids::GLOW_BERRIES, Items::GLOW_BERRIES());
+		$this->map1to1Item(Ids::GLOW_INK_SAC, Items::GLOW_INK_SAC());
+		$this->map1to1Item(Ids::GLOWSTONE_DUST, Items::GLOWSTONE_DUST());
+		$this->map1to1Item(Ids::GOLD_INGOT, Items::GOLD_INGOT());
+		$this->map1to1Item(Ids::GOLD_NUGGET, Items::GOLD_NUGGET());
+		$this->map1to1Item(Ids::GOLDEN_APPLE, Items::GOLDEN_APPLE());
+		$this->map1to1Item(Ids::GOLDEN_AXE, Items::GOLDEN_AXE());
+		$this->map1to1Item(Ids::GOLDEN_BOOTS, Items::GOLDEN_BOOTS());
+		$this->map1to1Item(Ids::GOLDEN_CARROT, Items::GOLDEN_CARROT());
+		$this->map1to1Item(Ids::GOLDEN_CHESTPLATE, Items::GOLDEN_CHESTPLATE());
+		$this->map1to1Item(Ids::GOLDEN_HELMET, Items::GOLDEN_HELMET());
+		$this->map1to1Item(Ids::GOLDEN_HOE, Items::GOLDEN_HOE());
+		$this->map1to1Item(Ids::GOLDEN_LEGGINGS, Items::GOLDEN_LEGGINGS());
+		$this->map1to1Item(Ids::GOLDEN_PICKAXE, Items::GOLDEN_PICKAXE());
+		$this->map1to1Item(Ids::GOLDEN_SHOVEL, Items::GOLDEN_SHOVEL());
+		$this->map1to1Item(Ids::GOLDEN_SWORD, Items::GOLDEN_SWORD());
+		$this->map1to1Item(Ids::GUNPOWDER, Items::GUNPOWDER());
+		$this->map1to1Item(Ids::HEART_OF_THE_SEA, Items::HEART_OF_THE_SEA());
+		$this->map1to1Item(Ids::HONEY_BOTTLE, Items::HONEY_BOTTLE());
+		$this->map1to1Item(Ids::HONEYCOMB, Items::HONEYCOMB());
+		$this->map1to1Item(Ids::HOST_ARMOR_TRIM_SMITHING_TEMPLATE, Items::HOST_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::ICE_BOMB, Items::ICE_BOMB());
+		$this->map1to1Item(Ids::INK_SAC, Items::INK_SAC());
+		$this->map1to1Item(Ids::IRON_AXE, Items::IRON_AXE());
+		$this->map1to1Item(Ids::IRON_BOOTS, Items::IRON_BOOTS());
+		$this->map1to1Item(Ids::IRON_CHESTPLATE, Items::IRON_CHESTPLATE());
+		$this->map1to1Item(Ids::IRON_HELMET, Items::IRON_HELMET());
+		$this->map1to1Item(Ids::IRON_HOE, Items::IRON_HOE());
+		$this->map1to1Item(Ids::IRON_INGOT, Items::IRON_INGOT());
+		$this->map1to1Item(Ids::IRON_LEGGINGS, Items::IRON_LEGGINGS());
+		$this->map1to1Item(Ids::IRON_NUGGET, Items::IRON_NUGGET());
+		$this->map1to1Item(Ids::IRON_PICKAXE, Items::IRON_PICKAXE());
+		$this->map1to1Item(Ids::IRON_SHOVEL, Items::IRON_SHOVEL());
+		$this->map1to1Item(Ids::IRON_SWORD, Items::IRON_SWORD());
+		$this->map1to1Item(Ids::JUNGLE_BOAT, Items::JUNGLE_BOAT());
+		$this->map1to1Item(Ids::JUNGLE_SIGN, Items::JUNGLE_SIGN());
+		$this->map1to1Item(Ids::LAPIS_LAZULI, Items::LAPIS_LAZULI());
+		$this->map1to1Item(Ids::LAVA_BUCKET, Items::LAVA_BUCKET());
+		$this->map1to1Item(Ids::LEATHER, Items::LEATHER());
+		$this->map1to1Item(Ids::LEATHER_BOOTS, Items::LEATHER_BOOTS());
+		$this->map1to1Item(Ids::LEATHER_CHESTPLATE, Items::LEATHER_TUNIC());
+		$this->map1to1Item(Ids::LEATHER_HELMET, Items::LEATHER_CAP());
+		$this->map1to1Item(Ids::LEATHER_LEGGINGS, Items::LEATHER_PANTS());
+		$this->map1to1Item(Ids::MAGMA_CREAM, Items::MAGMA_CREAM());
+		$this->map1to1Item(Ids::MANGROVE_BOAT, Items::MANGROVE_BOAT());
+		$this->map1to1Item(Ids::MANGROVE_SIGN, Items::MANGROVE_SIGN());
+		$this->map1to1Item(Ids::MELON_SEEDS, Items::MELON_SEEDS());
+		$this->map1to1Item(Ids::MELON_SLICE, Items::MELON());
+		$this->map1to1Item(Ids::MILK_BUCKET, Items::MILK_BUCKET());
+		$this->map1to1Item(Ids::MINECART, Items::MINECART());
+		$this->map1to1Item(Ids::MUSHROOM_STEW, Items::MUSHROOM_STEW());
+		$this->map1to1Item(Ids::MUSIC_DISC_11, Items::RECORD_11());
+		$this->map1to1Item(Ids::MUSIC_DISC_13, Items::RECORD_13());
+		$this->map1to1Item(Ids::MUSIC_DISC_5, Items::RECORD_5());
+		$this->map1to1Item(Ids::MUSIC_DISC_BLOCKS, Items::RECORD_BLOCKS());
+		$this->map1to1Item(Ids::MUSIC_DISC_CAT, Items::RECORD_CAT());
+		$this->map1to1Item(Ids::MUSIC_DISC_CHIRP, Items::RECORD_CHIRP());
+		$this->map1to1Item(Ids::MUSIC_DISC_FAR, Items::RECORD_FAR());
+		$this->map1to1Item(Ids::MUSIC_DISC_MALL, Items::RECORD_MALL());
+		$this->map1to1Item(Ids::MUSIC_DISC_MELLOHI, Items::RECORD_MELLOHI());
+		$this->map1to1Item(Ids::MUSIC_DISC_OTHERSIDE, Items::RECORD_OTHERSIDE());
+		$this->map1to1Item(Ids::MUSIC_DISC_PIGSTEP, Items::RECORD_PIGSTEP());
+		$this->map1to1Item(Ids::MUSIC_DISC_STAL, Items::RECORD_STAL());
+		$this->map1to1Item(Ids::MUSIC_DISC_STRAD, Items::RECORD_STRAD());
+		$this->map1to1Item(Ids::MUSIC_DISC_WAIT, Items::RECORD_WAIT());
+		$this->map1to1Item(Ids::MUSIC_DISC_WARD, Items::RECORD_WARD());
+		$this->map1to1Item(Ids::MUTTON, Items::RAW_MUTTON());
+		$this->map1to1Item(Ids::NAME_TAG, Items::NAME_TAG());
+		$this->map1to1Item(Ids::NAUTILUS_SHELL, Items::NAUTILUS_SHELL());
+		$this->map1to1Item(Ids::NETHER_STAR, Items::NETHER_STAR());
+		$this->map1to1Item(Ids::NETHERBRICK, Items::NETHER_BRICK());
+		$this->map1to1Item(Ids::NETHERITE_AXE, Items::NETHERITE_AXE());
+		$this->map1to1Item(Ids::NETHERITE_BOOTS, Items::NETHERITE_BOOTS());
+		$this->map1to1Item(Ids::NETHERITE_CHESTPLATE, Items::NETHERITE_CHESTPLATE());
+		$this->map1to1Item(Ids::NETHERITE_HELMET, Items::NETHERITE_HELMET());
+		$this->map1to1Item(Ids::NETHERITE_HOE, Items::NETHERITE_HOE());
+		$this->map1to1Item(Ids::NETHERITE_INGOT, Items::NETHERITE_INGOT());
+		$this->map1to1Item(Ids::NETHERITE_LEGGINGS, Items::NETHERITE_LEGGINGS());
+		$this->map1to1Item(Ids::NETHERITE_PICKAXE, Items::NETHERITE_PICKAXE());
+		$this->map1to1Item(Ids::NETHERITE_SCRAP, Items::NETHERITE_SCRAP());
+		$this->map1to1Item(Ids::NETHERITE_SHOVEL, Items::NETHERITE_SHOVEL());
+		$this->map1to1Item(Ids::NETHERITE_SWORD, Items::NETHERITE_SWORD());
+		$this->map1to1Item(Ids::NETHERITE_UPGRADE_SMITHING_TEMPLATE, Items::NETHERITE_UPGRADE_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::OAK_BOAT, Items::OAK_BOAT());
+		$this->map1to1Item(Ids::OAK_SIGN, Items::OAK_SIGN());
+		$this->map1to1Item(Ids::PAINTING, Items::PAINTING());
+		$this->map1to1Item(Ids::PAPER, Items::PAPER());
+		$this->map1to1Item(Ids::PHANTOM_MEMBRANE, Items::PHANTOM_MEMBRANE());
+		$this->map1to1Item(Ids::PITCHER_POD, Items::PITCHER_POD());
+		$this->map1to1Item(Ids::POISONOUS_POTATO, Items::POISONOUS_POTATO());
+		$this->map1to1Item(Ids::POPPED_CHORUS_FRUIT, Items::POPPED_CHORUS_FRUIT());
+		$this->map1to1Item(Ids::PORKCHOP, Items::RAW_PORKCHOP());
+		$this->map1to1Item(Ids::POTATO, Items::POTATO());
+		$this->map1to1Item(Ids::PRISMARINE_CRYSTALS, Items::PRISMARINE_CRYSTALS());
+		$this->map1to1Item(Ids::PRISMARINE_SHARD, Items::PRISMARINE_SHARD());
+		$this->map1to1Item(Ids::PUFFERFISH, Items::PUFFERFISH());
+		$this->map1to1Item(Ids::PUMPKIN_PIE, Items::PUMPKIN_PIE());
+		$this->map1to1Item(Ids::PUMPKIN_SEEDS, Items::PUMPKIN_SEEDS());
+		$this->map1to1Item(Ids::QUARTZ, Items::NETHER_QUARTZ());
+		$this->map1to1Item(Ids::RABBIT, Items::RAW_RABBIT());
+		$this->map1to1Item(Ids::RABBIT_FOOT, Items::RABBIT_FOOT());
+		$this->map1to1Item(Ids::RABBIT_HIDE, Items::RABBIT_HIDE());
+		$this->map1to1Item(Ids::RABBIT_STEW, Items::RABBIT_STEW());
+		$this->map1to1Item(Ids::RAISER_ARMOR_TRIM_SMITHING_TEMPLATE, Items::RAISER_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::RAW_COPPER, Items::RAW_COPPER());
+		$this->map1to1Item(Ids::RAW_GOLD, Items::RAW_GOLD());
+		$this->map1to1Item(Ids::RAW_IRON, Items::RAW_IRON());
+		$this->map1to1Item(Ids::REDSTONE, Items::REDSTONE_DUST());
+		$this->map1to1Item(Ids::RIB_ARMOR_TRIM_SMITHING_TEMPLATE, Items::RIB_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::ROTTEN_FLESH, Items::ROTTEN_FLESH());
+		$this->map1to1Item(Ids::SALMON, Items::RAW_SALMON());
+		$this->map1to1Item(Ids::TURTLE_SCUTE, Items::SCUTE());
+		$this->map1to1Item(Ids::SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE, Items::SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE, Items::SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::SHEARS, Items::SHEARS());
+		$this->map1to1Item(Ids::SHULKER_SHELL, Items::SHULKER_SHELL());
+		$this->map1to1Item(Ids::SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE, Items::SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::SLIME_BALL, Items::SLIMEBALL());
+		$this->map1to1Item(Ids::SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE, Items::SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::SNOWBALL, Items::SNOWBALL());
+		$this->map1to1Item(Ids::SPIDER_EYE, Items::SPIDER_EYE());
+		$this->map1to1Item(Ids::SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE, Items::SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::SPRUCE_BOAT, Items::SPRUCE_BOAT());
+		$this->map1to1Item(Ids::SPRUCE_SIGN, Items::SPRUCE_SIGN());
+		$this->map1to1Item(Ids::SPYGLASS, Items::SPYGLASS());
+		$this->map1to1Item(Ids::SQUID_SPAWN_EGG, Items::SQUID_SPAWN_EGG());
+		$this->map1to1Item(Ids::STICK, Items::STICK());
+		$this->map1to1Item(Ids::STONE_AXE, Items::STONE_AXE());
+		$this->map1to1Item(Ids::STONE_HOE, Items::STONE_HOE());
+		$this->map1to1Item(Ids::STONE_PICKAXE, Items::STONE_PICKAXE());
+		$this->map1to1Item(Ids::STONE_SHOVEL, Items::STONE_SHOVEL());
+		$this->map1to1Item(Ids::STONE_SWORD, Items::STONE_SWORD());
+		$this->map1to1Item(Ids::STRING, Items::STRING());
+		$this->map1to1Item(Ids::SUGAR, Items::SUGAR());
+		$this->map1to1Item(Ids::SWEET_BERRIES, Items::SWEET_BERRIES());
+		$this->map1to1Item(Ids::TORCHFLOWER_SEEDS, Items::TORCHFLOWER_SEEDS());
+		$this->map1to1Item(Ids::TIDE_ARMOR_TRIM_SMITHING_TEMPLATE, Items::TIDE_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::TOTEM_OF_UNDYING, Items::TOTEM());
+		$this->map1to1Item(Ids::TROPICAL_FISH, Items::CLOWNFISH());
+		$this->map1to1Item(Ids::TURTLE_HELMET, Items::TURTLE_HELMET());
+		$this->map1to1Item(Ids::VEX_ARMOR_TRIM_SMITHING_TEMPLATE, Items::VEX_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::VILLAGER_SPAWN_EGG, Items::VILLAGER_SPAWN_EGG());
+		$this->map1to1Item(Ids::WARD_ARMOR_TRIM_SMITHING_TEMPLATE, Items::WARD_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::WARPED_SIGN, Items::WARPED_SIGN());
+		$this->map1to1Item(Ids::WATER_BUCKET, Items::WATER_BUCKET());
+		$this->map1to1Item(Ids::WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE, Items::WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::WHEAT, Items::WHEAT());
+		$this->map1to1Item(Ids::WHEAT_SEEDS, Items::WHEAT_SEEDS());
+		$this->map1to1Item(Ids::WILD_ARMOR_TRIM_SMITHING_TEMPLATE, Items::WILD_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$this->map1to1Item(Ids::WOODEN_AXE, Items::WOODEN_AXE());
+		$this->map1to1Item(Ids::WOODEN_HOE, Items::WOODEN_HOE());
+		$this->map1to1Item(Ids::WOODEN_PICKAXE, Items::WOODEN_PICKAXE());
+		$this->map1to1Item(Ids::WOODEN_SHOVEL, Items::WOODEN_SHOVEL());
+		$this->map1to1Item(Ids::WOODEN_SWORD, Items::WOODEN_SWORD());
+		$this->map1to1Item(Ids::WRITABLE_BOOK, Items::WRITABLE_BOOK());
+		$this->map1to1Item(Ids::WRITTEN_BOOK, Items::WRITTEN_BOOK());
+		$this->map1to1Item(Ids::ZOMBIE_SPAWN_EGG, Items::ZOMBIE_SPAWN_EGG());
+	}
+
+	/**
+	 * Registers mappings for item IDs which map to different PocketMine-MP item types, depending on their meta
+	 * values.
+	 * This can only be used if the target item type doesn't require any additional properties, since the items are
+	 * indexed by their base type ID.
+	 */
+	private function register1ToNItemMappings() : void{
+		$this->map1ToNItem(Ids::ARROW, [
+			0 => Items::ARROW(),
+			//TODO: tipped arrows
+		]);
+		$this->map1ToNItem(Ids::COMPOUND, [
+			CompoundTypeIds::SALT => Items::CHEMICAL_SALT(),
+			CompoundTypeIds::SODIUM_OXIDE => Items::CHEMICAL_SODIUM_OXIDE(),
+			CompoundTypeIds::SODIUM_HYDROXIDE => Items::CHEMICAL_SODIUM_HYDROXIDE(),
+			CompoundTypeIds::MAGNESIUM_NITRATE => Items::CHEMICAL_MAGNESIUM_NITRATE(),
+			CompoundTypeIds::IRON_SULPHIDE => Items::CHEMICAL_IRON_SULPHIDE(),
+			CompoundTypeIds::LITHIUM_HYDRIDE => Items::CHEMICAL_LITHIUM_HYDRIDE(),
+			CompoundTypeIds::SODIUM_HYDRIDE => Items::CHEMICAL_SODIUM_HYDRIDE(),
+			CompoundTypeIds::CALCIUM_BROMIDE => Items::CHEMICAL_CALCIUM_BROMIDE(),
+			CompoundTypeIds::MAGNESIUM_OXIDE => Items::CHEMICAL_MAGNESIUM_OXIDE(),
+			CompoundTypeIds::SODIUM_ACETATE => Items::CHEMICAL_SODIUM_ACETATE(),
+			CompoundTypeIds::LUMINOL => Items::CHEMICAL_LUMINOL(),
+			CompoundTypeIds::CHARCOAL => Items::CHEMICAL_CHARCOAL(),
+			CompoundTypeIds::SUGAR => Items::CHEMICAL_SUGAR(),
+			CompoundTypeIds::ALUMINIUM_OXIDE => Items::CHEMICAL_ALUMINIUM_OXIDE(),
+			CompoundTypeIds::BORON_TRIOXIDE => Items::CHEMICAL_BORON_TRIOXIDE(),
+			CompoundTypeIds::SOAP => Items::CHEMICAL_SOAP(),
+			CompoundTypeIds::POLYETHYLENE => Items::CHEMICAL_POLYETHYLENE(),
+			CompoundTypeIds::RUBBISH => Items::CHEMICAL_RUBBISH(),
+			CompoundTypeIds::MAGNESIUM_SALTS => Items::CHEMICAL_MAGNESIUM_SALTS(),
+			CompoundTypeIds::SULPHATE => Items::CHEMICAL_SULPHATE(),
+			CompoundTypeIds::BARIUM_SULPHATE => Items::CHEMICAL_BARIUM_SULPHATE(),
+			CompoundTypeIds::POTASSIUM_CHLORIDE => Items::CHEMICAL_POTASSIUM_CHLORIDE(),
+			CompoundTypeIds::MERCURIC_CHLORIDE => Items::CHEMICAL_MERCURIC_CHLORIDE(),
+			CompoundTypeIds::CERIUM_CHLORIDE => Items::CHEMICAL_CERIUM_CHLORIDE(),
+			CompoundTypeIds::TUNGSTEN_CHLORIDE => Items::CHEMICAL_TUNGSTEN_CHLORIDE(),
+			CompoundTypeIds::CALCIUM_CHLORIDE => Items::CHEMICAL_CALCIUM_CHLORIDE(),
+			CompoundTypeIds::WATER => Items::CHEMICAL_WATER(),
+			CompoundTypeIds::GLUE => Items::CHEMICAL_GLUE(),
+			CompoundTypeIds::HYPOCHLORITE => Items::CHEMICAL_HYPOCHLORITE(),
+			CompoundTypeIds::CRUDE_OIL => Items::CHEMICAL_CRUDE_OIL(),
+			CompoundTypeIds::LATEX => Items::CHEMICAL_LATEX(),
+			CompoundTypeIds::POTASSIUM_IODIDE => Items::CHEMICAL_POTASSIUM_IODIDE(),
+			CompoundTypeIds::SODIUM_FLUORIDE => Items::CHEMICAL_SODIUM_FLUORIDE(),
+			CompoundTypeIds::BENZENE => Items::CHEMICAL_BENZENE(),
+			CompoundTypeIds::INK => Items::CHEMICAL_INK(),
+			CompoundTypeIds::HYDROGEN_PEROXIDE => Items::CHEMICAL_HYDROGEN_PEROXIDE(),
+			CompoundTypeIds::AMMONIA => Items::CHEMICAL_AMMONIA(),
+			CompoundTypeIds::SODIUM_HYPOCHLORITE => Items::CHEMICAL_SODIUM_HYPOCHLORITE(),
+		]);
+	}
+
+	/**
+	 * Registers mappings for item IDs which map to single blockitems, and have meta values that alter their properties.
+	 * TODO: try and make this less ugly; for the most part the logic is symmetrical, it's just difficult to write it
+	 * in a unified manner.
+	 */
+	private function register1to1BlockWithMetaMappings() : void{
+		$this->map1to1BlockWithMeta(
+			Ids::BED,
+			Blocks::BED(),
+			function(Bed $block, int $meta) : void{
+				$block->setColor(DyeColorIdMap::getInstance()->fromId($meta) ?? throw new ItemTypeDeserializeException("Unknown bed color ID $meta"));
+			},
+			fn(Bed $block) => DyeColorIdMap::getInstance()->toId($block->getColor())
+		);
+	}
+
+	/**
+	 * Registers mappings for item IDs which map to single items, and have meta values that alter their properties.
+	 * TODO: try and make this less ugly; for the most part the logic is symmetrical, it's just difficult to write it
+	 * in a unified manner.
+	 */
+	private function register1to1ItemWithMetaMappings() : void{
+		$this->map1to1ItemWithMeta(
+			Ids::BANNER,
+			Items::BANNER(),
+			function(Banner $item, int $meta) : void{
+				$item->setColor(DyeColorIdMap::getInstance()->fromInvertedId($meta) ?? throw new ItemTypeDeserializeException("Unknown banner meta $meta"));
+			},
+			fn(Banner $item) => DyeColorIdMap::getInstance()->toInvertedId($item->getColor())
+		);
+		$this->map1to1ItemWithMeta(
+			Ids::GOAT_HORN,
+			Items::GOAT_HORN(),
+			function(GoatHorn $item, int $meta) : void{
+				$item->setHornType(GoatHornTypeIdMap::getInstance()->fromId($meta) ?? throw new ItemTypeDeserializeException("Unknown goat horn type ID $meta"));
+			},
+			fn(GoatHorn $item) => GoatHornTypeIdMap::getInstance()->toId($item->getHornType())
+		);
+		$this->map1to1ItemWithMeta(
+			Ids::MEDICINE,
+			Items::MEDICINE(),
+			function(Medicine $item, int $meta) : void{
+				$item->setType(MedicineTypeIdMap::getInstance()->fromId($meta) ?? throw new ItemTypeDeserializeException("Unknown medicine type ID $meta"));
+			},
+			fn(Medicine $item) => MedicineTypeIdMap::getInstance()->toId($item->getType())
+		);
+		$this->map1to1ItemWithMeta(
+			Ids::POTION,
+			Items::POTION(),
+			function(Potion $item, int $meta) : void{
+				$item->setType(PotionTypeIdMap::getInstance()->fromId($meta) ?? throw new ItemTypeDeserializeException("Unknown potion type ID $meta"));
+			},
+			fn(Potion $item) => PotionTypeIdMap::getInstance()->toId($item->getType())
+		);
+		$this->map1to1ItemWithMeta(
+			Ids::SPLASH_POTION,
+			Items::SPLASH_POTION(),
+			function(SplashPotion $item, int $meta) : void{
+				$item->setType(PotionTypeIdMap::getInstance()->fromId($meta) ?? throw new ItemTypeDeserializeException("Unknown potion type ID $meta"));
+			},
+			fn(SplashPotion $item) => PotionTypeIdMap::getInstance()->toId($item->getType())
+		);
+		$this->map1to1ItemWithMeta(
+			Ids::SUSPICIOUS_STEW,
+			Items::SUSPICIOUS_STEW(),
+			function(SuspiciousStew $item, int $meta) : void{
+				$item->setType(SuspiciousStewTypeIdMap::getInstance()->fromId($meta) ?? throw new ItemTypeDeserializeException("Unknown suspicious stew type ID $meta"));
+			},
+			fn(SuspiciousStew $item) => SuspiciousStewTypeIdMap::getInstance()->toId($item->getType())
+		);
+	}
+
+	/**
+	 * Registers serializers and deserializers for items that don't fit any other pattern.
+	 * Ideally we want to get rid of this completely, if possible.
+	 *
+	 * Most of these are single PocketMine-MP items which map to multiple IDs depending on their properties, which is
+	 * complex to implement in a generic way.
+	 */
+	private function registerMiscItemMappings() : void{
+		foreach(DyeColor::cases() as $color){
+			$id = DyeColorIdMap::getInstance()->toItemId($color);
+			$this->deserializer?->map($id, fn() => Items::DYE()->setColor($color));
+		}
+		$this->serializer?->map(Items::DYE(), fn(Dye $item) => new Data(DyeColorIdMap::getInstance()->toItemId($item->getColor())));
+	}
+
+	/**
+	 * Registers serializers and deserializers for PocketMine-MP blockitems that don't fit any other pattern.
+	 * Ideally we want to get rid of this completely, if possible.
+	 *
+	 * Most of these are single PocketMine-MP blocks which map to multiple IDs depending on their properties, which is
+	 * complex to implement in a generic way.
+	 */
+	private function registerMiscBlockMappings() : void{
+		$copperDoorStateIdMap = [];
+		foreach ([
+			[Ids::COPPER_DOOR, CopperOxidation::NONE, false],
+			[Ids::EXPOSED_COPPER_DOOR, CopperOxidation::EXPOSED, false],
+			[Ids::WEATHERED_COPPER_DOOR, CopperOxidation::WEATHERED, false],
+			[Ids::OXIDIZED_COPPER_DOOR, CopperOxidation::OXIDIZED, false],
+			[Ids::WAXED_COPPER_DOOR, CopperOxidation::NONE, true],
+			[Ids::WAXED_EXPOSED_COPPER_DOOR, CopperOxidation::EXPOSED, true],
+			[Ids::WAXED_WEATHERED_COPPER_DOOR, CopperOxidation::WEATHERED, true],
+			[Ids::WAXED_OXIDIZED_COPPER_DOOR, CopperOxidation::OXIDIZED, true]
+		] as [$id, $oxidation, $waxed]) {
+			$copperDoorStateIdMap[$oxidation->value][$waxed ? 1 : 0] = $id;
+			$this->deserializer?->mapBlock($id, fn() => Blocks::COPPER_DOOR()->setOxidation($oxidation)->setWaxed($waxed));
+		}
+		$this->serializer?->mapBlock(Blocks::COPPER_DOOR(), fn(CopperDoor $block) => new Data($copperDoorStateIdMap[$block->getOxidation()->value][$block->isWaxed() ? 1 : 0]));
+	}
+}
diff --git a/src/block/utils/InvalidBlockStateException.php b/src/data/bedrock/item/ItemTypeDeserializeException.php
similarity index 87%
rename from src/block/utils/InvalidBlockStateException.php
rename to src/data/bedrock/item/ItemTypeDeserializeException.php
index f425813401..53ae790530 100644
--- a/src/block/utils/InvalidBlockStateException.php
+++ b/src/data/bedrock/item/ItemTypeDeserializeException.php
@@ -21,8 +21,8 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\block\utils;
+namespace pocketmine\data\bedrock\item;
 
-class InvalidBlockStateException extends \UnexpectedValueException{
+class ItemTypeDeserializeException extends \RuntimeException{
 
 }
diff --git a/src/data/bedrock/item/ItemTypeNames.php b/src/data/bedrock/item/ItemTypeNames.php
new file mode 100644
index 0000000000..03b32d4826
--- /dev/null
+++ b/src/data/bedrock/item/ItemTypeNames.php
@@ -0,0 +1,581 @@
+<?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\item;
+
+/**
+ * This class is generated automatically from the item type dictionary for the current version. Do not edit it manually.
+ */
+final class ItemTypeNames{
+	public const ACACIA_BOAT = "minecraft:acacia_boat";
+	public const ACACIA_CHEST_BOAT = "minecraft:acacia_chest_boat";
+	public const ACACIA_DOOR = "minecraft:acacia_door";
+	public const ACACIA_HANGING_SIGN = "minecraft:acacia_hanging_sign";
+	public const ACACIA_SIGN = "minecraft:acacia_sign";
+	public const AGENT_SPAWN_EGG = "minecraft:agent_spawn_egg";
+	public const ALLAY_SPAWN_EGG = "minecraft:allay_spawn_egg";
+	public const AMETHYST_SHARD = "minecraft:amethyst_shard";
+	public const ANGLER_POTTERY_SHERD = "minecraft:angler_pottery_sherd";
+	public const APPLE = "minecraft:apple";
+	public const ARCHER_POTTERY_SHERD = "minecraft:archer_pottery_sherd";
+	public const ARMADILLO_SCUTE = "minecraft:armadillo_scute";
+	public const ARMADILLO_SPAWN_EGG = "minecraft:armadillo_spawn_egg";
+	public const ARMOR_STAND = "minecraft:armor_stand";
+	public const ARMS_UP_POTTERY_SHERD = "minecraft:arms_up_pottery_sherd";
+	public const ARROW = "minecraft:arrow";
+	public const AXOLOTL_BUCKET = "minecraft:axolotl_bucket";
+	public const AXOLOTL_SPAWN_EGG = "minecraft:axolotl_spawn_egg";
+	public const BAKED_POTATO = "minecraft:baked_potato";
+	public const BALLOON = "minecraft:balloon";
+	public const BAMBOO_CHEST_RAFT = "minecraft:bamboo_chest_raft";
+	public const BAMBOO_DOOR = "minecraft:bamboo_door";
+	public const BAMBOO_HANGING_SIGN = "minecraft:bamboo_hanging_sign";
+	public const BAMBOO_RAFT = "minecraft:bamboo_raft";
+	public const BAMBOO_SIGN = "minecraft:bamboo_sign";
+	public const BANNER = "minecraft:banner";
+	public const BANNER_PATTERN = "minecraft:banner_pattern";
+	public const BAT_SPAWN_EGG = "minecraft:bat_spawn_egg";
+	public const BED = "minecraft:bed";
+	public const BEE_SPAWN_EGG = "minecraft:bee_spawn_egg";
+	public const BEEF = "minecraft:beef";
+	public const BEETROOT = "minecraft:beetroot";
+	public const BEETROOT_SEEDS = "minecraft:beetroot_seeds";
+	public const BEETROOT_SOUP = "minecraft:beetroot_soup";
+	public const BIRCH_BOAT = "minecraft:birch_boat";
+	public const BIRCH_CHEST_BOAT = "minecraft:birch_chest_boat";
+	public const BIRCH_DOOR = "minecraft:birch_door";
+	public const BIRCH_HANGING_SIGN = "minecraft:birch_hanging_sign";
+	public const BIRCH_SIGN = "minecraft:birch_sign";
+	public const BLACK_BUNDLE = "minecraft:black_bundle";
+	public const BLACK_DYE = "minecraft:black_dye";
+	public const BLADE_POTTERY_SHERD = "minecraft:blade_pottery_sherd";
+	public const BLAZE_POWDER = "minecraft:blaze_powder";
+	public const BLAZE_ROD = "minecraft:blaze_rod";
+	public const BLAZE_SPAWN_EGG = "minecraft:blaze_spawn_egg";
+	public const BLEACH = "minecraft:bleach";
+	public const BLUE_BUNDLE = "minecraft:blue_bundle";
+	public const BLUE_DYE = "minecraft:blue_dye";
+	public const BOAT = "minecraft:boat";
+	public const BOGGED_SPAWN_EGG = "minecraft:bogged_spawn_egg";
+	public const BOLT_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:bolt_armor_trim_smithing_template";
+	public const BONE = "minecraft:bone";
+	public const BONE_MEAL = "minecraft:bone_meal";
+	public const BOOK = "minecraft:book";
+	public const BORDURE_INDENTED_BANNER_PATTERN = "minecraft:bordure_indented_banner_pattern";
+	public const BOW = "minecraft:bow";
+	public const BOWL = "minecraft:bowl";
+	public const BREAD = "minecraft:bread";
+	public const BREEZE_ROD = "minecraft:breeze_rod";
+	public const BREEZE_SPAWN_EGG = "minecraft:breeze_spawn_egg";
+	public const BREWER_POTTERY_SHERD = "minecraft:brewer_pottery_sherd";
+	public const BREWING_STAND = "minecraft:brewing_stand";
+	public const BRICK = "minecraft:brick";
+	public const BROWN_BUNDLE = "minecraft:brown_bundle";
+	public const BROWN_DYE = "minecraft:brown_dye";
+	public const BRUSH = "minecraft:brush";
+	public const BUCKET = "minecraft:bucket";
+	public const BUNDLE = "minecraft:bundle";
+	public const BURN_POTTERY_SHERD = "minecraft:burn_pottery_sherd";
+	public const CAKE = "minecraft:cake";
+	public const CAMEL_SPAWN_EGG = "minecraft:camel_spawn_egg";
+	public const CAMERA = "minecraft:camera";
+	public const CAMPFIRE = "minecraft:campfire";
+	public const CARPET = "minecraft:carpet";
+	public const CARROT = "minecraft:carrot";
+	public const CARROT_ON_A_STICK = "minecraft:carrot_on_a_stick";
+	public const CAT_SPAWN_EGG = "minecraft:cat_spawn_egg";
+	public const CAULDRON = "minecraft:cauldron";
+	public const CAVE_SPIDER_SPAWN_EGG = "minecraft:cave_spider_spawn_egg";
+	public const CHAIN = "minecraft:chain";
+	public const CHAINMAIL_BOOTS = "minecraft:chainmail_boots";
+	public const CHAINMAIL_CHESTPLATE = "minecraft:chainmail_chestplate";
+	public const CHAINMAIL_HELMET = "minecraft:chainmail_helmet";
+	public const CHAINMAIL_LEGGINGS = "minecraft:chainmail_leggings";
+	public const CHARCOAL = "minecraft:charcoal";
+	public const CHEMISTRY_TABLE = "minecraft:chemistry_table";
+	public const CHERRY_BOAT = "minecraft:cherry_boat";
+	public const CHERRY_CHEST_BOAT = "minecraft:cherry_chest_boat";
+	public const CHERRY_DOOR = "minecraft:cherry_door";
+	public const CHERRY_HANGING_SIGN = "minecraft:cherry_hanging_sign";
+	public const CHERRY_SIGN = "minecraft:cherry_sign";
+	public const CHEST_BOAT = "minecraft:chest_boat";
+	public const CHEST_MINECART = "minecraft:chest_minecart";
+	public const CHICKEN = "minecraft:chicken";
+	public const CHICKEN_SPAWN_EGG = "minecraft:chicken_spawn_egg";
+	public const CHORUS_FRUIT = "minecraft:chorus_fruit";
+	public const CLAY_BALL = "minecraft:clay_ball";
+	public const CLOCK = "minecraft:clock";
+	public const COAL = "minecraft:coal";
+	public const COAST_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:coast_armor_trim_smithing_template";
+	public const COCOA_BEANS = "minecraft:cocoa_beans";
+	public const COD = "minecraft:cod";
+	public const COD_BUCKET = "minecraft:cod_bucket";
+	public const COD_SPAWN_EGG = "minecraft:cod_spawn_egg";
+	public const COLORED_TORCH_BP = "minecraft:colored_torch_bp";
+	public const COLORED_TORCH_RG = "minecraft:colored_torch_rg";
+	public const COMMAND_BLOCK_MINECART = "minecraft:command_block_minecart";
+	public const COMPARATOR = "minecraft:comparator";
+	public const COMPASS = "minecraft:compass";
+	public const COMPOUND = "minecraft:compound";
+	public const CONCRETE = "minecraft:concrete";
+	public const CONCRETE_POWDER = "minecraft:concrete_powder";
+	public const COOKED_BEEF = "minecraft:cooked_beef";
+	public const COOKED_CHICKEN = "minecraft:cooked_chicken";
+	public const COOKED_COD = "minecraft:cooked_cod";
+	public const COOKED_MUTTON = "minecraft:cooked_mutton";
+	public const COOKED_PORKCHOP = "minecraft:cooked_porkchop";
+	public const COOKED_RABBIT = "minecraft:cooked_rabbit";
+	public const COOKED_SALMON = "minecraft:cooked_salmon";
+	public const COOKIE = "minecraft:cookie";
+	public const COPPER_DOOR = "minecraft:copper_door";
+	public const COPPER_INGOT = "minecraft:copper_ingot";
+	public const CORAL = "minecraft:coral";
+	public const CORAL_BLOCK = "minecraft:coral_block";
+	public const CORAL_FAN = "minecraft:coral_fan";
+	public const CORAL_FAN_DEAD = "minecraft:coral_fan_dead";
+	public const COW_SPAWN_EGG = "minecraft:cow_spawn_egg";
+	public const CREEPER_BANNER_PATTERN = "minecraft:creeper_banner_pattern";
+	public const CREEPER_SPAWN_EGG = "minecraft:creeper_spawn_egg";
+	public const CRIMSON_DOOR = "minecraft:crimson_door";
+	public const CRIMSON_HANGING_SIGN = "minecraft:crimson_hanging_sign";
+	public const CRIMSON_SIGN = "minecraft:crimson_sign";
+	public const CROSSBOW = "minecraft:crossbow";
+	public const CYAN_BUNDLE = "minecraft:cyan_bundle";
+	public const CYAN_DYE = "minecraft:cyan_dye";
+	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";
+	public const DARK_OAK_DOOR = "minecraft:dark_oak_door";
+	public const DARK_OAK_HANGING_SIGN = "minecraft:dark_oak_hanging_sign";
+	public const DARK_OAK_SIGN = "minecraft:dark_oak_sign";
+	public const DEBUG_STICK = "minecraft:debug_stick";
+	public const DIAMOND = "minecraft:diamond";
+	public const DIAMOND_AXE = "minecraft:diamond_axe";
+	public const DIAMOND_BOOTS = "minecraft:diamond_boots";
+	public const DIAMOND_CHESTPLATE = "minecraft:diamond_chestplate";
+	public const DIAMOND_HELMET = "minecraft:diamond_helmet";
+	public const DIAMOND_HOE = "minecraft:diamond_hoe";
+	public const DIAMOND_HORSE_ARMOR = "minecraft:diamond_horse_armor";
+	public const DIAMOND_LEGGINGS = "minecraft:diamond_leggings";
+	public const DIAMOND_PICKAXE = "minecraft:diamond_pickaxe";
+	public const DIAMOND_SHOVEL = "minecraft:diamond_shovel";
+	public const DIAMOND_SWORD = "minecraft:diamond_sword";
+	public const DISC_FRAGMENT_5 = "minecraft:disc_fragment_5";
+	public const DOLPHIN_SPAWN_EGG = "minecraft:dolphin_spawn_egg";
+	public const DONKEY_SPAWN_EGG = "minecraft:donkey_spawn_egg";
+	public const DOUBLE_PLANT = "minecraft:double_plant";
+	public const DOUBLE_STONE_BLOCK_SLAB = "minecraft:double_stone_block_slab";
+	public const DOUBLE_STONE_BLOCK_SLAB2 = "minecraft:double_stone_block_slab2";
+	public const DOUBLE_STONE_BLOCK_SLAB3 = "minecraft:double_stone_block_slab3";
+	public const DOUBLE_STONE_BLOCK_SLAB4 = "minecraft:double_stone_block_slab4";
+	public const DRAGON_BREATH = "minecraft:dragon_breath";
+	public const DRIED_KELP = "minecraft:dried_kelp";
+	public const DROWNED_SPAWN_EGG = "minecraft:drowned_spawn_egg";
+	public const DUNE_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:dune_armor_trim_smithing_template";
+	public const DYE = "minecraft:dye";
+	public const ECHO_SHARD = "minecraft:echo_shard";
+	public const EGG = "minecraft:egg";
+	public const ELDER_GUARDIAN_SPAWN_EGG = "minecraft:elder_guardian_spawn_egg";
+	public const ELYTRA = "minecraft:elytra";
+	public const EMERALD = "minecraft:emerald";
+	public const EMPTY_MAP = "minecraft:empty_map";
+	public const ENCHANTED_BOOK = "minecraft:enchanted_book";
+	public const ENCHANTED_GOLDEN_APPLE = "minecraft:enchanted_golden_apple";
+	public const END_CRYSTAL = "minecraft:end_crystal";
+	public const ENDER_DRAGON_SPAWN_EGG = "minecraft:ender_dragon_spawn_egg";
+	public const ENDER_EYE = "minecraft:ender_eye";
+	public const ENDER_PEARL = "minecraft:ender_pearl";
+	public const ENDERMAN_SPAWN_EGG = "minecraft:enderman_spawn_egg";
+	public const ENDERMITE_SPAWN_EGG = "minecraft:endermite_spawn_egg";
+	public const EVOKER_SPAWN_EGG = "minecraft:evoker_spawn_egg";
+	public const EXPERIENCE_BOTTLE = "minecraft:experience_bottle";
+	public const EXPLORER_POTTERY_SHERD = "minecraft:explorer_pottery_sherd";
+	public const EXPOSED_COPPER_DOOR = "minecraft:exposed_copper_door";
+	public const EYE_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:eye_armor_trim_smithing_template";
+	public const FEATHER = "minecraft:feather";
+	public const FENCE = "minecraft:fence";
+	public const FERMENTED_SPIDER_EYE = "minecraft:fermented_spider_eye";
+	public const FIELD_MASONED_BANNER_PATTERN = "minecraft:field_masoned_banner_pattern";
+	public const FILLED_MAP = "minecraft:filled_map";
+	public const FIRE_CHARGE = "minecraft:fire_charge";
+	public const FIREWORK_ROCKET = "minecraft:firework_rocket";
+	public const FIREWORK_STAR = "minecraft:firework_star";
+	public const FISHING_ROD = "minecraft:fishing_rod";
+	public const FLINT = "minecraft:flint";
+	public const FLINT_AND_STEEL = "minecraft:flint_and_steel";
+	public const FLOW_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:flow_armor_trim_smithing_template";
+	public const FLOW_BANNER_PATTERN = "minecraft:flow_banner_pattern";
+	public const FLOW_POTTERY_SHERD = "minecraft:flow_pottery_sherd";
+	public const FLOWER_BANNER_PATTERN = "minecraft:flower_banner_pattern";
+	public const FLOWER_POT = "minecraft:flower_pot";
+	public const FOX_SPAWN_EGG = "minecraft:fox_spawn_egg";
+	public const FRAME = "minecraft:frame";
+	public const FRIEND_POTTERY_SHERD = "minecraft:friend_pottery_sherd";
+	public const FROG_SPAWN_EGG = "minecraft:frog_spawn_egg";
+	public const GHAST_SPAWN_EGG = "minecraft:ghast_spawn_egg";
+	public const GHAST_TEAR = "minecraft:ghast_tear";
+	public const GLASS_BOTTLE = "minecraft:glass_bottle";
+	public const GLISTERING_MELON_SLICE = "minecraft:glistering_melon_slice";
+	public const GLOBE_BANNER_PATTERN = "minecraft:globe_banner_pattern";
+	public const GLOW_BERRIES = "minecraft:glow_berries";
+	public const GLOW_FRAME = "minecraft:glow_frame";
+	public const GLOW_INK_SAC = "minecraft:glow_ink_sac";
+	public const GLOW_SQUID_SPAWN_EGG = "minecraft:glow_squid_spawn_egg";
+	public const GLOW_STICK = "minecraft:glow_stick";
+	public const GLOWSTONE_DUST = "minecraft:glowstone_dust";
+	public const GOAT_HORN = "minecraft:goat_horn";
+	public const GOAT_SPAWN_EGG = "minecraft:goat_spawn_egg";
+	public const GOLD_INGOT = "minecraft:gold_ingot";
+	public const GOLD_NUGGET = "minecraft:gold_nugget";
+	public const GOLDEN_APPLE = "minecraft:golden_apple";
+	public const GOLDEN_AXE = "minecraft:golden_axe";
+	public const GOLDEN_BOOTS = "minecraft:golden_boots";
+	public const GOLDEN_CARROT = "minecraft:golden_carrot";
+	public const GOLDEN_CHESTPLATE = "minecraft:golden_chestplate";
+	public const GOLDEN_HELMET = "minecraft:golden_helmet";
+	public const GOLDEN_HOE = "minecraft:golden_hoe";
+	public const GOLDEN_HORSE_ARMOR = "minecraft:golden_horse_armor";
+	public const GOLDEN_LEGGINGS = "minecraft:golden_leggings";
+	public const GOLDEN_PICKAXE = "minecraft:golden_pickaxe";
+	public const GOLDEN_SHOVEL = "minecraft:golden_shovel";
+	public const GOLDEN_SWORD = "minecraft:golden_sword";
+	public const GRAY_BUNDLE = "minecraft:gray_bundle";
+	public const GRAY_DYE = "minecraft:gray_dye";
+	public const GREEN_BUNDLE = "minecraft:green_bundle";
+	public const GREEN_DYE = "minecraft:green_dye";
+	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 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";
+	public const HEART_POTTERY_SHERD = "minecraft:heart_pottery_sherd";
+	public const HEARTBREAK_POTTERY_SHERD = "minecraft:heartbreak_pottery_sherd";
+	public const HOGLIN_SPAWN_EGG = "minecraft:hoglin_spawn_egg";
+	public const HONEY_BOTTLE = "minecraft:honey_bottle";
+	public const HONEYCOMB = "minecraft:honeycomb";
+	public const HOPPER = "minecraft:hopper";
+	public const HOPPER_MINECART = "minecraft:hopper_minecart";
+	public const HORSE_SPAWN_EGG = "minecraft:horse_spawn_egg";
+	public const HOST_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:host_armor_trim_smithing_template";
+	public const HOWL_POTTERY_SHERD = "minecraft:howl_pottery_sherd";
+	public const HUSK_SPAWN_EGG = "minecraft:husk_spawn_egg";
+	public const ICE_BOMB = "minecraft:ice_bomb";
+	public const INK_SAC = "minecraft:ink_sac";
+	public const IRON_AXE = "minecraft:iron_axe";
+	public const IRON_BOOTS = "minecraft:iron_boots";
+	public const IRON_CHESTPLATE = "minecraft:iron_chestplate";
+	public const IRON_DOOR = "minecraft:iron_door";
+	public const IRON_GOLEM_SPAWN_EGG = "minecraft:iron_golem_spawn_egg";
+	public const IRON_HELMET = "minecraft:iron_helmet";
+	public const IRON_HOE = "minecraft:iron_hoe";
+	public const IRON_HORSE_ARMOR = "minecraft:iron_horse_armor";
+	public const IRON_INGOT = "minecraft:iron_ingot";
+	public const IRON_LEGGINGS = "minecraft:iron_leggings";
+	public const IRON_NUGGET = "minecraft:iron_nugget";
+	public const IRON_PICKAXE = "minecraft:iron_pickaxe";
+	public const IRON_SHOVEL = "minecraft:iron_shovel";
+	public const IRON_SWORD = "minecraft:iron_sword";
+	public const JUNGLE_BOAT = "minecraft:jungle_boat";
+	public const JUNGLE_CHEST_BOAT = "minecraft:jungle_chest_boat";
+	public const JUNGLE_DOOR = "minecraft:jungle_door";
+	public const JUNGLE_HANGING_SIGN = "minecraft:jungle_hanging_sign";
+	public const JUNGLE_SIGN = "minecraft:jungle_sign";
+	public const KELP = "minecraft:kelp";
+	public const LAPIS_LAZULI = "minecraft:lapis_lazuli";
+	public const LAVA_BUCKET = "minecraft:lava_bucket";
+	public const LEAD = "minecraft:lead";
+	public const LEATHER = "minecraft:leather";
+	public const LEATHER_BOOTS = "minecraft:leather_boots";
+	public const LEATHER_CHESTPLATE = "minecraft:leather_chestplate";
+	public const LEATHER_HELMET = "minecraft:leather_helmet";
+	public const LEATHER_HORSE_ARMOR = "minecraft:leather_horse_armor";
+	public const LEATHER_LEGGINGS = "minecraft:leather_leggings";
+	public const LEAVES = "minecraft:leaves";
+	public const LEAVES2 = "minecraft:leaves2";
+	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_GRAY_BUNDLE = "minecraft:light_gray_bundle";
+	public const LIGHT_GRAY_DYE = "minecraft:light_gray_dye";
+	public const LIME_BUNDLE = "minecraft:lime_bundle";
+	public const LIME_DYE = "minecraft:lime_dye";
+	public const LINGERING_POTION = "minecraft:lingering_potion";
+	public const LLAMA_SPAWN_EGG = "minecraft:llama_spawn_egg";
+	public const LODESTONE_COMPASS = "minecraft:lodestone_compass";
+	public const LOG = "minecraft:log";
+	public const LOG2 = "minecraft:log2";
+	public const MACE = "minecraft:mace";
+	public const MAGENTA_BUNDLE = "minecraft:magenta_bundle";
+	public const MAGENTA_DYE = "minecraft:magenta_dye";
+	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";
+	public const MANGROVE_CHEST_BOAT = "minecraft:mangrove_chest_boat";
+	public const MANGROVE_DOOR = "minecraft:mangrove_door";
+	public const MANGROVE_HANGING_SIGN = "minecraft:mangrove_hanging_sign";
+	public const MANGROVE_SIGN = "minecraft:mangrove_sign";
+	public const MEDICINE = "minecraft:medicine";
+	public const MELON_SEEDS = "minecraft:melon_seeds";
+	public const MELON_SLICE = "minecraft:melon_slice";
+	public const MILK_BUCKET = "minecraft:milk_bucket";
+	public const MINECART = "minecraft:minecart";
+	public const MINER_POTTERY_SHERD = "minecraft:miner_pottery_sherd";
+	public const MOJANG_BANNER_PATTERN = "minecraft:mojang_banner_pattern";
+	public const MONSTER_EGG = "minecraft:monster_egg";
+	public const MOOSHROOM_SPAWN_EGG = "minecraft:mooshroom_spawn_egg";
+	public const MOURNER_POTTERY_SHERD = "minecraft:mourner_pottery_sherd";
+	public const MULE_SPAWN_EGG = "minecraft:mule_spawn_egg";
+	public const MUSHROOM_STEW = "minecraft:mushroom_stew";
+	public const MUSIC_DISC_11 = "minecraft:music_disc_11";
+	public const MUSIC_DISC_13 = "minecraft:music_disc_13";
+	public const MUSIC_DISC_5 = "minecraft:music_disc_5";
+	public const MUSIC_DISC_BLOCKS = "minecraft:music_disc_blocks";
+	public const MUSIC_DISC_CAT = "minecraft:music_disc_cat";
+	public const MUSIC_DISC_CHIRP = "minecraft:music_disc_chirp";
+	public const MUSIC_DISC_CREATOR = "minecraft:music_disc_creator";
+	public const MUSIC_DISC_CREATOR_MUSIC_BOX = "minecraft:music_disc_creator_music_box";
+	public const MUSIC_DISC_FAR = "minecraft:music_disc_far";
+	public const MUSIC_DISC_MALL = "minecraft:music_disc_mall";
+	public const MUSIC_DISC_MELLOHI = "minecraft:music_disc_mellohi";
+	public const MUSIC_DISC_OTHERSIDE = "minecraft:music_disc_otherside";
+	public const MUSIC_DISC_PIGSTEP = "minecraft:music_disc_pigstep";
+	public const MUSIC_DISC_PRECIPICE = "minecraft:music_disc_precipice";
+	public const MUSIC_DISC_RELIC = "minecraft:music_disc_relic";
+	public const MUSIC_DISC_STAL = "minecraft:music_disc_stal";
+	public const MUSIC_DISC_STRAD = "minecraft:music_disc_strad";
+	public const MUSIC_DISC_WAIT = "minecraft:music_disc_wait";
+	public const MUSIC_DISC_WARD = "minecraft:music_disc_ward";
+	public const MUTTON = "minecraft:mutton";
+	public const NAME_TAG = "minecraft:name_tag";
+	public const NAUTILUS_SHELL = "minecraft:nautilus_shell";
+	public const NETHER_SPROUTS = "minecraft:nether_sprouts";
+	public const NETHER_STAR = "minecraft:nether_star";
+	public const NETHER_WART = "minecraft:nether_wart";
+	public const NETHERBRICK = "minecraft:netherbrick";
+	public const NETHERITE_AXE = "minecraft:netherite_axe";
+	public const NETHERITE_BOOTS = "minecraft:netherite_boots";
+	public const NETHERITE_CHESTPLATE = "minecraft:netherite_chestplate";
+	public const NETHERITE_HELMET = "minecraft:netherite_helmet";
+	public const NETHERITE_HOE = "minecraft:netherite_hoe";
+	public const NETHERITE_INGOT = "minecraft:netherite_ingot";
+	public const NETHERITE_LEGGINGS = "minecraft:netherite_leggings";
+	public const NETHERITE_PICKAXE = "minecraft:netherite_pickaxe";
+	public const NETHERITE_SCRAP = "minecraft:netherite_scrap";
+	public const NETHERITE_SHOVEL = "minecraft:netherite_shovel";
+	public const NETHERITE_SWORD = "minecraft:netherite_sword";
+	public const NETHERITE_UPGRADE_SMITHING_TEMPLATE = "minecraft:netherite_upgrade_smithing_template";
+	public const NPC_SPAWN_EGG = "minecraft:npc_spawn_egg";
+	public const OAK_BOAT = "minecraft:oak_boat";
+	public const OAK_CHEST_BOAT = "minecraft:oak_chest_boat";
+	public const OAK_HANGING_SIGN = "minecraft:oak_hanging_sign";
+	public const OAK_SIGN = "minecraft:oak_sign";
+	public const OCELOT_SPAWN_EGG = "minecraft:ocelot_spawn_egg";
+	public const OMINOUS_BOTTLE = "minecraft:ominous_bottle";
+	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 OXIDIZED_COPPER_DOOR = "minecraft:oxidized_copper_door";
+	public const PAINTING = "minecraft:painting";
+	public const PANDA_SPAWN_EGG = "minecraft:panda_spawn_egg";
+	public const PAPER = "minecraft:paper";
+	public const PARROT_SPAWN_EGG = "minecraft:parrot_spawn_egg";
+	public const PHANTOM_MEMBRANE = "minecraft:phantom_membrane";
+	public const PHANTOM_SPAWN_EGG = "minecraft:phantom_spawn_egg";
+	public const PIG_SPAWN_EGG = "minecraft:pig_spawn_egg";
+	public const PIGLIN_BANNER_PATTERN = "minecraft:piglin_banner_pattern";
+	public const PIGLIN_BRUTE_SPAWN_EGG = "minecraft:piglin_brute_spawn_egg";
+	public const PIGLIN_SPAWN_EGG = "minecraft:piglin_spawn_egg";
+	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 PITCHER_POD = "minecraft:pitcher_pod";
+	public const PLANKS = "minecraft:planks";
+	public const PLENTY_POTTERY_SHERD = "minecraft:plenty_pottery_sherd";
+	public const POISONOUS_POTATO = "minecraft:poisonous_potato";
+	public const POLAR_BEAR_SPAWN_EGG = "minecraft:polar_bear_spawn_egg";
+	public const POPPED_CHORUS_FRUIT = "minecraft:popped_chorus_fruit";
+	public const PORKCHOP = "minecraft:porkchop";
+	public const POTATO = "minecraft:potato";
+	public const POTION = "minecraft:potion";
+	public const POWDER_SNOW_BUCKET = "minecraft:powder_snow_bucket";
+	public const PRISMARINE_CRYSTALS = "minecraft:prismarine_crystals";
+	public const PRISMARINE_SHARD = "minecraft:prismarine_shard";
+	public const PRIZE_POTTERY_SHERD = "minecraft:prize_pottery_sherd";
+	public const PUFFERFISH = "minecraft:pufferfish";
+	public const PUFFERFISH_BUCKET = "minecraft:pufferfish_bucket";
+	public const PUFFERFISH_SPAWN_EGG = "minecraft:pufferfish_spawn_egg";
+	public const PUMPKIN_PIE = "minecraft:pumpkin_pie";
+	public const PUMPKIN_SEEDS = "minecraft:pumpkin_seeds";
+	public const PURPLE_BUNDLE = "minecraft:purple_bundle";
+	public const PURPLE_DYE = "minecraft:purple_dye";
+	public const QUARTZ = "minecraft:quartz";
+	public const RABBIT = "minecraft:rabbit";
+	public const RABBIT_FOOT = "minecraft:rabbit_foot";
+	public const RABBIT_HIDE = "minecraft:rabbit_hide";
+	public const RABBIT_SPAWN_EGG = "minecraft:rabbit_spawn_egg";
+	public const RABBIT_STEW = "minecraft:rabbit_stew";
+	public const RAISER_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:raiser_armor_trim_smithing_template";
+	public const RAPID_FERTILIZER = "minecraft:rapid_fertilizer";
+	public const RAVAGER_SPAWN_EGG = "minecraft:ravager_spawn_egg";
+	public const RAW_COPPER = "minecraft:raw_copper";
+	public const RAW_GOLD = "minecraft:raw_gold";
+	public const RAW_IRON = "minecraft:raw_iron";
+	public const RECOVERY_COMPASS = "minecraft:recovery_compass";
+	public const RED_BUNDLE = "minecraft:red_bundle";
+	public const RED_DYE = "minecraft:red_dye";
+	public const RED_FLOWER = "minecraft:red_flower";
+	public const REDSTONE = "minecraft:redstone";
+	public const REPEATER = "minecraft:repeater";
+	public const RIB_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:rib_armor_trim_smithing_template";
+	public const ROTTEN_FLESH = "minecraft:rotten_flesh";
+	public const SADDLE = "minecraft:saddle";
+	public const SALMON = "minecraft:salmon";
+	public const SALMON_BUCKET = "minecraft:salmon_bucket";
+	public const SALMON_SPAWN_EGG = "minecraft:salmon_spawn_egg";
+	public const SAPLING = "minecraft:sapling";
+	public const SCRAPE_POTTERY_SHERD = "minecraft:scrape_pottery_sherd";
+	public const SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:sentry_armor_trim_smithing_template";
+	public const SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:shaper_armor_trim_smithing_template";
+	public const SHEAF_POTTERY_SHERD = "minecraft:sheaf_pottery_sherd";
+	public const SHEARS = "minecraft:shears";
+	public const SHEEP_SPAWN_EGG = "minecraft:sheep_spawn_egg";
+	public const SHELTER_POTTERY_SHERD = "minecraft:shelter_pottery_sherd";
+	public const SHIELD = "minecraft:shield";
+	public const SHULKER_BOX = "minecraft:shulker_box";
+	public const SHULKER_SHELL = "minecraft:shulker_shell";
+	public const SHULKER_SPAWN_EGG = "minecraft:shulker_spawn_egg";
+	public const SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:silence_armor_trim_smithing_template";
+	public const SILVERFISH_SPAWN_EGG = "minecraft:silverfish_spawn_egg";
+	public const SKELETON_HORSE_SPAWN_EGG = "minecraft:skeleton_horse_spawn_egg";
+	public const SKELETON_SPAWN_EGG = "minecraft:skeleton_spawn_egg";
+	public const SKULL = "minecraft:skull";
+	public const SKULL_BANNER_PATTERN = "minecraft:skull_banner_pattern";
+	public const SKULL_POTTERY_SHERD = "minecraft:skull_pottery_sherd";
+	public const SLIME_BALL = "minecraft:slime_ball";
+	public const SLIME_SPAWN_EGG = "minecraft:slime_spawn_egg";
+	public const SNIFFER_SPAWN_EGG = "minecraft:sniffer_spawn_egg";
+	public const SNORT_POTTERY_SHERD = "minecraft:snort_pottery_sherd";
+	public const SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:snout_armor_trim_smithing_template";
+	public const SNOW_GOLEM_SPAWN_EGG = "minecraft:snow_golem_spawn_egg";
+	public const SNOWBALL = "minecraft:snowball";
+	public const SOUL_CAMPFIRE = "minecraft:soul_campfire";
+	public const SPARKLER = "minecraft:sparkler";
+	public const SPAWN_EGG = "minecraft:spawn_egg";
+	public const SPIDER_EYE = "minecraft:spider_eye";
+	public const SPIDER_SPAWN_EGG = "minecraft:spider_spawn_egg";
+	public const SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:spire_armor_trim_smithing_template";
+	public const SPLASH_POTION = "minecraft:splash_potion";
+	public const SPRUCE_BOAT = "minecraft:spruce_boat";
+	public const SPRUCE_CHEST_BOAT = "minecraft:spruce_chest_boat";
+	public const SPRUCE_DOOR = "minecraft:spruce_door";
+	public const SPRUCE_HANGING_SIGN = "minecraft:spruce_hanging_sign";
+	public const SPRUCE_SIGN = "minecraft:spruce_sign";
+	public const SPYGLASS = "minecraft:spyglass";
+	public const SQUID_SPAWN_EGG = "minecraft:squid_spawn_egg";
+	public const STAINED_GLASS = "minecraft:stained_glass";
+	public const STAINED_GLASS_PANE = "minecraft:stained_glass_pane";
+	public const STAINED_HARDENED_CLAY = "minecraft:stained_hardened_clay";
+	public const STICK = "minecraft:stick";
+	public const STONE_AXE = "minecraft:stone_axe";
+	public const STONE_BLOCK_SLAB = "minecraft:stone_block_slab";
+	public const STONE_BLOCK_SLAB2 = "minecraft:stone_block_slab2";
+	public const STONE_BLOCK_SLAB3 = "minecraft:stone_block_slab3";
+	public const STONE_BLOCK_SLAB4 = "minecraft:stone_block_slab4";
+	public const STONE_HOE = "minecraft:stone_hoe";
+	public const STONE_PICKAXE = "minecraft:stone_pickaxe";
+	public const STONE_SHOVEL = "minecraft:stone_shovel";
+	public const STONE_SWORD = "minecraft:stone_sword";
+	public const STONEBRICK = "minecraft:stonebrick";
+	public const STRAY_SPAWN_EGG = "minecraft:stray_spawn_egg";
+	public const STRIDER_SPAWN_EGG = "minecraft:strider_spawn_egg";
+	public const STRING = "minecraft:string";
+	public const SUGAR = "minecraft:sugar";
+	public const SUGAR_CANE = "minecraft:sugar_cane";
+	public const SUSPICIOUS_STEW = "minecraft:suspicious_stew";
+	public const SWEET_BERRIES = "minecraft:sweet_berries";
+	public const TADPOLE_BUCKET = "minecraft:tadpole_bucket";
+	public const TADPOLE_SPAWN_EGG = "minecraft:tadpole_spawn_egg";
+	public const TALLGRASS = "minecraft:tallgrass";
+	public const TIDE_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:tide_armor_trim_smithing_template";
+	public const TNT_MINECART = "minecraft:tnt_minecart";
+	public const TORCHFLOWER_SEEDS = "minecraft:torchflower_seeds";
+	public const TOTEM_OF_UNDYING = "minecraft:totem_of_undying";
+	public const TRADER_LLAMA_SPAWN_EGG = "minecraft:trader_llama_spawn_egg";
+	public const TRIAL_KEY = "minecraft:trial_key";
+	public const TRIDENT = "minecraft:trident";
+	public const TROPICAL_FISH = "minecraft:tropical_fish";
+	public const TROPICAL_FISH_BUCKET = "minecraft:tropical_fish_bucket";
+	public const TROPICAL_FISH_SPAWN_EGG = "minecraft:tropical_fish_spawn_egg";
+	public const TURTLE_HELMET = "minecraft:turtle_helmet";
+	public const TURTLE_SCUTE = "minecraft:turtle_scute";
+	public const TURTLE_SPAWN_EGG = "minecraft:turtle_spawn_egg";
+	public const VEX_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:vex_armor_trim_smithing_template";
+	public const VEX_SPAWN_EGG = "minecraft:vex_spawn_egg";
+	public const VILLAGER_SPAWN_EGG = "minecraft:villager_spawn_egg";
+	public const VINDICATOR_SPAWN_EGG = "minecraft:vindicator_spawn_egg";
+	public const WANDERING_TRADER_SPAWN_EGG = "minecraft:wandering_trader_spawn_egg";
+	public const WARD_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:ward_armor_trim_smithing_template";
+	public const WARDEN_SPAWN_EGG = "minecraft:warden_spawn_egg";
+	public const WARPED_DOOR = "minecraft:warped_door";
+	public const WARPED_FUNGUS_ON_A_STICK = "minecraft:warped_fungus_on_a_stick";
+	public const WARPED_HANGING_SIGN = "minecraft:warped_hanging_sign";
+	public const WARPED_SIGN = "minecraft:warped_sign";
+	public const WATER_BUCKET = "minecraft:water_bucket";
+	public const WAXED_COPPER_DOOR = "minecraft:waxed_copper_door";
+	public const WAXED_EXPOSED_COPPER_DOOR = "minecraft:waxed_exposed_copper_door";
+	public const WAXED_OXIDIZED_COPPER_DOOR = "minecraft:waxed_oxidized_copper_door";
+	public const WAXED_WEATHERED_COPPER_DOOR = "minecraft:waxed_weathered_copper_door";
+	public const WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:wayfinder_armor_trim_smithing_template";
+	public const WEATHERED_COPPER_DOOR = "minecraft:weathered_copper_door";
+	public const WHEAT = "minecraft:wheat";
+	public const WHEAT_SEEDS = "minecraft:wheat_seeds";
+	public const WHITE_BUNDLE = "minecraft:white_bundle";
+	public const WHITE_DYE = "minecraft:white_dye";
+	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";
+	public const WITHER_SKELETON_SPAWN_EGG = "minecraft:wither_skeleton_spawn_egg";
+	public const WITHER_SPAWN_EGG = "minecraft:wither_spawn_egg";
+	public const WOLF_ARMOR = "minecraft:wolf_armor";
+	public const WOLF_SPAWN_EGG = "minecraft:wolf_spawn_egg";
+	public const WOOD = "minecraft:wood";
+	public const WOODEN_AXE = "minecraft:wooden_axe";
+	public const WOODEN_DOOR = "minecraft:wooden_door";
+	public const WOODEN_HOE = "minecraft:wooden_hoe";
+	public const WOODEN_PICKAXE = "minecraft:wooden_pickaxe";
+	public const WOODEN_SHOVEL = "minecraft:wooden_shovel";
+	public const WOODEN_SLAB = "minecraft:wooden_slab";
+	public const WOODEN_SWORD = "minecraft:wooden_sword";
+	public const WOOL = "minecraft:wool";
+	public const WRITABLE_BOOK = "minecraft:writable_book";
+	public const WRITTEN_BOOK = "minecraft:written_book";
+	public const YELLOW_BUNDLE = "minecraft:yellow_bundle";
+	public const YELLOW_DYE = "minecraft:yellow_dye";
+	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";
+	public const ZOMBIE_SPAWN_EGG = "minecraft:zombie_spawn_egg";
+	public const ZOMBIE_VILLAGER_SPAWN_EGG = "minecraft:zombie_villager_spawn_egg";
+}
diff --git a/src/data/bedrock/item/ItemTypeSerializeException.php b/src/data/bedrock/item/ItemTypeSerializeException.php
new file mode 100644
index 0000000000..152ba0e824
--- /dev/null
+++ b/src/data/bedrock/item/ItemTypeSerializeException.php
@@ -0,0 +1,28 @@
+<?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\item;
+
+final class ItemTypeSerializeException extends \LogicException{
+
+}
diff --git a/src/data/bedrock/item/SavedItemData.php b/src/data/bedrock/item/SavedItemData.php
new file mode 100644
index 0000000000..87e91732e0
--- /dev/null
+++ b/src/data/bedrock/item/SavedItemData.php
@@ -0,0 +1,67 @@
+<?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\item;
+
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\VersionInfo;
+
+final class SavedItemData{
+
+	public const TAG_NAME = "Name";
+	public const TAG_DAMAGE = "Damage";
+	public const TAG_BLOCK = "Block";
+	public const TAG_TAG = "tag";
+
+	public function __construct(
+		private string $name,
+		private int $meta = 0,
+		private ?BlockStateData $block = null,
+		private ?CompoundTag $tag = null
+	){}
+
+	public function getName() : string{ return $this->name; }
+
+	public function getMeta() : int{ return $this->meta; }
+
+	public function getBlock() : ?BlockStateData{ return $this->block; }
+
+	public function getTag() : ?CompoundTag{ return $this->tag; }
+
+	public function toNbt() : CompoundTag{
+		$result = CompoundTag::create();
+		$result->setString(self::TAG_NAME, $this->name);
+		$result->setShort(self::TAG_DAMAGE, $this->meta);
+
+		if($this->block !== null){
+			$result->setTag(self::TAG_BLOCK, $this->block->toNbt());
+		}
+		if($this->tag !== null){
+			$result->setTag(self::TAG_TAG, $this->tag);
+		}
+		$result->setLong(VersionInfo::TAG_WORLD_DATA_VERSION, VersionInfo::WORLD_DATA_VERSION);
+
+		return $result;
+	}
+}
diff --git a/src/data/bedrock/item/SavedItemStackData.php b/src/data/bedrock/item/SavedItemStackData.php
new file mode 100644
index 0000000000..b8ad648f07
--- /dev/null
+++ b/src/data/bedrock/item/SavedItemStackData.php
@@ -0,0 +1,87 @@
+<?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\item;
+
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\ListTag;
+use pocketmine\nbt\tag\StringTag;
+use pocketmine\utils\Binary;
+use function array_map;
+use function count;
+
+final class SavedItemStackData{
+
+	public const TAG_COUNT = "Count";
+	public const TAG_SLOT = "Slot";
+	public const TAG_WAS_PICKED_UP = "WasPickedUp";
+	public const TAG_CAN_PLACE_ON = "CanPlaceOn";
+	public const TAG_CAN_DESTROY = "CanDestroy";
+
+	/**
+	 * @param string[] $canPlaceOn
+	 * @param string[] $canDestroy
+	 */
+	public function __construct(
+		private SavedItemData $typeData,
+		private int $count,
+		private ?int $slot,
+		private ?bool $wasPickedUp,
+		private array $canPlaceOn,
+		private array $canDestroy
+	){}
+
+	public function getTypeData() : SavedItemData{ return $this->typeData; }
+
+	public function getCount() : int{ return $this->count; }
+
+	public function getSlot() : ?int{ return $this->slot; }
+
+	public function getWasPickedUp() : ?bool{ return $this->wasPickedUp; }
+
+	/** @return string[] */
+	public function getCanPlaceOn() : array{ return $this->canPlaceOn; }
+
+	/** @return string[] */
+	public function getCanDestroy() : array{ return $this->canDestroy; }
+
+	public function toNbt() : CompoundTag{
+		$result = CompoundTag::create();
+		$result->setByte(self::TAG_COUNT, Binary::signByte($this->count));
+
+		if($this->slot !== null){
+			$result->setByte(self::TAG_SLOT, Binary::signByte($this->slot));
+		}
+		if($this->wasPickedUp !== null){
+			$result->setByte(self::TAG_WAS_PICKED_UP, $this->wasPickedUp ? 1 : 0);
+		}
+		if(count($this->canPlaceOn) !== 0){
+			$result->setTag(self::TAG_CAN_PLACE_ON, new ListTag(array_map(fn(string $s) => new StringTag($s), $this->canPlaceOn)));
+		}
+		if(count($this->canDestroy) !== 0){
+			$result->setTag(self::TAG_CAN_DESTROY, new ListTag(array_map(fn(string $s) => new StringTag($s), $this->canDestroy)));
+		}
+
+		return $result->merge($this->typeData->toNbt());
+	}
+}
diff --git a/src/data/bedrock/item/UnsupportedItemTypeException.php b/src/data/bedrock/item/UnsupportedItemTypeException.php
new file mode 100644
index 0000000000..7f579fd13f
--- /dev/null
+++ b/src/data/bedrock/item/UnsupportedItemTypeException.php
@@ -0,0 +1,28 @@
+<?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\item;
+
+final class UnsupportedItemTypeException extends ItemTypeDeserializeException{
+
+}
diff --git a/src/data/bedrock/item/upgrade/ItemDataUpgrader.php b/src/data/bedrock/item/upgrade/ItemDataUpgrader.php
new file mode 100644
index 0000000000..7b34ffcb6e
--- /dev/null
+++ b/src/data/bedrock/item/upgrade/ItemDataUpgrader.php
@@ -0,0 +1,225 @@
+<?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\item\upgrade;
+
+use pocketmine\data\bedrock\block\BlockStateDeserializeException;
+use pocketmine\data\bedrock\block\upgrade\BlockDataUpgrader;
+use pocketmine\data\bedrock\item\BlockItemIdMap;
+use pocketmine\data\bedrock\item\SavedItemData;
+use pocketmine\data\bedrock\item\SavedItemStackData;
+use pocketmine\data\SavedDataLoadingException;
+use pocketmine\nbt\NBT;
+use pocketmine\nbt\NbtException;
+use pocketmine\nbt\tag\ByteTag;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\ListTag;
+use pocketmine\nbt\tag\ShortTag;
+use pocketmine\nbt\tag\StringTag;
+use pocketmine\network\mcpe\convert\BlockStateDictionary;
+use pocketmine\utils\Binary;
+use function assert;
+
+final class ItemDataUpgrader{
+	private const TAG_LEGACY_ID = "id"; //TAG_Short (or TAG_String for Java itemstacks)
+
+	public function __construct(
+		private ItemIdMetaUpgrader $idMetaUpgrader,
+		private LegacyItemIdToStringIdMap $legacyIntToStringIdMap,
+		private R12ItemIdToBlockIdMap $r12ItemIdToBlockIdMap,
+		private BlockDataUpgrader $blockDataUpgrader,
+		private BlockItemIdMap $blockItemIdMap,
+		private BlockStateDictionary $blockStateDictionary
+	){}
+
+	/**
+	 * This function replaces the legacy ItemFactory::get().
+	 *
+	 * Unlike ItemFactory::get(), it returns a SavedItemStackData which you can do with as you please.
+	 * If you want to deserialize it into a PocketMine-MP itemstack, pass it to the ItemDeserializer.
+	 *
+	 * @see ItemDataUpgrader::upgradeItemTypeDataInt()
+	 */
+	public function upgradeItemTypeDataString(string $rawNameId, int $meta, int $count, ?CompoundTag $nbt) : SavedItemStackData{
+		if(($r12BlockId = $this->r12ItemIdToBlockIdMap->itemIdToBlockId($rawNameId)) !== null){
+			try{
+				$blockStateData = $this->blockDataUpgrader->upgradeStringIdMeta($r12BlockId, $meta);
+			}catch(BlockStateDeserializeException $e){
+				throw new SavedDataLoadingException("Failed to deserialize blockstate for legacy blockitem: " . $e->getMessage(), 0, $e);
+			}
+		}else{
+			//probably a standard item
+			$blockStateData = null;
+		}
+
+		[$newNameId, $newMeta] = $this->idMetaUpgrader->upgrade($rawNameId, $meta);
+
+		//TODO: this won't account for spawn eggs from before 1.16.100 - perhaps we're lucky and they just left the meta in there anyway?
+
+		return new SavedItemStackData(
+			new SavedItemData($newNameId, $newMeta, $blockStateData, $nbt),
+			$count,
+			null,
+			null,
+			[],
+			[]
+		);
+	}
+
+	/**
+	 * This function replaces the legacy ItemFactory::get().
+	 *
+	 * @throws SavedDataLoadingException if the legacy numeric ID doesn't map to a string ID
+	 */
+	public function upgradeItemTypeDataInt(int $legacyNumericId, int $meta, int $count, ?CompoundTag $nbt) : SavedItemStackData{
+		//do not upgrade the ID beyond this initial step - we need the 1.12 ID for the item ID -> block ID map in the
+		//next step
+		$rawNameId = $this->legacyIntToStringIdMap->legacyToString($legacyNumericId);
+		if($rawNameId === null){
+			throw new SavedDataLoadingException("Unmapped legacy item ID $legacyNumericId");
+		}
+		return $this->upgradeItemTypeDataString($rawNameId, $meta, $count, $nbt);
+	}
+
+	/**
+	 * @throws SavedDataLoadingException
+	 */
+	private function upgradeItemTypeNbt(CompoundTag $tag) : ?SavedItemData{
+		if(($nameIdTag = $tag->getTag(SavedItemData::TAG_NAME)) instanceof StringTag){
+			//Bedrock 1.6+
+
+			$rawNameId = $nameIdTag->getValue();
+		}elseif(($idTag = $tag->getTag(self::TAG_LEGACY_ID)) instanceof ShortTag){
+			//Bedrock <= 1.5, PM <= 1.12
+
+			if($idTag->getValue() === 0){
+				//0 is a special case for air, which is not a valid item ID
+				//this isn't supposed to be saved, but this appears in some places due to bugs in older versions
+				return null;
+			}
+			$rawNameId = $this->legacyIntToStringIdMap->legacyToString($idTag->getValue());
+			if($rawNameId === null){
+				throw new SavedDataLoadingException("Legacy item ID " . $idTag->getValue() . " doesn't map to any modern string ID");
+			}
+		}elseif($idTag instanceof StringTag){
+			//PC item save format - best we can do here is hope the string IDs match
+
+			$rawNameId = $idTag->getValue();
+		}else{
+			throw new SavedDataLoadingException("Item stack data should have either a name ID or a legacy ID");
+		}
+
+		$meta = $tag->getShort(SavedItemData::TAG_DAMAGE, 0);
+
+		$blockStateNbt = $tag->getCompoundTag(SavedItemData::TAG_BLOCK);
+		if($blockStateNbt !== null){
+			try{
+				$blockStateData = $this->blockDataUpgrader->upgradeBlockStateNbt($blockStateNbt);
+			}catch(BlockStateDeserializeException $e){
+				throw new SavedDataLoadingException("Failed to deserialize blockstate for blockitem: " . $e->getMessage(), 0, $e);
+			}
+		}elseif(($r12BlockId = $this->r12ItemIdToBlockIdMap->itemIdToBlockId($rawNameId)) !== null){
+			//this is a legacy blockitem represented by ID + meta
+			try{
+				$blockStateData = $this->blockDataUpgrader->upgradeStringIdMeta($r12BlockId, $meta);
+			}catch(BlockStateDeserializeException $e){
+				throw new SavedDataLoadingException("Failed to deserialize blockstate for legacy blockitem: " . $e->getMessage(), 0, $e);
+			}
+		}else{
+			//probably a standard item
+			$blockStateData = null;
+		}
+
+		[$newNameId, $newMeta] = $this->idMetaUpgrader->upgrade($rawNameId, $meta);
+
+		//TODO: Dirty hack to load old skulls from disk: Put this into item upgrade schema's before Mojang makes something with a non 0 default state
+		if($blockStateData === null && ($blockId = $this->blockItemIdMap->lookupBlockId($newNameId)) !== null){
+			$networkRuntimeId = $this->blockStateDictionary->lookupStateIdFromIdMeta($blockId, 0);
+
+			if($networkRuntimeId === null){
+				throw new SavedDataLoadingException("Failed to find blockstate for blockitem $newNameId");
+			}
+
+			$blockStateData = $this->blockStateDictionary->generateDataFromStateId($networkRuntimeId);
+		}
+
+		//TODO: this won't account for spawn eggs from before 1.16.100 - perhaps we're lucky and they just left the meta in there anyway?
+		//TODO: read version from VersionInfo::TAG_WORLD_DATA_VERSION - we may need it to fix up old items
+
+		return new SavedItemData($newNameId, $newMeta, $blockStateData, $tag->getCompoundTag(SavedItemData::TAG_TAG));
+	}
+
+	/**
+	 * @return string[]
+	 * @throws SavedDataLoadingException
+	 */
+	private static function deserializeListOfStrings(?ListTag $list, string $tagName) : array{
+		if($list === null){
+			return [];
+		}
+		if($list->getTagType() !== NBT::TAG_String){
+			throw new SavedDataLoadingException("Unexpected type of list for tag '$tagName', expected TAG_String");
+		}
+		$result = [];
+		foreach($list as $item){
+			assert($item instanceof StringTag);
+			$result[] = $item->getValue();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @throws SavedDataLoadingException
+	 */
+	public function upgradeItemStackNbt(CompoundTag $tag) : ?SavedItemStackData{
+		$savedItemData = $this->upgradeItemTypeNbt($tag);
+		if($savedItemData === null){
+			//air - this isn't supposed to be saved, but older versions of PM saved it in some places
+			return null;
+		}
+		try{
+			//required
+			$count = Binary::unsignByte($tag->getByte(SavedItemStackData::TAG_COUNT));
+
+			//optional
+			$slot = ($slotTag = $tag->getTag(SavedItemStackData::TAG_SLOT)) instanceof ByteTag ? Binary::unsignByte($slotTag->getValue()) : null;
+			$wasPickedUp = ($wasPickedUpTag = $tag->getTag(SavedItemStackData::TAG_WAS_PICKED_UP)) instanceof ByteTag ? $wasPickedUpTag->getValue() : null;
+			$canPlaceOnList = $tag->getListTag(SavedItemStackData::TAG_CAN_PLACE_ON);
+			$canDestroyList = $tag->getListTag(SavedItemStackData::TAG_CAN_DESTROY);
+		}catch(NbtException $e){
+			throw new SavedDataLoadingException($e->getMessage(), 0, $e);
+		}
+
+		return new SavedItemStackData(
+			$savedItemData,
+			$count,
+			$slot,
+			$wasPickedUp !== 0,
+			self::deserializeListOfStrings($canPlaceOnList, SavedItemStackData::TAG_CAN_PLACE_ON),
+			self::deserializeListOfStrings($canDestroyList, SavedItemStackData::TAG_CAN_DESTROY)
+		);
+	}
+
+	public function getIdMetaUpgrader() : ItemIdMetaUpgrader{ return $this->idMetaUpgrader; }
+}
diff --git a/src/data/bedrock/item/upgrade/ItemIdMetaUpgradeSchema.php b/src/data/bedrock/item/upgrade/ItemIdMetaUpgradeSchema.php
new file mode 100644
index 0000000000..0388fd1e7b
--- /dev/null
+++ b/src/data/bedrock/item/upgrade/ItemIdMetaUpgradeSchema.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock\item\upgrade;
+
+use function mb_strtolower;
+
+final class ItemIdMetaUpgradeSchema{
+
+	/**
+	 * @param string[]   $renamedIds
+	 * @param string[][] $remappedMetas
+	 * @phpstan-param array<string, string> $renamedIds
+	 * @phpstan-param array<string, array<int, string>> $remappedMetas
+	 */
+	public function __construct(
+		private array $renamedIds,
+		private array $remappedMetas,
+		private int $schemaId
+	){}
+
+	public function getSchemaId() : int{ return $this->schemaId; }
+
+	/**
+	 * @return string[]
+	 * @phpstan-return array<string, string>
+	 */
+	public function getRenamedIds() : array{ return $this->renamedIds; }
+
+	/**
+	 * @return string[][]
+	 * @phpstan-return array<string, array<int, string>>
+	 */
+	public function getRemappedMetas() : array{ return $this->remappedMetas; }
+
+	public function renameId(string $id) : ?string{
+		return $this->renamedIds[mb_strtolower($id, 'US-ASCII')] ?? null;
+	}
+
+	public function remapMeta(string $id, int $meta) : ?string{
+		return $this->remappedMetas[mb_strtolower($id, 'US-ASCII')][$meta] ?? null;
+	}
+}
diff --git a/src/data/bedrock/item/upgrade/ItemIdMetaUpgradeSchemaUtils.php b/src/data/bedrock/item/upgrade/ItemIdMetaUpgradeSchemaUtils.php
new file mode 100644
index 0000000000..0fa10803a1
--- /dev/null
+++ b/src/data/bedrock/item/upgrade/ItemIdMetaUpgradeSchemaUtils.php
@@ -0,0 +1,102 @@
+<?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\item\upgrade;
+
+use pocketmine\data\bedrock\item\upgrade\model\ItemIdMetaUpgradeSchemaModel;
+use pocketmine\utils\Filesystem;
+use Symfony\Component\Filesystem\Path;
+use function gettype;
+use function is_object;
+use function json_decode;
+use function ksort;
+use const JSON_THROW_ON_ERROR;
+use const SORT_NUMERIC;
+
+final class ItemIdMetaUpgradeSchemaUtils{
+
+	/**
+	 * @return ItemIdMetaUpgradeSchema[]
+	 * @phpstan-return array<int, ItemIdMetaUpgradeSchema>
+	 */
+	public static function loadSchemas(string $path, int $maxSchemaId) : array{
+		$iterator = new \RegexIterator(
+			new \FilesystemIterator(
+				$path,
+				\FilesystemIterator::KEY_AS_FILENAME | \FilesystemIterator::SKIP_DOTS
+			),
+			'/^(\d{4}).*\.json$/',
+			\RegexIterator::GET_MATCH,
+			\RegexIterator::USE_KEY
+		);
+
+		$result = [];
+
+		/** @var string[] $matches */
+		foreach($iterator as $matches){
+			$filename = $matches[0];
+			$schemaId = (int) $matches[1];
+			if($schemaId > $maxSchemaId){
+				continue;
+			}
+
+			$fullPath = Path::join($path, $filename);
+
+			$raw = Filesystem::fileGetContents($fullPath);
+
+			try{
+				$schema = self::loadSchemaFromString($raw, $schemaId);
+			}catch(\RuntimeException $e){
+				throw new \RuntimeException("Loading schema file $fullPath: " . $e->getMessage(), 0, $e);
+			}
+
+			$result[$schemaId] = $schema;
+		}
+
+		ksort($result, SORT_NUMERIC);
+		return $result;
+	}
+
+	public static function loadSchemaFromString(string $raw, int $schemaId) : ItemIdMetaUpgradeSchema{
+		try{
+			$json = json_decode($raw, false, flags: JSON_THROW_ON_ERROR);
+		}catch(\JsonException $e){
+			throw new \RuntimeException($e->getMessage(), 0, $e);
+		}
+		if(!is_object($json)){
+			throw new \RuntimeException("Unexpected root type of schema file " . gettype($json) . ", expected object");
+		}
+
+		$jsonMapper = new \JsonMapper();
+		$jsonMapper->bExceptionOnMissingData = true;
+		$jsonMapper->bExceptionOnUndefinedProperty = true;
+		$jsonMapper->bStrictObjectTypeChecking = true;
+		try{
+			$model = $jsonMapper->map($json, new ItemIdMetaUpgradeSchemaModel());
+		}catch(\JsonMapper_Exception $e){
+			throw new \RuntimeException($e->getMessage(), 0, $e);
+		}
+
+		return new ItemIdMetaUpgradeSchema($model->renamedIds, $model->remappedMetas, $schemaId);
+	}
+}
diff --git a/src/data/bedrock/item/upgrade/ItemIdMetaUpgrader.php b/src/data/bedrock/item/upgrade/ItemIdMetaUpgrader.php
new file mode 100644
index 0000000000..96980c92f4
--- /dev/null
+++ b/src/data/bedrock/item/upgrade/ItemIdMetaUpgrader.php
@@ -0,0 +1,83 @@
+<?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\item\upgrade;
+
+use function ksort;
+use const SORT_NUMERIC;
+
+/**
+ * Upgrades old item string IDs and metas to newer ones according to the given schemas.
+ */
+final class ItemIdMetaUpgrader{
+
+	/**
+	 * @var ItemIdMetaUpgradeSchema[]
+	 * @phpstan-var array<int, ItemIdMetaUpgradeSchema>
+	 */
+	private array $idMetaUpgradeSchemas = [];
+
+	/**
+	 * @param ItemIdMetaUpgradeSchema[] $idMetaUpgradeSchemas
+	 * @phpstan-param array<int, ItemIdMetaUpgradeSchema> $idMetaUpgradeSchemas
+	 */
+	public function __construct(
+		array $idMetaUpgradeSchemas,
+	){
+		foreach($idMetaUpgradeSchemas as $schema){
+			$this->addSchema($schema);
+		}
+	}
+
+	public function addSchema(ItemIdMetaUpgradeSchema $schema) : void{
+		if(isset($this->idMetaUpgradeSchemas[$schema->getSchemaId()])){
+			throw new \InvalidArgumentException("Already have a schema with priority " . $schema->getSchemaId());
+		}
+		$this->idMetaUpgradeSchemas[$schema->getSchemaId()] = $schema;
+		ksort($this->idMetaUpgradeSchemas, SORT_NUMERIC);
+	}
+
+	/**
+	 * @return ItemIdMetaUpgradeSchema[]
+	 * @phpstan-return array<int, ItemIdMetaUpgradeSchema>
+	 */
+	public function getSchemas() : array{ return $this->idMetaUpgradeSchemas; }
+
+	/**
+	 * @phpstan-return array{string, int}
+	 */
+	public function upgrade(string $id, int $meta) : array{
+		$newId = $id;
+		$newMeta = $meta;
+		foreach($this->idMetaUpgradeSchemas as $schema){
+			if(($remappedMetaId = $schema->remapMeta($newId, $newMeta)) !== null){
+				$newId = $remappedMetaId;
+				$newMeta = 0;
+			}elseif(($renamedId = $schema->renameId($newId)) !== null){
+				$newId = $renamedId;
+			}
+		}
+
+		return [$newId, $newMeta];
+	}
+}
diff --git a/src/data/bedrock/LegacyItemIdToStringIdMap.php b/src/data/bedrock/item/upgrade/LegacyItemIdToStringIdMap.php
similarity index 76%
rename from src/data/bedrock/LegacyItemIdToStringIdMap.php
rename to src/data/bedrock/item/upgrade/LegacyItemIdToStringIdMap.php
index 254ad96bb1..7ca1367fb8 100644
--- a/src/data/bedrock/LegacyItemIdToStringIdMap.php
+++ b/src/data/bedrock/item/upgrade/LegacyItemIdToStringIdMap.php
@@ -21,15 +21,16 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\data\bedrock;
+namespace pocketmine\data\bedrock\item\upgrade;
 
+use pocketmine\data\bedrock\LegacyToStringIdMap;
 use pocketmine\utils\SingletonTrait;
 use Symfony\Component\Filesystem\Path;
 
-final class LegacyItemIdToStringIdMap extends LegacyToStringBidirectionalIdMap{
+final class LegacyItemIdToStringIdMap extends LegacyToStringIdMap{
 	use SingletonTrait;
 
 	public function __construct(){
-		parent::__construct(Path::join(\pocketmine\BEDROCK_DATA_PATH, 'item_id_map.json'));
+		parent::__construct(Path::join(\pocketmine\BEDROCK_ITEM_UPGRADE_SCHEMA_PATH, 'item_legacy_id_map.json'));
 	}
 }
diff --git a/src/data/bedrock/item/upgrade/R12ItemIdToBlockIdMap.php b/src/data/bedrock/item/upgrade/R12ItemIdToBlockIdMap.php
new file mode 100644
index 0000000000..19cfe6c78d
--- /dev/null
+++ b/src/data/bedrock/item/upgrade/R12ItemIdToBlockIdMap.php
@@ -0,0 +1,102 @@
+<?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\item\upgrade;
+
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Filesystem;
+use pocketmine\utils\SingletonTrait;
+use pocketmine\utils\Utils;
+use Symfony\Component\Filesystem\Path;
+use function is_array;
+use function is_string;
+use function json_decode;
+use function mb_strtolower;
+use const JSON_THROW_ON_ERROR;
+use const pocketmine\BEDROCK_ITEM_UPGRADE_SCHEMA_PATH;
+
+/**
+ * Maps all known 1.12 and lower item IDs to their respective block IDs, where appropriate.
+ * If an item ID does not have a corresponding 1.12 block ID, assume the item is not a blockitem.
+ *
+ * This is only needed for deserializing blockitems from 1.8 and lower (or 1.12 and lower in the case of PM). In 1.9 and
+ * above, the blockstate NBT is stored in the itemstack NBT, and the item ID is not used.
+ */
+final class R12ItemIdToBlockIdMap{
+	use SingletonTrait;
+
+	private static function make() : self{
+		$map = json_decode(
+			Filesystem::fileGetContents(Path::join(BEDROCK_ITEM_UPGRADE_SCHEMA_PATH, '1.12.0_item_id_to_block_id_map.json')),
+			associative: true,
+			flags: JSON_THROW_ON_ERROR
+		);
+		if(!is_array($map)){
+			throw new AssumptionFailedError("Invalid blockitem ID mapping table, expected array as root type");
+		}
+
+		$builtMap = [];
+		foreach(Utils::promoteKeys($map) as $itemId => $blockId){
+			if(!is_string($itemId)){
+				throw new AssumptionFailedError("Invalid blockitem ID mapping table, expected string as key");
+			}
+			if(!is_string($blockId)){
+				throw new AssumptionFailedError("Invalid blockitem ID mapping table, expected string as value");
+			}
+			$builtMap[$itemId] = $blockId;
+		}
+
+		return new self($builtMap);
+	}
+
+	/**
+	 * @var string[]
+	 * @phpstan-var array<string, string>
+	 */
+	private array $itemToBlock = [];
+	/**
+	 * @var string[]
+	 * @phpstan-var array<string, string>
+	 */
+	private array $blockToItem = [];
+
+	/**
+	 * @param string[] $itemToBlock
+	 * @phpstan-param array<string, string> $itemToBlock
+	 */
+	public function __construct(array $itemToBlock){
+		foreach(Utils::stringifyKeys($itemToBlock) as $itemId => $blockId){
+			$this->itemToBlock[mb_strtolower($itemId, 'US-ASCII')] = $blockId;
+			$this->blockToItem[mb_strtolower($blockId, 'US-ASCII')] = $itemId;
+		}
+	}
+
+	public function itemIdToBlockId(string $itemId) : ?string{
+		return $this->itemToBlock[mb_strtolower($itemId, 'US-ASCII')] ?? null;
+	}
+
+	public function blockIdToItemId(string $blockId) : ?string{
+		//we don't need this for any functionality, but it might be nice to have for debugging
+		return $this->blockToItem[mb_strtolower($blockId, 'US-ASCII')] ?? null;
+	}
+}
diff --git a/src/data/bedrock/item/upgrade/model/ItemIdMetaUpgradeSchemaModel.php b/src/data/bedrock/item/upgrade/model/ItemIdMetaUpgradeSchemaModel.php
new file mode 100644
index 0000000000..5765c5acf1
--- /dev/null
+++ b/src/data/bedrock/item/upgrade/model/ItemIdMetaUpgradeSchemaModel.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock\item\upgrade\model;
+
+final class ItemIdMetaUpgradeSchemaModel{
+
+	/**
+	 * @var string[]
+	 * @phpstan-var array<string, string>
+	 */
+	public array $renamedIds = [];
+
+	/**
+	 * @var string[][]
+	 * @phpstan-var array<string, array<int, string>>
+	 */
+	public array $remappedMetas = [];
+}
diff --git a/src/data/java/GameModeIdMap.php b/src/data/java/GameModeIdMap.php
index 348749b51f..9262723ed8 100644
--- a/src/data/java/GameModeIdMap.php
+++ b/src/data/java/GameModeIdMap.php
@@ -26,6 +26,7 @@ namespace pocketmine\data\java;
 use pocketmine\player\GameMode;
 use pocketmine\utils\SingletonTrait;
 use function array_key_exists;
+use function spl_object_id;
 
 final class GameModeIdMap{
 	use SingletonTrait;
@@ -43,15 +44,19 @@ final class GameModeIdMap{
 	private array $enumToId = [];
 
 	public function __construct(){
-		$this->register(0, GameMode::SURVIVAL());
-		$this->register(1, GameMode::CREATIVE());
-		$this->register(2, GameMode::ADVENTURE());
-		$this->register(3, GameMode::SPECTATOR());
+		foreach(GameMode::cases() as $case){
+			$this->register(match($case){
+				GameMode::SURVIVAL => 0,
+				GameMode::CREATIVE => 1,
+				GameMode::ADVENTURE => 2,
+				GameMode::SPECTATOR => 3,
+			}, $case);
+		}
 	}
 
 	private function register(int $id, GameMode $type) : void{
 		$this->idToEnum[$id] = $type;
-		$this->enumToId[$type->id()] = $id;
+		$this->enumToId[spl_object_id($type)] = $id;
 	}
 
 	public function fromId(int $id) : ?GameMode{
@@ -59,9 +64,10 @@ final class GameModeIdMap{
 	}
 
 	public function toId(GameMode $type) : int{
-		if(!array_key_exists($type->id(), $this->enumToId)){
-			throw new \InvalidArgumentException("Game mode does not have a mapped ID"); //this should never happen
+		$k = spl_object_id($type);
+		if(!array_key_exists($k, $this->enumToId)){
+			throw new \InvalidArgumentException("Game mode $type->name does not have a mapped ID"); //this should never happen
 		}
-		return $this->enumToId[$type->id()];
+		return $this->enumToId[$k];
 	}
 }
diff --git a/src/data/runtime/InvalidSerializedRuntimeDataException.php b/src/data/runtime/InvalidSerializedRuntimeDataException.php
new file mode 100644
index 0000000000..899a206f67
--- /dev/null
+++ b/src/data/runtime/InvalidSerializedRuntimeDataException.php
@@ -0,0 +1,28 @@
+<?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\runtime;
+
+final class InvalidSerializedRuntimeDataException extends \UnexpectedValueException{
+
+}
diff --git a/src/data/runtime/LegacyRuntimeEnumDescriberTrait.php b/src/data/runtime/LegacyRuntimeEnumDescriberTrait.php
new file mode 100644
index 0000000000..3c540f7fa7
--- /dev/null
+++ b/src/data/runtime/LegacyRuntimeEnumDescriberTrait.php
@@ -0,0 +1,89 @@
+<?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\runtime;
+
+/**
+ * Provides backwards-compatible shims for the old codegen'd enum describer methods.
+ * This is kept for plugin backwards compatibility, but these functions should not be used in new code.
+ * @deprecated
+ */
+trait LegacyRuntimeEnumDescriberTrait{
+	abstract protected function enum(\UnitEnum &$case) : void;
+
+	public function bellAttachmentType(\pocketmine\block\utils\BellAttachmentType &$value) : void{
+		$this->enum($value);
+	}
+
+	public function copperOxidation(\pocketmine\block\utils\CopperOxidation &$value) : void{
+		$this->enum($value);
+	}
+
+	public function coralType(\pocketmine\block\utils\CoralType &$value) : void{
+		$this->enum($value);
+	}
+
+	public function dirtType(\pocketmine\block\utils\DirtType &$value) : void{
+		$this->enum($value);
+	}
+
+	public function dripleafState(\pocketmine\block\utils\DripleafState &$value) : void{
+		$this->enum($value);
+	}
+
+	public function dyeColor(\pocketmine\block\utils\DyeColor &$value) : void{
+		$this->enum($value);
+	}
+
+	public function froglightType(\pocketmine\block\utils\FroglightType &$value) : void{
+		$this->enum($value);
+	}
+
+	public function leverFacing(\pocketmine\block\utils\LeverFacing &$value) : void{
+		$this->enum($value);
+	}
+
+	public function medicineType(\pocketmine\item\MedicineType &$value) : void{
+		$this->enum($value);
+	}
+
+	public function mobHeadType(\pocketmine\block\utils\MobHeadType &$value) : void{
+		$this->enum($value);
+	}
+
+	public function mushroomBlockType(\pocketmine\block\utils\MushroomBlockType &$value) : void{
+		$this->enum($value);
+	}
+
+	public function potionType(\pocketmine\item\PotionType &$value) : void{
+		$this->enum($value);
+	}
+
+	public function slabType(\pocketmine\block\utils\SlabType &$value) : void{
+		$this->enum($value);
+	}
+
+	public function suspiciousStewType(\pocketmine\item\SuspiciousStewType &$value) : void{
+		$this->enum($value);
+	}
+}
diff --git a/src/data/runtime/RuntimeDataDescriber.php b/src/data/runtime/RuntimeDataDescriber.php
new file mode 100644
index 0000000000..6eb552a7b6
--- /dev/null
+++ b/src/data/runtime/RuntimeDataDescriber.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\data\runtime;
+
+use pocketmine\block\utils\BrewingStandSlot;
+use pocketmine\block\utils\WallConnectionType;
+use pocketmine\math\Facing;
+
+/**
+ * Interface implemented by {@link RuntimeDataReader}, {@link RuntimeDataWriter} and {@link RuntimeDataSizeCalculator}.
+ * Used to describe the structure of runtime data to an implementation.
+ *
+ * This interface should be considered **sealed**.
+ * You may use it as a type for parameters and return values, but it should not be implemented outside of this package.
+ * New methods may be added without warning.
+ */
+interface RuntimeDataDescriber extends RuntimeEnumDescriber{
+	public function int(int $bits, int &$value) : void;
+
+	/**
+	 * @deprecated Use {@link RuntimeDataDescriber::boundedIntAuto()} instead.
+	 */
+	public function boundedInt(int $bits, int $min, int $max, int &$value) : void;
+
+	/**
+	 * Same as boundedInt() but automatically calculates the required number of bits from the range.
+	 * The range bounds must be constant.
+	 */
+	public function boundedIntAuto(int $min, int $max, int &$value) : void;
+
+	public function bool(bool &$value) : void;
+
+	public function horizontalFacing(int &$facing) : void;
+
+	/**
+	 * @param int[] $faces
+	 */
+	public function facingFlags(array &$faces) : void;
+
+	/**
+	 * @param int[] $faces
+	 */
+	public function horizontalFacingFlags(array &$faces) : void;
+
+	public function facing(int &$facing) : void;
+
+	public function facingExcept(int &$facing, int $except) : void;
+
+	public function axis(int &$axis) : void;
+
+	public function horizontalAxis(int &$axis) : void;
+
+	/**
+	 * @param WallConnectionType[] $connections
+	 * @phpstan-param array<Facing::NORTH|Facing::EAST|Facing::SOUTH|Facing::WEST, WallConnectionType> $connections
+	 */
+	public function wallConnections(array &$connections) : void;
+
+	/**
+	 * @param BrewingStandSlot[] $slots
+	 * @phpstan-param array<int, BrewingStandSlot> $slots
+	 *
+	 * @deprecated Use {@link enumSet()} instead.
+	 */
+	public function brewingStandSlots(array &$slots) : void;
+
+	public function railShape(int &$railShape) : void;
+
+	public function straightOnlyRailShape(int &$railShape) : void;
+
+	/**
+	 * @phpstan-template T of \UnitEnum
+	 * @phpstan-param T &$case
+	 * @phpstan-param-out T $case
+	 */
+	public function enum(\UnitEnum &$case) : void;
+
+	/**
+	 * @param \UnitEnum[] &$set
+	 * @param \UnitEnum[] $allCases
+	 *
+	 * @phpstan-template T of \UnitEnum
+	 * @phpstan-param array<int, T> &$set
+	 * @phpstan-param array<int, T> $allCases
+	 */
+	public function enumSet(array &$set, array $allCases) : void;
+}
diff --git a/src/data/runtime/RuntimeDataReader.php b/src/data/runtime/RuntimeDataReader.php
new file mode 100644
index 0000000000..84239f4113
--- /dev/null
+++ b/src/data/runtime/RuntimeDataReader.php
@@ -0,0 +1,245 @@
+<?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\runtime;
+
+use pocketmine\block\utils\BrewingStandSlot;
+use pocketmine\block\utils\RailConnectionInfo;
+use pocketmine\block\utils\WallConnectionType;
+use pocketmine\math\Axis;
+use pocketmine\math\Facing;
+use pocketmine\utils\AssumptionFailedError;
+use function get_class;
+use function intdiv;
+use function log;
+use function spl_object_id;
+
+final class RuntimeDataReader implements RuntimeDataDescriber{
+	use LegacyRuntimeEnumDescriberTrait;
+
+	private int $offset = 0;
+
+	public function __construct(
+		private int $maxBits,
+		private int $value
+	){}
+
+	public function readInt(int $bits) : int{
+		$bitsLeft = $this->maxBits - $this->offset;
+		if($bits > $bitsLeft){
+			throw new \InvalidArgumentException("No bits left in buffer (need $bits, have $bitsLeft");
+		}
+
+		$value = ($this->value >> $this->offset) & ~(~0 << $bits);
+		$this->offset += $bits;
+		return $value;
+	}
+
+	public function int(int $bits, int &$value) : void{
+		$value = $this->readInt($bits);
+	}
+
+	/**
+	 * @deprecated Use {@link self::boundedIntAuto()} instead.
+	 */
+	public function boundedInt(int $bits, int $min, int $max, int &$value) : void{
+		$offset = $this->offset;
+		$this->boundedIntAuto($min, $max, $value);
+		$actualBits = $this->offset - $offset;
+		if($this->offset !== $offset + $bits){
+			throw new \InvalidArgumentException("Bits should be $actualBits for the given bounds, but received $bits. Use boundedIntAuto() for automatic bits calculation.");
+		}
+	}
+
+	private function readBoundedIntAuto(int $min, int $max) : int{
+		$bits = ((int) log($max - $min, 2)) + 1;
+		$result = $this->readInt($bits) + $min;
+		if($result < $min || $result > $max){
+			throw new InvalidSerializedRuntimeDataException("Value is outside the range $min - $max");
+		}
+		return $result;
+	}
+
+	public function boundedIntAuto(int $min, int $max, int &$value) : void{
+		$value = $this->readBoundedIntAuto($min, $max);
+	}
+
+	protected function readBool() : bool{
+		return $this->readInt(1) === 1;
+	}
+
+	public function bool(bool &$value) : void{
+		$value = $this->readBool();
+	}
+
+	public function horizontalFacing(int &$facing) : void{
+		$facing = match($this->readInt(2)){
+			0 => Facing::NORTH,
+			1 => Facing::EAST,
+			2 => Facing::SOUTH,
+			3 => Facing::WEST,
+			default => throw new AssumptionFailedError("Unreachable")
+		};
+	}
+
+	/**
+	 * @param int[] $faces
+	 */
+	public function facingFlags(array &$faces) : void{
+		$result = [];
+		foreach(Facing::ALL as $facing){
+			if($this->readBool()){
+				$result[$facing] = $facing;
+			}
+		}
+
+		$faces = $result;
+	}
+
+	/**
+	 * @param int[] $faces
+	 */
+	public function horizontalFacingFlags(array &$faces) : void{
+		$result = [];
+		foreach(Facing::HORIZONTAL as $facing){
+			if($this->readBool()){
+				$result[$facing] = $facing;
+			}
+		}
+
+		$faces = $result;
+	}
+
+	public function facing(int &$facing) : void{
+		$facing = match($this->readInt(3)){
+			0 => Facing::DOWN,
+			1 => Facing::UP,
+			2 => Facing::NORTH,
+			3 => Facing::SOUTH,
+			4 => Facing::WEST,
+			5 => Facing::EAST,
+			default => throw new InvalidSerializedRuntimeDataException("Invalid facing value")
+		};
+	}
+
+	public function facingExcept(int &$facing, int $except) : void{
+		$result = 0;
+		$this->facing($result);
+		if($result === $except){
+			throw new InvalidSerializedRuntimeDataException("Illegal facing value");
+		}
+
+		$facing = $result;
+	}
+
+	public function axis(int &$axis) : void{
+		$axis = match($this->readInt(2)){
+			0 => Axis::X,
+			1 => Axis::Z,
+			2 => Axis::Y,
+			default => throw new InvalidSerializedRuntimeDataException("Invalid axis value")
+		};
+	}
+
+	public function horizontalAxis(int &$axis) : void{
+		$axis = match($this->readInt(1)){
+			0 => Axis::X,
+			1 => Axis::Z,
+			default => throw new AssumptionFailedError("Unreachable")
+		};
+	}
+
+	/**
+	 * @param WallConnectionType[] $connections
+	 * @phpstan-param array<Facing::NORTH|Facing::EAST|Facing::SOUTH|Facing::WEST, WallConnectionType> $connections
+	 */
+	public function wallConnections(array &$connections) : void{
+		$result = [];
+		$offset = 0;
+		$packed = $this->readBoundedIntAuto(0, (3 ** 4) - 1);
+		foreach(Facing::HORIZONTAL as $facing){
+			$type = intdiv($packed,  (3 ** $offset)) % 3;
+			if($type !== 0){
+				$result[$facing] = match($type){
+					1 => WallConnectionType::SHORT,
+					2 => WallConnectionType::TALL,
+					default => throw new AssumptionFailedError("Unreachable")
+				};
+			}
+			$offset++;
+		}
+
+		$connections = $result;
+	}
+
+	/**
+	 * @param BrewingStandSlot[] $slots
+	 * @phpstan-param array<int, BrewingStandSlot> $slots
+	 *
+	 * @deprecated Use {@link enumSet()} instead.
+	 */
+	public function brewingStandSlots(array &$slots) : void{
+		$this->enumSet($slots, BrewingStandSlot::cases());
+	}
+
+	public function railShape(int &$railShape) : void{
+		$result = $this->readInt(4);
+		if(!isset(RailConnectionInfo::CONNECTIONS[$result]) && !isset(RailConnectionInfo::CURVE_CONNECTIONS[$result])){
+			throw new InvalidSerializedRuntimeDataException("Invalid rail shape $result");
+		}
+
+		$railShape = $result;
+	}
+
+	public function straightOnlyRailShape(int &$railShape) : void{
+		$result = $this->readInt(3);
+		if(!isset(RailConnectionInfo::CONNECTIONS[$result])){
+			throw new InvalidSerializedRuntimeDataException("No rail shape matches meta $result");
+		}
+
+		$railShape = $result;
+	}
+
+	public function enum(\UnitEnum &$case) : void{
+		$metadata = RuntimeEnumMetadata::from($case);
+		$raw = $this->readInt($metadata->bits);
+		$result = $metadata->intToEnum($raw);
+		if($result === null){
+			throw new InvalidSerializedRuntimeDataException("Invalid serialized value $raw for " . get_class($case));
+		}
+
+		$case = $result;
+	}
+
+	public function enumSet(array &$set, array $allCases) : void{
+		$result = [];
+		foreach($allCases as $case){
+			if($this->readBool()){
+				$result[spl_object_id($case)] = $case;
+			}
+		}
+		$set = $result;
+	}
+
+	public function getOffset() : int{ return $this->offset; }
+}
diff --git a/src/data/runtime/RuntimeDataSizeCalculator.php b/src/data/runtime/RuntimeDataSizeCalculator.php
new file mode 100644
index 0000000000..18c703cb83
--- /dev/null
+++ b/src/data/runtime/RuntimeDataSizeCalculator.php
@@ -0,0 +1,120 @@
+<?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\runtime;
+
+use pocketmine\block\utils\BrewingStandSlot;
+use pocketmine\math\Facing;
+use function count;
+use function log;
+
+final class RuntimeDataSizeCalculator implements RuntimeDataDescriber{
+	use LegacyRuntimeEnumDescriberTrait;
+
+	private int $bits = 0;
+
+	protected function addBits(int $bits) : void{
+		$this->bits += $bits;
+	}
+
+	public function getBitsUsed() : int{
+		return $this->bits;
+	}
+
+	public function int(int $bits, int &$value) : void{
+		$this->addBits($bits);
+	}
+
+	/**
+	 * @deprecated Use {@link self::boundedIntAuto()} instead.
+	 */
+	public function boundedInt(int $bits, int $min, int $max, int &$value) : void{
+		$currentBits = $this->bits;
+		$this->boundedIntAuto($min, $max, $value);
+		$actualBits = $this->bits - $currentBits;
+		if($actualBits !== $bits){
+			throw new \InvalidArgumentException("Bits should be $actualBits for the given bounds, but received $bits. Use boundedIntAuto() for automatic bits calculation.");
+		}
+	}
+
+	public function boundedIntAuto(int $min, int $max, int &$value) : void{
+		$this->addBits(((int) log($max - $min, 2)) + 1);
+	}
+
+	public function bool(bool &$value) : void{
+		$this->addBits(1);
+	}
+
+	public function horizontalFacing(int &$facing) : void{
+		$this->addBits(2);
+	}
+
+	public function facingFlags(array &$faces) : void{
+		$this->addBits(count(Facing::ALL));
+	}
+
+	public function horizontalFacingFlags(array &$faces) : void{
+		$this->addBits(count(Facing::HORIZONTAL));
+	}
+
+	public function facing(int &$facing) : void{
+		$this->addBits(3);
+	}
+
+	public function facingExcept(int &$facing, int $except) : void{
+		$this->facing($facing);
+	}
+
+	public function axis(int &$axis) : void{
+		$this->addBits(2);
+	}
+
+	public function horizontalAxis(int &$axis) : void{
+		$this->addBits(1);
+	}
+
+	public function wallConnections(array &$connections) : void{
+		$this->addBits(7);
+	}
+
+	public function brewingStandSlots(array &$slots) : void{
+		$this->addBits(count(BrewingStandSlot::cases()));
+	}
+
+	public function railShape(int &$railShape) : void{
+		$this->addBits(4);
+	}
+
+	public function straightOnlyRailShape(int &$railShape) : void{
+		$this->addBits(3);
+	}
+
+	public function enum(\UnitEnum &$case) : void{
+		$metadata = RuntimeEnumMetadata::from($case);
+		$this->addBits($metadata->bits);
+	}
+
+	public function enumSet(array &$set, array $allCases) : void{
+		$this->addBits(count($allCases));
+	}
+}
diff --git a/src/data/runtime/RuntimeDataWriter.php b/src/data/runtime/RuntimeDataWriter.php
new file mode 100644
index 0000000000..0fbdd869f3
--- /dev/null
+++ b/src/data/runtime/RuntimeDataWriter.php
@@ -0,0 +1,205 @@
+<?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\runtime;
+
+use pocketmine\block\utils\BrewingStandSlot;
+use pocketmine\block\utils\WallConnectionType;
+use pocketmine\math\Axis;
+use pocketmine\math\Facing;
+use function array_flip;
+use function log;
+use function spl_object_id;
+
+final class RuntimeDataWriter implements RuntimeDataDescriber{
+	use LegacyRuntimeEnumDescriberTrait;
+
+	private int $value = 0;
+	private int $offset = 0;
+
+	public function __construct(
+		private int $maxBits
+	){}
+
+	public function writeInt(int $bits, int $value) : void{
+		if($this->offset + $bits > $this->maxBits){
+			throw new \InvalidArgumentException("Bit buffer cannot be larger than $this->maxBits bits (already have $this->offset bits)");
+		}
+		if(($value & (~0 << $bits)) !== 0){
+			throw new \InvalidArgumentException("Value $value does not fit into $bits bits");
+		}
+
+		$this->value |= ($value << $this->offset);
+		$this->offset += $bits;
+	}
+
+	public function int(int $bits, int &$value) : void{
+		$this->writeInt($bits, $value);
+	}
+
+	/**
+	 * @deprecated Use {@link self::boundedIntAuto()} instead.
+	 */
+	public function boundedInt(int $bits, int $min, int $max, int &$value) : void{
+		$offset = $this->offset;
+		$this->writeBoundedIntAuto($min, $max, $value);
+		$actualBits = $this->offset - $offset;
+		if($actualBits !== $bits){
+			throw new \InvalidArgumentException("Bits should be $actualBits for the given bounds, but received $bits. Use boundedIntAuto() for automatic bits calculation.");
+		}
+	}
+
+	private function writeBoundedIntAuto(int $min, int $max, int $value) : void{
+		if($value < $min || $value > $max){
+			throw new \InvalidArgumentException("Value $value is outside the range $min - $max");
+		}
+		$bits = ((int) log($max - $min, 2)) + 1;
+		$this->writeInt($bits, $value - $min);
+	}
+
+	public function boundedIntAuto(int $min, int $max, int &$value) : void{
+		$this->writeBoundedIntAuto($min, $max, $value);
+	}
+
+	protected function writeBool(bool $value) : void{
+		$this->writeInt(1, $value ? 1 : 0);
+	}
+
+	public function bool(bool &$value) : void{
+		$this->writeBool($value);
+	}
+
+	public function horizontalFacing(int &$facing) : void{
+		$this->writeInt(2, match($facing){
+			Facing::NORTH => 0,
+			Facing::EAST => 1,
+			Facing::SOUTH => 2,
+			Facing::WEST => 3,
+			default => throw new \InvalidArgumentException("Invalid horizontal facing $facing")
+		});
+	}
+
+	/**
+	 * @param int[] $faces
+	 */
+	public function facingFlags(array &$faces) : void{
+		$uniqueFaces = array_flip($faces);
+		foreach(Facing::ALL as $facing){
+			$this->writeBool(isset($uniqueFaces[$facing]));
+		}
+	}
+
+	/**
+	 * @param int[] $faces
+	 */
+	public function horizontalFacingFlags(array &$faces) : void{
+		$uniqueFaces = array_flip($faces);
+		foreach(Facing::HORIZONTAL as $facing){
+			$this->writeBool(isset($uniqueFaces[$facing]));
+		}
+	}
+
+	public function facing(int &$facing) : void{
+		$this->writeInt(3, match($facing){
+			0 => Facing::DOWN,
+			1 => Facing::UP,
+			2 => Facing::NORTH,
+			3 => Facing::SOUTH,
+			4 => Facing::WEST,
+			5 => Facing::EAST,
+			default => throw new \InvalidArgumentException("Invalid facing $facing")
+		});
+	}
+
+	public function facingExcept(int &$facing, int $except) : void{
+		$this->facing($facing);
+	}
+
+	public function axis(int &$axis) : void{
+		$this->writeInt(2, match($axis){
+			Axis::X => 0,
+			Axis::Z => 1,
+			Axis::Y => 2,
+			default => throw new \InvalidArgumentException("Invalid axis $axis")
+		});
+	}
+
+	public function horizontalAxis(int &$axis) : void{
+		$this->writeInt(1, match($axis){
+			Axis::X => 0,
+			Axis::Z => 1,
+			default => throw new \InvalidArgumentException("Invalid horizontal axis $axis")
+		});
+	}
+
+	/**
+	 * @param WallConnectionType[] $connections
+	 * @phpstan-param array<Facing::NORTH|Facing::EAST|Facing::SOUTH|Facing::WEST, WallConnectionType> $connections
+	 */
+	public function wallConnections(array &$connections) : void{
+		$packed = 0;
+		$offset = 0;
+		foreach(Facing::HORIZONTAL as $facing){
+			$packed += match($connections[$facing] ?? null){
+				null => 0,
+				WallConnectionType::SHORT => 1,
+				WallConnectionType::TALL => 2,
+			} * (3 ** $offset);
+			$offset++;
+		}
+		$this->writeBoundedIntAuto(0, (3 ** 4) - 1, $packed);
+	}
+
+	/**
+	 * @param BrewingStandSlot[] $slots
+	 * @phpstan-param array<int, BrewingStandSlot> $slots
+	 *
+	 * @deprecated Use {@link enumSet()} instead.
+	 */
+	public function brewingStandSlots(array &$slots) : void{
+		$this->enumSet($slots, BrewingStandSlot::cases());
+	}
+
+	public function railShape(int &$railShape) : void{
+		$this->int(4, $railShape);
+	}
+
+	public function straightOnlyRailShape(int &$railShape) : void{
+		$this->int(3, $railShape);
+	}
+
+	public function enum(\UnitEnum &$case) : void{
+		$metadata = RuntimeEnumMetadata::from($case);
+		$this->writeInt($metadata->bits, $metadata->enumToInt($case));
+	}
+
+	public function enumSet(array &$set, array $allCases) : void{
+		foreach($allCases as $case){
+			$this->writeBool(isset($set[spl_object_id($case)]));
+		}
+	}
+
+	public function getValue() : int{ return $this->value; }
+
+	public function getOffset() : int{ return $this->offset; }
+}
diff --git a/src/data/runtime/RuntimeEnumDescriber.php b/src/data/runtime/RuntimeEnumDescriber.php
new file mode 100644
index 0000000000..79550d041b
--- /dev/null
+++ b/src/data/runtime/RuntimeEnumDescriber.php
@@ -0,0 +1,61 @@
+<?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\runtime;
+
+/**
+ * Provides backwards-compatible shims for the old codegen'd enum describer methods.
+ * This is kept for plugin backwards compatibility, but these functions should not be used in new code.
+ * @deprecated
+ */
+interface RuntimeEnumDescriber{
+
+	public function bellAttachmentType(\pocketmine\block\utils\BellAttachmentType &$value) : void;
+
+	public function copperOxidation(\pocketmine\block\utils\CopperOxidation &$value) : void;
+
+	public function coralType(\pocketmine\block\utils\CoralType &$value) : void;
+
+	public function dirtType(\pocketmine\block\utils\DirtType &$value) : void;
+
+	public function dripleafState(\pocketmine\block\utils\DripleafState &$value) : void;
+
+	public function dyeColor(\pocketmine\block\utils\DyeColor &$value) : void;
+
+	public function froglightType(\pocketmine\block\utils\FroglightType &$value) : void;
+
+	public function leverFacing(\pocketmine\block\utils\LeverFacing &$value) : void;
+
+	public function medicineType(\pocketmine\item\MedicineType &$value) : void;
+
+	public function mobHeadType(\pocketmine\block\utils\MobHeadType &$value) : void;
+
+	public function mushroomBlockType(\pocketmine\block\utils\MushroomBlockType &$value) : void;
+
+	public function potionType(\pocketmine\item\PotionType &$value) : void;
+
+	public function slabType(\pocketmine\block\utils\SlabType &$value) : void;
+
+	public function suspiciousStewType(\pocketmine\item\SuspiciousStewType &$value) : void;
+
+}
diff --git a/src/data/runtime/RuntimeEnumMetadata.php b/src/data/runtime/RuntimeEnumMetadata.php
new file mode 100644
index 0000000000..261b7a1bc3
--- /dev/null
+++ b/src/data/runtime/RuntimeEnumMetadata.php
@@ -0,0 +1,114 @@
+<?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\runtime;
+
+use function array_values;
+use function ceil;
+use function count;
+use function log;
+use function spl_object_id;
+use function usort;
+
+/**
+ * A big hack to allow lazily associating enum cases with packed bit values for RuntimeDataDescriber :)
+ *
+ * @internal
+ * @phpstan-template T of \UnitEnum
+ */
+final class RuntimeEnumMetadata{
+	public readonly int $bits;
+
+	/**
+	 * @var object[]
+	 * @phpstan-var list<T>
+	 */
+	private readonly array $intToEnum;
+	/**
+	 * @var int[]
+	 * @phpstan-var array<int, int>
+	 */
+	private readonly array $enumToInt;
+
+	/**
+	 * @param \UnitEnum[] $members
+	 * @phpstan-param list<T> $members
+	 */
+	public function __construct(
+		array $members
+	){
+		usort($members, fn(\UnitEnum $a, \UnitEnum $b) => $a->name <=> $b->name); //sort by name to ensure consistent ordering (and thus consistent bit assignments)
+
+		$this->bits = (int) ceil(log(count($members), 2));
+		$this->intToEnum = array_values($members);
+
+		$reversed = [];
+		foreach($this->intToEnum as $int => $enum){
+			$reversed[spl_object_id($enum)] = $int;
+		}
+
+		$this->enumToInt = $reversed;
+	}
+
+	/**
+	 * @phpstan-return T|null
+	 */
+	public function intToEnum(int $value) : ?object{
+		return $this->intToEnum[$value] ?? null;
+	}
+
+	/**
+	 * @phpstan-param T $enum
+	 */
+	public function enumToInt(object $enum) : int{
+		return $this->enumToInt[spl_object_id($enum)];
+	}
+
+	/**
+	 * @var self[]
+	 * @phpstan-var array<class-string, object>
+	 */
+	private static array $cache = [];
+
+	/**
+	 * @phpstan-template TEnum of \UnitEnum
+	 * @phpstan-param TEnum $case
+	 *
+	 * @phpstan-return self<TEnum>
+	 */
+	public static function from(\UnitEnum $case) : self{
+		$class = $case::class;
+		/** @phpstan-var self<TEnum>|null $metadata */
+		$metadata = self::$cache[$class] ?? null;
+		if($metadata === null){
+			/**
+			 * PHPStan can't infer this correctly :( https://github.com/phpstan/phpstan/issues/7162
+			 * @phpstan-var list<TEnum> $cases
+			 */
+			$cases = $case::cases();
+			self::$cache[$class] = $metadata = new self($cases);
+		}
+
+		return $metadata;
+	}
+}
diff --git a/src/entity/Attribute.php b/src/entity/Attribute.php
index 5e27f92abc..829e3d26cd 100644
--- a/src/entity/Attribute.php
+++ b/src/entity/Attribute.php
@@ -48,32 +48,19 @@ class Attribute{
 	public const ZOMBIE_SPAWN_REINFORCEMENTS = self::MC_PREFIX . "zombie.spawn_reinforcements";
 	public const LAVA_MOVEMENT = self::MC_PREFIX . "lava_movement";
 
-	/** @var string */
-	protected $id;
-	/** @var float */
-	protected $minValue;
-	/** @var float */
-	protected $maxValue;
-	/** @var float */
-	protected $defaultValue;
-	/** @var float */
-	protected $currentValue;
-	/** @var bool */
-	protected $shouldSend;
+	protected float $currentValue;
+	protected bool $desynchronized = true;
 
-	/** @var bool */
-	protected $desynchronized = true;
-
-	public function __construct(string $id, float $minValue, float $maxValue, float $defaultValue, bool $shouldSend = true){
+	public function __construct(
+		protected string $id,
+		protected float $minValue,
+		protected float $maxValue,
+		protected float $defaultValue,
+		protected bool $shouldSend = true
+	){
 		if($minValue > $maxValue || $defaultValue > $maxValue || $defaultValue < $minValue){
 			throw new \InvalidArgumentException("Invalid ranges: min value: $minValue, max value: $maxValue, $defaultValue: $defaultValue");
 		}
-		$this->id = $id;
-		$this->minValue = $minValue;
-		$this->maxValue = $maxValue;
-		$this->defaultValue = $defaultValue;
-		$this->shouldSend = $shouldSend;
-
 		$this->currentValue = $this->defaultValue;
 	}
 
diff --git a/src/entity/Entity.php b/src/entity/Entity.php
index bdcd088a58..9bd0de9eac 100644
--- a/src/entity/Entity.php
+++ b/src/entity/Entity.php
@@ -35,6 +35,7 @@ use pocketmine\event\entity\EntityMotionEvent;
 use pocketmine\event\entity\EntityRegainHealthEvent;
 use pocketmine\event\entity\EntitySpawnEvent;
 use pocketmine\event\entity\EntityTeleportEvent;
+use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector2;
@@ -44,6 +45,8 @@ use pocketmine\nbt\tag\DoubleTag;
 use pocketmine\nbt\tag\FloatTag;
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\StringTag;
+use pocketmine\network\mcpe\EntityEventBroadcaster;
+use pocketmine\network\mcpe\NetworkBroadcastUtils;
 use pocketmine\network\mcpe\protocol\AddActorPacket;
 use pocketmine\network\mcpe\protocol\MoveActorAbsolutePacket;
 use pocketmine\network\mcpe\protocol\SetActorMotionPacket;
@@ -58,6 +61,7 @@ use pocketmine\Server;
 use pocketmine\timings\Timings;
 use pocketmine\timings\TimingsHandler;
 use pocketmine\utils\Utils;
+use pocketmine\VersionInfo;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\Position;
 use pocketmine\world\sound\Sound;
@@ -71,7 +75,6 @@ use function deg2rad;
 use function floor;
 use function fmod;
 use function get_class;
-use function lcg_value;
 use function sin;
 use function spl_object_id;
 use const M_PI_2;
@@ -99,126 +102,84 @@ abstract class Entity{
 		return self::$entityCount++;
 	}
 
-	/** @var Player[] */
-	protected $hasSpawned = [];
+	/**
+	 * @var Player[]
+	 * @phpstan-var array<int, Player>
+	 */
+	protected array $hasSpawned = [];
 
-	/** @var int */
-	protected $id;
+	protected int $id;
 
 	private EntityMetadataCollection $networkProperties;
 
-	/** @var EntityDamageEvent|null */
-	protected $lastDamageCause = null;
+	protected ?EntityDamageEvent $lastDamageCause = null;
 
 	/** @var Block[]|null */
-	protected $blocksAround;
+	protected ?array $blocksAround = null;
 
-	/** @var Location */
-	protected $location;
-	/** @var Location */
-	protected $lastLocation;
-	/** @var Vector3 */
-	protected $motion;
-	/** @var Vector3 */
-	protected $lastMotion;
-	/** @var bool */
-	protected $forceMovementUpdate = false;
+	protected Location $location;
+	protected Location $lastLocation;
+	protected Vector3 $motion;
+	protected Vector3 $lastMotion;
+	protected bool $forceMovementUpdate = false;
+	private bool $checkBlockIntersectionsNextTick = true;
 
-	/** @var AxisAlignedBB */
-	public $boundingBox;
-	/** @var bool */
-	public $onGround = false;
+	public AxisAlignedBB $boundingBox;
+	public bool $onGround = false;
 
-	/** @var EntitySizeInfo */
-	public $size;
+	public EntitySizeInfo $size;
 
 	private float $health = 20.0;
 	private int $maxHealth = 20;
 
-	/** @var float */
-	protected $ySize = 0.0;
-	/** @var float */
-	protected $stepHeight = 0.0;
-	/** @var bool */
-	public $keepMovement = false;
+	protected float $ySize = 0.0;
+	protected float $stepHeight = 0.0;
+	public bool $keepMovement = false;
 
-	/** @var float */
-	public $fallDistance = 0.0;
-	/** @var int */
-	public $ticksLived = 0;
-	/** @var int */
-	public $lastUpdate;
-	/** @var int */
-	protected $fireTicks = 0;
-	/** @var bool */
-	public $canCollide = true;
-
-	/** @var bool */
-	protected $isStatic = false;
+	public float $fallDistance = 0.0;
+	public int $ticksLived = 0;
+	public int $lastUpdate;
+	protected int $fireTicks = 0;
 
 	private bool $savedWithChunk = true;
 
-	/** @var bool */
-	public $isCollided = false;
-	/** @var bool */
-	public $isCollidedHorizontally = false;
-	/** @var bool */
-	public $isCollidedVertically = false;
+	public bool $isCollided = false;
+	public bool $isCollidedHorizontally = false;
+	public bool $isCollidedVertically = false;
 
-	/** @var int */
-	public $noDamageTicks = 0;
-	/** @var bool */
-	protected $justCreated = true;
+	public int $noDamageTicks = 0;
+	protected bool $justCreated = true;
 
-	/** @var AttributeMap */
-	protected $attributeMap;
+	protected AttributeMap $attributeMap;
 
-	/** @var float */
-	protected $gravity;
-	/** @var float */
-	protected $drag;
-	/** @var bool */
-	protected $gravityEnabled = true;
+	protected float $gravity;
+	protected float $drag;
+	protected bool $gravityEnabled = true;
 
-	/** @var Server */
-	protected $server;
+	protected Server $server;
 
-	/** @var bool */
-	protected $closed = false;
+	protected bool $closed = false;
 	private bool $closeInFlight = false;
 	private bool $needsDespawn = false;
 
-	/** @var TimingsHandler */
-	protected $timings;
+	protected TimingsHandler $timings;
 
 	protected bool $networkPropertiesDirty = false;
 
-	/** @var string */
-	protected $nameTag = "";
-	/** @var bool */
-	protected $nameTagVisible = true;
-	/** @var bool */
-	protected $alwaysShowNameTag = false;
-	/** @var string */
-	protected $scoreTag = "";
-	/** @var float */
-	protected $scale = 1.0;
+	protected string $nameTag = "";
+	protected bool $nameTagVisible = true;
+	protected bool $alwaysShowNameTag = false;
+	protected string $scoreTag = "";
+	protected float $scale = 1.0;
 
-	/** @var bool */
-	protected $canClimb = false;
-	/** @var bool */
-	protected $canClimbWalls = false;
-	/** @var bool */
-	protected $immobile = false;
-	/** @var bool */
-	protected $invisible = false;
-	/** @var bool */
-	protected $silent = false;
+	protected bool $canClimb = false;
+	protected bool $canClimbWalls = false;
+	protected bool $noClientPredictions = false;
+	protected bool $invisible = false;
+	protected bool $silent = false;
 
-	/** @var int|null */
-	protected $ownerId = null;
-	/** @var int|null */
-	protected $targetId = null;
+	protected ?int $ownerId = null;
+	protected ?int $targetId = null;
 
 	private bool $constructorCalled = false;
 
@@ -232,6 +193,8 @@ abstract class Entity{
 		$this->timings = Timings::getEntityTimings($this);
 
 		$this->size = $this->getInitialSizeInfo();
+		$this->drag = $this->getInitialDragMultiplier();
+		$this->gravity = $this->getInitialGravity();
 
 		$this->id = self::nextRuntimeId();
 		$this->server = $location->getWorld()->getServer();
@@ -244,7 +207,7 @@ abstract class Entity{
 		if($nbt !== null){
 			$this->motion = EntityDataHelper::parseVec3($nbt, self::TAG_MOTION, true);
 		}else{
-			$this->motion = new Vector3(0, 0, 0);
+			$this->motion = Vector3::zero();
 		}
 
 		$this->resetLastMovements();
@@ -265,6 +228,21 @@ abstract class Entity{
 
 	abstract protected function getInitialSizeInfo() : EntitySizeInfo;
 
+	/**
+	 * Returns the percentage by which the entity's velocity is reduced per tick when moving through air.
+	 * The entity's velocity is multiplied by 1 minus this value.
+	 *
+	 * @return float 0-1
+	 */
+	abstract protected function getInitialDragMultiplier() : float;
+
+	/**
+	 * Returns the downwards acceleration of the entity when falling, in blocks/tick².
+	 *
+	 * @return float minimum 0
+	 */
+	abstract protected function getInitialGravity() : float;
+
 	public function getNameTag() : string{
 		return $this->nameTag;
 	}
@@ -277,6 +255,14 @@ abstract class Entity{
 		return $this->alwaysShowNameTag;
 	}
 
+	/**
+	 * Returns whether players can rename this entity using a name tag.
+	 * Note that plugins can still name entities using setNameTag().
+	 */
+	public function canBeRenamed() : bool{
+		return false;
+	}
+
 	public function setNameTag(string $name) : void{
 		$this->nameTag = $name;
 		$this->networkPropertiesDirty = true;
@@ -340,12 +326,24 @@ abstract class Entity{
 		$this->networkPropertiesDirty = true;
 	}
 
-	public function isImmobile() : bool{
-		return $this->immobile;
+	/**
+	 * Returns whether clients may predict this entity's behaviour and movement. Used for things like water movement,
+	 * burning, and movement smoothing (interpolation).
+	 */
+	public function hasNoClientPredictions() : bool{
+		return $this->noClientPredictions;
 	}
 
-	public function setImmobile(bool $value = true) : void{
-		$this->immobile = $value;
+	/**
+	 * Things such as movement in water, burning, etc. may be predicted by the client. This is sometimes not desirable,
+	 * since server-side logic may differ from client-side prediction. However, things like movement smoothing
+	 * (interpolation) are also controlled by this, so it should be used with care.
+	 *
+	 * Setting this flag will also disable player movement inputs, but this should not be relied on, as cheat clients
+	 * will be able to bypass it.
+	 */
+	public function setNoClientPredictions(bool $value = true) : void{
+		$this->noClientPredictions = $value;
 		$this->networkPropertiesDirty = true;
 	}
 
@@ -503,6 +501,8 @@ abstract class Entity{
 		$nbt->setShort(self::TAG_FIRE, $this->fireTicks);
 		$nbt->setByte(self::TAG_ON_GROUND, $this->onGround ? 1 : 0);
 
+		$nbt->setLong(VersionInfo::TAG_WORLD_DATA_VERSION, VersionInfo::WORLD_DATA_VERSION);
+
 		return $nbt;
 	}
 
@@ -530,7 +530,12 @@ abstract class Entity{
 	}
 
 	public function attack(EntityDamageEvent $source) : void{
-		if($this->isFireProof() && ($source->getCause() === EntityDamageEvent::CAUSE_FIRE || $source->getCause() === EntityDamageEvent::CAUSE_FIRE_TICK)){
+		if($this->isFireProof() && (
+				$source->getCause() === EntityDamageEvent::CAUSE_FIRE ||
+				$source->getCause() === EntityDamageEvent::CAUSE_FIRE_TICK ||
+				$source->getCause() === EntityDamageEvent::CAUSE_LAVA
+			)
+		){
 			$source->cancel();
 		}
 		$source->call();
@@ -647,7 +652,10 @@ abstract class Entity{
 
 		$hasUpdate = false;
 
-		$this->checkBlockIntersections();
+		if($this->checkBlockIntersectionsNextTick){
+			$this->checkBlockIntersections();
+		}
+		$this->checkBlockIntersectionsNextTick = true;
 
 		if($this->location->y <= World::Y_MIN - 16 && $this->isAlive()){
 			$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_VOID, 10);
@@ -694,8 +702,10 @@ abstract class Entity{
 		if($fireTicks < 0 || $fireTicks > 0x7fff){
 			throw new \InvalidArgumentException("Fire ticks must be in range 0 ... " . 0x7fff . ", got $fireTicks");
 		}
-		$this->fireTicks = $fireTicks;
-		$this->networkPropertiesDirty = true;
+		if(!$this->isFireProof()){
+			$this->fireTicks = $fireTicks;
+			$this->networkPropertiesDirty = true;
+		}
 	}
 
 	public function extinguish() : void{
@@ -708,12 +718,13 @@ abstract class Entity{
 	}
 
 	protected function doOnFireTick(int $tickDiff = 1) : bool{
-		if($this->isFireProof() && $this->fireTicks > 1){
-			$this->fireTicks = 1;
-		}else{
-			$this->fireTicks -= $tickDiff;
+		if($this->isFireProof() && $this->isOnFire()){
+			$this->extinguish();
+			return false;
 		}
 
+		$this->fireTicks -= $tickDiff;
+
 		if(($this->fireTicks % 20 === 0) || $tickDiff > 20){
 			$this->dealFireDamage();
 		}
@@ -753,7 +764,7 @@ abstract class Entity{
 		$wasStill = $this->lastMotion->lengthSquared() == 0.0;
 		if($wasStill !== $still){
 			//TODO: hack for client-side AI interference: prevent client sided movement when motion is 0
-			$this->setImmobile($still);
+			$this->setNoClientPredictions($still);
 		}
 
 		if($teleport || $diffPosition > 0.0001 || $diffRotation > 1.0 || (!$wasStill && $still)){
@@ -774,33 +785,34 @@ abstract class Entity{
 	}
 
 	protected function broadcastMovement(bool $teleport = false) : void{
-		if($teleport){
-			//TODO: HACK! workaround for https://github.com/pmmp/PocketMine-MP/issues/4394
-			//this happens because MoveActor*Packet doesn't clear interpolation targets on the client, so the entity
-			//snaps to the teleport position, but then lerps back to the original position if a normal movement for the
-			//entity was recently broadcasted. This can be seen with players throwing ender pearls.
-			//TODO: remove this if the bug ever gets fixed (lol)
-			foreach($this->hasSpawned as $player){
-				$this->despawnFrom($player);
-				$this->spawnTo($player);
-			}
-		}else{
-			$this->server->broadcastPackets($this->hasSpawned, [MoveActorAbsolutePacket::create(
-				$this->id,
-				$this->getOffsetPosition($this->location),
-				$this->location->pitch,
-				$this->location->yaw,
-				$this->location->yaw,
-				(
-					//TODO: if the above hack for #4394 gets removed, we should be setting FLAG_TELEPORT here
-					($this->onGround ? MoveActorAbsolutePacket::FLAG_GROUND : 0)
-				)
-			)]);
-		}
+		NetworkBroadcastUtils::broadcastPackets($this->hasSpawned, [MoveActorAbsolutePacket::create(
+			$this->id,
+			$this->getOffsetPosition($this->location),
+			$this->location->pitch,
+			$this->location->yaw,
+			$this->location->yaw,
+			(
+				//TODO: We should be setting FLAG_TELEPORT here to disable client-side movement interpolation, but it
+				//breaks player teleporting (observers see the player rubberband back to the pre-teleport position while
+				//the teleported player sees themselves at the correct position), and does nothing whatsoever for
+				//non-player entities (movement is still interpolated). Both of these are client bugs.
+				//See https://github.com/pmmp/PocketMine-MP/issues/4394
+				($this->onGround ? MoveActorAbsolutePacket::FLAG_GROUND : 0)
+			)
+		)]);
 	}
 
 	protected function broadcastMotion() : void{
-		$this->server->broadcastPackets($this->hasSpawned, [SetActorMotionPacket::create($this->id, $this->getMotion())]);
+		NetworkBroadcastUtils::broadcastPackets($this->hasSpawned, [SetActorMotionPacket::create($this->id, $this->getMotion(), tick: 0)]);
+	}
+
+	public function getGravity() : float{
+		return $this->gravity;
+	}
+
+	public function setGravity(float $gravity) : void{
+		Utils::checkFloatNotInfOrNaN("gravity", $gravity);
+		$this->gravity = $gravity;
 	}
 
 	public function hasGravity() : bool{
@@ -841,7 +853,7 @@ abstract class Entity{
 
 	protected function checkObstruction(float $x, float $y, float $z) : bool{
 		$world = $this->getWorld();
-		if(count($world->getCollisionBoxes($this, $this->getBoundingBox(), false)) === 0){
+		if(count($world->getBlockCollisionBoxes($this->boundingBox)) === 0){
 			return false;
 		}
 
@@ -897,7 +909,7 @@ abstract class Entity{
 				return false;
 			}
 
-			$force = lcg_value() * 0.2 + 0.1;
+			$force = Utils::getRandomFloat() * 0.2 + 0.1;
 
 			$this->motion = match($direction){
 				Facing::WEST => $this->motion->withComponents(-$force, null, null),
@@ -1128,6 +1140,7 @@ abstract class Entity{
 		$this->blocksAround = null;
 
 		Timings::$entityMove->startTiming();
+		Timings::$entityMoveCollision->startTiming();
 
 		$wantedX = $dx;
 		$wantedY = $dy;
@@ -1142,7 +1155,7 @@ abstract class Entity{
 
 			assert(abs($dx) <= 20 && abs($dy) <= 20 && abs($dz) <= 20, "Movement distance is excessive: dx=$dx, dy=$dy, dz=$dz");
 
-			$list = $this->getWorld()->getCollisionBoxes($this, $moveBB->addCoord($dx, $dy, $dz), false);
+			$list = $this->getWorld()->getBlockCollisionBoxes($moveBB->addCoord($dx, $dy, $dz));
 
 			foreach($list as $bb){
 				$dy = $bb->calculateYOffset($moveBB, $dy);
@@ -1174,7 +1187,7 @@ abstract class Entity{
 
 				$stepBB = clone $this->boundingBox;
 
-				$list = $this->getWorld()->getCollisionBoxes($this, $stepBB->addCoord($dx, $dy, $dz), false);
+				$list = $this->getWorld()->getBlockCollisionBoxes($stepBB->addCoord($dx, $dy, $dz));
 				foreach($list as $bb){
 					$dy = $bb->calculateYOffset($stepBB, $dy);
 				}
@@ -1212,6 +1225,7 @@ abstract class Entity{
 
 			$this->boundingBox = $moveBB;
 		}
+		Timings::$entityMoveCollision->stopTiming();
 
 		$this->location = new Location(
 			($this->boundingBox->minX + $this->boundingBox->maxX) / 2,
@@ -1295,6 +1309,7 @@ abstract class Entity{
 	}
 
 	protected function checkBlockIntersections() : void{
+		$this->checkBlockIntersectionsNextTick = false;
 		$vectors = [];
 
 		foreach($this->getBlocksAroundWithEntityInsideActions() as $block){
@@ -1306,10 +1321,12 @@ abstract class Entity{
 			}
 		}
 
-		$vector = Vector3::sum(...$vectors);
-		if($vector->lengthSquared() > 0){
-			$d = 0.014;
-			$this->motion = $this->motion->addVector($vector->normalize()->multiply($d));
+		if(count($vectors) > 0){
+			$vector = Vector3::sum(...$vectors);
+			if($vector->lengthSquared() > 0){
+				$d = 0.014;
+				$this->motion = $this->motion->addVector($vector->normalize()->multiply($d));
+			}
 		}
 	}
 
@@ -1528,7 +1545,7 @@ abstract class Entity{
 		$id = spl_object_id($player);
 		if(isset($this->hasSpawned[$id])){
 			if($send){
-				$player->getNetworkSession()->onEntityRemoved($this);
+				$player->getNetworkSession()->getEntityEventBroadcaster()->onEntityRemoved([$player->getNetworkSession()], $this);
 			}
 			unset($this->hasSpawned[$id]);
 		}
@@ -1539,9 +1556,18 @@ abstract class Entity{
 	 * player moves, viewers will once again be able to see the entity.
 	 */
 	public function despawnFromAll() : void{
-		foreach($this->hasSpawned as $player){
-			$this->despawnFrom($player);
-		}
+		NetworkBroadcastUtils::broadcastEntityEvent(
+			$this->hasSpawned,
+			fn(EntityEventBroadcaster $broadcaster, array $recipients) => $broadcaster->onEntityRemoved($recipients, $this)
+		);
+		$this->hasSpawned = [];
+	}
+
+	/**
+	 * Returns the item that players will equip when middle-clicking on this entity.
+	 */
+	public function getPickedItem() : ?Item{
+		return null;
 	}
 
 	/**
@@ -1615,9 +1641,7 @@ abstract class Entity{
 		$targets = $targets ?? $this->hasSpawned;
 		$data = $data ?? $this->getAllNetworkData();
 
-		foreach($targets as $p){
-			$p->getNetworkSession()->syncActorData($this, $data);
-		}
+		NetworkBroadcastUtils::broadcastEntityEvent($targets, fn(EntityEventBroadcaster $broadcaster, array $recipients) => $broadcaster->syncActorData($recipients, $this, $data));
 	}
 
 	/**
@@ -1660,7 +1684,7 @@ abstract class Entity{
 		$properties->setGenericFlag(EntityMetadataFlags::CAN_CLIMB, $this->canClimb);
 		$properties->setGenericFlag(EntityMetadataFlags::CAN_SHOW_NAMETAG, $this->nameTagVisible);
 		$properties->setGenericFlag(EntityMetadataFlags::HAS_COLLISION, true);
-		$properties->setGenericFlag(EntityMetadataFlags::IMMOBILE, $this->immobile);
+		$properties->setGenericFlag(EntityMetadataFlags::NO_AI, $this->noClientPredictions);
 		$properties->setGenericFlag(EntityMetadataFlags::INVISIBLE, $this->invisible);
 		$properties->setGenericFlag(EntityMetadataFlags::SILENT, $this->silent);
 		$properties->setGenericFlag(EntityMetadataFlags::ONFIRE, $this->isOnFire());
@@ -1671,7 +1695,7 @@ abstract class Entity{
 	 * @param Player[]|null $targets
 	 */
 	public function broadcastAnimation(Animation $animation, ?array $targets = null) : void{
-		$this->server->broadcastPackets($targets ?? $this->getViewers(), $animation->encode());
+		NetworkBroadcastUtils::broadcastPackets($targets ?? $this->getViewers(), $animation->encode());
 	}
 
 	/**
@@ -1680,7 +1704,7 @@ abstract class Entity{
 	 */
 	public function broadcastSound(Sound $sound, ?array $targets = null) : void{
 		if(!$this->silent){
-			$this->server->broadcastPackets($targets ?? $this->getViewers(), $sound->encode($this->location));
+			$this->getWorld()->addSound($this->location->asVector3(), $sound, $targets ?? $this->getViewers());
 		}
 	}
 
diff --git a/src/entity/EntityDataHelper.php b/src/entity/EntityDataHelper.php
index 1a15d74580..60e45e535a 100644
--- a/src/entity/EntityDataHelper.php
+++ b/src/entity/EntityDataHelper.php
@@ -80,7 +80,7 @@ final class EntityDataHelper{
 	public static function parseVec3(CompoundTag $nbt, string $tagName, bool $optional) : Vector3{
 		$pos = $nbt->getTag($tagName);
 		if($pos === null && $optional){
-			return new Vector3(0, 0, 0);
+			return Vector3::zero();
 		}
 		if(!($pos instanceof ListTag) || ($pos->getTagType() !== NBT::TAG_Double && $pos->getTagType() !== NBT::TAG_Float)){
 			throw new SavedDataLoadingException("'$tagName' should be a List<Double> or List<Float>");
diff --git a/src/entity/EntityFactory.php b/src/entity/EntityFactory.php
index 8aa83b4718..03d9c03e6b 100644
--- a/src/entity/EntityFactory.php
+++ b/src/entity/EntityFactory.php
@@ -26,12 +26,13 @@ namespace pocketmine\entity;
 use DaveRandom\CallbackValidator\CallbackType;
 use DaveRandom\CallbackValidator\ParameterType;
 use DaveRandom\CallbackValidator\ReturnType;
-use pocketmine\block\BlockFactory;
-use pocketmine\data\bedrock\EntityLegacyIds as LegacyIds;
+use pocketmine\block\RuntimeBlockStateRegistry;
+use pocketmine\data\bedrock\LegacyEntityIdToStringIdMap;
 use pocketmine\data\bedrock\PotionTypeIdMap;
 use pocketmine\data\bedrock\PotionTypeIds;
 use pocketmine\data\SavedDataLoadingException;
 use pocketmine\entity\EntityDataHelper as Helper;
+use pocketmine\entity\object\EndCrystal;
 use pocketmine\entity\object\ExperienceOrb;
 use pocketmine\entity\object\FallingBlock;
 use pocketmine\entity\object\ItemEntity;
@@ -42,6 +43,7 @@ use pocketmine\entity\projectile\Arrow;
 use pocketmine\entity\projectile\Egg;
 use pocketmine\entity\projectile\EnderPearl;
 use pocketmine\entity\projectile\ExperienceBottle;
+use pocketmine\entity\projectile\IceBomb;
 use pocketmine\entity\projectile\Snowball;
 use pocketmine\entity\projectile\SplashPotion;
 use pocketmine\item\Item;
@@ -86,19 +88,23 @@ final class EntityFactory{
 
 		$this->register(Arrow::class, function(World $world, CompoundTag $nbt) : Arrow{
 			return new Arrow(Helper::parseLocation($nbt, $world), null, $nbt->getByte(Arrow::TAG_CRIT, 0) === 1, $nbt);
-		}, ['Arrow', 'minecraft:arrow'], LegacyIds::ARROW);
+		}, ['Arrow', 'minecraft:arrow']);
 
 		$this->register(Egg::class, function(World $world, CompoundTag $nbt) : Egg{
 			return new Egg(Helper::parseLocation($nbt, $world), null, $nbt);
-		}, ['Egg', 'minecraft:egg'], LegacyIds::EGG);
+		}, ['Egg', 'minecraft:egg']);
+
+		$this->register(EndCrystal::class, function(World $world, CompoundTag $nbt) : EndCrystal{
+			return new EndCrystal(Helper::parseLocation($nbt, $world), $nbt);
+		}, ['EnderCrystal', 'minecraft:ender_crystal']);
 
 		$this->register(EnderPearl::class, function(World $world, CompoundTag $nbt) : EnderPearl{
 			return new EnderPearl(Helper::parseLocation($nbt, $world), null, $nbt);
-		}, ['ThrownEnderpearl', 'minecraft:ender_pearl'], LegacyIds::ENDER_PEARL);
+		}, ['ThrownEnderpearl', 'minecraft:ender_pearl']);
 
 		$this->register(ExperienceBottle::class, function(World $world, CompoundTag $nbt) : ExperienceBottle{
 			return new ExperienceBottle(Helper::parseLocation($nbt, $world), null, $nbt);
-		}, ['ThrownExpBottle', 'minecraft:xp_bottle'], LegacyIds::XP_BOTTLE);
+		}, ['ThrownExpBottle', 'minecraft:xp_bottle']);
 
 		$this->register(ExperienceOrb::class, function(World $world, CompoundTag $nbt) : ExperienceOrb{
 			$value = 1;
@@ -109,11 +115,15 @@ final class EntityFactory{
 			}
 
 			return new ExperienceOrb(Helper::parseLocation($nbt, $world), $value, $nbt);
-		}, ['XPOrb', 'minecraft:xp_orb'], LegacyIds::XP_ORB);
+		}, ['XPOrb', 'minecraft:xp_orb']);
 
 		$this->register(FallingBlock::class, function(World $world, CompoundTag $nbt) : FallingBlock{
-			return new FallingBlock(Helper::parseLocation($nbt, $world), FallingBlock::parseBlockNBT(BlockFactory::getInstance(), $nbt), $nbt);
-		}, ['FallingSand', 'minecraft:falling_block'], LegacyIds::FALLING_BLOCK);
+			return new FallingBlock(Helper::parseLocation($nbt, $world), FallingBlock::parseBlockNBT(RuntimeBlockStateRegistry::getInstance(), $nbt), $nbt);
+		}, ['FallingSand', 'minecraft:falling_block']);
+
+		$this->register(IceBomb::class, function(World $world, CompoundTag $nbt) : IceBomb{
+			return new IceBomb(Helper::parseLocation($nbt, $world), null, $nbt);
+		}, ['minecraft:ice_bomb']);
 
 		$this->register(ItemEntity::class, function(World $world, CompoundTag $nbt) : ItemEntity{
 			$itemTag = $nbt->getCompoundTag(ItemEntity::TAG_ITEM);
@@ -126,7 +136,7 @@ final class EntityFactory{
 				throw new SavedDataLoadingException("Item is invalid");
 			}
 			return new ItemEntity(Helper::parseLocation($nbt, $world), $item, $nbt);
-		}, ['Item', 'minecraft:item'], LegacyIds::ITEM);
+		}, ['Item', 'minecraft:item']);
 
 		$this->register(Painting::class, function(World $world, CompoundTag $nbt) : Painting{
 			$motive = PaintingMotive::getMotiveByName($nbt->getString(Painting::TAG_MOTIVE));
@@ -143,15 +153,15 @@ final class EntityFactory{
 			}
 
 			return new Painting(Helper::parseLocation($nbt, $world), $blockIn, $facing, $motive, $nbt);
-		}, ['Painting', 'minecraft:painting'], LegacyIds::PAINTING);
+		}, ['Painting', 'minecraft:painting']);
 
 		$this->register(PrimedTNT::class, function(World $world, CompoundTag $nbt) : PrimedTNT{
 			return new PrimedTNT(Helper::parseLocation($nbt, $world), $nbt);
-		}, ['PrimedTnt', 'PrimedTNT', 'minecraft:tnt'], LegacyIds::TNT);
+		}, ['PrimedTnt', 'PrimedTNT', 'minecraft:tnt']);
 
 		$this->register(Snowball::class, function(World $world, CompoundTag $nbt) : Snowball{
 			return new Snowball(Helper::parseLocation($nbt, $world), null, $nbt);
-		}, ['Snowball', 'minecraft:snowball'], LegacyIds::SNOWBALL);
+		}, ['Snowball', 'minecraft:snowball']);
 
 		$this->register(SplashPotion::class, function(World $world, CompoundTag $nbt) : SplashPotion{
 			$potionType = PotionTypeIdMap::getInstance()->fromId($nbt->getShort(SplashPotion::TAG_POTION_ID, PotionTypeIds::WATER));
@@ -159,19 +169,19 @@ final class EntityFactory{
 				throw new SavedDataLoadingException("No such potion type");
 			}
 			return new SplashPotion(Helper::parseLocation($nbt, $world), null, $potionType, $nbt);
-		}, ['ThrownPotion', 'minecraft:potion', 'thrownpotion'], LegacyIds::SPLASH_POTION);
+		}, ['ThrownPotion', 'minecraft:potion', 'thrownpotion']);
 
 		$this->register(Squid::class, function(World $world, CompoundTag $nbt) : Squid{
 			return new Squid(Helper::parseLocation($nbt, $world), $nbt);
-		}, ['Squid', 'minecraft:squid'], LegacyIds::SQUID);
+		}, ['Squid', 'minecraft:squid']);
 
 		$this->register(Villager::class, function(World $world, CompoundTag $nbt) : Villager{
 			return new Villager(Helper::parseLocation($nbt, $world), $nbt);
-		}, ['Villager', 'minecraft:villager'], LegacyIds::VILLAGER);
+		}, ['Villager', 'minecraft:villager']);
 
 		$this->register(Zombie::class, function(World $world, CompoundTag $nbt) : Zombie{
 			return new Zombie(Helper::parseLocation($nbt, $world), $nbt);
-		}, ['Zombie', 'minecraft:zombie'], LegacyIds::ZOMBIE);
+		}, ['Zombie', 'minecraft:zombie']);
 
 		$this->register(Human::class, function(World $world, CompoundTag $nbt) : Human{
 			return new Human(Helper::parseLocation($nbt, $world), Human::parseSkinNBT($nbt), $nbt);
@@ -191,7 +201,7 @@ final class EntityFactory{
 	 *
 	 * @throws \InvalidArgumentException
 	 */
-	public function register(string $className, \Closure $creationFunc, array $saveNames, ?int $legacyMcpeSaveId = null) : void{
+	public function register(string $className, \Closure $creationFunc, array $saveNames) : void{
 		if(count($saveNames) === 0){
 			throw new \InvalidArgumentException("At least one save name must be provided");
 		}
@@ -205,9 +215,6 @@ final class EntityFactory{
 		foreach($saveNames as $name){
 			$this->creationFuncs[$name] = $creationFunc;
 		}
-		if($legacyMcpeSaveId !== null){
-			$this->creationFuncs[$legacyMcpeSaveId] = $creationFunc;
-		}
 
 		$this->saveNames[$className] = reset($saveNames);
 	}
@@ -225,7 +232,8 @@ final class EntityFactory{
 			if($saveId instanceof StringTag){
 				$func = $this->creationFuncs[$saveId->getValue()] ?? null;
 			}elseif($saveId instanceof IntTag){ //legacy MCPE format
-				$func = $this->creationFuncs[$saveId->getValue() & 0xff] ?? null;
+				$stringId = LegacyEntityIdToStringIdMap::getInstance()->legacyToString($saveId->getValue() & 0xff);
+				$func = $stringId !== null ? $this->creationFuncs[$stringId] ?? null : null;
 			}
 			if($func === null){
 				return null;
diff --git a/src/entity/Human.php b/src/entity/Human.php
index 58911a07cf..f2c4c7a740 100644
--- a/src/entity/Human.php
+++ b/src/entity/Human.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\entity;
 
+use pocketmine\data\bedrock\item\SavedItemStackData;
 use pocketmine\data\SavedDataLoadingException;
 use pocketmine\entity\animation\TotemUseAnimation;
 use pocketmine\entity\effect\EffectInstance;
@@ -36,6 +37,7 @@ use pocketmine\inventory\InventoryHolder;
 use pocketmine\inventory\PlayerEnderInventory;
 use pocketmine\inventory\PlayerInventory;
 use pocketmine\inventory\PlayerOffHandInventory;
+use pocketmine\item\enchantment\EnchantingHelper;
 use pocketmine\item\enchantment\VanillaEnchantments;
 use pocketmine\item\Item;
 use pocketmine\item\Totem;
@@ -45,11 +47,14 @@ use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\StringTag;
-use pocketmine\network\mcpe\convert\SkinAdapterSingleton;
 use pocketmine\network\mcpe\convert\TypeConverter;
+use pocketmine\network\mcpe\EntityEventBroadcaster;
+use pocketmine\network\mcpe\NetworkBroadcastUtils;
 use pocketmine\network\mcpe\protocol\AddPlayerPacket;
 use pocketmine\network\mcpe\protocol\PlayerListPacket;
 use pocketmine\network\mcpe\protocol\PlayerSkinPacket;
+use pocketmine\network\mcpe\protocol\types\AbilitiesData;
+use pocketmine\network\mcpe\protocol\types\AbilitiesLayer;
 use pocketmine\network\mcpe\protocol\types\command\CommandPermissions;
 use pocketmine\network\mcpe\protocol\types\DeviceOS;
 use pocketmine\network\mcpe\protocol\types\entity\EntityIds;
@@ -60,10 +65,8 @@ use pocketmine\network\mcpe\protocol\types\GameMode;
 use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
 use pocketmine\network\mcpe\protocol\types\PlayerPermissions;
-use pocketmine\network\mcpe\protocol\types\UpdateAbilitiesPacketLayer;
 use pocketmine\network\mcpe\protocol\UpdateAbilitiesPacket;
 use pocketmine\player\Player;
-use pocketmine\utils\Limits;
 use pocketmine\world\sound\TotemUseSound;
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidInterface;
@@ -73,7 +76,6 @@ use function array_key_exists;
 use function array_merge;
 use function array_values;
 use function min;
-use function random_int;
 
 class Human extends Living implements ProjectileSource, InventoryHolder{
 
@@ -89,7 +91,6 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 	private const TAG_XP_PROGRESS = "XpP"; //TAG_Float
 	private const TAG_LIFETIME_XP_TOTAL = "XpTotal"; //TAG_Int
 	private const TAG_XP_SEED = "XpSeed"; //TAG_Int
-	private const TAG_NAME_TAG = "NameTag"; //TAG_String
 	private const TAG_SKIN = "Skin"; //TAG_Compound
 	private const TAG_SKIN_NAME = "Name"; //TAG_String
 	private const TAG_SKIN_DATA = "Data"; //TAG_ByteArray
@@ -99,28 +100,18 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 
 	public static function getNetworkTypeId() : string{ return EntityIds::PLAYER; }
 
-	/** @var PlayerInventory */
-	protected $inventory;
+	protected PlayerInventory $inventory;
+	protected PlayerOffHandInventory $offHandInventory;
+	protected PlayerEnderInventory $enderInventory;
 
-	/** @var PlayerOffHandInventory */
-	protected $offHandInventory;
+	protected UuidInterface $uuid;
 
-	/** @var PlayerEnderInventory */
-	protected $enderInventory;
+	protected Skin $skin;
 
-	/** @var UuidInterface */
-	protected $uuid;
+	protected HungerManager $hungerManager;
+	protected ExperienceManager $xpManager;
 
-	/** @var Skin */
-	protected $skin;
-
-	/** @var HungerManager */
-	protected $hungerManager;
-	/** @var ExperienceManager */
-	protected $xpManager;
-
-	/** @var int */
-	protected $xpSeed;
+	protected int $xpSeed;
 
 	public function __construct(Location $location, Skin $skin, ?CompoundTag $nbt = null){
 		$this->skin = $skin;
@@ -173,8 +164,8 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 	 * @param Player[]|null $targets
 	 */
 	public function sendSkin(?array $targets = null) : void{
-		$this->server->broadcastPackets($targets ?? $this->hasSpawned, [
-			PlayerSkinPacket::create($this->getUniqueId(), "", "", SkinAdapterSingleton::get()->toSkinData($this->skin))
+		NetworkBroadcastUtils::broadcastPackets($targets ?? $this->hasSpawned, [
+			PlayerSkinPacket::create($this->getUniqueId(), "", "", TypeConverter::getInstance()->getSkinAdapter()->toSkinData($this->skin))
 		]);
 	}
 
@@ -188,9 +179,10 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 	}
 
 	public function emote(string $emoteId) : void{
-		foreach($this->getViewers() as $player){
-			$player->getNetworkSession()->onEmote($this, $emoteId);
-		}
+		NetworkBroadcastUtils::broadcastEntityEvent(
+			$this->getViewers(),
+			fn(EntityEventBroadcaster $broadcaster, array $recipients) => $broadcaster->onEmote($recipients, $this, $emoteId)
+		);
 	}
 
 	public function getHungerManager() : HungerManager{
@@ -218,16 +210,25 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 		return $this->xpManager;
 	}
 
+	public function getEnchantmentSeed() : int{
+		return $this->xpSeed;
+	}
+
+	public function setEnchantmentSeed(int $seed) : void{
+		$this->xpSeed = $seed;
+	}
+
+	public function regenerateEnchantmentSeed() : void{
+		$this->xpSeed = EnchantingHelper::generateSeed();
+	}
+
 	public function getXpDropAmount() : int{
 		//this causes some XP to be lost on death when above level 1 (by design), dropping at most enough points for
 		//about 7.5 levels of XP.
 		return min(100, 7 * $this->xpManager->getXpLevel());
 	}
 
-	/**
-	 * @return PlayerInventory
-	 */
-	public function getInventory(){
+	public function getInventory() : PlayerInventory{
 		return $this->inventory;
 	}
 
@@ -241,10 +242,6 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 	 * For Human entities which are not players, sets their properties such as nametag, skin and UUID from NBT.
 	 */
 	protected function initHumanData(CompoundTag $nbt) : void{
-		if(($nameTagTag = $nbt->getTag(self::TAG_NAME_TAG)) instanceof StringTag){
-			$this->setNameTag($nameTagTag->getValue());
-		}
-
 		//TODO: use of NIL UUID for namespace is a hack; we should provide a proper UUID for the namespace
 		$this->uuid = Uuid::uuid3(Uuid::NIL, ((string) $this->getId()) . $this->skin->getSkinData() . $this->getNameTag());
 	}
@@ -269,11 +266,10 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 		$this->xpManager = new ExperienceManager($this);
 
 		$this->inventory = new PlayerInventory($this);
-		$syncHeldItem = function() : void{
-			foreach($this->getViewers() as $viewer){
-				$viewer->getNetworkSession()->onMobMainHandItemChange($this);
-			}
-		};
+		$syncHeldItem = fn() => NetworkBroadcastUtils::broadcastEntityEvent(
+			$this->getViewers(),
+			fn(EntityEventBroadcaster $broadcaster, array $recipients) => $broadcaster->onMobMainHandItemChange($recipients, $this)
+		);
 		$this->inventory->getListeners()->add(new CallbackInventoryListener(
 			function(Inventory $unused, int $slot, Item $unused2) use ($syncHeldItem) : void{
 				if($slot === $this->inventory->getHeldItemIndex()){
@@ -297,7 +293,7 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 
 			/** @var CompoundTag $item */
 			foreach($inventoryTag as $i => $item){
-				$slot = $item->getByte(Item::TAG_SLOT);
+				$slot = $item->getByte(SavedItemStackData::TAG_SLOT);
 				if($slot >= 0 && $slot < 9){ //Hotbar
 					//Old hotbar saving stuff, ignore it
 				}elseif($slot >= 100 && $slot < 104){ //Armor
@@ -314,11 +310,10 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 		if($offHand !== null){
 			$this->offHandInventory->setItem(0, Item::nbtDeserialize($offHand));
 		}
-		$this->offHandInventory->getListeners()->add(CallbackInventoryListener::onAnyChange(function() : void{
-			foreach($this->getViewers() as $viewer){
-				$viewer->getNetworkSession()->onMobOffHandItemChange($this);
-			}
-		}));
+		$this->offHandInventory->getListeners()->add(CallbackInventoryListener::onAnyChange(fn() => NetworkBroadcastUtils::broadcastEntityEvent(
+			$this->getViewers(),
+			fn(EntityEventBroadcaster $broadcaster, array $recipients) => $broadcaster->onMobOffHandItemChange($recipients, $this)
+		)));
 
 		$enderChestInventoryTag = $nbt->getListTag(self::TAG_ENDER_CHEST_INVENTORY);
 		if($enderChestInventoryTag !== null){
@@ -326,17 +321,16 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 
 			/** @var CompoundTag $item */
 			foreach($enderChestInventoryTag as $i => $item){
-				$enderChestInventoryItems[$item->getByte(Item::TAG_SLOT)] = Item::nbtDeserialize($item);
+				$enderChestInventoryItems[$item->getByte(SavedItemStackData::TAG_SLOT)] = Item::nbtDeserialize($item);
 			}
 			self::populateInventoryFromListTag($this->enderInventory, $enderChestInventoryItems);
 		}
 
 		$this->inventory->setHeldItemIndex($nbt->getInt(self::TAG_SELECTED_INVENTORY_SLOT, 0));
-		$this->inventory->getHeldItemIndexChangeListeners()->add(function(int $oldIndex) : void{
-			foreach($this->getViewers() as $viewer){
-				$viewer->getNetworkSession()->onMobMainHandItemChange($this);
-			}
-		});
+		$this->inventory->getHeldItemIndexChangeListeners()->add(fn() => NetworkBroadcastUtils::broadcastEntityEvent(
+			$this->getViewers(),
+			fn(EntityEventBroadcaster $broadcaster, array $recipients) => $broadcaster->onMobMainHandItemChange($recipients, $this)
+		));
 
 		$this->hungerManager->setFood((float) $nbt->getInt(self::TAG_FOOD_LEVEL, (int) $this->hungerManager->getFood()));
 		$this->hungerManager->setExhaustion($nbt->getFloat(self::TAG_FOOD_EXHAUSTION_LEVEL, $this->hungerManager->getExhaustion()));
@@ -351,7 +345,7 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 		if(($xpSeedTag = $nbt->getTag(self::TAG_XP_SEED)) instanceof IntTag){
 			$this->xpSeed = $xpSeedTag->getValue();
 		}else{
-			$this->xpSeed = random_int(Limits::INT32_MIN, Limits::INT32_MAX);
+			$this->xpSeed = EnchantingHelper::generateSeed();
 		}
 	}
 
@@ -408,9 +402,9 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 
 	public function getDrops() : array{
 		return array_filter(array_merge(
-			$this->inventory !== null ? array_values($this->inventory->getContents()) : [],
-			$this->armorInventory !== null ? array_values($this->armorInventory->getContents()) : [],
-			$this->offHandInventory !== null ? array_values($this->offHandInventory->getContents()) : [],
+			array_values($this->inventory->getContents()),
+			array_values($this->armorInventory->getContents()),
+			array_values($this->offHandInventory->getContents()),
 		), function(Item $item) : bool{ return !$item->hasEnchantment(VanillaEnchantments::VANISHING()) && !$item->keepOnDeath(); });
 	}
 
@@ -429,55 +423,51 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 
 		$inventoryTag = new ListTag([], NBT::TAG_Compound);
 		$nbt->setTag(self::TAG_INVENTORY, $inventoryTag);
-		if($this->inventory !== null){
-			//Normal inventory
-			$slotCount = $this->inventory->getSize() + $this->inventory->getHotbarSize();
-			for($slot = $this->inventory->getHotbarSize(); $slot < $slotCount; ++$slot){
-				$item = $this->inventory->getItem($slot - 9);
-				if(!$item->isNull()){
-					$inventoryTag->push($item->nbtSerialize($slot));
-				}
-			}
 
-			//Armor
-			for($slot = 100; $slot < 104; ++$slot){
-				$item = $this->armorInventory->getItem($slot - 100);
-				if(!$item->isNull()){
-					$inventoryTag->push($item->nbtSerialize($slot));
-				}
+		//Normal inventory
+		$slotCount = $this->inventory->getSize() + $this->inventory->getHotbarSize();
+		for($slot = $this->inventory->getHotbarSize(); $slot < $slotCount; ++$slot){
+			$item = $this->inventory->getItem($slot - 9);
+			if(!$item->isNull()){
+				$inventoryTag->push($item->nbtSerialize($slot));
 			}
-
-			$nbt->setInt(self::TAG_SELECTED_INVENTORY_SLOT, $this->inventory->getHeldItemIndex());
 		}
+
+		//Armor
+		for($slot = 100; $slot < 104; ++$slot){
+			$item = $this->armorInventory->getItem($slot - 100);
+			if(!$item->isNull()){
+				$inventoryTag->push($item->nbtSerialize($slot));
+			}
+		}
+
+		$nbt->setInt(self::TAG_SELECTED_INVENTORY_SLOT, $this->inventory->getHeldItemIndex());
+
 		$offHandItem = $this->offHandInventory->getItem(0);
 		if(!$offHandItem->isNull()){
 			$nbt->setTag(self::TAG_OFF_HAND_ITEM, $offHandItem->nbtSerialize());
 		}
 
-		if($this->enderInventory !== null){
-			/** @var CompoundTag[] $items */
-			$items = [];
+		/** @var CompoundTag[] $items */
+		$items = [];
 
-			$slotCount = $this->enderInventory->getSize();
-			for($slot = 0; $slot < $slotCount; ++$slot){
-				$item = $this->enderInventory->getItem($slot);
-				if(!$item->isNull()){
-					$items[] = $item->nbtSerialize($slot);
-				}
+		$slotCount = $this->enderInventory->getSize();
+		for($slot = 0; $slot < $slotCount; ++$slot){
+			$item = $this->enderInventory->getItem($slot);
+			if(!$item->isNull()){
+				$items[] = $item->nbtSerialize($slot);
 			}
-
-			$nbt->setTag(self::TAG_ENDER_CHEST_INVENTORY, new ListTag($items, NBT::TAG_Compound));
 		}
 
-		if($this->skin !== null){
-			$nbt->setTag(self::TAG_SKIN, CompoundTag::create()
-				->setString(self::TAG_SKIN_NAME, $this->skin->getSkinId())
-				->setByteArray(self::TAG_SKIN_DATA, $this->skin->getSkinData())
-				->setByteArray(self::TAG_SKIN_CAPE_DATA, $this->skin->getCapeData())
-				->setString(self::TAG_SKIN_GEOMETRY_NAME, $this->skin->getGeometryName())
-				->setByteArray(self::TAG_SKIN_GEOMETRY_DATA, $this->skin->getGeometryData())
-			);
-		}
+		$nbt->setTag(self::TAG_ENDER_CHEST_INVENTORY, new ListTag($items, NBT::TAG_Compound));
+
+		$nbt->setTag(self::TAG_SKIN, CompoundTag::create()
+			->setString(self::TAG_SKIN_NAME, $this->skin->getSkinId())
+			->setByteArray(self::TAG_SKIN_DATA, $this->skin->getSkinData())
+			->setByteArray(self::TAG_SKIN_CAPE_DATA, $this->skin->getCapeData())
+			->setString(self::TAG_SKIN_GEOMETRY_NAME, $this->skin->getGeometryName())
+			->setByteArray(self::TAG_SKIN_GEOMETRY_DATA, $this->skin->getGeometryData())
+		);
 
 		return $nbt;
 	}
@@ -489,11 +479,13 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 	}
 
 	protected function sendSpawnPacket(Player $player) : void{
+		$networkSession = $player->getNetworkSession();
+		$typeConverter = $networkSession->getTypeConverter();
 		if(!($this instanceof Player)){
-			$player->getNetworkSession()->sendDataPacket(PlayerListPacket::add([PlayerListEntry::createAdditionEntry($this->uuid, $this->id, $this->getName(), SkinAdapterSingleton::get()->toSkinData($this->skin))]));
+			$networkSession->sendDataPacket(PlayerListPacket::add([PlayerListEntry::createAdditionEntry($this->uuid, $this->id, $this->getName(), $typeConverter->getSkinAdapter()->toSkinData($this->skin))]));
 		}
 
-		$player->getNetworkSession()->sendDataPacket(AddPlayerPacket::create(
+		$networkSession->sendDataPacket(AddPlayerPacket::create(
 			$this->getUniqueId(),
 			$this->getName(),
 			$this->getId(),
@@ -503,18 +495,18 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 			$this->location->pitch,
 			$this->location->yaw,
 			$this->location->yaw, //TODO: head yaw
-			ItemStackWrapper::legacy(TypeConverter::getInstance()->coreItemStackToNet($this->getInventory()->getItemInHand())),
+			ItemStackWrapper::legacy($typeConverter->coreItemStackToNet($this->getInventory()->getItemInHand())),
 			GameMode::SURVIVAL,
 			$this->getAllNetworkData(),
 			new PropertySyncData([], []),
-			UpdateAbilitiesPacket::create(CommandPermissions::NORMAL, PlayerPermissions::VISITOR, $this->getId() /* TODO: this should be unique ID */, [
-				new UpdateAbilitiesPacketLayer(
-					UpdateAbilitiesPacketLayer::LAYER_BASE,
-					array_fill(0, UpdateAbilitiesPacketLayer::NUMBER_OF_ABILITIES, false),
+			UpdateAbilitiesPacket::create(new AbilitiesData(CommandPermissions::NORMAL, PlayerPermissions::VISITOR, $this->getId() /* TODO: this should be unique ID */, [
+				new AbilitiesLayer(
+					AbilitiesLayer::LAYER_BASE,
+					array_fill(0, AbilitiesLayer::NUMBER_OF_ABILITIES, false),
 					0.0,
 					0.0
 				)
-			]),
+			])),
 			[], //TODO: entity links
 			"", //device ID (we intentionally don't send this - secvuln)
 			DeviceOS::UNKNOWN //we intentionally don't send this (secvuln)
@@ -523,11 +515,12 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 		//TODO: Hack for MCPE 1.2.13: DATA_NAMETAG is useless in AddPlayerPacket, so it has to be sent separately
 		$this->sendData([$player], [EntityMetadataProperties::NAMETAG => new StringMetadataProperty($this->getNameTag())]);
 
-		$player->getNetworkSession()->onMobArmorChange($this);
-		$player->getNetworkSession()->onMobOffHandItemChange($this);
+		$entityEventBroadcaster = $networkSession->getEntityEventBroadcaster();
+		$entityEventBroadcaster->onMobArmorChange([$networkSession], $this);
+		$entityEventBroadcaster->onMobOffHandItemChange([$networkSession], $this);
 
 		if(!($this instanceof Player)){
-			$player->getNetworkSession()->sendDataPacket(PlayerListPacket::remove([PlayerListEntry::createRemovalEntry($this->uuid)]));
+			$networkSession->sendDataPacket(PlayerListPacket::remove([PlayerListEntry::createRemovalEntry($this->uuid)]));
 		}
 	}
 
@@ -544,11 +537,13 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 	}
 
 	protected function destroyCycles() : void{
-		$this->inventory = null;
-		$this->offHandInventory = null;
-		$this->enderInventory = null;
-		$this->hungerManager = null;
-		$this->xpManager = null;
+		unset(
+			$this->inventory,
+			$this->offHandInventory,
+			$this->enderInventory,
+			$this->hungerManager,
+			$this->xpManager
+		);
 		parent::destroyCycles();
 	}
 }
diff --git a/src/entity/HungerManager.php b/src/entity/HungerManager.php
index 304dcd30b4..a318558918 100644
--- a/src/entity/HungerManager.php
+++ b/src/entity/HungerManager.php
@@ -133,14 +133,18 @@ class HungerManager{
 		if(!$this->enabled){
 			return 0;
 		}
-		$ev = new PlayerExhaustEvent($this->entity, $amount, $cause);
-		$ev->call();
-		if($ev->isCancelled()){
-			return 0.0;
+		$evAmount = $amount;
+		if(PlayerExhaustEvent::hasHandlers()){
+			$ev = new PlayerExhaustEvent($this->entity, $amount, $cause);
+			$ev->call();
+			if($ev->isCancelled()){
+				return 0.0;
+			}
+			$evAmount = $ev->getAmount();
 		}
 
 		$exhaustion = $this->getExhaustion();
-		$exhaustion += $ev->getAmount();
+		$exhaustion += $evAmount;
 
 		while($exhaustion >= 4.0){
 			$exhaustion -= 4.0;
@@ -159,7 +163,7 @@ class HungerManager{
 		}
 		$this->setExhaustion($exhaustion);
 
-		return $ev->getAmount();
+		return $evAmount;
 	}
 
 	public function getFoodTickTimer() : int{
diff --git a/src/entity/Living.php b/src/entity/Living.php
index 86457321e4..1f27a5cacf 100644
--- a/src/entity/Living.php
+++ b/src/entity/Living.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\entity;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockLegacyIds;
+use pocketmine\block\BlockTypeIds;
 use pocketmine\data\bedrock\EffectIdMap;
 use pocketmine\entity\animation\DeathAnimation;
 use pocketmine\entity\animation\HurtAnimation;
@@ -50,12 +50,15 @@ use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\FloatTag;
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\ShortTag;
+use pocketmine\network\mcpe\EntityEventBroadcaster;
+use pocketmine\network\mcpe\NetworkBroadcastUtils;
 use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataCollection;
 use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags;
 use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties;
 use pocketmine\player\Player;
 use pocketmine\timings\Timings;
 use pocketmine\utils\Binary;
+use pocketmine\utils\Utils;
 use pocketmine\world\sound\BurpSound;
 use pocketmine\world\sound\EntityLandSound;
 use pocketmine\world\sound\EntityLongFallSound;
@@ -66,17 +69,30 @@ use function atan2;
 use function ceil;
 use function count;
 use function floor;
-use function lcg_value;
+use function ksort;
 use function max;
 use function min;
 use function mt_getrandmax;
 use function mt_rand;
+use function round;
 use function sqrt;
 use const M_PI;
+use const SORT_NUMERIC;
 
 abstract class Living extends Entity{
 	protected const DEFAULT_BREATH_TICKS = 300;
 
+	/**
+	 * The default knockback multiplier when an entity is hit by another entity.
+	 * Larger values knock the entity back with increased velocity.
+	 */
+	public const DEFAULT_KNOCKBACK_FORCE = 0.4;
+	/**
+	 * Limit of an entity's vertical knockback velocity when hit by another entity. Without this limit, the entity
+	 * may be knocked far up into the air with large knockback forces.
+	 */
+	public const DEFAULT_KNOCKBACK_VERTICAL_LIMIT = 0.4;
+
 	private const TAG_LEGACY_HEALTH = "HealF"; //TAG_Float
 	private const TAG_HEALTH = "Health"; //TAG_Float
 	private const TAG_BREATH_TICKS = "Air"; //TAG_Short
@@ -87,53 +103,41 @@ abstract class Living extends Entity{
 	private const TAG_EFFECT_SHOW_PARTICLES = "ShowParticles"; //TAG_Byte
 	private const TAG_EFFECT_AMBIENT = "Ambient"; //TAG_Byte
 
-	protected $gravity = 0.08;
-	protected $drag = 0.02;
+	protected int $attackTime = 0;
 
-	/** @var int */
-	protected $attackTime = 0;
+	public int $deadTicks = 0;
+	protected int $maxDeadTicks = 25;
 
-	/** @var int */
-	public $deadTicks = 0;
-	/** @var int */
-	protected $maxDeadTicks = 25;
+	protected float $jumpVelocity = 0.42;
 
-	/** @var float */
-	protected $jumpVelocity = 0.42;
+	protected EffectManager $effectManager;
 
-	/** @var EffectManager */
-	protected $effectManager;
+	protected ArmorInventory $armorInventory;
 
-	/** @var ArmorInventory */
-	protected $armorInventory;
+	protected bool $breathing = true;
+	protected int $breathTicks = self::DEFAULT_BREATH_TICKS;
+	protected int $maxBreathTicks = self::DEFAULT_BREATH_TICKS;
 
-	/** @var bool */
-	protected $breathing = true;
-	/** @var int */
-	protected $breathTicks = self::DEFAULT_BREATH_TICKS;
-	/** @var int */
-	protected $maxBreathTicks = self::DEFAULT_BREATH_TICKS;
+	protected Attribute $healthAttr;
+	protected Attribute $absorptionAttr;
+	protected Attribute $knockbackResistanceAttr;
+	protected Attribute $moveSpeedAttr;
 
-	/** @var Attribute */
-	protected $healthAttr;
-	/** @var Attribute */
-	protected $absorptionAttr;
-	/** @var Attribute */
-	protected $knockbackResistanceAttr;
-	/** @var Attribute */
-	protected $moveSpeedAttr;
+	protected bool $sprinting = false;
+	protected bool $sneaking = false;
+	protected bool $gliding = false;
+	protected bool $swimming = false;
 
-	/** @var bool */
-	protected $sprinting = false;
-	/** @var bool */
-	protected $sneaking = false;
-	/** @var bool */
-	protected $gliding = false;
-	/** @var bool */
-	protected $swimming = false;
+	protected function getInitialDragMultiplier() : float{ return 0.02; }
+
+	protected function getInitialGravity() : float{ return 0.08; }
 
 	abstract public function getName() : string;
 
+	public function canBeRenamed() : bool{
+		return true;
+	}
+
 	protected function initEntity(CompoundTag $nbt) : void{
 		parent::initEntity($nbt);
 
@@ -143,13 +147,10 @@ abstract class Living extends Entity{
 
 		$this->armorInventory = new ArmorInventory($this);
 		//TODO: load/save armor inventory contents
-		$this->armorInventory->getListeners()->add(CallbackInventoryListener::onAnyChange(
-			function(Inventory $unused) : void{
-				foreach($this->getViewers() as $viewer){
-					$viewer->getNetworkSession()->onMobArmorChange($this);
-				}
-			}
-		));
+		$this->armorInventory->getListeners()->add(CallbackInventoryListener::onAnyChange(fn() => NetworkBroadcastUtils::broadcastEntityEvent(
+			$this->getViewers(),
+			fn(EntityEventBroadcaster $broadcaster, array $recipients) => $broadcaster->onMobArmorChange($recipients, $this)
+		)));
 
 		$health = $this->getMaxHealth();
 
@@ -233,6 +234,7 @@ abstract class Living extends Entity{
 	public function setSneaking(bool $value = true) : void{
 		$this->sneaking = $value;
 		$this->networkPropertiesDirty = true;
+		$this->recalculateSize();
 	}
 
 	public function isSprinting() : bool{
@@ -274,6 +276,8 @@ abstract class Living extends Entity{
 		if($this->isSwimming() || $this->isGliding()){
 			$width = $size->getWidth();
 			$this->setSize((new EntitySizeInfo($width, $width, $width * 0.9))->scale($this->getScale()));
+		}elseif($this->isSneaking()){
+			$this->setSize((new EntitySizeInfo(3 / 4 * $size->getHeight(), $size->getWidth(), 3 / 4 * $size->getEyeHeight()))->scale($this->getScale()));
 		}else{
 			$this->setSize($size->scale($this->getScale()));
 		}
@@ -310,16 +314,6 @@ abstract class Living extends Entity{
 		return $nbt;
 	}
 
-	/**
-	 * @deprecated This function always returns true, no matter whether the target is in the line of sight or not.
-	 * @see VoxelRayTrace::inDirection() for a more generalized method of ray-tracing to a target.
-	 */
-	public function hasLineOfSight(Entity $entity) : bool{
-		//TODO: head height
-		return true;
-		//return $this->getLevelNonNull()->rayTraceBlocks(Vector3::createVector($this->x, $this->y + $this->height, $this->z), Vector3::createVector($entity->x, $entity->y + $entity->height, $entity->z)) === null;
-	}
-
 	public function getEffects() : EffectManager{
 		return $this->effectManager;
 	}
@@ -386,7 +380,7 @@ abstract class Living extends Entity{
 				new EntityLongFallSound($this) :
 				new EntityShortFallSound($this)
 			);
-		}elseif($fallBlock->getId() !== BlockLegacyIds::AIR){
+		}elseif($fallBlock->getTypeId() !== BlockTypeIds::AIR){
 			$this->broadcastSound(new EntityLandSound($this, $fallBlock));
 		}
 		return $newVerticalVelocity;
@@ -456,6 +450,10 @@ abstract class Living extends Entity{
 		$source->setModifier(-$source->getFinalDamage() * min(ceil(min($totalEpf, 25) * (mt_rand(50, 100) / 100)), 20) * 0.04, EntityDamageEvent::MODIFIER_ARMOR_ENCHANTMENTS);
 
 		$source->setModifier(-min($this->getAbsorption(), $source->getFinalDamage()), EntityDamageEvent::MODIFIER_ABSORPTION);
+
+		if($cause === EntityDamageEvent::CAUSE_FALLING_BLOCK && $this->armorInventory->getHelmet() instanceof Armor){
+			$source->setModifier(-($source->getFinalDamage() / 4), EntityDamageEvent::MODIFIER_ARMOR_HELMET);
+		}
 	}
 
 	/**
@@ -487,6 +485,15 @@ abstract class Living extends Entity{
 			if($damage > 0){
 				$attacker->attack(new EntityDamageByEntityEvent($this, $attacker, EntityDamageEvent::CAUSE_MAGIC, $damage));
 			}
+
+			if($source->getModifier(EntityDamageEvent::MODIFIER_ARMOR_HELMET) < 0){
+				$helmet = $this->armorInventory->getHelmet();
+				if($helmet instanceof Armor){
+					$finalDamage = $source->getFinalDamage();
+					$this->damageItem($helmet, (int) round($finalDamage * 4 + Utils::getRandomFloat() * $finalDamage * 2));
+					$this->armorInventory->setHelmet($helmet);
+				}
+			}
 		}
 	}
 
@@ -497,14 +504,16 @@ abstract class Living extends Entity{
 	public function damageArmor(float $damage) : void{
 		$durabilityRemoved = (int) max(floor($damage / 4), 1);
 
-		$armor = $this->armorInventory->getContents(true);
-		foreach($armor as $item){
+		$armor = $this->armorInventory->getContents();
+		foreach($armor as $slotId => $item){
 			if($item instanceof Armor){
+				$oldItem = clone $item;
 				$this->damageItem($item, $durabilityRemoved);
+				if(!$item->equalsExact($oldItem)){
+					$this->armorInventory->setItem($slotId, $item);
+				}
 			}
 		}
-
-		$this->armorInventory->setContents($armor);
 	}
 
 	private function damageItem(Durable $item, int $durabilityRemoved) : void{
@@ -515,7 +524,7 @@ abstract class Living extends Entity{
 	}
 
 	public function attack(EntityDamageEvent $source) : void{
-		if($this->noDamageTicks > 0){
+		if($this->noDamageTicks > 0 && $source->getCause() !== EntityDamageEvent::CAUSE_SUICIDE){
 			$source->cancel();
 		}
 
@@ -528,7 +537,9 @@ abstract class Living extends Entity{
 			$source->cancel();
 		}
 
-		$this->applyDamageModifiers($source);
+		if($source->getCause() !== EntityDamageEvent::CAUSE_SUICIDE){
+			$this->applyDamageModifiers($source);
+		}
 
 		if($source instanceof EntityDamageByEntityEvent && (
 			$source->getCause() === EntityDamageEvent::CAUSE_BLOCK_EXPLOSION ||
@@ -546,26 +557,33 @@ abstract class Living extends Entity{
 			return;
 		}
 
-		$this->attackTime = $source->getAttackCooldown();
+		if($this->attackTime <= 0){
+			//this logic only applies if the entity was cold attacked
 
-		if($source instanceof EntityDamageByChildEntityEvent){
-			$e = $source->getChild();
-			if($e !== null){
-				$motion = $e->getMotion();
-				$this->knockBack($motion->x, $motion->z, $source->getKnockBack());
+			$this->attackTime = $source->getAttackCooldown();
+
+			if($source instanceof EntityDamageByChildEntityEvent){
+				$e = $source->getChild();
+				if($e !== null){
+					$motion = $e->getMotion();
+					$this->knockBack($motion->x, $motion->z, $source->getKnockBack(), $source->getVerticalKnockBackLimit());
+				}
+			}elseif($source instanceof EntityDamageByEntityEvent){
+				$e = $source->getDamager();
+				if($e !== null){
+					$deltaX = $this->location->x - $e->location->x;
+					$deltaZ = $this->location->z - $e->location->z;
+					$this->knockBack($deltaX, $deltaZ, $source->getKnockBack(), $source->getVerticalKnockBackLimit());
+				}
 			}
-		}elseif($source instanceof EntityDamageByEntityEvent){
-			$e = $source->getDamager();
-			if($e !== null){
-				$deltaX = $this->location->x - $e->location->x;
-				$deltaZ = $this->location->z - $e->location->z;
-				$this->knockBack($deltaX, $deltaZ, $source->getKnockBack());
+
+			if($this->isAlive()){
+				$this->doHitAnimation();
 			}
 		}
 
 		if($this->isAlive()){
 			$this->applyPostDamageEffects($source);
-			$this->doHitAnimation();
 		}
 	}
 
@@ -573,7 +591,7 @@ abstract class Living extends Entity{
 		$this->broadcastAnimation(new HurtAnimation($this));
 	}
 
-	public function knockBack(float $x, float $z, float $force = 0.4, ?float $verticalLimit = 0.4) : void{
+	public function knockBack(float $x, float $z, float $force = self::DEFAULT_KNOCKBACK_FORCE, ?float $verticalLimit = self::DEFAULT_KNOCKBACK_VERTICAL_LIMIT) : void{
 		$f = sqrt($x * $x + $z * $z);
 		if($f <= 0){
 			return;
@@ -648,6 +666,16 @@ abstract class Living extends Entity{
 			if($this->doAirSupplyTick($tickDiff)){
 				$hasUpdate = true;
 			}
+
+			foreach($this->armorInventory->getContents() as $index => $item){
+				$oldItem = clone $item;
+				if($item->onTickWorn($this)){
+					$hasUpdate = true;
+					if(!$item->equalsExact($oldItem)){
+						$this->armorInventory->setItem($index, $item);
+					}
+				}
+			}
 		}
 
 		if($this->attackTime > 0){
@@ -669,7 +697,7 @@ abstract class Living extends Entity{
 			$this->setBreathing(false);
 
 			if(($respirationLevel = $this->armorInventory->getHelmet()->getEnchantmentLevel(VanillaEnchantments::RESPIRATION())) <= 0 ||
-				lcg_value() <= (1 / ($respirationLevel + 1))
+				Utils::getRandomFloat() <= (1 / ($respirationLevel + 1))
 			){
 				$ticks -= $tickDiff;
 				if($ticks <= -20){
@@ -798,10 +826,10 @@ abstract class Living extends Entity{
 				--$nextIndex;
 			}
 
-			$id = $block->getId();
+			$id = $block->getTypeId();
 
 			if($transparent === null){
-				if($id !== BlockLegacyIds::AIR){
+				if($id !== BlockTypeIds::AIR){
 					break;
 				}
 			}else{
@@ -850,14 +878,37 @@ abstract class Living extends Entity{
 	protected function sendSpawnPacket(Player $player) : void{
 		parent::sendSpawnPacket($player);
 
-		$player->getNetworkSession()->onMobArmorChange($this);
+		$networkSession = $player->getNetworkSession();
+		$networkSession->getEntityEventBroadcaster()->onMobArmorChange([$networkSession], $this);
 	}
 
 	protected function syncNetworkData(EntityMetadataCollection $properties) : void{
 		parent::syncNetworkData($properties);
 
-		$properties->setByte(EntityMetadataProperties::POTION_AMBIENT, $this->effectManager->hasOnlyAmbientEffects() ? 1 : 0);
-		$properties->setInt(EntityMetadataProperties::POTION_COLOR, Binary::signInt($this->effectManager->getBubbleColor()->toARGB()));
+		$visibleEffects = [];
+		foreach ($this->effectManager->all() as $effect) {
+			if (!$effect->isVisible() || !$effect->getType()->hasBubbles()) {
+				continue;
+			}
+			$visibleEffects[EffectIdMap::getInstance()->toId($effect->getType())] = $effect->isAmbient();
+		}
+
+		//TODO: HACK! the client may not be able to identify effects if they are not sorted.
+		ksort($visibleEffects, SORT_NUMERIC);
+
+		$effectsData = 0;
+		$packedEffectsCount = 0;
+		foreach ($visibleEffects as $effectId => $isAmbient) {
+			$effectsData = ($effectsData << 7) |
+				(($effectId & 0x3f) << 1) | //Why not use 7 bits instead of only 6? mojang...
+				($isAmbient ? 1 : 0);
+
+			if (++$packedEffectsCount >= 8) {
+				break;
+			}
+		}
+		$properties->setLong(EntityMetadataProperties::VISIBLE_MOB_EFFECTS, $effectsData);
+
 		$properties->setShort(EntityMetadataProperties::AIR, $this->breathTicks);
 		$properties->setShort(EntityMetadataProperties::MAX_AIR, $this->maxBreathTicks);
 
@@ -876,8 +927,10 @@ abstract class Living extends Entity{
 	}
 
 	protected function destroyCycles() : void{
-		$this->armorInventory = null;
-		$this->effectManager = null;
+		unset(
+			$this->armorInventory,
+			$this->effectManager
+		);
 		parent::destroyCycles();
 	}
 }
diff --git a/src/entity/Location.php b/src/entity/Location.php
index c2c9bd27e9..990108ac48 100644
--- a/src/entity/Location.php
+++ b/src/entity/Location.php
@@ -29,10 +29,8 @@ use pocketmine\world\World;
 
 class Location extends Position{
 
-	/** @var float */
-	public $yaw;
-	/** @var float */
-	public $pitch;
+	public float $yaw;
+	public float $pitch;
 
 	public function __construct(float $x, float $y, float $z, ?World $world, float $yaw, float $pitch){
 		$this->yaw = $yaw;
diff --git a/src/entity/Squid.php b/src/entity/Squid.php
index 9b2f5a9038..a0f3fef48b 100644
--- a/src/entity/Squid.php
+++ b/src/entity/Squid.php
@@ -26,6 +26,7 @@ namespace pocketmine\entity;
 use pocketmine\entity\animation\SquidInkCloudAnimation;
 use pocketmine\event\entity\EntityDamageByEntityEvent;
 use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\CompoundTag;
@@ -39,10 +40,8 @@ class Squid extends WaterAnimal{
 
 	public static function getNetworkTypeId() : string{ return EntityIds::SQUID; }
 
-	/** @var Vector3|null */
-	public $swimDirection = null;
-	/** @var float */
-	public $swimSpeed = 0.1;
+	public ?Vector3 $swimDirection = null;
+	public float $swimSpeed = 0.1;
 
 	private int $switchDirectionTicker = 0;
 
@@ -126,4 +125,8 @@ class Squid extends WaterAnimal{
 			VanillaItems::INK_SAC()->setCount(mt_rand(1, 3))
 		];
 	}
+
+	public function getPickedItem() : ?Item{
+		return VanillaItems::SQUID_SPAWN_EGG();
+	}
 }
diff --git a/src/entity/Villager.php b/src/entity/Villager.php
index 376401a5df..fee65b0143 100644
--- a/src/entity/Villager.php
+++ b/src/entity/Villager.php
@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\entity;
 
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\network\mcpe\protocol\types\entity\EntityIds;
 use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataCollection;
@@ -87,6 +89,10 @@ class Villager extends Living implements Ageable{
 		return $this->baby;
 	}
 
+	public function getPickedItem() : ?Item{
+		return VanillaItems::VILLAGER_SPAWN_EGG();
+	}
+
 	protected function syncNetworkData(EntityMetadataCollection $properties) : void{
 		parent::syncNetworkData($properties);
 		$properties->setGenericFlag(EntityMetadataFlags::BABY, $this->baby);
diff --git a/src/entity/WaterAnimal.php b/src/entity/WaterAnimal.php
index 04deadde89..83e7a58a92 100644
--- a/src/entity/WaterAnimal.php
+++ b/src/entity/WaterAnimal.php
@@ -28,8 +28,7 @@ use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataCollection;
 use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags;
 
 abstract class WaterAnimal extends Living implements Ageable{
-	/** @var bool */
-	protected $baby = false;
+	protected bool $baby = false;
 
 	public function isBaby() : bool{
 		return $this->baby;
diff --git a/src/entity/Zombie.php b/src/entity/Zombie.php
index 18fc2207e7..159a2dd258 100644
--- a/src/entity/Zombie.php
+++ b/src/entity/Zombie.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\entity;
 
+use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
 use pocketmine\network\mcpe\protocol\types\entity\EntityIds;
 use function mt_rand;
@@ -65,4 +66,8 @@ class Zombie extends Living{
 		//TODO: check for equipment and whether it's a baby
 		return 5;
 	}
+
+	public function getPickedItem() : ?Item{
+		return VanillaItems::ZOMBIE_SPAWN_EGG();
+	}
 }
diff --git a/src/entity/animation/ConsumingItemAnimation.php b/src/entity/animation/ConsumingItemAnimation.php
index b268f655ce..49c8a0a516 100644
--- a/src/entity/animation/ConsumingItemAnimation.php
+++ b/src/entity/animation/ConsumingItemAnimation.php
@@ -23,24 +23,24 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\animation;
 
-use pocketmine\entity\Human;
+use pocketmine\entity\Living;
 use pocketmine\item\Item;
-use pocketmine\network\mcpe\convert\ItemTranslator;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\ActorEventPacket;
 use pocketmine\network\mcpe\protocol\types\ActorEvent;
 
 final class ConsumingItemAnimation implements Animation{
 
 	public function __construct(
-		private Human $human, //TODO: maybe this can be expanded to more than just player entities?
+		private Living $entity,
 		private Item $item
 	){}
 
 	public function encode() : array{
-		[$netId, $netData] = ItemTranslator::getInstance()->toNetworkId($this->item->getId(), $this->item->getMeta());
+		[$netId, $netData] = TypeConverter::getInstance()->getItemTranslator()->toNetworkId($this->item);
 		return [
 			//TODO: need to check the data values
-			ActorEventPacket::create($this->human->getId(), ActorEvent::EATING_ITEM, ($netId << 16) | $netData)
+			ActorEventPacket::create($this->entity->getId(), ActorEvent::EATING_ITEM, ($netId << 16) | $netData)
 		];
 	}
 }
diff --git a/src/entity/effect/EffectManager.php b/src/entity/effect/EffectManager.php
index 72e47f71e0..747662dc71 100644
--- a/src/entity/effect/EffectManager.php
+++ b/src/entity/effect/EffectManager.php
@@ -33,25 +33,22 @@ use function count;
 use function spl_object_id;
 
 class EffectManager{
-
 	/** @var EffectInstance[] */
-	protected $effects = [];
+	protected array $effects = [];
 
-	/** @var Color */
-	protected $bubbleColor;
-	/** @var bool */
-	protected $onlyAmbientEffects = false;
+	protected Color $bubbleColor;
+	protected bool $onlyAmbientEffects = false;
 
 	/**
 	 * @var \Closure[]|ObjectSet
 	 * @phpstan-var ObjectSet<\Closure(EffectInstance, bool $replacesOldEffect) : void>
 	 */
-	protected $effectAddHooks;
+	protected ObjectSet $effectAddHooks;
 	/**
 	 * @var \Closure[]|ObjectSet
 	 * @phpstan-var ObjectSet<\Closure(EffectInstance) : void>
 	 */
-	protected $effectRemoveHooks;
+	protected ObjectSet $effectRemoveHooks;
 
 	public function __construct(
 		private Living $entity
diff --git a/src/entity/object/EndCrystal.php b/src/entity/object/EndCrystal.php
new file mode 100644
index 0000000000..afaeb67693
--- /dev/null
+++ b/src/entity/object/EndCrystal.php
@@ -0,0 +1,146 @@
+<?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\entity\object;
+
+use pocketmine\entity\Entity;
+use pocketmine\entity\EntitySizeInfo;
+use pocketmine\entity\Explosive;
+use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\event\entity\EntityPreExplodeEvent;
+use pocketmine\item\Item;
+use pocketmine\item\VanillaItems;
+use pocketmine\math\Vector3;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\network\mcpe\protocol\types\BlockPosition;
+use pocketmine\network\mcpe\protocol\types\entity\EntityIds;
+use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataCollection;
+use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags;
+use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties;
+use pocketmine\world\Explosion;
+
+class EndCrystal extends Entity implements Explosive{
+	private const TAG_SHOWBASE = "ShowBottom"; //TAG_Byte
+
+	private const TAG_BLOCKTARGET_X = "BlockTargetX"; //TAG_Int
+	private const TAG_BLOCKTARGET_Y = "BlockTargetY"; //TAG_Int
+	private const TAG_BLOCKTARGET_Z = "BlockTargetZ"; //TAG_Int
+
+	public static function getNetworkTypeId() : string{ return EntityIds::ENDER_CRYSTAL; }
+
+	protected bool $showBase = false;
+	protected ?Vector3 $beamTarget = null;
+
+	protected function getInitialSizeInfo() : EntitySizeInfo{ return new EntitySizeInfo(2.0, 2.0); }
+
+	protected function getInitialDragMultiplier() : float{ return 1.0; }
+
+	protected function getInitialGravity() : float{ return 0.0; }
+
+	public function isFireProof() : bool{
+		return true;
+	}
+
+	public function getPickedItem() : ?Item{
+		return VanillaItems::END_CRYSTAL();
+	}
+
+	public function showBase() : bool{
+		return $this->showBase;
+	}
+
+	public function setShowBase(bool $showBase) : void{
+		$this->showBase = $showBase;
+		$this->networkPropertiesDirty = true;
+	}
+
+	public function getBeamTarget() : ?Vector3{
+		return $this->beamTarget;
+	}
+
+	public function setBeamTarget(?Vector3 $beamTarget) : void{
+		$this->beamTarget = $beamTarget;
+		$this->networkPropertiesDirty = true;
+	}
+
+	public function attack(EntityDamageEvent $source) : void{
+		parent::attack($source);
+		if(
+			$source->getCause() !== EntityDamageEvent::CAUSE_VOID &&
+			!$this->isFlaggedForDespawn() &&
+			!$source->isCancelled()
+		){
+			$this->flagForDespawn();
+			$this->explode();
+		}
+	}
+
+	protected function initEntity(CompoundTag $nbt) : void{
+		parent::initEntity($nbt);
+
+		$this->setMaxHealth(1);
+		$this->setHealth(1);
+
+		$this->setShowBase($nbt->getByte(self::TAG_SHOWBASE, 0) === 1);
+
+		if(
+			($beamXTag = $nbt->getTag(self::TAG_BLOCKTARGET_X)) instanceof IntTag &&
+			($beamYTag = $nbt->getTag(self::TAG_BLOCKTARGET_Y)) instanceof IntTag &&
+			($beamZTag = $nbt->getTag(self::TAG_BLOCKTARGET_Z)) instanceof IntTag
+		){
+			$this->setBeamTarget(new Vector3($beamXTag->getValue(), $beamYTag->getValue(), $beamZTag->getValue()));
+		}
+	}
+
+	public function saveNBT() : CompoundTag{
+		$nbt = parent::saveNBT();
+
+		$nbt->setByte(self::TAG_SHOWBASE, $this->showBase ? 1 : 0);
+		if($this->beamTarget !== null){
+			$nbt->setInt(self::TAG_BLOCKTARGET_X, $this->beamTarget->getFloorX());
+			$nbt->setInt(self::TAG_BLOCKTARGET_Y, $this->beamTarget->getFloorY());
+			$nbt->setInt(self::TAG_BLOCKTARGET_Z, $this->beamTarget->getFloorZ());
+		}
+		return $nbt;
+	}
+
+	public function explode() : void{
+		$ev = new EntityPreExplodeEvent($this, 6);
+		$ev->call();
+		if(!$ev->isCancelled()){
+			$explosion = new Explosion($this->getPosition(), $ev->getRadius(), $this);
+			if($ev->isBlockBreaking()){
+				$explosion->explodeA();
+			}
+			$explosion->explodeB();
+		}
+	}
+
+	protected function syncNetworkData(EntityMetadataCollection $properties) : void{
+		parent::syncNetworkData($properties);
+
+		$properties->setGenericFlag(EntityMetadataFlags::SHOWBASE, $this->showBase);
+		$properties->setBlockPos(EntityMetadataProperties::BLOCK_TARGET, BlockPosition::fromVector3($this->beamTarget ?? Vector3::zero()));
+	}
+}
diff --git a/src/entity/object/ExperienceOrb.php b/src/entity/object/ExperienceOrb.php
index 2b5932e9c2..5120da3e14 100644
--- a/src/entity/object/ExperienceOrb.php
+++ b/src/entity/object/ExperienceOrb.php
@@ -32,6 +32,7 @@ use pocketmine\network\mcpe\protocol\types\entity\EntityIds;
 use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataCollection;
 use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties;
 use pocketmine\player\Player;
+use function max;
 use function sqrt;
 
 class ExperienceOrb extends Entity{
@@ -48,6 +49,10 @@ class ExperienceOrb extends Entity{
 	/** Split sizes used for dropping experience orbs. */
 	public const ORB_SPLIT_SIZES = [2477, 1237, 617, 307, 149, 73, 37, 17, 7, 3, 1]; //This is indexed biggest to smallest so that we can return as soon as we found the biggest value.
 
+	public const DEFAULT_DESPAWN_DELAY = 6000;
+	public const NEVER_DESPAWN = -1;
+	public const MAX_DESPAWN_DELAY = 32767 + self::DEFAULT_DESPAWN_DELAY; //max value storable by mojang NBT :(
+
 	/**
 	 * Returns the largest size of normal XP orb that will be spawned for the specified amount of XP. Used to split XP
 	 * up into multiple orbs when an amount of XP is dropped.
@@ -79,26 +84,15 @@ class ExperienceOrb extends Entity{
 		return $result;
 	}
 
-	public $gravity = 0.04;
-	public $drag = 0.02;
+	/** Ticker used for determining interval in which to look for new target players. */
+	protected int $lookForTargetTime = 0;
 
-	/** @var int */
-	protected $age = 0;
+	/** Runtime entity ID of the player this XP orb is targeting. */
+	protected ?int $targetPlayerRuntimeId = null;
 
-	/**
-	 * @var int
-	 * Ticker used for determining interval in which to look for new target players.
-	 */
-	protected $lookForTargetTime = 0;
+	protected int $xpValue;
 
-	/**
-	 * @var int|null
-	 * Runtime entity ID of the player this XP orb is targeting.
-	 */
-	protected $targetPlayerRuntimeId = null;
-
-	/** @var int */
-	protected $xpValue;
+	private int $despawnDelay = self::DEFAULT_DESPAWN_DELAY;
 
 	public function __construct(Location $location, int $xpValue, ?CompoundTag $nbt = null){
 		$this->xpValue = $xpValue;
@@ -107,16 +101,30 @@ class ExperienceOrb extends Entity{
 
 	protected function getInitialSizeInfo() : EntitySizeInfo{ return new EntitySizeInfo(0.25, 0.25); }
 
+	protected function getInitialDragMultiplier() : float{ return 0.02; }
+
+	protected function getInitialGravity() : float{ return 0.04; }
+
 	protected function initEntity(CompoundTag $nbt) : void{
 		parent::initEntity($nbt);
 
-		$this->age = $nbt->getShort(self::TAG_AGE, 0);
+		$age = $nbt->getShort(self::TAG_AGE, 0);
+		if($age === -32768){
+			$this->despawnDelay = self::NEVER_DESPAWN;
+		}else{
+			$this->despawnDelay = max(0, self::DEFAULT_DESPAWN_DELAY - $age);
+		}
 	}
 
 	public function saveNBT() : CompoundTag{
 		$nbt = parent::saveNBT();
 
-		$nbt->setShort(self::TAG_AGE, $this->age);
+		if($this->despawnDelay === self::NEVER_DESPAWN){
+			$age = -32768;
+		}else{
+			$age = self::DEFAULT_DESPAWN_DELAY - $this->despawnDelay;
+		}
+		$nbt->setShort(self::TAG_AGE, $age);
 
 		$nbt->setShort(self::TAG_VALUE_PC, $this->getXpValue());
 		$nbt->setInt(self::TAG_VALUE_PE, $this->getXpValue());
@@ -124,6 +132,15 @@ class ExperienceOrb extends Entity{
 		return $nbt;
 	}
 
+	public function getDespawnDelay() : int{ return $this->despawnDelay; }
+
+	public function setDespawnDelay(int $despawnDelay) : void{
+		if(($despawnDelay < 0 || $despawnDelay > self::MAX_DESPAWN_DELAY) && $despawnDelay !== self::NEVER_DESPAWN){
+			throw new \InvalidArgumentException("Despawn ticker must be in range 0 ... " . self::MAX_DESPAWN_DELAY . " or " . self::NEVER_DESPAWN . ", got $despawnDelay");
+		}
+		$this->despawnDelay = $despawnDelay;
+	}
+
 	public function getXpValue() : int{
 		return $this->xpValue;
 	}
@@ -160,8 +177,8 @@ class ExperienceOrb extends Entity{
 	protected function entityBaseTick(int $tickDiff = 1) : bool{
 		$hasUpdate = parent::entityBaseTick($tickDiff);
 
-		$this->age += $tickDiff;
-		if($this->age > 6000){
+		$this->despawnDelay -= $tickDiff;
+		if($this->despawnDelay <= 0){
 			$this->flagForDespawn();
 			return true;
 		}
diff --git a/src/entity/object/FallingBlock.php b/src/entity/object/FallingBlock.php
index 52ef8df7cd..66d4049f88 100644
--- a/src/entity/object/FallingBlock.php
+++ b/src/entity/object/FallingBlock.php
@@ -24,39 +24,41 @@ declare(strict_types=1);
 namespace pocketmine\entity\object;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
+use pocketmine\block\RuntimeBlockStateRegistry;
 use pocketmine\block\utils\Fallable;
+use pocketmine\data\bedrock\block\BlockStateDeserializeException;
 use pocketmine\data\SavedDataLoadingException;
 use pocketmine\entity\Entity;
 use pocketmine\entity\EntitySizeInfo;
+use pocketmine\entity\Living;
 use pocketmine\entity\Location;
 use pocketmine\event\entity\EntityBlockChangeEvent;
+use pocketmine\event\entity\EntityDamageByEntityEvent;
 use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\ByteTag;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
-use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\types\entity\EntityIds;
 use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataCollection;
 use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties;
+use pocketmine\world\format\io\GlobalBlockStateHandlers;
+use pocketmine\world\sound\BlockBreakSound;
 use function abs;
+use function min;
+use function round;
 
 class FallingBlock extends Entity{
-
+	private const TAG_FALLING_BLOCK = "FallingBlock"; //TAG_Compound
 	private const TAG_TILE_ID = "TileID"; //TAG_Int
 	private const TAG_TILE = "Tile"; //TAG_Byte
 	private const TAG_DATA = "Data"; //TAG_Byte
 
 	public static function getNetworkTypeId() : string{ return EntityIds::FALLING_BLOCK; }
 
-	protected $gravity = 0.04;
-	protected $drag = 0.02;
-
-	/** @var Block */
-	protected $block;
-
-	public $canCollide = false;
+	protected Block $block;
 
 	public function __construct(Location $location, Block $block, ?CompoundTag $nbt = null){
 		$this->block = $block;
@@ -65,23 +67,44 @@ class FallingBlock extends Entity{
 
 	protected function getInitialSizeInfo() : EntitySizeInfo{ return new EntitySizeInfo(0.98, 0.98); }
 
-	public static function parseBlockNBT(BlockFactory $factory, CompoundTag $nbt) : Block{
-		$blockId = 0;
+	protected function getInitialDragMultiplier() : float{ return 0.02; }
+
+	protected function getInitialGravity() : float{ return 0.04; }
+
+	public static function parseBlockNBT(RuntimeBlockStateRegistry $factory, CompoundTag $nbt) : Block{
 
 		//TODO: 1.8+ save format
-		if(($tileIdTag = $nbt->getTag(self::TAG_TILE_ID)) instanceof IntTag){
-			$blockId = $tileIdTag->getValue();
-		}elseif(($tileTag = $nbt->getTag(self::TAG_TILE)) instanceof ByteTag){
-			$blockId = $tileTag->getValue();
+		$blockDataUpgrader = GlobalBlockStateHandlers::getUpgrader();
+		if(($fallingBlockTag = $nbt->getCompoundTag(self::TAG_FALLING_BLOCK)) !== null){
+			try{
+				$blockStateData = $blockDataUpgrader->upgradeBlockStateNbt($fallingBlockTag);
+			}catch(BlockStateDeserializeException $e){
+				throw new SavedDataLoadingException("Invalid falling block blockstate: " . $e->getMessage(), 0, $e);
+			}
+		}else{
+			if(($tileIdTag = $nbt->getTag(self::TAG_TILE_ID)) instanceof IntTag){
+				$blockId = $tileIdTag->getValue();
+			}elseif(($tileTag = $nbt->getTag(self::TAG_TILE)) instanceof ByteTag){
+				$blockId = $tileTag->getValue();
+			}else{
+				throw new SavedDataLoadingException("Missing legacy falling block info");
+			}
+			$damage = $nbt->getByte(self::TAG_DATA, 0);
+
+			try{
+				$blockStateData = $blockDataUpgrader->upgradeIntIdMeta($blockId, $damage);
+			}catch(BlockStateDeserializeException $e){
+				throw new SavedDataLoadingException("Invalid legacy falling block data: " . $e->getMessage(), 0, $e);
+			}
 		}
 
-		if($blockId === 0){
-			throw new SavedDataLoadingException("Missing block info from NBT");
+		try{
+			$blockStateId = GlobalBlockStateHandlers::getDeserializer()->deserialize($blockStateData);
+		}catch(BlockStateDeserializeException $e){
+			throw new SavedDataLoadingException($e->getMessage(), 0, $e);
 		}
 
-		$damage = $nbt->getByte(self::TAG_DATA, 0);
-
-		return $factory->get($blockId, $damage);
+		return $factory->fromStateId($blockStateId);
 	}
 
 	public function canCollideWith(Entity $entity) : bool{
@@ -119,14 +142,20 @@ class FallingBlock extends Entity{
 			if($this->onGround || $blockTarget !== null){
 				$this->flagForDespawn();
 
+				$blockResult = $blockTarget ?? $this->block;
 				$block = $world->getBlock($pos);
 				if(!$block->canBeReplaced() || !$world->isInWorld($pos->getFloorX(), $pos->getFloorY(), $pos->getFloorZ()) || ($this->onGround && abs($this->location->y - $this->location->getFloorY()) > 0.001)){
 					$world->dropItem($this->location, $this->block->asItem());
+					$world->addSound($pos->add(0.5, 0.5, 0.5), new BlockBreakSound($blockResult));
 				}else{
-					$ev = new EntityBlockChangeEvent($this, $block, $blockTarget ?? $this->block);
+					$ev = new EntityBlockChangeEvent($this, $block, $blockResult);
 					$ev->call();
 					if(!$ev->isCancelled()){
-						$world->setBlock($pos, $ev->getTo());
+						$b = $ev->getTo();
+						$world->setBlock($pos, $b);
+						if($this->onGround && $b instanceof Fallable && ($sound = $b->getLandSound()) !== null){
+							$world->addSound($pos->add(0.5, 0.5, 0.5), $sound);
+						}
 					}
 				}
 				$hasUpdate = true;
@@ -136,22 +165,44 @@ class FallingBlock extends Entity{
 		return $hasUpdate;
 	}
 
+	protected function onHitGround() : ?float{
+		if($this->block instanceof Fallable){
+			$damagePerBlock = $this->block->getFallDamagePerBlock();
+			if($damagePerBlock > 0 && ($fallenBlocks = round($this->fallDistance) - 1) > 0){
+				$damage = min($fallenBlocks * $damagePerBlock, $this->block->getMaxFallDamage());
+				foreach($this->getWorld()->getCollidingEntities($this->getBoundingBox()) as $entity){
+					if($entity instanceof Living){
+						$ev = new EntityDamageByEntityEvent($this, $entity, EntityDamageEvent::CAUSE_FALLING_BLOCK, $damage);
+						$entity->attack($ev);
+					}
+				}
+			}
+			if(!$this->block->onHitGround($this)){
+				$this->flagForDespawn();
+			}
+		}
+		return null;
+	}
+
 	public function getBlock() : Block{
 		return $this->block;
 	}
 
 	public function saveNBT() : CompoundTag{
 		$nbt = parent::saveNBT();
-		$nbt->setInt(self::TAG_TILE_ID, $this->block->getId());
-		$nbt->setByte(self::TAG_DATA, $this->block->getMeta());
+		$nbt->setTag(self::TAG_FALLING_BLOCK, GlobalBlockStateHandlers::getSerializer()->serialize($this->block->getStateId())->toNbt());
 
 		return $nbt;
 	}
 
+	public function getPickedItem() : ?Item{
+		return $this->block->asItem();
+	}
+
 	protected function syncNetworkData(EntityMetadataCollection $properties) : void{
 		parent::syncNetworkData($properties);
 
-		$properties->setInt(EntityMetadataProperties::VARIANT, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()));
+		$properties->setInt(EntityMetadataProperties::VARIANT, TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId($this->block->getStateId()));
 	}
 
 	public function getOffsetPosition(Vector3 $vector3) : Vector3{
diff --git a/src/entity/object/ItemEntity.php b/src/entity/object/ItemEntity.php
index 76336d84ef..7d718bc851 100644
--- a/src/entity/object/ItemEntity.php
+++ b/src/entity/object/ItemEntity.php
@@ -34,12 +34,14 @@ use pocketmine\event\entity\ItemSpawnEvent;
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\CompoundTag;
-use pocketmine\network\mcpe\convert\TypeConverter;
+use pocketmine\network\mcpe\EntityEventBroadcaster;
+use pocketmine\network\mcpe\NetworkBroadcastUtils;
 use pocketmine\network\mcpe\protocol\AddItemActorPacket;
 use pocketmine\network\mcpe\protocol\types\entity\EntityIds;
 use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\permission\DefaultPermissionNames;
 use pocketmine\player\Player;
+use pocketmine\timings\Timings;
 use function max;
 
 class ItemEntity extends Entity{
@@ -58,22 +60,11 @@ class ItemEntity extends Entity{
 	public const NEVER_DESPAWN = -1;
 	public const MAX_DESPAWN_DELAY = 32767 + self::DEFAULT_DESPAWN_DELAY; //max value storable by mojang NBT :(
 
-	/** @var string */
-	protected $owner = "";
-	/** @var string */
-	protected $thrower = "";
-	/** @var int */
-	protected $pickupDelay = 0;
-	/** @var Item */
-	protected $item;
-
-	protected $gravity = 0.04;
-	protected $drag = 0.02;
-
-	public $canCollide = false;
-
-	/** @var int */
-	protected $despawnDelay = self::DEFAULT_DESPAWN_DELAY;
+	protected string $owner = "";
+	protected string $thrower = "";
+	protected int $pickupDelay = 0;
+	protected int $despawnDelay = self::DEFAULT_DESPAWN_DELAY;
+	protected Item $item;
 
 	public function __construct(Location $location, Item $item, ?CompoundTag $nbt = null){
 		if($item->isNull()){
@@ -85,6 +76,10 @@ class ItemEntity extends Entity{
 
 	protected function getInitialSizeInfo() : EntitySizeInfo{ return new EntitySizeInfo(0.25, 0.25); }
 
+	protected function getInitialDragMultiplier() : float{ return 0.02; }
+
+	protected function getInitialGravity() : float{ return 0.04; }
+
 	protected function initEntity(CompoundTag $nbt) : void{
 		parent::initEntity($nbt);
 
@@ -112,14 +107,24 @@ class ItemEntity extends Entity{
 			return false;
 		}
 
-		$hasUpdate = parent::entityBaseTick($tickDiff);
+		Timings::$itemEntityBaseTick->startTiming();
+		try{
 
-		if(!$this->isFlaggedForDespawn() && $this->pickupDelay !== self::NEVER_DESPAWN){ //Infinite delay
-			$this->pickupDelay -= $tickDiff;
-			if($this->pickupDelay < 0){
-				$this->pickupDelay = 0;
+			$hasUpdate = parent::entityBaseTick($tickDiff);
+
+			if($this->isFlaggedForDespawn()){
+				return $hasUpdate;
 			}
-			if($this->hasMovementUpdate() && $this->despawnDelay % self::MERGE_CHECK_PERIOD === 0){
+
+			if($this->pickupDelay !== self::NEVER_DESPAWN && $this->pickupDelay > 0){ //Infinite delay
+				$hasUpdate = true;
+				$this->pickupDelay -= $tickDiff;
+				if($this->pickupDelay < 0){
+					$this->pickupDelay = 0;
+				}
+			}
+
+			if($this->hasMovementUpdate() && $this->isMergeCandidate() && $this->despawnDelay % self::MERGE_CHECK_PERIOD === 0){
 				$mergeable = [$this]; //in case the merge target ends up not being this
 				$mergeTarget = $this;
 				foreach($this->getWorld()->getNearbyEntities($this->boundingBox->expandedCopy(0.5, 0.5, 0.5), $this) as $entity){
@@ -141,28 +146,39 @@ class ItemEntity extends Entity{
 				}
 			}
 
-			$this->despawnDelay -= $tickDiff;
-			if($this->despawnDelay <= 0){
-				$ev = new ItemDespawnEvent($this);
-				$ev->call();
-				if($ev->isCancelled()){
-					$this->despawnDelay = self::DEFAULT_DESPAWN_DELAY;
-				}else{
-					$this->flagForDespawn();
-					$hasUpdate = true;
+			if(!$this->isFlaggedForDespawn() && $this->despawnDelay !== self::NEVER_DESPAWN){
+				$hasUpdate = true;
+				$this->despawnDelay -= $tickDiff;
+				if($this->despawnDelay <= 0){
+					$ev = new ItemDespawnEvent($this);
+					$ev->call();
+					if($ev->isCancelled()){
+						$this->despawnDelay = self::DEFAULT_DESPAWN_DELAY;
+					}else{
+						$this->flagForDespawn();
+					}
 				}
 			}
-		}
 
-		return $hasUpdate;
+			return $hasUpdate;
+		}finally{
+			Timings::$itemEntityBaseTick->stopTiming();
+		}
+	}
+
+	private function isMergeCandidate() : bool{
+		return $this->pickupDelay !== self::NEVER_DESPAWN && $this->item->getCount() < $this->item->getMaxStackSize();
 	}
 
 	/**
 	 * Returns whether this item entity can merge with the given one.
 	 */
 	public function isMergeable(ItemEntity $entity) : bool{
+		if(!$this->isMergeCandidate() || !$entity->isMergeCandidate()){
+			return false;
+		}
 		$item = $entity->item;
-		return $entity !== $this && $entity->pickupDelay !== self::NEVER_DESPAWN && $item->canStackWith($this->item) && $item->getCount() + $this->item->getCount() <= $item->getMaxStackSize();
+		return $entity !== $this && $item->canStackWith($this->item) && $item->getCount() + $this->item->getCount() <= $item->getMaxStackSize();
 	}
 
 	/**
@@ -212,12 +228,8 @@ class ItemEntity extends Entity{
 		}
 		$nbt->setShort(self::TAG_AGE, $age);
 		$nbt->setShort(self::TAG_PICKUP_DELAY, $this->pickupDelay);
-		if($this->owner !== null){
-			$nbt->setString(self::TAG_OWNER, $this->owner);
-		}
-		if($this->thrower !== null){
-			$nbt->setString(self::TAG_THROWER, $this->thrower);
-		}
+		$nbt->setString(self::TAG_OWNER, $this->owner);
+		$nbt->setString(self::TAG_THROWER, $this->thrower);
 
 		return $nbt;
 	}
@@ -226,6 +238,10 @@ class ItemEntity extends Entity{
 		return $this->item;
 	}
 
+	public function isFireProof() : bool{
+		return $this->item->isFireProof();
+	}
+
 	public function canCollideWith(Entity $entity) : bool{
 		return false;
 	}
@@ -276,10 +292,11 @@ class ItemEntity extends Entity{
 	}
 
 	protected function sendSpawnPacket(Player $player) : void{
-		$player->getNetworkSession()->sendDataPacket(AddItemActorPacket::create(
+		$networkSession = $player->getNetworkSession();
+		$networkSession->sendDataPacket(AddItemActorPacket::create(
 			$this->getId(), //TODO: entity unique ID
 			$this->getId(),
-			ItemStackWrapper::legacy(TypeConverter::getInstance()->coreItemStackToNet($this->getItem())),
+			ItemStackWrapper::legacy($networkSession->getTypeConverter()->coreItemStackToNet($this->getItem())),
 			$this->location->asVector3(),
 			$this->getMotion(),
 			$this->getAllNetworkData(),
@@ -321,9 +338,10 @@ class ItemEntity extends Entity{
 			return;
 		}
 
-		foreach($this->getViewers() as $viewer){
-			$viewer->getNetworkSession()->onPlayerPickUpItem($player, $this);
-		}
+		NetworkBroadcastUtils::broadcastEntityEvent(
+			$this->getViewers(),
+			fn(EntityEventBroadcaster $broadcaster, array $recipients) => $broadcaster->onPickUpItem($recipients, $player, $this)
+		);
 
 		$inventory = $ev->getInventory();
 		if($inventory !== null){
diff --git a/src/entity/object/Painting.php b/src/entity/object/Painting.php
index 52082e7a33..641d040510 100644
--- a/src/entity/object/Painting.php
+++ b/src/entity/object/Painting.php
@@ -28,6 +28,7 @@ use pocketmine\entity\Entity;
 use pocketmine\entity\EntitySizeInfo;
 use pocketmine\entity\Location;
 use pocketmine\event\entity\EntityDamageByEntityEvent;
+use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
@@ -63,17 +64,9 @@ class Painting extends Entity{
 		Facing::EAST => 3
 	];
 
-	/** @var float */
-	protected $gravity = 0.0;
-	/** @var float */
-	protected $drag = 1.0;
-
-	/** @var Vector3 */
-	protected $blockIn;
-	/** @var int */
-	protected $facing = Facing::NORTH;
-	/** @var PaintingMotive */
-	protected $motive;
+	protected Vector3 $blockIn;
+	protected int $facing;
+	protected PaintingMotive $motive;
 
 	public function __construct(Location $location, Vector3 $blockIn, int $facing, PaintingMotive $motive, ?CompoundTag $nbt = null){
 		$this->motive = $motive;
@@ -87,6 +80,10 @@ class Painting extends Entity{
 		return new EntitySizeInfo(0.5, 0.5);
 	}
 
+	protected function getInitialDragMultiplier() : float{ return 1.0; }
+
+	protected function getInitialGravity() : float{ return 0.0; }
+
 	protected function initEntity(CompoundTag $nbt) : void{
 		$this->setMaxHealth(1);
 		$this->setHealth(1);
@@ -169,6 +166,10 @@ class Painting extends Entity{
 		));
 	}
 
+	public function getPickedItem() : ?Item{
+		return VanillaItems::PAINTING();
+	}
+
 	/**
 	 * Returns the painting motive (which image is displayed on the painting)
 	 */
diff --git a/src/entity/object/PaintingMotive.php b/src/entity/object/PaintingMotive.php
index ecbc478a55..00114c508b 100644
--- a/src/entity/object/PaintingMotive.php
+++ b/src/entity/object/PaintingMotive.php
@@ -27,7 +27,7 @@ class PaintingMotive{
 	private static bool $initialized = false;
 
 	/** @var PaintingMotive[] */
-	protected static $motives = [];
+	protected static array $motives = [];
 
 	public static function init() : void{
 		self::$initialized = true;
@@ -37,9 +37,11 @@ class PaintingMotive{
 			new PaintingMotive(1, 1, "Aztec2"),
 			new PaintingMotive(1, 1, "Bomb"),
 			new PaintingMotive(1, 1, "Kebab"),
+			new PaintingMotive(1, 1, "meditative"),
 			new PaintingMotive(1, 1, "Plant"),
 			new PaintingMotive(1, 1, "Wasteland"),
 			new PaintingMotive(1, 2, "Graham"),
+			new PaintingMotive(1, 2, "prairie_ride"),
 			new PaintingMotive(1, 2, "Wanderer"),
 			new PaintingMotive(2, 1, "Courbet"),
 			new PaintingMotive(2, 1, "Creebet"),
@@ -47,8 +49,10 @@ class PaintingMotive{
 			new PaintingMotive(2, 1, "Sea"),
 			new PaintingMotive(2, 1, "Sunset"),
 			new PaintingMotive(2, 2, "Bust"),
+			new PaintingMotive(2, 2, "baroque"),
 			new PaintingMotive(2, 2, "Earth"),
 			new PaintingMotive(2, 2, "Fire"),
+			new PaintingMotive(2, 2, "humble"),
 			new PaintingMotive(2, 2, "Match"),
 			new PaintingMotive(2, 2, "SkullAndRoses"),
 			new PaintingMotive(2, 2, "Stage"),
@@ -56,12 +60,28 @@ class PaintingMotive{
 			new PaintingMotive(2, 2, "Water"),
 			new PaintingMotive(2, 2, "Wind"),
 			new PaintingMotive(2, 2, "Wither"),
+			new PaintingMotive(3, 3, "bouquet"),
+			new PaintingMotive(3, 3, "cavebird"),
+			new PaintingMotive(3, 3, "cotan"),
+			new PaintingMotive(3, 3, "endboss"),
+			new PaintingMotive(3, 3, "fern"),
+			new PaintingMotive(3, 3, "owlemons"),
+			new PaintingMotive(3, 3, "sunflowers"),
+			new PaintingMotive(3, 3, "tides"),
+			new PaintingMotive(3, 4, "backyard"),
+			new PaintingMotive(3, 4, "pond"),
+			new PaintingMotive(4, 2, "changing"),
 			new PaintingMotive(4, 2, "Fighters"),
+			new PaintingMotive(4, 2, "finding"),
+			new PaintingMotive(4, 2, "lowmist"),
+			new PaintingMotive(4, 2, "passage"),
 			new PaintingMotive(4, 3, "DonkeyKong"),
 			new PaintingMotive(4, 3, "Skeleton"),
 			new PaintingMotive(4, 4, "BurningSkull"),
+			new PaintingMotive(4, 4, "orb"),
 			new PaintingMotive(4, 4, "Pigscene"),
-			new PaintingMotive(4, 4, "Pointer")
+			new PaintingMotive(4, 4, "Pointer"),
+			new PaintingMotive(4, 4, "unpacked")
 		] as $motive){
 			self::registerMotive($motive);
 		}
@@ -91,18 +111,11 @@ class PaintingMotive{
 		return self::$motives;
 	}
 
-	/** @var string */
-	protected $name;
-	/** @var int */
-	protected $width;
-	/** @var int */
-	protected $height;
-
-	public function __construct(int $width, int $height, string $name){
-		$this->name = $name;
-		$this->width = $width;
-		$this->height = $height;
-	}
+	public function __construct(
+		protected int $width,
+		protected int $height,
+		protected string $name
+	){}
 
 	public function getName() : string{
 		return $this->name;
diff --git a/src/entity/object/PrimedTNT.php b/src/entity/object/PrimedTNT.php
index 20129269a0..af3c979228 100644
--- a/src/entity/object/PrimedTNT.php
+++ b/src/entity/object/PrimedTNT.php
@@ -23,11 +23,13 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\object;
 
+use pocketmine\block\VanillaBlocks;
 use pocketmine\entity\Entity;
 use pocketmine\entity\EntitySizeInfo;
 use pocketmine\entity\Explosive;
 use pocketmine\event\entity\EntityDamageEvent;
-use pocketmine\event\entity\ExplosionPrimeEvent;
+use pocketmine\event\entity\EntityPreExplodeEvent;
+use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\network\mcpe\protocol\types\entity\EntityIds;
@@ -43,18 +45,15 @@ class PrimedTNT extends Entity implements Explosive{
 
 	public static function getNetworkTypeId() : string{ return EntityIds::TNT; }
 
-	protected $gravity = 0.04;
-	protected $drag = 0.02;
-
-	/** @var int */
-	protected $fuse;
-
+	protected int $fuse;
 	protected bool $worksUnderwater = false;
 
-	public $canCollide = false;
-
 	protected function getInitialSizeInfo() : EntitySizeInfo{ return new EntitySizeInfo(0.98, 0.98); }
 
+	protected function getInitialDragMultiplier() : float{ return 0.02; }
+
+	protected function getInitialGravity() : float{ return 0.04; }
+
 	public function getFuse() : int{
 		return $this->fuse;
 	}
@@ -118,11 +117,11 @@ class PrimedTNT extends Entity implements Explosive{
 	}
 
 	public function explode() : void{
-		$ev = new ExplosionPrimeEvent($this, 4);
+		$ev = new EntityPreExplodeEvent($this, 4);
 		$ev->call();
 		if(!$ev->isCancelled()){
 			//TODO: deal with underwater TNT (underwater TNT treats water as if it has a blast resistance of 0)
-			$explosion = new Explosion(Position::fromObject($this->location->add(0, $this->size->getHeight() / 2, 0), $this->getWorld()), $ev->getForce(), $this);
+			$explosion = new Explosion(Position::fromObject($this->location->add(0, $this->size->getHeight() / 2, 0), $this->getWorld()), $ev->getRadius(), $this);
 			if($ev->isBlockBreaking()){
 				$explosion->explodeA();
 			}
@@ -130,6 +129,10 @@ class PrimedTNT extends Entity implements Explosive{
 		}
 	}
 
+	public function getPickedItem() : ?Item{
+		return VanillaBlocks::TNT()->setWorksUnderwater($this->worksUnderwater)->asItem();
+	}
+
 	protected function syncNetworkData(EntityMetadataCollection $properties) : void{
 		parent::syncNetworkData($properties);
 
diff --git a/src/entity/projectile/Arrow.php b/src/entity/projectile/Arrow.php
index 3c5d356d2c..1cc2b355b6 100644
--- a/src/entity/projectile/Arrow.php
+++ b/src/entity/projectile/Arrow.php
@@ -33,6 +33,8 @@ use pocketmine\event\entity\ProjectileHitEvent;
 use pocketmine\item\VanillaItems;
 use pocketmine\math\RayTraceResult;
 use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\network\mcpe\EntityEventBroadcaster;
+use pocketmine\network\mcpe\NetworkBroadcastUtils;
 use pocketmine\network\mcpe\protocol\types\entity\EntityIds;
 use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataCollection;
 use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags;
@@ -55,23 +57,11 @@ class Arrow extends Projectile{
 	public const TAG_CRIT = "crit"; //TAG_Byte
 	private const TAG_LIFE = "life"; //TAG_Short
 
-	protected $gravity = 0.05;
-	protected $drag = 0.01;
-
-	/** @var float */
-	protected $damage = 2.0;
-
-	/** @var int */
-	protected $pickupMode = self::PICKUP_ANY;
-
-	/** @var float */
-	protected $punchKnockback = 0.0;
-
-	/** @var int */
-	protected $collideTicks = 0;
-
-	/** @var bool */
-	protected $critical = false;
+	protected float $damage = 2.0;
+	protected int $pickupMode = self::PICKUP_ANY;
+	protected float $punchKnockback = 0.0;
+	protected int $collideTicks = 0;
+	protected bool $critical = false;
 
 	public function __construct(Location $location, ?Entity $shootingEntity, bool $critical, ?CompoundTag $nbt = null){
 		parent::__construct($location, $shootingEntity, $nbt);
@@ -80,6 +70,10 @@ class Arrow extends Projectile{
 
 	protected function getInitialSizeInfo() : EntitySizeInfo{ return new EntitySizeInfo(0.25, 0.25); }
 
+	protected function getInitialDragMultiplier() : float{ return 0.01; }
+
+	protected function getInitialGravity() : float{ return 0.05; }
+
 	protected function initEntity(CompoundTag $nbt) : void{
 		parent::initEntity($nbt);
 
@@ -197,9 +191,10 @@ class Arrow extends Projectile{
 			return;
 		}
 
-		foreach($this->getViewers() as $viewer){
-			$viewer->getNetworkSession()->onPlayerPickUpItem($player, $this);
-		}
+		NetworkBroadcastUtils::broadcastEntityEvent(
+			$this->getViewers(),
+			fn(EntityEventBroadcaster $broadcaster, array $recipients) => $broadcaster->onPickUpItem($recipients, $player, $this)
+		);
 
 		$ev->getInventory()?->addItem($ev->getItem());
 		$this->flagForDespawn();
diff --git a/src/entity/projectile/ExperienceBottle.php b/src/entity/projectile/ExperienceBottle.php
index c32af48a9b..ea8447a74a 100644
--- a/src/entity/projectile/ExperienceBottle.php
+++ b/src/entity/projectile/ExperienceBottle.php
@@ -32,7 +32,7 @@ use function mt_rand;
 class ExperienceBottle extends Throwable{
 	public static function getNetworkTypeId() : string{ return EntityIds::XP_BOTTLE; }
 
-	protected $gravity = 0.07;
+	protected function getInitialGravity() : float{ return 0.07; }
 
 	public function getResultDamage() : int{
 		return -1;
diff --git a/src/entity/projectile/IceBomb.php b/src/entity/projectile/IceBomb.php
new file mode 100644
index 0000000000..69a5d46a2c
--- /dev/null
+++ b/src/entity/projectile/IceBomb.php
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\entity\projectile;
+
+use pocketmine\block\Block;
+use pocketmine\block\BlockTypeIds;
+use pocketmine\block\VanillaBlocks;
+use pocketmine\event\entity\ProjectileHitEvent;
+use pocketmine\item\VanillaItems;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\RayTraceResult;
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\types\entity\EntityIds;
+use pocketmine\world\particle\ItemBreakParticle;
+use pocketmine\world\sound\IceBombHitSound;
+
+class IceBomb extends Throwable{
+	public static function getNetworkTypeId() : string{ return EntityIds::ICE_BOMB; }
+
+	public function getResultDamage() : int{
+		return -1;
+	}
+
+	protected function calculateInterceptWithBlock(Block $block, Vector3 $start, Vector3 $end) : ?RayTraceResult{
+		if($block->getTypeId() === BlockTypeIds::WATER){
+			$pos = $block->getPosition();
+
+			return AxisAlignedBB::one()->offset($pos->x, $pos->y, $pos->z)->calculateIntercept($start, $end);
+		}
+
+		return parent::calculateInterceptWithBlock($block, $start, $end);
+	}
+
+	protected function onHit(ProjectileHitEvent $event) : void{
+		$world = $this->getWorld();
+		$pos = $this->location;
+
+		$world->addSound($pos, new IceBombHitSound());
+		$itemBreakParticle = new ItemBreakParticle(VanillaItems::ICE_BOMB());
+		for($i = 0; $i < 6; ++$i){
+			$world->addParticle($pos, $itemBreakParticle);
+		}
+	}
+
+	protected function onHitBlock(Block $blockHit, RayTraceResult $hitResult) : void{
+		parent::onHitBlock($blockHit, $hitResult);
+
+		$pos = $blockHit->getPosition();
+		$world = $pos->getWorld();
+		$posX = $pos->getFloorX();
+		$posY = $pos->getFloorY();
+		$posZ = $pos->getFloorZ();
+
+		$ice = VanillaBlocks::ICE();
+		for($x = $posX - 1; $x <= $posX + 1; $x++){
+			for($y = $posY - 1; $y <= $posY + 1; $y++){
+				for($z = $posZ - 1; $z <= $posZ + 1; $z++){
+					if($world->getBlockAt($x, $y, $z)->getTypeId() === BlockTypeIds::WATER){
+						$world->setBlockAt($x, $y, $z, $ice);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/src/entity/projectile/Projectile.php b/src/entity/projectile/Projectile.php
index 68afabd08a..0abc274b5d 100644
--- a/src/entity/projectile/Projectile.php
+++ b/src/entity/projectile/Projectile.php
@@ -24,10 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\entity\projectile;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
+use pocketmine\data\SavedDataLoadingException;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
 use pocketmine\entity\Location;
+use pocketmine\entity\object\EndCrystal;
 use pocketmine\event\entity\EntityCombustByEntityEvent;
 use pocketmine\event\entity\EntityDamageByChildEntityEvent;
 use pocketmine\event\entity\EntityDamageByEntityEvent;
@@ -38,30 +39,28 @@ use pocketmine\event\entity\ProjectileHitEvent;
 use pocketmine\math\RayTraceResult;
 use pocketmine\math\Vector3;
 use pocketmine\math\VoxelRayTrace;
-use pocketmine\nbt\tag\ByteTag;
+use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\ListTag;
 use pocketmine\timings\Timings;
 use function assert;
 use function atan2;
 use function ceil;
+use function count;
 use function sqrt;
 use const M_PI;
 use const PHP_INT_MAX;
 
 abstract class Projectile extends Entity{
+	private const TAG_STUCK_ON_BLOCK_POS = "StuckToBlockPos";
 	private const TAG_DAMAGE = "damage"; //TAG_Double
 	private const TAG_TILE_X = "tileX"; //TAG_Int
 	private const TAG_TILE_Y = "tileY"; //TAG_Int
 	private const TAG_TILE_Z = "tileZ"; //TAG_Int
-	private const TAG_BLOCK_ID = "blockId"; //TAG_Int
-	private const TAG_BLOCK_DATA = "blockData"; //TAG_Byte
 
-	/** @var float */
-	protected $damage = 0.0;
-
-	/** @var Block|null */
-	protected $blockHit;
+	protected float $damage = 0.0;
+	protected ?Vector3 $blockHit = null;
 
 	public function __construct(Location $location, ?Entity $shootingEntity, ?CompoundTag $nbt = null){
 		parent::__construct($location, $nbt);
@@ -83,32 +82,22 @@ abstract class Projectile extends Entity{
 		$this->setHealth(1);
 		$this->damage = $nbt->getDouble(self::TAG_DAMAGE, $this->damage);
 
-		(function() use ($nbt) : void{
-			if(($tileXTag = $nbt->getTag(self::TAG_TILE_X)) instanceof IntTag && ($tileYTag = $nbt->getTag(self::TAG_TILE_Y)) instanceof IntTag && ($tileZTag = $nbt->getTag(self::TAG_TILE_Z)) instanceof IntTag){
-				$blockPos = new Vector3($tileXTag->getValue(), $tileYTag->getValue(), $tileZTag->getValue());
-			}else{
-				return;
+		if(($stuckOnBlockPosTag = $nbt->getListTag(self::TAG_STUCK_ON_BLOCK_POS)) !== null){
+			if($stuckOnBlockPosTag->getTagType() !== NBT::TAG_Int || count($stuckOnBlockPosTag) !== 3){
+				throw new SavedDataLoadingException(self::TAG_STUCK_ON_BLOCK_POS . " tag should be a list of 3 TAG_Int");
 			}
 
-			if(($blockIdTag = $nbt->getTag(self::TAG_BLOCK_ID)) instanceof IntTag){
-				$blockId = $blockIdTag->getValue();
-			}else{
-				return;
-			}
+			/** @var IntTag[] $values */
+			$values = $stuckOnBlockPosTag->getValue();
 
-			if(($blockDataTag = $nbt->getTag(self::TAG_BLOCK_DATA)) instanceof ByteTag){
-				$blockData = $blockDataTag->getValue();
-			}else{
-				return;
-			}
-
-			$this->blockHit = BlockFactory::getInstance()->get($blockId, $blockData);
-			$this->blockHit->position($this->getWorld(), $blockPos->getFloorX(), $blockPos->getFloorY(), $blockPos->getFloorZ());
-		})();
+			$this->blockHit = new Vector3($values[0]->getValue(), $values[1]->getValue(), $values[2]->getValue());
+		}elseif(($tileXTag = $nbt->getTag(self::TAG_TILE_X)) instanceof IntTag && ($tileYTag = $nbt->getTag(self::TAG_TILE_Y)) instanceof IntTag && ($tileZTag = $nbt->getTag(self::TAG_TILE_Z)) instanceof IntTag){
+			$this->blockHit = new Vector3($tileXTag->getValue(), $tileYTag->getValue(), $tileZTag->getValue());
+		}
 	}
 
 	public function canCollideWith(Entity $entity) : bool{
-		return $entity instanceof Living && !$this->onGround;
+		return ($entity instanceof Living || $entity instanceof EndCrystal) && !$this->onGround;
 	}
 
 	public function canBeCollidedWith() : bool{
@@ -143,14 +132,11 @@ abstract class Projectile extends Entity{
 		$nbt->setDouble(self::TAG_DAMAGE, $this->damage);
 
 		if($this->blockHit !== null){
-			$pos = $this->blockHit->getPosition();
-			$nbt->setInt(self::TAG_TILE_X, $pos->x);
-			$nbt->setInt(self::TAG_TILE_Y, $pos->y);
-			$nbt->setInt(self::TAG_TILE_Z, $pos->z);
-
-			//we intentionally use different ones to PC because we don't have stringy IDs
-			$nbt->setInt(self::TAG_BLOCK_ID, $this->blockHit->getId());
-			$nbt->setByte(self::TAG_BLOCK_DATA, $this->blockHit->getMeta());
+			$nbt->setTag(self::TAG_STUCK_ON_BLOCK_POS, new ListTag([
+				new IntTag($this->blockHit->getFloorX()),
+				new IntTag($this->blockHit->getFloorY()),
+				new IntTag($this->blockHit->getFloorZ())
+			]));
 		}
 
 		return $nbt;
@@ -161,8 +147,11 @@ abstract class Projectile extends Entity{
 	}
 
 	public function onNearbyBlockChange() : void{
-		if($this->blockHit !== null && $this->getWorld()->isInLoadedTerrain($this->blockHit->getPosition()) && !$this->blockHit->isSameState($this->getWorld()->getBlock($this->blockHit->getPosition()))){
-			$this->blockHit = null;
+		if($this->blockHit !== null && $this->getWorld()->isInLoadedTerrain($this->blockHit)){
+			$blockHit = $this->getWorld()->getBlock($this->blockHit);
+			if(!$blockHit->collidesWithBB($this->getBoundingBox()->expandedCopy(0.001, 0.001, 0.001))){
+				$this->blockHit = null;
+			}
 		}
 
 		parent::onNearbyBlockChange();
@@ -175,7 +164,8 @@ abstract class Projectile extends Entity{
 	protected function move(float $dx, float $dy, float $dz) : void{
 		$this->blocksAround = null;
 
-		Timings::$entityMove->startTiming();
+		Timings::$projectileMove->startTiming();
+		Timings::$projectileMoveRayTrace->startTiming();
 
 		$start = $this->location->asVector3();
 		$end = $start->add($dx, $dy, $dz);
@@ -184,8 +174,9 @@ abstract class Projectile extends Entity{
 		$entityHit = null;
 		$hitResult = null;
 
+		$world = $this->getWorld();
 		foreach(VoxelRayTrace::betweenPoints($start, $end) as $vector3){
-			$block = $this->getWorld()->getBlockAt($vector3->x, $vector3->y, $vector3->z);
+			$block = $world->getBlockAt($vector3->x, $vector3->y, $vector3->z);
 
 			$blockHitResult = $this->calculateInterceptWithBlock($block, $start, $end);
 			if($blockHitResult !== null){
@@ -199,7 +190,7 @@ abstract class Projectile extends Entity{
 		$entityDistance = PHP_INT_MAX;
 
 		$newDiff = $end->subtractVector($start);
-		foreach($this->getWorld()->getCollidingEntities($this->boundingBox->addCoord($newDiff->x, $newDiff->y, $newDiff->z)->expand(1, 1, 1), $this) as $entity){
+		foreach($world->getCollidingEntities($this->boundingBox->addCoord($newDiff->x, $newDiff->y, $newDiff->z)->expand(1, 1, 1), $this) as $entity){
 			if($entity->getId() === $this->getOwningEntityId() && $this->ticksLived < 5){
 				continue;
 			}
@@ -221,6 +212,8 @@ abstract class Projectile extends Entity{
 			}
 		}
 
+		Timings::$projectileMoveRayTrace->stopTiming();
+
 		$this->location = Location::fromObject(
 			$end,
 			$this->location->world,
@@ -252,7 +245,7 @@ abstract class Projectile extends Entity{
 			}
 
 			$this->isCollided = $this->onGround = true;
-			$this->motion = new Vector3(0, 0, 0);
+			$this->motion = Vector3::zero();
 		}else{
 			$this->isCollided = $this->onGround = false;
 			$this->blockHit = null;
@@ -265,10 +258,10 @@ abstract class Projectile extends Entity{
 			);
 		}
 
-		$this->getWorld()->onEntityMoved($this);
+		$world->onEntityMoved($this);
 		$this->checkBlockIntersections();
 
-		Timings::$entityMove->stopTiming();
+		Timings::$projectileMove->stopTiming();
 	}
 
 	/**
@@ -321,6 +314,7 @@ abstract class Projectile extends Entity{
 	 * Called when the projectile collides with a Block.
 	 */
 	protected function onHitBlock(Block $blockHit, RayTraceResult $hitResult) : void{
-		$this->blockHit = clone $blockHit;
+		$this->blockHit = $blockHit->getPosition()->asVector3();
+		$blockHit->onProjectileHit($this, $hitResult);
 	}
 }
diff --git a/src/entity/projectile/Snowball.php b/src/entity/projectile/Snowball.php
index cf9d7c6894..30a0ba6e25 100644
--- a/src/entity/projectile/Snowball.php
+++ b/src/entity/projectile/Snowball.php
@@ -31,8 +31,9 @@ class Snowball extends Throwable{
 	public static function getNetworkTypeId() : string{ return EntityIds::SNOWBALL; }
 
 	protected function onHit(ProjectileHitEvent $event) : void{
+		$world = $this->getWorld();
 		for($i = 0; $i < 6; ++$i){
-			$this->getWorld()->addParticle($this->location, new SnowballPoofParticle());
+			$world->addParticle($this->location, new SnowballPoofParticle());
 		}
 	}
 }
diff --git a/src/entity/projectile/SplashPotion.php b/src/entity/projectile/SplashPotion.php
index 05f64e525b..f4635cad77 100644
--- a/src/entity/projectile/SplashPotion.php
+++ b/src/entity/projectile/SplashPotion.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\projectile;
 
-use pocketmine\block\BlockLegacyIds;
+use pocketmine\block\BlockTypeTags;
 use pocketmine\block\VanillaBlocks;
 use pocketmine\color\Color;
 use pocketmine\data\bedrock\PotionTypeIdMap;
@@ -54,11 +54,7 @@ class SplashPotion extends Throwable{
 
 	public static function getNetworkTypeId() : string{ return EntityIds::SPLASH_POTION; }
 
-	protected $gravity = 0.05;
-	protected $drag = 0.01;
-
-	/** @var bool */
-	protected $linger = false;
+	protected bool $linger = false;
 	protected PotionType $potionType;
 
 	public function __construct(Location $location, ?Entity $shootingEntity, PotionType $potionType, ?CompoundTag $nbt = null){
@@ -66,6 +62,8 @@ class SplashPotion extends Throwable{
 		parent::__construct($location, $shootingEntity, $nbt);
 	}
 
+	protected function getInitialGravity() : float{ return 0.05; }
+
 	public function saveNBT() : CompoundTag{
 		$nbt = parent::saveNBT();
 		$nbt->setShort(self::TAG_POTION_ID, PotionTypeIdMap::getInstance()->toId($this->getPotionType()));
@@ -131,14 +129,14 @@ class SplashPotion extends Throwable{
 			}else{
 				//TODO: lingering potions
 			}
-		}elseif($event instanceof ProjectileHitBlockEvent && $this->getPotionType()->equals(PotionType::WATER())){
+		}elseif($event instanceof ProjectileHitBlockEvent && $this->getPotionType() === PotionType::WATER){
 			$blockIn = $event->getBlockHit()->getSide($event->getRayTraceResult()->getHitFace());
 
-			if($blockIn->getId() === BlockLegacyIds::FIRE){
+			if($blockIn->hasTypeTag(BlockTypeTags::FIRE)){
 				$this->getWorld()->setBlock($blockIn->getPosition(), VanillaBlocks::AIR());
 			}
 			foreach($blockIn->getHorizontalSides() as $horizontalSide){
-				if($horizontalSide->getId() === BlockLegacyIds::FIRE){
+				if($horizontalSide->hasTypeTag(BlockTypeTags::FIRE)){
 					$this->getWorld()->setBlock($horizontalSide->getPosition(), VanillaBlocks::AIR());
 				}
 			}
diff --git a/src/entity/projectile/Throwable.php b/src/entity/projectile/Throwable.php
index 86a3e5e041..467c836042 100644
--- a/src/entity/projectile/Throwable.php
+++ b/src/entity/projectile/Throwable.php
@@ -29,11 +29,12 @@ use pocketmine\math\RayTraceResult;
 
 abstract class Throwable extends Projectile{
 
-	protected $gravity = 0.03;
-	protected $drag = 0.01;
-
 	protected function getInitialSizeInfo() : EntitySizeInfo{ return new EntitySizeInfo(0.25, 0.25); }
 
+	protected function getInitialDragMultiplier() : float{ return 0.01; }
+
+	protected function getInitialGravity() : float{ return 0.03; }
+
 	protected function onHitBlock(Block $blockHit, RayTraceResult $hitResult) : void{
 		parent::onHitBlock($blockHit, $hitResult);
 		$this->flagForDespawn();
diff --git a/src/event/Event.php b/src/event/Event.php
index 7437283aca..21b8ae36a5 100644
--- a/src/event/Event.php
+++ b/src/event/Event.php
@@ -26,6 +26,8 @@ declare(strict_types=1);
  */
 namespace pocketmine\event;
 
+use pocketmine\timings\Timings;
+use function count;
 use function get_class;
 
 abstract class Event{
@@ -33,8 +35,7 @@ abstract class Event{
 
 	private static int $eventCallDepth = 1;
 
-	/** @var string|null */
-	protected $eventName = null;
+	protected ?string $eventName = null;
 
 	final public function getEventName() : string{
 		return $this->eventName ?? get_class($this);
@@ -51,22 +52,29 @@ abstract class Event{
 			throw new \RuntimeException("Recursive event call detected (reached max depth of " . self::MAX_EVENT_CALL_DEPTH . " calls)");
 		}
 
-		$handlerList = HandlerListManager::global()->getListFor(get_class($this));
+		$timings = Timings::getEventTimings($this);
+		$timings->startTiming();
+
+		$handlers = HandlerListManager::global()->getHandlersFor(static::class);
 
 		++self::$eventCallDepth;
 		try{
-			foreach(EventPriority::ALL as $priority){
-				$currentList = $handlerList;
-				while($currentList !== null){
-					foreach($currentList->getListenersByPriority($priority) as $registration){
-						$registration->callEvent($this);
-					}
-
-					$currentList = $currentList->getParent();
-				}
+			foreach($handlers as $registration){
+				$registration->callEvent($this);
 			}
 		}finally{
 			--self::$eventCallDepth;
+			$timings->stopTiming();
 		}
 	}
+
+	/**
+	 * Returns whether the current class context has any registered global handlers.
+	 * This can be used in hot code paths to avoid unnecessary event object creation.
+	 *
+	 * Usage: SomeEventClass::hasHandlers()
+	 */
+	public static function hasHandlers() : bool{
+		return count(HandlerListManager::global()->getHandlersFor(static::class)) > 0;
+	}
 }
diff --git a/src/event/EventPriority.php b/src/event/EventPriority.php
index cdeb3136a3..99c71faff6 100644
--- a/src/event/EventPriority.php
+++ b/src/event/EventPriority.php
@@ -32,6 +32,8 @@ use function mb_strtoupper;
  * LOWEST -> LOW -> NORMAL -> HIGH -> HIGHEST -> MONITOR
  *
  * MONITOR events should not change the event outcome or contents
+ *
+ * WARNING: If these values are changed, handler sorting in HandlerList::getListenerList() may need to be updated.
  */
 final class EventPriority{
 
diff --git a/src/event/HandlerList.php b/src/event/HandlerList.php
index 0e16555b38..e7d229a3ff 100644
--- a/src/event/HandlerList.php
+++ b/src/event/HandlerList.php
@@ -24,22 +24,32 @@ declare(strict_types=1);
 namespace pocketmine\event;
 
 use pocketmine\plugin\Plugin;
-use function array_fill_keys;
+use function array_merge;
+use function krsort;
 use function spl_object_id;
+use const SORT_NUMERIC;
 
 class HandlerList{
-	/** @var RegisteredListener[][] */
+	/**
+	 * @var RegisteredListener[][]
+	 * @phpstan-var array<int, array<int, RegisteredListener>>
+	 */
 	private array $handlerSlots = [];
 
+	/** @var RegisteredListenerCache[] */
+	private array $affectedHandlerCaches = [];
+
 	/**
-	 * @phpstan-template TEvent of Event
-	 * @phpstan-param class-string<TEvent> $class
+	 * @phpstan-param class-string<covariant Event> $class
 	 */
 	public function __construct(
 		private string $class,
-		private ?HandlerList $parentList
+		private ?HandlerList $parentList,
+		private RegisteredListenerCache $handlerCache = new RegisteredListenerCache()
 	){
-		$this->handlerSlots = array_fill_keys(EventPriority::ALL, []);
+		for($list = $this; $list !== null; $list = $list->parentList){
+			$list->affectedHandlerCaches[spl_object_id($this->handlerCache)] = $this->handlerCache;
+		}
 	}
 
 	/**
@@ -50,6 +60,7 @@ class HandlerList{
 			throw new \InvalidArgumentException("This listener is already registered to priority {$listener->getPriority()} of event {$this->class}");
 		}
 		$this->handlerSlots[$listener->getPriority()][spl_object_id($listener)] = $listener;
+		$this->invalidateAffectedCaches();
 	}
 
 	/**
@@ -59,12 +70,10 @@ class HandlerList{
 		foreach($listeners as $listener){
 			$this->register($listener);
 		}
+		$this->invalidateAffectedCaches();
 	}
 
-	/**
-	 * @param RegisteredListener|Listener|Plugin $object
-	 */
-	public function unregister($object) : void{
+	public function unregister(RegisteredListener|Plugin|Listener $object) : void{
 		if($object instanceof Plugin || $object instanceof Listener){
 			foreach($this->handlerSlots as $priority => $list){
 				foreach($list as $hash => $listener){
@@ -75,25 +84,61 @@ class HandlerList{
 					}
 				}
 			}
-		}elseif($object instanceof RegisteredListener){
-			if(isset($this->handlerSlots[$object->getPriority()][spl_object_id($object)])){
-				unset($this->handlerSlots[$object->getPriority()][spl_object_id($object)]);
-			}
+		}else{
+			unset($this->handlerSlots[$object->getPriority()][spl_object_id($object)]);
 		}
+		$this->invalidateAffectedCaches();
 	}
 
 	public function clear() : void{
-		$this->handlerSlots = array_fill_keys(EventPriority::ALL, []);
+		$this->handlerSlots = [];
+		$this->invalidateAffectedCaches();
 	}
 
 	/**
 	 * @return RegisteredListener[]
 	 */
 	public function getListenersByPriority(int $priority) : array{
-		return $this->handlerSlots[$priority];
+		return $this->handlerSlots[$priority] ?? [];
 	}
 
 	public function getParent() : ?HandlerList{
 		return $this->parentList;
 	}
+
+	/**
+	 * Invalidates all known caches which might be affected by this list's contents.
+	 */
+	private function invalidateAffectedCaches() : void{
+		foreach($this->affectedHandlerCaches as $cache){
+			$cache->list = null;
+		}
+	}
+
+	/**
+	 * @return RegisteredListener[]
+	 * @phpstan-return list<RegisteredListener>
+	 */
+	public function getListenerList() : array{
+		if($this->handlerCache->list !== null){
+			return $this->handlerCache->list;
+		}
+
+		$handlerLists = [];
+		for($currentList = $this; $currentList !== null; $currentList = $currentList->parentList){
+			$handlerLists[] = $currentList;
+		}
+
+		$listenersByPriority = [];
+		foreach($handlerLists as $currentList){
+			foreach($currentList->handlerSlots as $priority => $listeners){
+				$listenersByPriority[$priority] = array_merge($listenersByPriority[$priority] ?? [], $listeners);
+			}
+		}
+
+		//TODO: why on earth do the priorities have higher values for lower priority?
+		krsort($listenersByPriority, SORT_NUMERIC);
+
+		return $this->handlerCache->list = array_merge(...$listenersByPriority);
+	}
 }
diff --git a/src/event/HandlerListManager.php b/src/event/HandlerListManager.php
index ecff0b85b3..605a387478 100644
--- a/src/event/HandlerListManager.php
+++ b/src/event/HandlerListManager.php
@@ -36,14 +36,17 @@ class HandlerListManager{
 
 	/** @var HandlerList[] classname => HandlerList */
 	private array $allLists = [];
+	/**
+	 * @var RegisteredListenerCache[] event class name => cache
+	 * @phpstan-var array<class-string<Event>, RegisteredListenerCache>
+	 */
+	private array $handlerCaches = [];
 
 	/**
 	 * Unregisters all the listeners
 	 * If a Plugin or Listener is passed, all the listeners with that object will be removed
-	 *
-	 * @param Plugin|Listener|RegisteredListener|null $object
 	 */
-	public function unregisterAll($object = null) : void{
+	public function unregisterAll(RegisteredListener|Plugin|Listener|null $object = null) : void{
 		if($object instanceof Listener || $object instanceof Plugin || $object instanceof RegisteredListener){
 			foreach($this->allLists as $h){
 				$h->unregister($object);
@@ -83,8 +86,7 @@ class HandlerListManager{
 	 *
 	 * Calling this method also lazily initializes the $classMap inheritance tree of handler lists.
 	 *
-	 * @phpstan-template TEvent of Event
-	 * @phpstan-param class-string<TEvent> $event
+	 * @phpstan-param class-string<covariant Event> $event
 	 *
 	 * @throws \ReflectionException
 	 * @throws \InvalidArgumentException
@@ -100,7 +102,24 @@ class HandlerListManager{
 		}
 
 		$parent = self::resolveNearestHandleableParent($class);
-		return $this->allLists[$event] = new HandlerList($event, $parent !== null ? $this->getListFor($parent->getName()) : null);
+		$cache = new RegisteredListenerCache();
+		$this->handlerCaches[$event] = $cache;
+		return $this->allLists[$event] = new HandlerList(
+			$event,
+			parentList: $parent !== null ? $this->getListFor($parent->getName()) : null,
+			handlerCache: $cache
+		);
+	}
+
+	/**
+	 * @phpstan-param class-string<covariant Event> $event
+	 *
+	 * @return RegisteredListener[]
+	 */
+	public function getHandlersFor(string $event) : array{
+		$cache = $this->handlerCaches[$event] ?? null;
+		//getListFor() will populate the cache for the next call
+		return $cache?->list ?? $this->getListFor($event)->getListenerList();
 	}
 
 	/**
diff --git a/src/event/RegisteredListener.php b/src/event/RegisteredListener.php
index d227fc2cb5..6b29dfec30 100644
--- a/src/event/RegisteredListener.php
+++ b/src/event/RegisteredListener.php
@@ -57,8 +57,11 @@ class RegisteredListener{
 			return;
 		}
 		$this->timings->startTiming();
-		($this->handler)($event);
-		$this->timings->stopTiming();
+		try{
+			($this->handler)($event);
+		}finally{
+			$this->timings->stopTiming();
+		}
 	}
 
 	public function isHandlingCancelled() : bool{
diff --git a/src/event/RegisteredListenerCache.php b/src/event/RegisteredListenerCache.php
new file mode 100644
index 0000000000..e5e3155465
--- /dev/null
+++ b/src/event/RegisteredListenerCache.php
@@ -0,0 +1,38 @@
+<?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\event;
+
+/**
+ * @internal
+ */
+final class RegisteredListenerCache{
+
+	/**
+	 * List of all handlers that will be called for a particular event, ordered by execution order.
+	 *
+	 * @var RegisteredListener[]
+	 * @phpstan-var list<RegisteredListener>
+	 */
+	public ?array $list = null;
+}
diff --git a/src/event/block/BlockBreakEvent.php b/src/event/block/BlockBreakEvent.php
index fba60983e7..c876d2727d 100644
--- a/src/event/block/BlockBreakEvent.php
+++ b/src/event/block/BlockBreakEvent.php
@@ -35,30 +35,22 @@ use pocketmine\player\Player;
 class BlockBreakEvent extends BlockEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var Player */
-	protected $player;
-
-	/** @var Item */
-	protected $item;
-
-	/** @var bool */
-	protected $instaBreak = false;
 	/** @var Item[] */
-	protected $blockDrops = [];
-	/** @var int */
-	protected $xpDrops;
+	protected array $blockDrops = [];
 
 	/**
 	 * @param Item[] $drops
 	 */
-	public function __construct(Player $player, Block $block, Item $item, bool $instaBreak = false, array $drops = [], int $xpDrops = 0){
+	public function __construct(
+		protected Player $player,
+		Block $block,
+		protected Item $item,
+		protected bool $instaBreak = false,
+		array $drops = [],
+		protected int $xpDrops = 0
+	){
 		parent::__construct($block);
-		$this->item = $item;
-		$this->player = $player;
-
-		$this->instaBreak = $instaBreak;
 		$this->setDrops($drops);
-		$this->xpDrops = $xpDrops;
 	}
 
 	/**
diff --git a/src/event/block/BlockEvent.php b/src/event/block/BlockEvent.php
index deb1ccf8dd..057408950f 100644
--- a/src/event/block/BlockEvent.php
+++ b/src/event/block/BlockEvent.php
@@ -30,12 +30,9 @@ use pocketmine\block\Block;
 use pocketmine\event\Event;
 
 abstract class BlockEvent extends Event{
-	/** @var Block */
-	protected $block;
-
-	public function __construct(Block $block){
-		$this->block = $block;
-	}
+	public function __construct(
+		protected Block $block
+	){}
 
 	public function getBlock() : Block{
 		return $this->block;
diff --git a/src/event/block/BlockFormEvent.php b/src/event/block/BlockFormEvent.php
index 5211e3a0f4..95c4841135 100644
--- a/src/event/block/BlockFormEvent.php
+++ b/src/event/block/BlockFormEvent.php
@@ -23,10 +23,26 @@ declare(strict_types=1);
 
 namespace pocketmine\event\block;
 
+use pocketmine\block\Block;
+
 /**
  * Called when a new block forms, usually as the result of some action.
  * This could be things like obsidian forming due to collision of lava and water.
  */
 class BlockFormEvent extends BaseBlockChangeEvent{
 
+	public function __construct(
+		Block $block,
+		Block $newState,
+		private Block $causingBlock
+	){
+		parent::__construct($block, $newState);
+	}
+
+	/**
+	 * Returns the block which caused the target block to form into a new state.
+	 */
+	public function getCausingBlock() : Block{
+		return $this->causingBlock;
+	}
 }
diff --git a/src/event/block/BlockGrowEvent.php b/src/event/block/BlockGrowEvent.php
index 6a2239a148..c3e070a34b 100644
--- a/src/event/block/BlockGrowEvent.php
+++ b/src/event/block/BlockGrowEvent.php
@@ -23,9 +23,27 @@ declare(strict_types=1);
 
 namespace pocketmine\event\block;
 
+use pocketmine\block\Block;
+use pocketmine\player\Player;
+
 /**
  * Called when plants or crops grow.
  */
 class BlockGrowEvent extends BaseBlockChangeEvent{
 
+	public function __construct(
+		Block $block,
+		Block $newState,
+		private ?Player $player = null,
+	){
+		parent::__construct($block, $newState);
+	}
+
+	/**
+	 * It returns the player which grows the crop.
+	 * It returns null when the crop grows by itself.
+	 */
+	public function getPlayer() : ?Player{
+		return $this->player;
+	}
 }
diff --git a/src/event/block/BlockPlaceEvent.php b/src/event/block/BlockPlaceEvent.php
index 0c134eb8c2..3572cb5e09 100644
--- a/src/event/block/BlockPlaceEvent.php
+++ b/src/event/block/BlockPlaceEvent.php
@@ -26,32 +26,28 @@ namespace pocketmine\event\block;
 use pocketmine\block\Block;
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
+use pocketmine\event\Event;
 use pocketmine\item\Item;
 use pocketmine\player\Player;
+use pocketmine\world\BlockTransaction;
 
 /**
- * Called when a player places a block
+ * Called when a player initiates a block placement action.
+ * More than one block may be changed by a single placement action, for example when placing a door.
  */
-class BlockPlaceEvent extends BlockEvent implements Cancellable{
+class BlockPlaceEvent extends Event implements Cancellable{
 	use CancellableTrait;
 
-	/** @var Player */
-	protected $player;
-
-	/** @var Item */
-	protected $item;
-
-	/** @var Block */
-	protected $blockReplace;
-	/** @var Block */
-	protected $blockAgainst;
-
-	public function __construct(Player $player, Block $blockPlace, Block $blockReplace, Block $blockAgainst, Item $item){
-		parent::__construct($blockPlace);
-		$this->blockReplace = $blockReplace;
-		$this->blockAgainst = $blockAgainst;
-		$this->item = $item;
-		$this->player = $player;
+	public function __construct(
+		protected Player $player,
+		protected BlockTransaction $transaction,
+		protected Block $blockAgainst,
+		protected Item $item
+	){
+		$world = $this->blockAgainst->getPosition()->getWorld();
+		foreach($this->transaction->getBlocks() as [$x, $y, $z, $block]){
+			$block->position($world, $x, $y, $z);
+		}
 	}
 
 	/**
@@ -68,8 +64,15 @@ class BlockPlaceEvent extends BlockEvent implements Cancellable{
 		return clone $this->item;
 	}
 
-	public function getBlockReplaced() : Block{
-		return $this->blockReplace;
+	/**
+	 * Returns a BlockTransaction object containing all the block positions that will be changed by this event, and the
+	 * states they will be changed to.
+	 *
+	 * This will usually contain only one block, but may contain more if the block being placed is a multi-block
+	 * structure such as a door or bed.
+	 */
+	public function getTransaction() : BlockTransaction{
+		return $this->transaction;
 	}
 
 	public function getBlockAgainst() : Block{
diff --git a/src/event/block/BlockSpreadEvent.php b/src/event/block/BlockSpreadEvent.php
index 42009260da..18128bfef7 100644
--- a/src/event/block/BlockSpreadEvent.php
+++ b/src/event/block/BlockSpreadEvent.php
@@ -30,6 +30,11 @@ use pocketmine\block\Block;
  */
 class BlockSpreadEvent extends BaseBlockChangeEvent{
 
+	/**
+	 * @param Block $block    Block being replaced (TODO: rename this)
+	 * @param Block $source   Origin of the spread
+	 * @param Block $newState Replacement block
+	 */
 	public function __construct(
 		Block $block,
 		private Block $source,
diff --git a/src/event/block/CampfireCookEvent.php b/src/event/block/CampfireCookEvent.php
new file mode 100644
index 0000000000..3762f5848f
--- /dev/null
+++ b/src/event/block/CampfireCookEvent.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\event\block;
+
+use pocketmine\block\Campfire;
+use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
+use pocketmine\item\Item;
+
+class CampfireCookEvent extends BlockEvent implements Cancellable{
+	use CancellableTrait;
+
+	public function __construct(
+		private Campfire $campfire,
+		private int $slot,
+		private Item $input,
+		private Item $result
+	){
+		parent::__construct($campfire);
+		$this->input = clone $input;
+	}
+
+	public function getCampfire() : Campfire{
+		return $this->campfire;
+	}
+
+	public function getSlot() : int{
+		return $this->slot;
+	}
+
+	public function getInput() : Item{
+		return $this->input;
+	}
+
+	public function getResult() : Item{
+		return $this->result;
+	}
+
+	public function setResult(Item $result) : void{
+		$this->result = $result;
+	}
+}
diff --git a/src/event/block/FarmlandHydrationChangeEvent.php b/src/event/block/FarmlandHydrationChangeEvent.php
new file mode 100644
index 0000000000..4df5c1a4ef
--- /dev/null
+++ b/src/event/block/FarmlandHydrationChangeEvent.php
@@ -0,0 +1,59 @@
+<?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\event\block;
+
+use pocketmine\block\Block;
+use pocketmine\block\Farmland;
+use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
+
+/**
+ * Called when farmland hydration is updated.
+ */
+class FarmlandHydrationChangeEvent extends BlockEvent implements Cancellable{
+	use CancellableTrait;
+
+	public function __construct(
+		Block $block,
+		private int $oldHydration,
+		private int $newHydration,
+	){
+		parent::__construct($block);
+	}
+
+	public function getOldHydration() : int{
+		return $this->oldHydration;
+	}
+
+	public function getNewHydration() : int{
+		return $this->newHydration;
+	}
+
+	public function setNewHydration(int $hydration) : void{
+		if($hydration < 0 || $hydration > Farmland::MAX_WETNESS){
+			throw new \InvalidArgumentException("Hydration must be in range 0 ... " . Farmland::MAX_WETNESS);
+		}
+		$this->newHydration = $hydration;
+	}
+}
diff --git a/src/event/block/PressurePlateUpdateEvent.php b/src/event/block/PressurePlateUpdateEvent.php
new file mode 100644
index 0000000000..e6f2e92ba4
--- /dev/null
+++ b/src/event/block/PressurePlateUpdateEvent.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\event\block;
+
+use pocketmine\block\Block;
+use pocketmine\entity\Entity;
+
+/**
+ * Called whenever the list of entities on a pressure plate changes.
+ * Depending on the type of pressure plate, this might turn on/off its signal, or change the signal strength.
+ */
+final class PressurePlateUpdateEvent extends BaseBlockChangeEvent{
+	/**
+	 * @param Entity[] $activatingEntities
+	 */
+	public function __construct(
+		Block $block,
+		Block $newState,
+		private array $activatingEntities
+	){
+		parent::__construct($block, $newState);
+	}
+
+	/**
+	 * Returns a list of entities intersecting the pressure plate's activation box.
+	 * If the pressure plate is about to deactivate, this list will be empty.
+	 *
+	 * @return Entity[]
+	 */
+	public function getActivatingEntities() : array{ return $this->activatingEntities; }
+}
diff --git a/src/event/entity/EntityCombustByBlockEvent.php b/src/event/entity/EntityCombustByBlockEvent.php
index 7dbab849da..20631f5d09 100644
--- a/src/event/entity/EntityCombustByBlockEvent.php
+++ b/src/event/entity/EntityCombustByBlockEvent.php
@@ -27,8 +27,7 @@ use pocketmine\block\Block;
 use pocketmine\entity\Entity;
 
 class EntityCombustByBlockEvent extends EntityCombustEvent{
-	/** @var Block */
-	protected $combuster;
+	protected Block $combuster;
 
 	public function __construct(Block $combuster, Entity $combustee, int $duration){
 		parent::__construct($combustee, $duration);
diff --git a/src/event/entity/EntityCombustByEntityEvent.php b/src/event/entity/EntityCombustByEntityEvent.php
index e60406ec8d..353ef143c1 100644
--- a/src/event/entity/EntityCombustByEntityEvent.php
+++ b/src/event/entity/EntityCombustByEntityEvent.php
@@ -26,8 +26,7 @@ namespace pocketmine\event\entity;
 use pocketmine\entity\Entity;
 
 class EntityCombustByEntityEvent extends EntityCombustEvent{
-	/** @var Entity */
-	protected $combuster;
+	protected Entity $combuster;
 
 	public function __construct(Entity $combuster, Entity $combustee, int $duration){
 		parent::__construct($combustee, $duration);
diff --git a/src/event/entity/EntityCombustEvent.php b/src/event/entity/EntityCombustEvent.php
index 838474c5f9..26029b7cd3 100644
--- a/src/event/entity/EntityCombustEvent.php
+++ b/src/event/entity/EntityCombustEvent.php
@@ -33,8 +33,7 @@ use pocketmine\event\CancellableTrait;
 class EntityCombustEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var int */
-	protected $duration;
+	protected int $duration;
 
 	public function __construct(Entity $combustee, int $duration){
 		$this->entity = $combustee;
diff --git a/src/event/entity/EntityDamageByEntityEvent.php b/src/event/entity/EntityDamageByEntityEvent.php
index 6264375bb6..052be9a159 100644
--- a/src/event/entity/EntityDamageByEntityEvent.php
+++ b/src/event/entity/EntityDamageByEntityEvent.php
@@ -36,7 +36,15 @@ class EntityDamageByEntityEvent extends EntityDamageEvent{
 	/**
 	 * @param float[] $modifiers
 	 */
-	public function __construct(Entity $damager, Entity $entity, int $cause, float $damage, array $modifiers = [], private float $knockBack = 0.4){
+	public function __construct(
+		Entity $damager,
+		Entity $entity,
+		int $cause,
+		float $damage,
+		array $modifiers = [],
+		private float $knockBack = Living::DEFAULT_KNOCKBACK_FORCE,
+		private float $verticalKnockBackLimit = Living::DEFAULT_KNOCKBACK_VERTICAL_LIMIT
+	){
 		$this->damagerEntityId = $damager->getId();
 		parent::__construct($entity, $cause, $damage, $modifiers);
 		$this->addAttackerModifiers($damager);
@@ -49,7 +57,7 @@ class EntityDamageByEntityEvent extends EntityDamageEvent{
 				$this->setModifier($this->getBaseDamage() * 0.3 * $strength->getEffectLevel(), self::MODIFIER_STRENGTH);
 			}
 
-			if(($weakness = $effects->get(VanillaEffects::WEAKNESS())) !== null){
+			if(($weakness = $effects->get(VanillaEffects::WEAKNESS())) !== null && $this->getCause() === EntityDamageEvent::CAUSE_ENTITY_ATTACK){
 				$this->setModifier(-($this->getBaseDamage() * 0.2 * $weakness->getEffectLevel()), self::MODIFIER_WEAKNESS);
 			}
 		}
@@ -62,11 +70,39 @@ class EntityDamageByEntityEvent extends EntityDamageEvent{
 		return $this->getEntity()->getWorld()->getServer()->getWorldManager()->findEntity($this->damagerEntityId);
 	}
 
+	/**
+	 * Returns the force with which the victim will be knocked back from the attacking entity.
+	 *
+	 * @see Living::DEFAULT_KNOCKBACK_FORCE
+	 */
 	public function getKnockBack() : float{
 		return $this->knockBack;
 	}
 
+	/**
+	 * Sets the force with which the victim will be knocked back from the attacking entity.
+	 * Larger values will knock the victim back further.
+	 * Negative values will pull the victim towards the attacker.
+	 */
 	public function setKnockBack(float $knockBack) : void{
 		$this->knockBack = $knockBack;
 	}
+
+	/**
+	 * Returns the maximum upwards velocity the victim may have after being knocked back.
+	 * This ensures that the victim doesn't fly up into the sky when high levels of knockback are applied.
+	 *
+	 * @see Living::DEFAULT_KNOCKBACK_VERTICAL_LIMIT
+	 */
+	public function getVerticalKnockBackLimit() : float{
+		return $this->verticalKnockBackLimit;
+	}
+
+	/**
+	 * Sets the maximum upwards velocity the victim may have after being knocked back.
+	 * Larger values will allow the victim to fly higher if the knockback force is also large.
+	 */
+	public function setVerticalKnockBackLimit(float $verticalKnockBackLimit) : void{
+		$this->verticalKnockBackLimit = $verticalKnockBackLimit;
+	}
 }
diff --git a/src/event/entity/EntityDamageEvent.php b/src/event/entity/EntityDamageEvent.php
index edb44f1f71..7c3e2aaa40 100644
--- a/src/event/entity/EntityDamageEvent.php
+++ b/src/event/entity/EntityDamageEvent.php
@@ -46,6 +46,7 @@ class EntityDamageEvent extends EntityEvent implements Cancellable{
 	public const MODIFIER_TOTEM = 8;
 	public const MODIFIER_WEAPON_ENCHANTMENTS = 9;
 	public const MODIFIER_PREVIOUS_DAMAGE_COOLDOWN = 10;
+	public const MODIFIER_ARMOR_HELMET = 11;
 
 	public const CAUSE_CONTACT = 0;
 	public const CAUSE_ENTITY_ATTACK = 1;
@@ -63,6 +64,7 @@ class EntityDamageEvent extends EntityEvent implements Cancellable{
 	public const CAUSE_MAGIC = 13;
 	public const CAUSE_CUSTOM = 14;
 	public const CAUSE_STARVATION = 15;
+	public const CAUSE_FALLING_BLOCK = 16;
 
 	private float $baseDamage;
 	private float $originalBase;
diff --git a/src/event/entity/EntityEvent.php b/src/event/entity/EntityEvent.php
index 6eead20f79..d82cdcc825 100644
--- a/src/event/entity/EntityEvent.php
+++ b/src/event/entity/EntityEvent.php
@@ -33,11 +33,8 @@ use pocketmine\event\Event;
  * @phpstan-template TEntity of Entity
  */
 abstract class EntityEvent extends Event{
-	/**
-	 * @var Entity
-	 * @phpstan-var TEntity
-	 */
-	protected $entity;
+	/** @phpstan-var TEntity */
+	protected Entity $entity;
 
 	/**
 	 * @return Entity
diff --git a/src/event/entity/EntityExplodeEvent.php b/src/event/entity/EntityExplodeEvent.php
index e37742cb64..0a0e4f6966 100644
--- a/src/event/entity/EntityExplodeEvent.php
+++ b/src/event/entity/EntityExplodeEvent.php
@@ -34,34 +34,27 @@ use pocketmine\world\Position;
  * Called when an entity explodes, after the explosion's impact has been calculated.
  * No changes have been made to the world at this stage.
  *
- * @see ExplosionPrimeEvent
+ * @see EntityPreExplodeEvent
  *
  * @phpstan-extends EntityEvent<Entity>
  */
 class EntityExplodeEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var Position */
-	protected $position;
-
-	/** @var Block[] */
-	protected $blocks;
-
-	/** @var float */
-	protected $yield;
-
 	/**
 	 * @param Block[] $blocks
 	 * @param float   $yield  0-100
 	 */
-	public function __construct(Entity $entity, Position $position, array $blocks, float $yield){
+	public function __construct(
+		Entity $entity,
+		protected Position $position,
+		protected array $blocks,
+		protected float $yield
+	){
 		$this->entity = $entity;
-		$this->position = $position;
-		$this->blocks = $blocks;
 		if($yield < 0.0 || $yield > 100.0){
 			throw new \InvalidArgumentException("Yield must be in range 0.0 - 100.0");
 		}
-		$this->yield = $yield;
 	}
 
 	public function getPosition() : Position{
diff --git a/src/event/entity/ExplosionPrimeEvent.php b/src/event/entity/EntityPreExplodeEvent.php
similarity index 81%
rename from src/event/entity/ExplosionPrimeEvent.php
rename to src/event/entity/EntityPreExplodeEvent.php
index ff06684f9f..f02a85ecd9 100644
--- a/src/event/entity/ExplosionPrimeEvent.php
+++ b/src/event/entity/EntityPreExplodeEvent.php
@@ -35,30 +35,30 @@ use pocketmine\event\CancellableTrait;
  *
  * @phpstan-extends EntityEvent<Entity>
  */
-class ExplosionPrimeEvent extends EntityEvent implements Cancellable{
+class EntityPreExplodeEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var float */
-	protected $force;
 	private bool $blockBreaking = true;
 
-	public function __construct(Entity $entity, float $force){
-		if($force <= 0){
+	public function __construct(
+		Entity $entity,
+		protected float $radius
+	){
+		if($radius <= 0){
 			throw new \InvalidArgumentException("Explosion radius must be positive");
 		}
 		$this->entity = $entity;
-		$this->force = $force;
 	}
 
-	public function getForce() : float{
-		return $this->force;
+	public function getRadius() : float{
+		return $this->radius;
 	}
 
-	public function setForce(float $force) : void{
-		if($force <= 0){
+	public function setRadius(float $radius) : void{
+		if($radius <= 0){
 			throw new \InvalidArgumentException("Explosion radius must be positive");
 		}
-		$this->force = $force;
+		$this->radius = $radius;
 	}
 
 	public function isBlockBreaking() : bool{
diff --git a/src/event/inventory/CraftItemEvent.php b/src/event/inventory/CraftItemEvent.php
index 64f285f155..35409f8286 100644
--- a/src/event/inventory/CraftItemEvent.php
+++ b/src/event/inventory/CraftItemEvent.php
@@ -30,6 +30,7 @@ use pocketmine\event\Event;
 use pocketmine\inventory\transaction\CraftingTransaction;
 use pocketmine\item\Item;
 use pocketmine\player\Player;
+use pocketmine\utils\Utils;
 
 class CraftItemEvent extends Event implements Cancellable{
 	use CancellableTrait;
@@ -74,7 +75,7 @@ class CraftItemEvent extends Event implements Cancellable{
 	 * @return Item[]
 	 */
 	public function getInputs() : array{
-		return $this->inputs;
+		return Utils::cloneObjectArray($this->inputs);
 	}
 
 	/**
@@ -83,7 +84,7 @@ class CraftItemEvent extends Event implements Cancellable{
 	 * @return Item[]
 	 */
 	public function getOutputs() : array{
-		return $this->outputs;
+		return Utils::cloneObjectArray($this->outputs);
 	}
 
 	public function getPlayer() : Player{
diff --git a/src/event/inventory/InventoryEvent.php b/src/event/inventory/InventoryEvent.php
index 4c314f1980..4202946791 100644
--- a/src/event/inventory/InventoryEvent.php
+++ b/src/event/inventory/InventoryEvent.php
@@ -31,12 +31,9 @@ use pocketmine\inventory\Inventory;
 use pocketmine\player\Player;
 
 abstract class InventoryEvent extends Event{
-	/** @var Inventory */
-	protected $inventory;
-
-	public function __construct(Inventory $inventory){
-		$this->inventory = $inventory;
-	}
+	public function __construct(
+		protected Inventory $inventory
+	){}
 
 	public function getInventory() : Inventory{
 		return $this->inventory;
diff --git a/src/event/player/PlayerChatEvent.php b/src/event/player/PlayerChatEvent.php
index 8062cece78..1cdbb49fb8 100644
--- a/src/event/player/PlayerChatEvent.php
+++ b/src/event/player/PlayerChatEvent.php
@@ -26,7 +26,7 @@ namespace pocketmine\event\player;
 use pocketmine\command\CommandSender;
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
-use pocketmine\lang\KnownTranslationKeys;
+use pocketmine\player\chat\ChatFormatter;
 use pocketmine\player\Player;
 use pocketmine\utils\Utils;
 
@@ -36,25 +36,16 @@ use pocketmine\utils\Utils;
 class PlayerChatEvent extends PlayerEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var string */
-	protected $message;
-
-	/** @var string */
-	protected $format;
-
-	/** @var CommandSender[] */
-	protected $recipients = [];
-
 	/**
 	 * @param CommandSender[] $recipients
 	 */
-	public function __construct(Player $player, string $message, array $recipients, string $format = KnownTranslationKeys::CHAT_TYPE_TEXT){
+	public function __construct(
+		Player $player,
+		protected string $message,
+		protected array $recipients,
+		protected ChatFormatter $formatter
+	){
 		$this->player = $player;
-		$this->message = $message;
-
-		$this->format = $format;
-
-		$this->recipients = $recipients;
 	}
 
 	public function getMessage() : string{
@@ -72,12 +63,12 @@ class PlayerChatEvent extends PlayerEvent implements Cancellable{
 		$this->player = $player;
 	}
 
-	public function getFormat() : string{
-		return $this->format;
+	public function getFormatter() : ChatFormatter{
+		return $this->formatter;
 	}
 
-	public function setFormat(string $format) : void{
-		$this->format = $format;
+	public function setFormatter(ChatFormatter $formatter) : void{
+		$this->formatter = $formatter;
 	}
 
 	/**
diff --git a/src/event/player/PlayerCreationEvent.php b/src/event/player/PlayerCreationEvent.php
index 64f449d1a4..8f66702f3c 100644
--- a/src/event/player/PlayerCreationEvent.php
+++ b/src/event/player/PlayerCreationEvent.php
@@ -69,10 +69,9 @@ class PlayerCreationEvent extends Event{
 	/**
 	 * Returns the base class that the final player class must extend.
 	 *
-	 * @return string
 	 * @phpstan-return class-string<Player>
 	 */
-	public function getBaseClass(){
+	public function getBaseClass() : string{
 		return $this->baseClass;
 	}
 
@@ -81,10 +80,9 @@ class PlayerCreationEvent extends Event{
 	 * The new base class must be a subclass of the current base class.
 	 * This can (perhaps) be used to limit the options for custom player classes provided by other plugins.
 	 *
-	 * @param string $class
 	 * @phpstan-param class-string<Player> $class
 	 */
-	public function setBaseClass($class) : void{
+	public function setBaseClass(string $class) : void{
 		if(!is_a($class, $this->baseClass, true)){
 			throw new \RuntimeException("Base class $class must extend " . $this->baseClass);
 		}
@@ -95,10 +93,9 @@ class PlayerCreationEvent extends Event{
 	/**
 	 * Returns the class that will be instantiated to create the player after the event.
 	 *
-	 * @return string
 	 * @phpstan-return class-string<Player>
 	 */
-	public function getPlayerClass(){
+	public function getPlayerClass() : string{
 		return $this->playerClass;
 	}
 
@@ -106,10 +103,9 @@ class PlayerCreationEvent extends Event{
 	 * Sets the class that will be instantiated to create the player after the event. The class must not be abstract,
 	 * and must be an instance of the base class.
 	 *
-	 * @param string $class
 	 * @phpstan-param class-string<Player> $class
 	 */
-	public function setPlayerClass($class) : void{
+	public function setPlayerClass(string $class) : void{
 		Utils::testValidInstance($class, $this->baseClass);
 		$this->playerClass = $class;
 	}
diff --git a/src/event/player/PlayerDataSaveEvent.php b/src/event/player/PlayerDataSaveEvent.php
index 690684cfd0..664f1552de 100644
--- a/src/event/player/PlayerDataSaveEvent.php
+++ b/src/event/player/PlayerDataSaveEvent.php
@@ -35,19 +35,11 @@ use pocketmine\player\Player;
 class PlayerDataSaveEvent extends Event implements Cancellable{
 	use CancellableTrait;
 
-	/** @var CompoundTag */
-	protected $data;
-	/** @var string */
-	protected $playerName;
-
 	public function __construct(
-		CompoundTag $nbt,
-		string $playerName,
+		protected CompoundTag $data,
+		protected string $playerName,
 		private ?Player $player
-	){
-		$this->data = $nbt;
-		$this->playerName = $playerName;
-	}
+	){}
 
 	/**
 	 * Returns the data to be written to disk as a CompoundTag
diff --git a/src/event/player/PlayerDeathEvent.php b/src/event/player/PlayerDeathEvent.php
index 132411c584..aacff3438c 100644
--- a/src/event/player/PlayerDeathEvent.php
+++ b/src/event/player/PlayerDeathEvent.php
@@ -23,8 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\event\player;
 
-use pocketmine\block\BlockLegacyIds;
+use pocketmine\block\BlockTypeIds;
 use pocketmine\entity\Living;
+use pocketmine\entity\object\FallingBlock;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageByEntityEvent;
 use pocketmine\event\entity\EntityDamageEvent;
@@ -35,10 +36,10 @@ use pocketmine\lang\Translatable;
 use pocketmine\player\Player;
 
 class PlayerDeathEvent extends EntityDeathEvent{
-	/** @var Player */
-	protected $player;
+	protected Player $player;
 
 	private Translatable|string $deathMessage;
+	private Translatable|string $deathScreenMessage;
 	private bool $keepInventory = false;
 	private bool $keepXp = false;
 
@@ -50,6 +51,7 @@ class PlayerDeathEvent extends EntityDeathEvent{
 		parent::__construct($entity, $drops, $xp);
 		$this->player = $entity;
 		$this->deathMessage = $deathMessage ?? self::deriveMessage($entity->getDisplayName(), $entity->getLastDamageCause());
+		$this->deathScreenMessage = $this->deathMessage;
 	}
 
 	/**
@@ -71,6 +73,14 @@ class PlayerDeathEvent extends EntityDeathEvent{
 		$this->deathMessage = $deathMessage;
 	}
 
+	public function getDeathScreenMessage() : Translatable|string{
+		return $this->deathScreenMessage;
+	}
+
+	public function setDeathScreenMessage(Translatable|string $deathScreenMessage) : void{
+		$this->deathScreenMessage = $deathScreenMessage;
+	}
+
 	public function getKeepInventory() : bool{
 		return $this->keepInventory;
 	}
@@ -137,7 +147,7 @@ class PlayerDeathEvent extends EntityDeathEvent{
 
 			case EntityDamageEvent::CAUSE_CONTACT:
 				if($deathCause instanceof EntityDamageByBlockEvent){
-					if($deathCause->getDamager()->getId() === BlockLegacyIds::CACTUS){
+					if($deathCause->getDamager()->getTypeId() === BlockTypeIds::CACTUS){
 						return KnownTranslationFactory::death_attack_cactus($name);
 					}
 				}
@@ -156,6 +166,19 @@ class PlayerDeathEvent extends EntityDeathEvent{
 			case EntityDamageEvent::CAUSE_MAGIC:
 				return KnownTranslationFactory::death_attack_magic($name);
 
+			case EntityDamageEvent::CAUSE_FALLING_BLOCK:
+				if($deathCause instanceof EntityDamageByEntityEvent){
+					$e = $deathCause->getDamager();
+					if($e instanceof FallingBlock){
+						if($e->getBlock()->getTypeId() === BlockTypeIds::ANVIL){
+							return KnownTranslationFactory::death_attack_anvil($name);
+						}else{
+							return KnownTranslationFactory::death_attack_fallingBlock($name);
+						}
+					}
+				}
+				break;
+
 			case EntityDamageEvent::CAUSE_CUSTOM:
 				break;
 
diff --git a/src/event/player/PlayerDisconnectEventTrait.php b/src/event/player/PlayerDisconnectEventTrait.php
new file mode 100644
index 0000000000..219f742472
--- /dev/null
+++ b/src/event/player/PlayerDisconnectEventTrait.php
@@ -0,0 +1,62 @@
+<?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\event\player;
+
+use pocketmine\lang\Translatable;
+
+trait PlayerDisconnectEventTrait{
+	/**
+	 * Sets the kick reason shown in the server log and on the console.
+	 *
+	 * This should be a **short, simple, single-line** message.
+	 * Do not use long or multi-line messages here - they will spam the log and server console with useless information.
+	 */
+	public function setDisconnectReason(Translatable|string $disconnectReason) : void{
+		$this->disconnectReason = $disconnectReason;
+	}
+
+	/**
+	 * Returns the kick reason shown in the server log and on the console.
+	 * When kicked by the /kick command, the default is something like "Kicked by admin.".
+	 */
+	public function getDisconnectReason() : Translatable|string{
+		return $this->disconnectReason;
+	}
+
+	/**
+	 * Sets the message shown on the player's disconnection screen.
+	 * This can be as long as you like, and may contain formatting and newlines.
+	 * If this is set to null, the kick reason will be used as the disconnect screen message directly.
+	 */
+	public function setDisconnectScreenMessage(Translatable|string|null $disconnectScreenMessage) : void{
+		$this->disconnectScreenMessage = $disconnectScreenMessage;
+	}
+
+	/**
+	 * Returns the message shown on the player's disconnection screen.
+	 * When kicked by the /kick command, the default is something like "Kicked by admin.".
+	 * If this is null, the kick reason will be used as the disconnect screen message directly.
+	 */
+	public function getDisconnectScreenMessage() : Translatable|string|null{ return $this->disconnectScreenMessage ?? $this->disconnectReason; }
+}
diff --git a/src/event/player/PlayerDuplicateLoginEvent.php b/src/event/player/PlayerDuplicateLoginEvent.php
index 0de9ace002..3acb566151 100644
--- a/src/event/player/PlayerDuplicateLoginEvent.php
+++ b/src/event/player/PlayerDuplicateLoginEvent.php
@@ -26,6 +26,7 @@ namespace pocketmine\event\player;
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
 use pocketmine\event\Event;
+use pocketmine\lang\Translatable;
 use pocketmine\network\mcpe\NetworkSession;
 
 /**
@@ -34,12 +35,13 @@ use pocketmine\network\mcpe\NetworkSession;
  */
 class PlayerDuplicateLoginEvent extends Event implements Cancellable{
 	use CancellableTrait;
-
-	private string $disconnectMessage = "Logged in from another location";
+	use PlayerDisconnectEventTrait;
 
 	public function __construct(
 		private NetworkSession $connectingSession,
-		private NetworkSession $existingSession
+		private NetworkSession $existingSession,
+		private Translatable|string $disconnectReason,
+		private Translatable|string|null $disconnectScreenMessage
 	){}
 
 	public function getConnectingSession() : NetworkSession{
@@ -49,15 +51,4 @@ class PlayerDuplicateLoginEvent extends Event implements Cancellable{
 	public function getExistingSession() : NetworkSession{
 		return $this->existingSession;
 	}
-
-	/**
-	 * Returns the message shown to the session which gets disconnected.
-	 */
-	public function getDisconnectMessage() : string{
-		return $this->disconnectMessage;
-	}
-
-	public function setDisconnectMessage(string $message) : void{
-		$this->disconnectMessage = $message;
-	}
 }
diff --git a/src/event/player/PlayerEnchantingOptionsRequestEvent.php b/src/event/player/PlayerEnchantingOptionsRequestEvent.php
new file mode 100644
index 0000000000..833185f760
--- /dev/null
+++ b/src/event/player/PlayerEnchantingOptionsRequestEvent.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\event\player;
+
+use pocketmine\block\inventory\EnchantInventory;
+use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
+use pocketmine\event\Event;
+use pocketmine\item\enchantment\EnchantingOption;
+use pocketmine\player\Player;
+use pocketmine\utils\Utils;
+use function count;
+
+/**
+ * Called when a player inserts an item into an enchanting table's input slot.
+ * The options provided by the event will be shown on the enchanting table menu.
+ */
+class PlayerEnchantingOptionsRequestEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
+	/**
+	 * @param EnchantingOption[] $options
+	 */
+	public function __construct(
+		Player $player,
+		private readonly EnchantInventory $inventory,
+		private array $options
+	){
+		$this->player = $player;
+	}
+
+	public function getInventory() : EnchantInventory{
+		return $this->inventory;
+	}
+
+	/**
+	 * @return EnchantingOption[]
+	 */
+	public function getOptions() : array{
+		return $this->options;
+	}
+
+	/**
+	 * @param EnchantingOption[] $options
+	 */
+	public function setOptions(array $options) : void{
+		Utils::validateArrayValueType($options, function(EnchantingOption $_) : void{ });
+		if(($optionCount = count($options)) > 3){
+			throw new \LogicException("The maximum number of options for an enchanting table is 3, but $optionCount have been passed");
+		}
+
+		$this->options = $options;
+	}
+}
diff --git a/src/event/player/PlayerCommandPreprocessEvent.php b/src/event/player/PlayerEntityPickEvent.php
similarity index 53%
rename from src/event/player/PlayerCommandPreprocessEvent.php
rename to src/event/player/PlayerEntityPickEvent.php
index 5023b36b12..3c742d6c48 100644
--- a/src/event/player/PlayerCommandPreprocessEvent.php
+++ b/src/event/player/PlayerEntityPickEvent.php
@@ -23,41 +23,31 @@ declare(strict_types=1);
 
 namespace pocketmine\event\player;
 
+use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
-use pocketmine\event\server\CommandEvent;
+use pocketmine\item\Item;
 use pocketmine\player\Player;
 
 /**
- * Called when a player runs a command or chats, before it is processed.
- *
- * If the message is prefixed with a / (forward slash), it will be interpreted as a command.
- * Otherwise, it will be broadcasted as a chat message.
- *
- * @deprecated
- * @see PlayerChatEvent to handle chat messages
- * @see CommandEvent to intercept commands
+ * Called when a player middle-clicks on an entity to get an item in creative mode.
  */
-class PlayerCommandPreprocessEvent extends PlayerEvent implements Cancellable{
+class PlayerEntityPickEvent extends PlayerEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var string */
-	protected $message;
-
-	public function __construct(Player $player, string $message){
+	public function __construct(
+		Player $player,
+		private Entity $entityClicked,
+		private Item $resultItem
+	){
 		$this->player = $player;
-		$this->message = $message;
 	}
 
-	public function getMessage() : string{
-		return $this->message;
+	public function getEntity() : Entity{
+		return $this->entityClicked;
 	}
 
-	public function setMessage(string $message) : void{
-		$this->message = $message;
-	}
-
-	public function setPlayer(Player $player) : void{
-		$this->player = $player;
+	public function getResultItem() : Item{
+		return $this->resultItem;
 	}
 }
diff --git a/src/event/player/PlayerEvent.php b/src/event/player/PlayerEvent.php
index 7334528f28..9ec9dc661a 100644
--- a/src/event/player/PlayerEvent.php
+++ b/src/event/player/PlayerEvent.php
@@ -30,8 +30,7 @@ use pocketmine\event\Event;
 use pocketmine\player\Player;
 
 abstract class PlayerEvent extends Event{
-	/** @var Player */
-	protected $player;
+	protected Player $player;
 
 	public function getPlayer() : Player{
 		return $this->player;
diff --git a/src/event/player/PlayerExhaustEvent.php b/src/event/player/PlayerExhaustEvent.php
index dbf2c0d6d0..9a13ff900a 100644
--- a/src/event/player/PlayerExhaustEvent.php
+++ b/src/event/player/PlayerExhaustEvent.php
@@ -46,23 +46,19 @@ class PlayerExhaustEvent extends EntityEvent implements Cancellable{
 	public const CAUSE_SPRINT_JUMPING = 10;
 	public const CAUSE_CUSTOM = 11;
 
-	/** @var Human */
-	protected $player;
-
 	public function __construct(
-		Human $human,
+		protected Human $human,
 		private float $amount,
 		private int $cause
 	){
 		$this->entity = $human;
-		$this->player = $human;
 	}
 
 	/**
 	 * @return Human
 	 */
 	public function getPlayer(){
-		return $this->player;
+		return $this->human;
 	}
 
 	public function getAmount() : float{
diff --git a/src/event/player/PlayerExperienceChangeEvent.php b/src/event/player/PlayerExperienceChangeEvent.php
index 5b042fb9f5..4831d7869d 100644
--- a/src/event/player/PlayerExperienceChangeEvent.php
+++ b/src/event/player/PlayerExperienceChangeEvent.php
@@ -35,9 +35,6 @@ use pocketmine\event\entity\EntityEvent;
 class PlayerExperienceChangeEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var Human */
-	protected $entity;
-
 	public function __construct(
 		Human $player,
 		private int $oldLevel,
diff --git a/src/event/player/PlayerGameModeChangeEvent.php b/src/event/player/PlayerGameModeChangeEvent.php
index aa1b6c0f8e..9e3737d634 100644
--- a/src/event/player/PlayerGameModeChangeEvent.php
+++ b/src/event/player/PlayerGameModeChangeEvent.php
@@ -34,15 +34,14 @@ use pocketmine\player\Player;
 class PlayerGameModeChangeEvent extends PlayerEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var GameMode */
-	protected $gamemode;
-
-	public function __construct(Player $player, GameMode $newGamemode){
+	public function __construct(
+		Player $player,
+		protected GameMode $newGamemode
+	){
 		$this->player = $player;
-		$this->gamemode = $newGamemode;
 	}
 
 	public function getNewGamemode() : GameMode{
-		return $this->gamemode;
+		return $this->newGamemode;
 	}
 }
diff --git a/src/event/player/PlayerInteractEvent.php b/src/event/player/PlayerInteractEvent.php
index f283913643..46daf70813 100644
--- a/src/event/player/PlayerInteractEvent.php
+++ b/src/event/player/PlayerInteractEvent.php
@@ -40,28 +40,21 @@ class PlayerInteractEvent extends PlayerEvent implements Cancellable{
 	public const LEFT_CLICK_BLOCK = 0;
 	public const RIGHT_CLICK_BLOCK = 1;
 
-	/** @var Block */
-	protected $blockTouched;
+	protected Vector3 $touchVector;
 
-	/** @var Vector3 */
-	protected $touchVector;
+	protected bool $useItem = true;
+	protected bool $useBlock = true;
 
-	/** @var int */
-	protected $blockFace;
-
-	/** @var Item */
-	protected $item;
-
-	/** @var int */
-	protected $action;
-
-	public function __construct(Player $player, Item $item, Block $block, ?Vector3 $touchVector, int $face, int $action = PlayerInteractEvent::RIGHT_CLICK_BLOCK){
+	public function __construct(
+		Player $player,
+		protected Item $item,
+		protected Block $blockTouched,
+		?Vector3 $touchVector,
+		protected int $blockFace,
+		protected int $action = PlayerInteractEvent::RIGHT_CLICK_BLOCK
+	){
 		$this->player = $player;
-		$this->item = $item;
-		$this->blockTouched = $block;
-		$this->touchVector = $touchVector ?? new Vector3(0, 0, 0);
-		$this->blockFace = $face;
-		$this->action = $action;
+		$this->touchVector = $touchVector ?? Vector3::zero();
 	}
 
 	public function getAction() : int{
@@ -83,4 +76,28 @@ class PlayerInteractEvent extends PlayerEvent implements Cancellable{
 	public function getFace() : int{
 		return $this->blockFace;
 	}
+
+	/**
+	 * Returns whether the item may react to the interaction. If disabled, items such as spawn eggs will not activate.
+	 * This does NOT prevent blocks from being placed - it makes the item behave as if the player is sneaking.
+	 */
+	public function useItem() : bool{ return $this->useItem; }
+
+	/**
+	 * Sets whether the used item may react to the interaction. If false, items such as spawn eggs will not activate.
+	 * This does NOT prevent blocks from being placed - it makes the item behave as if the player is sneaking.
+	 */
+	public function setUseItem(bool $useItem) : void{ $this->useItem = $useItem; }
+
+	/**
+	 * Returns whether the block may react to the interaction. If false, doors, fence gates and trapdoors will not
+	 * respond, containers will not open, etc.
+	 */
+	public function useBlock() : bool{ return $this->useBlock; }
+
+	/**
+	 * Sets whether the block may react to the interaction. If false, doors, fence gates and trapdoors will not
+	 * respond, containers will not open, etc.
+	 */
+	public function setUseBlock(bool $useBlock) : void{ $this->useBlock = $useBlock; }
 }
diff --git a/src/event/player/PlayerItemEnchantEvent.php b/src/event/player/PlayerItemEnchantEvent.php
new file mode 100644
index 0000000000..76151384d3
--- /dev/null
+++ b/src/event/player/PlayerItemEnchantEvent.php
@@ -0,0 +1,85 @@
+<?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\event\player;
+
+use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
+use pocketmine\inventory\transaction\EnchantingTransaction;
+use pocketmine\item\enchantment\EnchantingOption;
+use pocketmine\item\Item;
+use pocketmine\player\Player;
+
+/**
+ * Called when a player enchants an item using an enchanting table.
+ */
+class PlayerItemEnchantEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
+	public function __construct(
+		Player $player,
+		private readonly EnchantingTransaction $transaction,
+		private readonly EnchantingOption $option,
+		private readonly Item $inputItem,
+		private readonly Item $outputItem,
+		private readonly int $cost
+	){
+		$this->player = $player;
+	}
+
+	/**
+	 * Returns the inventory transaction involved in this enchant event.
+	 */
+	public function getTransaction() : EnchantingTransaction{
+		return $this->transaction;
+	}
+
+	/**
+	 * Returns the enchantment option used.
+	 */
+	public function getOption() : EnchantingOption{
+		return $this->option;
+	}
+
+	/**
+	 * Returns the item to be enchanted.
+	 */
+	public function getInputItem() : Item{
+		return clone $this->inputItem;
+	}
+
+	/**
+	 * Returns the enchanted item.
+	 */
+	public function getOutputItem() : Item{
+		return clone $this->outputItem;
+	}
+
+	/**
+	 * Returns the number of XP levels and lapis that will be subtracted after enchanting
+	 * if the player is not in creative mode.
+	 */
+	public function getCost() : int{
+		return $this->cost;
+	}
+}
diff --git a/src/event/player/PlayerJoinEvent.php b/src/event/player/PlayerJoinEvent.php
index e5a0c5639a..668b3bd91c 100644
--- a/src/event/player/PlayerJoinEvent.php
+++ b/src/event/player/PlayerJoinEvent.php
@@ -34,12 +34,11 @@ use pocketmine\player\Player;
  * @see PlayerLoginEvent
  */
 class PlayerJoinEvent extends PlayerEvent{
-	/** @var string|Translatable */
-	protected $joinMessage;
-
-	public function __construct(Player $player, Translatable|string $joinMessage){
+	public function __construct(
+		Player $player,
+		protected Translatable|string $joinMessage
+	){
 		$this->player = $player;
-		$this->joinMessage = $joinMessage;
 	}
 
 	public function setJoinMessage(Translatable|string $joinMessage) : void{
diff --git a/src/event/player/PlayerKickEvent.php b/src/event/player/PlayerKickEvent.php
index a0b9fe4c07..8e00385a2a 100644
--- a/src/event/player/PlayerKickEvent.php
+++ b/src/event/player/PlayerKickEvent.php
@@ -33,34 +33,15 @@ use pocketmine\player\Player;
  */
 class PlayerKickEvent extends PlayerEvent implements Cancellable{
 	use CancellableTrait;
+	use PlayerDisconnectEventTrait;
 
-	/** @var Translatable|string */
-	protected $quitMessage;
-
-	/** @var string */
-	protected $reason;
-
-	public function __construct(Player $player, string $reason, Translatable|string $quitMessage){
+	public function __construct(
+		Player $player,
+		protected Translatable|string $disconnectReason,
+		protected Translatable|string $quitMessage,
+		protected Translatable|string|null $disconnectScreenMessage
+	){
 		$this->player = $player;
-		$this->quitMessage = $quitMessage;
-		$this->reason = $reason;
-	}
-
-	/**
-	 * Sets the message shown on the kicked player's disconnection screen.
-	 * This message is also displayed in the console and server log.
-	 */
-	public function setReason(string $reason) : void{
-		$this->reason = $reason;
-	}
-
-	/**
-	 * Returns the message shown on the kicked player's disconnection screen.
-	 * This message is also displayed in the console and server log.
-	 * When kicked by the /kick command, the default is something like "Kicked by admin.".
-	 */
-	public function getReason() : string{
-		return $this->reason;
 	}
 
 	/**
diff --git a/src/event/player/PlayerLoginEvent.php b/src/event/player/PlayerLoginEvent.php
index f96618ed98..734e548232 100644
--- a/src/event/player/PlayerLoginEvent.php
+++ b/src/event/player/PlayerLoginEvent.php
@@ -25,6 +25,7 @@ namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
+use pocketmine\lang\Translatable;
 use pocketmine\player\Player;
 
 /**
@@ -35,19 +36,18 @@ use pocketmine\player\Player;
 class PlayerLoginEvent extends PlayerEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var string */
-	protected $kickMessage;
-
-	public function __construct(Player $player, string $kickMessage){
+	public function __construct(
+		Player $player,
+		protected Translatable|string $kickMessage
+	){
 		$this->player = $player;
+	}
+
+	public function setKickMessage(Translatable|string $kickMessage) : void{
 		$this->kickMessage = $kickMessage;
 	}
 
-	public function setKickMessage(string $kickMessage) : void{
-		$this->kickMessage = $kickMessage;
-	}
-
-	public function getKickMessage() : string{
+	public function getKickMessage() : Translatable|string{
 		return $this->kickMessage;
 	}
 }
diff --git a/src/network/mcpe/convert/SkinAdapterSingleton.php b/src/event/player/PlayerMissSwingEvent.php
similarity index 64%
rename from src/network/mcpe/convert/SkinAdapterSingleton.php
rename to src/event/player/PlayerMissSwingEvent.php
index db2f7903a7..2f7ffda9cf 100644
--- a/src/network/mcpe/convert/SkinAdapterSingleton.php
+++ b/src/event/player/PlayerMissSwingEvent.php
@@ -21,22 +21,19 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\network\mcpe\convert;
+namespace pocketmine\event\player;
+
+use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
+use pocketmine\player\Player;
 
 /**
- * Accessor for SkinAdapter
+ * Called when a player attempts to perform the attack action (left-click) without a target entity.
  */
-class SkinAdapterSingleton{
-	private static ?SkinAdapter $skinAdapter = null;
+class PlayerMissSwingEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
 
-	public static function get() : SkinAdapter{
-		if(self::$skinAdapter === null){
-			self::$skinAdapter = new LegacySkinAdapter();
-		}
-		return self::$skinAdapter;
-	}
-
-	public static function set(SkinAdapter $adapter) : void{
-		self::$skinAdapter = $adapter;
+	public function __construct(Player $player){
+		$this->player = $player;
 	}
 }
diff --git a/src/event/player/PlayerPreLoginEvent.php b/src/event/player/PlayerPreLoginEvent.php
index 4f266d661b..5a69c0e175 100644
--- a/src/event/player/PlayerPreLoginEvent.php
+++ b/src/event/player/PlayerPreLoginEvent.php
@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\event\player;
 
-use pocketmine\event\Cancellable;
 use pocketmine\event\Event;
+use pocketmine\lang\Translatable;
 use pocketmine\player\PlayerInfo;
 use function array_keys;
 use function count;
@@ -39,38 +39,35 @@ use function count;
  * WARNING: Any information about the player CANNOT be trusted at this stage, because they are not authenticated and
  * could be a hacker posing as another player.
  */
-class PlayerPreLoginEvent extends Event implements Cancellable{
-	public const KICK_REASON_PLUGIN = 0;
-	public const KICK_REASON_SERVER_FULL = 1;
-	public const KICK_REASON_SERVER_WHITELISTED = 2;
-	public const KICK_REASON_BANNED = 3;
+class PlayerPreLoginEvent extends Event{
+	public const KICK_FLAG_PLUGIN = 0;
+	public const KICK_FLAG_SERVER_FULL = 1;
+	public const KICK_FLAG_SERVER_WHITELISTED = 2;
+	public const KICK_FLAG_BANNED = 3;
 
-	public const KICK_REASON_PRIORITY = [
-		self::KICK_REASON_PLUGIN, //Plugin reason should always take priority over anything else
-		self::KICK_REASON_SERVER_FULL,
-		self::KICK_REASON_SERVER_WHITELISTED,
-		self::KICK_REASON_BANNED
+	public const KICK_FLAG_PRIORITY = [
+		self::KICK_FLAG_PLUGIN, //Plugin reason should always take priority over anything else
+		self::KICK_FLAG_SERVER_FULL,
+		self::KICK_FLAG_SERVER_WHITELISTED,
+		self::KICK_FLAG_BANNED
 	];
 
-	/** @var bool */
-	protected $authRequired;
-
-	/** @var string[] reason const => associated message */
-	protected $kickReasons = [];
+	/** @var Translatable[]|string[] reason const => associated message */
+	protected array $disconnectReasons = [];
+	/** @var Translatable[]|string[] */
+	protected array $disconnectScreenMessages = [];
 
 	public function __construct(
 		private PlayerInfo $playerInfo,
 		private string $ip,
 		private int $port,
-		bool $authRequired
-	){
-		$this->authRequired = $authRequired;
-	}
+		protected bool $authRequired
+	){}
 
 	/**
 	 * Returns an object containing self-proclaimed information about the connecting player.
-	 * WARNING: THE PLAYER IS NOT VERIFIED DURING THIS EVENT. At this point, it's unknown if the player is real or a
-	 * hacker.
+	 * WARNING: THE PLAYER IS NOT VERIFIED DURING THIS EVENT. At this point, this could be a hacker posing as another
+	 * player.
 	 */
 	public function getPlayerInfo() : PlayerInfo{
 		return $this->playerInfo;
@@ -93,27 +90,31 @@ class PlayerPreLoginEvent extends Event implements Cancellable{
 	}
 
 	/**
-	 * Returns an array of kick reasons currently assigned.
+	 * Returns an array of kick flags currently assigned.
 	 *
 	 * @return int[]
 	 */
-	public function getKickReasons() : array{
-		return array_keys($this->kickReasons);
+	public function getKickFlags() : array{
+		return array_keys($this->disconnectReasons);
 	}
 
 	/**
-	 * Returns whether the given kick reason is set for this event.
+	 * Returns whether the given kick flag is set for this event.
 	 */
-	public function isKickReasonSet(int $flag) : bool{
-		return isset($this->kickReasons[$flag]);
+	public function isKickFlagSet(int $flag) : bool{
+		return isset($this->disconnectReasons[$flag]);
 	}
 
 	/**
-	 * Sets a reason to disallow the player to continue continue authenticating, with a message.
+	 * Sets a reason to disallow the player to continue authenticating, with a message.
 	 * This can also be used to change kick messages for already-set flags.
+	 *
+	 * @param Translatable|string      $disconnectReason        Shown in the server log - this should be a short one-line message
+	 * @param Translatable|string|null $disconnectScreenMessage Shown on the player's disconnection screen (null will use the reason)
 	 */
-	public function setKickReason(int $flag, string $message) : void{
-		$this->kickReasons[$flag] = $message;
+	public function setKickFlag(int $flag, Translatable|string $disconnectReason, Translatable|string|null $disconnectScreenMessage = null) : void{
+		$this->disconnectReasons[$flag] = $disconnectReason;
+		$this->disconnectScreenMessages[$flag] = $disconnectScreenMessage ?? $disconnectReason;
 	}
 
 	/**
@@ -122,50 +123,72 @@ class PlayerPreLoginEvent extends Event implements Cancellable{
 	 *
 	 * @param int $flag Specific flag to clear.
 	 */
-	public function clearKickReason(int $flag) : void{
-		unset($this->kickReasons[$flag]);
+	public function clearKickFlag(int $flag) : void{
+		unset($this->disconnectReasons[$flag], $this->disconnectScreenMessages[$flag]);
 	}
 
 	/**
 	 * Clears all pre-assigned kick reasons, allowing the player to continue logging in.
 	 */
-	public function clearAllKickReasons() : void{
-		$this->kickReasons = [];
+	public function clearAllKickFlags() : void{
+		$this->disconnectReasons = [];
+		$this->disconnectScreenMessages = [];
 	}
 
 	/**
 	 * Returns whether the player is allowed to continue logging in.
 	 */
 	public function isAllowed() : bool{
-		return count($this->kickReasons) === 0;
+		return count($this->disconnectReasons) === 0;
 	}
 
 	/**
-	 * Returns the kick message provided for the given kick flag, or null if not set.
+	 * Returns the disconnect reason provided for the given kick flag, or null if not set.
+	 * This is the message which will be shown in the server log and on the console.
 	 */
-	public function getKickMessage(int $flag) : ?string{
-		return $this->kickReasons[$flag] ?? null;
+	public function getDisconnectReason(int $flag) : Translatable|string|null{
+		return $this->disconnectReasons[$flag] ?? null;
 	}
 
 	/**
-	 * Returns the final kick message which will be shown on the disconnect screen.
-	 *
-	 * Note: Only one message (the highest priority one) will be shown. See priority order to decide how to set your
+	 * Returns the disconnect screen message provided for the given kick flag, or null if not set.
+	 * This is the message shown to the player on the disconnect screen.
+	 */
+	public function getDisconnectScreenMessage(int $flag) : Translatable|string|null{
+		return $this->disconnectScreenMessages[$flag] ?? null;
+	}
+
+	/**
+	 * Resolves the message that will be shown in the server log if the player is kicked.
+	 * Only one message (the highest priority one) will be shown. See priority order to decide how to set your
 	 * messages.
 	 *
-	 * @see PlayerPreLoginEvent::KICK_REASON_PRIORITY
+	 * @see PlayerPreLoginEvent::KICK_FLAG_PRIORITY
 	 */
-	public function getFinalKickMessage() : string{
-		foreach(self::KICK_REASON_PRIORITY as $p){
-			if(isset($this->kickReasons[$p])){
-				return $this->kickReasons[$p];
+	public function getFinalDisconnectReason() : Translatable|string{
+		foreach(self::KICK_FLAG_PRIORITY as $p){
+			if(isset($this->disconnectReasons[$p])){
+				return $this->disconnectReasons[$p];
 			}
 		}
 
 		return "";
 	}
 
-	public function isCancelled() : bool{
-		return !$this->isAllowed();
+	/**
+	 * Resolves the message that will be shown on the player's disconnect screen if they are kicked.
+	 * Only one message (the highest priority one) will be shown. See priority order to decide how to set your
+	 * messages.
+	 *
+	 * @see PlayerPreLoginEvent::KICK_FLAG_PRIORITY
+	 */
+	public function getFinalDisconnectScreenMessage() : Translatable|string{
+		foreach(self::KICK_FLAG_PRIORITY as $p){
+			if(isset($this->disconnectScreenMessages[$p])){
+				return $this->disconnectScreenMessages[$p];
+			}
+		}
+
+		return "";
 	}
 }
diff --git a/src/event/player/PlayerQuitEvent.php b/src/event/player/PlayerQuitEvent.php
index 0f3d691611..13b48d6c02 100644
--- a/src/event/player/PlayerQuitEvent.php
+++ b/src/event/player/PlayerQuitEvent.php
@@ -37,16 +37,12 @@ use pocketmine\player\Player;
  * @see PlayerKickEvent
  */
 class PlayerQuitEvent extends PlayerEvent{
-
-	/** @var Translatable|string */
-	protected $quitMessage;
-	/** @var string */
-	protected $quitReason;
-
-	public function __construct(Player $player, Translatable|string $quitMessage, string $quitReason){
+	public function __construct(
+		Player $player,
+		protected Translatable|string $quitMessage,
+		protected Translatable|string $quitReason
+	){
 		$this->player = $player;
-		$this->quitMessage = $quitMessage;
-		$this->quitReason = $quitReason;
 	}
 
 	/**
@@ -66,7 +62,7 @@ class PlayerQuitEvent extends PlayerEvent{
 	/**
 	 * Returns the disconnect reason shown in the server log and on the console.
 	 */
-	public function getQuitReason() : string{
+	public function getQuitReason() : Translatable|string{
 		return $this->quitReason;
 	}
 }
diff --git a/src/event/player/PlayerResourcePackOfferEvent.php b/src/event/player/PlayerResourcePackOfferEvent.php
new file mode 100644
index 0000000000..df00cf474e
--- /dev/null
+++ b/src/event/player/PlayerResourcePackOfferEvent.php
@@ -0,0 +1,106 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\event\player;
+
+use pocketmine\event\Event;
+use pocketmine\player\PlayerInfo;
+use pocketmine\resourcepacks\ResourcePack;
+use function array_unshift;
+
+/**
+ * Called after a player authenticates and is being offered resource packs to download.
+ *
+ * This event should be used to decide which resource packs to offer the player and whether to require the player to
+ * download the packs before they can join the server.
+ */
+class PlayerResourcePackOfferEvent extends Event{
+	/**
+	 * @param ResourcePack[] $resourcePacks
+	 * @param string[]       $encryptionKeys pack UUID => key, leave unset for any packs that are not encrypted
+	 *
+	 * @phpstan-param list<ResourcePack>    $resourcePacks
+	 * @phpstan-param array<string, string> $encryptionKeys
+	 */
+	public function __construct(
+		private readonly PlayerInfo $playerInfo,
+		private array $resourcePacks,
+		private array $encryptionKeys,
+		private bool $mustAccept
+	){}
+
+	public function getPlayerInfo() : PlayerInfo{
+		return $this->playerInfo;
+	}
+
+	/**
+	 * Adds a resource pack to the top of the stack.
+	 * The resources in this pack will be applied over the top of any existing packs.
+	 */
+	public function addResourcePack(ResourcePack $entry, ?string $encryptionKey = null) : void{
+		array_unshift($this->resourcePacks, $entry);
+		if($encryptionKey !== null){
+			$this->encryptionKeys[$entry->getPackId()] = $encryptionKey;
+		}
+	}
+
+	/**
+	 * Sets the resource packs to offer. Packs are applied from the highest key to the lowest, with each pack
+	 * overwriting any resources from the previous pack. This means that the pack at index 0 gets the final say on which
+	 * resources are used.
+	 *
+	 * @param ResourcePack[] $resourcePacks
+	 * @param string[]       $encryptionKeys pack UUID => key, leave unset for any packs that are not encrypted
+	 *
+	 * @phpstan-param list<ResourcePack>    $resourcePacks
+	 * @phpstan-param array<string, string> $encryptionKeys
+	 */
+	public function setResourcePacks(array $resourcePacks, array $encryptionKeys) : void{
+		$this->resourcePacks = $resourcePacks;
+		$this->encryptionKeys = $encryptionKeys;
+	}
+
+	/**
+	 * @return ResourcePack[]
+	 * @phpstan-return list<ResourcePack>
+	 */
+	public function getResourcePacks() : array{
+		return $this->resourcePacks;
+	}
+
+	/**
+	 * @return string[]
+	 * @phpstan-return array<string, string>
+	 */
+	public function getEncryptionKeys() : array{
+		return $this->encryptionKeys;
+	}
+
+	public function setMustAccept(bool $mustAccept) : void{
+		$this->mustAccept = $mustAccept;
+	}
+
+	public function mustAccept() : bool{
+		return $this->mustAccept;
+	}
+}
diff --git a/src/event/player/PlayerRespawnEvent.php b/src/event/player/PlayerRespawnEvent.php
index 5390d94203..095fe0bea0 100644
--- a/src/event/player/PlayerRespawnEvent.php
+++ b/src/event/player/PlayerRespawnEvent.php
@@ -31,12 +31,11 @@ use pocketmine\world\Position;
  * Called when a player is respawned
  */
 class PlayerRespawnEvent extends PlayerEvent{
-	/** @var Position */
-	protected $position;
-
-	public function __construct(Player $player, Position $position){
+	public function __construct(
+		Player $player,
+		protected Position $position
+	){
 		$this->player = $player;
-		$this->position = $position;
 	}
 
 	public function getRespawnPosition() : Position{
diff --git a/src/event/player/PlayerToggleFlightEvent.php b/src/event/player/PlayerToggleFlightEvent.php
index af233e020b..cbdaacdeaa 100644
--- a/src/event/player/PlayerToggleFlightEvent.php
+++ b/src/event/player/PlayerToggleFlightEvent.php
@@ -30,12 +30,11 @@ use pocketmine\player\Player;
 class PlayerToggleFlightEvent extends PlayerEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var bool */
-	protected $isFlying;
-
-	public function __construct(Player $player, bool $isFlying){
+	public function __construct(
+		Player $player,
+		protected bool $isFlying
+	){
 		$this->player = $player;
-		$this->isFlying = $isFlying;
 	}
 
 	public function isFlying() : bool{
diff --git a/src/event/player/PlayerToggleSneakEvent.php b/src/event/player/PlayerToggleSneakEvent.php
index d7e246a9d3..d51e6803e8 100644
--- a/src/event/player/PlayerToggleSneakEvent.php
+++ b/src/event/player/PlayerToggleSneakEvent.php
@@ -30,12 +30,11 @@ use pocketmine\player\Player;
 class PlayerToggleSneakEvent extends PlayerEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var bool */
-	protected $isSneaking;
-
-	public function __construct(Player $player, bool $isSneaking){
+	public function __construct(
+		Player $player,
+		protected bool $isSneaking
+	){
 		$this->player = $player;
-		$this->isSneaking = $isSneaking;
 	}
 
 	public function isSneaking() : bool{
diff --git a/src/event/player/PlayerToggleSprintEvent.php b/src/event/player/PlayerToggleSprintEvent.php
index 960e782558..2397c29812 100644
--- a/src/event/player/PlayerToggleSprintEvent.php
+++ b/src/event/player/PlayerToggleSprintEvent.php
@@ -30,12 +30,11 @@ use pocketmine\player\Player;
 class PlayerToggleSprintEvent extends PlayerEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var bool */
-	protected $isSprinting;
-
-	public function __construct(Player $player, bool $isSprinting){
+	public function __construct(
+		Player $player,
+		protected bool $isSprinting
+	){
 		$this->player = $player;
-		$this->isSprinting = $isSprinting;
 	}
 
 	public function isSprinting() : bool{
diff --git a/src/event/player/PlayerTransferEvent.php b/src/event/player/PlayerTransferEvent.php
index c733381194..5d8c0bb7e1 100644
--- a/src/event/player/PlayerTransferEvent.php
+++ b/src/event/player/PlayerTransferEvent.php
@@ -25,6 +25,7 @@ namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
+use pocketmine\lang\Translatable;
 use pocketmine\player\Player;
 
 /**
@@ -33,18 +34,13 @@ use pocketmine\player\Player;
 class PlayerTransferEvent extends PlayerEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var string */
-	protected $address;
-	/** @var int */
-	protected $port = 19132;
-	/** @var string */
-	protected $message;
-
-	public function __construct(Player $player, string $address, int $port, string $message){
+	public function __construct(
+		Player $player,
+		protected string $address,
+		protected int $port,
+		protected Translatable|string $message
+	){
 		$this->player = $player;
-		$this->address = $address;
-		$this->port = $port;
-		$this->message = $message;
 	}
 
 	/**
@@ -78,14 +74,14 @@ class PlayerTransferEvent extends PlayerEvent implements Cancellable{
 	/**
 	 * Returns the disconnect reason shown in the server log and on the console.
 	 */
-	public function getMessage() : string{
+	public function getMessage() : Translatable|string{
 		return $this->message;
 	}
 
 	/**
 	 * Sets the disconnect reason shown in the server log and on the console.
 	 */
-	public function setMessage(string $message) : void{
+	public function setMessage(Translatable|string $message) : void{
 		$this->message = $message;
 	}
 }
diff --git a/src/event/server/CommandEvent.php b/src/event/server/CommandEvent.php
index 6a55154e8c..1881ad4963 100644
--- a/src/event/server/CommandEvent.php
+++ b/src/event/server/CommandEvent.php
@@ -44,16 +44,10 @@ use pocketmine\event\CancellableTrait;
 class CommandEvent extends ServerEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var string */
-	protected $command;
-
-	/** @var CommandSender */
-	protected $sender;
-
-	public function __construct(CommandSender $sender, string $command){
-		$this->sender = $sender;
-		$this->command = $command;
-	}
+	public function __construct(
+		protected CommandSender $sender,
+		protected string $command
+	){}
 
 	public function getSender() : CommandSender{
 		return $this->sender;
diff --git a/src/event/server/DataPacketDecodeEvent.php b/src/event/server/DataPacketDecodeEvent.php
new file mode 100644
index 0000000000..44aefbb916
--- /dev/null
+++ b/src/event/server/DataPacketDecodeEvent.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\event\server;
+
+use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
+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{
+	use CancellableTrait;
+
+	public function __construct(
+		private NetworkSession $origin,
+		private int $packetId,
+		private string $packetBuffer
+	){}
+
+	public function getOrigin() : NetworkSession{
+		return $this->origin;
+	}
+
+	public function getPacketId() : int{
+		return $this->packetId;
+	}
+
+	public function getPacketBuffer() : string{
+		return $this->packetBuffer;
+	}
+}
diff --git a/src/event/server/DataPacketSendEvent.php b/src/event/server/DataPacketSendEvent.php
index 8cbe47cf8b..147d99db34 100644
--- a/src/event/server/DataPacketSendEvent.php
+++ b/src/event/server/DataPacketSendEvent.php
@@ -27,6 +27,7 @@ use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\ClientboundPacket;
+use pocketmine\utils\Utils;
 
 /**
  * Called when packets are sent to network sessions.
@@ -56,4 +57,12 @@ class DataPacketSendEvent extends ServerEvent implements Cancellable{
 	public function getPackets() : array{
 		return $this->packets;
 	}
+
+	/**
+	 * @param ClientboundPacket[] $packets
+	 */
+	public function setPackets(array $packets) : void{
+		Utils::validateArrayValueType($packets, function(ClientboundPacket $_) : void{});
+		$this->packets = $packets;
+	}
 }
diff --git a/src/event/server/NetworkInterfaceEvent.php b/src/event/server/NetworkInterfaceEvent.php
index 72eb067e38..5c1675f19b 100644
--- a/src/event/server/NetworkInterfaceEvent.php
+++ b/src/event/server/NetworkInterfaceEvent.php
@@ -26,12 +26,9 @@ namespace pocketmine\event\server;
 use pocketmine\network\NetworkInterface;
 
 class NetworkInterfaceEvent extends ServerEvent{
-	/** @var NetworkInterface */
-	protected $interface;
-
-	public function __construct(NetworkInterface $interface){
-		$this->interface = $interface;
-	}
+	public function __construct(
+		protected NetworkInterface $interface
+	){}
 
 	public function getInterface() : NetworkInterface{
 		return $this->interface;
diff --git a/src/event/world/WorldDifficultyChangeEvent.php b/src/event/world/WorldDifficultyChangeEvent.php
new file mode 100644
index 0000000000..90cee376a5
--- /dev/null
+++ b/src/event/world/WorldDifficultyChangeEvent.php
@@ -0,0 +1,44 @@
+<?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\event\world;
+
+use pocketmine\world\World;
+
+/**
+ * Called when a world's difficulty is changed.
+ */
+final class WorldDifficultyChangeEvent extends WorldEvent{
+
+	public function __construct(
+		World $world,
+		private int $oldDifficulty,
+		private int $newDifficulty
+	){
+		parent::__construct($world);
+	}
+
+	public function getOldDifficulty() : int{ return $this->oldDifficulty; }
+
+	public function getNewDifficulty() : int{ return $this->newDifficulty; }
+}
diff --git a/src/event/world/WorldDisplayNameChangeEvent.php b/src/event/world/WorldDisplayNameChangeEvent.php
new file mode 100644
index 0000000000..a3067a1c53
--- /dev/null
+++ b/src/event/world/WorldDisplayNameChangeEvent.php
@@ -0,0 +1,48 @@
+<?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\event\world;
+
+use pocketmine\world\World;
+
+/**
+ * Called when a world's display name is changed.
+ */
+final class WorldDisplayNameChangeEvent extends WorldEvent{
+
+	public function __construct(
+		World $world,
+		private string $oldName,
+		private string $newName
+	){
+		parent::__construct($world);
+	}
+
+	public function getOldName() : string{
+		return $this->oldName;
+	}
+
+	public function getNewName() : string{
+		return $this->newName;
+	}
+}
diff --git a/src/inventory/ArmorInventory.php b/src/inventory/ArmorInventory.php
index a115b992d3..8591cc65bf 100644
--- a/src/inventory/ArmorInventory.php
+++ b/src/inventory/ArmorInventory.php
@@ -23,8 +23,13 @@ declare(strict_types=1);
 
 namespace pocketmine\inventory;
 
+use pocketmine\block\BlockTypeIds;
 use pocketmine\entity\Living;
+use pocketmine\inventory\transaction\action\validator\CallbackSlotValidator;
+use pocketmine\inventory\transaction\TransactionValidationException;
+use pocketmine\item\Armor;
 use pocketmine\item\Item;
+use pocketmine\item\ItemBlock;
 
 class ArmorInventory extends SimpleInventory{
 	public const SLOT_HEAD = 0;
@@ -32,12 +37,12 @@ class ArmorInventory extends SimpleInventory{
 	public const SLOT_LEGS = 2;
 	public const SLOT_FEET = 3;
 
-	/** @var Living */
-	protected $holder;
-
-	public function __construct(Living $holder){
-		$this->holder = $holder;
+	public function __construct(
+		protected Living $holder
+	){
 		parent::__construct(4);
+
+		$this->validators->add(new CallbackSlotValidator(self::validate(...)));
 	}
 
 	public function getHolder() : Living{
@@ -75,4 +80,20 @@ class ArmorInventory extends SimpleInventory{
 	public function setBoots(Item $boots) : void{
 		$this->setItem(self::SLOT_FEET, $boots);
 	}
+
+	private static function validate(Inventory $inventory, Item $item, int $slot) : ?TransactionValidationException{
+		if($item instanceof Armor){
+			if($item->getArmorSlot() !== $slot){
+				return new TransactionValidationException("Armor item is in wrong slot");
+			}
+		}else{
+			if(!($slot === ArmorInventory::SLOT_HEAD && $item instanceof ItemBlock && (
+					$item->getBlock()->getTypeId() === BlockTypeIds::CARVED_PUMPKIN ||
+					$item->getBlock()->getTypeId() === BlockTypeIds::MOB_HEAD
+				))){
+				return new TransactionValidationException("Item is not accepted in an armor slot");
+			}
+		}
+		return null;
+	}
 }
diff --git a/src/inventory/BaseInventory.php b/src/inventory/BaseInventory.php
index 06b3b9800e..0d5d1ffe60 100644
--- a/src/inventory/BaseInventory.php
+++ b/src/inventory/BaseInventory.php
@@ -36,20 +36,27 @@ use function spl_object_id;
 
 /**
  * This class provides everything needed to implement an inventory, minus the underlying storage system.
+ *
+ * @phpstan-import-type SlotValidators from SlotValidatedInventory
  */
-abstract class BaseInventory implements Inventory{
-	/** @var int */
-	protected $maxStackSize = Inventory::MAX_STACK;
-	/** @var Player[] */
-	protected $viewers = [];
+abstract class BaseInventory implements Inventory, SlotValidatedInventory{
+	protected int $maxStackSize = Inventory::MAX_STACK;
+	/**
+	 * @var Player[]
+	 * @phpstan-var array<int, Player>
+	 */
+	protected array $viewers = [];
 	/**
 	 * @var InventoryListener[]|ObjectSet
 	 * @phpstan-var ObjectSet<InventoryListener>
 	 */
-	protected $listeners;
+	protected ObjectSet $listeners;
+	/** @phpstan-var SlotValidators */
+	protected ObjectSet $validators;
 
 	public function __construct(){
 		$this->listeners = new ObjectSet();
+		$this->validators = new ObjectSet();
 	}
 
 	public function getMaxStackSize() : int{
@@ -108,13 +115,22 @@ abstract class BaseInventory implements Inventory{
 		$this->onContentChange($oldContents);
 	}
 
+	/**
+	 * Helper for utility functions which search the inventory.
+	 * TODO: make this abstract instead of providing a slow default implementation (BC break)
+	 */
+	protected function getMatchingItemCount(int $slot, Item $test, bool $checkTags) : int{
+		$item = $this->getItem($slot);
+		return $item->equals($test, true, $checkTags) ? $item->getCount() : 0;
+	}
+
 	public function contains(Item $item) : bool{
 		$count = max(1, $item->getCount());
-		$checkDamage = !$item->hasAnyDamageValue();
 		$checkTags = $item->hasNamedTag();
-		foreach($this->getContents() as $i){
-			if($item->equals($i, $checkDamage, $checkTags)){
-				$count -= $i->getCount();
+		for($i = 0, $size = $this->getSize(); $i < $size; $i++){
+			$slotCount = $this->getMatchingItemCount($i, $item, $checkTags);
+			if($slotCount > 0){
+				$count -= $slotCount;
 				if($count <= 0){
 					return true;
 				}
@@ -126,11 +142,10 @@ abstract class BaseInventory implements Inventory{
 
 	public function all(Item $item) : array{
 		$slots = [];
-		$checkDamage = !$item->hasAnyDamageValue();
 		$checkTags = $item->hasNamedTag();
-		foreach($this->getContents() as $index => $i){
-			if($item->equals($i, $checkDamage, $checkTags)){
-				$slots[$index] = $i;
+		for($i = 0, $size = $this->getSize(); $i < $size; $i++){
+			if($this->getMatchingItemCount($i, $item, $checkTags) > 0){
+				$slots[$i] = $this->getItem($i);
 			}
 		}
 
@@ -139,21 +154,11 @@ abstract class BaseInventory implements Inventory{
 
 	public function first(Item $item, bool $exact = false) : int{
 		$count = $exact ? $item->getCount() : max(1, $item->getCount());
-		$checkDamage = $exact || !$item->hasAnyDamageValue();
 		$checkTags = $exact || $item->hasNamedTag();
 
-		foreach($this->getContents() as $index => $i){
-			if($item->equals($i, $checkDamage, $checkTags) && ($i->getCount() === $count || (!$exact && $i->getCount() > $count))){
-				return $index;
-			}
-		}
-
-		return -1;
-	}
-
-	public function firstEmpty() : int{
-		foreach($this->getContents(true) as $i => $slot){
-			if($slot->isNull()){
+		for($i = 0, $size = $this->getSize(); $i < $size; $i++){
+			$slotCount = $this->getMatchingItemCount($i, $item, $checkTags);
+			if($slotCount > 0 && ($slotCount === $count || (!$exact && $slotCount > $count))){
 				return $i;
 			}
 		}
@@ -161,6 +166,20 @@ abstract class BaseInventory implements Inventory{
 		return -1;
 	}
 
+	public function firstEmpty() : int{
+		for($i = 0, $size = $this->getSize(); $i < $size; $i++){
+			if($this->isSlotEmpty($i)){
+				return $i;
+			}
+		}
+
+		return -1;
+	}
+
+	/**
+	 * TODO: make this abstract and force implementations to implement it properly (BC break)
+	 * This default implementation works, but is slow.
+	 */
 	public function isSlotEmpty(int $index) : bool{
 		return $this->getItem($index)->isNull();
 	}
@@ -171,14 +190,16 @@ abstract class BaseInventory implements Inventory{
 
 	public function getAddableItemQuantity(Item $item) : int{
 		$count = $item->getCount();
+		$maxStackSize = min($this->getMaxStackSize(), $item->getMaxStackSize());
+
 		for($i = 0, $size = $this->getSize(); $i < $size; ++$i){
-			$slot = $this->getItem($i);
-			if($item->canStackWith($slot)){
-				if(($diff = min($slot->getMaxStackSize(), $item->getMaxStackSize()) - $slot->getCount()) > 0){
+			if($this->isSlotEmpty($i)){
+				$count -= $maxStackSize;
+			}else{
+				$slotCount = $this->getMatchingItemCount($i, $item, true);
+				if($slotCount > 0 && ($diff = $maxStackSize - $slotCount) > 0){
 					$count -= $diff;
 				}
-			}elseif($slot->isNull()){
-				$count -= min($this->getMaxStackSize(), $item->getMaxStackSize());
 			}
 
 			if($count <= 0){
@@ -212,22 +233,29 @@ abstract class BaseInventory implements Inventory{
 		return $returnSlots;
 	}
 
-	private function internalAddItem(Item $slot) : Item{
+	private function internalAddItem(Item $newItem) : Item{
 		$emptySlots = [];
 
+		$maxStackSize = min($this->getMaxStackSize(), $newItem->getMaxStackSize());
+
 		for($i = 0, $size = $this->getSize(); $i < $size; ++$i){
-			$item = $this->getItem($i);
-			if($item->isNull()){
+			if($this->isSlotEmpty($i)){
 				$emptySlots[] = $i;
+				continue;
+			}
+			$slotCount = $this->getMatchingItemCount($i, $newItem, true);
+			if($slotCount === 0){
+				continue;
 			}
 
-			if($slot->canStackWith($item) && $item->getCount() < $item->getMaxStackSize()){
-				$amount = min($item->getMaxStackSize() - $item->getCount(), $slot->getCount(), $this->getMaxStackSize());
+			if($slotCount < $maxStackSize){
+				$amount = min($maxStackSize - $slotCount, $newItem->getCount());
 				if($amount > 0){
-					$slot->setCount($slot->getCount() - $amount);
-					$item->setCount($item->getCount() + $amount);
-					$this->setItem($i, $item);
-					if($slot->getCount() <= 0){
+					$newItem->setCount($newItem->getCount() - $amount);
+					$slotItem = $this->getItem($i);
+					$slotItem->setCount($slotItem->getCount() + $amount);
+					$this->setItem($i, $slotItem);
+					if($newItem->getCount() <= 0){
 						break;
 					}
 				}
@@ -236,65 +264,64 @@ abstract class BaseInventory implements Inventory{
 
 		if(count($emptySlots) > 0){
 			foreach($emptySlots as $slotIndex){
-				$amount = min($slot->getMaxStackSize(), $slot->getCount(), $this->getMaxStackSize());
-				$slot->setCount($slot->getCount() - $amount);
-				$item = clone $slot;
-				$item->setCount($amount);
-				$this->setItem($slotIndex, $item);
-				if($slot->getCount() <= 0){
+				$amount = min($maxStackSize, $newItem->getCount());
+				$newItem->setCount($newItem->getCount() - $amount);
+				$slotItem = clone $newItem;
+				$slotItem->setCount($amount);
+				$this->setItem($slotIndex, $slotItem);
+				if($newItem->getCount() <= 0){
 					break;
 				}
 			}
 		}
 
-		return $slot;
+		return $newItem;
 	}
 
 	public function remove(Item $item) : void{
-		$checkDamage = !$item->hasAnyDamageValue();
 		$checkTags = $item->hasNamedTag();
 
-		foreach($this->getContents() as $index => $i){
-			if($item->equals($i, $checkDamage, $checkTags)){
-				$this->clear($index);
+		for($i = 0, $size = $this->getSize(); $i < $size; $i++){
+			if($this->getMatchingItemCount($i, $item, $checkTags) > 0){
+				$this->clear($i);
 			}
 		}
 	}
 
 	public function removeItem(Item ...$slots) : array{
-		/** @var Item[] $itemSlots */
-		/** @var Item[] $slots */
-		$itemSlots = [];
+		$searchItems = [];
 		foreach($slots as $slot){
 			if(!$slot->isNull()){
-				$itemSlots[] = clone $slot;
+				$searchItems[] = clone $slot;
 			}
 		}
 
 		for($i = 0, $size = $this->getSize(); $i < $size; ++$i){
-			$item = $this->getItem($i);
-			if($item->isNull()){
+			if($this->isSlotEmpty($i)){
 				continue;
 			}
 
-			foreach($itemSlots as $index => $slot){
-				if($slot->equals($item, !$slot->hasAnyDamageValue(), $slot->hasNamedTag())){
-					$amount = min($item->getCount(), $slot->getCount());
-					$slot->setCount($slot->getCount() - $amount);
-					$item->setCount($item->getCount() - $amount);
-					$this->setItem($i, $item);
-					if($slot->getCount() <= 0){
-						unset($itemSlots[$index]);
+			foreach($searchItems as $index => $search){
+				$slotCount = $this->getMatchingItemCount($i, $search, $search->hasNamedTag());
+				if($slotCount > 0){
+					$amount = min($slotCount, $search->getCount());
+					$search->setCount($search->getCount() - $amount);
+
+					$slotItem = $this->getItem($i);
+					$slotItem->setCount($slotItem->getCount() - $amount);
+					$this->setItem($i, $slotItem);
+					if($search->getCount() <= 0){
+						unset($searchItems[$index]);
 					}
 				}
 			}
 
-			if(count($itemSlots) === 0){
+			if(count($searchItems) === 0){
 				break;
 			}
 		}
 
-		return $itemSlots;
+		return $searchItems;
 	}
 
 	public function clear(int $index) : void{
@@ -348,7 +375,7 @@ abstract class BaseInventory implements Inventory{
 			if($invManager === null){
 				continue;
 			}
-			$invManager->syncSlot($this, $index);
+			$invManager->onSlotChange($this, $index);
 		}
 	}
 
@@ -377,4 +404,8 @@ abstract class BaseInventory implements Inventory{
 	public function getListeners() : ObjectSet{
 		return $this->listeners;
 	}
+
+	public function getSlotValidators() : ObjectSet{
+		return $this->validators;
+	}
 }
diff --git a/src/inventory/CreativeInventory.php b/src/inventory/CreativeInventory.php
index 8037e60917..57e5cbb4e6 100644
--- a/src/inventory/CreativeInventory.php
+++ b/src/inventory/CreativeInventory.php
@@ -23,25 +23,38 @@ declare(strict_types=1);
 
 namespace pocketmine\inventory;
 
-use pocketmine\item\Durable;
+use pocketmine\crafting\CraftingManagerFromDataHelper;
+use pocketmine\crafting\json\ItemStackData;
+use pocketmine\data\bedrock\BedrockDataFiles;
 use pocketmine\item\Item;
-use pocketmine\utils\Filesystem;
+use pocketmine\utils\DestructorCallbackTrait;
+use pocketmine\utils\ObjectSet;
 use pocketmine\utils\SingletonTrait;
-use Symfony\Component\Filesystem\Path;
-use function json_decode;
+use pocketmine\utils\Utils;
 
 final class CreativeInventory{
 	use SingletonTrait;
+	use DestructorCallbackTrait;
 
-	/** @var Item[] */
+	/**
+	 * @var Item[]
+	 * @phpstan-var array<int, Item>
+	 */
 	private array $creative = [];
 
-	private function __construct(){
-		$creativeItems = json_decode(Filesystem::fileGetContents(Path::join(\pocketmine\BEDROCK_DATA_PATH, "creativeitems.json")), true);
+	/** @phpstan-var ObjectSet<\Closure() : void> */
+	private ObjectSet $contentChangedCallbacks;
 
+	private function __construct(){
+		$this->contentChangedCallbacks = new ObjectSet();
+		$creativeItems = CraftingManagerFromDataHelper::loadJsonArrayOfObjectsFile(
+			BedrockDataFiles::CREATIVEITEMS_JSON,
+			ItemStackData::class
+		);
 		foreach($creativeItems as $data){
-			$item = Item::jsonDeserialize($data);
-			if($item->getName() === "Unknown"){
+			$item = CraftingManagerFromDataHelper::deserializeItemStack($data);
+			if($item === null){
+				//unknown item
 				continue;
 			}
 			$this->add($item);
@@ -54,22 +67,24 @@ final class CreativeInventory{
 	 */
 	public function clear() : void{
 		$this->creative = [];
+		$this->onContentChange();
 	}
 
 	/**
 	 * @return Item[]
+	 * @phpstan-return array<int, Item>
 	 */
 	public function getAll() : array{
-		return $this->creative;
+		return Utils::cloneObjectArray($this->creative);
 	}
 
 	public function getItem(int $index) : ?Item{
-		return $this->creative[$index] ?? null;
+		return isset($this->creative[$index]) ? clone $this->creative[$index] : null;
 	}
 
 	public function getItemIndex(Item $item) : int{
 		foreach($this->creative as $i => $d){
-			if($item->equals($d, !($item instanceof Durable))){
+			if($item->equals($d, true, false)){
 				return $i;
 			}
 		}
@@ -83,6 +98,7 @@ final class CreativeInventory{
 	 */
 	public function add(Item $item) : void{
 		$this->creative[] = clone $item;
+		$this->onContentChange();
 	}
 
 	/**
@@ -93,10 +109,22 @@ final class CreativeInventory{
 		$index = $this->getItemIndex($item);
 		if($index !== -1){
 			unset($this->creative[$index]);
+			$this->onContentChange();
 		}
 	}
 
 	public function contains(Item $item) : bool{
 		return $this->getItemIndex($item) !== -1;
 	}
+
+	/** @phpstan-return ObjectSet<\Closure() : void> */
+	public function getContentChangedCallbacks() : ObjectSet{
+		return $this->contentChangedCallbacks;
+	}
+
+	private function onContentChange() : void{
+		foreach($this->contentChangedCallbacks as $callback){
+			$callback();
+		}
+	}
 }
diff --git a/src/inventory/DelegateInventory.php b/src/inventory/DelegateInventory.php
index 391b9599c7..a211732cf4 100644
--- a/src/inventory/DelegateInventory.php
+++ b/src/inventory/DelegateInventory.php
@@ -30,6 +30,7 @@ use pocketmine\item\Item;
  */
 class DelegateInventory extends BaseInventory{
 	private InventoryListener $inventoryListener;
+	private bool $backingInventoryChanging = false;
 
 	public function __construct(
 		private Inventory $backingInventory
@@ -39,12 +40,22 @@ class DelegateInventory extends BaseInventory{
 		$this->backingInventory->getListeners()->add($this->inventoryListener = new CallbackInventoryListener(
 			static function(Inventory $unused, int $slot, Item $oldItem) use ($weakThis) : void{
 				if(($strongThis = $weakThis->get()) !== null){
-					$strongThis->onSlotChange($slot, $oldItem);
+					$strongThis->backingInventoryChanging = true;
+					try{
+						$strongThis->onSlotChange($slot, $oldItem);
+					}finally{
+						$strongThis->backingInventoryChanging = false;
+					}
 				}
 			},
 			static function(Inventory $unused, array $oldContents) use ($weakThis) : void{
 				if(($strongThis = $weakThis->get()) !== null){
-					$strongThis->onContentChange($oldContents);
+					$strongThis->backingInventoryChanging = true;
+					try{
+						$strongThis->onContentChange($oldContents);
+					}finally{
+						$strongThis->backingInventoryChanging = false;
+					}
 				}
 			}
 		));
@@ -73,4 +84,20 @@ class DelegateInventory extends BaseInventory{
 	protected function internalSetContents(array $items) : void{
 		$this->backingInventory->setContents($items);
 	}
+
+	public function isSlotEmpty(int $index) : bool{
+		return $this->backingInventory->isSlotEmpty($index);
+	}
+
+	protected function onSlotChange(int $index, Item $before) : void{
+		if($this->backingInventoryChanging){
+			parent::onSlotChange($index, $before);
+		}
+	}
+
+	protected function onContentChange(array $itemsBefore) : void{
+		if($this->backingInventoryChanging){
+			parent::onContentChange($itemsBefore);
+		}
+	}
 }
diff --git a/src/inventory/InventoryHolder.php b/src/inventory/InventoryHolder.php
index 95732cd154..20fd14fd29 100644
--- a/src/inventory/InventoryHolder.php
+++ b/src/inventory/InventoryHolder.php
@@ -25,10 +25,5 @@ namespace pocketmine\inventory;
 
 interface InventoryHolder{
 
-	/**
-	 * Get the object related inventory
-	 *
-	 * @return Inventory
-	 */
-	public function getInventory();
+	public function getInventory() : Inventory;
 }
diff --git a/src/inventory/PlayerCursorInventory.php b/src/inventory/PlayerCursorInventory.php
index ea0d5cb599..30f9e3aec2 100644
--- a/src/inventory/PlayerCursorInventory.php
+++ b/src/inventory/PlayerCursorInventory.php
@@ -26,18 +26,13 @@ namespace pocketmine\inventory;
 use pocketmine\player\Player;
 
 class PlayerCursorInventory extends SimpleInventory implements TemporaryInventory{
-	/** @var Player */
-	protected $holder;
-
-	public function __construct(Player $holder){
-		$this->holder = $holder;
+	public function __construct(
+		protected Player $holder
+	){
 		parent::__construct(1);
 	}
 
-	/**
-	 * @return Player
-	 */
-	public function getHolder(){
+	public function getHolder() : Player{
 		return $this->holder;
 	}
 }
diff --git a/src/inventory/PlayerInventory.php b/src/inventory/PlayerInventory.php
index eb07326a09..fdaa0adff8 100644
--- a/src/inventory/PlayerInventory.php
+++ b/src/inventory/PlayerInventory.php
@@ -30,17 +30,14 @@ use pocketmine\utils\ObjectSet;
 
 class PlayerInventory extends SimpleInventory{
 
-	/** @var Human */
-	protected $holder;
-
-	/** @var int */
-	protected $itemInHandIndex = 0;
+	protected Human $holder;
+	protected int $itemInHandIndex = 0;
 
 	/**
 	 * @var \Closure[]|ObjectSet
 	 * @phpstan-var ObjectSet<\Closure(int $oldIndex) : void>
 	 */
-	protected $heldItemIndexChangeListeners;
+	protected ObjectSet $heldItemIndexChangeListeners;
 
 	public function __construct(Human $player){
 		$this->holder = $player;
@@ -123,10 +120,7 @@ class PlayerInventory extends SimpleInventory{
 		return 9;
 	}
 
-	/**
-	 * @return Human|Player
-	 */
-	public function getHolder(){
+	public function getHolder() : Human{
 		return $this->holder;
 	}
 }
diff --git a/src/inventory/SimpleInventory.php b/src/inventory/SimpleInventory.php
index aae11c84c0..4b44326fa1 100644
--- a/src/inventory/SimpleInventory.php
+++ b/src/inventory/SimpleInventory.php
@@ -83,4 +83,13 @@ class SimpleInventory extends BaseInventory{
 			}
 		}
 	}
+
+	protected function getMatchingItemCount(int $slot, Item $test, bool $checkTags) : int{
+		$slotItem = $this->slots[$slot];
+		return $slotItem !== null && $slotItem->equals($test, true, $checkTags) ? $slotItem->getCount() : 0;
+	}
+
+	public function isSlotEmpty(int $index) : bool{
+		return $this->slots[$index] === null || $this->slots[$index]->isNull();
+	}
 }
diff --git a/src/inventory/SlotValidatedInventory.php b/src/inventory/SlotValidatedInventory.php
new file mode 100644
index 0000000000..f30ebf8a01
--- /dev/null
+++ b/src/inventory/SlotValidatedInventory.php
@@ -0,0 +1,46 @@
+<?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\inventory;
+
+use pocketmine\inventory\transaction\action\validator\SlotValidator;
+use pocketmine\utils\ObjectSet;
+
+/**
+ * A "slot validated inventory" has validators which may restrict items
+ * from being placed in particular slots of the inventory when transactions are executed.
+ *
+ * @phpstan-type SlotValidators ObjectSet<SlotValidator>
+ */
+interface SlotValidatedInventory{
+	/**
+	 * Returns a set of validators that will be used to determine whether an item can be placed in a particular slot.
+	 * All validators need to return null for the transaction to be allowed.
+	 * If one of the validators returns an exception, the transaction will be cancelled.
+	 *
+	 * There is no guarantee that the validators will be called in any particular order.
+	 *
+	 * @phpstan-return SlotValidators
+	 */
+	public function getSlotValidators() : ObjectSet;
+}
diff --git a/src/inventory/transaction/CraftingTransaction.php b/src/inventory/transaction/CraftingTransaction.php
index 792984e0fb..9e3c505520 100644
--- a/src/inventory/transaction/CraftingTransaction.php
+++ b/src/inventory/transaction/CraftingTransaction.php
@@ -25,12 +25,18 @@ namespace pocketmine\inventory\transaction;
 
 use pocketmine\crafting\CraftingManager;
 use pocketmine\crafting\CraftingRecipe;
+use pocketmine\crafting\RecipeIngredient;
 use pocketmine\event\inventory\CraftItemEvent;
 use pocketmine\item\Item;
 use pocketmine\player\Player;
+use pocketmine\utils\Utils;
+use function array_fill_keys;
+use function array_keys;
 use function array_pop;
 use function count;
 use function intdiv;
+use function min;
+use function uasort;
 
 /**
  * This transaction type is specialized for crafting validation. It shares most of the same semantics of the base
@@ -48,30 +54,142 @@ use function intdiv;
  * results, with no remainder. Any leftovers are expected to be emitted back to the crafting grid.
  */
 class CraftingTransaction extends InventoryTransaction{
-	/** @var CraftingRecipe|null */
-	protected $recipe;
-	/** @var int|null */
-	protected $repetitions;
+	protected ?CraftingRecipe $recipe = null;
+	protected ?int $repetitions = null;
 
-	/** @var Item[] */
-	protected $inputs = [];
-	/** @var Item[] */
-	protected $outputs = [];
+	/**
+	 * @var Item[]
+	 * @phpstan-var list<Item>
+	 */
+	protected array $inputs = [];
+	/**
+	 * @var Item[]
+	 * @phpstan-var list<Item>
+	 */
+	protected array $outputs = [];
 
 	private CraftingManager $craftingManager;
 
-	public function __construct(Player $source, CraftingManager $craftingManager, array $actions = []){
+	public function __construct(Player $source, CraftingManager $craftingManager, array $actions = [], ?CraftingRecipe $recipe = null, ?int $repetitions = null){
 		parent::__construct($source, $actions);
 		$this->craftingManager = $craftingManager;
+		$this->recipe = $recipe;
+		$this->repetitions = $repetitions;
+	}
+
+	/**
+	 * @param Item[] $providedItems
+	 * @return Item[]
+	 *
+	 * @phpstan-param list<Item> $providedItems
+	 * @phpstan-return list<Item>
+	 */
+	private static function packItems(array $providedItems) : array{
+		$packedProvidedItems = [];
+		while(count($providedItems) > 0){
+			$item = array_pop($providedItems);
+			foreach($providedItems as $k => $otherItem){
+				if($item->canStackWith($otherItem)){
+					$item->setCount($item->getCount() + $otherItem->getCount());
+					unset($providedItems[$k]);
+				}
+			}
+			$packedProvidedItems[] = $item;
+		}
+
+		return $packedProvidedItems;
+	}
+
+	/**
+	 * @param Item[]             $providedItems
+	 * @param RecipeIngredient[] $recipeIngredients
+	 *
+	 * @phpstan-param list<Item> $providedItems
+	 * @phpstan-param list<RecipeIngredient> $recipeIngredients
+	 */
+	public static function matchIngredients(array $providedItems, array $recipeIngredients, int $expectedIterations) : void{
+		if(count($recipeIngredients) === 0){
+			throw new TransactionValidationException("No recipe ingredients given");
+		}
+		if(count($providedItems) === 0){
+			throw new TransactionValidationException("No transaction items given");
+		}
+
+		$packedProvidedItems = self::packItems(Utils::cloneObjectArray($providedItems));
+		$packedProvidedItemMatches = array_fill_keys(array_keys($packedProvidedItems), 0);
+
+		$recipeIngredientMatches = [];
+
+		foreach($recipeIngredients as $ingredientIndex => $recipeIngredient){
+			$acceptedItems = [];
+			foreach($packedProvidedItems as $itemIndex => $packedItem){
+				if($recipeIngredient->accepts($packedItem)){
+					$packedProvidedItemMatches[$itemIndex]++;
+					$acceptedItems[$itemIndex] = $itemIndex;
+				}
+			}
+
+			if(count($acceptedItems) === 0){
+				throw new TransactionValidationException("No provided items satisfy ingredient requirement $recipeIngredient");
+			}
+
+			$recipeIngredientMatches[$ingredientIndex] = $acceptedItems;
+		}
+
+		foreach($packedProvidedItemMatches as $itemIndex => $itemMatchCount){
+			if($itemMatchCount === 0){
+				$item = $packedProvidedItems[$itemIndex];
+				throw new TransactionValidationException("Provided item $item is not accepted by any recipe ingredient");
+			}
+		}
+
+		//Most picky ingredients first - avoid picky ingredient getting their items stolen by wildcard ingredients
+		//TODO: this is still insufficient when multiple wildcard ingredients have overlaps, but we don't (yet) have to
+		//worry about those.
+		uasort($recipeIngredientMatches, fn(array $a, array $b) => count($a) <=> count($b));
+
+		foreach($recipeIngredientMatches as $ingredientIndex => $acceptedItems){
+			$needed = $expectedIterations;
+
+			foreach($packedProvidedItems as $itemIndex => $item){
+				if(!isset($acceptedItems[$itemIndex])){
+					continue;
+				}
+
+				$taken = min($needed, $item->getCount());
+				$needed -= $taken;
+				$item->setCount($item->getCount() - $taken);
+
+				if($item->getCount() === 0){
+					unset($packedProvidedItems[$itemIndex]);
+				}
+
+				if($needed === 0){
+					//validation passed!
+					continue 2;
+				}
+			}
+
+			$recipeIngredient = $recipeIngredients[$ingredientIndex];
+			$actualIterations = $expectedIterations - $needed;
+			throw new TransactionValidationException("Not enough items to satisfy recipe ingredient $recipeIngredient for $expectedIterations (only have enough items for $actualIterations iterations)");
+		}
+
+		if(count($packedProvidedItems) > 0){
+			throw new TransactionValidationException("Not all provided items were used");
+		}
 	}
 
 	/**
 	 * @param Item[] $txItems
 	 * @param Item[] $recipeItems
 	 *
+	 * @phpstan-param list<Item> $txItems
+	 * @phpstan-param list<Item> $recipeItems
+	 *
 	 * @throws TransactionValidationException
 	 */
-	protected function matchRecipeItems(array $txItems, array $recipeItems, bool $wildcards, int $iterations = 0) : int{
+	protected function matchOutputs(array $txItems, array $recipeItems) : int{
 		if(count($recipeItems) === 0){
 			throw new TransactionValidationException("No recipe items given");
 		}
@@ -79,6 +197,7 @@ class CraftingTransaction extends InventoryTransaction{
 			throw new TransactionValidationException("No transaction items given");
 		}
 
+		$iterations = 0;
 		while(count($recipeItems) > 0){
 			/** @var Item $recipeItem */
 			$recipeItem = array_pop($recipeItems);
@@ -92,7 +211,7 @@ class CraftingTransaction extends InventoryTransaction{
 
 			$haveCount = 0;
 			foreach($txItems as $j => $txItem){
-				if($txItem->equals($recipeItem, !$wildcards || !$recipeItem->hasAnyDamageValue(), !$wildcards || $recipeItem->hasNamedTag())){
+				if($txItem->canStackWith($recipeItem)){
 					$haveCount += $txItem->getCount();
 					unset($txItems[$j]);
 				}
@@ -117,12 +236,24 @@ class CraftingTransaction extends InventoryTransaction{
 
 		if(count($txItems) > 0){
 			//all items should be destroyed in this process
-			throw new TransactionValidationException("Expected 0 ingredients left over, have " . count($txItems));
+			throw new TransactionValidationException("Expected 0 items left over, have " . count($txItems));
 		}
 
 		return $iterations;
 	}
 
+	private function validateRecipe(CraftingRecipe $recipe, ?int $expectedRepetitions) : int{
+		//compute number of times recipe was crafted
+		$repetitions = $this->matchOutputs($this->outputs, $recipe->getResultsFor($this->source->getCraftingGrid()));
+		if($expectedRepetitions !== null && $repetitions !== $expectedRepetitions){
+			throw new TransactionValidationException("Expected $expectedRepetitions repetitions, got $repetitions");
+		}
+		//assert that $repetitions x recipe ingredients should be consumed
+		self::matchIngredients($this->inputs, $recipe->getIngredientList(), $repetitions);
+
+		return $repetitions;
+	}
+
 	public function validate() : void{
 		$this->squashDuplicateSlotChanges();
 		if(count($this->actions) < 1){
@@ -131,25 +262,29 @@ class CraftingTransaction extends InventoryTransaction{
 
 		$this->matchItems($this->outputs, $this->inputs);
 
-		$failed = 0;
-		foreach($this->craftingManager->matchRecipeByOutputs($this->outputs) as $recipe){
-			try{
-				//compute number of times recipe was crafted
-				$this->repetitions = $this->matchRecipeItems($this->outputs, $recipe->getResultsFor($this->source->getCraftingGrid()), false);
-				//assert that $repetitions x recipe ingredients should be consumed
-				$this->matchRecipeItems($this->inputs, $recipe->getIngredientList(), true, $this->repetitions);
-
-				//Success!
-				$this->recipe = $recipe;
-				break;
-			}catch(TransactionValidationException $e){
-				//failed
-				++$failed;
-			}
-		}
-
 		if($this->recipe === null){
-			throw new TransactionValidationException("Unable to match a recipe to transaction (tried to match against $failed recipes)");
+			$failed = 0;
+			foreach($this->craftingManager->matchRecipeByOutputs($this->outputs) as $recipe){
+				try{
+					//compute number of times recipe was crafted
+					$this->repetitions = $this->matchOutputs($this->outputs, $recipe->getResultsFor($this->source->getCraftingGrid()));
+					//assert that $repetitions x recipe ingredients should be consumed
+					self::matchIngredients($this->inputs, $recipe->getIngredientList(), $this->repetitions);
+
+					//Success!
+					$this->recipe = $recipe;
+					break;
+				}catch(TransactionValidationException $e){
+					//failed
+					++$failed;
+				}
+			}
+
+			if($this->recipe === null){
+				throw new TransactionValidationException("Unable to match a recipe to transaction (tried to match against $failed recipes)");
+			}
+		}else{
+			$this->repetitions = $this->validateRecipe($this->recipe, $this->repetitions);
 		}
 	}
 
diff --git a/src/inventory/transaction/EnchantingTransaction.php b/src/inventory/transaction/EnchantingTransaction.php
new file mode 100644
index 0000000000..d00df97e21
--- /dev/null
+++ b/src/inventory/transaction/EnchantingTransaction.php
@@ -0,0 +1,134 @@
+<?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\inventory\transaction;
+
+use pocketmine\event\player\PlayerItemEnchantEvent;
+use pocketmine\item\enchantment\EnchantingHelper;
+use pocketmine\item\enchantment\EnchantingOption;
+use pocketmine\item\Item;
+use pocketmine\item\ItemTypeIds;
+use pocketmine\player\Player;
+use pocketmine\utils\AssumptionFailedError;
+use function count;
+use function min;
+
+class EnchantingTransaction extends InventoryTransaction{
+
+	private ?Item $inputItem = null;
+	private ?Item $outputItem = null;
+
+	public function __construct(
+		Player $source,
+		private readonly EnchantingOption $option,
+		private readonly int $cost
+	){
+		parent::__construct($source);
+	}
+
+	private function validateOutput() : void{
+		if($this->inputItem === null || $this->outputItem === null){
+			throw new AssumptionFailedError("Expected that inputItem and outputItem are not null before validating output");
+		}
+
+		$enchantedInput = EnchantingHelper::enchantItem($this->inputItem, $this->option->getEnchantments());
+		if(!$this->outputItem->equalsExact($enchantedInput)){
+			throw new TransactionValidationException("Invalid output item");
+		}
+	}
+
+	private function validateFiniteResources(int $lapisSpent) : void{
+		if($lapisSpent !== $this->cost){
+			throw new TransactionValidationException("Expected the amount of lapis lazuli spent to be $this->cost, but received $lapisSpent");
+		}
+
+		$xpLevel = $this->source->getXpManager()->getXpLevel();
+		$requiredXpLevel = $this->option->getRequiredXpLevel();
+
+		if($xpLevel < $requiredXpLevel){
+			throw new TransactionValidationException("Player's XP level $xpLevel is less than the required XP level $requiredXpLevel");
+		}
+		//XP level cost is intentionally not checked here, as the required level may be lower than the cost, allowing
+		//the option to be used with less XP than the cost - in this case, as much XP as possible will be deducted.
+	}
+
+	public function validate() : void{
+		if(count($this->actions) < 1){
+			throw new TransactionValidationException("Transaction must have at least one action to be executable");
+		}
+
+		/** @var Item[] $inputs */
+		$inputs = [];
+		/** @var Item[] $outputs */
+		$outputs = [];
+		$this->matchItems($outputs, $inputs);
+
+		$lapisSpent = 0;
+		foreach($inputs as $input){
+			if($input->getTypeId() === ItemTypeIds::LAPIS_LAZULI){
+				$lapisSpent = $input->getCount();
+			}else{
+				if($this->inputItem !== null){
+					throw new TransactionValidationException("Received more than 1 items to enchant");
+				}
+				$this->inputItem = $input;
+			}
+		}
+
+		if($this->inputItem === null){
+			throw new TransactionValidationException("No item to enchant received");
+		}
+
+		if(($outputCount = count($outputs)) !== 1){
+			throw new TransactionValidationException("Expected 1 output item, but received $outputCount");
+		}
+		$this->outputItem = $outputs[0];
+
+		$this->validateOutput();
+
+		if($this->source->hasFiniteResources()){
+			$this->validateFiniteResources($lapisSpent);
+		}
+	}
+
+	public function execute() : void{
+		parent::execute();
+
+		if($this->source->hasFiniteResources()){
+			//If the required XP level is less than the XP cost, the option can be selected with less XP than the cost.
+			//In this case, as much XP as possible will be taken.
+			$this->source->getXpManager()->subtractXpLevels(min($this->cost, $this->source->getXpManager()->getXpLevel()));
+		}
+		$this->source->regenerateEnchantmentSeed();
+	}
+
+	protected function callExecuteEvent() : bool{
+		if($this->inputItem === null || $this->outputItem === null){
+			throw new AssumptionFailedError("Expected that inputItem and outputItem are not null before executing the event");
+		}
+
+		$event = new PlayerItemEnchantEvent($this->source, $this, $this->option, $this->inputItem, $this->outputItem, $this->cost);
+		$event->call();
+		return !$event->isCancelled();
+	}
+}
diff --git a/src/inventory/transaction/InventoryTransaction.php b/src/inventory/transaction/InventoryTransaction.php
index 46dacb8ec0..47290e4015 100644
--- a/src/inventory/transaction/InventoryTransaction.php
+++ b/src/inventory/transaction/InventoryTransaction.php
@@ -29,6 +29,7 @@ use pocketmine\inventory\transaction\action\InventoryAction;
 use pocketmine\inventory\transaction\action\SlotChangeAction;
 use pocketmine\item\Item;
 use pocketmine\player\Player;
+use pocketmine\utils\Utils;
 use function array_keys;
 use function array_values;
 use function assert;
@@ -55,22 +56,27 @@ use function spl_object_id;
  * @see InventoryAction
  */
 class InventoryTransaction{
-	/** @var bool */
-	protected $hasExecuted = false;
-	/** @var Player */
-	protected $source;
+	protected bool $hasExecuted = false;
 
-	/** @var Inventory[] */
-	protected $inventories = [];
+	/**
+	 * @var Inventory[]
+	 * @phpstan-var array<int, Inventory>
+	 */
+	protected array $inventories = [];
 
-	/** @var InventoryAction[] */
-	protected $actions = [];
+	/**
+	 * @var InventoryAction[]
+	 * @phpstan-var array<int, InventoryAction>
+	 */
+	protected array $actions = [];
 
 	/**
 	 * @param InventoryAction[] $actions
 	 */
-	public function __construct(Player $source, array $actions = []){
-		$this->source = $source;
+	public function __construct(
+		protected Player $source,
+		array $actions = []
+	){
 		foreach($actions as $action){
 			$this->addAction($action);
 		}
@@ -82,6 +88,7 @@ class InventoryTransaction{
 
 	/**
 	 * @return Inventory[]
+	 * @phpstan-return array<int, Inventory>
 	 */
 	public function getInventories() : array{
 		return $this->inventories;
@@ -94,6 +101,7 @@ class InventoryTransaction{
 	 * significance and should not be relied on.
 	 *
 	 * @return InventoryAction[]
+	 * @phpstan-return array<int, InventoryAction>
 	 */
 	public function getActions() : array{
 		return $this->actions;
@@ -103,6 +111,9 @@ class InventoryTransaction{
 		if(!isset($this->actions[$hash = spl_object_id($action)])){
 			$this->actions[$hash] = $action;
 			$action->onAddToTransaction($this);
+			if($action instanceof SlotChangeAction && !isset($this->inventories[$inventoryId = spl_object_id($action->getInventory())])){
+				$this->inventories[$inventoryId] = $action->getInventory();
+			}
 		}else{
 			throw new \InvalidArgumentException("Tried to add the same action to a transaction twice");
 		}
@@ -121,21 +132,11 @@ class InventoryTransaction{
 		$this->actions = $actions;
 	}
 
-	/**
-	 * @internal This method should not be used by plugins, it's used to add tracked inventories for InventoryActions
-	 * involving inventories.
-	 */
-	public function addInventory(Inventory $inventory) : void{
-		if(!isset($this->inventories[$hash = spl_object_id($inventory)])){
-			$this->inventories[$hash] = $inventory;
-		}
-	}
-
 	/**
 	 * @param Item[] $needItems
 	 * @param Item[] $haveItems
-	 * @phpstan-param-out Item[] $needItems
-	 * @phpstan-param-out Item[] $haveItems
+	 * @phpstan-param-out list<Item> $needItems
+	 * @phpstan-param-out list<Item> $haveItems
 	 *
 	 * @throws TransactionValidationException
 	 */
@@ -189,11 +190,8 @@ class InventoryTransaction{
 	 * wrong order), so this method also tries to chain them into order.
 	 */
 	protected function squashDuplicateSlotChanges() : void{
-		/** @var SlotChangeAction[][] $slotChanges */
 		$slotChanges = [];
-		/** @var Inventory[] $inventories */
 		$inventories = [];
-		/** @var int[] $slots */
 		$slots = [];
 
 		foreach($this->actions as $key => $action){
@@ -204,7 +202,7 @@ class InventoryTransaction{
 			}
 		}
 
-		foreach($slotChanges as $hash => $list){
+		foreach(Utils::stringifyKeys($slotChanges) as $hash => $list){
 			if(count($list) === 1){ //No need to compact slot changes if there is only one on this slot
 				continue;
 			}
@@ -234,6 +232,7 @@ class InventoryTransaction{
 
 	/**
 	 * @param SlotChangeAction[] $possibleActions
+	 * @phpstan-param list<SlotChangeAction> $possibleActions
 	 */
 	protected function findResultItem(Item $needOrigin, array $possibleActions) : ?Item{
 		assert(count($possibleActions) > 0);
diff --git a/src/inventory/transaction/TransactionBuilderInventory.php b/src/inventory/transaction/TransactionBuilderInventory.php
index 4995284a04..95b6c4a147 100644
--- a/src/inventory/transaction/TransactionBuilderInventory.php
+++ b/src/inventory/transaction/TransactionBuilderInventory.php
@@ -50,6 +50,10 @@ final class TransactionBuilderInventory extends BaseInventory{
 		$this->changedSlots = new \SplFixedArray($this->actualInventory->getSize());
 	}
 
+	public function getActualInventory() : Inventory{
+		return $this->actualInventory;
+	}
+
 	protected function internalSetContents(array $items) : void{
 		for($i = 0, $size = $this->getSize(); $i < $size; ++$i){
 			if(!isset($items[$i])){
diff --git a/src/inventory/transaction/action/CreateItemAction.php b/src/inventory/transaction/action/CreateItemAction.php
index 99605bf963..3ebda69004 100644
--- a/src/inventory/transaction/action/CreateItemAction.php
+++ b/src/inventory/transaction/action/CreateItemAction.php
@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\inventory\transaction\action;
 
-use pocketmine\inventory\CreativeInventory;
 use pocketmine\inventory\transaction\TransactionValidationException;
 use pocketmine\item\Item;
 use pocketmine\item\VanillaItems;
@@ -43,7 +42,7 @@ class CreateItemAction extends InventoryAction{
 		if($source->hasFiniteResources()){
 			throw new TransactionValidationException("Player has finite resources, cannot create items");
 		}
-		if(!CreativeInventory::getInstance()->contains($this->sourceItem)){
+		if(!$source->getCreativeInventory()->contains($this->sourceItem)){
 			throw new TransactionValidationException("Creative inventory does not contain requested item");
 		}
 	}
diff --git a/src/inventory/transaction/action/InventoryAction.php b/src/inventory/transaction/action/InventoryAction.php
index 31b0c5b7f4..2f0db083c9 100644
--- a/src/inventory/transaction/action/InventoryAction.php
+++ b/src/inventory/transaction/action/InventoryAction.php
@@ -32,15 +32,10 @@ use pocketmine\player\Player;
  * Represents an action involving a change that applies in some way to an inventory or other item-source.
  */
 abstract class InventoryAction{
-	/** @var Item */
-	protected $sourceItem;
-	/** @var Item */
-	protected $targetItem;
-
-	public function __construct(Item $sourceItem, Item $targetItem){
-		$this->sourceItem = $sourceItem;
-		$this->targetItem = $targetItem;
-	}
+	public function __construct(
+		protected Item $sourceItem,
+		protected Item $targetItem
+	){}
 
 	/**
 	 * Returns the item that was present before the action took place.
@@ -65,6 +60,7 @@ abstract class InventoryAction{
 
 	/**
 	 * Called when the action is added to the specified InventoryTransaction.
+	 * @deprecated
 	 */
 	public function onAddToTransaction(InventoryTransaction $transaction) : void{
 
diff --git a/src/inventory/transaction/action/SlotChangeAction.php b/src/inventory/transaction/action/SlotChangeAction.php
index d4130e592b..3c9b8e5cf7 100644
--- a/src/inventory/transaction/action/SlotChangeAction.php
+++ b/src/inventory/transaction/action/SlotChangeAction.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\inventory\transaction\action;
 
 use pocketmine\inventory\Inventory;
-use pocketmine\inventory\transaction\InventoryTransaction;
+use pocketmine\inventory\SlotValidatedInventory;
 use pocketmine\inventory\transaction\TransactionValidationException;
 use pocketmine\item\Item;
 use pocketmine\player\Player;
@@ -33,15 +33,13 @@ use pocketmine\player\Player;
  * Represents an action causing a change in an inventory slot.
  */
 class SlotChangeAction extends InventoryAction{
-
-	/** @var Inventory */
-	protected $inventory;
-	private int $inventorySlot;
-
-	public function __construct(Inventory $inventory, int $inventorySlot, Item $sourceItem, Item $targetItem){
+	public function __construct(
+		protected Inventory $inventory,
+		private int $inventorySlot,
+		Item $sourceItem,
+		Item $targetItem
+	){
 		parent::__construct($sourceItem, $targetItem);
-		$this->inventory = $inventory;
-		$this->inventorySlot = $inventorySlot;
 	}
 
 	/**
@@ -76,13 +74,14 @@ class SlotChangeAction extends InventoryAction{
 		if($this->targetItem->getCount() > $this->inventory->getMaxStackSize()){
 			throw new TransactionValidationException("Target item exceeds inventory max stack size");
 		}
-	}
-
-	/**
-	 * Adds this action's target inventory to the transaction's inventory list.
-	 */
-	public function onAddToTransaction(InventoryTransaction $transaction) : void{
-		$transaction->addInventory($this->inventory);
+		if($this->inventory instanceof SlotValidatedInventory && !$this->targetItem->isNull()){
+			foreach($this->inventory->getSlotValidators() as $validator){
+				$ret = $validator->validate($this->inventory, $this->targetItem, $this->inventorySlot);
+				if($ret !== null){
+					throw new TransactionValidationException("Target item is not accepted by the inventory at slot #" . $this->inventorySlot . ": " . $ret->getMessage(), 0, $ret);
+				}
+			}
+		}
 	}
 
 	/**
diff --git a/src/inventory/transaction/action/validator/CallbackSlotValidator.php b/src/inventory/transaction/action/validator/CallbackSlotValidator.php
new file mode 100644
index 0000000000..1670dc6232
--- /dev/null
+++ b/src/inventory/transaction/action/validator/CallbackSlotValidator.php
@@ -0,0 +1,44 @@
+<?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\inventory\transaction\action\validator;
+
+use pocketmine\inventory\Inventory;
+use pocketmine\inventory\transaction\TransactionValidationException;
+use pocketmine\item\Item;
+use pocketmine\utils\Utils;
+
+class CallbackSlotValidator implements SlotValidator{
+	/**
+	 * @phpstan-param \Closure(Inventory, Item, int) : ?TransactionValidationException $validate
+	 */
+	public function __construct(
+		private \Closure $validate
+	){
+		Utils::validateCallableSignature(function(Inventory $inventory, Item $item, int $slot) : ?TransactionValidationException{ return null; }, $validate);
+	}
+
+	public function validate(Inventory $inventory, Item $item, int $slot) : ?TransactionValidationException{
+		return ($this->validate)($inventory, $item, $slot);
+	}
+}
diff --git a/src/inventory/transaction/action/validator/SlotValidator.php b/src/inventory/transaction/action/validator/SlotValidator.php
new file mode 100644
index 0000000000..1b78c91f7f
--- /dev/null
+++ b/src/inventory/transaction/action/validator/SlotValidator.php
@@ -0,0 +1,38 @@
+<?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\inventory\transaction\action\validator;
+
+use pocketmine\inventory\Inventory;
+use pocketmine\inventory\transaction\TransactionValidationException;
+use pocketmine\item\Item;
+
+/**
+ * Validates a slot placement in an inventory.
+ */
+interface SlotValidator{
+	/**
+	 * Returns null if the slot placement is valid, or a TransactionValidationException if it is not.
+	 */
+	public function validate(Inventory $inventory, Item $item, int $slot) : ?TransactionValidationException;
+}
diff --git a/src/item/Armor.php b/src/item/Armor.php
index 25374c6a00..63a8003adc 100644
--- a/src/item/Armor.php
+++ b/src/item/Armor.php
@@ -33,7 +33,7 @@ use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
 use pocketmine\player\Player;
 use pocketmine\utils\Binary;
-use function lcg_value;
+use pocketmine\utils\Utils;
 use function mt_rand;
 
 class Armor extends Durable{
@@ -42,11 +42,13 @@ class Armor extends Durable{
 
 	private ArmorTypeInfo $armorInfo;
 
-	/** @var Color|null */
-	protected $customColor = null;
+	protected ?Color $customColor = null;
 
-	public function __construct(ItemIdentifier $identifier, string $name, ArmorTypeInfo $info){
-		parent::__construct($identifier, $name);
+	/**
+	 * @param string[] $enchantmentTags
+	 */
+	public function __construct(ItemIdentifier $identifier, string $name, ArmorTypeInfo $info, array $enchantmentTags = []){
+		parent::__construct($identifier, $name, $enchantmentTags);
 		$this->armorInfo = $info;
 	}
 
@@ -69,6 +71,18 @@ class Armor extends Durable{
 		return 1;
 	}
 
+	public function isFireProof() : bool{
+		return $this->armorInfo->isFireProof();
+	}
+
+	public function getMaterial() : ArmorMaterial{
+		return $this->armorInfo->getMaterial();
+	}
+
+	public function getEnchantability() : int{
+		return $this->armorInfo->getMaterial()->getEnchantability();
+	}
+
 	/**
 	 * Returns the dyed colour of this armour piece. This generally only applies to leather armour.
 	 */
@@ -115,7 +129,7 @@ class Armor extends Durable{
 
 			$chance = 1 / ($unbreakingLevel + 1);
 			for($i = 0; $i < $amount; ++$i){
-				if(mt_rand(1, 100) > 60 && lcg_value() > $chance){ //unbreaking only applies to armor 40% of the time at best
+				if(mt_rand(1, 100) > 60 && Utils::getRandomFloat() > $chance){ //unbreaking only applies to armor 40% of the time at best
 					$negated++;
 				}
 			}
@@ -126,18 +140,21 @@ class Armor extends Durable{
 		return 0;
 	}
 
-	public function onClickAir(Player $player, Vector3 $directionVector) : ItemUseResult{
+	public function onClickAir(Player $player, Vector3 $directionVector, array &$returnedItems) : ItemUseResult{
 		$existing = $player->getArmorInventory()->getItem($this->getArmorSlot());
 		$thisCopy = clone $this;
 		$new = $thisCopy->pop();
 		$player->getArmorInventory()->setItem($this->getArmorSlot(), $new);
-		if($thisCopy->getCount() === 0){
-			$player->getInventory()->setItemInHand($existing);
-		}else{ //if the stack size was bigger than 1 (usually won't happen, but might be caused by plugins
-			$player->getInventory()->setItemInHand($thisCopy);
-			$player->getInventory()->addItem($existing);
+		$player->getInventory()->setItemInHand($existing);
+		$sound = $new->getMaterial()->getEquipSound();
+		if($sound !== null){
+			$player->broadcastSound($sound);
 		}
-		return ItemUseResult::SUCCESS();
+		if(!$thisCopy->isNull()){
+			//if the stack size was bigger than 1 (usually won't happen, but might be caused by plugins)
+			$returnedItems[] = $thisCopy;
+		}
+		return ItemUseResult::SUCCESS;
 	}
 
 	protected function deserializeCompoundTag(CompoundTag $tag) : void{
diff --git a/src/item/ArmorMaterial.php b/src/item/ArmorMaterial.php
new file mode 100644
index 0000000000..d0ea33feb4
--- /dev/null
+++ b/src/item/ArmorMaterial.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\item;
+
+use pocketmine\world\sound\Sound;
+
+class ArmorMaterial{
+
+	public function __construct(
+		private readonly int $enchantability,
+		private readonly ?Sound $equipSound = null
+	){
+	}
+
+	/**
+	 * Returns the value that defines how enchantable the item is.
+	 *
+	 * The higher an item's enchantability is, the more likely it will be to gain high-level enchantments
+	 * or multiple enchantments upon being enchanted in an enchanting table.
+	 */
+	public function getEnchantability() : int{
+		return $this->enchantability;
+	}
+
+	/**
+	 * Returns the sound that plays when equipping the armor
+	 */
+	public function getEquipSound() : ?Sound{
+		return $this->equipSound;
+	}
+}
diff --git a/src/item/ArmorTypeInfo.php b/src/item/ArmorTypeInfo.php
index c6b25bd6aa..dbb4ed06df 100644
--- a/src/item/ArmorTypeInfo.php
+++ b/src/item/ArmorTypeInfo.php
@@ -24,11 +24,18 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 class ArmorTypeInfo{
+	private ArmorMaterial $material;
+
 	public function __construct(
 		private int $defensePoints,
 		private int $maxDurability,
-		private int $armorSlot
-	){}
+		private int $armorSlot,
+		private int $toughness = 0,
+		private bool $fireProof = false,
+		?ArmorMaterial $material = null
+	){
+		$this->material = $material ?? VanillaArmorMaterials::LEATHER();
+	}
 
 	public function getDefensePoints() : int{
 		return $this->defensePoints;
@@ -41,4 +48,16 @@ class ArmorTypeInfo{
 	public function getArmorSlot() : int{
 		return $this->armorSlot;
 	}
+
+	public function getToughness() : int{
+		return $this->toughness;
+	}
+
+	public function isFireProof() : bool{
+		return $this->fireProof;
+	}
+
+	public function getMaterial() : ArmorMaterial{
+		return $this->material;
+	}
 }
diff --git a/src/item/Axe.php b/src/item/Axe.php
index 40b8b67362..57b378311d 100644
--- a/src/item/Axe.php
+++ b/src/item/Axe.php
@@ -41,14 +41,14 @@ class Axe extends TieredTool{
 		return $this->tier->getBaseAttackPoints() - 1;
 	}
 
-	public function onDestroyBlock(Block $block) : bool{
+	public function onDestroyBlock(Block $block, array &$returnedItems) : bool{
 		if(!$block->getBreakInfo()->breaksInstantly()){
 			return $this->applyDamage(1);
 		}
 		return false;
 	}
 
-	public function onAttackEntity(Entity $victim) : bool{
+	public function onAttackEntity(Entity $victim, array &$returnedItems) : bool{
 		return $this->applyDamage(2);
 	}
 }
diff --git a/src/item/Banner.php b/src/item/Banner.php
index 92bf7729dc..2fc53f5ae6 100644
--- a/src/item/Banner.php
+++ b/src/item/Banner.php
@@ -23,12 +23,12 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-use pocketmine\block\Block;
 use pocketmine\block\tile\Banner as TileBanner;
 use pocketmine\block\utils\BannerPatternLayer;
 use pocketmine\block\utils\DyeColor;
 use pocketmine\data\bedrock\BannerPatternTypeIdMap;
 use pocketmine\data\bedrock\DyeColorIdMap;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\ListTag;
@@ -39,7 +39,7 @@ class Banner extends ItemBlockWallOrFloor{
 	public const TAG_PATTERN_COLOR = TileBanner::TAG_PATTERN_COLOR;
 	public const TAG_PATTERN_NAME = TileBanner::TAG_PATTERN_NAME;
 
-	private DyeColor $color;
+	private DyeColor $color = DyeColor::BLACK;
 
 	/**
 	 * @var BannerPatternLayer[]
@@ -47,11 +47,6 @@ class Banner extends ItemBlockWallOrFloor{
 	 */
 	private array $patterns = [];
 
-	public function __construct(ItemIdentifier $identifier, Block $floorVariant, Block $wallVariant){
-		parent::__construct($identifier, $floorVariant, $wallVariant);
-		$this->color = DyeColor::BLACK();
-	}
-
 	public function getColor() : DyeColor{
 		return $this->color;
 	}
@@ -62,8 +57,8 @@ class Banner extends ItemBlockWallOrFloor{
 		return $this;
 	}
 
-	public function getMeta() : int{
-		return DyeColorIdMap::getInstance()->toInvertedId($this->color);
+	protected function describeState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->color);
 	}
 
 	/**
@@ -101,7 +96,7 @@ class Banner extends ItemBlockWallOrFloor{
 		if($patterns !== null && $patterns->getTagType() === NBT::TAG_Compound){
 			/** @var CompoundTag $t */
 			foreach($patterns as $t){
-				$patternColor = $colorIdMap->fromInvertedId($t->getInt(self::TAG_PATTERN_COLOR)) ?? DyeColor::BLACK(); //TODO: missing pattern colour should be an error
+				$patternColor = $colorIdMap->fromInvertedId($t->getInt(self::TAG_PATTERN_COLOR)) ?? DyeColor::BLACK; //TODO: missing pattern colour should be an error
 				$patternType = $patternIdMap->fromId($t->getString(self::TAG_PATTERN_NAME));
 				if($patternType === null){
 					continue; //TODO: this should be an error
diff --git a/src/item/Boat.php b/src/item/Boat.php
index 1a78b03018..8fd3ea6507 100644
--- a/src/item/Boat.php
+++ b/src/item/Boat.php
@@ -23,18 +23,16 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-use pocketmine\block\utils\TreeType;
-
 class Boat extends Item{
-	private TreeType $woodType;
+	private BoatType $boatType;
 
-	public function __construct(ItemIdentifier $identifier, string $name, TreeType $woodType){
+	public function __construct(ItemIdentifier $identifier, string $name, BoatType $boatType){
 		parent::__construct($identifier, $name);
-		$this->woodType = $woodType;
+		$this->boatType = $boatType;
 	}
 
-	public function getWoodType() : TreeType{
-		return $this->woodType;
+	public function getType() : BoatType{
+		return $this->boatType;
 	}
 
 	public function getFuelTime() : int{
diff --git a/src/item/BoatType.php b/src/item/BoatType.php
new file mode 100644
index 0000000000..518a1324e7
--- /dev/null
+++ b/src/item/BoatType.php
@@ -0,0 +1,67 @@
+<?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\item;
+
+use pocketmine\block\utils\WoodType;
+use pocketmine\utils\LegacyEnumShimTrait;
+
+/**
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
+ *
+ * @method static BoatType ACACIA()
+ * @method static BoatType BIRCH()
+ * @method static BoatType DARK_OAK()
+ * @method static BoatType JUNGLE()
+ * @method static BoatType MANGROVE()
+ * @method static BoatType OAK()
+ * @method static BoatType SPRUCE()
+ */
+enum BoatType{
+	use LegacyEnumShimTrait;
+
+	case OAK;
+	case SPRUCE;
+	case BIRCH;
+	case JUNGLE;
+	case ACACIA;
+	case DARK_OAK;
+	case MANGROVE;
+
+	public function getWoodType() : WoodType{
+		return match($this){
+			self::OAK => WoodType::OAK,
+			self::SPRUCE => WoodType::SPRUCE,
+			self::BIRCH => WoodType::BIRCH,
+			self::JUNGLE => WoodType::JUNGLE,
+			self::ACACIA => WoodType::ACACIA,
+			self::DARK_OAK => WoodType::DARK_OAK,
+			self::MANGROVE => WoodType::MANGROVE,
+		};
+	}
+
+	public function getDisplayName() : string{
+		return $this->getWoodType()->getDisplayName();
+	}
+}
diff --git a/src/item/Bow.php b/src/item/Bow.php
index 460b844c65..1b25312a8e 100644
--- a/src/item/Bow.php
+++ b/src/item/Bow.php
@@ -44,7 +44,7 @@ class Bow extends Tool implements Releasable{
 		return 385;
 	}
 
-	public function onReleaseUsing(Player $player) : ItemUseResult{
+	public function onReleaseUsing(Player $player, array &$returnedItems) : ItemUseResult{
 		$arrow = VanillaItems::ARROW();
 		$inventory = match(true){
 			$player->getOffHandInventory()->contains($arrow) => $player->getOffHandInventory(),
@@ -53,7 +53,7 @@ class Bow extends Tool implements Releasable{
 		};
 
 		if($player->hasFiniteResources() && $inventory === null){
-			return ItemUseResult::FAIL();
+			return ItemUseResult::FAIL;
 		}
 
 		$location = $player->getLocation();
@@ -95,7 +95,7 @@ class Bow extends Tool implements Releasable{
 
 		if($ev->isCancelled()){
 			$entity->flagForDespawn();
-			return ItemUseResult::FAIL();
+			return ItemUseResult::FAIL;
 		}
 
 		$entity->setMotion($entity->getMotion()->multiply($ev->getForce()));
@@ -105,7 +105,7 @@ class Bow extends Tool implements Releasable{
 			$projectileEv->call();
 			if($projectileEv->isCancelled()){
 				$ev->getProjectile()->flagForDespawn();
-				return ItemUseResult::FAIL();
+				return ItemUseResult::FAIL;
 			}
 
 			$ev->getProjectile()->spawnToAll();
@@ -121,7 +121,7 @@ class Bow extends Tool implements Releasable{
 			$this->applyDamage(1);
 		}
 
-		return ItemUseResult::SUCCESS();
+		return ItemUseResult::SUCCESS;
 	}
 
 	public function canStartUsingItem(Player $player) : bool{
diff --git a/src/item/Bowl.php b/src/item/Bowl.php
index d83044307d..217346df54 100644
--- a/src/item/Bowl.php
+++ b/src/item/Bowl.php
@@ -25,5 +25,7 @@ namespace pocketmine\item;
 
 class Bowl extends Item{
 
-	//TODO: check fuel
+	public function getFuelTime() : int{
+		return 200;
+	}
 }
diff --git a/src/item/Bucket.php b/src/item/Bucket.php
index 39ca6d2aab..ee69a0a8a5 100644
--- a/src/item/Bucket.php
+++ b/src/item/Bucket.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 use pocketmine\block\Block;
+use pocketmine\block\BlockTypeIds;
 use pocketmine\block\Liquid;
 use pocketmine\block\VanillaBlocks;
 use pocketmine\event\player\PlayerBucketFillEvent;
@@ -36,34 +37,35 @@ class Bucket extends Item{
 		return 16;
 	}
 
-	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{
+	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, array &$returnedItems) : ItemUseResult{
 		//TODO: move this to generic placement logic
 		if($blockClicked instanceof Liquid && $blockClicked->isSource()){
 			$stack = clone $this;
 			$stack->pop();
 
-			$resultItem = ItemFactory::getInstance()->get(ItemIds::BUCKET, $blockClicked->getFlowingForm()->getId());
+			$resultItem = match($blockClicked->getTypeId()){
+				BlockTypeIds::LAVA => VanillaItems::LAVA_BUCKET(),
+				BlockTypeIds::WATER => VanillaItems::WATER_BUCKET(),
+				default => null
+			};
+			if($resultItem === null){
+				return ItemUseResult::FAIL;
+			}
+
 			$ev = new PlayerBucketFillEvent($player, $blockReplace, $face, $this, $resultItem);
 			$ev->call();
 			if(!$ev->isCancelled()){
 				$player->getWorld()->setBlock($blockClicked->getPosition(), VanillaBlocks::AIR());
 				$player->getWorld()->addSound($blockClicked->getPosition()->add(0.5, 0.5, 0.5), $blockClicked->getBucketFillSound());
-				if($player->hasFiniteResources()){
-					if($stack->getCount() === 0){
-						$player->getInventory()->setItemInHand($ev->getItem());
-					}else{
-						$player->getInventory()->setItemInHand($stack);
-						$player->getInventory()->addItem($ev->getItem());
-					}
-				}else{
-					$player->getInventory()->addItem($ev->getItem());
-				}
-				return ItemUseResult::SUCCESS();
+
+				$this->pop();
+				$returnedItems[] = $ev->getItem();
+				return ItemUseResult::SUCCESS;
 			}
 
-			return ItemUseResult::FAIL();
+			return ItemUseResult::FAIL;
 		}
 
-		return ItemUseResult::NONE();
+		return ItemUseResult::NONE;
 	}
 }
diff --git a/src/item/ChorusFruit.php b/src/item/ChorusFruit.php
index 80f99d5d81..e10c519576 100644
--- a/src/item/ChorusFruit.php
+++ b/src/item/ChorusFruit.php
@@ -56,15 +56,17 @@ class ChorusFruit extends Food{
 		$maxY = $minY + 16;
 		$maxZ = $minZ + 16;
 
+		$worldMinY = $world->getMinY();
+
 		for($attempts = 0; $attempts < 16; ++$attempts){
 			$x = mt_rand($minX, $maxX);
 			$y = mt_rand($minY, $maxY);
 			$z = mt_rand($minZ, $maxZ);
 
-			while($y >= 0 && !$world->getBlockAt($x, $y, $z)->isSolid()){
+			while($y >= $worldMinY && !$world->getBlockAt($x, $y, $z)->isSolid()){
 				$y--;
 			}
-			if($y < 0){
+			if($y < $worldMinY){
 				continue;
 			}
 
@@ -86,4 +88,8 @@ class ChorusFruit extends Food{
 	public function getCooldownTicks() : int{
 		return 20;
 	}
+
+	public function getCooldownTag() : ?string{
+		return ItemCooldownTags::CHORUS_FRUIT;
+	}
 }
diff --git a/src/item/CoralFan.php b/src/item/CoralFan.php
new file mode 100644
index 0000000000..7fdfc9114b
--- /dev/null
+++ b/src/item/CoralFan.php
@@ -0,0 +1,62 @@
+<?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\item;
+
+use pocketmine\block\Block;
+use pocketmine\block\utils\CoralTypeTrait;
+use pocketmine\block\VanillaBlocks;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\math\Axis;
+use pocketmine\math\Facing;
+
+final class CoralFan extends Item{
+	use CoralTypeTrait {
+		describeBlockItemState as encodeCoralType;
+	}
+
+	public function __construct(ItemIdentifier $identifier){
+		parent::__construct($identifier, VanillaBlocks::CORAL_FAN()->getName());
+	}
+
+	protected function describeState(RuntimeDataDescriber $w) : void{
+		//this is aliased to ensure a compile error in case the functions in Item or Block start to differ in future
+		//right now we can directly reuse encodeType from CoralTypeTrait, but that might silently stop working if Item
+		//were to be altered. CoralTypeTrait was originally intended for blocks, so it's better not to assume anything.
+		$this->encodeCoralType($w);
+	}
+
+	public function getBlock(?int $clickedFace = null) : Block{
+		$block = $clickedFace !== null && Facing::axis($clickedFace) !== Axis::Y ? VanillaBlocks::WALL_CORAL_FAN() : VanillaBlocks::CORAL_FAN();
+
+		return $block->setCoralType($this->coralType)->setDead($this->dead);
+	}
+
+	public function getFuelTime() : int{
+		return $this->getBlock()->getFuelTime();
+	}
+
+	public function getMaxStackSize() : int{
+		return $this->getBlock()->getMaxStackSize();
+	}
+}
diff --git a/src/item/Durable.php b/src/item/Durable.php
index 887fbb4fdf..069a01202e 100644
--- a/src/item/Durable.php
+++ b/src/item/Durable.php
@@ -25,19 +25,13 @@ namespace pocketmine\item;
 
 use pocketmine\item\enchantment\VanillaEnchantments;
 use pocketmine\nbt\tag\CompoundTag;
-use function lcg_value;
+use pocketmine\utils\Utils;
 use function min;
 
 abstract class Durable extends Item{
-
-	/** @var int */
-	protected $damage = 0;
+	protected int $damage = 0;
 	private bool $unbreakable = false;
 
-	public function getMeta() : int{
-		return $this->damage;
-	}
-
 	/**
 	 * Returns whether this item will take damage when used.
 	 */
@@ -93,7 +87,7 @@ abstract class Durable extends Item{
 
 			$chance = 1 / ($unbreakingLevel + 1);
 			for($i = 0; $i < $amount; ++$i){
-				if(lcg_value() > $chance){
+				if(Utils::getRandomFloat() > $chance){
 					$negated++;
 				}
 			}
@@ -127,10 +121,17 @@ abstract class Durable extends Item{
 	protected function deserializeCompoundTag(CompoundTag $tag) : void{
 		parent::deserializeCompoundTag($tag);
 		$this->unbreakable = $tag->getByte("Unbreakable", 0) !== 0;
+
+		$damage = $tag->getInt("Damage", $this->damage);
+		if($damage !== $this->damage && $damage >= 0 && $damage <= $this->getMaxDurability()){
+			//TODO: out-of-bounds damage should be an error
+			$this->setDamage($damage);
+		}
 	}
 
 	protected function serializeCompoundTag(CompoundTag $tag) : void{
 		parent::serializeCompoundTag($tag);
 		$this->unbreakable ? $tag->setByte("Unbreakable", 1) : $tag->removeTag("Unbreakable");
+		$this->damage !== 0 ? $tag->setInt("Damage", $this->damage) : $tag->removeTag("Damage");
 	}
 }
diff --git a/src/item/Dye.php b/src/item/Dye.php
index 5ef8667161..9fdfb96710 100644
--- a/src/item/Dye.php
+++ b/src/item/Dye.php
@@ -24,16 +24,24 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 use pocketmine\block\utils\DyeColor;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 
 class Dye extends Item{
-	private DyeColor $color;
+	private DyeColor $color = DyeColor::BLACK;
 
-	public function __construct(ItemIdentifier $identifier, string $name, DyeColor $color){
-		parent::__construct($identifier, $name);
-		$this->color = $color;
+	protected function describeState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->color);
 	}
 
 	public function getColor() : DyeColor{
 		return $this->color;
 	}
+
+	/**
+	 * @return $this
+	 */
+	public function setColor(DyeColor $color) : self{
+		$this->color = $color;
+		return $this;
+	}
 }
diff --git a/src/item/EnchantedBook.php b/src/item/EnchantedBook.php
new file mode 100644
index 0000000000..5660de6f60
--- /dev/null
+++ b/src/item/EnchantedBook.php
@@ -0,0 +1,30 @@
+<?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\item;
+
+class EnchantedBook extends Item{
+	public function getMaxStackSize() : int{
+		return 1;
+	}
+}
diff --git a/src/item/EndCrystal.php b/src/item/EndCrystal.php
new file mode 100644
index 0000000000..320d657e6d
--- /dev/null
+++ b/src/item/EndCrystal.php
@@ -0,0 +1,59 @@
+<?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\item;
+
+use pocketmine\block\Block;
+use pocketmine\block\BlockTypeIds;
+use pocketmine\entity\Location;
+use pocketmine\entity\object\EndCrystal as EntityEndCrystal;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use function count;
+
+class EndCrystal extends Item{
+
+	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, array &$returnedItems) : ItemUseResult{
+		if($blockClicked->getTypeId() === BlockTypeIds::OBSIDIAN || $blockClicked->getTypeId() === BlockTypeIds::BEDROCK){
+			$pos = $blockClicked->getPosition();
+			$world = $pos->getWorld();
+			$bb = AxisAlignedBB::one()
+				->offset($pos->getX(), $pos->getY(), $pos->getZ())
+				->extend(Facing::UP, 1);
+			if(
+				count($world->getNearbyEntities($bb)) === 0 &&
+				$blockClicked->getSide(Facing::UP)->getTypeId() === BlockTypeIds::AIR &&
+				$blockClicked->getSide(Facing::UP, 2)->getTypeId() === BlockTypeIds::AIR
+			){
+				$crystal = new EntityEndCrystal(Location::fromObject($pos->add(0.5, 1, 0.5), $world));
+				$crystal->spawnToAll();
+
+				$this->pop();
+				return ItemUseResult::SUCCESS;
+			}
+		}
+		return ItemUseResult::NONE;
+	}
+}
diff --git a/src/item/EnderPearl.php b/src/item/EnderPearl.php
index 76bcb358ea..7109d3ae06 100644
--- a/src/item/EnderPearl.php
+++ b/src/item/EnderPearl.php
@@ -45,4 +45,8 @@ class EnderPearl extends ProjectileItem{
 	public function getCooldownTicks() : int{
 		return 20;
 	}
+
+	public function getCooldownTag() : ?string{
+		return ItemCooldownTags::ENDER_PEARL;
+	}
 }
diff --git a/src/item/Skull.php b/src/item/FireCharge.php
similarity index 55%
rename from src/item/Skull.php
rename to src/item/FireCharge.php
index 92205e228d..a612e0897d 100644
--- a/src/item/Skull.php
+++ b/src/item/FireCharge.php
@@ -24,24 +24,25 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 use pocketmine\block\Block;
-use pocketmine\block\utils\SkullType;
+use pocketmine\block\BlockTypeIds;
 use pocketmine\block\VanillaBlocks;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\sound\BlazeShootSound;
 
-class Skull extends Item{
-	private SkullType $skullType;
+class FireCharge extends Item{
 
-	public function __construct(ItemIdentifier $identifier, string $name, SkullType $skullType){
-		parent::__construct($identifier, $name);
-		$this->skullType = $skullType;
-	}
+	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, array &$returnedItems) : ItemUseResult{
+		if($blockReplace->getTypeId() === BlockTypeIds::AIR){
+			$world = $player->getWorld();
+			$world->setBlock($blockReplace->getPosition(), VanillaBlocks::FIRE());
+			$world->addSound($blockReplace->getPosition()->add(0.5, 0.5, 0.5), new BlazeShootSound());
 
-	public function getBlock(?int $clickedFace = null) : Block{
-		//TODO: we ought to be able to represent this as a regular ItemBlock
-		//but that's not currently possible because the skulltype isn't part of the internal block runtimeID
-		return VanillaBlocks::MOB_HEAD()->setSkullType($this->skullType);
-	}
+			$this->pop();
 
-	public function getSkullType() : SkullType{
-		return $this->skullType;
+			return ItemUseResult::SUCCESS;
+		}
+
+		return ItemUseResult::NONE;
 	}
 }
diff --git a/src/item/FlintSteel.php b/src/item/FlintSteel.php
index f3d8c20ef8..3e694eb0db 100644
--- a/src/item/FlintSteel.php
+++ b/src/item/FlintSteel.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockLegacyIds;
+use pocketmine\block\BlockTypeIds;
 use pocketmine\block\VanillaBlocks;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
@@ -32,18 +32,18 @@ use pocketmine\world\sound\FlintSteelSound;
 
 class FlintSteel extends Tool{
 
-	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{
-		if($blockReplace->getId() === BlockLegacyIds::AIR){
+	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, array &$returnedItems) : ItemUseResult{
+		if($blockReplace->getTypeId() === BlockTypeIds::AIR){
 			$world = $player->getWorld();
 			$world->setBlock($blockReplace->getPosition(), VanillaBlocks::FIRE());
 			$world->addSound($blockReplace->getPosition()->add(0.5, 0.5, 0.5), new FlintSteelSound());
 
 			$this->applyDamage(1);
 
-			return ItemUseResult::SUCCESS();
+			return ItemUseResult::SUCCESS;
 		}
 
-		return ItemUseResult::NONE();
+		return ItemUseResult::NONE;
 	}
 
 	public function getMaxDurability() : int{
diff --git a/src/item/GlassBottle.php b/src/item/GlassBottle.php
index ca59fd2b37..c638b109f7 100644
--- a/src/item/GlassBottle.php
+++ b/src/item/GlassBottle.php
@@ -23,6 +23,21 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
+use pocketmine\block\Block;
+use pocketmine\block\BlockTypeIds;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+
 class GlassBottle extends Item{
 
+	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, array &$returnedItems) : ItemUseResult{
+		if($blockClicked->getTypeId() === BlockTypeIds::WATER){
+			$this->pop();
+			$returnedItems[] = VanillaItems::POTION()->setType(PotionType::WATER);
+
+			return ItemUseResult::SUCCESS;
+		}
+
+		return ItemUseResult::NONE;
+	}
 }
diff --git a/src/item/Bed.php b/src/item/GlowBerries.php
similarity index 68%
rename from src/item/Bed.php
rename to src/item/GlowBerries.php
index b0a14d366e..e959b7b9e0 100644
--- a/src/item/Bed.php
+++ b/src/item/GlowBerries.php
@@ -24,26 +24,19 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 use pocketmine\block\Block;
-use pocketmine\block\utils\DyeColor;
 use pocketmine\block\VanillaBlocks;
 
-class Bed extends Item{
-	private DyeColor $color;
+class GlowBerries extends Food{
 
-	public function __construct(ItemIdentifier $identifier, string $name, DyeColor $color){
-		parent::__construct($identifier, $name);
-		$this->color = $color;
+	public function getFoodRestore() : int{
+		return 2;
 	}
 
-	public function getColor() : DyeColor{
-		return $this->color;
+	public function getSaturationRestore() : float{
+		return 0.4;
 	}
 
 	public function getBlock(?int $clickedFace = null) : Block{
-		return VanillaBlocks::BED()->setColor($this->color);
-	}
-
-	public function getMaxStackSize() : int{
-		return 1;
+		return VanillaBlocks::CAVE_VINES();
 	}
 }
diff --git a/src/item/GoatHorn.php b/src/item/GoatHorn.php
new file mode 100644
index 0000000000..088701e398
--- /dev/null
+++ b/src/item/GoatHorn.php
@@ -0,0 +1,71 @@
+<?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\item;
+
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\sound\GoatHornSound;
+
+class GoatHorn extends Item implements Releasable{
+
+	private GoatHornType $goatHornType = GoatHornType::PONDER;
+
+	protected function describeState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->goatHornType);
+	}
+
+	public function getHornType() : GoatHornType{ return $this->goatHornType; }
+
+	/**
+	 * @return $this
+	 */
+	public function setHornType(GoatHornType $type) : self{
+		$this->goatHornType = $type;
+		return $this;
+	}
+
+	public function getMaxStackSize() : int{
+		return 1;
+	}
+
+	public function getCooldownTicks() : int{
+		return 140;
+	}
+
+	public function getCooldownTag() : ?string{
+		return ItemCooldownTags::GOAT_HORN;
+	}
+
+	public function canStartUsingItem(Player $player) : bool{
+		return true;
+	}
+
+	public function onClickAir(Player $player, Vector3 $directionVector, array &$returnedItems) : ItemUseResult{
+		$position = $player->getPosition();
+		$position->getWorld()->addSound($position, new GoatHornSound($this->goatHornType));
+
+		return ItemUseResult::SUCCESS;
+	}
+}
diff --git a/src/item/GoatHornType.php b/src/item/GoatHornType.php
new file mode 100644
index 0000000000..6c0c3b2f7f
--- /dev/null
+++ b/src/item/GoatHornType.php
@@ -0,0 +1,36 @@
+<?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\item;
+
+enum GoatHornType{
+
+	case PONDER;
+	case SING;
+	case SEEK;
+	case FEEL;
+	case ADMIRE;
+	case CALL;
+	case YEARN;
+	case DREAM;
+}
diff --git a/src/item/GoldenAppleEnchanted.php b/src/item/GoldenAppleEnchanted.php
index 5b68f5f21c..28e43a7a47 100644
--- a/src/item/GoldenAppleEnchanted.php
+++ b/src/item/GoldenAppleEnchanted.php
@@ -30,7 +30,7 @@ class GoldenAppleEnchanted extends GoldenApple{
 
 	public function getAdditionalEffects() : array{
 		return [
-			new EffectInstance(VanillaEffects::REGENERATION(), 600, 4),
+			new EffectInstance(VanillaEffects::REGENERATION(), 600, 1),
 			new EffectInstance(VanillaEffects::ABSORPTION(), 2400, 3),
 			new EffectInstance(VanillaEffects::RESISTANCE(), 6000),
 			new EffectInstance(VanillaEffects::FIRE_RESISTANCE(), 6000)
diff --git a/src/item/Hoe.php b/src/item/Hoe.php
index 8fd1bbad63..1f2c2efaed 100644
--- a/src/item/Hoe.php
+++ b/src/item/Hoe.php
@@ -33,11 +33,11 @@ class Hoe extends TieredTool{
 		return BlockToolType::HOE;
 	}
 
-	public function onAttackEntity(Entity $victim) : bool{
+	public function onAttackEntity(Entity $victim, array &$returnedItems) : bool{
 		return $this->applyDamage(1);
 	}
 
-	public function onDestroyBlock(Block $block) : bool{
+	public function onDestroyBlock(Block $block, array &$returnedItems) : bool{
 		if(!$block->getBreakInfo()->breaksInstantly()){
 			return $this->applyDamage(1);
 		}
diff --git a/src/item/HoneyBottle.php b/src/item/HoneyBottle.php
new file mode 100644
index 0000000000..a9f563b46f
--- /dev/null
+++ b/src/item/HoneyBottle.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\item;
+
+use pocketmine\entity\effect\VanillaEffects;
+use pocketmine\entity\Living;
+
+final class HoneyBottle extends Food{
+
+	public function getMaxStackSize() : int{
+		return 16;
+	}
+
+	public function requiresHunger() : bool{
+		return false;
+	}
+
+	public function getFoodRestore() : int{
+		return 6;
+	}
+
+	public function getSaturationRestore() : float{
+		return 1.2;
+	}
+
+	public function getResidue() : Item{
+		return VanillaItems::GLASS_BOTTLE();
+	}
+
+	public function onConsume(Living $consumer) : void{
+		$consumer->getEffects()->remove(VanillaEffects::POISON());
+	}
+}
diff --git a/src/item/IceBomb.php b/src/item/IceBomb.php
new file mode 100644
index 0000000000..fbc9f24a2f
--- /dev/null
+++ b/src/item/IceBomb.php
@@ -0,0 +1,48 @@
+<?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\item;
+
+use pocketmine\entity\Location;
+use pocketmine\entity\projectile\IceBomb as IceBombEntity;
+use pocketmine\entity\projectile\Throwable;
+use pocketmine\player\Player;
+
+class IceBomb extends ProjectileItem{
+
+	public function getMaxStackSize() : int{
+		return 16;
+	}
+
+	protected function createEntity(Location $location, Player $thrower) : Throwable{
+		return new IceBombEntity($location, $thrower);
+	}
+
+	public function getThrowForce() : float{
+		return 1.5;
+	}
+
+	public function getCooldownTicks() : int{
+		return 10;
+	}
+}
diff --git a/src/item/Item.php b/src/item/Item.php
index 785a38ca0f..205f15e130 100644
--- a/src/item/Item.php
+++ b/src/item/Item.php
@@ -31,29 +31,31 @@ use pocketmine\block\BlockBreakInfo;
 use pocketmine\block\BlockToolType;
 use pocketmine\block\VanillaBlocks;
 use pocketmine\data\bedrock\EnchantmentIdMap;
+use pocketmine\data\bedrock\item\ItemTypeDeserializeException;
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\data\runtime\RuntimeDataWriter;
 use pocketmine\data\SavedDataLoadingException;
 use pocketmine\entity\Entity;
+use pocketmine\entity\Living;
 use pocketmine\item\enchantment\EnchantmentInstance;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\LittleEndianNbtSerializer;
 use pocketmine\nbt\NBT;
-use pocketmine\nbt\NbtDataException;
 use pocketmine\nbt\NbtException;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\ListTag;
-use pocketmine\nbt\tag\ShortTag;
 use pocketmine\nbt\tag\StringTag;
 use pocketmine\nbt\TreeRoot;
 use pocketmine\player\Player;
-use pocketmine\utils\Binary;
 use pocketmine\utils\Utils;
+use pocketmine\world\format\io\GlobalItemDataHandlers;
 use function base64_decode;
 use function base64_encode;
 use function count;
-use function get_class;
 use function gettype;
 use function hex2bin;
 use function is_string;
+use function morton2d_encode;
 
 class Item implements \JsonSerializable{
 	use ItemEnchantmentHandlingTrait;
@@ -70,46 +72,31 @@ class Item implements \JsonSerializable{
 
 	public const TAG_KEEP_ON_DEATH = "minecraft:keep_on_death";
 
-	private const TAG_ID = "id"; //TAG_Short
-	private const TAG_COUNT = "Count"; //TAG_Byte
-	private const TAG_DAMAGE = "Damage"; //TAG_Short
-	private const TAG_TAG = "tag"; //TAG_Compound
-
-	public const TAG_SLOT = "Slot"; //TAG_Byte
-
 	private const TAG_CAN_PLACE_ON = "CanPlaceOn"; //TAG_List<TAG_String>
 	private const TAG_CAN_DESTROY = "CanDestroy"; //TAG_List<TAG_String>
 
-	private ItemIdentifier $identifier;
 	private CompoundTag $nbt;
 
-	/** @var int */
-	protected $count = 1;
-	/** @var string */
-	protected $name;
+	protected int $count = 1;
 
 	//TODO: this stuff should be moved to itemstack properties, not mushed in with type properties
 
-	/** @var string */
-	protected $customName = "";
+	protected string $customName = "";
 	/** @var string[] */
-	protected $lore = [];
-	/**
-	 * TODO: this needs to die in a fire
-	 * @var CompoundTag|null
-	 */
-	protected $blockEntityTag = null;
+	protected array $lore = [];
+	/** TODO: this needs to die in a fire */
+	protected ?CompoundTag $blockEntityTag = null;
 
 	/**
 	 * @var string[]
 	 * @phpstan-var array<string, string>
 	 */
-	protected $canPlaceOn = [];
+	protected array $canPlaceOn = [];
 	/**
 	 * @var string[]
 	 * @phpstan-var array<string, string>
 	 */
-	protected $canDestroy;
+	protected array $canDestroy = [];
 
 	protected bool $keepOnDeath = false;
 
@@ -120,13 +107,14 @@ class Item implements \JsonSerializable{
 	 * NOTE: This should NOT BE USED for creating items to set into an inventory. Use VanillaItems for that
 	 * purpose.
 	 * @see VanillaItems
+	 *
+	 * @param string[] $enchantmentTags
 	 */
-	public function __construct(ItemIdentifier $identifier, string $name = "Unknown"){
-		$this->identifier = $identifier;
-		$this->name = $name;
-
-		$this->canPlaceOn = [];
-		$this->canDestroy = [];
+	public function __construct(
+		private ItemIdentifier $identifier,
+		protected string $name = "Unknown",
+		private array $enchantmentTags = []
+	){
 		$this->nbt = new CompoundTag();
 	}
 
@@ -353,30 +341,35 @@ class Item implements \JsonSerializable{
 	}
 
 	protected function serializeCompoundTag(CompoundTag $tag) : void{
-		$display = $tag->getCompoundTag(self::TAG_DISPLAY) ?? new CompoundTag();
+		$display = $tag->getCompoundTag(self::TAG_DISPLAY);
 
-		$this->hasCustomName() ?
-			$display->setString(self::TAG_DISPLAY_NAME, $this->getCustomName()) :
-			$display->removeTag(self::TAG_DISPLAY_NAME);
+		if($this->customName !== ""){
+			$display ??= new CompoundTag();
+			$display->setString(self::TAG_DISPLAY_NAME, $this->customName);
+		}else{
+			$display?->removeTag(self::TAG_DISPLAY_NAME);
+		}
 
 		if(count($this->lore) > 0){
 			$loreTag = new ListTag();
 			foreach($this->lore as $line){
 				$loreTag->push(new StringTag($line));
 			}
+			$display ??= new CompoundTag();
 			$display->setTag(self::TAG_DISPLAY_LORE, $loreTag);
 		}else{
-			$display->removeTag(self::TAG_DISPLAY_LORE);
+			$display?->removeTag(self::TAG_DISPLAY_LORE);
 		}
-		$display->count() > 0 ?
+		$display !== null && $display->count() > 0 ?
 			$tag->setTag(self::TAG_DISPLAY, $display) :
 			$tag->removeTag(self::TAG_DISPLAY);
 
-		if($this->hasEnchantments()){
+		if(count($this->enchantments) > 0){
 			$ench = new ListTag();
-			foreach($this->getEnchantments() as $enchantmentInstance){
+			$enchantmentIdMap = EnchantmentIdMap::getInstance();
+			foreach($this->enchantments as $enchantmentInstance){
 				$ench->push(CompoundTag::create()
-					->setShort(self::TAG_ENCH_ID, EnchantmentIdMap::getInstance()->toId($enchantmentInstance->getType()))
+					->setShort(self::TAG_ENCH_ID, $enchantmentIdMap->toId($enchantmentInstance->getType()))
 					->setShort(self::TAG_ENCH_LVL, $enchantmentInstance->getLevel())
 				);
 			}
@@ -385,8 +378,8 @@ class Item implements \JsonSerializable{
 			$tag->removeTag(self::TAG_ENCH);
 		}
 
-		($blockData = $this->getCustomBlockData()) !== null ?
-			$tag->setTag(self::TAG_BLOCK_ENTITY_TAG, clone $blockData) :
+		$this->blockEntityTag !== null ?
+			$tag->setTag(self::TAG_BLOCK_ENTITY_TAG, clone $this->blockEntityTag) :
 			$tag->removeTag(self::TAG_BLOCK_ENTITY_TAG);
 
 		if(count($this->canPlaceOn) > 0){
@@ -448,7 +441,7 @@ class Item implements \JsonSerializable{
 	}
 
 	public function isNull() : bool{
-		return $this->count <= 0 || $this->getId() === ItemIds::AIR;
+		return $this->count <= 0;
 	}
 
 	/**
@@ -465,6 +458,29 @@ class Item implements \JsonSerializable{
 		return $this->name;
 	}
 
+	/**
+	 * Returns tags that represent the type of item being enchanted and are used to determine
+	 * what enchantments can be applied to this item during in-game enchanting (enchanting table, anvil, fishing, etc.).
+	 * @see ItemEnchantmentTags
+	 * @see ItemEnchantmentTagRegistry
+	 * @see AvailableEnchantmentRegistry
+	 *
+	 * @return string[]
+	 */
+	public function getEnchantmentTags() : array{
+		return $this->enchantmentTags;
+	}
+
+	/**
+	 * Returns the value that defines how enchantable the item is.
+	 *
+	 * The higher an item's enchantability is, the more likely it will be to gain high-level enchantments
+	 * or multiple enchantments upon being enchanted in an enchanting table.
+	 */
+	public function getEnchantability() : int{
+		return 1;
+	}
+
 	final public function canBePlaced() : bool{
 		return $this->getBlock()->canBePlaced();
 	}
@@ -476,20 +492,26 @@ class Item implements \JsonSerializable{
 		return VanillaBlocks::AIR();
 	}
 
-	final public function getId() : int{
-		return $this->identifier->getId();
+	final public function getTypeId() : int{
+		return $this->identifier->getTypeId();
 	}
 
-	public function getMeta() : int{
-		return $this->identifier->getMeta();
+	final public function getStateId() : int{
+		return morton2d_encode($this->identifier->getTypeId(), $this->computeStateData());
+	}
+
+	private function computeStateData() : int{
+		$writer = new RuntimeDataWriter(16); //TODO: max bits should be a constant instead of being hardcoded all over the place
+		$this->describeState($writer);
+		return $writer->getValue();
 	}
 
 	/**
-	 * Returns whether this item can match any item with an equivalent ID with any meta value.
-	 * Used in crafting recipes which accept multiple variants of the same item, for example crafting tables recipes.
+	 * Describes state properties of the item, such as colour, skull type, etc.
+	 * This allows associating basic extra data with the item at runtime in a more efficient format than NBT.
 	 */
-	public function hasAnyDamageValue() : bool{
-		return $this->identifier->getMeta() === -1;
+	protected function describeState(RuntimeDataDescriber $w) : void{
+		//NOOP
 	}
 
 	/**
@@ -516,6 +538,13 @@ class Item implements \JsonSerializable{
 		return $item;
 	}
 
+	/**
+	 * Returns whether this item can survive being dropped into lava, or fire.
+	 */
+	public function isFireProof() : bool{
+		return false;
+	}
+
 	/**
 	 * Returns how many points of damage this item will deal to an entity when used as a weapon.
 	 */
@@ -555,38 +584,56 @@ class Item implements \JsonSerializable{
 
 	/**
 	 * Called when a player uses this item on a block.
+	 *
+	 * @param Item[] &$returnedItems Items to be added to the target's inventory (or dropped, if the inventory is full)
 	 */
-	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{
-		return ItemUseResult::NONE();
+	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, array &$returnedItems) : ItemUseResult{
+		return ItemUseResult::NONE;
 	}
 
 	/**
 	 * Called when a player uses the item on air, for example throwing a projectile.
 	 * Returns whether the item was changed, for example count decrease or durability change.
+	 *
+	 * @param Item[] &$returnedItems Items to be added to the target's inventory (or dropped, if the inventory is full)
 	 */
-	public function onClickAir(Player $player, Vector3 $directionVector) : ItemUseResult{
-		return ItemUseResult::NONE();
+	public function onClickAir(Player $player, Vector3 $directionVector, array &$returnedItems) : ItemUseResult{
+		return ItemUseResult::NONE;
 	}
 
 	/**
 	 * Called when a player is using this item and releases it. Used to handle bow shoot actions.
 	 * Returns whether the item was changed, for example count decrease or durability change.
+	 *
+	 * @param Item[] &$returnedItems Items to be added to the target's inventory (or dropped, if the inventory is full)
 	 */
-	public function onReleaseUsing(Player $player) : ItemUseResult{
-		return ItemUseResult::NONE();
+	public function onReleaseUsing(Player $player, array &$returnedItems) : ItemUseResult{
+		return ItemUseResult::NONE;
 	}
 
 	/**
 	 * Called when this item is used to destroy a block. Usually used to update durability.
+	 *
+	 * @param Item[] &$returnedItems Items to be added to the target's inventory (or dropped, if the inventory is full)
 	 */
-	public function onDestroyBlock(Block $block) : bool{
+	public function onDestroyBlock(Block $block, array &$returnedItems) : bool{
 		return false;
 	}
 
 	/**
 	 * Called when this item is used to attack an entity. Usually used to update durability.
+	 *
+	 * @param Item[] &$returnedItems Items to be added to the target's inventory (or dropped, if the inventory is full)
 	 */
-	public function onAttackEntity(Entity $victim) : bool{
+	public function onAttackEntity(Entity $victim, array &$returnedItems) : bool{
+		return false;
+	}
+
+	/**
+	 * Called when this item is being worn by an entity.
+	 * Returns whether it did something.
+	 */
+	public function onTickWorn(Living $entity) : bool{
 		return false;
 	}
 
@@ -607,15 +654,28 @@ class Item implements \JsonSerializable{
 		return 0;
 	}
 
+	/**
+	 * Returns a tag that identifies a group of items that should have cooldown at the same time
+	 * regardless of their state or type.
+	 * When cooldown starts, any other items with the same cooldown tag can't be used until the cooldown expires.
+	 * Such behaviour can be seen in goat horns and shields.
+	 *
+	 * If tag is null, item state id will be used to store cooldown.
+	 *
+	 * @see ItemCooldownTags
+	 */
+	public function getCooldownTag() : ?string{
+		return null;
+	}
+
 	/**
 	 * Compares an Item to this Item and check if they match.
 	 *
-	 * @param bool $checkDamage   Whether to verify that the damage values match.
+	 * @param bool $checkDamage   @deprecated
 	 * @param bool $checkCompound Whether to verify that the items' NBT match.
 	 */
 	final public function equals(Item $item, bool $checkDamage = true, bool $checkCompound = true) : bool{
-		return $this->getId() === $item->getId() &&
-			(!$checkDamage || $this->getMeta() === $item->getMeta()) &&
+		return $this->getStateId() === $item->getStateId() &&
 			(!$checkCompound || $this->getNamedTag()->equals($item->getNamedTag()));
 	}
 
@@ -630,55 +690,29 @@ class Item implements \JsonSerializable{
 	 * Returns whether the specified item stack has the same ID, damage, NBT and count as this item stack.
 	 */
 	final public function equalsExact(Item $other) : bool{
-		return $this->equals($other, true, true) && $this->count === $other->count;
+		return $this->canStackWith($other) && $this->count === $other->count;
 	}
 
 	final public function __toString() : string{
-		return "Item " . $this->name . " (" . $this->getId() . ":" . ($this->hasAnyDamageValue() ? "?" : $this->getMeta()) . ")x" . $this->count . ($this->hasNamedTag() ? " tags:0x" . base64_encode((new LittleEndianNbtSerializer())->write(new TreeRoot($this->getNamedTag()))) : "");
+		return "Item " . $this->name . " (" . $this->getTypeId() . ":" . $this->computeStateData() . ")x" . $this->count . ($this->hasNamedTag() ? " tags:0x" . base64_encode((new LittleEndianNbtSerializer())->write(new TreeRoot($this->getNamedTag()))) : "");
 	}
 
 	/**
-	 * Returns an array of item stack properties that can be serialized to json.
-	 *
-	 * @return mixed[]
-	 * @phpstan-return array{id: int, damage?: int, count?: int, nbt_b64?: string}
+	 * @phpstan-return never
 	 */
-	final public function jsonSerialize() : array{
-		$data = [
-			"id" => $this->getId()
-		];
-
-		if($this->getMeta() !== 0){
-			$data["damage"] = $this->getMeta();
-		}
-
-		if($this->getCount() !== 1){
-			$data["count"] = $this->getCount();
-		}
-
-		if($this->hasNamedTag()){
-			$data["nbt_b64"] = base64_encode((new LittleEndianNbtSerializer())->write(new TreeRoot($this->getNamedTag())));
-		}
-
-		return $data;
+	public function jsonSerialize() : array{
+		throw new \LogicException("json_encode()ing Item instances is no longer supported. Make your own method to convert the item to an array or stdClass.");
 	}
 
 	/**
-	 * Returns an Item from properties created in an array by {@link Item#jsonSerialize}
+	 * Deserializes item JSON data produced by json_encode()ing Item instances in older versions of PocketMine-MP.
+	 * This method exists solely to allow upgrading old JSON data stored by plugins.
+	 *
 	 * @param mixed[] $data
-	 * @phpstan-param array{
-	 * 	id: int,
-	 * 	damage?: int,
-	 * 	count?: int,
-	 * 	nbt?: string,
-	 * 	nbt_hex?: string,
-	 * 	nbt_b64?: string
-	 * } $data
 	 *
-	 * @throws NbtDataException
-	 * @throws \InvalidArgumentException
+	 * @throws SavedDataLoadingException
 	 */
-	final public static function jsonDeserialize(array $data) : Item{
+	final public static function legacyJsonDeserialize(array $data) : Item{
 		$nbt = "";
 
 		//Backwards compatibility
@@ -689,9 +723,19 @@ class Item implements \JsonSerializable{
 		}elseif(isset($data["nbt_b64"])){
 			$nbt = base64_decode($data["nbt_b64"], true);
 		}
-		return ItemFactory::getInstance()->get(
-			(int) $data["id"], (int) ($data["damage"] ?? 0), (int) ($data["count"] ?? 1), $nbt !== "" ? (new LittleEndianNbtSerializer())->read($nbt)->mustGetCompoundTag() : null
+
+		$itemStackData = GlobalItemDataHandlers::getUpgrader()->upgradeItemTypeDataInt(
+			(int) $data["id"],
+			(int) ($data["damage"] ?? 0),
+			(int) ($data["count"] ?? 1),
+			$nbt !== "" ? (new LittleEndianNbtSerializer())->read($nbt)->mustGetCompoundTag() : null
 		);
+
+		try{
+			return GlobalItemDataHandlers::getDeserializer()->deserializeStack($itemStackData);
+		}catch(ItemTypeDeserializeException $e){
+			throw new SavedDataLoadingException($e->getMessage(), 0, $e);
+		}
 	}
 
 	/**
@@ -700,57 +744,24 @@ class Item implements \JsonSerializable{
 	 * @param int $slot optional, the inventory slot of the item
 	 */
 	public function nbtSerialize(int $slot = -1) : CompoundTag{
-		$result = CompoundTag::create()
-			->setShort(self::TAG_ID, $this->getId())
-			->setByte(self::TAG_COUNT, Binary::signByte($this->count))
-			->setShort(self::TAG_DAMAGE, $this->getMeta());
-
-		$tag = $this->getNamedTag();
-		if($tag->count() > 0){
-			$result->setTag(self::TAG_TAG, $tag);
-		}
-
-		if($slot !== -1){
-			$result->setByte(self::TAG_SLOT, $slot);
-		}
-
-		return $result;
+		return GlobalItemDataHandlers::getSerializer()->serializeStack($this, $slot !== -1 ? $slot : null)->toNbt();
 	}
 
 	/**
 	 * Deserializes an Item from an NBT CompoundTag
-	 * @throws NbtException
 	 * @throws SavedDataLoadingException
 	 */
 	public static function nbtDeserialize(CompoundTag $tag) : Item{
-		if($tag->getTag(self::TAG_ID) === null || $tag->getTag(self::TAG_COUNT) === null){
+		$itemData = GlobalItemDataHandlers::getUpgrader()->upgradeItemStackNbt($tag);
+		if($itemData === null){
 			return VanillaItems::AIR();
 		}
 
-		$count = Binary::unsignByte($tag->getByte(self::TAG_COUNT));
-		$meta = $tag->getShort(self::TAG_DAMAGE, 0);
-
-		$idTag = $tag->getTag(self::TAG_ID);
-		if($idTag instanceof ShortTag){
-			$item = ItemFactory::getInstance()->get($idTag->getValue(), $meta, $count);
-		}elseif($idTag instanceof StringTag){ //PC item save format
-			try{
-				$item = LegacyStringToItemParser::getInstance()->parse($idTag->getValue() . ":$meta");
-			}catch(LegacyStringToItemParserException $e){
-				//TODO: improve error handling
-				return VanillaItems::AIR();
-			}
-			$item->setCount($count);
-		}else{
-			throw new SavedDataLoadingException("Item CompoundTag ID must be an instance of StringTag or ShortTag, " . get_class($idTag) . " given");
+		try{
+			return GlobalItemDataHandlers::getDeserializer()->deserializeStack($itemData);
+		}catch(ItemTypeDeserializeException $e){
+			throw new SavedDataLoadingException($e->getMessage(), 0, $e);
 		}
-
-		$itemNBT = $tag->getCompoundTag(self::TAG_TAG);
-		if($itemNBT !== null){
-			$item->setNamedTag(clone $itemNBT);
-		}
-
-		return $item;
 	}
 
 	public function __clone(){
diff --git a/src/item/ItemBlock.php b/src/item/ItemBlock.php
index f0d68c0e3b..015c784714 100644
--- a/src/item/ItemBlock.php
+++ b/src/item/ItemBlock.php
@@ -24,28 +24,47 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
+use pocketmine\block\BlockTypeIds;
+use pocketmine\data\runtime\RuntimeDataDescriber;
 
 /**
- * Class used for Items that can be Blocks
+ * Class used for Items that directly represent blocks, such as stone, dirt, wood etc.
+ *
+ * This should NOT be used for items which are merely *associated* with blocks (e.g. seeds are not wheat crops; they
+ * just place wheat crops when used on the ground).
  */
-class ItemBlock extends Item{
-	private int $blockFullId;
+final class ItemBlock extends Item{
+	public function __construct(
+		private Block $block
+	){
+		parent::__construct(ItemIdentifier::fromBlock($block), $block->getName(), $block->getEnchantmentTags());
+	}
 
-	public function __construct(ItemIdentifier $identifier, Block $block){
-		parent::__construct($identifier, $block->getName());
-		$this->blockFullId = $block->getFullId();
+	protected function describeState(RuntimeDataDescriber $w) : void{
+		$this->block->describeBlockItemState($w);
 	}
 
 	public function getBlock(?int $clickedFace = null) : Block{
-		return BlockFactory::getInstance()->fromFullBlock($this->blockFullId);
+		return clone $this->block;
 	}
 
 	public function getFuelTime() : int{
-		return $this->getBlock()->getFuelTime();
+		return $this->block->getFuelTime();
+	}
+
+	public function isFireProof() : bool{
+		return $this->block->isFireProofAsItem();
 	}
 
 	public function getMaxStackSize() : int{
-		return $this->getBlock()->getMaxStackSize();
+		return $this->block->getMaxStackSize();
+	}
+
+	public function isNull() : bool{
+		//TODO: we really shouldn't need to treat air as a special case here
+		//this is needed because the "null" empty slot item is represented by an air block, but there's no real reason
+		//why air should be needed at all. A separate special item type (or actual null) should be used instead, but
+		//this would cause a lot of BC breaks, so we can't do it yet.
+		return parent::isNull() || $this->block->getTypeId() === BlockTypeIds::AIR;
 	}
 }
diff --git a/src/item/ItemBlockWallOrFloor.php b/src/item/ItemBlockWallOrFloor.php
index 4151d1d2f9..c20c73a1d0 100644
--- a/src/item/ItemBlockWallOrFloor.php
+++ b/src/item/ItemBlockWallOrFloor.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
+use pocketmine\block\RuntimeBlockStateRegistry;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
 
@@ -34,15 +34,15 @@ class ItemBlockWallOrFloor extends Item{
 
 	public function __construct(ItemIdentifier $identifier, Block $floorVariant, Block $wallVariant){
 		parent::__construct($identifier, $floorVariant->getName());
-		$this->floorVariant = $floorVariant->getFullId();
-		$this->wallVariant = $wallVariant->getFullId();
+		$this->floorVariant = $floorVariant->getStateId();
+		$this->wallVariant = $wallVariant->getStateId();
 	}
 
 	public function getBlock(?int $clickedFace = null) : Block{
 		if($clickedFace !== null && Facing::axis($clickedFace) !== Axis::Y){
-			return BlockFactory::getInstance()->fromFullBlock($this->wallVariant);
+			return RuntimeBlockStateRegistry::getInstance()->fromStateId($this->wallVariant);
 		}
-		return BlockFactory::getInstance()->fromFullBlock($this->floorVariant);
+		return RuntimeBlockStateRegistry::getInstance()->fromStateId($this->floorVariant);
 	}
 
 	public function getFuelTime() : int{
diff --git a/src/item/ItemCooldownTags.php b/src/item/ItemCooldownTags.php
new file mode 100644
index 0000000000..f0ef6d1699
--- /dev/null
+++ b/src/item/ItemCooldownTags.php
@@ -0,0 +1,45 @@
+<?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\item;
+
+/**
+ * Tags used by items to determine their cooldown group.
+ *
+ * These tag values are not related to Minecraft internal IDs.
+ * They only share a visual similarity because these are the most obvious values to use.
+ * Any arbitrary string can be used.
+ *
+ * @see Item::getCooldownTag()
+ */
+final class ItemCooldownTags{
+
+	private function __construct(){
+		//NOOP
+	}
+
+	public const CHORUS_FRUIT = "chorus_fruit";
+	public const ENDER_PEARL = "ender_pearl";
+	public const SHIELD = "shield";
+	public const GOAT_HORN = "goat_horn";
+}
diff --git a/src/item/ItemEnchantmentHandlingTrait.php b/src/item/ItemEnchantmentHandlingTrait.php
index 2a27432a22..10da7dd760 100644
--- a/src/item/ItemEnchantmentHandlingTrait.php
+++ b/src/item/ItemEnchantmentHandlingTrait.php
@@ -33,8 +33,11 @@ use function spl_object_id;
  * The primary purpose of this trait is providing scope isolation for the methods it contains.
  */
 trait ItemEnchantmentHandlingTrait{
-	/** @var EnchantmentInstance[] */
-	protected $enchantments = [];
+	/**
+	 * @var EnchantmentInstance[]
+	 * @phpstan-var array<int, EnchantmentInstance>
+	 */
+	protected array $enchantments = [];
 
 	public function hasEnchantments() : bool{
 		return count($this->enchantments) > 0;
@@ -79,6 +82,7 @@ trait ItemEnchantmentHandlingTrait{
 
 	/**
 	 * @return EnchantmentInstance[]
+	 * @phpstan-return array<int, EnchantmentInstance>
 	 */
 	public function getEnchantments() : array{
 		return $this->enchantments;
diff --git a/src/item/ItemFactory.php b/src/item/ItemFactory.php
deleted file mode 100644
index 4a949f843e..0000000000
--- a/src/item/ItemFactory.php
+++ /dev/null
@@ -1,531 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\item;
-
-use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
-use pocketmine\block\utils\CoralType;
-use pocketmine\block\utils\DyeColor;
-use pocketmine\block\utils\RecordType;
-use pocketmine\block\utils\SkullType;
-use pocketmine\block\utils\TreeType;
-use pocketmine\block\VanillaBlocks as Blocks;
-use pocketmine\data\bedrock\CompoundTypeIds;
-use pocketmine\data\bedrock\DyeColorIdMap;
-use pocketmine\data\bedrock\EntityLegacyIds;
-use pocketmine\data\bedrock\PotionTypeIdMap;
-use pocketmine\entity\Entity;
-use pocketmine\entity\Location;
-use pocketmine\entity\Squid;
-use pocketmine\entity\Villager;
-use pocketmine\entity\Zombie;
-use pocketmine\inventory\ArmorInventory;
-use pocketmine\item\ItemIdentifier as IID;
-use pocketmine\item\ItemIds as Ids;
-use pocketmine\math\Vector3;
-use pocketmine\nbt\NbtException;
-use pocketmine\nbt\tag\CompoundTag;
-use pocketmine\utils\SingletonTrait;
-use pocketmine\world\World;
-
-/**
- * Manages deserializing item types from their legacy ID/metadata.
- * This is primarily needed for loading inventories saved in the world (or playerdata storage).
- */
-class ItemFactory{
-	use SingletonTrait;
-
-	/** @var Item[] */
-	private array $list = [];
-
-	public function __construct(){
-		$this->registerArmorItems();
-		$this->registerSpawnEggs();
-		$this->registerTierToolItems();
-
-		$this->register(new Apple(new IID(Ids::APPLE, 0), "Apple"));
-		$this->register(new Arrow(new IID(Ids::ARROW, 0), "Arrow"));
-
-		$this->register(new BakedPotato(new IID(Ids::BAKED_POTATO, 0), "Baked Potato"));
-		$this->register(new Bamboo(new IID(Ids::BAMBOO, 0), "Bamboo"), true);
-		$this->register(new Beetroot(new IID(Ids::BEETROOT, 0), "Beetroot"));
-		$this->register(new BeetrootSeeds(new IID(Ids::BEETROOT_SEEDS, 0), "Beetroot Seeds"));
-		$this->register(new BeetrootSoup(new IID(Ids::BEETROOT_SOUP, 0), "Beetroot Soup"));
-		$this->register(new BlazeRod(new IID(Ids::BLAZE_ROD, 0), "Blaze Rod"));
-		$this->register(new Book(new IID(Ids::BOOK, 0), "Book"));
-		$this->register(new Bow(new IID(Ids::BOW, 0), "Bow"));
-		$this->register(new Bowl(new IID(Ids::BOWL, 0), "Bowl"));
-		$this->register(new Bread(new IID(Ids::BREAD, 0), "Bread"));
-		$this->register(new Bucket(new IID(Ids::BUCKET, 0), "Bucket"));
-		$this->register(new Carrot(new IID(Ids::CARROT, 0), "Carrot"));
-		$this->register(new ChorusFruit(new IID(Ids::CHORUS_FRUIT, 0), "Chorus Fruit"));
-		$this->register(new Clock(new IID(Ids::CLOCK, 0), "Clock"));
-		$this->register(new Clownfish(new IID(Ids::CLOWNFISH, 0), "Clownfish"));
-		$this->register(new Coal(new IID(Ids::COAL, 0), "Coal"));
-
-		foreach([
-			0 => CoralType::TUBE(),
-			1 => CoralType::BRAIN(),
-			2 => CoralType::BUBBLE(),
-			3 => CoralType::FIRE(),
-			4 => CoralType::HORN()
-		] as $meta => $coralType){
-			$this->register(new ItemBlockWallOrFloor(
-				new IID(Ids::CORAL_FAN, $meta),
-				Blocks::CORAL_FAN()->setCoralType($coralType)->setDead(false),
-				Blocks::WALL_CORAL_FAN()->setCoralType($coralType)->setDead(false)
-			), true);
-			$this->register(new ItemBlockWallOrFloor(
-				new IID(Ids::CORAL_FAN_DEAD, $meta),
-				Blocks::CORAL_FAN()->setCoralType($coralType)->setDead(true),
-				Blocks::WALL_CORAL_FAN()->setCoralType($coralType)->setDead(true)
-			), true);
-		}
-
-		$this->register(new Coal(new IID(Ids::COAL, 1), "Charcoal"));
-		$this->register(new CocoaBeans(new IID(Ids::DYE, 3), "Cocoa Beans"));
-		$this->register(new Compass(new IID(Ids::COMPASS, 0), "Compass"));
-		$this->register(new CookedChicken(new IID(Ids::COOKED_CHICKEN, 0), "Cooked Chicken"));
-		$this->register(new CookedFish(new IID(Ids::COOKED_FISH, 0), "Cooked Fish"));
-		$this->register(new CookedMutton(new IID(Ids::COOKED_MUTTON, 0), "Cooked Mutton"));
-		$this->register(new CookedPorkchop(new IID(Ids::COOKED_PORKCHOP, 0), "Cooked Porkchop"));
-		$this->register(new CookedRabbit(new IID(Ids::COOKED_RABBIT, 0), "Cooked Rabbit"));
-		$this->register(new CookedSalmon(new IID(Ids::COOKED_SALMON, 0), "Cooked Salmon"));
-		$this->register(new Cookie(new IID(Ids::COOKIE, 0), "Cookie"));
-		$this->register(new DriedKelp(new IID(Ids::DRIED_KELP, 0), "Dried Kelp"));
-		$this->register(new Egg(new IID(Ids::EGG, 0), "Egg"));
-		$this->register(new EnderPearl(new IID(Ids::ENDER_PEARL, 0), "Ender Pearl"));
-		$this->register(new ExperienceBottle(new IID(Ids::EXPERIENCE_BOTTLE, 0), "Bottle o' Enchanting"));
-		$this->register(new Fertilizer(new IID(Ids::DYE, 15), "Bone Meal"));
-		$this->register(new FishingRod(new IID(Ids::FISHING_ROD, 0), "Fishing Rod"));
-		$this->register(new FlintSteel(new IID(Ids::FLINT_STEEL, 0), "Flint and Steel"));
-		$this->register(new GlassBottle(new IID(Ids::GLASS_BOTTLE, 0), "Glass Bottle"));
-		$this->register(new GoldenApple(new IID(Ids::GOLDEN_APPLE, 0), "Golden Apple"));
-		$this->register(new GoldenAppleEnchanted(new IID(Ids::ENCHANTED_GOLDEN_APPLE, 0), "Enchanted Golden Apple"));
-		$this->register(new GoldenCarrot(new IID(Ids::GOLDEN_CARROT, 0), "Golden Carrot"));
-		$this->register(new Item(new IID(Ids::BLAZE_POWDER, 0), "Blaze Powder"));
-		$this->register(new Item(new IID(Ids::BLEACH, 0), "Bleach")); //EDU
-		$this->register(new Item(new IID(Ids::BONE, 0), "Bone"));
-		$this->register(new Item(new IID(Ids::BRICK, 0), "Brick"));
-		$this->register(new Item(new IID(Ids::CHORUS_FRUIT_POPPED, 0), "Popped Chorus Fruit"));
-		$this->register(new Item(new IID(Ids::CLAY_BALL, 0), "Clay"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::SALT), "Salt"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::SODIUM_OXIDE), "Sodium Oxide"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::SODIUM_HYDROXIDE), "Sodium Hydroxide"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::MAGNESIUM_NITRATE), "Magnesium Nitrate"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::IRON_SULPHIDE), "Iron Sulphide"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::LITHIUM_HYDRIDE), "Lithium Hydride"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::SODIUM_HYDRIDE), "Sodium Hydride"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::CALCIUM_BROMIDE), "Calcium Bromide"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::MAGNESIUM_OXIDE), "Magnesium Oxide"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::SODIUM_ACETATE), "Sodium Acetate"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::LUMINOL), "Luminol"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::CHARCOAL), "Charcoal")); //??? maybe bug
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::SUGAR), "Sugar")); //??? maybe bug
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::ALUMINIUM_OXIDE), "Aluminium Oxide"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::BORON_TRIOXIDE), "Boron Trioxide"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::SOAP), "Soap"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::POLYETHYLENE), "Polyethylene"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::RUBBISH), "Rubbish"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::MAGNESIUM_SALTS), "Magnesium Salts"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::SULPHATE), "Sulphate"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::BARIUM_SULPHATE), "Barium Sulphate"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::POTASSIUM_CHLORIDE), "Potassium Chloride"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::MERCURIC_CHLORIDE), "Mercuric Chloride"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::CERIUM_CHLORIDE), "Cerium Chloride"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::TUNGSTEN_CHLORIDE), "Tungsten Chloride"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::CALCIUM_CHLORIDE), "Calcium Chloride"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::WATER), "Water")); //???
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::GLUE), "Glue"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::HYPOCHLORITE), "Hypochlorite"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::CRUDE_OIL), "Crude Oil"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::LATEX), "Latex"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::POTASSIUM_IODIDE), "Potassium Iodide"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::SODIUM_FLUORIDE), "Sodium Fluoride"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::BENZENE), "Benzene"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::INK), "Ink"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::HYDROGEN_PEROXIDE), "Hydrogen Peroxide"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::AMMONIA), "Ammonia"));
-		$this->register(new Item(new IID(Ids::COMPOUND, CompoundTypeIds::SODIUM_HYPOCHLORITE), "Sodium Hypochlorite"));
-		$this->register(new Item(new IID(Ids::DIAMOND, 0), "Diamond"));
-		$this->register(new Item(new IID(Ids::DRAGON_BREATH, 0), "Dragon's Breath"));
-		$this->register(new Item(new IID(Ids::DYE, 0), "Ink Sac"));
-		$this->register(new Item(new IID(Ids::DYE, 4), "Lapis Lazuli"));
-		$this->register(new Item(new IID(Ids::EMERALD, 0), "Emerald"));
-		$this->register(new Item(new IID(Ids::FEATHER, 0), "Feather"));
-		$this->register(new Item(new IID(Ids::FERMENTED_SPIDER_EYE, 0), "Fermented Spider Eye"));
-		$this->register(new Item(new IID(Ids::FLINT, 0), "Flint"));
-		$this->register(new Item(new IID(Ids::GHAST_TEAR, 0), "Ghast Tear"));
-		$this->register(new Item(new IID(Ids::GLISTERING_MELON, 0), "Glistering Melon"));
-		$this->register(new Item(new IID(Ids::GLOWSTONE_DUST, 0), "Glowstone Dust"));
-		$this->register(new Item(new IID(Ids::GOLD_INGOT, 0), "Gold Ingot"));
-		$this->register(new Item(new IID(Ids::GOLD_NUGGET, 0), "Gold Nugget"));
-		$this->register(new Item(new IID(Ids::GUNPOWDER, 0), "Gunpowder"));
-		$this->register(new Item(new IID(Ids::HEART_OF_THE_SEA, 0), "Heart of the Sea"));
-		$this->register(new Item(new IID(Ids::IRON_INGOT, 0), "Iron Ingot"));
-		$this->register(new Item(new IID(Ids::IRON_NUGGET, 0), "Iron Nugget"));
-		$this->register(new Item(new IID(Ids::LEATHER, 0), "Leather"));
-		$this->register(new Item(new IID(Ids::MAGMA_CREAM, 0), "Magma Cream"));
-		$this->register(new Item(new IID(Ids::NAUTILUS_SHELL, 0), "Nautilus Shell"));
-		$this->register(new Item(new IID(Ids::NETHER_BRICK, 0), "Nether Brick"));
-		$this->register(new Item(new IID(Ids::NETHER_QUARTZ, 0), "Nether Quartz"));
-		$this->register(new Item(new IID(Ids::NETHER_STAR, 0), "Nether Star"));
-		$this->register(new Item(new IID(Ids::PAPER, 0), "Paper"));
-		$this->register(new Item(new IID(Ids::PRISMARINE_CRYSTALS, 0), "Prismarine Crystals"));
-		$this->register(new Item(new IID(Ids::PRISMARINE_SHARD, 0), "Prismarine Shard"));
-		$this->register(new Item(new IID(Ids::RABBIT_FOOT, 0), "Rabbit's Foot"));
-		$this->register(new Item(new IID(Ids::RABBIT_HIDE, 0), "Rabbit Hide"));
-		$this->register(new Item(new IID(Ids::SHULKER_SHELL, 0), "Shulker Shell"));
-		$this->register(new Item(new IID(Ids::SLIME_BALL, 0), "Slimeball"));
-		$this->register(new Item(new IID(Ids::SUGAR, 0), "Sugar"));
-		$this->register(new Item(new IID(Ids::TURTLE_SHELL_PIECE, 0), "Scute"));
-		$this->register(new Item(new IID(Ids::WHEAT, 0), "Wheat"));
-		$this->register(new ItemBlock(new IID(Ids::ACACIA_DOOR, 0), Blocks::ACACIA_DOOR()));
-		$this->register(new ItemBlock(new IID(Ids::BIRCH_DOOR, 0), Blocks::BIRCH_DOOR()));
-		$this->register(new ItemBlock(new IID(Ids::BREWING_STAND, 0), Blocks::BREWING_STAND()));
-		$this->register(new ItemBlock(new IID(Ids::CAKE, 0), Blocks::CAKE()));
-		$this->register(new ItemBlock(new IID(Ids::COMPARATOR, 0), Blocks::REDSTONE_COMPARATOR()));
-		$this->register(new ItemBlock(new IID(Ids::DARK_OAK_DOOR, 0), Blocks::DARK_OAK_DOOR()));
-		$this->register(new ItemBlock(new IID(Ids::FLOWER_POT, 0), Blocks::FLOWER_POT()));
-		$this->register(new ItemBlock(new IID(Ids::HOPPER, 0), Blocks::HOPPER()));
-		$this->register(new ItemBlock(new IID(Ids::IRON_DOOR, 0), Blocks::IRON_DOOR()));
-		$this->register(new ItemBlock(new IID(Ids::ITEM_FRAME, 0), Blocks::ITEM_FRAME()));
-		$this->register(new ItemBlock(new IID(Ids::JUNGLE_DOOR, 0), Blocks::JUNGLE_DOOR()));
-		$this->register(new ItemBlock(new IID(Ids::NETHER_WART, 0), Blocks::NETHER_WART()));
-		$this->register(new ItemBlock(new IID(Ids::OAK_DOOR, 0), Blocks::OAK_DOOR()));
-		$this->register(new ItemBlock(new IID(Ids::REPEATER, 0), Blocks::REDSTONE_REPEATER()));
-		$this->register(new ItemBlock(new IID(Ids::SPRUCE_DOOR, 0), Blocks::SPRUCE_DOOR()));
-		$this->register(new ItemBlock(new IID(Ids::SUGARCANE, 0), Blocks::SUGARCANE()));
-
-		//the meta values for buckets are intentionally hardcoded because block IDs will change in the future
-		$waterBucket = new LiquidBucket(new IID(Ids::BUCKET, 8), "Water Bucket", Blocks::WATER());
-		$this->register($waterBucket);
-		$this->remap(new IID(Ids::BUCKET, 9), $waterBucket);
-		$lavaBucket = new LiquidBucket(new IID(Ids::BUCKET, 10), "Lava Bucket", Blocks::LAVA());
-		$this->register($lavaBucket);
-		$this->remap(new IID(Ids::BUCKET, 11), $lavaBucket);
-		$this->register(new Melon(new IID(Ids::MELON, 0), "Melon"));
-		$this->register(new MelonSeeds(new IID(Ids::MELON_SEEDS, 0), "Melon Seeds"));
-		$this->register(new MilkBucket(new IID(Ids::BUCKET, 1), "Milk Bucket"));
-		$this->register(new Minecart(new IID(Ids::MINECART, 0), "Minecart"));
-		$this->register(new MushroomStew(new IID(Ids::MUSHROOM_STEW, 0), "Mushroom Stew"));
-		$this->register(new PaintingItem(new IID(Ids::PAINTING, 0), "Painting"));
-		$this->register(new PoisonousPotato(new IID(Ids::POISONOUS_POTATO, 0), "Poisonous Potato"));
-		$this->register(new Potato(new IID(Ids::POTATO, 0), "Potato"));
-		$this->register(new Pufferfish(new IID(Ids::PUFFERFISH, 0), "Pufferfish"));
-		$this->register(new PumpkinPie(new IID(Ids::PUMPKIN_PIE, 0), "Pumpkin Pie"));
-		$this->register(new PumpkinSeeds(new IID(Ids::PUMPKIN_SEEDS, 0), "Pumpkin Seeds"));
-		$this->register(new RabbitStew(new IID(Ids::RABBIT_STEW, 0), "Rabbit Stew"));
-		$this->register(new RawBeef(new IID(Ids::RAW_BEEF, 0), "Raw Beef"));
-		$this->register(new RawChicken(new IID(Ids::RAW_CHICKEN, 0), "Raw Chicken"));
-		$this->register(new RawFish(new IID(Ids::RAW_FISH, 0), "Raw Fish"));
-		$this->register(new RawMutton(new IID(Ids::RAW_MUTTON, 0), "Raw Mutton"));
-		$this->register(new RawPorkchop(new IID(Ids::RAW_PORKCHOP, 0), "Raw Porkchop"));
-		$this->register(new RawRabbit(new IID(Ids::RAW_RABBIT, 0), "Raw Rabbit"));
-		$this->register(new RawSalmon(new IID(Ids::RAW_SALMON, 0), "Raw Salmon"));
-		$this->register(new Record(new IID(Ids::RECORD_13, 0), RecordType::DISK_13(), "Record 13"));
-		$this->register(new Record(new IID(Ids::RECORD_CAT, 0), RecordType::DISK_CAT(), "Record Cat"));
-		$this->register(new Record(new IID(Ids::RECORD_BLOCKS, 0), RecordType::DISK_BLOCKS(), "Record Blocks"));
-		$this->register(new Record(new IID(Ids::RECORD_CHIRP, 0), RecordType::DISK_CHIRP(), "Record Chirp"));
-		$this->register(new Record(new IID(Ids::RECORD_FAR, 0), RecordType::DISK_FAR(), "Record Far"));
-		$this->register(new Record(new IID(Ids::RECORD_MALL, 0), RecordType::DISK_MALL(), "Record Mall"));
-		$this->register(new Record(new IID(Ids::RECORD_MELLOHI, 0), RecordType::DISK_MELLOHI(), "Record Mellohi"));
-		$this->register(new Record(new IID(Ids::RECORD_STAL, 0), RecordType::DISK_STAL(), "Record Stal"));
-		$this->register(new Record(new IID(Ids::RECORD_STRAD, 0), RecordType::DISK_STRAD(), "Record Strad"));
-		$this->register(new Record(new IID(Ids::RECORD_WARD, 0), RecordType::DISK_WARD(), "Record Ward"));
-		$this->register(new Record(new IID(Ids::RECORD_11, 0), RecordType::DISK_11(), "Record 11"));
-		$this->register(new Record(new IID(Ids::RECORD_WAIT, 0), RecordType::DISK_WAIT(), "Record Wait"));
-		$this->register(new Redstone(new IID(Ids::REDSTONE, 0), "Redstone"));
-		$this->register(new RottenFlesh(new IID(Ids::ROTTEN_FLESH, 0), "Rotten Flesh"));
-		$this->register(new Shears(new IID(Ids::SHEARS, 0), "Shears"));
-		$this->register(new ItemBlockWallOrFloor(new IID(Ids::SIGN, 0), Blocks::OAK_SIGN(), Blocks::OAK_WALL_SIGN()));
-		$this->register(new ItemBlockWallOrFloor(new IID(Ids::SPRUCE_SIGN, 0), Blocks::SPRUCE_SIGN(), Blocks::SPRUCE_WALL_SIGN()));
-		$this->register(new ItemBlockWallOrFloor(new IID(Ids::BIRCH_SIGN, 0), Blocks::BIRCH_SIGN(), Blocks::BIRCH_WALL_SIGN()));
-		$this->register(new ItemBlockWallOrFloor(new IID(Ids::JUNGLE_SIGN, 0), Blocks::JUNGLE_SIGN(), Blocks::JUNGLE_WALL_SIGN()));
-		$this->register(new ItemBlockWallOrFloor(new IID(Ids::ACACIA_SIGN, 0), Blocks::ACACIA_SIGN(), Blocks::ACACIA_WALL_SIGN()));
-		$this->register(new ItemBlockWallOrFloor(new IID(Ids::DARKOAK_SIGN, 0), Blocks::DARK_OAK_SIGN(), Blocks::DARK_OAK_WALL_SIGN()));
-		$this->register(new Snowball(new IID(Ids::SNOWBALL, 0), "Snowball"));
-		$this->register(new SpiderEye(new IID(Ids::SPIDER_EYE, 0), "Spider Eye"));
-		$this->register(new Steak(new IID(Ids::STEAK, 0), "Steak"));
-		$this->register(new Stick(new IID(Ids::STICK, 0), "Stick"));
-		$this->register(new StringItem(new IID(Ids::STRING, 0), "String"));
-		$this->register(new SweetBerries(new IID(Ids::SWEET_BERRIES, 0), "Sweet Berries"));
-		$this->register(new Totem(new IID(Ids::TOTEM, 0), "Totem of Undying"));
-		$this->register(new WheatSeeds(new IID(Ids::WHEAT_SEEDS, 0), "Wheat Seeds"));
-		$this->register(new WritableBook(new IID(Ids::WRITABLE_BOOK, 0), "Book & Quill"));
-		$this->register(new WrittenBook(new IID(Ids::WRITTEN_BOOK, 0), "Written Book"));
-
-		foreach(SkullType::getAll() as $skullType){
-			$this->register(new Skull(new IID(Ids::SKULL, $skullType->getMagicNumber()), $skullType->getDisplayName(), $skullType));
-		}
-
-		$dyeMap = [
-			DyeColor::BLACK()->id() => 16,
-			DyeColor::BROWN()->id() => 17,
-			DyeColor::BLUE()->id() => 18,
-			DyeColor::WHITE()->id() => 19
-		];
-		$colorIdMap = DyeColorIdMap::getInstance();
-		foreach(DyeColor::getAll() as $color){
-			//TODO: use colour object directly
-			//TODO: add interface to dye-colour objects
-			$this->register(new Dye(new IID(Ids::DYE, $dyeMap[$color->id()] ?? $colorIdMap->toInvertedId($color)), $color->getDisplayName() . " Dye", $color));
-			$this->register(new Bed(new IID(Ids::BED, $colorIdMap->toId($color)), $color->getDisplayName() . " Bed", $color));
-			$this->register((new Banner(
-				new IID(Ids::BANNER, 0),
-				Blocks::BANNER(),
-				Blocks::WALL_BANNER()
-			))->setColor($color));
-		}
-
-		foreach(PotionType::getAll() as $type){
-			$typeId = PotionTypeIdMap::getInstance()->toId($type);
-			$this->register(new Potion(new IID(Ids::POTION, $typeId), $type->getDisplayName() . " Potion", $type));
-			$this->register(new SplashPotion(new IID(Ids::SPLASH_POTION, $typeId), $type->getDisplayName() . " Splash Potion", $type));
-		}
-
-		foreach(TreeType::getAll() as $type){
-			$this->register(new Boat(new IID(Ids::BOAT, $type->getMagicNumber()), $type->getDisplayName() . " Boat", $type));
-		}
-
-		//region --- auto-generated TODOs ---
-		//TODO: minecraft:armor_stand
-		//TODO: minecraft:balloon
-		//TODO: minecraft:banner_pattern
-		//TODO: minecraft:campfire
-		//TODO: minecraft:carrotOnAStick
-		//TODO: minecraft:chest_minecart
-		//TODO: minecraft:command_block_minecart
-		//TODO: minecraft:crossbow
-		//TODO: minecraft:elytra
-		//TODO: minecraft:emptyMap
-		//TODO: minecraft:enchanted_book
-		//TODO: minecraft:end_crystal
-		//TODO: minecraft:ender_eye
-		//TODO: minecraft:fireball
-		//TODO: minecraft:fireworks
-		//TODO: minecraft:fireworksCharge
-		//TODO: minecraft:glow_stick
-		//TODO: minecraft:hopper_minecart
-		//TODO: minecraft:horsearmordiamond
-		//TODO: minecraft:horsearmorgold
-		//TODO: minecraft:horsearmoriron
-		//TODO: minecraft:horsearmorleather
-		//TODO: minecraft:ice_bomb
-		//TODO: minecraft:kelp
-		//TODO: minecraft:lead
-		//TODO: minecraft:lingering_potion
-		//TODO: minecraft:map
-		//TODO: minecraft:medicine
-		//TODO: minecraft:name_tag
-		//TODO: minecraft:phantom_membrane
-		//TODO: minecraft:rapid_fertilizer
-		//TODO: minecraft:record_pigstep
-		//TODO: minecraft:saddle
-		//TODO: minecraft:shield
-		//TODO: minecraft:sparkler
-		//TODO: minecraft:spawn_egg
-		//TODO: minecraft:tnt_minecart
-		//TODO: minecraft:trident
-		//TODO: minecraft:turtle_helmet
-		//endregion
-	}
-
-	private function registerSpawnEggs() : void{
-		//TODO: the meta values should probably be hardcoded; they won't change, but the EntityLegacyIds might
-		$this->register(new class(new IID(Ids::SPAWN_EGG, EntityLegacyIds::ZOMBIE), "Zombie Spawn Egg") extends SpawnEgg{
-			protected function createEntity(World $world, Vector3 $pos, float $yaw, float $pitch) : Entity{
-				return new Zombie(Location::fromObject($pos, $world, $yaw, $pitch));
-			}
-		});
-		$this->register(new class(new IID(Ids::SPAWN_EGG, EntityLegacyIds::SQUID), "Squid Spawn Egg") extends SpawnEgg{
-			public function createEntity(World $world, Vector3 $pos, float $yaw, float $pitch) : Entity{
-				return new Squid(Location::fromObject($pos, $world, $yaw, $pitch));
-			}
-		});
-		$this->register(new class(new IID(Ids::SPAWN_EGG, EntityLegacyIds::VILLAGER), "Villager Spawn Egg") extends SpawnEgg{
-			public function createEntity(World $world, Vector3 $pos, float $yaw, float $pitch) : Entity{
-				return new Villager(Location::fromObject($pos, $world, $yaw, $pitch));
-			}
-		});
-	}
-
-	private function registerTierToolItems() : void{
-		$this->register(new Axe(new IID(Ids::DIAMOND_AXE, 0), "Diamond Axe", ToolTier::DIAMOND()));
-		$this->register(new Axe(new IID(Ids::GOLDEN_AXE, 0), "Golden Axe", ToolTier::GOLD()));
-		$this->register(new Axe(new IID(Ids::IRON_AXE, 0), "Iron Axe", ToolTier::IRON()));
-		$this->register(new Axe(new IID(Ids::STONE_AXE, 0), "Stone Axe", ToolTier::STONE()));
-		$this->register(new Axe(new IID(Ids::WOODEN_AXE, 0), "Wooden Axe", ToolTier::WOOD()));
-		$this->register(new Hoe(new IID(Ids::DIAMOND_HOE, 0), "Diamond Hoe", ToolTier::DIAMOND()));
-		$this->register(new Hoe(new IID(Ids::GOLDEN_HOE, 0), "Golden Hoe", ToolTier::GOLD()));
-		$this->register(new Hoe(new IID(Ids::IRON_HOE, 0), "Iron Hoe", ToolTier::IRON()));
-		$this->register(new Hoe(new IID(Ids::STONE_HOE, 0), "Stone Hoe", ToolTier::STONE()));
-		$this->register(new Hoe(new IID(Ids::WOODEN_HOE, 0), "Wooden Hoe", ToolTier::WOOD()));
-		$this->register(new Pickaxe(new IID(Ids::DIAMOND_PICKAXE, 0), "Diamond Pickaxe", ToolTier::DIAMOND()));
-		$this->register(new Pickaxe(new IID(Ids::GOLDEN_PICKAXE, 0), "Golden Pickaxe", ToolTier::GOLD()));
-		$this->register(new Pickaxe(new IID(Ids::IRON_PICKAXE, 0), "Iron Pickaxe", ToolTier::IRON()));
-		$this->register(new Pickaxe(new IID(Ids::STONE_PICKAXE, 0), "Stone Pickaxe", ToolTier::STONE()));
-		$this->register(new Pickaxe(new IID(Ids::WOODEN_PICKAXE, 0), "Wooden Pickaxe", ToolTier::WOOD()));
-		$this->register(new Shovel(new IID(Ids::DIAMOND_SHOVEL, 0), "Diamond Shovel", ToolTier::DIAMOND()));
-		$this->register(new Shovel(new IID(Ids::GOLDEN_SHOVEL, 0), "Golden Shovel", ToolTier::GOLD()));
-		$this->register(new Shovel(new IID(Ids::IRON_SHOVEL, 0), "Iron Shovel", ToolTier::IRON()));
-		$this->register(new Shovel(new IID(Ids::STONE_SHOVEL, 0), "Stone Shovel", ToolTier::STONE()));
-		$this->register(new Shovel(new IID(Ids::WOODEN_SHOVEL, 0), "Wooden Shovel", ToolTier::WOOD()));
-		$this->register(new Sword(new IID(Ids::DIAMOND_SWORD, 0), "Diamond Sword", ToolTier::DIAMOND()));
-		$this->register(new Sword(new IID(Ids::GOLDEN_SWORD, 0), "Golden Sword", ToolTier::GOLD()));
-		$this->register(new Sword(new IID(Ids::IRON_SWORD, 0), "Iron Sword", ToolTier::IRON()));
-		$this->register(new Sword(new IID(Ids::STONE_SWORD, 0), "Stone Sword", ToolTier::STONE()));
-		$this->register(new Sword(new IID(Ids::WOODEN_SWORD, 0), "Wooden Sword", ToolTier::WOOD()));
-	}
-
-	private function registerArmorItems() : void{
-		$this->register(new Armor(new IID(Ids::CHAIN_BOOTS, 0), "Chainmail Boots", new ArmorTypeInfo(1, 196, ArmorInventory::SLOT_FEET)));
-		$this->register(new Armor(new IID(Ids::DIAMOND_BOOTS, 0), "Diamond Boots", new ArmorTypeInfo(3, 430, ArmorInventory::SLOT_FEET)));
-		$this->register(new Armor(new IID(Ids::GOLDEN_BOOTS, 0), "Golden Boots", new ArmorTypeInfo(1, 92, ArmorInventory::SLOT_FEET)));
-		$this->register(new Armor(new IID(Ids::IRON_BOOTS, 0), "Iron Boots", new ArmorTypeInfo(2, 196, ArmorInventory::SLOT_FEET)));
-		$this->register(new Armor(new IID(Ids::LEATHER_BOOTS, 0), "Leather Boots", new ArmorTypeInfo(1, 66, ArmorInventory::SLOT_FEET)));
-		$this->register(new Armor(new IID(Ids::CHAIN_CHESTPLATE, 0), "Chainmail Chestplate", new ArmorTypeInfo(5, 241, ArmorInventory::SLOT_CHEST)));
-		$this->register(new Armor(new IID(Ids::DIAMOND_CHESTPLATE, 0), "Diamond Chestplate", new ArmorTypeInfo(8, 529, ArmorInventory::SLOT_CHEST)));
-		$this->register(new Armor(new IID(Ids::GOLDEN_CHESTPLATE, 0), "Golden Chestplate", new ArmorTypeInfo(5, 113, ArmorInventory::SLOT_CHEST)));
-		$this->register(new Armor(new IID(Ids::IRON_CHESTPLATE, 0), "Iron Chestplate", new ArmorTypeInfo(6, 241, ArmorInventory::SLOT_CHEST)));
-		$this->register(new Armor(new IID(Ids::LEATHER_CHESTPLATE, 0), "Leather Tunic", new ArmorTypeInfo(3, 81, ArmorInventory::SLOT_CHEST)));
-		$this->register(new Armor(new IID(Ids::CHAIN_HELMET, 0), "Chainmail Helmet", new ArmorTypeInfo(2, 166, ArmorInventory::SLOT_HEAD)));
-		$this->register(new Armor(new IID(Ids::DIAMOND_HELMET, 0), "Diamond Helmet", new ArmorTypeInfo(3, 364, ArmorInventory::SLOT_HEAD)));
-		$this->register(new Armor(new IID(Ids::GOLDEN_HELMET, 0), "Golden Helmet", new ArmorTypeInfo(2, 78, ArmorInventory::SLOT_HEAD)));
-		$this->register(new Armor(new IID(Ids::IRON_HELMET, 0), "Iron Helmet", new ArmorTypeInfo(2, 166, ArmorInventory::SLOT_HEAD)));
-		$this->register(new Armor(new IID(Ids::LEATHER_HELMET, 0), "Leather Cap", new ArmorTypeInfo(1, 56, ArmorInventory::SLOT_HEAD)));
-		$this->register(new Armor(new IID(Ids::CHAIN_LEGGINGS, 0), "Chainmail Leggings", new ArmorTypeInfo(4, 226, ArmorInventory::SLOT_LEGS)));
-		$this->register(new Armor(new IID(Ids::DIAMOND_LEGGINGS, 0), "Diamond Leggings", new ArmorTypeInfo(6, 496, ArmorInventory::SLOT_LEGS)));
-		$this->register(new Armor(new IID(Ids::GOLDEN_LEGGINGS, 0), "Golden Leggings", new ArmorTypeInfo(3, 106, ArmorInventory::SLOT_LEGS)));
-		$this->register(new Armor(new IID(Ids::IRON_LEGGINGS, 0), "Iron Leggings", new ArmorTypeInfo(5, 226, ArmorInventory::SLOT_LEGS)));
-		$this->register(new Armor(new IID(Ids::LEATHER_LEGGINGS, 0), "Leather Pants", new ArmorTypeInfo(2, 76, ArmorInventory::SLOT_LEGS)));
-	}
-
-	/**
-	 * Maps an item type to its corresponding ID. This is necessary to ensure that the item is correctly loaded when
-	 * reading data from disk storage.
-	 *
-	 * NOTE: If you are registering a new item type, you will need to add it to the creative inventory yourself - it
-	 * will not automatically appear there.
-	 *
-	 * @throws \RuntimeException if something attempted to override an already-registered item without specifying the
-	 * $override parameter.
-	 */
-	public function register(Item $item, bool $override = false) : void{
-		$id = $item->getId();
-		$variant = $item->getMeta();
-
-		if(!$override && $this->isRegistered($id, $variant)){
-			throw new \RuntimeException("Trying to overwrite an already registered item");
-		}
-
-		$this->list[self::getListOffset($id, $variant)] = clone $item;
-	}
-
-	public function remap(ItemIdentifier $identifier, Item $item, bool $override = false) : void{
-		if(!$override && $this->isRegistered($identifier->getId(), $identifier->getMeta())){
-			throw new \RuntimeException("Trying to overwrite an already registered item");
-		}
-
-		$this->list[self::getListOffset($identifier->getId(), $identifier->getMeta())] = clone $item;
-	}
-
-	private static function itemToBlockId(int $id) : int{
-		return $id < 0 ? 255 - $id : $id;
-	}
-
-	/**
-	 * @deprecated This method should ONLY be used for deserializing data, e.g. from a config or database. For all other
-	 * purposes, use VanillaItems.
-	 * @see VanillaItems
-	 *
-	 * Deserializes an item from the provided legacy ID, legacy meta, count and NBT.
-	 *
-	 * @throws \InvalidArgumentException
-	 * @throws NbtException
-	 */
-	public function get(int $id, int $meta = 0, int $count = 1, ?CompoundTag $tags = null) : Item{
-		/** @var Item|null $item */
-		$item = null;
-		if($meta !== -1){
-			if(isset($this->list[$offset = self::getListOffset($id, $meta)])){
-				$item = clone $this->list[$offset];
-			}elseif(isset($this->list[$zero = self::getListOffset($id, 0)]) && $this->list[$zero] instanceof Durable){
-				if($meta >= 0 && $meta <= $this->list[$zero]->getMaxDurability()){
-					$item = clone $this->list[$zero];
-					$item->setDamage($meta);
-				}else{
-					$item = new Item(new IID($id, $meta));
-				}
-			}elseif($id < 256){ //intentionally includes negatives, for extended block IDs
-				//TODO: do not assume that item IDs and block IDs are the same or related
-				$item = new ItemBlock(new IID($id, $meta), BlockFactory::getInstance()->get(self::itemToBlockId($id), $meta & 0xf));
-			}
-		}
-
-		if($item === null){
-			//negative damage values will fallthru to here, to avoid crazy shit with crafting wildcard hacks
-			$item = new Item(new IID($id, $meta));
-		}
-
-		$item->setCount($count);
-		if($tags !== null){
-			$item->setNamedTag($tags);
-		}
-		return $item;
-	}
-
-	/**
-	 * @deprecated
-	 * @see VanillaItems::AIR()
-	 */
-	public static function air() : Item{
-		return self::getInstance()->get(Ids::AIR, 0, 0);
-	}
-
-	/**
-	 * Returns whether the specified item ID is already registered in the item factory.
-	 */
-	public function isRegistered(int $id, int $variant = 0) : bool{
-		if($id < 256){
-			return BlockFactory::getInstance()->isRegistered(self::itemToBlockId($id));
-		}
-
-		return isset($this->list[self::getListOffset($id, $variant)]);
-	}
-
-	private static function getListOffset(int $id, int $variant) : int{
-		if($id < -0x8000 || $id > 0x7fff){
-			throw new \InvalidArgumentException("ID must be in range " . -0x8000 . " - " . 0x7fff);
-		}
-		return (($id & 0xffff) << 16) | ($variant & 0xffff);
-	}
-
-	/**
-	 * @return Item[]
-	 */
-	public function getAllRegistered() : array{
-		return $this->list;
-	}
-}
diff --git a/src/item/ItemIdentifier.php b/src/item/ItemIdentifier.php
index 988be58d27..8be4d7d56b 100644
--- a/src/item/ItemIdentifier.php
+++ b/src/item/ItemIdentifier.php
@@ -23,23 +23,17 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-final class ItemIdentifier{
-	private int $id;
-	private int $meta;
+use pocketmine\block\Block;
 
-	public function __construct(int $id, int $meta){
-		if($id < -0x8000 || $id > 0x7fff){ //signed short range
-			throw new \InvalidArgumentException("ID must be in range " . -0x8000 . " - " . 0x7fff);
-		}
-		$this->id = $id;
-		$this->meta = $meta !== -1 ? $meta & 0x7FFF : -1;
+class ItemIdentifier{
+	public function __construct(
+		private int $typeId
+	){}
+
+	public static function fromBlock(Block $block) : self{
+		//TODO: maybe an ItemBlockIdentifier is in order?
+		return new self(ItemTypeIds::fromBlockTypeId($block->getTypeId()));
 	}
 
-	public function getId() : int{
-		return $this->id;
-	}
-
-	public function getMeta() : int{
-		return $this->meta;
-	}
+	public function getTypeId() : int{ return $this->typeId; }
 }
diff --git a/src/item/ItemIds.php b/src/item/ItemIds.php
deleted file mode 100644
index 7790a1d7af..0000000000
--- a/src/item/ItemIds.php
+++ /dev/null
@@ -1,736 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\item;
-
-final class ItemIds{
-
-	private function __construct(){
-		//NOOP
-	}
-
-	public const LIT_BLAST_FURNACE = -214;
-	public const COMPOSTER = -213;
-	public const WOOD = -212;
-	public const JIGSAW = -211;
-	public const LAVA_CAULDRON = -210;
-	public const CAMPFIRE = -209;
-	public const LANTERN = -208;
-	public const SWEET_BERRY_BUSH = -207;
-	public const BELL = -206;
-
-	public const LOOM = -204;
-	public const BARREL = -203;
-	public const SMITHING_TABLE = -202;
-	public const FLETCHING_TABLE = -201;
-	public const CARTOGRAPHY_TABLE = -200;
-	public const LIT_SMOKER = -199;
-	public const SMOKER = -198;
-	public const STONECUTTER_BLOCK = -197;
-	public const BLAST_FURNACE = -196;
-	public const GRINDSTONE = -195;
-	public const LECTERN = -194;
-	public const DARKOAK_WALL_SIGN = -193;
-	public const DARKOAK_STANDING_SIGN = -192;
-	public const ACACIA_WALL_SIGN = -191;
-	public const ACACIA_STANDING_SIGN = -190;
-	public const JUNGLE_WALL_SIGN = -189;
-	public const JUNGLE_STANDING_SIGN = -188;
-	public const BIRCH_WALL_SIGN = -187;
-	public const BIRCH_STANDING_SIGN = -186;
-	public const SMOOTH_QUARTZ_STAIRS = -185;
-	public const RED_NETHER_BRICK_STAIRS = -184;
-	public const SMOOTH_STONE = -183;
-	public const SPRUCE_WALL_SIGN = -182;
-	public const SPRUCE_STANDING_SIGN = -181;
-	public const NORMAL_STONE_STAIRS = -180;
-	public const MOSSY_COBBLESTONE_STAIRS = -179;
-	public const END_BRICK_STAIRS = -178;
-	public const SMOOTH_SANDSTONE_STAIRS = -177;
-	public const SMOOTH_RED_SANDSTONE_STAIRS = -176;
-	public const MOSSY_STONE_BRICK_STAIRS = -175;
-	public const POLISHED_ANDESITE_STAIRS = -174;
-	public const POLISHED_DIORITE_STAIRS = -173;
-	public const POLISHED_GRANITE_STAIRS = -172;
-	public const ANDESITE_STAIRS = -171;
-	public const DIORITE_STAIRS = -170;
-	public const GRANITE_STAIRS = -169;
-	public const DOUBLE_STONE_SLAB4 = -168;
-	public const DOUBLE_STONE_SLAB3 = -167;
-	public const STONE_SLAB4 = -166;
-	public const SCAFFOLDING = -165;
-	public const BAMBOO_SAPLING = -164;
-	public const BAMBOO = -163;
-	public const STONE_SLAB3 = -162;
-	public const BARRIER = -161;
-	public const BUBBLE_COLUMN = -160;
-	public const TURTLE_EGG = -159;
-
-	public const CONDUIT = -157;
-	public const SEA_PICKLE = -156;
-	public const CARVED_PUMPKIN = -155;
-	public const SPRUCE_PRESSURE_PLATE = -154;
-	public const JUNGLE_PRESSURE_PLATE = -153;
-	public const DARK_OAK_PRESSURE_PLATE = -152;
-	public const BIRCH_PRESSURE_PLATE = -151;
-	public const ACACIA_PRESSURE_PLATE = -150;
-	public const SPRUCE_TRAPDOOR = -149;
-	public const JUNGLE_TRAPDOOR = -148;
-	public const DARK_OAK_TRAPDOOR = -147;
-	public const BIRCH_TRAPDOOR = -146;
-	public const ACACIA_TRAPDOOR = -145;
-	public const SPRUCE_BUTTON = -144;
-	public const JUNGLE_BUTTON = -143;
-	public const DARK_OAK_BUTTON = -142;
-	public const BIRCH_BUTTON = -141;
-	public const ACACIA_BUTTON = -140;
-	public const DRIED_KELP_BLOCK = -139;
-	public const KELP_BLOCK = -138;
-	public const CORAL_FAN_HANG3 = -137;
-	public const CORAL_FAN_HANG2 = -136;
-	public const CORAL_FAN_HANG = -135;
-	public const CORAL_FAN_DEAD = -134;
-	public const CORAL_FAN = -133;
-	public const CORAL_BLOCK = -132;
-	public const CORAL = -131;
-	public const SEAGRASS = -130;
-	public const ELEMENT_118 = -129;
-	public const ELEMENT_117 = -128;
-	public const ELEMENT_116 = -127;
-	public const ELEMENT_115 = -126;
-	public const ELEMENT_114 = -125;
-	public const ELEMENT_113 = -124;
-	public const ELEMENT_112 = -123;
-	public const ELEMENT_111 = -122;
-	public const ELEMENT_110 = -121;
-	public const ELEMENT_109 = -120;
-	public const ELEMENT_108 = -119;
-	public const ELEMENT_107 = -118;
-	public const ELEMENT_106 = -117;
-	public const ELEMENT_105 = -116;
-	public const ELEMENT_104 = -115;
-	public const ELEMENT_103 = -114;
-	public const ELEMENT_102 = -113;
-	public const ELEMENT_101 = -112;
-	public const ELEMENT_100 = -111;
-	public const ELEMENT_99 = -110;
-	public const ELEMENT_98 = -109;
-	public const ELEMENT_97 = -108;
-	public const ELEMENT_96 = -107;
-	public const ELEMENT_95 = -106;
-	public const ELEMENT_94 = -105;
-	public const ELEMENT_93 = -104;
-	public const ELEMENT_92 = -103;
-	public const ELEMENT_91 = -102;
-	public const ELEMENT_90 = -101;
-	public const ELEMENT_89 = -100;
-	public const ELEMENT_88 = -99;
-	public const ELEMENT_87 = -98;
-	public const ELEMENT_86 = -97;
-	public const ELEMENT_85 = -96;
-	public const ELEMENT_84 = -95;
-	public const ELEMENT_83 = -94;
-	public const ELEMENT_82 = -93;
-	public const ELEMENT_81 = -92;
-	public const ELEMENT_80 = -91;
-	public const ELEMENT_79 = -90;
-	public const ELEMENT_78 = -89;
-	public const ELEMENT_77 = -88;
-	public const ELEMENT_76 = -87;
-	public const ELEMENT_75 = -86;
-	public const ELEMENT_74 = -85;
-	public const ELEMENT_73 = -84;
-	public const ELEMENT_72 = -83;
-	public const ELEMENT_71 = -82;
-	public const ELEMENT_70 = -81;
-	public const ELEMENT_69 = -80;
-	public const ELEMENT_68 = -79;
-	public const ELEMENT_67 = -78;
-	public const ELEMENT_66 = -77;
-	public const ELEMENT_65 = -76;
-	public const ELEMENT_64 = -75;
-	public const ELEMENT_63 = -74;
-	public const ELEMENT_62 = -73;
-	public const ELEMENT_61 = -72;
-	public const ELEMENT_60 = -71;
-	public const ELEMENT_59 = -70;
-	public const ELEMENT_58 = -69;
-	public const ELEMENT_57 = -68;
-	public const ELEMENT_56 = -67;
-	public const ELEMENT_55 = -66;
-	public const ELEMENT_54 = -65;
-	public const ELEMENT_53 = -64;
-	public const ELEMENT_52 = -63;
-	public const ELEMENT_51 = -62;
-	public const ELEMENT_50 = -61;
-	public const ELEMENT_49 = -60;
-	public const ELEMENT_48 = -59;
-	public const ELEMENT_47 = -58;
-	public const ELEMENT_46 = -57;
-	public const ELEMENT_45 = -56;
-	public const ELEMENT_44 = -55;
-	public const ELEMENT_43 = -54;
-	public const ELEMENT_42 = -53;
-	public const ELEMENT_41 = -52;
-	public const ELEMENT_40 = -51;
-	public const ELEMENT_39 = -50;
-	public const ELEMENT_38 = -49;
-	public const ELEMENT_37 = -48;
-	public const ELEMENT_36 = -47;
-	public const ELEMENT_35 = -46;
-	public const ELEMENT_34 = -45;
-	public const ELEMENT_33 = -44;
-	public const ELEMENT_32 = -43;
-	public const ELEMENT_31 = -42;
-	public const ELEMENT_30 = -41;
-	public const ELEMENT_29 = -40;
-	public const ELEMENT_28 = -39;
-	public const ELEMENT_27 = -38;
-	public const ELEMENT_26 = -37;
-	public const ELEMENT_25 = -36;
-	public const ELEMENT_24 = -35;
-	public const ELEMENT_23 = -34;
-	public const ELEMENT_22 = -33;
-	public const ELEMENT_21 = -32;
-	public const ELEMENT_20 = -31;
-	public const ELEMENT_19 = -30;
-	public const ELEMENT_18 = -29;
-	public const ELEMENT_17 = -28;
-	public const ELEMENT_16 = -27;
-	public const ELEMENT_15 = -26;
-	public const ELEMENT_14 = -25;
-	public const ELEMENT_13 = -24;
-	public const ELEMENT_12 = -23;
-	public const ELEMENT_11 = -22;
-	public const ELEMENT_10 = -21;
-	public const ELEMENT_9 = -20;
-	public const ELEMENT_8 = -19;
-	public const ELEMENT_7 = -18;
-	public const ELEMENT_6 = -17;
-	public const ELEMENT_5 = -16;
-	public const ELEMENT_4 = -15;
-	public const ELEMENT_3 = -14;
-	public const ELEMENT_2 = -13;
-	public const ELEMENT_1 = -12;
-	public const BLUE_ICE = -11;
-	public const STRIPPED_OAK_LOG = -10;
-	public const STRIPPED_DARK_OAK_LOG = -9;
-	public const STRIPPED_ACACIA_LOG = -8;
-	public const STRIPPED_JUNGLE_LOG = -7;
-	public const STRIPPED_BIRCH_LOG = -6;
-	public const STRIPPED_SPRUCE_LOG = -5;
-	public const PRISMARINE_BRICKS_STAIRS = -4;
-	public const DARK_PRISMARINE_STAIRS = -3;
-	public const PRISMARINE_STAIRS = -2;
-
-	public const AIR = 0;
-	public const STONE = 1;
-	public const GRASS = 2;
-	public const DIRT = 3;
-	public const COBBLESTONE = 4;
-	public const PLANKS = 5, WOODEN_PLANKS = 5;
-	public const SAPLING = 6;
-	public const BEDROCK = 7;
-	public const FLOWING_WATER = 8;
-	public const STILL_WATER = 9, WATER = 9;
-	public const FLOWING_LAVA = 10;
-	public const LAVA = 11, STILL_LAVA = 11;
-	public const SAND = 12;
-	public const GRAVEL = 13;
-	public const GOLD_ORE = 14;
-	public const IRON_ORE = 15;
-	public const COAL_ORE = 16;
-	public const LOG = 17;
-	public const LEAVES = 18;
-	public const SPONGE = 19;
-	public const GLASS = 20;
-	public const LAPIS_ORE = 21;
-	public const LAPIS_BLOCK = 22;
-	public const DISPENSER = 23;
-	public const SANDSTONE = 24;
-	public const NOTEBLOCK = 25, NOTE_BLOCK = 25;
-	public const BED_BLOCK = 26;
-	public const GOLDEN_RAIL = 27, POWERED_RAIL = 27;
-	public const DETECTOR_RAIL = 28;
-	public const STICKY_PISTON = 29;
-	public const COBWEB = 30, WEB = 30;
-	public const TALLGRASS = 31, TALL_GRASS = 31;
-	public const DEADBUSH = 32, DEAD_BUSH = 32;
-	public const PISTON = 33;
-	public const PISTONARMCOLLISION = 34, PISTON_ARM_COLLISION = 34;
-	public const WOOL = 35;
-	public const ELEMENT_0 = 36;
-	public const DANDELION = 37, YELLOW_FLOWER = 37;
-	public const POPPY = 38, RED_FLOWER = 38;
-	public const BROWN_MUSHROOM = 39;
-	public const RED_MUSHROOM = 40;
-	public const GOLD_BLOCK = 41;
-	public const IRON_BLOCK = 42;
-	public const DOUBLE_STONE_SLAB = 43;
-	public const STONE_SLAB = 44;
-	public const BRICK_BLOCK = 45;
-	public const TNT = 46;
-	public const BOOKSHELF = 47;
-	public const MOSSY_COBBLESTONE = 48, MOSS_STONE = 48;
-	public const OBSIDIAN = 49;
-	public const TORCH = 50;
-	public const FIRE = 51;
-	public const MOB_SPAWNER = 52, MONSTER_SPAWNER = 52;
-	public const OAK_STAIRS = 53, WOODEN_STAIRS = 53;
-	public const CHEST = 54;
-	public const REDSTONE_WIRE = 55;
-	public const DIAMOND_ORE = 56;
-	public const DIAMOND_BLOCK = 57;
-	public const CRAFTING_TABLE = 58, WORKBENCH = 58;
-	public const WHEAT_BLOCK = 59;
-	public const FARMLAND = 60;
-	public const FURNACE = 61;
-	public const BURNING_FURNACE = 62, LIT_FURNACE = 62;
-	public const SIGN_POST = 63, STANDING_SIGN = 63;
-	public const OAK_DOOR_BLOCK = 64, WOODEN_DOOR_BLOCK = 64;
-	public const LADDER = 65;
-	public const RAIL = 66;
-	public const COBBLESTONE_STAIRS = 67, STONE_STAIRS = 67;
-	public const WALL_SIGN = 68;
-	public const LEVER = 69;
-	public const STONE_PRESSURE_PLATE = 70;
-	public const IRON_DOOR_BLOCK = 71;
-	public const WOODEN_PRESSURE_PLATE = 72;
-	public const REDSTONE_ORE = 73;
-	public const GLOWING_REDSTONE_ORE = 74, LIT_REDSTONE_ORE = 74;
-	public const UNLIT_REDSTONE_TORCH = 75;
-	public const LIT_REDSTONE_TORCH = 76, REDSTONE_TORCH = 76;
-	public const STONE_BUTTON = 77;
-	public const SNOW_LAYER = 78;
-	public const ICE = 79;
-	public const SNOW = 80, SNOW_BLOCK = 80;
-	public const CACTUS = 81;
-	public const CLAY_BLOCK = 82;
-	public const REEDS_BLOCK = 83, SUGARCANE_BLOCK = 83;
-	public const JUKEBOX = 84;
-	public const FENCE = 85;
-	public const PUMPKIN = 86;
-	public const NETHERRACK = 87;
-	public const SOUL_SAND = 88;
-	public const GLOWSTONE = 89;
-	public const PORTAL = 90;
-	public const JACK_O_LANTERN = 91, LIT_PUMPKIN = 91;
-	public const CAKE_BLOCK = 92;
-	public const REPEATER_BLOCK = 93, UNPOWERED_REPEATER = 93;
-	public const POWERED_REPEATER = 94;
-	public const INVISIBLEBEDROCK = 95, INVISIBLE_BEDROCK = 95;
-	public const TRAPDOOR = 96, WOODEN_TRAPDOOR = 96;
-	public const MONSTER_EGG = 97;
-	public const STONEBRICK = 98, STONE_BRICK = 98, STONE_BRICKS = 98;
-	public const BROWN_MUSHROOM_BLOCK = 99;
-	public const RED_MUSHROOM_BLOCK = 100;
-	public const IRON_BARS = 101;
-	public const GLASS_PANE = 102;
-	public const MELON_BLOCK = 103;
-	public const PUMPKIN_STEM = 104;
-	public const MELON_STEM = 105;
-	public const VINE = 106, VINES = 106;
-	public const FENCE_GATE = 107, OAK_FENCE_GATE = 107;
-	public const BRICK_STAIRS = 108;
-	public const STONE_BRICK_STAIRS = 109;
-	public const MYCELIUM = 110;
-	public const LILY_PAD = 111, WATERLILY = 111, WATER_LILY = 111;
-	public const NETHER_BRICK_BLOCK = 112;
-	public const NETHER_BRICK_FENCE = 113;
-	public const NETHER_BRICK_STAIRS = 114;
-	public const NETHER_WART_PLANT = 115;
-	public const ENCHANTING_TABLE = 116, ENCHANTMENT_TABLE = 116;
-	public const BREWING_STAND_BLOCK = 117;
-	public const CAULDRON_BLOCK = 118;
-	public const END_PORTAL = 119;
-	public const END_PORTAL_FRAME = 120;
-	public const END_STONE = 121;
-	public const DRAGON_EGG = 122;
-	public const REDSTONE_LAMP = 123;
-	public const LIT_REDSTONE_LAMP = 124;
-	public const DROPPER = 125;
-	public const ACTIVATOR_RAIL = 126;
-	public const COCOA = 127, COCOA_BLOCK = 127;
-	public const SANDSTONE_STAIRS = 128;
-	public const EMERALD_ORE = 129;
-	public const ENDER_CHEST = 130;
-	public const TRIPWIRE_HOOK = 131;
-	public const TRIPWIRE = 132, TRIP_WIRE = 132;
-	public const EMERALD_BLOCK = 133;
-	public const SPRUCE_STAIRS = 134;
-	public const BIRCH_STAIRS = 135;
-	public const JUNGLE_STAIRS = 136;
-	public const COMMAND_BLOCK = 137;
-	public const BEACON = 138;
-	public const COBBLESTONE_WALL = 139, STONE_WALL = 139;
-	public const FLOWER_POT_BLOCK = 140;
-	public const CARROTS = 141, CARROT_BLOCK = 141;
-	public const POTATOES = 142, POTATO_BLOCK = 142;
-	public const WOODEN_BUTTON = 143;
-	public const MOB_HEAD_BLOCK = 144, SKULL_BLOCK = 144;
-	public const ANVIL = 145;
-	public const TRAPPED_CHEST = 146;
-	public const LIGHT_WEIGHTED_PRESSURE_PLATE = 147;
-	public const HEAVY_WEIGHTED_PRESSURE_PLATE = 148;
-	public const COMPARATOR_BLOCK = 149, UNPOWERED_COMPARATOR = 149;
-	public const POWERED_COMPARATOR = 150;
-	public const DAYLIGHT_DETECTOR = 151, DAYLIGHT_SENSOR = 151;
-	public const REDSTONE_BLOCK = 152;
-	public const NETHER_QUARTZ_ORE = 153, QUARTZ_ORE = 153;
-	public const HOPPER_BLOCK = 154;
-	public const QUARTZ_BLOCK = 155;
-	public const QUARTZ_STAIRS = 156;
-	public const DOUBLE_WOODEN_SLAB = 157;
-	public const WOODEN_SLAB = 158;
-	public const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159, TERRACOTTA = 159;
-	public const STAINED_GLASS_PANE = 160;
-	public const LEAVES2 = 161;
-	public const LOG2 = 162;
-	public const ACACIA_STAIRS = 163;
-	public const DARK_OAK_STAIRS = 164;
-	public const SLIME = 165, SLIME_BLOCK = 165;
-	public const GLOW_STICK = 166;
-	public const IRON_TRAPDOOR = 167;
-	public const PRISMARINE = 168;
-	public const SEALANTERN = 169, SEA_LANTERN = 169;
-	public const HAY_BALE = 170, HAY_BLOCK = 170;
-	public const CARPET = 171;
-	public const HARDENED_CLAY = 172;
-	public const COAL_BLOCK = 173;
-	public const PACKED_ICE = 174;
-	public const DOUBLE_PLANT = 175;
-	public const STANDING_BANNER = 176;
-	public const WALL_BANNER = 177;
-	public const DAYLIGHT_DETECTOR_INVERTED = 178, DAYLIGHT_SENSOR_INVERTED = 178;
-	public const RED_SANDSTONE = 179;
-	public const RED_SANDSTONE_STAIRS = 180;
-	public const DOUBLE_STONE_SLAB2 = 181;
-	public const STONE_SLAB2 = 182;
-	public const SPRUCE_FENCE_GATE = 183;
-	public const BIRCH_FENCE_GATE = 184;
-	public const JUNGLE_FENCE_GATE = 185;
-	public const DARK_OAK_FENCE_GATE = 186;
-	public const ACACIA_FENCE_GATE = 187;
-	public const REPEATING_COMMAND_BLOCK = 188;
-	public const CHAIN_COMMAND_BLOCK = 189;
-	public const HARD_GLASS_PANE = 190;
-	public const HARD_STAINED_GLASS_PANE = 191;
-	public const CHEMICAL_HEAT = 192;
-	public const SPRUCE_DOOR_BLOCK = 193;
-	public const BIRCH_DOOR_BLOCK = 194;
-	public const JUNGLE_DOOR_BLOCK = 195;
-	public const ACACIA_DOOR_BLOCK = 196;
-	public const DARK_OAK_DOOR_BLOCK = 197;
-	public const GRASS_PATH = 198;
-	public const FRAME_BLOCK = 199, ITEM_FRAME_BLOCK = 199;
-	public const CHORUS_FLOWER = 200;
-	public const PURPUR_BLOCK = 201;
-	public const COLORED_TORCH_RG = 202;
-	public const PURPUR_STAIRS = 203;
-	public const COLORED_TORCH_BP = 204;
-	public const UNDYED_SHULKER_BOX = 205;
-	public const END_BRICKS = 206;
-	public const FROSTED_ICE = 207;
-	public const END_ROD = 208;
-	public const END_GATEWAY = 209;
-
-	public const MAGMA = 213;
-	public const NETHER_WART_BLOCK = 214;
-	public const RED_NETHER_BRICK = 215;
-	public const BONE_BLOCK = 216;
-
-	public const SHULKER_BOX = 218;
-	public const PURPLE_GLAZED_TERRACOTTA = 219;
-	public const WHITE_GLAZED_TERRACOTTA = 220;
-	public const ORANGE_GLAZED_TERRACOTTA = 221;
-	public const MAGENTA_GLAZED_TERRACOTTA = 222;
-	public const LIGHT_BLUE_GLAZED_TERRACOTTA = 223;
-	public const YELLOW_GLAZED_TERRACOTTA = 224;
-	public const LIME_GLAZED_TERRACOTTA = 225;
-	public const PINK_GLAZED_TERRACOTTA = 226;
-	public const GRAY_GLAZED_TERRACOTTA = 227;
-	public const SILVER_GLAZED_TERRACOTTA = 228;
-	public const CYAN_GLAZED_TERRACOTTA = 229;
-
-	public const BLUE_GLAZED_TERRACOTTA = 231;
-	public const BROWN_GLAZED_TERRACOTTA = 232;
-	public const GREEN_GLAZED_TERRACOTTA = 233;
-	public const RED_GLAZED_TERRACOTTA = 234;
-	public const BLACK_GLAZED_TERRACOTTA = 235;
-	public const CONCRETE = 236;
-	public const CONCRETEPOWDER = 237, CONCRETE_POWDER = 237;
-	public const CHEMISTRY_TABLE = 238;
-	public const UNDERWATER_TORCH = 239;
-	public const CHORUS_PLANT = 240;
-	public const STAINED_GLASS = 241;
-
-	public const PODZOL = 243;
-	public const BEETROOT_BLOCK = 244;
-	public const STONECUTTER = 245;
-	public const GLOWINGOBSIDIAN = 246, GLOWING_OBSIDIAN = 246;
-	public const NETHERREACTOR = 247, NETHER_REACTOR = 247;
-	public const INFO_UPDATE = 248;
-	public const INFO_UPDATE2 = 249;
-	public const MOVINGBLOCK = 250, MOVING_BLOCK = 250;
-	public const OBSERVER = 251;
-	public const STRUCTURE_BLOCK = 252;
-	public const HARD_GLASS = 253;
-	public const HARD_STAINED_GLASS = 254;
-	public const RESERVED6 = 255;
-	public const IRON_SHOVEL = 256;
-	public const IRON_PICKAXE = 257;
-	public const IRON_AXE = 258;
-	public const FLINT_AND_STEEL = 259, FLINT_STEEL = 259;
-	public const APPLE = 260;
-	public const BOW = 261;
-	public const ARROW = 262;
-	public const COAL = 263;
-	public const DIAMOND = 264;
-	public const IRON_INGOT = 265;
-	public const GOLD_INGOT = 266;
-	public const IRON_SWORD = 267;
-	public const WOODEN_SWORD = 268;
-	public const WOODEN_SHOVEL = 269;
-	public const WOODEN_PICKAXE = 270;
-	public const WOODEN_AXE = 271;
-	public const STONE_SWORD = 272;
-	public const STONE_SHOVEL = 273;
-	public const STONE_PICKAXE = 274;
-	public const STONE_AXE = 275;
-	public const DIAMOND_SWORD = 276;
-	public const DIAMOND_SHOVEL = 277;
-	public const DIAMOND_PICKAXE = 278;
-	public const DIAMOND_AXE = 279;
-	public const STICK = 280;
-	public const BOWL = 281;
-	public const MUSHROOM_STEW = 282;
-	public const GOLDEN_SWORD = 283, GOLD_SWORD = 283;
-	public const GOLDEN_SHOVEL = 284, GOLD_SHOVEL = 284;
-	public const GOLDEN_PICKAXE = 285, GOLD_PICKAXE = 285;
-	public const GOLDEN_AXE = 286, GOLD_AXE = 286;
-	public const STRING = 287;
-	public const FEATHER = 288;
-	public const GUNPOWDER = 289;
-	public const WOODEN_HOE = 290;
-	public const STONE_HOE = 291;
-	public const IRON_HOE = 292;
-	public const DIAMOND_HOE = 293;
-	public const GOLDEN_HOE = 294, GOLD_HOE = 294;
-	public const SEEDS = 295, WHEAT_SEEDS = 295;
-	public const WHEAT = 296;
-	public const BREAD = 297;
-	public const LEATHER_CAP = 298, LEATHER_HELMET = 298;
-	public const LEATHER_CHESTPLATE = 299, LEATHER_TUNIC = 299;
-	public const LEATHER_LEGGINGS = 300, LEATHER_PANTS = 300;
-	public const LEATHER_BOOTS = 301;
-	public const CHAINMAIL_HELMET = 302, CHAIN_HELMET = 302;
-	public const CHAINMAIL_CHESTPLATE = 303, CHAIN_CHESTPLATE = 303;
-	public const CHAINMAIL_LEGGINGS = 304, CHAIN_LEGGINGS = 304;
-	public const CHAINMAIL_BOOTS = 305, CHAIN_BOOTS = 305;
-	public const IRON_HELMET = 306;
-	public const IRON_CHESTPLATE = 307;
-	public const IRON_LEGGINGS = 308;
-	public const IRON_BOOTS = 309;
-	public const DIAMOND_HELMET = 310;
-	public const DIAMOND_CHESTPLATE = 311;
-	public const DIAMOND_LEGGINGS = 312;
-	public const DIAMOND_BOOTS = 313;
-	public const GOLDEN_HELMET = 314, GOLD_HELMET = 314;
-	public const GOLDEN_CHESTPLATE = 315, GOLD_CHESTPLATE = 315;
-	public const GOLDEN_LEGGINGS = 316, GOLD_LEGGINGS = 316;
-	public const GOLDEN_BOOTS = 317, GOLD_BOOTS = 317;
-	public const FLINT = 318;
-	public const PORKCHOP = 319, RAW_PORKCHOP = 319;
-	public const COOKED_PORKCHOP = 320;
-	public const PAINTING = 321;
-	public const GOLDEN_APPLE = 322;
-	public const SIGN = 323;
-	public const OAK_DOOR = 324, WOODEN_DOOR = 324;
-	public const BUCKET = 325;
-
-	public const MINECART = 328;
-	public const SADDLE = 329;
-	public const IRON_DOOR = 330;
-	public const REDSTONE = 331, REDSTONE_DUST = 331;
-	public const SNOWBALL = 332;
-	public const BOAT = 333;
-	public const LEATHER = 334;
-	public const KELP = 335;
-	public const BRICK = 336;
-	public const CLAY = 337, CLAY_BALL = 337;
-	public const REEDS = 338, SUGARCANE = 338;
-	public const PAPER = 339;
-	public const BOOK = 340;
-	public const SLIMEBALL = 341, SLIME_BALL = 341;
-	public const CHEST_MINECART = 342, MINECART_WITH_CHEST = 342;
-
-	public const EGG = 344;
-	public const COMPASS = 345;
-	public const FISHING_ROD = 346;
-	public const CLOCK = 347;
-	public const GLOWSTONE_DUST = 348;
-	public const FISH = 349, RAW_FISH = 349;
-	public const COOKED_FISH = 350;
-	public const DYE = 351;
-	public const BONE = 352;
-	public const SUGAR = 353;
-	public const CAKE = 354;
-	public const BED = 355;
-	public const REPEATER = 356;
-	public const COOKIE = 357;
-	public const FILLED_MAP = 358;
-	public const SHEARS = 359;
-	public const MELON = 360, MELON_SLICE = 360;
-	public const PUMPKIN_SEEDS = 361;
-	public const MELON_SEEDS = 362;
-	public const BEEF = 363, RAW_BEEF = 363;
-	public const COOKED_BEEF = 364, STEAK = 364;
-	public const CHICKEN = 365, RAW_CHICKEN = 365;
-	public const COOKED_CHICKEN = 366;
-	public const ROTTEN_FLESH = 367;
-	public const ENDER_PEARL = 368;
-	public const BLAZE_ROD = 369;
-	public const GHAST_TEAR = 370;
-	public const GOLDEN_NUGGET = 371, GOLD_NUGGET = 371;
-	public const NETHER_WART = 372;
-	public const POTION = 373;
-	public const GLASS_BOTTLE = 374;
-	public const SPIDER_EYE = 375;
-	public const FERMENTED_SPIDER_EYE = 376;
-	public const BLAZE_POWDER = 377;
-	public const MAGMA_CREAM = 378;
-	public const BREWING_STAND = 379;
-	public const CAULDRON = 380;
-	public const ENDER_EYE = 381;
-	public const GLISTERING_MELON = 382, SPECKLED_MELON = 382;
-	public const SPAWN_EGG = 383;
-	public const BOTTLE_O_ENCHANTING = 384, EXPERIENCE_BOTTLE = 384;
-	public const FIREBALL = 385, FIRE_CHARGE = 385;
-	public const WRITABLE_BOOK = 386;
-	public const WRITTEN_BOOK = 387;
-	public const EMERALD = 388;
-	public const FRAME = 389, ITEM_FRAME = 389;
-	public const FLOWER_POT = 390;
-	public const CARROT = 391;
-	public const POTATO = 392;
-	public const BAKED_POTATO = 393;
-	public const POISONOUS_POTATO = 394;
-	public const EMPTYMAP = 395, EMPTY_MAP = 395, MAP = 395;
-	public const GOLDEN_CARROT = 396;
-	public const MOB_HEAD = 397, SKULL = 397;
-	public const CARROTONASTICK = 398, CARROT_ON_A_STICK = 398;
-	public const NETHERSTAR = 399, NETHER_STAR = 399;
-	public const PUMPKIN_PIE = 400;
-	public const FIREWORKS = 401;
-	public const FIREWORKSCHARGE = 402, FIREWORKS_CHARGE = 402;
-	public const ENCHANTED_BOOK = 403;
-	public const COMPARATOR = 404;
-	public const NETHERBRICK = 405, NETHER_BRICK = 405;
-	public const NETHER_QUARTZ = 406, QUARTZ = 406;
-	public const MINECART_WITH_TNT = 407, TNT_MINECART = 407;
-	public const HOPPER_MINECART = 408, MINECART_WITH_HOPPER = 408;
-	public const PRISMARINE_SHARD = 409;
-	public const HOPPER = 410;
-	public const RABBIT = 411, RAW_RABBIT = 411;
-	public const COOKED_RABBIT = 412;
-	public const RABBIT_STEW = 413;
-	public const RABBIT_FOOT = 414;
-	public const RABBIT_HIDE = 415;
-	public const HORSEARMORLEATHER = 416, HORSE_ARMOR_LEATHER = 416, LEATHER_HORSE_ARMOR = 416;
-	public const HORSEARMORIRON = 417, HORSE_ARMOR_IRON = 417, IRON_HORSE_ARMOR = 417;
-	public const GOLDEN_HORSE_ARMOR = 418, GOLD_HORSE_ARMOR = 418, HORSEARMORGOLD = 418, HORSE_ARMOR_GOLD = 418;
-	public const DIAMOND_HORSE_ARMOR = 419, HORSEARMORDIAMOND = 419, HORSE_ARMOR_DIAMOND = 419;
-	public const LEAD = 420;
-	public const NAMETAG = 421, NAME_TAG = 421;
-	public const PRISMARINE_CRYSTALS = 422;
-	public const MUTTON = 423, MUTTONRAW = 423, MUTTON_RAW = 423, RAW_MUTTON = 423;
-	public const COOKED_MUTTON = 424, MUTTONCOOKED = 424, MUTTON_COOKED = 424;
-	public const ARMOR_STAND = 425;
-	public const END_CRYSTAL = 426;
-	public const SPRUCE_DOOR = 427;
-	public const BIRCH_DOOR = 428;
-	public const JUNGLE_DOOR = 429;
-	public const ACACIA_DOOR = 430;
-	public const DARK_OAK_DOOR = 431;
-	public const CHORUS_FRUIT = 432;
-	public const CHORUS_FRUIT_POPPED = 433;
-	public const BANNER_PATTERN = 434;
-
-	public const DRAGON_BREATH = 437;
-	public const SPLASH_POTION = 438;
-
-	public const LINGERING_POTION = 441;
-	public const SPARKLER = 442;
-	public const COMMAND_BLOCK_MINECART = 443, MINECART_WITH_COMMAND_BLOCK = 443;
-	public const ELYTRA = 444;
-	public const SHULKER_SHELL = 445;
-	public const BANNER = 446;
-	public const MEDICINE = 447;
-	public const BALLOON = 448;
-	public const RAPID_FERTILIZER = 449;
-	public const TOTEM = 450;
-	public const BLEACH = 451;
-	public const IRON_NUGGET = 452;
-	public const ICE_BOMB = 453;
-
-	public const TRIDENT = 455;
-
-	public const BEETROOT = 457;
-	public const BEETROOT_SEEDS = 458;
-	public const BEETROOT_SOUP = 459;
-	public const RAW_SALMON = 460, SALMON = 460;
-	public const CLOWNFISH = 461;
-	public const PUFFERFISH = 462;
-	public const COOKED_SALMON = 463;
-	public const DRIED_KELP = 464;
-	public const NAUTILUS_SHELL = 465;
-	public const APPLEENCHANTED = 466, APPLE_ENCHANTED = 466, ENCHANTED_GOLDEN_APPLE = 466;
-	public const HEART_OF_THE_SEA = 467;
-	public const TURTLE_SHELL_PIECE = 468;
-	public const TURTLE_HELMET = 469;
-	public const PHANTOM_MEMBRANE = 470;
-	public const CROSSBOW = 471;
-	public const SPRUCE_SIGN = 472;
-	public const BIRCH_SIGN = 473;
-	public const JUNGLE_SIGN = 474;
-	public const ACACIA_SIGN = 475;
-	public const DARKOAK_SIGN = 476;
-	public const SWEET_BERRIES = 477;
-
-	public const COMPOUND = 499;
-	public const RECORD_13 = 500;
-	public const RECORD_CAT = 501;
-	public const RECORD_BLOCKS = 502;
-	public const RECORD_CHIRP = 503;
-	public const RECORD_FAR = 504;
-	public const RECORD_MALL = 505;
-	public const RECORD_MELLOHI = 506;
-	public const RECORD_STAL = 507;
-	public const RECORD_STRAD = 508;
-	public const RECORD_WARD = 509;
-	public const RECORD_11 = 510;
-	public const RECORD_WAIT = 511;
-
-	public const SHIELD = 513;
-
-}
diff --git a/src/item/ItemTypeIds.php b/src/item/ItemTypeIds.php
new file mode 100644
index 0000000000..f3ad406a67
--- /dev/null
+++ b/src/item/ItemTypeIds.php
@@ -0,0 +1,356 @@
+<?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\item;
+
+/**
+ * Every item in {@link VanillaItems} has a corresponding constant in this class. These constants can be used to
+ * identify and compare item types efficiently using {@link Item::getTypeId()}.
+ *
+ * WARNING: These are NOT a replacement for Minecraft legacy IDs. Do **NOT** hardcode their values, or store them in
+ * configs or databases. They will change without warning.
+ */
+final class ItemTypeIds{
+
+	private function __construct(){
+		//NOOP
+	}
+
+	public const ACACIA_BOAT = 20000;
+	public const ACACIA_SIGN = 20001;
+	public const APPLE = 20002;
+	public const ARROW = 20003;
+	public const BAKED_POTATO = 20004;
+	public const BAMBOO = 20005;
+	public const BANNER = 20006;
+
+	public const BEETROOT = 20008;
+	public const BEETROOT_SEEDS = 20009;
+	public const BEETROOT_SOUP = 20010;
+	public const BIRCH_BOAT = 20011;
+	public const BIRCH_SIGN = 20012;
+	public const BLAZE_POWDER = 20013;
+	public const BLAZE_ROD = 20014;
+	public const BLEACH = 20015;
+	public const BONE = 20016;
+	public const BONE_MEAL = 20017;
+	public const BOOK = 20018;
+	public const BOW = 20019;
+	public const BOWL = 20020;
+	public const BREAD = 20021;
+	public const BRICK = 20022;
+	public const BUCKET = 20023;
+	public const CARROT = 20024;
+	public const CHAINMAIL_BOOTS = 20025;
+	public const CHAINMAIL_CHESTPLATE = 20026;
+	public const CHAINMAIL_HELMET = 20027;
+	public const CHAINMAIL_LEGGINGS = 20028;
+	public const CHARCOAL = 20029;
+	public const CHEMICAL_ALUMINIUM_OXIDE = 20030;
+	public const CHEMICAL_AMMONIA = 20031;
+	public const CHEMICAL_BARIUM_SULPHATE = 20032;
+	public const CHEMICAL_BENZENE = 20033;
+	public const CHEMICAL_BORON_TRIOXIDE = 20034;
+	public const CHEMICAL_CALCIUM_BROMIDE = 20035;
+	public const CHEMICAL_CALCIUM_CHLORIDE = 20036;
+	public const CHEMICAL_CERIUM_CHLORIDE = 20037;
+	public const CHEMICAL_CHARCOAL = 20038;
+	public const CHEMICAL_CRUDE_OIL = 20039;
+	public const CHEMICAL_GLUE = 20040;
+	public const CHEMICAL_HYDROGEN_PEROXIDE = 20041;
+	public const CHEMICAL_HYPOCHLORITE = 20042;
+	public const CHEMICAL_INK = 20043;
+	public const CHEMICAL_IRON_SULPHIDE = 20044;
+	public const CHEMICAL_LATEX = 20045;
+	public const CHEMICAL_LITHIUM_HYDRIDE = 20046;
+	public const CHEMICAL_LUMINOL = 20047;
+	public const CHEMICAL_MAGNESIUM_NITRATE = 20048;
+	public const CHEMICAL_MAGNESIUM_OXIDE = 20049;
+	public const CHEMICAL_MAGNESIUM_SALTS = 20050;
+	public const CHEMICAL_MERCURIC_CHLORIDE = 20051;
+	public const CHEMICAL_POLYETHYLENE = 20052;
+	public const CHEMICAL_POTASSIUM_CHLORIDE = 20053;
+	public const CHEMICAL_POTASSIUM_IODIDE = 20054;
+	public const CHEMICAL_RUBBISH = 20055;
+	public const CHEMICAL_SALT = 20056;
+	public const CHEMICAL_SOAP = 20057;
+	public const CHEMICAL_SODIUM_ACETATE = 20058;
+	public const CHEMICAL_SODIUM_FLUORIDE = 20059;
+	public const CHEMICAL_SODIUM_HYDRIDE = 20060;
+	public const CHEMICAL_SODIUM_HYDROXIDE = 20061;
+	public const CHEMICAL_SODIUM_HYPOCHLORITE = 20062;
+	public const CHEMICAL_SODIUM_OXIDE = 20063;
+	public const CHEMICAL_SUGAR = 20064;
+	public const CHEMICAL_SULPHATE = 20065;
+	public const CHEMICAL_TUNGSTEN_CHLORIDE = 20066;
+	public const CHEMICAL_WATER = 20067;
+	public const CHORUS_FRUIT = 20068;
+	public const CLAY = 20069;
+	public const CLOCK = 20070;
+	public const CLOWNFISH = 20071;
+	public const COAL = 20072;
+	public const COCOA_BEANS = 20073;
+	public const COMPASS = 20074;
+	public const COOKED_CHICKEN = 20075;
+	public const COOKED_FISH = 20076;
+	public const COOKED_MUTTON = 20077;
+	public const COOKED_PORKCHOP = 20078;
+	public const COOKED_RABBIT = 20079;
+	public const COOKED_SALMON = 20080;
+	public const COOKIE = 20081;
+	public const CORAL_FAN = 20082;
+	public const DARK_OAK_BOAT = 20083;
+	public const DARK_OAK_SIGN = 20084;
+	public const DIAMOND = 20085;
+	public const DIAMOND_AXE = 20086;
+	public const DIAMOND_BOOTS = 20087;
+	public const DIAMOND_CHESTPLATE = 20088;
+	public const DIAMOND_HELMET = 20089;
+	public const DIAMOND_HOE = 20090;
+	public const DIAMOND_LEGGINGS = 20091;
+	public const DIAMOND_PICKAXE = 20092;
+	public const DIAMOND_SHOVEL = 20093;
+	public const DIAMOND_SWORD = 20094;
+	public const DRAGON_BREATH = 20095;
+	public const DRIED_KELP = 20096;
+	public const DYE = 20097;
+	public const EGG = 20098;
+	public const EMERALD = 20099;
+	public const ENCHANTED_GOLDEN_APPLE = 20100;
+	public const ENDER_PEARL = 20101;
+	public const EXPERIENCE_BOTTLE = 20102;
+	public const FEATHER = 20103;
+	public const FERMENTED_SPIDER_EYE = 20104;
+	public const FISHING_ROD = 20105;
+	public const FLINT = 20106;
+	public const FLINT_AND_STEEL = 20107;
+	public const GHAST_TEAR = 20108;
+	public const GLASS_BOTTLE = 20109;
+	public const GLISTERING_MELON = 20110;
+	public const GLOWSTONE_DUST = 20111;
+	public const GOLD_INGOT = 20112;
+	public const GOLD_NUGGET = 20113;
+	public const GOLDEN_APPLE = 20114;
+	public const GOLDEN_AXE = 20115;
+	public const GOLDEN_BOOTS = 20116;
+	public const GOLDEN_CARROT = 20117;
+	public const GOLDEN_CHESTPLATE = 20118;
+	public const GOLDEN_HELMET = 20119;
+	public const GOLDEN_HOE = 20120;
+	public const GOLDEN_LEGGINGS = 20121;
+	public const GOLDEN_PICKAXE = 20122;
+	public const GOLDEN_SHOVEL = 20123;
+	public const GOLDEN_SWORD = 20124;
+	public const GUNPOWDER = 20125;
+	public const HEART_OF_THE_SEA = 20126;
+	public const INK_SAC = 20127;
+	public const IRON_AXE = 20128;
+	public const IRON_BOOTS = 20129;
+	public const IRON_CHESTPLATE = 20130;
+	public const IRON_HELMET = 20131;
+	public const IRON_HOE = 20132;
+	public const IRON_INGOT = 20133;
+	public const IRON_LEGGINGS = 20134;
+	public const IRON_NUGGET = 20135;
+	public const IRON_PICKAXE = 20136;
+	public const IRON_SHOVEL = 20137;
+	public const IRON_SWORD = 20138;
+	public const JUNGLE_BOAT = 20139;
+	public const JUNGLE_SIGN = 20140;
+	public const LAPIS_LAZULI = 20141;
+	public const LAVA_BUCKET = 20142;
+	public const LEATHER = 20143;
+	public const LEATHER_BOOTS = 20144;
+	public const LEATHER_CAP = 20145;
+	public const LEATHER_PANTS = 20146;
+	public const LEATHER_TUNIC = 20147;
+	public const MAGMA_CREAM = 20148;
+	public const MELON = 20149;
+	public const MELON_SEEDS = 20150;
+	public const MILK_BUCKET = 20151;
+	public const MINECART = 20152;
+
+	public const MUSHROOM_STEW = 20154;
+	public const NAUTILUS_SHELL = 20155;
+	public const NETHER_BRICK = 20156;
+	public const NETHER_QUARTZ = 20157;
+	public const NETHER_STAR = 20158;
+	public const OAK_BOAT = 20159;
+	public const OAK_SIGN = 20160;
+	public const PAINTING = 20161;
+	public const PAPER = 20162;
+	public const POISONOUS_POTATO = 20163;
+	public const POPPED_CHORUS_FRUIT = 20164;
+	public const POTATO = 20165;
+	public const POTION = 20166;
+	public const PRISMARINE_CRYSTALS = 20167;
+	public const PRISMARINE_SHARD = 20168;
+	public const PUFFERFISH = 20169;
+	public const PUMPKIN_PIE = 20170;
+	public const PUMPKIN_SEEDS = 20171;
+	public const RABBIT_FOOT = 20172;
+	public const RABBIT_HIDE = 20173;
+	public const RABBIT_STEW = 20174;
+	public const RAW_BEEF = 20175;
+	public const RAW_CHICKEN = 20176;
+	public const RAW_FISH = 20177;
+	public const RAW_MUTTON = 20178;
+	public const RAW_PORKCHOP = 20179;
+	public const RAW_RABBIT = 20180;
+	public const RAW_SALMON = 20181;
+	public const RECORD_11 = 20182;
+	public const RECORD_13 = 20183;
+	public const RECORD_BLOCKS = 20184;
+	public const RECORD_CAT = 20185;
+	public const RECORD_CHIRP = 20186;
+	public const RECORD_FAR = 20187;
+	public const RECORD_MALL = 20188;
+	public const RECORD_MELLOHI = 20189;
+	public const RECORD_STAL = 20190;
+	public const RECORD_STRAD = 20191;
+	public const RECORD_WAIT = 20192;
+	public const RECORD_WARD = 20193;
+	public const REDSTONE_DUST = 20194;
+	public const ROTTEN_FLESH = 20195;
+	public const SCUTE = 20196;
+	public const SHEARS = 20197;
+	public const SHULKER_SHELL = 20198;
+	public const SLIMEBALL = 20199;
+	public const SNOWBALL = 20200;
+	public const SPIDER_EYE = 20201;
+	public const SPLASH_POTION = 20202;
+	public const SPRUCE_BOAT = 20203;
+	public const SPRUCE_SIGN = 20204;
+	public const SQUID_SPAWN_EGG = 20205;
+	public const STEAK = 20206;
+	public const STICK = 20207;
+	public const STONE_AXE = 20208;
+	public const STONE_HOE = 20209;
+	public const STONE_PICKAXE = 20210;
+	public const STONE_SHOVEL = 20211;
+	public const STONE_SWORD = 20212;
+	public const STRING = 20213;
+	public const SUGAR = 20214;
+	public const SWEET_BERRIES = 20215;
+	public const TOTEM = 20216;
+	public const VILLAGER_SPAWN_EGG = 20217;
+	public const WATER_BUCKET = 20218;
+	public const WHEAT = 20219;
+	public const WHEAT_SEEDS = 20220;
+	public const WOODEN_AXE = 20221;
+	public const WOODEN_HOE = 20222;
+	public const WOODEN_PICKAXE = 20223;
+	public const WOODEN_SHOVEL = 20224;
+	public const WOODEN_SWORD = 20225;
+	public const WRITABLE_BOOK = 20226;
+	public const WRITTEN_BOOK = 20227;
+	public const ZOMBIE_SPAWN_EGG = 20228;
+	public const CRIMSON_SIGN = 20229;
+	public const MANGROVE_SIGN = 20230;
+	public const WARPED_SIGN = 20231;
+	public const AMETHYST_SHARD = 20232;
+	public const COPPER_INGOT = 20233;
+	public const DISC_FRAGMENT_5 = 20234;
+	public const ECHO_SHARD = 20235;
+	public const GLOW_INK_SAC = 20236;
+	public const HONEY_BOTTLE = 20237;
+	public const HONEYCOMB = 20238;
+	public const RECORD_5 = 20239;
+	public const RECORD_OTHERSIDE = 20240;
+	public const RECORD_PIGSTEP = 20241;
+	public const NETHERITE_INGOT = 20242;
+	public const NETHERITE_AXE = 20243;
+	public const NETHERITE_HOE = 20244;
+	public const NETHERITE_PICKAXE = 20245;
+	public const NETHERITE_SHOVEL = 20246;
+	public const NETHERITE_SWORD = 20247;
+	public const NETHERITE_BOOTS = 20248;
+	public const NETHERITE_CHESTPLATE = 20249;
+	public const NETHERITE_HELMET = 20250;
+	public const NETHERITE_LEGGINGS = 20251;
+	public const PHANTOM_MEMBRANE = 20252;
+	public const RAW_COPPER = 20253;
+	public const RAW_IRON = 20254;
+	public const RAW_GOLD = 20255;
+	public const SPYGLASS = 20256;
+	public const NETHERITE_SCRAP = 20257;
+	public const POWDER_SNOW_BUCKET = 20258;
+	public const LINGERING_POTION = 20259;
+	public const FIRE_CHARGE = 20260;
+	public const SUSPICIOUS_STEW = 20261;
+	public const TURTLE_HELMET = 20262;
+	public const MEDICINE = 20263;
+	public const MANGROVE_BOAT = 20264;
+	public const GLOW_BERRIES = 20265;
+	public const CHERRY_SIGN = 20266;
+	public const ENCHANTED_BOOK = 20267;
+	public const TORCHFLOWER_SEEDS = 20268;
+	public const NETHERITE_UPGRADE_SMITHING_TEMPLATE = 20269;
+	public const SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE = 20270;
+	public const VEX_ARMOR_TRIM_SMITHING_TEMPLATE = 20271;
+	public const WILD_ARMOR_TRIM_SMITHING_TEMPLATE = 20272;
+	public const COAST_ARMOR_TRIM_SMITHING_TEMPLATE = 20273;
+	public const DUNE_ARMOR_TRIM_SMITHING_TEMPLATE = 20274;
+	public const WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE = 20275;
+	public const RAISER_ARMOR_TRIM_SMITHING_TEMPLATE = 20276;
+	public const SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE = 20277;
+	public const HOST_ARMOR_TRIM_SMITHING_TEMPLATE = 20278;
+	public const WARD_ARMOR_TRIM_SMITHING_TEMPLATE = 20279;
+	public const SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE = 20280;
+	public const TIDE_ARMOR_TRIM_SMITHING_TEMPLATE = 20281;
+	public const SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE = 20282;
+	public const RIB_ARMOR_TRIM_SMITHING_TEMPLATE = 20283;
+	public const EYE_ARMOR_TRIM_SMITHING_TEMPLATE = 20284;
+	public const SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE = 20285;
+	public const PITCHER_POD = 20286;
+	public const NAME_TAG = 20287;
+	public const GOAT_HORN = 20288;
+	public const END_CRYSTAL = 20289;
+	public const ICE_BOMB = 20290;
+
+	public const FIRST_UNUSED_ITEM_ID = 20291;
+
+	private static int $nextDynamicId = self::FIRST_UNUSED_ITEM_ID;
+
+	/**
+	 * Returns a new runtime item type ID, e.g. for use by a custom item.
+	 */
+	public static function newId() : int{
+		return self::$nextDynamicId++;
+	}
+
+	public static function fromBlockTypeId(int $blockTypeId) : int{
+		if($blockTypeId < 0){
+			throw new \InvalidArgumentException("Block type IDs cannot be negative");
+		}
+		//negative item type IDs are treated as block IDs
+		return -$blockTypeId;
+	}
+
+	public static function toBlockTypeId(int $itemTypeId) : ?int{
+		if($itemTypeId > 0){ //not a blockitem
+			return null;
+		}
+		return -$itemTypeId;
+	}
+}
diff --git a/src/item/ItemUseResult.php b/src/item/ItemUseResult.php
index ff78b94e43..e3fbe10fb4 100644
--- a/src/item/ItemUseResult.php
+++ b/src/item/ItemUseResult.php
@@ -23,26 +23,20 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static ItemUseResult FAIL()
  * @method static ItemUseResult NONE()
  * @method static ItemUseResult SUCCESS()
  */
-final class ItemUseResult{
-	use EnumTrait;
+enum ItemUseResult{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("none"),
-			new self("fail"),
-			new self("success")
-		);
-	}
+	case NONE;
+	case FAIL;
+	case SUCCESS;
 }
diff --git a/src/item/LegacyStringToItemParser.php b/src/item/LegacyStringToItemParser.php
index 1137674a35..6969190d5f 100644
--- a/src/item/LegacyStringToItemParser.php
+++ b/src/item/LegacyStringToItemParser.php
@@ -23,14 +23,19 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
+use pocketmine\data\bedrock\item\ItemDeserializer;
+use pocketmine\data\bedrock\item\ItemTypeDeserializeException;
+use pocketmine\data\bedrock\item\upgrade\ItemDataUpgrader;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Filesystem;
 use pocketmine\utils\SingletonTrait;
+use pocketmine\utils\Utils;
+use pocketmine\world\format\io\GlobalItemDataHandlers;
 use Symfony\Component\Filesystem\Path;
 use function explode;
 use function is_array;
-use function is_int;
 use function is_numeric;
+use function is_string;
 use function json_decode;
 use function str_replace;
 use function strtolower;
@@ -45,20 +50,26 @@ use function trim;
  * Avoid using this wherever possible. Unless you need to parse item strings containing meta (e.g. "dye:4", "351:4") or
  * item IDs (e.g. "351"), you should prefer the newer StringToItemParser, which is much more user-friendly, more
  * flexible, and also supports registering custom aliases for any item in any state.
+ *
+ * WARNING: This class does NOT support items added during or after PocketMine-MP 5.0.0. Use StringToItemParser for
+ * modern items.
  */
 final class LegacyStringToItemParser{
 	use SingletonTrait;
 
 	private static function make() : self{
-		$result = new self(ItemFactory::getInstance());
+		$result = new self(
+			GlobalItemDataHandlers::getUpgrader(),
+			GlobalItemDataHandlers::getDeserializer()
+		);
 
 		$mappingsRaw = Filesystem::fileGetContents(Path::join(\pocketmine\RESOURCE_PATH, 'item_from_string_bc_map.json'));
 
 		$mappings = json_decode($mappingsRaw, true);
 		if(!is_array($mappings)) throw new AssumptionFailedError("Invalid mappings format, expected array");
 
-		foreach($mappings as $name => $id){
-			if(!is_int($id)) throw new AssumptionFailedError("Invalid mappings format, expected int values");
+		foreach(Utils::promoteKeys($mappings) as $name => $id){
+			if(!is_string($id)) throw new AssumptionFailedError("Invalid mappings format, expected string values");
 			$result->addMapping((string) $name, $id);
 		}
 
@@ -66,20 +77,23 @@ final class LegacyStringToItemParser{
 	}
 
 	/**
-	 * @var int[]
-	 * @phpstan-var array<string, int>
+	 * @var string[]
+	 * @phpstan-var array<string, string>
 	 */
 	private array $map = [];
 
-	public function __construct(private ItemFactory $itemFactory){}
+	public function __construct(
+		private ItemDataUpgrader $itemDataUpgrader,
+		private ItemDeserializer $itemDeserializer
+	){}
 
-	public function addMapping(string $alias, int $id) : void{
+	public function addMapping(string $alias, string $id) : void{
 		$this->map[$alias] = $id;
 	}
 
 	/**
-	 * @return int[]
-	 * @phpstan-return array<string, int>
+	 * @return string[]
+	 * @phpstan-return array<string, string>
 	 */
 	public function getMappings() : array{
 		return $this->map;
@@ -107,14 +121,23 @@ final class LegacyStringToItemParser{
 			throw new LegacyStringToItemParserException("Unable to parse \"" . $b[1] . "\" from \"" . $input . "\" as a valid meta value");
 		}
 
-		$id = strtolower($b[0]);
-		if(isset($this->map[$id])){
-			$item = $this->itemFactory->get($this->map[$id], $meta);
-		}else{
-			throw new LegacyStringToItemParserException("Unable to resolve \"" . $input . "\" to a valid item");
+		$lower = strtolower($b[0]);
+		if($lower === "0" || $lower === "air"){
+			//item deserializer doesn't recognize air items since they aren't supposed to exist
+			return VanillaItems::AIR();
 		}
 
-		return $item;
+		$legacyId = $this->map[$lower] ?? null;
+		if($legacyId === null){
+			throw new LegacyStringToItemParserException("Unable to resolve \"" . $input . "\" to a valid item");
+		}
+		$itemData = $this->itemDataUpgrader->upgradeItemTypeDataString($legacyId, $meta, 1, null);
+
+		try{
+			return $this->itemDeserializer->deserializeStack($itemData);
+		}catch(ItemTypeDeserializeException $e){
+			throw new LegacyStringToItemParserException($e->getMessage(), 0, $e);
+		}
 	}
 
 	protected function reprocess(string $input) : string{
diff --git a/src/item/LiquidBucket.php b/src/item/LiquidBucket.php
index 8e6d41716b..eb2cb18ed9 100644
--- a/src/item/LiquidBucket.php
+++ b/src/item/LiquidBucket.php
@@ -54,9 +54,9 @@ class LiquidBucket extends Item{
 		return VanillaItems::BUCKET();
 	}
 
-	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{
+	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, array &$returnedItems) : ItemUseResult{
 		if(!$blockReplace->canBeReplaced()){
-			return ItemUseResult::NONE();
+			return ItemUseResult::NONE;
 		}
 
 		//TODO: move this to generic placement logic
@@ -68,13 +68,12 @@ class LiquidBucket extends Item{
 			$player->getWorld()->setBlock($blockReplace->getPosition(), $resultBlock->getFlowingForm());
 			$player->getWorld()->addSound($blockReplace->getPosition()->add(0.5, 0.5, 0.5), $resultBlock->getBucketEmptySound());
 
-			if($player->hasFiniteResources()){
-				$player->getInventory()->setItemInHand($ev->getItem());
-			}
-			return ItemUseResult::SUCCESS();
+			$this->pop();
+			$returnedItems[] = $ev->getItem();
+			return ItemUseResult::SUCCESS;
 		}
 
-		return ItemUseResult::FAIL();
+		return ItemUseResult::FAIL;
 	}
 
 	public function getLiquid() : Liquid{
diff --git a/src/item/Medicine.php b/src/item/Medicine.php
new file mode 100644
index 0000000000..bd2f724649
--- /dev/null
+++ b/src/item/Medicine.php
@@ -0,0 +1,67 @@
+<?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\item;
+
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\entity\Living;
+use pocketmine\player\Player;
+
+class Medicine extends Item implements ConsumableItem{
+
+	private MedicineType $medicineType = MedicineType::EYE_DROPS;
+
+	protected function describeState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->medicineType);
+	}
+
+	public function getType() : MedicineType{ return $this->medicineType; }
+
+	/**
+	 * @return $this
+	 */
+	public function setType(MedicineType $type) : self{
+		$this->medicineType = $type;
+		return $this;
+	}
+
+	public function getMaxStackSize() : int{
+		return 1;
+	}
+
+	public function onConsume(Living $consumer) : void{
+		$consumer->getEffects()->remove($this->getType()->getCuredEffect());
+	}
+
+	public function getAdditionalEffects() : array{
+		return [];
+	}
+
+	public function getResidue() : Item{
+		return VanillaItems::GLASS_BOTTLE();
+	}
+
+	public function canStartUsingItem(Player $player) : bool{
+		return $player->getEffects()->has($this->getType()->getCuredEffect());
+	}
+}
diff --git a/src/item/MedicineType.php b/src/item/MedicineType.php
new file mode 100644
index 0000000000..ea99bb75dc
--- /dev/null
+++ b/src/item/MedicineType.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\item;
+
+use pocketmine\entity\effect\Effect;
+use pocketmine\entity\effect\VanillaEffects;
+use pocketmine\utils\LegacyEnumShimTrait;
+
+/**
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
+ *
+ * @method static MedicineType ANTIDOTE()
+ * @method static MedicineType ELIXIR()
+ * @method static MedicineType EYE_DROPS()
+ * @method static MedicineType TONIC()
+ */
+enum MedicineType{
+	use LegacyEnumShimTrait;
+
+	case ANTIDOTE;
+	case ELIXIR;
+	case EYE_DROPS;
+	case TONIC;
+
+	/**
+	 * @phpstan-return array{0: string, 1: Effect}
+	 */
+	private function getMetadata() : array{
+		//cache not required here - VanillaEffects always returns the same object
+		return match($this){
+			self::ANTIDOTE => ['Antidote', VanillaEffects::POISON()],
+			self::ELIXIR => ['Elixir', VanillaEffects::WEAKNESS()],
+			self::EYE_DROPS => ['Eye Drops', VanillaEffects::BLINDNESS()],
+			self::TONIC => ['Tonic', VanillaEffects::NAUSEA()]
+		};
+	}
+
+	public function getDisplayName() : string{ return $this->getMetadata()[0]; }
+
+	public function getCuredEffect() : Effect{ return $this->getMetadata()[1]; }
+}
diff --git a/src/item/NameTag.php b/src/item/NameTag.php
new file mode 100644
index 0000000000..8c7113e1de
--- /dev/null
+++ b/src/item/NameTag.php
@@ -0,0 +1,40 @@
+<?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\item;
+
+use pocketmine\entity\Entity;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+
+class NameTag extends Item{
+
+	public function onInteractEntity(Player $player, Entity $entity, Vector3 $clickVector) : bool{
+		if($entity->canBeRenamed() && $this->hasCustomName()){
+			$entity->setNameTag($this->getCustomName());
+			$this->pop();
+			return true;
+		}
+		return false;
+	}
+}
diff --git a/src/item/PaintingItem.php b/src/item/PaintingItem.php
index 1c649c8e06..a83c8dba8f 100644
--- a/src/item/PaintingItem.php
+++ b/src/item/PaintingItem.php
@@ -37,9 +37,9 @@ use function count;
 
 class PaintingItem extends Item{
 
-	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{
+	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, array &$returnedItems) : ItemUseResult{
 		if(Facing::axis($face) === Axis::Y){
-			return ItemUseResult::NONE();
+			return ItemUseResult::NONE;
 		}
 
 		$motives = [];
@@ -67,7 +67,7 @@ class PaintingItem extends Item{
 		}
 
 		if(count($motives) === 0){ //No space available
-			return ItemUseResult::NONE();
+			return ItemUseResult::NONE;
 		}
 
 		/** @var PaintingMotive $motive */
@@ -81,6 +81,6 @@ class PaintingItem extends Item{
 		$entity->spawnToAll();
 
 		$player->getWorld()->addSound($replacePos->add(0.5, 0.5, 0.5), new PaintingPlaceSound());
-		return ItemUseResult::SUCCESS();
+		return ItemUseResult::SUCCESS;
 	}
 }
diff --git a/src/item/Pickaxe.php b/src/item/Pickaxe.php
index 9796785072..0c8fa01642 100644
--- a/src/item/Pickaxe.php
+++ b/src/item/Pickaxe.php
@@ -41,14 +41,14 @@ class Pickaxe extends TieredTool{
 		return $this->tier->getBaseAttackPoints() - 2;
 	}
 
-	public function onDestroyBlock(Block $block) : bool{
+	public function onDestroyBlock(Block $block, array &$returnedItems) : bool{
 		if(!$block->getBreakInfo()->breaksInstantly()){
 			return $this->applyDamage(1);
 		}
 		return false;
 	}
 
-	public function onAttackEntity(Entity $victim) : bool{
+	public function onAttackEntity(Entity $victim, array &$returnedItems) : bool{
 		return $this->applyDamage(2);
 	}
 }
diff --git a/src/item/PitcherPod.php b/src/item/PitcherPod.php
new file mode 100644
index 0000000000..be9393515d
--- /dev/null
+++ b/src/item/PitcherPod.php
@@ -0,0 +1,34 @@
+<?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\item;
+
+use pocketmine\block\Block;
+use pocketmine\block\VanillaBlocks;
+
+final class PitcherPod extends Item{
+
+	public function getBlock(?int $clickedFace = null) : Block{
+		return VanillaBlocks::PITCHER_CROP();
+	}
+}
diff --git a/src/item/Potion.php b/src/item/Potion.php
index 1255a5396d..192a257841 100644
--- a/src/item/Potion.php
+++ b/src/item/Potion.php
@@ -23,26 +23,35 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\entity\Living;
 use pocketmine\player\Player;
+use pocketmine\world\sound\BottleEmptySound;
 
 class Potion extends Item implements ConsumableItem{
 
-	private PotionType $potionType;
+	private PotionType $potionType = PotionType::WATER;
 
-	public function __construct(ItemIdentifier $identifier, string $name, PotionType $potionType){
-		parent::__construct($identifier, $name);
-		$this->potionType = $potionType;
+	protected function describeState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->potionType);
 	}
 
 	public function getType() : PotionType{ return $this->potionType; }
 
+	/**
+	 * @return $this
+	 */
+	public function setType(PotionType $type) : self{
+		$this->potionType = $type;
+		return $this;
+	}
+
 	public function getMaxStackSize() : int{
 		return 1;
 	}
 
 	public function onConsume(Living $consumer) : void{
-
+		$consumer->broadcastSound(new BottleEmptySound());
 	}
 
 	public function getAdditionalEffects() : array{
diff --git a/src/item/PotionType.php b/src/item/PotionType.php
index 7ec0f38761..3f4773e6de 100644
--- a/src/item/PotionType.php
+++ b/src/item/PotionType.php
@@ -25,13 +25,12 @@ namespace pocketmine\item;
 
 use pocketmine\entity\effect\EffectInstance;
 use pocketmine\entity\effect\VanillaEffects;
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
+use function spl_object_id;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static PotionType AWKWARD()
  * @method static PotionType FIRE_RESISTANCE()
@@ -65,6 +64,7 @@ use pocketmine\utils\EnumTrait;
  * @method static PotionType STRONG_LEAPING()
  * @method static PotionType STRONG_POISON()
  * @method static PotionType STRONG_REGENERATION()
+ * @method static PotionType STRONG_SLOWNESS()
  * @method static PotionType STRONG_STRENGTH()
  * @method static PotionType STRONG_SWIFTNESS()
  * @method static PotionType STRONG_TURTLE_MASTER()
@@ -75,154 +75,196 @@ use pocketmine\utils\EnumTrait;
  * @method static PotionType WATER_BREATHING()
  * @method static PotionType WEAKNESS()
  * @method static PotionType WITHER()
+ *
+ * @phpstan-type TMetadata array{0: string, 1: \Closure() : list<EffectInstance>}
  */
-final class PotionType{
-	use EnumTrait {
-		__construct as Enum___construct;
-	}
+enum PotionType{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("water", "Water", fn() => []),
-			new self("mundane", "Mundane", fn() => []),
-			new self("long_mundane", "Long Mundane", fn() => []),
-			new self("thick", "Thick", fn() => []),
-			new self("awkward", "Awkward", fn() => []),
-			new self("night_vision", "Night Vision", fn() => [
-				new EffectInstance(VanillaEffects::NIGHT_VISION(), 3600)
-			]),
-			new self("long_night_vision", "Long Night Vision", fn() => [
-				new EffectInstance(VanillaEffects::NIGHT_VISION(), 9600)
-			]),
-			new self("invisibility", "Invisibility", fn() => [
-				new EffectInstance(VanillaEffects::INVISIBILITY(), 3600)
-			]),
-			new self("long_invisibility", "Long Invisibility", fn() => [
-				new EffectInstance(VanillaEffects::INVISIBILITY(), 9600)
-			]),
-			new self("leaping", "Leaping", fn() => [
-				new EffectInstance(VanillaEffects::JUMP_BOOST(), 3600)
-			]),
-			new self("long_leaping", "Long Leaping", fn() => [
-				new EffectInstance(VanillaEffects::JUMP_BOOST(), 9600)
-			]),
-			new self("strong_leaping", "Strong Leaping", fn() => [
-				new EffectInstance(VanillaEffects::JUMP_BOOST(), 1800, 1)
-			]),
-			new self("fire_resistance", "Fire Resistance", fn() => [
-				new EffectInstance(VanillaEffects::FIRE_RESISTANCE(), 3600)
-			]),
-			new self("long_fire_resistance", "Long Fire Resistance", fn() => [
-				new EffectInstance(VanillaEffects::FIRE_RESISTANCE(), 9600)
-			]),
-			new self("swiftness", "Swiftness", fn() => [
-				new EffectInstance(VanillaEffects::SPEED(), 3600)
-			]),
-			new self("long_swiftness", "Long Swiftness", fn() => [
-				new EffectInstance(VanillaEffects::SPEED(), 9600)
-			]),
-			new self("strong_swiftness", "Strong Swiftness", fn() => [
-				new EffectInstance(VanillaEffects::SPEED(), 1800, 1)
-			]),
-			new self("slowness", "Slowness", fn() => [
-				new EffectInstance(VanillaEffects::SLOWNESS(), 1800)
-			]),
-			new self("long_slowness", "Long Slowness", fn() => [
-				new EffectInstance(VanillaEffects::SLOWNESS(), 4800)
-			]),
-			new self("water_breathing", "Water Breathing", fn() => [
-				new EffectInstance(VanillaEffects::WATER_BREATHING(), 3600)
-			]),
-			new self("long_water_breathing", "Long Water Breathing", fn() => [
-				new EffectInstance(VanillaEffects::WATER_BREATHING(), 9600)
-			]),
-			new self("healing", "Healing", fn() => [
-				new EffectInstance(VanillaEffects::INSTANT_HEALTH())
-			]),
-			new self("strong_healing", "Strong Healing", fn() => [
-				new EffectInstance(VanillaEffects::INSTANT_HEALTH(), null, 1)
-			]),
-			new self("harming", "Harming", fn() => [
-				new EffectInstance(VanillaEffects::INSTANT_DAMAGE())
-			]),
-			new self("strong_harming", "Strong Harming", fn() => [
-				new EffectInstance(VanillaEffects::INSTANT_DAMAGE(), null, 1)
-			]),
-			new self("poison", "Poison", fn() => [
-				new EffectInstance(VanillaEffects::POISON(), 900)
-			]),
-			new self("long_poison", "Long Poison", fn() => [
-				new EffectInstance(VanillaEffects::POISON(), 2400)
-			]),
-			new self("strong_poison", "Strong Poison", fn() => [
-				new EffectInstance(VanillaEffects::POISON(), 440, 1)
-			]),
-			new self("regeneration", "Regeneration", fn() => [
-				new EffectInstance(VanillaEffects::REGENERATION(), 900)
-			]),
-			new self("long_regeneration", "Long Regeneration", fn() => [
-				new EffectInstance(VanillaEffects::REGENERATION(), 2400)
-			]),
-			new self("strong_regeneration", "Strong Regeneration", fn() => [
-				new EffectInstance(VanillaEffects::REGENERATION(), 440, 1)
-			]),
-			new self("strength", "Strength", fn() => [
-				new EffectInstance(VanillaEffects::STRENGTH(), 3600)
-			]),
-			new self("long_strength", "Long Strength", fn() => [
-				new EffectInstance(VanillaEffects::STRENGTH(), 9600)
-			]),
-			new self("strong_strength", "Strong Strength", fn() => [
-				new EffectInstance(VanillaEffects::STRENGTH(), 1800, 1)
-			]),
-			new self("weakness", "Weakness", fn() => [
-				new EffectInstance(VanillaEffects::WEAKNESS(), 1800)
-			]),
-			new self("long_weakness", "Long Weakness", fn() => [
-				new EffectInstance(VanillaEffects::WEAKNESS(), 4800)
-			]),
-			new self("wither", "Wither", fn() => [
-				new EffectInstance(VanillaEffects::WITHER(), 800, 1)
-			]),
-			new self("turtle_master", "Turtle Master", fn() => [
-				new EffectInstance(VanillaEffects::SLOWNESS(), 20 * 20, 3),
-				new EffectInstance(VanillaEffects::RESISTANCE(), 20 * 20, 2),
-			]),
-			new self("long_turtle_master", "Long Turtle Master", fn() => [
-				new EffectInstance(VanillaEffects::SLOWNESS(), 40 * 20, 3),
-				new EffectInstance(VanillaEffects::RESISTANCE(), 40 * 20, 2),
-			]),
-			new self("strong_turtle_master", "Strong Turtle Master", fn() => [
-				new EffectInstance(VanillaEffects::SLOWNESS(), 20 * 20, 5),
-				new EffectInstance(VanillaEffects::RESISTANCE(), 20 * 20, 3),
-			]),
-			new self("slow_falling", "Slow Falling", fn() => [
-				//TODO
-			]),
-			new self("long_slow_falling", "Long Slow Falling", fn() => [
-				//TODO
-			])
-		);
-	}
+	case WATER;
+	case MUNDANE;
+	case LONG_MUNDANE;
+	case THICK;
+	case AWKWARD;
+	case NIGHT_VISION;
+	case LONG_NIGHT_VISION;
+	case INVISIBILITY;
+	case LONG_INVISIBILITY;
+	case LEAPING;
+	case LONG_LEAPING;
+	case STRONG_LEAPING;
+	case FIRE_RESISTANCE;
+	case LONG_FIRE_RESISTANCE;
+	case SWIFTNESS;
+	case LONG_SWIFTNESS;
+	case STRONG_SWIFTNESS;
+	case SLOWNESS;
+	case LONG_SLOWNESS;
+	case WATER_BREATHING;
+	case LONG_WATER_BREATHING;
+	case HEALING;
+	case STRONG_HEALING;
+	case HARMING;
+	case STRONG_HARMING;
+	case POISON;
+	case LONG_POISON;
+	case STRONG_POISON;
+	case REGENERATION;
+	case LONG_REGENERATION;
+	case STRONG_REGENERATION;
+	case STRENGTH;
+	case LONG_STRENGTH;
+	case STRONG_STRENGTH;
+	case WEAKNESS;
+	case LONG_WEAKNESS;
+	case WITHER;
+	case TURTLE_MASTER;
+	case LONG_TURTLE_MASTER;
+	case STRONG_TURTLE_MASTER;
+	case SLOW_FALLING;
+	case LONG_SLOW_FALLING;
+	case STRONG_SLOWNESS;
 
 	/**
-	 * @phpstan-param \Closure() : list<EffectInstance> $effectsGetter
+	 * @phpstan-return TMetadata
 	 */
-	private function __construct(
-		string $enumName,
-		private string $displayName,
-		private \Closure $effectsGetter
-	){
-		$this->Enum___construct($enumName);
+	private function getMetadata() : array{
+		/** @phpstan-var array<int, TMetadata> $cache */
+		static $cache = [];
+
+		return $cache[spl_object_id($this)] ??= match($this){
+			self::WATER => ["Water", fn() => []],
+			self::MUNDANE => ["Mundane", fn() => []],
+			self::LONG_MUNDANE => ["Long Mundane", fn() => []],
+			self::THICK => ["Thick", fn() => []],
+			self::AWKWARD => ["Awkward", fn() => []],
+			self::NIGHT_VISION => ["Night Vision", fn() => [
+				new EffectInstance(VanillaEffects::NIGHT_VISION(), 3600)
+			]],
+			self::LONG_NIGHT_VISION => ["Long Night Vision", fn() => [
+				new EffectInstance(VanillaEffects::NIGHT_VISION(), 9600)
+			]],
+			self::INVISIBILITY => ["Invisibility", fn() => [
+				new EffectInstance(VanillaEffects::INVISIBILITY(), 3600)
+			]],
+			self::LONG_INVISIBILITY => ["Long Invisibility", fn() => [
+				new EffectInstance(VanillaEffects::INVISIBILITY(), 9600)
+			]],
+			self::LEAPING => ["Leaping", fn() => [
+				new EffectInstance(VanillaEffects::JUMP_BOOST(), 3600)
+			]],
+			self::LONG_LEAPING => ["Long Leaping", fn() => [
+				new EffectInstance(VanillaEffects::JUMP_BOOST(), 9600)
+			]],
+			self::STRONG_LEAPING => ["Strong Leaping", fn() => [
+				new EffectInstance(VanillaEffects::JUMP_BOOST(), 1800, 1)
+			]],
+			self::FIRE_RESISTANCE => ["Fire Resistance", fn() => [
+				new EffectInstance(VanillaEffects::FIRE_RESISTANCE(), 3600)
+			]],
+			self::LONG_FIRE_RESISTANCE => ["Long Fire Resistance", fn() => [
+				new EffectInstance(VanillaEffects::FIRE_RESISTANCE(), 9600)
+			]],
+			self::SWIFTNESS => ["Swiftness", fn() => [
+				new EffectInstance(VanillaEffects::SPEED(), 3600)
+			]],
+			self::LONG_SWIFTNESS => ["Long Swiftness", fn() => [
+				new EffectInstance(VanillaEffects::SPEED(), 9600)
+			]],
+			self::STRONG_SWIFTNESS => ["Strong Swiftness", fn() => [
+				new EffectInstance(VanillaEffects::SPEED(), 1800, 1)
+			]],
+			self::SLOWNESS => ["Slowness", fn() => [
+				new EffectInstance(VanillaEffects::SLOWNESS(), 1800)
+			]],
+			self::LONG_SLOWNESS => ["Long Slowness", fn() => [
+				new EffectInstance(VanillaEffects::SLOWNESS(), 4800)
+			]],
+			self::WATER_BREATHING => ["Water Breathing", fn() => [
+				new EffectInstance(VanillaEffects::WATER_BREATHING(), 3600)
+			]],
+			self::LONG_WATER_BREATHING => ["Long Water Breathing", fn() => [
+				new EffectInstance(VanillaEffects::WATER_BREATHING(), 9600)
+			]],
+			self::HEALING => ["Healing", fn() => [
+				new EffectInstance(VanillaEffects::INSTANT_HEALTH())
+			]],
+			self::STRONG_HEALING => ["Strong Healing", fn() => [
+				new EffectInstance(VanillaEffects::INSTANT_HEALTH(), null, 1)
+			]],
+			self::HARMING => ["Harming", fn() => [
+				new EffectInstance(VanillaEffects::INSTANT_DAMAGE())
+			]],
+			self::STRONG_HARMING => ["Strong Harming", fn() => [
+				new EffectInstance(VanillaEffects::INSTANT_DAMAGE(), null, 1)
+			]],
+			self::POISON => ["Poison", fn() => [
+				new EffectInstance(VanillaEffects::POISON(), 900)
+			]],
+			self::LONG_POISON => ["Long Poison", fn() => [
+				new EffectInstance(VanillaEffects::POISON(), 2400)
+			]],
+			self::STRONG_POISON => ["Strong Poison", fn() => [
+				new EffectInstance(VanillaEffects::POISON(), 440, 1)
+			]],
+			self::REGENERATION => ["Regeneration", fn() => [
+				new EffectInstance(VanillaEffects::REGENERATION(), 900)
+			]],
+			self::LONG_REGENERATION => ["Long Regeneration", fn() => [
+				new EffectInstance(VanillaEffects::REGENERATION(), 2400)
+			]],
+			self::STRONG_REGENERATION => ["Strong Regeneration", fn() => [
+				new EffectInstance(VanillaEffects::REGENERATION(), 440, 1)
+			]],
+			self::STRENGTH => ["Strength", fn() => [
+				new EffectInstance(VanillaEffects::STRENGTH(), 3600)
+			]],
+			self::LONG_STRENGTH => ["Long Strength", fn() => [
+				new EffectInstance(VanillaEffects::STRENGTH(), 9600)
+			]],
+			self::STRONG_STRENGTH => ["Strong Strength", fn() => [
+				new EffectInstance(VanillaEffects::STRENGTH(), 1800, 1)
+			]],
+			self::WEAKNESS => ["Weakness", fn() => [
+				new EffectInstance(VanillaEffects::WEAKNESS(), 1800)
+			]],
+			self::LONG_WEAKNESS => ["Long Weakness", fn() => [
+				new EffectInstance(VanillaEffects::WEAKNESS(), 4800)
+			]],
+			self::WITHER => ["Wither", fn() => [
+				new EffectInstance(VanillaEffects::WITHER(), 800, 1)
+			]],
+			self::TURTLE_MASTER => ["Turtle Master", fn() => [
+				new EffectInstance(VanillaEffects::SLOWNESS(), 20 * 20, 3),
+				new EffectInstance(VanillaEffects::RESISTANCE(), 20 * 20, 2),
+			]],
+			self::LONG_TURTLE_MASTER => ["Long Turtle Master", fn() => [
+				new EffectInstance(VanillaEffects::SLOWNESS(), 40 * 20, 3),
+				new EffectInstance(VanillaEffects::RESISTANCE(), 40 * 20, 2),
+			]],
+			self::STRONG_TURTLE_MASTER => ["Strong Turtle Master", fn() => [
+				new EffectInstance(VanillaEffects::SLOWNESS(), 20 * 20, 5),
+				new EffectInstance(VanillaEffects::RESISTANCE(), 20 * 20, 3),
+			]],
+			self::SLOW_FALLING => ["Slow Falling", fn() => [
+				//TODO
+			]],
+			self::LONG_SLOW_FALLING => ["Long Slow Falling", fn() => [
+				//TODO
+			]],
+			self::STRONG_SLOWNESS => ["Strong Slowness", fn() => [
+				new EffectInstance(VanillaEffects::SLOWNESS(), 20 * 20, 3)
+			]]
+		};
 	}
 
-	public function getDisplayName() : string{ return $this->displayName; }
+	public function getDisplayName() : string{ return $this->getMetadata()[0]; }
 
 	/**
 	 * @return EffectInstance[]
 	 * @phpstan-return list<EffectInstance>
 	 */
 	public function getEffects() : array{
-		return ($this->effectsGetter)();
+		return ($this->getMetadata()[1])();
 	}
 }
diff --git a/src/item/ProjectileItem.php b/src/item/ProjectileItem.php
index e36eed21ab..47c4583e04 100644
--- a/src/item/ProjectileItem.php
+++ b/src/item/ProjectileItem.php
@@ -36,7 +36,7 @@ abstract class ProjectileItem extends Item{
 
 	abstract protected function createEntity(Location $location, Player $thrower) : Throwable;
 
-	public function onClickAir(Player $player, Vector3 $directionVector) : ItemUseResult{
+	public function onClickAir(Player $player, Vector3 $directionVector, array &$returnedItems) : ItemUseResult{
 		$location = $player->getLocation();
 
 		$projectile = $this->createEntity(Location::fromObject($player->getEyePos(), $player->getWorld(), $location->yaw, $location->pitch), $player);
@@ -46,7 +46,7 @@ abstract class ProjectileItem extends Item{
 		$projectileEv->call();
 		if($projectileEv->isCancelled()){
 			$projectile->flagForDespawn();
-			return ItemUseResult::FAIL();
+			return ItemUseResult::FAIL;
 		}
 
 		$projectile->spawnToAll();
@@ -55,6 +55,6 @@ abstract class ProjectileItem extends Item{
 
 		$this->pop();
 
-		return ItemUseResult::SUCCESS();
+		return ItemUseResult::SUCCESS;
 	}
 }
diff --git a/src/item/RottenFlesh.php b/src/item/RottenFlesh.php
index 4cecc67fcd..2ea3ee9559 100644
--- a/src/item/RottenFlesh.php
+++ b/src/item/RottenFlesh.php
@@ -25,7 +25,7 @@ namespace pocketmine\item;
 
 use pocketmine\entity\effect\EffectInstance;
 use pocketmine\entity\effect\VanillaEffects;
-use function lcg_value;
+use pocketmine\utils\Utils;
 
 class RottenFlesh extends Food{
 
@@ -38,7 +38,7 @@ class RottenFlesh extends Food{
 	}
 
 	public function getAdditionalEffects() : array{
-		if(lcg_value() <= 0.8){
+		if(Utils::getRandomFloat() <= 0.8){
 			return [
 				new EffectInstance(VanillaEffects::HUNGER(), 600)
 			];
diff --git a/src/item/Shears.php b/src/item/Shears.php
index a806e649f3..9c70d6cb2c 100644
--- a/src/item/Shears.php
+++ b/src/item/Shears.php
@@ -44,7 +44,7 @@ class Shears extends Tool{
 		return 15;
 	}
 
-	public function onDestroyBlock(Block $block) : bool{
+	public function onDestroyBlock(Block $block, array &$returnedItems) : bool{
 		return $this->applyDamage(1);
 	}
 }
diff --git a/src/item/Shovel.php b/src/item/Shovel.php
index dde12f4114..d3d0ae4298 100644
--- a/src/item/Shovel.php
+++ b/src/item/Shovel.php
@@ -41,14 +41,14 @@ class Shovel extends TieredTool{
 		return $this->tier->getBaseAttackPoints() - 3;
 	}
 
-	public function onDestroyBlock(Block $block) : bool{
+	public function onDestroyBlock(Block $block, array &$returnedItems) : bool{
 		if(!$block->getBreakInfo()->breaksInstantly()){
 			return $this->applyDamage(1);
 		}
 		return false;
 	}
 
-	public function onAttackEntity(Entity $victim) : bool{
+	public function onAttackEntity(Entity $victim, array &$returnedItems) : bool{
 		return $this->applyDamage(2);
 	}
 }
diff --git a/src/item/SpawnEgg.php b/src/item/SpawnEgg.php
index 84e8e2cf5d..ab4f0e1498 100644
--- a/src/item/SpawnEgg.php
+++ b/src/item/SpawnEgg.php
@@ -27,15 +27,15 @@ use pocketmine\block\Block;
 use pocketmine\entity\Entity;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
+use pocketmine\utils\Utils;
 use pocketmine\world\World;
-use function lcg_value;
 
 abstract class SpawnEgg extends Item{
 
 	abstract protected function createEntity(World $world, Vector3 $pos, float $yaw, float $pitch) : Entity;
 
-	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{
-		$entity = $this->createEntity($player->getWorld(), $blockReplace->getPosition()->add(0.5, 0, 0.5), lcg_value() * 360, 0);
+	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, array &$returnedItems) : ItemUseResult{
+		$entity = $this->createEntity($player->getWorld(), $blockReplace->getPosition()->add(0.5, 0, 0.5), Utils::getRandomFloat() * 360, 0);
 
 		if($this->hasCustomName()){
 			$entity->setNameTag($this->getCustomName());
@@ -43,6 +43,6 @@ abstract class SpawnEgg extends Item{
 		$this->pop();
 		$entity->spawnToAll();
 		//TODO: what if the entity was marked for deletion?
-		return ItemUseResult::SUCCESS();
+		return ItemUseResult::SUCCESS;
 	}
 }
diff --git a/src/item/SplashPotion.php b/src/item/SplashPotion.php
index be59523067..e1c9167ac3 100644
--- a/src/item/SplashPotion.php
+++ b/src/item/SplashPotion.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
+use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\entity\Location;
 use pocketmine\entity\projectile\SplashPotion as SplashPotionEntity;
 use pocketmine\entity\projectile\Throwable;
@@ -30,15 +31,22 @@ use pocketmine\player\Player;
 
 class SplashPotion extends ProjectileItem{
 
-	private PotionType $potionType;
+	private PotionType $potionType = PotionType::WATER;
 
-	public function __construct(ItemIdentifier $identifier, string $name, PotionType $potionType){
-		parent::__construct($identifier, $name);
-		$this->potionType = $potionType;
+	protected function describeState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->potionType);
 	}
 
 	public function getType() : PotionType{ return $this->potionType; }
 
+	/**
+	 * @return $this
+	 */
+	public function setType(PotionType $type) : self{
+		$this->potionType = $type;
+		return $this;
+	}
+
 	public function getMaxStackSize() : int{
 		return 1;
 	}
diff --git a/src/item/Spyglass.php b/src/item/Spyglass.php
new file mode 100644
index 0000000000..974715c258
--- /dev/null
+++ b/src/item/Spyglass.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\item;
+
+use pocketmine\player\Player;
+
+class Spyglass extends Item implements Releasable{
+
+	public function getMaxStackSize() : int{
+		return 1;
+	}
+
+	public function canStartUsingItem(Player $player) : bool{
+		return true;
+	}
+}
diff --git a/src/item/StringToItemParser.php b/src/item/StringToItemParser.php
index ad2fb6f08e..4cc9d29eb6 100644
--- a/src/item/StringToItemParser.php
+++ b/src/item/StringToItemParser.php
@@ -23,14 +23,22 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
+use pocketmine\block\AmethystCluster;
 use pocketmine\block\Block;
+use pocketmine\block\Light;
+use pocketmine\block\utils\CopperOxidation;
 use pocketmine\block\utils\CoralType;
+use pocketmine\block\utils\DirtType;
 use pocketmine\block\utils\DyeColor;
+use pocketmine\block\utils\FroglightType;
+use pocketmine\block\utils\MobHeadType;
 use pocketmine\block\utils\SlabType;
 use pocketmine\block\VanillaBlocks as Blocks;
 use pocketmine\item\VanillaItems as Items;
 use pocketmine\utils\SingletonTrait;
 use pocketmine\utils\StringToTParser;
+use function array_keys;
+use function strtolower;
 
 /**
  * Handles parsing items from strings. This is used to interpret names from the /give command (and others).
@@ -43,37 +51,77 @@ final class StringToItemParser extends StringToTParser{
 	private static function make() : self{
 		$result = new self();
 
-		foreach(DyeColor::getAll() as $color){
-			$prefix = fn(string $name) => $color->name() . "_" . $name;
+		self::registerDynamicBlocks($result);
+		self::registerBlocks($result);
+		self::registerDynamicItems($result);
+		self::registerItems($result);
+
+		return $result;
+	}
+
+	private static function registerDynamicBlocks(self $result) : void{
+		foreach(DyeColor::cases() as $color){
+			$register = fn(string $name, \Closure $callback) => $result->registerBlock(strtolower($color->name) . "_" . $name, $callback);
 			//wall and floor banner are the same item
-			$result->registerBlock($prefix("banner"), fn() => Blocks::BANNER()->setColor($color));
-			$result->registerBlock($prefix("bed"), fn() => Blocks::BED()->setColor($color));
-			$result->registerBlock($prefix("carpet"), fn() => Blocks::CARPET()->setColor($color));
-			$result->registerBlock($prefix("concrete"), fn() => Blocks::CONCRETE()->setColor($color));
-			$result->registerBlock($prefix("concrete_powder"), fn() => Blocks::CONCRETE_POWDER()->setColor($color));
-			$result->registerBlock($prefix("stained_clay"), fn() => Blocks::STAINED_CLAY()->setColor($color));
-			$result->registerBlock($prefix("stained_glass"), fn() => Blocks::STAINED_GLASS()->setColor($color));
-			$result->registerBlock($prefix("stained_glass_pane"), fn() => Blocks::STAINED_GLASS_PANE()->setColor($color));
-			$result->registerBlock($prefix("stained_hardened_glass"), fn() => Blocks::STAINED_HARDENED_GLASS()->setColor($color));
-			$result->registerBlock($prefix("stained_hardened_glass_pane"), fn() => Blocks::STAINED_HARDENED_GLASS_PANE()->setColor($color));
-			$result->registerBlock($prefix("wool"), fn() => Blocks::WOOL()->setColor($color));
-			$result->registerBlock($prefix("shulker_box"), fn() => Blocks::DYED_SHULKER_BOX()->setColor($color));
-		}
-		foreach(CoralType::getAll() as $coralType){
-			$prefix = fn(string $name) => $coralType->name() . "_" . $name;
-			$result->registerBlock($prefix("coral"), fn() => Blocks::CORAL()->setCoralType($coralType));
-			$result->registerBlock($prefix("coral_block"), fn() => Blocks::CORAL_BLOCK()->setCoralType($coralType));
-			//wall and floor coral fans are the same item
-			$result->registerBlock($prefix("coral_fan"), fn() => Blocks::CORAL_FAN()->setCoralType($coralType));
+			$register("banner", fn() => Blocks::BANNER()->setColor($color));
+			$register("bed", fn() => Blocks::BED()->setColor($color));
+			$register("candle", fn() => Blocks::DYED_CANDLE()->setColor($color));
+			$register("carpet", fn() => Blocks::CARPET()->setColor($color));
+			$register("concrete", fn() => Blocks::CONCRETE()->setColor($color));
+			$register("concrete_powder", fn() => Blocks::CONCRETE_POWDER()->setColor($color));
+			$register("glazed_terracotta", fn() => Blocks::GLAZED_TERRACOTTA()->setColor($color));
+			$register("stained_clay", fn() => Blocks::STAINED_CLAY()->setColor($color));
+			$register("stained_glass", fn() => Blocks::STAINED_GLASS()->setColor($color));
+			$register("stained_glass_pane", fn() => Blocks::STAINED_GLASS_PANE()->setColor($color));
+			$register("stained_hardened_glass", fn() => Blocks::STAINED_HARDENED_GLASS()->setColor($color));
+			$register("stained_hardened_glass_pane", fn() => Blocks::STAINED_HARDENED_GLASS_PANE()->setColor($color));
+			$register("wool", fn() => Blocks::WOOL()->setColor($color));
+			$register("shulker_box", fn() => Blocks::DYED_SHULKER_BOX()->setColor($color));
 		}
 
+		foreach(CoralType::cases() as $coralType){
+			$register = fn(string $name, \Closure $callback) => $result->registerBlock(strtolower($coralType->name) . "_" . $name, $callback);
+			$register("coral", fn() => Blocks::CORAL()->setCoralType($coralType));
+			$register("coral_block", fn() => Blocks::CORAL_BLOCK()->setCoralType($coralType));
+			//wall and floor coral fans are the same item
+			$register("coral_fan", fn() => Blocks::CORAL_FAN()->setCoralType($coralType));
+		}
+		for($i = Light::MIN_LIGHT_LEVEL; $i <= Light::MAX_LIGHT_LEVEL; $i++){
+			//helper aliases, since we don't support passing data values in /give
+			$result->registerBlock("light_$i", fn() => Blocks::LIGHT()->setLightLevel($i));
+			$result->registerBlock("light_block_$i", fn() => Blocks::LIGHT()->setLightLevel($i));
+		}
+
+		foreach(CopperOxidation::cases() as $oxidation){
+			$oxPrefix = $oxidation === CopperOxidation::NONE ? "" : strtolower($oxidation->name) . "_";
+
+			foreach(["" => false, "waxed_" => true] as $waxedPrefix => $waxed){
+				$register = fn(string $name, \Closure $callback) => $result->registerBlock($waxedPrefix . $oxPrefix . $name, $callback);
+				$register("copper_block", fn() => Blocks::COPPER()->setOxidation($oxidation)->setWaxed($waxed));
+				$register("chiseled_copper", fn() => Blocks::CHISELED_COPPER()->setOxidation($oxidation)->setWaxed($waxed));
+				$register("copper_grate", fn() => Blocks::COPPER_GRATE()->setOxidation($oxidation)->setWaxed($waxed));
+				$register("cut_copper_block", fn() => Blocks::CUT_COPPER()->setOxidation($oxidation)->setWaxed($waxed));
+				$register("cut_copper_stairs", fn() => Blocks::CUT_COPPER_STAIRS()->setOxidation($oxidation)->setWaxed($waxed));
+				$register("cut_copper_slab", fn() => Blocks::CUT_COPPER_SLAB()->setOxidation($oxidation)->setWaxed($waxed));
+				$register("copper_bulb", fn() => Blocks::COPPER_BULB()->setOxidation($oxidation)->setWaxed($waxed));
+				$register("copper_door", fn() => Blocks::COPPER_DOOR()->setOxidation($oxidation)->setWaxed($waxed));
+				$register("copper_trapdoor", fn() => Blocks::COPPER_TRAPDOOR()->setOxidation($oxidation)->setWaxed($waxed));
+			}
+		}
+
+		foreach(FroglightType::cases() as $froglightType){
+			$result->registerBlock(strtolower($froglightType->name) . "_froglight", fn() => Blocks::FROGLIGHT()->setFroglightType($froglightType));
+		}
+	}
+
+	private static function registerBlocks(self $result) : void{
 		$result->registerBlock("acacia_button", fn() => Blocks::ACACIA_BUTTON());
 		$result->registerBlock("acacia_door", fn() => Blocks::ACACIA_DOOR());
 		$result->registerBlock("acacia_door_block", fn() => Blocks::ACACIA_DOOR());
 		$result->registerBlock("acacia_fence", fn() => Blocks::ACACIA_FENCE());
 		$result->registerBlock("acacia_fence_gate", fn() => Blocks::ACACIA_FENCE_GATE());
 		$result->registerBlock("acacia_leaves", fn() => Blocks::ACACIA_LEAVES());
-		$result->registerBlock("acacia_log", fn() => Blocks::ACACIA_LOG());
+		$result->registerBlock("acacia_log", fn() => Blocks::ACACIA_LOG()->setStripped(false));
 		$result->registerBlock("acacia_planks", fn() => Blocks::ACACIA_PLANKS());
 		$result->registerBlock("acacia_pressure_plate", fn() => Blocks::ACACIA_PRESSURE_PLATE());
 		$result->registerBlock("acacia_sapling", fn() => Blocks::ACACIA_SAPLING());
@@ -83,7 +131,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("acacia_standing_sign", fn() => Blocks::ACACIA_SIGN());
 		$result->registerBlock("acacia_trapdoor", fn() => Blocks::ACACIA_TRAPDOOR());
 		$result->registerBlock("acacia_wall_sign", fn() => Blocks::ACACIA_WALL_SIGN());
-		$result->registerBlock("acacia_wood", fn() => Blocks::ACACIA_WOOD());
+		$result->registerBlock("acacia_wood", fn() => Blocks::ACACIA_WOOD()->setStripped(false));
 		$result->registerBlock("acacia_wood_stairs", fn() => Blocks::ACACIA_STAIRS());
 		$result->registerBlock("acacia_wooden_stairs", fn() => Blocks::ACACIA_STAIRS());
 		$result->registerBlock("activator_rail", fn() => Blocks::ACTIVATOR_RAIL());
@@ -91,31 +139,38 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("air", fn() => Blocks::AIR());
 		$result->registerBlock("all_sided_mushroom_stem", fn() => Blocks::ALL_SIDED_MUSHROOM_STEM());
 		$result->registerBlock("allium", fn() => Blocks::ALLIUM());
+		$result->registerBlock("amethyst_block", fn() => Blocks::AMETHYST());
+		$result->registerBlock("amethyst_cluster", fn() => Blocks::AMETHYST_CLUSTER());
+		$result->registerBlock("ancient_debris", fn() => Blocks::ANCIENT_DEBRIS());
 		$result->registerBlock("andesite", fn() => Blocks::ANDESITE());
 		$result->registerBlock("andesite_slab", fn() => Blocks::ANDESITE_SLAB());
 		$result->registerBlock("andesite_stairs", fn() => Blocks::ANDESITE_STAIRS());
 		$result->registerBlock("andesite_wall", fn() => Blocks::ANDESITE_WALL());
 		$result->registerBlock("anvil", fn() => Blocks::ANVIL());
 		$result->registerBlock("ateupd_block", fn() => Blocks::INFO_UPDATE2());
+		$result->registerBlock("azalea_leaves", fn() => Blocks::AZALEA_LEAVES());
 		$result->registerBlock("azure_bluet", fn() => Blocks::AZURE_BLUET());
 		$result->registerBlock("bamboo", fn() => Blocks::BAMBOO());
 		$result->registerBlock("bamboo_sapling", fn() => Blocks::BAMBOO_SAPLING());
 		$result->registerBlock("banner", fn() => Blocks::BANNER());
 		$result->registerBlock("barrel", fn() => Blocks::BARREL());
 		$result->registerBlock("barrier", fn() => Blocks::BARRIER());
+		$result->registerBlock("basalt", fn() => Blocks::BASALT());
 		$result->registerBlock("beacon", fn() => Blocks::BEACON());
+		$result->registerBlock("bed", fn() => Blocks::BED());
 		$result->registerBlock("bed_block", fn() => Blocks::BED());
 		$result->registerBlock("bedrock", fn() => Blocks::BEDROCK());
 		$result->registerBlock("beetroot_block", fn() => Blocks::BEETROOTS());
 		$result->registerBlock("beetroots", fn() => Blocks::BEETROOTS());
 		$result->registerBlock("bell", fn() => Blocks::BELL());
+		$result->registerBlock("big_dripleaf", fn() => Blocks::BIG_DRIPLEAF_HEAD());
 		$result->registerBlock("birch_button", fn() => Blocks::BIRCH_BUTTON());
 		$result->registerBlock("birch_door", fn() => Blocks::BIRCH_DOOR());
 		$result->registerBlock("birch_door_block", fn() => Blocks::BIRCH_DOOR());
 		$result->registerBlock("birch_fence", fn() => Blocks::BIRCH_FENCE());
 		$result->registerBlock("birch_fence_gate", fn() => Blocks::BIRCH_FENCE_GATE());
 		$result->registerBlock("birch_leaves", fn() => Blocks::BIRCH_LEAVES());
-		$result->registerBlock("birch_log", fn() => Blocks::BIRCH_LOG());
+		$result->registerBlock("birch_log", fn() => Blocks::BIRCH_LOG()->setStripped(false));
 		$result->registerBlock("birch_planks", fn() => Blocks::BIRCH_PLANKS());
 		$result->registerBlock("birch_pressure_plate", fn() => Blocks::BIRCH_PRESSURE_PLATE());
 		$result->registerBlock("birch_sapling", fn() => Blocks::BIRCH_SAPLING());
@@ -125,12 +180,14 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("birch_standing_sign", fn() => Blocks::BIRCH_SIGN());
 		$result->registerBlock("birch_trapdoor", fn() => Blocks::BIRCH_TRAPDOOR());
 		$result->registerBlock("birch_wall_sign", fn() => Blocks::BIRCH_WALL_SIGN());
-		$result->registerBlock("birch_wood", fn() => Blocks::BIRCH_WOOD());
+		$result->registerBlock("birch_wood", fn() => Blocks::BIRCH_WOOD()->setStripped(false));
 		$result->registerBlock("birch_wood_stairs", fn() => Blocks::BIRCH_STAIRS());
 		$result->registerBlock("birch_wooden_stairs", fn() => Blocks::BIRCH_STAIRS());
-		$result->registerBlock("black_glazed_terracotta", fn() => Blocks::BLACK_GLAZED_TERRACOTTA());
+		$result->registerBlock("blackstone", fn() => Blocks::BLACKSTONE());
+		$result->registerBlock("blackstone_slab", fn() => Blocks::BLACKSTONE_SLAB());
+		$result->registerBlock("blackstone_stairs", fn() => Blocks::BLACKSTONE_STAIRS());
+		$result->registerBlock("blackstone_wall", fn() => Blocks::BLACKSTONE_WALL());
 		$result->registerBlock("blast_furnace", fn() => Blocks::BLAST_FURNACE());
-		$result->registerBlock("blue_glazed_terracotta", fn() => Blocks::BLUE_GLAZED_TERRACOTTA());
 		$result->registerBlock("blue_ice", fn() => Blocks::BLUE_ICE());
 		$result->registerBlock("blue_orchid", fn() => Blocks::BLUE_ORCHID());
 		$result->registerBlock("blue_torch", fn() => Blocks::BLUE_TORCH());
@@ -144,33 +201,65 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("brick_wall", fn() => Blocks::BRICK_WALL());
 		$result->registerBlock("bricks", fn() => Blocks::BRICKS());
 		$result->registerBlock("bricks_block", fn() => Blocks::BRICKS());
-		$result->registerBlock("brown_glazed_terracotta", fn() => Blocks::BROWN_GLAZED_TERRACOTTA());
 		$result->registerBlock("brown_mushroom", fn() => Blocks::BROWN_MUSHROOM());
 		$result->registerBlock("brown_mushroom_block", fn() => Blocks::BROWN_MUSHROOM_BLOCK());
+		$result->registerBlock("budding_amethyst", fn() => Blocks::BUDDING_AMETHYST());
 		$result->registerBlock("burning_furnace", fn() => Blocks::FURNACE());
 		$result->registerBlock("bush", fn() => Blocks::DEAD_BUSH());
 		$result->registerBlock("cactus", fn() => Blocks::CACTUS());
 		$result->registerBlock("cake", fn() => Blocks::CAKE());
 		$result->registerBlock("cake_block", fn() => Blocks::CAKE());
+		$result->registerBlock("calcite", fn() => Blocks::CALCITE());
+		$result->registerBlock("campfire", fn() => Blocks::CAMPFIRE());
+		$result->registerBlock("candle", fn() => Blocks::CANDLE());
 		$result->registerBlock("carpet", fn() => Blocks::CARPET());
 		$result->registerBlock("carrot_block", fn() => Blocks::CARROTS());
 		$result->registerBlock("carrots", fn() => Blocks::CARROTS());
+		$result->registerBlock("cartography_table", fn() => Blocks::CARTOGRAPHY_TABLE());
 		$result->registerBlock("carved_pumpkin", fn() => Blocks::CARVED_PUMPKIN());
+		$result->registerBlock("cauldron", fn() => Blocks::CAULDRON());
+		$result->registerBlock("cave_vines", fn() => Blocks::CAVE_VINES());
+		$result->registerBlock("chain", fn() => Blocks::CHAIN());
+		$result->registerBlock("cherry_button", fn() => Blocks::CHERRY_BUTTON());
+		$result->registerBlock("cherry_door", fn() => Blocks::CHERRY_DOOR());
+		$result->registerBlock("cherry_fence", fn() => Blocks::CHERRY_FENCE());
+		$result->registerBlock("cherry_fence_gate", fn() => Blocks::CHERRY_FENCE_GATE());
+		$result->registerBlock("cherry_leaves", fn() => Blocks::CHERRY_LEAVES());
+		$result->registerBlock("cherry_log", fn() => Blocks::CHERRY_LOG());
+		$result->registerBlock("cherry_planks", fn() => Blocks::CHERRY_PLANKS());
+		$result->registerBlock("cherry_pressure_plate", fn() => Blocks::CHERRY_PRESSURE_PLATE());
+		$result->registerBlock("cherry_sign", fn() => Blocks::CHERRY_SIGN());
+		$result->registerBlock("cherry_slab", fn() => Blocks::CHERRY_SLAB());
+		$result->registerBlock("cherry_stairs", fn() => Blocks::CHERRY_STAIRS());
+		$result->registerBlock("cherry_trapdoor", fn() => Blocks::CHERRY_TRAPDOOR());
+		$result->registerBlock("cherry_wood", fn() => Blocks::CHERRY_WOOD());
 		$result->registerBlock("chemical_heat", fn() => Blocks::CHEMICAL_HEAT());
 		$result->registerBlock("chemistry_table", fn() => Blocks::COMPOUND_CREATOR());
 		$result->registerBlock("chest", fn() => Blocks::CHEST());
 		$result->registerBlock("chipped_anvil", fn() => Blocks::ANVIL()->setDamage(1));
+		$result->registerBlock("chiseled_bookshelf", fn() => Blocks::CHISELED_BOOKSHELF());
+		$result->registerBlock("chiseled_deepslate", fn() => Blocks::CHISELED_DEEPSLATE());
+		$result->registerBlock("chiseled_nether_bricks", fn() => Blocks::CHISELED_NETHER_BRICKS());
+		$result->registerBlock("chiseled_polished_blackstone", fn() => Blocks::CHISELED_POLISHED_BLACKSTONE());
 		$result->registerBlock("chiseled_quartz", fn() => Blocks::CHISELED_QUARTZ());
 		$result->registerBlock("chiseled_red_sandstone", fn() => Blocks::CHISELED_RED_SANDSTONE());
 		$result->registerBlock("chiseled_sandstone", fn() => Blocks::CHISELED_SANDSTONE());
 		$result->registerBlock("chiseled_stone_bricks", fn() => Blocks::CHISELED_STONE_BRICKS());
+		$result->registerBlock("chiseled_tuff", fn() => Blocks::CHISELED_TUFF());
+		$result->registerBlock("chiseled_tuff_bricks", fn() => Blocks::CHISELED_TUFF_BRICKS());
+		$result->registerBlock("chorus_flower", fn() => Blocks::CHORUS_FLOWER());
+		$result->registerBlock("chorus_plant", fn() => Blocks::CHORUS_PLANT());
 		$result->registerBlock("clay_block", fn() => Blocks::CLAY());
 		$result->registerBlock("coal_block", fn() => Blocks::COAL());
 		$result->registerBlock("coal_ore", fn() => Blocks::COAL_ORE());
-		$result->registerBlock("coarse_dirt", fn() => Blocks::DIRT()->setCoarse(true));
+		$result->registerBlock("coarse_dirt", fn() => Blocks::DIRT()->setDirtType(DirtType::COARSE));
 		$result->registerBlock("cobble", fn() => Blocks::COBBLESTONE());
 		$result->registerBlock("cobble_stairs", fn() => Blocks::COBBLESTONE_STAIRS());
 		$result->registerBlock("cobble_wall", fn() => Blocks::COBBLESTONE_WALL());
+		$result->registerBlock("cobbled_deepslate", fn() => Blocks::COBBLED_DEEPSLATE());
+		$result->registerBlock("cobbled_deepslate_slab", fn() => Blocks::COBBLED_DEEPSLATE_SLAB());
+		$result->registerBlock("cobbled_deepslate_stairs", fn() => Blocks::COBBLED_DEEPSLATE_STAIRS());
+		$result->registerBlock("cobbled_deepslate_wall", fn() => Blocks::COBBLED_DEEPSLATE_WALL());
 		$result->registerBlock("cobblestone", fn() => Blocks::COBBLESTONE());
 		$result->registerBlock("cobblestone_slab", fn() => Blocks::COBBLESTONE_SLAB());
 		$result->registerBlock("cobblestone_stairs", fn() => Blocks::COBBLESTONE_STAIRS());
@@ -188,21 +277,40 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("concrete", fn() => Blocks::CONCRETE());
 		$result->registerBlock("concrete_powder", fn() => Blocks::CONCRETE_POWDER());
 		$result->registerBlock("concretepowder", fn() => Blocks::CONCRETE_POWDER());
+		$result->registerBlock("copper_ore", fn() => Blocks::COPPER_ORE());
 		$result->registerBlock("coral", fn() => Blocks::CORAL());
 		$result->registerBlock("coral_block", fn() => Blocks::CORAL_BLOCK());
 		$result->registerBlock("coral_fan", fn() => Blocks::CORAL_FAN());
-		$result->registerBlock("coral_fan_dead", fn() => Blocks::CORAL_FAN()->setCoralType(CoralType::TUBE())->setDead(true));
+		$result->registerBlock("coral_fan_dead", fn() => Blocks::CORAL_FAN()->setCoralType(CoralType::TUBE)->setDead(true));
 		$result->registerBlock("coral_fan_hang", fn() => Blocks::WALL_CORAL_FAN());
-		$result->registerBlock("coral_fan_hang2", fn() => Blocks::WALL_CORAL_FAN()->setCoralType(CoralType::BUBBLE()));
-		$result->registerBlock("coral_fan_hang3", fn() => Blocks::WALL_CORAL_FAN()->setCoralType(CoralType::HORN()));
+		$result->registerBlock("coral_fan_hang2", fn() => Blocks::WALL_CORAL_FAN()->setCoralType(CoralType::BUBBLE));
+		$result->registerBlock("coral_fan_hang3", fn() => Blocks::WALL_CORAL_FAN()->setCoralType(CoralType::HORN));
 		$result->registerBlock("cornflower", fn() => Blocks::CORNFLOWER());
+		$result->registerBlock("cracked_deepslate_bricks", fn() => Blocks::CRACKED_DEEPSLATE_BRICKS());
+		$result->registerBlock("cracked_deepslate_tiles", fn() => Blocks::CRACKED_DEEPSLATE_TILES());
+		$result->registerBlock("cracked_nether_bricks", fn() => Blocks::CRACKED_NETHER_BRICKS());
+		$result->registerBlock("cracked_polished_blackstone_bricks", fn() => Blocks::CRACKED_POLISHED_BLACKSTONE_BRICKS());
 		$result->registerBlock("cracked_stone_bricks", fn() => Blocks::CRACKED_STONE_BRICKS());
 		$result->registerBlock("crafting_table", fn() => Blocks::CRAFTING_TABLE());
+		$result->registerBlock("creeper_head", fn() => Blocks::MOB_HEAD()->setMobHeadType(MobHeadType::CREEPER));
+		$result->registerBlock("crimson_button", fn() => Blocks::CRIMSON_BUTTON());
+		$result->registerBlock("crimson_door", fn() => Blocks::CRIMSON_DOOR());
+		$result->registerBlock("crimson_fence", fn() => Blocks::CRIMSON_FENCE());
+		$result->registerBlock("crimson_fence_gate", fn() => Blocks::CRIMSON_FENCE_GATE());
+		$result->registerBlock("crimson_hyphae", fn() => Blocks::CRIMSON_HYPHAE()->setStripped(false));
+		$result->registerBlock("crimson_planks", fn() => Blocks::CRIMSON_PLANKS());
+		$result->registerBlock("crimson_pressure_plate", fn() => Blocks::CRIMSON_PRESSURE_PLATE());
+		$result->registerBlock("crimson_roots", fn() => Blocks::CRIMSON_ROOTS());
+		$result->registerBlock("crimson_sign", fn() => Blocks::CRIMSON_SIGN());
+		$result->registerBlock("crimson_slab", fn() => Blocks::CRIMSON_SLAB());
+		$result->registerBlock("crimson_stairs", fn() => Blocks::CRIMSON_STAIRS());
+		$result->registerBlock("crimson_stem", fn() => Blocks::CRIMSON_STEM()->setStripped(false));
+		$result->registerBlock("crimson_trapdoor", fn() => Blocks::CRIMSON_TRAPDOOR());
+		$result->registerBlock("crying_obsidian", fn() => Blocks::CRYING_OBSIDIAN());
 		$result->registerBlock("cut_red_sandstone", fn() => Blocks::CUT_RED_SANDSTONE());
 		$result->registerBlock("cut_red_sandstone_slab", fn() => Blocks::CUT_RED_SANDSTONE_SLAB());
 		$result->registerBlock("cut_sandstone", fn() => Blocks::CUT_SANDSTONE());
 		$result->registerBlock("cut_sandstone_slab", fn() => Blocks::CUT_SANDSTONE_SLAB());
-		$result->registerBlock("cyan_glazed_terracotta", fn() => Blocks::CYAN_GLAZED_TERRACOTTA());
 		$result->registerBlock("damaged_anvil", fn() => Blocks::ANVIL()->setDamage(2));
 		$result->registerBlock("dandelion", fn() => Blocks::DANDELION());
 		$result->registerBlock("dark_oak_button", fn() => Blocks::DARK_OAK_BUTTON());
@@ -211,7 +319,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("dark_oak_fence", fn() => Blocks::DARK_OAK_FENCE());
 		$result->registerBlock("dark_oak_fence_gate", fn() => Blocks::DARK_OAK_FENCE_GATE());
 		$result->registerBlock("dark_oak_leaves", fn() => Blocks::DARK_OAK_LEAVES());
-		$result->registerBlock("dark_oak_log", fn() => Blocks::DARK_OAK_LOG());
+		$result->registerBlock("dark_oak_log", fn() => Blocks::DARK_OAK_LOG()->setStripped(false));
 		$result->registerBlock("dark_oak_planks", fn() => Blocks::DARK_OAK_PLANKS());
 		$result->registerBlock("dark_oak_pressure_plate", fn() => Blocks::DARK_OAK_PRESSURE_PLATE());
 		$result->registerBlock("dark_oak_sapling", fn() => Blocks::DARK_OAK_SAPLING());
@@ -221,7 +329,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("dark_oak_standing_sign", fn() => Blocks::DARK_OAK_SIGN());
 		$result->registerBlock("dark_oak_trapdoor", fn() => Blocks::DARK_OAK_TRAPDOOR());
 		$result->registerBlock("dark_oak_wall_sign", fn() => Blocks::DARK_OAK_WALL_SIGN());
-		$result->registerBlock("dark_oak_wood", fn() => Blocks::DARK_OAK_WOOD());
+		$result->registerBlock("dark_oak_wood", fn() => Blocks::DARK_OAK_WOOD()->setStripped(false));
 		$result->registerBlock("dark_oak_wood_stairs", fn() => Blocks::DARK_OAK_STAIRS());
 		$result->registerBlock("dark_oak_wooden_stairs", fn() => Blocks::DARK_OAK_STAIRS());
 		$result->registerBlock("dark_prismarine", fn() => Blocks::DARK_PRISMARINE());
@@ -236,6 +344,23 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("daylight_sensor_inverted", fn() => Blocks::DAYLIGHT_SENSOR()->setInverted(true));
 		$result->registerBlock("dead_bush", fn() => Blocks::DEAD_BUSH());
 		$result->registerBlock("deadbush", fn() => Blocks::DEAD_BUSH());
+		$result->registerBlock("deepslate", fn() => Blocks::DEEPSLATE());
+		$result->registerBlock("deepslate_bricks", fn() => Blocks::DEEPSLATE_BRICKS());
+		$result->registerBlock("deepslate_brick_slab", fn() => Blocks::DEEPSLATE_BRICK_SLAB());
+		$result->registerBlock("deepslate_brick_stairs", fn() => Blocks::DEEPSLATE_BRICK_STAIRS());
+		$result->registerBlock("deepslate_brick_wall", fn() => Blocks::DEEPSLATE_BRICK_WALL());
+		$result->registerBlock("deepslate_tiles", fn() => Blocks::DEEPSLATE_TILES());
+		$result->registerBlock("deepslate_tile_slab", fn() => Blocks::DEEPSLATE_TILE_SLAB());
+		$result->registerBlock("deepslate_tile_stairs", fn() => Blocks::DEEPSLATE_TILE_STAIRS());
+		$result->registerBlock("deepslate_tile_wall", fn() => Blocks::DEEPSLATE_TILE_WALL());
+		$result->registerBlock("deepslate_coal_ore", fn() => Blocks::DEEPSLATE_COAL_ORE());
+		$result->registerBlock("deepslate_copper_ore", fn() => Blocks::DEEPSLATE_COPPER_ORE());
+		$result->registerBlock("deepslate_diamond_ore", fn() => Blocks::DEEPSLATE_DIAMOND_ORE());
+		$result->registerBlock("deepslate_emerald_ore", fn() => Blocks::DEEPSLATE_EMERALD_ORE());
+		$result->registerBlock("deepslate_gold_ore", fn() => Blocks::DEEPSLATE_GOLD_ORE());
+		$result->registerBlock("deepslate_iron_ore", fn() => Blocks::DEEPSLATE_IRON_ORE());
+		$result->registerBlock("deepslate_lapis_lazuli_ore", fn() => Blocks::DEEPSLATE_LAPIS_LAZULI_ORE());
+		$result->registerBlock("deepslate_redstone_ore", fn() => Blocks::DEEPSLATE_REDSTONE_ORE());
 		$result->registerBlock("detector_rail", fn() => Blocks::DETECTOR_RAIL());
 		$result->registerBlock("diamond_block", fn() => Blocks::DIAMOND());
 		$result->registerBlock("diamond_ore", fn() => Blocks::DIAMOND_ORE());
@@ -243,22 +368,24 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("diorite_slab", fn() => Blocks::DIORITE_SLAB());
 		$result->registerBlock("diorite_stairs", fn() => Blocks::DIORITE_STAIRS());
 		$result->registerBlock("diorite_wall", fn() => Blocks::DIORITE_WALL());
-		$result->registerBlock("dirt", fn() => Blocks::DIRT());
+		$result->registerBlock("dirt", fn() => Blocks::DIRT()->setDirtType(DirtType::NORMAL));
+		$result->registerBlock("dirt_with_roots", fn() => Blocks::DIRT()->setDirtType(DirtType::ROOTED));
 		$result->registerBlock("door_block", fn() => Blocks::OAK_DOOR());
 		$result->registerBlock("double_plant", fn() => Blocks::SUNFLOWER());
-		$result->registerBlock("double_red_sandstone_slab", fn() => Blocks::RED_SANDSTONE_SLAB()->setSlabType(SlabType::DOUBLE()));
-		$result->registerBlock("double_slab", fn() => Blocks::STONE_SLAB()->setSlabType(SlabType::DOUBLE()));
-		$result->registerBlock("double_slabs", fn() => Blocks::STONE_SLAB()->setSlabType(SlabType::DOUBLE()));
-		$result->registerBlock("double_stone_slab", fn() => Blocks::STONE_SLAB()->setSlabType(SlabType::DOUBLE()));
-		$result->registerBlock("double_stone_slab2", fn() => Blocks::RED_SANDSTONE_SLAB()->setSlabType(SlabType::DOUBLE()));
-		$result->registerBlock("double_stone_slab3", fn() => Blocks::END_STONE_BRICK_SLAB()->setSlabType(SlabType::DOUBLE()));
-		$result->registerBlock("double_stone_slab4", fn() => Blocks::MOSSY_STONE_BRICK_SLAB()->setSlabType(SlabType::DOUBLE()));
+		$result->registerBlock("double_red_sandstone_slab", fn() => Blocks::RED_SANDSTONE_SLAB()->setSlabType(SlabType::DOUBLE));
+		$result->registerBlock("double_slab", fn() => Blocks::STONE_SLAB()->setSlabType(SlabType::DOUBLE));
+		$result->registerBlock("double_slabs", fn() => Blocks::STONE_SLAB()->setSlabType(SlabType::DOUBLE));
+		$result->registerBlock("double_stone_slab", fn() => Blocks::STONE_SLAB()->setSlabType(SlabType::DOUBLE));
+		$result->registerBlock("double_stone_slab2", fn() => Blocks::RED_SANDSTONE_SLAB()->setSlabType(SlabType::DOUBLE));
+		$result->registerBlock("double_stone_slab3", fn() => Blocks::END_STONE_BRICK_SLAB()->setSlabType(SlabType::DOUBLE));
+		$result->registerBlock("double_stone_slab4", fn() => Blocks::MOSSY_STONE_BRICK_SLAB()->setSlabType(SlabType::DOUBLE));
 		$result->registerBlock("double_tallgrass", fn() => Blocks::DOUBLE_TALLGRASS());
-		$result->registerBlock("double_wood_slab", fn() => Blocks::OAK_SLAB()->setSlabType(SlabType::DOUBLE()));
-		$result->registerBlock("double_wood_slabs", fn() => Blocks::OAK_SLAB()->setSlabType(SlabType::DOUBLE()));
-		$result->registerBlock("double_wooden_slab", fn() => Blocks::OAK_SLAB()->setSlabType(SlabType::DOUBLE()));
-		$result->registerBlock("double_wooden_slabs", fn() => Blocks::OAK_SLAB()->setSlabType(SlabType::DOUBLE()));
+		$result->registerBlock("double_wood_slab", fn() => Blocks::OAK_SLAB()->setSlabType(SlabType::DOUBLE));
+		$result->registerBlock("double_wood_slabs", fn() => Blocks::OAK_SLAB()->setSlabType(SlabType::DOUBLE));
+		$result->registerBlock("double_wooden_slab", fn() => Blocks::OAK_SLAB()->setSlabType(SlabType::DOUBLE));
+		$result->registerBlock("double_wooden_slabs", fn() => Blocks::OAK_SLAB()->setSlabType(SlabType::DOUBLE));
 		$result->registerBlock("dragon_egg", fn() => Blocks::DRAGON_EGG());
+		$result->registerBlock("dragon_head", fn() => Blocks::MOB_HEAD()->setMobHeadType(MobHeadType::DRAGON));
 		$result->registerBlock("dried_kelp_block", fn() => Blocks::DRIED_KELP());
 		$result->registerBlock("dyed_shulker_box", fn() => Blocks::DYED_SHULKER_BOX());
 		$result->registerBlock("element_0", fn() => Blocks::ELEMENT_ZERO());
@@ -529,20 +656,27 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("fletching_table", fn() => Blocks::FLETCHING_TABLE());
 		$result->registerBlock("flower_pot", fn() => Blocks::FLOWER_POT());
 		$result->registerBlock("flower_pot_block", fn() => Blocks::FLOWER_POT());
+		$result->registerBlock("flowering_azalea_leaves", fn() => Blocks::FLOWERING_AZALEA_LEAVES());
 		$result->registerBlock("flowing_lava", fn() => Blocks::LAVA());
 		$result->registerBlock("flowing_water", fn() => Blocks::WATER());
 		$result->registerBlock("frame", fn() => Blocks::ITEM_FRAME());
 		$result->registerBlock("frame_block", fn() => Blocks::ITEM_FRAME());
 		$result->registerBlock("frosted_ice", fn() => Blocks::FROSTED_ICE());
 		$result->registerBlock("furnace", fn() => Blocks::FURNACE());
+		$result->registerBlock("gilded_blackstone", fn() => Blocks::GILDED_BLACKSTONE());
 		$result->registerBlock("glass", fn() => Blocks::GLASS());
 		$result->registerBlock("glass_pane", fn() => Blocks::GLASS_PANE());
 		$result->registerBlock("glass_panel", fn() => Blocks::GLASS_PANE());
+		$result->registerBlock("glazed_terracotta", fn() => Blocks::GLAZED_TERRACOTTA());
+		$result->registerBlock("glow_frame", fn() => Blocks::GLOWING_ITEM_FRAME());
+		$result->registerBlock("glow_item_frame", fn() => Blocks::GLOWING_ITEM_FRAME());
+		$result->registerBlock("glowing_item_frame", fn() => Blocks::GLOWING_ITEM_FRAME());
 		$result->registerBlock("glowing_obsidian", fn() => Blocks::GLOWING_OBSIDIAN());
 		$result->registerBlock("glowing_redstone_ore", fn() => Blocks::REDSTONE_ORE()->setLit(true));
 		$result->registerBlock("glowingobsidian", fn() => Blocks::GLOWING_OBSIDIAN());
 		$result->registerBlock("glowstone", fn() => Blocks::GLOWSTONE());
 		$result->registerBlock("glowstone_block", fn() => Blocks::GLOWSTONE());
+		$result->registerBlock("glow_lichen", fn() => Blocks::GLOW_LICHEN());
 		$result->registerBlock("gold", fn() => Blocks::GOLD());
 		$result->registerBlock("gold_block", fn() => Blocks::GOLD());
 		$result->registerBlock("gold_ore", fn() => Blocks::GOLD_ORE());
@@ -555,9 +689,8 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("grass", fn() => Blocks::GRASS());
 		$result->registerBlock("grass_path", fn() => Blocks::GRASS_PATH());
 		$result->registerBlock("gravel", fn() => Blocks::GRAVEL());
-		$result->registerBlock("gray_glazed_terracotta", fn() => Blocks::GRAY_GLAZED_TERRACOTTA());
-		$result->registerBlock("green_glazed_terracotta", fn() => Blocks::GREEN_GLAZED_TERRACOTTA());
 		$result->registerBlock("green_torch", fn() => Blocks::GREEN_TORCH());
+		$result->registerBlock("hanging_roots", fn() => Blocks::HANGING_ROOTS());
 		$result->registerBlock("hard_glass", fn() => Blocks::HARDENED_GLASS());
 		$result->registerBlock("hard_glass_pane", fn() => Blocks::HARDENED_GLASS_PANE());
 		$result->registerBlock("hard_stained_glass", fn() => Blocks::STAINED_HARDENED_GLASS());
@@ -568,6 +701,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("hay_bale", fn() => Blocks::HAY_BALE());
 		$result->registerBlock("hay_block", fn() => Blocks::HAY_BALE());
 		$result->registerBlock("heavy_weighted_pressure_plate", fn() => Blocks::WEIGHTED_PRESSURE_PLATE_HEAVY());
+		$result->registerBlock("honeycomb_block", fn() => Blocks::HONEYCOMB());
 		$result->registerBlock("hopper", fn() => Blocks::HOPPER());
 		$result->registerBlock("hopper_block", fn() => Blocks::HOPPER());
 		$result->registerBlock("ice", fn() => Blocks::ICE());
@@ -603,7 +737,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("jungle_fence", fn() => Blocks::JUNGLE_FENCE());
 		$result->registerBlock("jungle_fence_gate", fn() => Blocks::JUNGLE_FENCE_GATE());
 		$result->registerBlock("jungle_leaves", fn() => Blocks::JUNGLE_LEAVES());
-		$result->registerBlock("jungle_log", fn() => Blocks::JUNGLE_LOG());
+		$result->registerBlock("jungle_log", fn() => Blocks::JUNGLE_LOG()->setStripped(false));
 		$result->registerBlock("jungle_planks", fn() => Blocks::JUNGLE_PLANKS());
 		$result->registerBlock("jungle_pressure_plate", fn() => Blocks::JUNGLE_PRESSURE_PLATE());
 		$result->registerBlock("jungle_sapling", fn() => Blocks::JUNGLE_SAPLING());
@@ -613,7 +747,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("jungle_standing_sign", fn() => Blocks::JUNGLE_SIGN());
 		$result->registerBlock("jungle_trapdoor", fn() => Blocks::JUNGLE_TRAPDOOR());
 		$result->registerBlock("jungle_wall_sign", fn() => Blocks::JUNGLE_WALL_SIGN());
-		$result->registerBlock("jungle_wood", fn() => Blocks::JUNGLE_WOOD());
+		$result->registerBlock("jungle_wood", fn() => Blocks::JUNGLE_WOOD()->setStripped(false));
 		$result->registerBlock("jungle_wood_stairs", fn() => Blocks::JUNGLE_STAIRS());
 		$result->registerBlock("jungle_wooden_stairs", fn() => Blocks::JUNGLE_STAIRS());
 		$result->registerBlock("lab_table", fn() => Blocks::LAB_TABLE());
@@ -623,6 +757,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("lapis_lazuli_block", fn() => Blocks::LAPIS_LAZULI());
 		$result->registerBlock("lapis_lazuli_ore", fn() => Blocks::LAPIS_LAZULI_ORE());
 		$result->registerBlock("lapis_ore", fn() => Blocks::LAPIS_LAZULI_ORE());
+		$result->registerBlock("large_amethyst_bud", fn() => Blocks::AMETHYST_CLUSTER()->setStage(AmethystCluster::STAGE_LARGE_BUD));
 		$result->registerBlock("large_fern", fn() => Blocks::LARGE_FERN());
 		$result->registerBlock("lava", fn() => Blocks::LAVA());
 		$result->registerBlock("leave", fn() => Blocks::OAK_LEAVES());
@@ -632,13 +767,13 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("lectern", fn() => Blocks::LECTERN());
 		$result->registerBlock("legacy_stonecutter", fn() => Blocks::LEGACY_STONECUTTER());
 		$result->registerBlock("lever", fn() => Blocks::LEVER());
-		$result->registerBlock("light_blue_glazed_terracotta", fn() => Blocks::LIGHT_BLUE_GLAZED_TERRACOTTA());
-		$result->registerBlock("light_gray_glazed_terracotta", fn() => Blocks::LIGHT_GRAY_GLAZED_TERRACOTTA());
+		$result->registerBlock("light", fn() => Blocks::LIGHT());
+		$result->registerBlock("light_block", fn() => Blocks::LIGHT());
 		$result->registerBlock("light_weighted_pressure_plate", fn() => Blocks::WEIGHTED_PRESSURE_PLATE_LIGHT());
+		$result->registerBlock("lightning_rod", fn() => Blocks::LIGHTNING_ROD());
 		$result->registerBlock("lilac", fn() => Blocks::LILAC());
 		$result->registerBlock("lily_of_the_valley", fn() => Blocks::LILY_OF_THE_VALLEY());
 		$result->registerBlock("lily_pad", fn() => Blocks::LILY_PAD());
-		$result->registerBlock("lime_glazed_terracotta", fn() => Blocks::LIME_GLAZED_TERRACOTTA());
 		$result->registerBlock("lit_blast_furnace", fn() => Blocks::BLAST_FURNACE());
 		$result->registerBlock("lit_furnace", fn() => Blocks::FURNACE());
 		$result->registerBlock("lit_pumpkin", fn() => Blocks::LIT_PUMPKIN());
@@ -646,14 +781,29 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("lit_redstone_ore", fn() => Blocks::REDSTONE_ORE()->setLit(true));
 		$result->registerBlock("lit_redstone_torch", fn() => Blocks::REDSTONE_TORCH());
 		$result->registerBlock("lit_smoker", fn() => Blocks::SMOKER());
-		$result->registerBlock("log", fn() => Blocks::OAK_LOG());
-		$result->registerBlock("log2", fn() => Blocks::ACACIA_LOG());
+		$result->registerBlock("log", fn() => Blocks::OAK_LOG()->setStripped(false));
+		$result->registerBlock("log2", fn() => Blocks::ACACIA_LOG()->setStripped(false));
 		$result->registerBlock("loom", fn() => Blocks::LOOM());
-		$result->registerBlock("magenta_glazed_terracotta", fn() => Blocks::MAGENTA_GLAZED_TERRACOTTA());
 		$result->registerBlock("magma", fn() => Blocks::MAGMA());
+		$result->registerBlock("mangrove_button", fn() => Blocks::MANGROVE_BUTTON());
+		$result->registerBlock("mangrove_door", fn() => Blocks::MANGROVE_DOOR());
+		$result->registerBlock("mangrove_fence", fn() => Blocks::MANGROVE_FENCE());
+		$result->registerBlock("mangrove_fence_gate", fn() => Blocks::MANGROVE_FENCE_GATE());
+		$result->registerBlock("mangrove_leaves", fn() => Blocks::MANGROVE_LEAVES());
+		$result->registerBlock("mangrove_log", fn() => Blocks::MANGROVE_LOG()->setStripped(false));
+		$result->registerBlock("mangrove_planks", fn() => Blocks::MANGROVE_PLANKS());
+		$result->registerBlock("mangrove_pressure_plate", fn() => Blocks::MANGROVE_PRESSURE_PLATE());
+		$result->registerBlock("mangrove_roots", fn() => Blocks::MANGROVE_ROOTS());
+		$result->registerBlock("mangrove_sign", fn() => Blocks::MANGROVE_SIGN());
+		$result->registerBlock("mangrove_slab", fn() => Blocks::MANGROVE_SLAB());
+		$result->registerBlock("mangrove_stairs", fn() => Blocks::MANGROVE_STAIRS());
+		$result->registerBlock("mangrove_trapdoor", fn() => Blocks::MANGROVE_TRAPDOOR());
+		$result->registerBlock("mangrove_wood", fn() => Blocks::MANGROVE_WOOD()->setStripped(false));
 		$result->registerBlock("material_reducer", fn() => Blocks::MATERIAL_REDUCER());
+		$result->registerBlock("medium_amethyst_bud", fn() => Blocks::AMETHYST_CLUSTER()->setStage(AmethystCluster::STAGE_MEDIUM_BUD));
 		$result->registerBlock("melon_block", fn() => Blocks::MELON());
 		$result->registerBlock("melon_stem", fn() => Blocks::MELON_STEM());
+		$result->registerBlock("mob_head", fn() => Blocks::MOB_HEAD());
 		$result->registerBlock("mob_head_block", fn() => Blocks::MOB_HEAD());
 		$result->registerBlock("mob_spawner", fn() => Blocks::MONSTER_SPAWNER());
 		$result->registerBlock("monster_egg", fn() => Blocks::INFESTED_STONE());
@@ -669,6 +819,12 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("mossy_stone_brick_stairs", fn() => Blocks::MOSSY_STONE_BRICK_STAIRS());
 		$result->registerBlock("mossy_stone_brick_wall", fn() => Blocks::MOSSY_STONE_BRICK_WALL());
 		$result->registerBlock("mossy_stone_bricks", fn() => Blocks::MOSSY_STONE_BRICKS());
+		$result->registerBlock("mud", fn() => Blocks::MUD());
+		$result->registerBlock("mud_bricks", fn() => Blocks::MUD_BRICKS());
+		$result->registerBlock("mud_brick_slab", fn() => Blocks::MUD_BRICK_SLAB());
+		$result->registerBlock("mud_brick_stairs", fn() => Blocks::MUD_BRICK_STAIRS());
+		$result->registerBlock("mud_brick_wall", fn() => Blocks::MUD_BRICK_WALL());
+		$result->registerBlock("muddy_mangrove_roots", fn() => Blocks::MUDDY_MANGROVE_ROOTS());
 		$result->registerBlock("mushroom_stem", fn() => Blocks::MUSHROOM_STEM());
 		$result->registerBlock("mycelium", fn() => Blocks::MYCELIUM());
 		$result->registerBlock("nether_brick_block", fn() => Blocks::NETHER_BRICKS());
@@ -678,6 +834,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("nether_brick_wall", fn() => Blocks::NETHER_BRICK_WALL());
 		$result->registerBlock("nether_bricks", fn() => Blocks::NETHER_BRICKS());
 		$result->registerBlock("nether_bricks_stairs", fn() => Blocks::NETHER_BRICK_STAIRS());
+		$result->registerBlock("nether_gold_ore", fn() => Blocks::NETHER_GOLD_ORE());
 		$result->registerBlock("nether_portal", fn() => Blocks::NETHER_PORTAL());
 		$result->registerBlock("nether_quartz_ore", fn() => Blocks::NETHER_QUARTZ_ORE());
 		$result->registerBlock("nether_reactor", fn() => Blocks::NETHER_REACTOR_CORE());
@@ -685,6 +842,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("nether_wart", fn() => Blocks::NETHER_WART());
 		$result->registerBlock("nether_wart_block", fn() => Blocks::NETHER_WART_BLOCK());
 		$result->registerBlock("nether_wart_plant", fn() => Blocks::NETHER_WART());
+		$result->registerBlock("netherite_block", fn() => Blocks::NETHERITE());
 		$result->registerBlock("netherrack", fn() => Blocks::NETHERRACK());
 		$result->registerBlock("netherreactor", fn() => Blocks::NETHER_REACTOR_CORE());
 		$result->registerBlock("normal_stone_stairs", fn() => Blocks::STONE_STAIRS());
@@ -696,7 +854,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("oak_fence", fn() => Blocks::OAK_FENCE());
 		$result->registerBlock("oak_fence_gate", fn() => Blocks::OAK_FENCE_GATE());
 		$result->registerBlock("oak_leaves", fn() => Blocks::OAK_LEAVES());
-		$result->registerBlock("oak_log", fn() => Blocks::OAK_LOG());
+		$result->registerBlock("oak_log", fn() => Blocks::OAK_LOG()->setStripped(false));
 		$result->registerBlock("oak_planks", fn() => Blocks::OAK_PLANKS());
 		$result->registerBlock("oak_pressure_plate", fn() => Blocks::OAK_PRESSURE_PLATE());
 		$result->registerBlock("oak_sapling", fn() => Blocks::OAK_SAPLING());
@@ -706,29 +864,51 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("oak_standing_sign", fn() => Blocks::OAK_SIGN());
 		$result->registerBlock("oak_trapdoor", fn() => Blocks::OAK_TRAPDOOR());
 		$result->registerBlock("oak_wall_sign", fn() => Blocks::OAK_WALL_SIGN());
-		$result->registerBlock("oak_wood", fn() => Blocks::OAK_WOOD());
+		$result->registerBlock("oak_wood", fn() => Blocks::OAK_WOOD()->setStripped(false));
 		$result->registerBlock("oak_wood_stairs", fn() => Blocks::OAK_STAIRS());
 		$result->registerBlock("oak_wooden_stairs", fn() => Blocks::OAK_STAIRS());
 		$result->registerBlock("obsidian", fn() => Blocks::OBSIDIAN());
-		$result->registerBlock("orange_glazed_terracotta", fn() => Blocks::ORANGE_GLAZED_TERRACOTTA());
 		$result->registerBlock("orange_tulip", fn() => Blocks::ORANGE_TULIP());
 		$result->registerBlock("oxeye_daisy", fn() => Blocks::OXEYE_DAISY());
 		$result->registerBlock("packed_ice", fn() => Blocks::PACKED_ICE());
+		$result->registerBlock("packed_mud", fn() => Blocks::PACKED_MUD());
 		$result->registerBlock("peony", fn() => Blocks::PEONY());
-		$result->registerBlock("pink_glazed_terracotta", fn() => Blocks::PINK_GLAZED_TERRACOTTA());
+		$result->registerBlock("pink_petals", fn() => Blocks::PINK_PETALS());
 		$result->registerBlock("pink_tulip", fn() => Blocks::PINK_TULIP());
+		$result->registerBlock("piglin_head", fn() => Blocks::MOB_HEAD()->setMobHeadType(MobHeadType::PIGLIN));
+		$result->registerBlock("pitcher_plant", fn() => Blocks::PITCHER_PLANT());
 		$result->registerBlock("plank", fn() => Blocks::OAK_PLANKS());
 		$result->registerBlock("planks", fn() => Blocks::OAK_PLANKS());
+		$result->registerBlock("player_head", fn() => Blocks::MOB_HEAD()->setMobHeadType(MobHeadType::PLAYER));
 		$result->registerBlock("podzol", fn() => Blocks::PODZOL());
 		$result->registerBlock("polished_andesite", fn() => Blocks::POLISHED_ANDESITE());
 		$result->registerBlock("polished_andesite_slab", fn() => Blocks::POLISHED_ANDESITE_SLAB());
 		$result->registerBlock("polished_andesite_stairs", fn() => Blocks::POLISHED_ANDESITE_STAIRS());
+		$result->registerBlock("polished_basalt", fn() => Blocks::POLISHED_BASALT());
+		$result->registerBlock("polished_blackstone", fn() => Blocks::POLISHED_BLACKSTONE());
+		$result->registerBlock("polished_blackstone_brick_slab", fn() => Blocks::POLISHED_BLACKSTONE_BRICK_SLAB());
+		$result->registerBlock("polished_blackstone_brick_stairs", fn() => Blocks::POLISHED_BLACKSTONE_BRICK_STAIRS());
+		$result->registerBlock("polished_blackstone_brick_wall", fn() => Blocks::POLISHED_BLACKSTONE_BRICK_WALL());
+		$result->registerBlock("polished_blackstone_bricks", fn() => Blocks::POLISHED_BLACKSTONE_BRICKS());
+		$result->registerBlock("polished_blackstone_button", fn() => Blocks::POLISHED_BLACKSTONE_BUTTON());
+		$result->registerBlock("polished_blackstone_pressure_plate", fn() => Blocks::POLISHED_BLACKSTONE_PRESSURE_PLATE());
+		$result->registerBlock("polished_blackstone_slab", fn() => Blocks::POLISHED_BLACKSTONE_SLAB());
+		$result->registerBlock("polished_blackstone_stairs", fn() => Blocks::POLISHED_BLACKSTONE_STAIRS());
+		$result->registerBlock("polished_blackstone_wall", fn() => Blocks::POLISHED_BLACKSTONE_WALL());
+		$result->registerBlock("polished_deepslate", fn() => Blocks::POLISHED_DEEPSLATE());
+		$result->registerBlock("polished_deepslate_slab", fn() => Blocks::POLISHED_DEEPSLATE_SLAB());
+		$result->registerBlock("polished_deepslate_stairs", fn() => Blocks::POLISHED_DEEPSLATE_STAIRS());
+		$result->registerBlock("polished_deepslate_wall", fn() => Blocks::POLISHED_DEEPSLATE_WALL());
 		$result->registerBlock("polished_diorite", fn() => Blocks::POLISHED_DIORITE());
 		$result->registerBlock("polished_diorite_slab", fn() => Blocks::POLISHED_DIORITE_SLAB());
 		$result->registerBlock("polished_diorite_stairs", fn() => Blocks::POLISHED_DIORITE_STAIRS());
 		$result->registerBlock("polished_granite", fn() => Blocks::POLISHED_GRANITE());
 		$result->registerBlock("polished_granite_slab", fn() => Blocks::POLISHED_GRANITE_SLAB());
 		$result->registerBlock("polished_granite_stairs", fn() => Blocks::POLISHED_GRANITE_STAIRS());
+		$result->registerBlock("polished_tuff", fn() => Blocks::POLISHED_TUFF());
+		$result->registerBlock("polished_tuff_slab", fn() => Blocks::POLISHED_TUFF_SLAB());
+		$result->registerBlock("polished_tuff_stairs", fn() => Blocks::POLISHED_TUFF_STAIRS());
+		$result->registerBlock("polished_tuff_wall", fn() => Blocks::POLISHED_TUFF_WALL());
 		$result->registerBlock("poppy", fn() => Blocks::POPPY());
 		$result->registerBlock("portal", fn() => Blocks::NETHER_PORTAL());
 		$result->registerBlock("portal_block", fn() => Blocks::NETHER_PORTAL());
@@ -748,7 +928,6 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("prismarine_wall", fn() => Blocks::PRISMARINE_WALL());
 		$result->registerBlock("pumpkin", fn() => Blocks::PUMPKIN());
 		$result->registerBlock("pumpkin_stem", fn() => Blocks::PUMPKIN_STEM());
-		$result->registerBlock("purple_glazed_terracotta", fn() => Blocks::PURPLE_GLAZED_TERRACOTTA());
 		$result->registerBlock("purple_torch", fn() => Blocks::PURPLE_TORCH());
 		$result->registerBlock("purpur", fn() => Blocks::PURPUR());
 		$result->registerBlock("purpur_block", fn() => Blocks::PURPUR());
@@ -756,13 +935,16 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("purpur_slab", fn() => Blocks::PURPUR_SLAB());
 		$result->registerBlock("purpur_stairs", fn() => Blocks::PURPUR_STAIRS());
 		$result->registerBlock("quartz_block", fn() => Blocks::QUARTZ());
+		$result->registerBlock("quartz_bricks", fn() => Blocks::QUARTZ_BRICKS());
 		$result->registerBlock("quartz_ore", fn() => Blocks::NETHER_QUARTZ_ORE());
 		$result->registerBlock("quartz_pillar", fn() => Blocks::QUARTZ_PILLAR());
 		$result->registerBlock("quartz_slab", fn() => Blocks::QUARTZ_SLAB());
 		$result->registerBlock("quartz_stairs", fn() => Blocks::QUARTZ_STAIRS());
 		$result->registerBlock("rail", fn() => Blocks::RAIL());
+		$result->registerBlock("raw_copper_block", fn() => Blocks::RAW_COPPER());
+		$result->registerBlock("raw_gold_block", fn() => Blocks::RAW_GOLD());
+		$result->registerBlock("raw_iron_block", fn() => Blocks::RAW_IRON());
 		$result->registerBlock("red_flower", fn() => Blocks::POPPY());
-		$result->registerBlock("red_glazed_terracotta", fn() => Blocks::RED_GLAZED_TERRACOTTA());
 		$result->registerBlock("red_mushroom", fn() => Blocks::RED_MUSHROOM());
 		$result->registerBlock("red_mushroom_block", fn() => Blocks::RED_MUSHROOM_BLOCK());
 		$result->registerBlock("red_nether_brick", fn() => Blocks::RED_NETHER_BRICKS());
@@ -786,9 +968,11 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("redstone_wire", fn() => Blocks::REDSTONE_WIRE());
 		$result->registerBlock("reeds", fn() => Blocks::SUGARCANE());
 		$result->registerBlock("reeds_block", fn() => Blocks::SUGARCANE());
+		$result->registerBlock("reinforced_deepslate", fn() => Blocks::REINFORCED_DEEPSLATE());
 		$result->registerBlock("repeater", fn() => Blocks::REDSTONE_REPEATER());
 		$result->registerBlock("repeater_block", fn() => Blocks::REDSTONE_REPEATER());
 		$result->registerBlock("reserved6", fn() => Blocks::RESERVED6());
+		$result->registerBlock("rooted_dirt", fn() => Blocks::DIRT()->setDirtType(DirtType::ROOTED));
 		$result->registerBlock("rose", fn() => Blocks::POPPY());
 		$result->registerBlock("rose_bush", fn() => Blocks::ROSE_BUSH());
 		$result->registerBlock("sand", fn() => Blocks::SAND());
@@ -797,19 +981,26 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("sandstone_stairs", fn() => Blocks::SANDSTONE_STAIRS());
 		$result->registerBlock("sandstone_wall", fn() => Blocks::SANDSTONE_WALL());
 		$result->registerBlock("sapling", fn() => Blocks::OAK_SAPLING());
+		$result->registerBlock("sculk", fn() => Blocks::SCULK());
 		$result->registerBlock("sea_lantern", fn() => Blocks::SEA_LANTERN());
 		$result->registerBlock("sea_pickle", fn() => Blocks::SEA_PICKLE());
 		$result->registerBlock("sealantern", fn() => Blocks::SEA_LANTERN());
+		$result->registerBlock("shroomlight", fn() => Blocks::SHROOMLIGHT());
 		$result->registerBlock("shulker_box", fn() => Blocks::SHULKER_BOX());
 		$result->registerBlock("sign", fn() => Blocks::OAK_SIGN());
 		$result->registerBlock("sign_post", fn() => Blocks::OAK_SIGN());
-		$result->registerBlock("silver_glazed_terracotta", fn() => Blocks::LIGHT_GRAY_GLAZED_TERRACOTTA());
+		$result->registerBlock("skeleton_skull", fn() => Blocks::MOB_HEAD()->setMobHeadType(MobHeadType::SKELETON));
+		$result->registerBlock("skull", fn() => Blocks::MOB_HEAD()->setMobHeadType(MobHeadType::SKELETON));
 		$result->registerBlock("skull_block", fn() => Blocks::MOB_HEAD());
 		$result->registerBlock("slab", fn() => Blocks::SMOOTH_STONE_SLAB());
 		$result->registerBlock("slabs", fn() => Blocks::SMOOTH_STONE_SLAB());
 		$result->registerBlock("slime", fn() => Blocks::SLIME());
 		$result->registerBlock("slime_block", fn() => Blocks::SLIME());
+		$result->registerBlock("small_amethyst_bud", fn() => Blocks::AMETHYST_CLUSTER()->setStage(AmethystCluster::STAGE_SMALL_BUD));
+		$result->registerBlock("small_dripleaf", fn() => Blocks::SMALL_DRIPLEAF());
+		$result->registerBlock("smithing_table", fn() => Blocks::SMITHING_TABLE());
 		$result->registerBlock("smoker", fn() => Blocks::SMOKER());
+		$result->registerBlock("smooth_basalt", fn() => Blocks::SMOOTH_BASALT());
 		$result->registerBlock("smooth_quartz", fn() => Blocks::SMOOTH_QUARTZ());
 		$result->registerBlock("smooth_quartz_slab", fn() => Blocks::SMOOTH_QUARTZ_SLAB());
 		$result->registerBlock("smooth_quartz_stairs", fn() => Blocks::SMOOTH_QUARTZ_STAIRS());
@@ -824,15 +1015,20 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("snow", fn() => Blocks::SNOW());
 		$result->registerBlock("snow_block", fn() => Blocks::SNOW());
 		$result->registerBlock("snow_layer", fn() => Blocks::SNOW_LAYER());
+		$result->registerBlock("soul_campfire", fn() => Blocks::SOUL_CAMPFIRE());
+		$result->registerBlock("soul_lantern", fn() => Blocks::SOUL_LANTERN());
 		$result->registerBlock("soul_sand", fn() => Blocks::SOUL_SAND());
+		$result->registerBlock("soul_soil", fn() => Blocks::SOUL_SOIL());
+		$result->registerBlock("soul_torch", fn() => Blocks::SOUL_TORCH());
 		$result->registerBlock("sponge", fn() => Blocks::SPONGE());
+		$result->registerBlock("spore_blossom", fn() => Blocks::SPORE_BLOSSOM());
 		$result->registerBlock("spruce_button", fn() => Blocks::SPRUCE_BUTTON());
 		$result->registerBlock("spruce_door", fn() => Blocks::SPRUCE_DOOR());
 		$result->registerBlock("spruce_door_block", fn() => Blocks::SPRUCE_DOOR());
 		$result->registerBlock("spruce_fence", fn() => Blocks::SPRUCE_FENCE());
 		$result->registerBlock("spruce_fence_gate", fn() => Blocks::SPRUCE_FENCE_GATE());
 		$result->registerBlock("spruce_leaves", fn() => Blocks::SPRUCE_LEAVES());
-		$result->registerBlock("spruce_log", fn() => Blocks::SPRUCE_LOG());
+		$result->registerBlock("spruce_log", fn() => Blocks::SPRUCE_LOG()->setStripped(false));
 		$result->registerBlock("spruce_planks", fn() => Blocks::SPRUCE_PLANKS());
 		$result->registerBlock("spruce_pressure_plate", fn() => Blocks::SPRUCE_PRESSURE_PLATE());
 		$result->registerBlock("spruce_sapling", fn() => Blocks::SPRUCE_SAPLING());
@@ -842,7 +1038,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("spruce_standing_sign", fn() => Blocks::SPRUCE_SIGN());
 		$result->registerBlock("spruce_trapdoor", fn() => Blocks::SPRUCE_TRAPDOOR());
 		$result->registerBlock("spruce_wall_sign", fn() => Blocks::SPRUCE_WALL_SIGN());
-		$result->registerBlock("spruce_wood", fn() => Blocks::SPRUCE_WOOD());
+		$result->registerBlock("spruce_wood", fn() => Blocks::SPRUCE_WOOD()->setStripped(false));
 		$result->registerBlock("spruce_wood_stairs", fn() => Blocks::SPRUCE_STAIRS());
 		$result->registerBlock("spruce_wooden_stairs", fn() => Blocks::SPRUCE_STAIRS());
 		$result->registerBlock("stained_clay", fn() => Blocks::STAINED_CLAY());
@@ -872,18 +1068,26 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("stonebrick", fn() => Blocks::STONE_BRICKS());
 		$result->registerBlock("stonecutter", fn() => Blocks::STONECUTTER());
 		$result->registerBlock("stonecutter_block", fn() => Blocks::STONECUTTER());
-		$result->registerBlock("stripped_acacia_log", fn() => Blocks::STRIPPED_ACACIA_LOG());
-		$result->registerBlock("stripped_acacia_wood", fn() => Blocks::STRIPPED_ACACIA_WOOD());
-		$result->registerBlock("stripped_birch_log", fn() => Blocks::STRIPPED_BIRCH_LOG());
-		$result->registerBlock("stripped_birch_wood", fn() => Blocks::STRIPPED_BIRCH_WOOD());
-		$result->registerBlock("stripped_dark_oak_log", fn() => Blocks::STRIPPED_DARK_OAK_LOG());
-		$result->registerBlock("stripped_dark_oak_wood", fn() => Blocks::STRIPPED_DARK_OAK_WOOD());
-		$result->registerBlock("stripped_jungle_log", fn() => Blocks::STRIPPED_JUNGLE_LOG());
-		$result->registerBlock("stripped_jungle_wood", fn() => Blocks::STRIPPED_JUNGLE_WOOD());
-		$result->registerBlock("stripped_oak_log", fn() => Blocks::STRIPPED_OAK_LOG());
-		$result->registerBlock("stripped_oak_wood", fn() => Blocks::STRIPPED_OAK_WOOD());
-		$result->registerBlock("stripped_spruce_log", fn() => Blocks::STRIPPED_SPRUCE_LOG());
-		$result->registerBlock("stripped_spruce_wood", fn() => Blocks::STRIPPED_SPRUCE_WOOD());
+		$result->registerBlock("stripped_acacia_log", fn() => Blocks::ACACIA_LOG()->setStripped(true));
+		$result->registerBlock("stripped_acacia_wood", fn() => Blocks::ACACIA_WOOD()->setStripped(true));
+		$result->registerBlock("stripped_birch_log", fn() => Blocks::BIRCH_LOG()->setStripped(true));
+		$result->registerBlock("stripped_birch_wood", fn() => Blocks::BIRCH_WOOD()->setStripped(true));
+		$result->registerBlock("stripped_cherry_log", fn() => Blocks::CHERRY_LOG()->setStripped(true));
+		$result->registerBlock("stripped_cherry_wood", fn() => Blocks::CHERRY_WOOD()->setStripped(true));
+		$result->registerBlock("stripped_crimson_hyphae", fn() => Blocks::CRIMSON_HYPHAE()->setStripped(true));
+		$result->registerBlock("stripped_crimson_stem", fn() => Blocks::CRIMSON_STEM()->setStripped(true));
+		$result->registerBlock("stripped_dark_oak_log", fn() => Blocks::DARK_OAK_LOG()->setStripped(true));
+		$result->registerBlock("stripped_dark_oak_wood", fn() => Blocks::DARK_OAK_WOOD()->setStripped(true));
+		$result->registerBlock("stripped_jungle_log", fn() => Blocks::JUNGLE_LOG()->setStripped(true));
+		$result->registerBlock("stripped_jungle_wood", fn() => Blocks::JUNGLE_WOOD()->setStripped(true));
+		$result->registerBlock("stripped_mangrove_log", fn() => Blocks::MANGROVE_LOG()->setStripped(true));
+		$result->registerBlock("stripped_mangrove_wood", fn() => Blocks::MANGROVE_WOOD()->setStripped(true));
+		$result->registerBlock("stripped_oak_log", fn() => Blocks::OAK_LOG()->setStripped(true));
+		$result->registerBlock("stripped_oak_wood", fn() => Blocks::OAK_WOOD()->setStripped(true));
+		$result->registerBlock("stripped_spruce_log", fn() => Blocks::SPRUCE_LOG()->setStripped(true));
+		$result->registerBlock("stripped_spruce_wood", fn() => Blocks::SPRUCE_WOOD()->setStripped(true));
+		$result->registerBlock("stripped_warped_hyphae", fn() => Blocks::WARPED_HYPHAE()->setStripped(true));
+		$result->registerBlock("stripped_warped_stem", fn() => Blocks::WARPED_STEM()->setStripped(true));
 		$result->registerBlock("sugar_cane", fn() => Blocks::SUGARCANE());
 		$result->registerBlock("sugar_canes", fn() => Blocks::SUGARCANE());
 		$result->registerBlock("sugarcane", fn() => Blocks::SUGARCANE());
@@ -893,15 +1097,27 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("tall_grass", fn() => Blocks::TALL_GRASS());
 		$result->registerBlock("tallgrass", fn() => Blocks::FERN());
 		$result->registerBlock("terracotta", fn() => Blocks::STAINED_CLAY());
+		$result->registerBlock("tinted_glass", fn() => Blocks::TINTED_GLASS());
 		$result->registerBlock("tnt", fn() => Blocks::TNT());
 		$result->registerBlock("torch", fn() => Blocks::TORCH());
+		$result->registerBlock("torchflower", fn() => Blocks::TORCHFLOWER());
 		$result->registerBlock("trapdoor", fn() => Blocks::OAK_TRAPDOOR());
 		$result->registerBlock("trapped_chest", fn() => Blocks::TRAPPED_CHEST());
 		$result->registerBlock("trip_wire", fn() => Blocks::TRIPWIRE());
 		$result->registerBlock("tripwire", fn() => Blocks::TRIPWIRE());
 		$result->registerBlock("tripwire_hook", fn() => Blocks::TRIPWIRE_HOOK());
 		$result->registerBlock("trunk", fn() => Blocks::OAK_PLANKS());
-		$result->registerBlock("trunk2", fn() => Blocks::ACACIA_LOG());
+		$result->registerBlock("trunk2", fn() => Blocks::ACACIA_LOG()->setStripped(false));
+		$result->registerBlock("tuff", fn() => Blocks::TUFF());
+		$result->registerBlock("tuff_bricks", fn() => Blocks::TUFF_BRICKS());
+		$result->registerBlock("tuff_brick_slab", fn() => Blocks::TUFF_BRICK_SLAB());
+		$result->registerBlock("tuff_brick_stairs", fn() => Blocks::TUFF_BRICK_STAIRS());
+		$result->registerBlock("tuff_brick_wall", fn() => Blocks::TUFF_BRICK_WALL());
+		$result->registerBlock("tuff_slab", fn() => Blocks::TUFF_SLAB());
+		$result->registerBlock("tuff_stairs", fn() => Blocks::TUFF_STAIRS());
+		$result->registerBlock("tuff_wall", fn() => Blocks::TUFF_WALL());
+		$result->registerBlock("twisting_vines", fn() => Blocks::TWISTING_VINES());
+		$result->registerBlock("underwater_tnt", fn() => Blocks::TNT()->setWorksUnderwater(true));
 		$result->registerBlock("underwater_torch", fn() => Blocks::UNDERWATER_TORCH());
 		$result->registerBlock("undyed_shulker_box", fn() => Blocks::SHULKER_BOX());
 		$result->registerBlock("unlit_redstone_torch", fn() => Blocks::REDSTONE_TORCH());
@@ -915,17 +1131,33 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("wall_banner", fn() => Blocks::WALL_BANNER());
 		$result->registerBlock("wall_coral_fan", fn() => Blocks::WALL_CORAL_FAN());
 		$result->registerBlock("wall_sign", fn() => Blocks::OAK_WALL_SIGN());
+		$result->registerBlock("warped_button", fn() => Blocks::WARPED_BUTTON());
+		$result->registerBlock("warped_door", fn() => Blocks::WARPED_DOOR());
+		$result->registerBlock("warped_fence", fn() => Blocks::WARPED_FENCE());
+		$result->registerBlock("warped_fence_gate", fn() => Blocks::WARPED_FENCE_GATE());
+		$result->registerBlock("warped_hyphae", fn() => Blocks::WARPED_HYPHAE()->setStripped(false));
+		$result->registerBlock("warped_planks", fn() => Blocks::WARPED_PLANKS());
+		$result->registerBlock("warped_pressure_plate", fn() => Blocks::WARPED_PRESSURE_PLATE());
+		$result->registerBlock("warped_roots", fn() => Blocks::WARPED_ROOTS());
+		$result->registerBlock("warped_sign", fn() => Blocks::WARPED_SIGN());
+		$result->registerBlock("warped_slab", fn() => Blocks::WARPED_SLAB());
+		$result->registerBlock("warped_stairs", fn() => Blocks::WARPED_STAIRS());
+		$result->registerBlock("warped_stem", fn() => Blocks::WARPED_STEM()->setStripped(false));
+		$result->registerBlock("warped_trapdoor", fn() => Blocks::WARPED_TRAPDOOR());
+		$result->registerBlock("warped_wart_block", fn() => Blocks::WARPED_WART_BLOCK());
 		$result->registerBlock("water", fn() => Blocks::WATER());
 		$result->registerBlock("water_lily", fn() => Blocks::LILY_PAD());
 		$result->registerBlock("waterlily", fn() => Blocks::LILY_PAD());
 		$result->registerBlock("web", fn() => Blocks::COBWEB());
+		$result->registerBlock("weeping_vines", fn() => Blocks::WEEPING_VINES());
 		$result->registerBlock("weighted_pressure_plate_heavy", fn() => Blocks::WEIGHTED_PRESSURE_PLATE_HEAVY());
 		$result->registerBlock("weighted_pressure_plate_light", fn() => Blocks::WEIGHTED_PRESSURE_PLATE_LIGHT());
 		$result->registerBlock("wheat_block", fn() => Blocks::WHEAT());
-		$result->registerBlock("white_glazed_terracotta", fn() => Blocks::WHITE_GLAZED_TERRACOTTA());
 		$result->registerBlock("white_tulip", fn() => Blocks::WHITE_TULIP());
-		$result->registerBlock("wood", fn() => Blocks::OAK_LOG());
-		$result->registerBlock("wood2", fn() => Blocks::ACACIA_LOG());
+		$result->registerBlock("wither_rose", fn() => Blocks::WITHER_ROSE());
+		$result->registerBlock("wither_skeleton_skull", fn() => Blocks::MOB_HEAD()->setMobHeadType(MobHeadType::WITHER_SKELETON));
+		$result->registerBlock("wood", fn() => Blocks::OAK_LOG()->setStripped(false));
+		$result->registerBlock("wood2", fn() => Blocks::ACACIA_LOG()->setStripped(false));
 		$result->registerBlock("wood_door_block", fn() => Blocks::OAK_DOOR());
 		$result->registerBlock("wood_slab", fn() => Blocks::OAK_SLAB());
 		$result->registerBlock("wood_slabs", fn() => Blocks::OAK_SLAB());
@@ -943,29 +1175,56 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("wool", fn() => Blocks::WOOL());
 		$result->registerBlock("workbench", fn() => Blocks::CRAFTING_TABLE());
 		$result->registerBlock("yellow_flower", fn() => Blocks::DANDELION());
-		$result->registerBlock("yellow_glazed_terracotta", fn() => Blocks::YELLOW_GLAZED_TERRACOTTA());
+		$result->registerBlock("zombie_head", fn() => Blocks::MOB_HEAD()->setMobHeadType(MobHeadType::ZOMBIE));
+	}
+
+	private static function registerDynamicItems(self $result) : void{
+		foreach(DyeColor::cases() as $color){
+			$prefix = fn(string $name) => strtolower($color->name) . "_" . $name;
+
+			$result->register($prefix("dye"), fn() => Items::DYE()->setColor($color));
+		}
+
+		foreach(GoatHornType::cases() as $goatHornType){
+			$prefix = fn(string $name) => strtolower($goatHornType->name) . "_" . $name;
+
+			$result->register($prefix("goat_horn"), fn() => Items::GOAT_HORN()->setHornType($goatHornType));
+		}
+
+		foreach(SuspiciousStewType::cases() as $suspiciousStewType){
+			$prefix = fn(string $name) => strtolower($suspiciousStewType->name) . "_" . $name;
+
+			$result->register($prefix("suspicious_stew"), fn() => Items::SUSPICIOUS_STEW()->setType($suspiciousStewType));
+		}
+
+		foreach(PotionType::cases() as $potionType){
+			$prefix = fn(string $name) => strtolower($potionType->name) . "_" . $name;
+
+			$result->register($prefix("potion"), fn() => Items::POTION()->setType($potionType));
+			$result->register($prefix("splash_potion"), fn() => Items::SPLASH_POTION()->setType($potionType));
+		}
+	}
+
+	private static function registerItems(self $result) : void{
 
 		$result->register("acacia_boat", fn() => Items::ACACIA_BOAT());
+		$result->register("amethyst_shard", fn() => Items::AMETHYST_SHARD());
+		$result->register("antidote", fn() => Items::MEDICINE()->setType(MedicineType::ANTIDOTE));
 		$result->register("apple", fn() => Items::APPLE());
 		$result->register("apple_enchanted", fn() => Items::ENCHANTED_GOLDEN_APPLE());
 		$result->register("appleenchanted", fn() => Items::ENCHANTED_GOLDEN_APPLE());
 		$result->register("arrow", fn() => Items::ARROW());
-		$result->register("awkward_potion", fn() => Items::AWKWARD_POTION());
-		$result->register("awkward_splash_potion", fn() => Items::AWKWARD_SPLASH_POTION());
 		$result->register("baked_potato", fn() => Items::BAKED_POTATO());
 		$result->register("baked_potatoes", fn() => Items::BAKED_POTATO());
-		$result->register("bed", fn() => Items::WHITE_BED());
 		$result->register("beef", fn() => Items::RAW_BEEF());
 		$result->register("beetroot", fn() => Items::BEETROOT());
 		$result->register("beetroot_seed", fn() => Items::BEETROOT_SEEDS());
 		$result->register("beetroot_seeds", fn() => Items::BEETROOT_SEEDS());
 		$result->register("beetroot_soup", fn() => Items::BEETROOT_SOUP());
 		$result->register("birch_boat", fn() => Items::BIRCH_BOAT());
-		$result->register("black_dye", fn() => Items::BLACK_DYE());
 		$result->register("blaze_powder", fn() => Items::BLAZE_POWDER());
 		$result->register("blaze_rod", fn() => Items::BLAZE_ROD());
 		$result->register("bleach", fn() => Items::BLEACH());
-		$result->register("blue_dye", fn() => Items::BLUE_DYE());
 		$result->register("boat", fn() => Items::OAK_BOAT());
 		$result->register("bone", fn() => Items::BONE());
 		$result->register("bone_meal", fn() => Items::BONE_MEAL());
@@ -975,7 +1234,6 @@ final class StringToItemParser extends StringToTParser{
 		$result->register("bowl", fn() => Items::BOWL());
 		$result->register("bread", fn() => Items::BREAD());
 		$result->register("brick", fn() => Items::BRICK());
-		$result->register("brown_dye", fn() => Items::BROWN_DYE());
 		$result->register("bucket", fn() => Items::BUCKET());
 		$result->register("carrot", fn() => Items::CARROT());
 		$result->register("chain_boots", fn() => Items::CHAINMAIL_BOOTS());
@@ -1034,6 +1292,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->register("clown_fish", fn() => Items::CLOWNFISH());
 		$result->register("clownfish", fn() => Items::CLOWNFISH());
 		$result->register("coal", fn() => Items::COAL());
+		$result->register("coast_armor_trim_smithing_template", fn() => Items::COAST_ARMOR_TRIM_SMITHING_TEMPLATE());
 		$result->register("cocoa_beans", fn() => Items::COCOA_BEANS());
 		$result->register("cod", fn() => Items::RAW_FISH());
 		$result->register("compass", fn() => Items::COMPASS());
@@ -1047,8 +1306,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->register("cooked_rabbit", fn() => Items::COOKED_RABBIT());
 		$result->register("cooked_salmon", fn() => Items::COOKED_SALMON());
 		$result->register("cookie", fn() => Items::COOKIE());
-		$result->register("creeper_head", fn() => Items::CREEPER_HEAD());
-		$result->register("cyan_dye", fn() => Items::CYAN_DYE());
+		$result->register("copper_ingot", fn() => Items::COPPER_INGOT());
 		$result->register("dark_oak_boat", fn() => Items::DARK_OAK_BOAT());
 		$result->register("diamond", fn() => Items::DIAMOND());
 		$result->register("diamond_axe", fn() => Items::DIAMOND_AXE());
@@ -1060,20 +1318,26 @@ final class StringToItemParser extends StringToTParser{
 		$result->register("diamond_pickaxe", fn() => Items::DIAMOND_PICKAXE());
 		$result->register("diamond_shovel", fn() => Items::DIAMOND_SHOVEL());
 		$result->register("diamond_sword", fn() => Items::DIAMOND_SWORD());
+		$result->register("disc_fragment_5", fn() => Items::DISC_FRAGMENT_5());
 		$result->register("dragon_breath", fn() => Items::DRAGON_BREATH());
-		$result->register("dragon_head", fn() => Items::DRAGON_HEAD());
 		$result->register("dried_kelp", fn() => Items::DRIED_KELP());
+		$result->register("dune_armor_trim_smithing_template", fn() => Items::DUNE_ARMOR_TRIM_SMITHING_TEMPLATE());
 		$result->register("dye", fn() => Items::INK_SAC());
+		$result->register("echo_shard", fn() => Items::ECHO_SHARD());
 		$result->register("egg", fn() => Items::EGG());
+		$result->register("elixir", fn() => Items::MEDICINE()->setType(MedicineType::ELIXIR));
 		$result->register("emerald", fn() => Items::EMERALD());
+		$result->register("enchanted_book", fn() => Items::ENCHANTED_BOOK());
 		$result->register("enchanted_golden_apple", fn() => Items::ENCHANTED_GOLDEN_APPLE());
 		$result->register("enchanting_bottle", fn() => Items::EXPERIENCE_BOTTLE());
+		$result->register("end_crystal", fn() => Items::END_CRYSTAL());
 		$result->register("ender_pearl", fn() => Items::ENDER_PEARL());
 		$result->register("experience_bottle", fn() => Items::EXPERIENCE_BOTTLE());
+		$result->register("eye_armor_trim_smithing_template", fn() => Items::EYE_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$result->register("eye_drops", fn() => Items::MEDICINE()->setType(MedicineType::EYE_DROPS));
 		$result->register("feather", fn() => Items::FEATHER());
 		$result->register("fermented_spider_eye", fn() => Items::FERMENTED_SPIDER_EYE());
-		$result->register("fire_resistance_potion", fn() => Items::FIRE_RESISTANCE_POTION());
-		$result->register("fire_resistance_splash_potion", fn() => Items::FIRE_RESISTANCE_SPLASH_POTION());
+		$result->register("fire_charge", fn() => Items::FIRE_CHARGE());
 		$result->register("fish", fn() => Items::RAW_FISH());
 		$result->register("fishing_rod", fn() => Items::FISHING_ROD());
 		$result->register("flint", fn() => Items::FLINT());
@@ -1082,7 +1346,10 @@ final class StringToItemParser extends StringToTParser{
 		$result->register("ghast_tear", fn() => Items::GHAST_TEAR());
 		$result->register("glass_bottle", fn() => Items::GLASS_BOTTLE());
 		$result->register("glistering_melon", fn() => Items::GLISTERING_MELON());
+		$result->register("glow_berries", fn() => Items::GLOW_BERRIES());
+		$result->register("glow_ink_sac", fn() => Items::GLOW_INK_SAC());
 		$result->register("glowstone_dust", fn() => Items::GLOWSTONE_DUST());
+		$result->register("goat_horn", fn() => Items::GOAT_HORN());
 		$result->register("gold_axe", fn() => Items::GOLDEN_AXE());
 		$result->register("gold_boots", fn() => Items::GOLDEN_BOOTS());
 		$result->register("gold_chestplate", fn() => Items::GOLDEN_CHESTPLATE());
@@ -1106,17 +1373,13 @@ final class StringToItemParser extends StringToTParser{
 		$result->register("golden_pickaxe", fn() => Items::GOLDEN_PICKAXE());
 		$result->register("golden_shovel", fn() => Items::GOLDEN_SHOVEL());
 		$result->register("golden_sword", fn() => Items::GOLDEN_SWORD());
-		$result->register("gray_dye", fn() => Items::GRAY_DYE());
-		$result->register("green_dye", fn() => Items::GREEN_DYE());
 		$result->register("gunpowder", fn() => Items::GUNPOWDER());
-		$result->register("harming_potion", fn() => Items::HARMING_POTION());
-		$result->register("harming_splash_potion", fn() => Items::HARMING_SPLASH_POTION());
-		$result->register("healing_potion", fn() => Items::HEALING_POTION());
-		$result->register("healing_splash_potion", fn() => Items::HEALING_SPLASH_POTION());
 		$result->register("heart_of_the_sea", fn() => Items::HEART_OF_THE_SEA());
+		$result->register("honey_bottle", fn() => Items::HONEY_BOTTLE());
+		$result->register("host_armor_trim_smithing_template", fn() => Items::HOST_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$result->register("honeycomb", fn() => Items::HONEYCOMB());
+		$result->register("ice_bomb", fn() => Items::ICE_BOMB());
 		$result->register("ink_sac", fn() => Items::INK_SAC());
-		$result->register("invisibility_potion", fn() => Items::INVISIBILITY_POTION());
-		$result->register("invisibility_splash_potion", fn() => Items::INVISIBILITY_SPLASH_POTION());
 		$result->register("iron_axe", fn() => Items::IRON_AXE());
 		$result->register("iron_boots", fn() => Items::IRON_BOOTS());
 		$result->register("iron_chestplate", fn() => Items::IRON_CHESTPLATE());
@@ -1131,8 +1394,6 @@ final class StringToItemParser extends StringToTParser{
 		$result->register("jungle_boat", fn() => Items::JUNGLE_BOAT());
 		$result->register("lapis_lazuli", fn() => Items::LAPIS_LAZULI());
 		$result->register("lava_bucket", fn() => Items::LAVA_BUCKET());
-		$result->register("leaping_potion", fn() => Items::LEAPING_POTION());
-		$result->register("leaping_splash_potion", fn() => Items::LEAPING_SPLASH_POTION());
 		$result->register("leather", fn() => Items::LEATHER());
 		$result->register("leather_boots", fn() => Items::LEATHER_BOOTS());
 		$result->register("leather_cap", fn() => Items::LEATHER_CAP());
@@ -1141,130 +1402,107 @@ final class StringToItemParser extends StringToTParser{
 		$result->register("leather_leggings", fn() => Items::LEATHER_PANTS());
 		$result->register("leather_pants", fn() => Items::LEATHER_PANTS());
 		$result->register("leather_tunic", fn() => Items::LEATHER_TUNIC());
-		$result->register("light_blue_dye", fn() => Items::LIGHT_BLUE_DYE());
-		$result->register("light_gray_dye", fn() => Items::LIGHT_GRAY_DYE());
-		$result->register("lime_dye", fn() => Items::LIME_DYE());
-		$result->register("long_fire_resistance_potion", fn() => Items::LONG_FIRE_RESISTANCE_POTION());
-		$result->register("long_fire_resistance_splash_potion", fn() => Items::LONG_FIRE_RESISTANCE_SPLASH_POTION());
-		$result->register("long_invisibility_potion", fn() => Items::LONG_INVISIBILITY_POTION());
-		$result->register("long_invisibility_splash_potion", fn() => Items::LONG_INVISIBILITY_SPLASH_POTION());
-		$result->register("long_leaping_potion", fn() => Items::LONG_LEAPING_POTION());
-		$result->register("long_leaping_splash_potion", fn() => Items::LONG_LEAPING_SPLASH_POTION());
-		$result->register("long_mundane_potion", fn() => Items::LONG_MUNDANE_POTION());
-		$result->register("long_mundane_splash_potion", fn() => Items::LONG_MUNDANE_SPLASH_POTION());
-		$result->register("long_night_vision_potion", fn() => Items::LONG_NIGHT_VISION_POTION());
-		$result->register("long_night_vision_splash_potion", fn() => Items::LONG_NIGHT_VISION_SPLASH_POTION());
-		$result->register("long_poison_potion", fn() => Items::LONG_POISON_POTION());
-		$result->register("long_poison_splash_potion", fn() => Items::LONG_POISON_SPLASH_POTION());
-		$result->register("long_regeneration_potion", fn() => Items::LONG_REGENERATION_POTION());
-		$result->register("long_regeneration_splash_potion", fn() => Items::LONG_REGENERATION_SPLASH_POTION());
-		$result->register("long_slow_falling_potion", fn() => Items::LONG_SLOW_FALLING_POTION());
-		$result->register("long_slow_falling_splash_potion", fn() => Items::LONG_SLOW_FALLING_SPLASH_POTION());
-		$result->register("long_slowness_potion", fn() => Items::LONG_SLOWNESS_POTION());
-		$result->register("long_slowness_splash_potion", fn() => Items::LONG_SLOWNESS_SPLASH_POTION());
-		$result->register("long_strength_potion", fn() => Items::LONG_STRENGTH_POTION());
-		$result->register("long_strength_splash_potion", fn() => Items::LONG_STRENGTH_SPLASH_POTION());
-		$result->register("long_swiftness_potion", fn() => Items::LONG_SWIFTNESS_POTION());
-		$result->register("long_swiftness_splash_potion", fn() => Items::LONG_SWIFTNESS_SPLASH_POTION());
-		$result->register("long_turtle_master_potion", fn() => Items::LONG_TURTLE_MASTER_POTION());
-		$result->register("long_turtle_master_splash_potion", fn() => Items::LONG_TURTLE_MASTER_SPLASH_POTION());
-		$result->register("long_water_breathing_potion", fn() => Items::LONG_WATER_BREATHING_POTION());
-		$result->register("long_water_breathing_splash_potion", fn() => Items::LONG_WATER_BREATHING_SPLASH_POTION());
-		$result->register("long_weakness_potion", fn() => Items::LONG_WEAKNESS_POTION());
-		$result->register("long_weakness_splash_potion", fn() => Items::LONG_WEAKNESS_SPLASH_POTION());
-		$result->register("magenta_dye", fn() => Items::MAGENTA_DYE());
 		$result->register("magma_cream", fn() => Items::MAGMA_CREAM());
 		$result->register("melon", fn() => Items::MELON());
 		$result->register("melon_seeds", fn() => Items::MELON_SEEDS());
 		$result->register("melon_slice", fn() => Items::MELON());
 		$result->register("milk_bucket", fn() => Items::MILK_BUCKET());
 		$result->register("minecart", fn() => Items::MINECART());
-		$result->register("mob_head", fn() => Items::SKELETON_SKULL());
-		$result->register("mundane_potion", fn() => Items::MUNDANE_POTION());
-		$result->register("mundane_splash_potion", fn() => Items::MUNDANE_SPLASH_POTION());
 		$result->register("mushroom_stew", fn() => Items::MUSHROOM_STEW());
 		$result->register("mutton", fn() => Items::RAW_MUTTON());
 		$result->register("mutton_cooked", fn() => Items::COOKED_MUTTON());
 		$result->register("mutton_raw", fn() => Items::RAW_MUTTON());
 		$result->register("muttoncooked", fn() => Items::COOKED_MUTTON());
 		$result->register("muttonraw", fn() => Items::RAW_MUTTON());
+		$result->register("name_tag", fn() => Items::NAME_TAG());
 		$result->register("nautilus_shell", fn() => Items::NAUTILUS_SHELL());
 		$result->register("nether_brick", fn() => Items::NETHER_BRICK());
 		$result->register("nether_quartz", fn() => Items::NETHER_QUARTZ());
 		$result->register("nether_star", fn() => Items::NETHER_STAR());
 		$result->register("netherbrick", fn() => Items::NETHER_BRICK());
+		$result->register("netherite_axe", fn() => Items::NETHERITE_AXE());
+		$result->register("netherite_boots", fn() => Items::NETHERITE_BOOTS());
+		$result->register("netherite_chestplate", fn() => Items::NETHERITE_CHESTPLATE());
+		$result->register("netherite_helmet", fn() => Items::NETHERITE_HELMET());
+		$result->register("netherite_hoe", fn() => Items::NETHERITE_HOE());
+		$result->register("netherite_ingot", fn() => Items::NETHERITE_INGOT());
+		$result->register("netherite_leggings", fn() => Items::NETHERITE_LEGGINGS());
+		$result->register("netherite_pickaxe", fn() => Items::NETHERITE_PICKAXE());
+		$result->register("netherite_scrap", fn() => Items::NETHERITE_SCRAP());
+		$result->register("netherite_shovel", fn() => Items::NETHERITE_SHOVEL());
+		$result->register("netherite_sword", fn() => Items::NETHERITE_SWORD());
 		$result->register("netherstar", fn() => Items::NETHER_STAR());
-		$result->register("night_vision_potion", fn() => Items::NIGHT_VISION_POTION());
-		$result->register("night_vision_splash_potion", fn() => Items::NIGHT_VISION_SPLASH_POTION());
+		$result->register("netherite_upgrade_smithing_template", fn() => Items::NETHERITE_UPGRADE_SMITHING_TEMPLATE());
 		$result->register("oak_boat", fn() => Items::OAK_BOAT());
-		$result->register("orange_dye", fn() => Items::ORANGE_DYE());
 		$result->register("painting", fn() => Items::PAINTING());
 		$result->register("paper", fn() => Items::PAPER());
-		$result->register("pink_dye", fn() => Items::PINK_DYE());
-		$result->register("player_head", fn() => Items::PLAYER_HEAD());
-		$result->register("poison_potion", fn() => Items::POISON_POTION());
-		$result->register("poison_splash_potion", fn() => Items::POISON_SPLASH_POTION());
+		$result->register("phantom_membrane", fn() => Items::PHANTOM_MEMBRANE());
+		$result->register("pitcher_pod", fn() => Items::PITCHER_POD());
 		$result->register("poisonous_potato", fn() => Items::POISONOUS_POTATO());
 		$result->register("popped_chorus_fruit", fn() => Items::POPPED_CHORUS_FRUIT());
 		$result->register("porkchop", fn() => Items::RAW_PORKCHOP());
 		$result->register("potato", fn() => Items::POTATO());
-		$result->register("potion", fn() => Items::WATER_POTION());
+		$result->register("potion", fn() => Items::POTION());
 		$result->register("prismarine_crystals", fn() => Items::PRISMARINE_CRYSTALS());
 		$result->register("prismarine_shard", fn() => Items::PRISMARINE_SHARD());
 		$result->register("puffer_fish", fn() => Items::PUFFERFISH());
 		$result->register("pufferfish", fn() => Items::PUFFERFISH());
 		$result->register("pumpkin_pie", fn() => Items::PUMPKIN_PIE());
 		$result->register("pumpkin_seeds", fn() => Items::PUMPKIN_SEEDS());
-		$result->register("purple_dye", fn() => Items::PURPLE_DYE());
 		$result->register("quartz", fn() => Items::NETHER_QUARTZ());
 		$result->register("rabbit", fn() => Items::RAW_RABBIT());
 		$result->register("rabbit_foot", fn() => Items::RABBIT_FOOT());
 		$result->register("rabbit_hide", fn() => Items::RABBIT_HIDE());
 		$result->register("rabbit_stew", fn() => Items::RABBIT_STEW());
+		$result->register("raiser_armor_trim_smithing_template", fn() => Items::RAISER_ARMOR_TRIM_SMITHING_TEMPLATE());
 		$result->register("raw_beef", fn() => Items::RAW_BEEF());
 		$result->register("raw_cod", fn() => Items::RAW_FISH());
+		$result->register("raw_copper", fn() => Items::RAW_COPPER());
 		$result->register("raw_chicken", fn() => Items::RAW_CHICKEN());
 		$result->register("raw_fish", fn() => Items::RAW_FISH());
+		$result->register("raw_gold", fn() => Items::RAW_GOLD());
+		$result->register("raw_iron", fn() => Items::RAW_IRON());
 		$result->register("raw_mutton", fn() => Items::RAW_MUTTON());
 		$result->register("raw_porkchop", fn() => Items::RAW_PORKCHOP());
 		$result->register("raw_rabbit", fn() => Items::RAW_RABBIT());
 		$result->register("raw_salmon", fn() => Items::RAW_SALMON());
 		$result->register("record_11", fn() => Items::RECORD_11());
 		$result->register("record_13", fn() => Items::RECORD_13());
+		$result->register("record_5", fn() => Items::RECORD_5());
 		$result->register("record_blocks", fn() => Items::RECORD_BLOCKS());
 		$result->register("record_cat", fn() => Items::RECORD_CAT());
 		$result->register("record_chirp", fn() => Items::RECORD_CHIRP());
 		$result->register("record_far", fn() => Items::RECORD_FAR());
 		$result->register("record_mall", fn() => Items::RECORD_MALL());
 		$result->register("record_mellohi", fn() => Items::RECORD_MELLOHI());
+		$result->register("record_otherside", fn() => Items::RECORD_OTHERSIDE());
+		$result->register("record_pigstep", fn() => Items::RECORD_PIGSTEP());
 		$result->register("record_stal", fn() => Items::RECORD_STAL());
 		$result->register("record_strad", fn() => Items::RECORD_STRAD());
 		$result->register("record_wait", fn() => Items::RECORD_WAIT());
 		$result->register("record_ward", fn() => Items::RECORD_WARD());
-		$result->register("red_dye", fn() => Items::RED_DYE());
 		$result->register("redstone", fn() => Items::REDSTONE_DUST());
 		$result->register("redstone_dust", fn() => Items::REDSTONE_DUST());
-		$result->register("regeneration_potion", fn() => Items::REGENERATION_POTION());
-		$result->register("regeneration_splash_potion", fn() => Items::REGENERATION_SPLASH_POTION());
+		$result->register("rib_armor_trim_smithing_template", fn() => Items::RIB_ARMOR_TRIM_SMITHING_TEMPLATE());
 		$result->register("rotten_flesh", fn() => Items::ROTTEN_FLESH());
 		$result->register("salmon", fn() => Items::RAW_SALMON());
 		$result->register("scute", fn() => Items::SCUTE());
+		$result->register("sentry_armor_trim_smithing_template", fn() => Items::SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$result->register("shaper_armor_trim_smithing_template", fn() => Items::SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE());
 		$result->register("seeds", fn() => Items::WHEAT_SEEDS());
 		$result->register("shears", fn() => Items::SHEARS());
 		$result->register("shulker_shell", fn() => Items::SHULKER_SHELL());
-		$result->register("skeleton_skull", fn() => Items::SKELETON_SKULL());
-		$result->register("skull", fn() => Items::SKELETON_SKULL());
+		$result->register("silence_armor_trim_smithing_template", fn() => Items::SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE());
 		$result->register("slime_ball", fn() => Items::SLIMEBALL());
+		$result->register("snout_armor_trim_smithing_template", fn() => Items::SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE());
 		$result->register("slimeball", fn() => Items::SLIMEBALL());
-		$result->register("slow_falling_potion", fn() => Items::SLOW_FALLING_POTION());
-		$result->register("slow_falling_splash_potion", fn() => Items::SLOW_FALLING_SPLASH_POTION());
-		$result->register("slowness_potion", fn() => Items::SLOWNESS_POTION());
-		$result->register("slowness_splash_potion", fn() => Items::SLOWNESS_SPLASH_POTION());
 		$result->register("snowball", fn() => Items::SNOWBALL());
 		$result->register("speckled_melon", fn() => Items::GLISTERING_MELON());
 		$result->register("spider_eye", fn() => Items::SPIDER_EYE());
-		$result->register("splash_potion", fn() => Items::WATER_SPLASH_POTION());
+		$result->register("spire_armor_trim_smithing_template", fn() => Items::SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE());
+		$result->register("splash_potion", fn() => Items::SPLASH_POTION());
 		$result->register("spruce_boat", fn() => Items::SPRUCE_BOAT());
+		$result->register("spyglass", fn() => Items::SPYGLASS());
 		$result->register("squid_spawn_egg", fn() => Items::SQUID_SPAWN_EGG());
 		$result->register("steak", fn() => Items::STEAK());
 		$result->register("stick", fn() => Items::STICK());
@@ -1274,49 +1512,24 @@ final class StringToItemParser extends StringToTParser{
 		$result->register("stone_pickaxe", fn() => Items::STONE_PICKAXE());
 		$result->register("stone_shovel", fn() => Items::STONE_SHOVEL());
 		$result->register("stone_sword", fn() => Items::STONE_SWORD());
-		$result->register("strength_potion", fn() => Items::STRENGTH_POTION());
-		$result->register("strength_splash_potion", fn() => Items::STRENGTH_SPLASH_POTION());
 		$result->register("string", fn() => Items::STRING());
-		$result->register("strong_harming_potion", fn() => Items::STRONG_HARMING_POTION());
-		$result->register("strong_harming_splash_potion", fn() => Items::STRONG_HARMING_SPLASH_POTION());
-		$result->register("strong_healing_potion", fn() => Items::STRONG_HEALING_POTION());
-		$result->register("strong_healing_splash_potion", fn() => Items::STRONG_HEALING_SPLASH_POTION());
-		$result->register("strong_leaping_potion", fn() => Items::STRONG_LEAPING_POTION());
-		$result->register("strong_leaping_splash_potion", fn() => Items::STRONG_LEAPING_SPLASH_POTION());
-		$result->register("strong_poison_potion", fn() => Items::STRONG_POISON_POTION());
-		$result->register("strong_poison_splash_potion", fn() => Items::STRONG_POISON_SPLASH_POTION());
-		$result->register("strong_regeneration_potion", fn() => Items::STRONG_REGENERATION_POTION());
-		$result->register("strong_regeneration_splash_potion", fn() => Items::STRONG_REGENERATION_SPLASH_POTION());
-		$result->register("strong_strength_potion", fn() => Items::STRONG_STRENGTH_POTION());
-		$result->register("strong_strength_splash_potion", fn() => Items::STRONG_STRENGTH_SPLASH_POTION());
-		$result->register("strong_swiftness_potion", fn() => Items::STRONG_SWIFTNESS_POTION());
-		$result->register("strong_swiftness_splash_potion", fn() => Items::STRONG_SWIFTNESS_SPLASH_POTION());
-		$result->register("strong_turtle_master_potion", fn() => Items::STRONG_TURTLE_MASTER_POTION());
-		$result->register("strong_turtle_master_splash_potion", fn() => Items::STRONG_TURTLE_MASTER_SPLASH_POTION());
 		$result->register("sugar", fn() => Items::SUGAR());
+		$result->register("suspicious_stew", fn() => Items::SUSPICIOUS_STEW());
 		$result->register("sweet_berries", fn() => Items::SWEET_BERRIES());
-		$result->register("swiftness_potion", fn() => Items::SWIFTNESS_POTION());
-		$result->register("swiftness_splash_potion", fn() => Items::SWIFTNESS_SPLASH_POTION());
-		$result->register("thick_potion", fn() => Items::THICK_POTION());
-		$result->register("thick_splash_potion", fn() => Items::THICK_SPLASH_POTION());
+		$result->register("tonic", fn() => Items::MEDICINE()->setType(MedicineType::TONIC));
+		$result->register("torchflower_seeds", fn() => Items::TORCHFLOWER_SEEDS());
+		$result->register("tide_armor_trim_smithing_template", fn() => Items::TIDE_ARMOR_TRIM_SMITHING_TEMPLATE());
 		$result->register("totem", fn() => Items::TOTEM());
-		$result->register("turtle_master_potion", fn() => Items::TURTLE_MASTER_POTION());
-		$result->register("turtle_master_splash_potion", fn() => Items::TURTLE_MASTER_SPLASH_POTION());
+		$result->register("turtle_helmet", fn() => Items::TURTLE_HELMET());
+		$result->register("vex_armor_trim_smithing_template", fn() => Items::VEX_ARMOR_TRIM_SMITHING_TEMPLATE());
 		$result->register("turtle_shell_piece", fn() => Items::SCUTE());
 		$result->register("villager_spawn_egg", fn() => Items::VILLAGER_SPAWN_EGG());
-		$result->register("water_breathing_potion", fn() => Items::WATER_BREATHING_POTION());
-		$result->register("water_breathing_splash_potion", fn() => Items::WATER_BREATHING_SPLASH_POTION());
+		$result->register("ward_armor_trim_smithing_template", fn() => Items::WARD_ARMOR_TRIM_SMITHING_TEMPLATE());
 		$result->register("water_bucket", fn() => Items::WATER_BUCKET());
-		$result->register("water_potion", fn() => Items::WATER_POTION());
-		$result->register("water_splash_potion", fn() => Items::WATER_SPLASH_POTION());
-		$result->register("weakness_potion", fn() => Items::WEAKNESS_POTION());
-		$result->register("weakness_splash_potion", fn() => Items::WEAKNESS_SPLASH_POTION());
+		$result->register("wayfinder_armor_trim_smithing_template", fn() => Items::WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE());
 		$result->register("wheat", fn() => Items::WHEAT());
 		$result->register("wheat_seeds", fn() => Items::WHEAT_SEEDS());
-		$result->register("white_dye", fn() => Items::WHITE_DYE());
-		$result->register("wither_potion", fn() => Items::WITHER_POTION());
-		$result->register("wither_skeleton_skull", fn() => Items::WITHER_SKELETON_SKULL());
-		$result->register("wither_splash_potion", fn() => Items::WITHER_SPLASH_POTION());
+		$result->register("wild_armor_trim_smithing_template", fn() => Items::WILD_ARMOR_TRIM_SMITHING_TEMPLATE());
 		$result->register("wooden_axe", fn() => Items::WOODEN_AXE());
 		$result->register("wooden_hoe", fn() => Items::WOODEN_HOE());
 		$result->register("wooden_pickaxe", fn() => Items::WOODEN_PICKAXE());
@@ -1324,11 +1537,19 @@ final class StringToItemParser extends StringToTParser{
 		$result->register("wooden_sword", fn() => Items::WOODEN_SWORD());
 		$result->register("writable_book", fn() => Items::WRITABLE_BOOK());
 		$result->register("written_book", fn() => Items::WRITTEN_BOOK());
-		$result->register("yellow_dye", fn() => Items::YELLOW_DYE());
-		$result->register("zombie_head", fn() => Items::ZOMBIE_HEAD());
 		$result->register("zombie_spawn_egg", fn() => Items::ZOMBIE_SPAWN_EGG());
+	}
 
-		return $result;
+	/**
+	 * @var true[][]
+	 * @phpstan-var array<int, array<string, true>>
+	 */
+	private array $reverseMap = [];
+
+	public function register(string $alias, \Closure $callback) : void{
+		parent::register($alias, $callback);
+		$item = $callback($alias);
+		$this->reverseMap[$item->getStateId()][$alias] = true;
 	}
 
 	/** @phpstan-param \Closure(string $input) : Block $callback */
@@ -1339,4 +1560,25 @@ final class StringToItemParser extends StringToTParser{
 	public function parse(string $input) : ?Item{
 		return parent::parse($input);
 	}
+
+	/**
+	 * Returns a list of currently registered aliases that resolve to the given item.
+	 *
+	 * @return string[]
+	 * @phpstan-return list<string>
+	 */
+	public function lookupAliases(Item $item) : array{
+		$aliases = $this->reverseMap[$item->getStateId()] ?? [];
+		return array_keys($aliases);
+	}
+
+	/**
+	 * Returns a list of currently registered aliases that resolve to the item form of the given block.
+	 *
+	 * @return string[]
+	 * @phpstan-return list<string>
+	 */
+	public function lookupBlockAliases(Block $block) : array{
+		return $this->lookupAliases($block->asItem());
+	}
 }
diff --git a/src/item/SuspiciousStew.php b/src/item/SuspiciousStew.php
new file mode 100644
index 0000000000..7d1d30cc09
--- /dev/null
+++ b/src/item/SuspiciousStew.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\item;
+
+use pocketmine\data\runtime\RuntimeDataDescriber;
+
+class SuspiciousStew extends Food{
+
+	private SuspiciousStewType $suspiciousStewType = SuspiciousStewType::POPPY;
+
+	protected function describeState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->suspiciousStewType);
+	}
+
+	public function getType() : SuspiciousStewType{ return $this->suspiciousStewType; }
+
+	/**
+	 * @return $this
+	 */
+	public function setType(SuspiciousStewType $type) : self{
+		$this->suspiciousStewType = $type;
+		return $this;
+	}
+
+	public function getMaxStackSize() : int{
+		return 1;
+	}
+
+	public function requiresHunger() : bool{
+		return false;
+	}
+
+	public function getFoodRestore() : int{
+		return 6;
+	}
+
+	public function getSaturationRestore() : float{
+		return 7.2;
+	}
+
+	public function getAdditionalEffects() : array{
+		return $this->suspiciousStewType->getEffects();
+	}
+
+	public function getResidue() : Item{
+		return VanillaItems::BOWL();
+	}
+}
diff --git a/src/item/SuspiciousStewType.php b/src/item/SuspiciousStewType.php
new file mode 100644
index 0000000000..d53b82a3fa
--- /dev/null
+++ b/src/item/SuspiciousStewType.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\item;
+
+use pocketmine\entity\effect\EffectInstance;
+use pocketmine\entity\effect\VanillaEffects;
+use pocketmine\utils\LegacyEnumShimTrait;
+
+/**
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
+ *
+ * @method static SuspiciousStewType ALLIUM()
+ * @method static SuspiciousStewType AZURE_BLUET()
+ * @method static SuspiciousStewType BLUE_ORCHID()
+ * @method static SuspiciousStewType CORNFLOWER()
+ * @method static SuspiciousStewType DANDELION()
+ * @method static SuspiciousStewType LILY_OF_THE_VALLEY()
+ * @method static SuspiciousStewType OXEYE_DAISY()
+ * @method static SuspiciousStewType POPPY()
+ * @method static SuspiciousStewType TULIP()
+ * @method static SuspiciousStewType WITHER_ROSE()
+ */
+enum SuspiciousStewType{
+	use LegacyEnumShimTrait;
+
+	case POPPY;
+	case CORNFLOWER;
+	case TULIP;
+	case AZURE_BLUET;
+	case LILY_OF_THE_VALLEY;
+	case DANDELION;
+	case BLUE_ORCHID;
+	case ALLIUM;
+	case OXEYE_DAISY;
+	case WITHER_ROSE;
+
+	/**
+	 * @return EffectInstance[]
+	 * @phpstan-return list<EffectInstance>
+	 */
+	public function getEffects() : array{
+		return match($this){
+			self::POPPY => [new EffectInstance(VanillaEffects::NIGHT_VISION(), 80)],
+			self::CORNFLOWER => [new EffectInstance(VanillaEffects::JUMP_BOOST(), 80)],
+			self::TULIP => [new EffectInstance(VanillaEffects::WEAKNESS(), 140)],
+			self::AZURE_BLUET => [new EffectInstance(VanillaEffects::BLINDNESS(), 120)],
+			self::LILY_OF_THE_VALLEY => [new EffectInstance(VanillaEffects::POISON(), 200)],
+			self::DANDELION,
+			self::BLUE_ORCHID => [new EffectInstance(VanillaEffects::SATURATION(), 6)],
+			self::ALLIUM => [new EffectInstance(VanillaEffects::FIRE_RESISTANCE(), 40)],
+			self::OXEYE_DAISY => [new EffectInstance(VanillaEffects::REGENERATION(), 120)],
+			self::WITHER_ROSE => [new EffectInstance(VanillaEffects::WITHER(), 120)]
+		};
+	}
+}
diff --git a/src/item/Sword.php b/src/item/Sword.php
index aee1e997e4..5576f3c125 100644
--- a/src/item/Sword.php
+++ b/src/item/Sword.php
@@ -49,14 +49,14 @@ class Sword extends TieredTool{
 		return 10;
 	}
 
-	public function onDestroyBlock(Block $block) : bool{
+	public function onDestroyBlock(Block $block, array &$returnedItems) : bool{
 		if(!$block->getBreakInfo()->breaksInstantly()){
 			return $this->applyDamage(2);
 		}
 		return false;
 	}
 
-	public function onAttackEntity(Entity $victim) : bool{
+	public function onAttackEntity(Entity $victim, array &$returnedItems) : bool{
 		return $this->applyDamage(1);
 	}
 }
diff --git a/src/item/TieredTool.php b/src/item/TieredTool.php
index 2c559f2a45..20b40bbcb4 100644
--- a/src/item/TieredTool.php
+++ b/src/item/TieredTool.php
@@ -24,12 +24,13 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 abstract class TieredTool extends Tool{
+	protected ToolTier $tier;
 
-	/** @var ToolTier */
-	protected $tier;
-
-	public function __construct(ItemIdentifier $identifier, string $name, ToolTier $tier){
-		parent::__construct($identifier, $name);
+	/**
+	 * @param string[] $enchantmentTags
+	 */
+	public function __construct(ItemIdentifier $identifier, string $name, ToolTier $tier, array $enchantmentTags = []){
+		parent::__construct($identifier, $name, $enchantmentTags);
 		$this->tier = $tier;
 	}
 
@@ -45,11 +46,19 @@ abstract class TieredTool extends Tool{
 		return $this->tier->getBaseEfficiency();
 	}
 
+	public function getEnchantability() : int{
+		return $this->tier->getEnchantability();
+	}
+
 	public function getFuelTime() : int{
-		if($this->tier->equals(ToolTier::WOOD())){
+		if($this->tier === ToolTier::WOOD){
 			return 200;
 		}
 
 		return 0;
 	}
+
+	public function isFireProof() : bool{
+		return $this->tier === ToolTier::NETHERITE;
+	}
 }
diff --git a/src/item/ToolTier.php b/src/item/ToolTier.php
index 08d7c52b64..8469bc7e5f 100644
--- a/src/item/ToolTier.php
+++ b/src/item/ToolTier.php
@@ -23,58 +23,76 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static ToolTier DIAMOND()
  * @method static ToolTier GOLD()
  * @method static ToolTier IRON()
+ * @method static ToolTier NETHERITE()
  * @method static ToolTier STONE()
  * @method static ToolTier WOOD()
+ *
+ * @phpstan-type TMetadata array{0: int, 1: int, 2: int, 3: int, 4: int}
  */
-final class ToolTier{
-	use EnumTrait {
-		__construct as Enum___construct;
+enum ToolTier{
+	use LegacyEnumShimTrait;
+
+	case WOOD;
+	case GOLD;
+	case STONE;
+	case IRON;
+	case DIAMOND;
+	case NETHERITE;
+
+	/**
+	 * This function exists only to permit the use of named arguments and to make the code easier to read in PhpStorm.
+	 * @phpstan-return TMetadata
+	 */
+	private static function meta(int $harvestLevel, int $maxDurability, int $baseAttackPoints, int $baseEfficiency, int $enchantability) : array{
+		return [$harvestLevel, $maxDurability, $baseAttackPoints, $baseEfficiency, $enchantability];
 	}
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("wood", 1, 60, 5, 2),
-			new self("gold", 2, 33, 5, 12),
-			new self("stone", 3, 132, 6, 4),
-			new self("iron", 4, 251, 7, 6),
-			new self("diamond", 5, 1562, 8, 8)
-		);
-	}
-
-	private function __construct(
-		string $name,
-		private int $harvestLevel,
-		private int $maxDurability,
-		private int $baseAttackPoints,
-		private int $baseEfficiency
-	){
-		$this->Enum___construct($name);
+	/**
+	 * @phpstan-return TMetadata
+	 */
+	private function getMetadata() : array{
+		return match($this){
+			self::WOOD => self::meta(1, 60, 5, 2, 15),
+			self::GOLD => self::meta(2, 33, 5, 12, 22),
+			self::STONE => self::meta(3, 132, 6, 4, 5),
+			self::IRON => self::meta(4, 251, 7, 6, 14),
+			self::DIAMOND => self::meta(5, 1562, 8, 8, 10),
+			self::NETHERITE => self::meta(6, 2032, 9, 9, 15)
+		};
 	}
 
 	public function getHarvestLevel() : int{
-		return $this->harvestLevel;
+		return $this->getMetadata()[0];
 	}
 
 	public function getMaxDurability() : int{
-		return $this->maxDurability;
+		return $this->getMetadata()[1];
 	}
 
 	public function getBaseAttackPoints() : int{
-		return $this->baseAttackPoints;
+		return $this->getMetadata()[2];
 	}
 
 	public function getBaseEfficiency() : int{
-		return $this->baseEfficiency;
+		return $this->getMetadata()[3];
+	}
+
+	/**
+	 * Returns the value that defines how enchantable the item is.
+	 *
+	 * The higher an item's enchantability is, the more likely it will be to gain high-level enchantments
+	 * or multiple enchantments upon being enchanted in an enchanting table.
+	 */
+	public function getEnchantability() : int{
+		return $this->getMetadata()[4];
 	}
 }
diff --git a/src/item/TorchflowerSeeds.php b/src/item/TorchflowerSeeds.php
new file mode 100644
index 0000000000..123af35a09
--- /dev/null
+++ b/src/item/TorchflowerSeeds.php
@@ -0,0 +1,34 @@
+<?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\item;
+
+use pocketmine\block\Block;
+use pocketmine\block\VanillaBlocks;
+
+final class TorchflowerSeeds extends Item{
+
+	public function getBlock(?int $clickedFace = null) : Block{
+		return VanillaBlocks::TORCHFLOWER_CROP();
+	}
+}
diff --git a/src/item/TurtleHelmet.php b/src/item/TurtleHelmet.php
new file mode 100644
index 0000000000..2ee1d74d2f
--- /dev/null
+++ b/src/item/TurtleHelmet.php
@@ -0,0 +1,41 @@
+<?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\item;
+
+use pocketmine\entity\effect\EffectInstance;
+use pocketmine\entity\effect\VanillaEffects;
+use pocketmine\entity\Human;
+use pocketmine\entity\Living;
+
+class TurtleHelmet extends Armor{
+
+	public function onTickWorn(Living $entity) : bool{
+		if($entity instanceof Human && !$entity->isUnderwater()){
+			$entity->getEffects()->add(new EffectInstance(VanillaEffects::WATER_BREATHING(), 200, 0, false));
+			return true;
+		}
+
+		return false;
+	}
+}
diff --git a/src/item/VanillaArmorMaterials.php b/src/item/VanillaArmorMaterials.php
new file mode 100644
index 0000000000..818273d208
--- /dev/null
+++ b/src/item/VanillaArmorMaterials.php
@@ -0,0 +1,80 @@
+<?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\item;
+
+use pocketmine\utils\RegistryTrait;
+use pocketmine\world\sound\ArmorEquipChainSound;
+use pocketmine\world\sound\ArmorEquipDiamondSound;
+use pocketmine\world\sound\ArmorEquipGenericSound;
+use pocketmine\world\sound\ArmorEquipGoldSound;
+use pocketmine\world\sound\ArmorEquipIronSound;
+use pocketmine\world\sound\ArmorEquipLeatherSound;
+use pocketmine\world\sound\ArmorEquipNetheriteSound;
+
+/**
+ * This doc-block is generated automatically, do not modify it manually.
+ * This must be regenerated whenever registry members are added, removed or changed.
+ * @see build/generate-registry-annotations.php
+ * @generate-registry-docblock
+ *
+ * @method static ArmorMaterial CHAINMAIL()
+ * @method static ArmorMaterial DIAMOND()
+ * @method static ArmorMaterial GOLD()
+ * @method static ArmorMaterial IRON()
+ * @method static ArmorMaterial LEATHER()
+ * @method static ArmorMaterial NETHERITE()
+ * @method static ArmorMaterial TURTLE()
+ */
+final class VanillaArmorMaterials{
+	use RegistryTrait;
+
+	private function __construct(){
+		// NOOP
+	}
+
+	protected static function register(string $name, ArmorMaterial $armorMaterial) : void{
+		self::_registryRegister($name, $armorMaterial);
+	}
+
+	/**
+	 * @return ArmorMaterial[]
+	 * @phpstan-return array<string, ArmorMaterial>
+	 */
+	public static function getAll() : array{
+		// phpstan doesn't support generic traits yet :(
+		/** @var ArmorMaterial[] $result */
+		$result = self::_registryGetAll();
+		return $result;
+	}
+
+	protected static function setup() : void{
+		self::register("leather", new ArmorMaterial(15, new ArmorEquipLeatherSound()));
+		self::register("chainmail", new ArmorMaterial(12, new ArmorEquipChainSound()));
+		self::register("iron", new ArmorMaterial(9, new ArmorEquipIronSound()));
+		self::register("turtle", new ArmorMaterial(9, new ArmorEquipGenericSound()));
+		self::register("gold", new ArmorMaterial(25, new ArmorEquipGoldSound()));
+		self::register("diamond", new ArmorMaterial(10, new ArmorEquipDiamondSound()));
+		self::register("netherite", new ArmorMaterial(15, new ArmorEquipNetheriteSound()));
+	}
+}
diff --git a/src/item/VanillaItems.php b/src/item/VanillaItems.php
index 9bc5378121..dcf59daf6b 100644
--- a/src/item/VanillaItems.php
+++ b/src/item/VanillaItems.php
@@ -23,8 +23,23 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-use pocketmine\item\ItemIds as Ids;
+use pocketmine\block\utils\RecordType;
+use pocketmine\block\VanillaBlocks as Blocks;
+use pocketmine\entity\Entity;
+use pocketmine\entity\Location;
+use pocketmine\entity\Squid;
+use pocketmine\entity\Villager;
+use pocketmine\entity\Zombie;
+use pocketmine\inventory\ArmorInventory;
+use pocketmine\item\enchantment\ItemEnchantmentTags as EnchantmentTags;
+use pocketmine\item\ItemIdentifier as IID;
+use pocketmine\item\VanillaArmorMaterials as ArmorMaterials;
+use pocketmine\math\Vector3;
 use pocketmine\utils\CloningRegistryTrait;
+use pocketmine\world\World;
+use function is_int;
+use function mb_strtoupper;
+use function strtolower;
 
 /**
  * This doc-block is generated automatically, do not modify it manually.
@@ -33,23 +48,22 @@ use pocketmine\utils\CloningRegistryTrait;
  * @generate-registry-docblock
  *
  * @method static Boat ACACIA_BOAT()
+ * @method static ItemBlockWallOrFloor ACACIA_SIGN()
  * @method static ItemBlock AIR()
+ * @method static Item AMETHYST_SHARD()
  * @method static Apple APPLE()
  * @method static Arrow ARROW()
- * @method static Potion AWKWARD_POTION()
- * @method static SplashPotion AWKWARD_SPLASH_POTION()
  * @method static BakedPotato BAKED_POTATO()
+ * @method static Bamboo BAMBOO()
+ * @method static Banner BANNER()
  * @method static Beetroot BEETROOT()
  * @method static BeetrootSeeds BEETROOT_SEEDS()
  * @method static BeetrootSoup BEETROOT_SOUP()
  * @method static Boat BIRCH_BOAT()
- * @method static Bed BLACK_BED()
- * @method static Dye BLACK_DYE()
+ * @method static ItemBlockWallOrFloor BIRCH_SIGN()
  * @method static Item BLAZE_POWDER()
  * @method static BlazeRod BLAZE_ROD()
  * @method static Item BLEACH()
- * @method static Bed BLUE_BED()
- * @method static Dye BLUE_DYE()
  * @method static Item BONE()
  * @method static Fertilizer BONE_MEAL()
  * @method static Book BOOK()
@@ -57,8 +71,6 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Bowl BOWL()
  * @method static Bread BREAD()
  * @method static Item BRICK()
- * @method static Bed BROWN_BED()
- * @method static Dye BROWN_DYE()
  * @method static Bucket BUCKET()
  * @method static Carrot CARROT()
  * @method static Armor CHAINMAIL_BOOTS()
@@ -104,11 +116,13 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Item CHEMICAL_SULPHATE()
  * @method static Item CHEMICAL_TUNGSTEN_CHLORIDE()
  * @method static Item CHEMICAL_WATER()
+ * @method static ItemBlockWallOrFloor CHERRY_SIGN()
  * @method static ChorusFruit CHORUS_FRUIT()
  * @method static Item CLAY()
  * @method static Clock CLOCK()
  * @method static Clownfish CLOWNFISH()
  * @method static Coal COAL()
+ * @method static Item COAST_ARMOR_TRIM_SMITHING_TEMPLATE()
  * @method static CocoaBeans COCOA_BEANS()
  * @method static Compass COMPASS()
  * @method static CookedChicken COOKED_CHICKEN()
@@ -118,10 +132,11 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static CookedRabbit COOKED_RABBIT()
  * @method static CookedSalmon COOKED_SALMON()
  * @method static Cookie COOKIE()
- * @method static Skull CREEPER_HEAD()
- * @method static Bed CYAN_BED()
- * @method static Dye CYAN_DYE()
+ * @method static Item COPPER_INGOT()
+ * @method static CoralFan CORAL_FAN()
+ * @method static ItemBlockWallOrFloor CRIMSON_SIGN()
  * @method static Boat DARK_OAK_BOAT()
+ * @method static ItemBlockWallOrFloor DARK_OAK_SIGN()
  * @method static Item DIAMOND()
  * @method static Axe DIAMOND_AXE()
  * @method static Armor DIAMOND_BOOTS()
@@ -132,18 +147,23 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Pickaxe DIAMOND_PICKAXE()
  * @method static Shovel DIAMOND_SHOVEL()
  * @method static Sword DIAMOND_SWORD()
+ * @method static Item DISC_FRAGMENT_5()
  * @method static Item DRAGON_BREATH()
- * @method static Skull DRAGON_HEAD()
  * @method static DriedKelp DRIED_KELP()
+ * @method static Item DUNE_ARMOR_TRIM_SMITHING_TEMPLATE()
+ * @method static Dye DYE()
+ * @method static Item ECHO_SHARD()
  * @method static Egg EGG()
  * @method static Item EMERALD()
+ * @method static EnchantedBook ENCHANTED_BOOK()
  * @method static GoldenAppleEnchanted ENCHANTED_GOLDEN_APPLE()
  * @method static EnderPearl ENDER_PEARL()
+ * @method static EndCrystal END_CRYSTAL()
  * @method static ExperienceBottle EXPERIENCE_BOTTLE()
+ * @method static Item EYE_ARMOR_TRIM_SMITHING_TEMPLATE()
  * @method static Item FEATHER()
  * @method static Item FERMENTED_SPIDER_EYE()
- * @method static Potion FIRE_RESISTANCE_POTION()
- * @method static SplashPotion FIRE_RESISTANCE_SPLASH_POTION()
+ * @method static FireCharge FIRE_CHARGE()
  * @method static FishingRod FISHING_ROD()
  * @method static Item FLINT()
  * @method static FlintSteel FLINT_AND_STEEL()
@@ -151,6 +171,9 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static GlassBottle GLASS_BOTTLE()
  * @method static Item GLISTERING_MELON()
  * @method static Item GLOWSTONE_DUST()
+ * @method static GlowBerries GLOW_BERRIES()
+ * @method static Item GLOW_INK_SAC()
+ * @method static GoatHorn GOAT_HORN()
  * @method static GoldenApple GOLDEN_APPLE()
  * @method static Axe GOLDEN_AXE()
  * @method static Armor GOLDEN_BOOTS()
@@ -164,19 +187,13 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Sword GOLDEN_SWORD()
  * @method static Item GOLD_INGOT()
  * @method static Item GOLD_NUGGET()
- * @method static Bed GRAY_BED()
- * @method static Dye GRAY_DYE()
- * @method static Bed GREEN_BED()
- * @method static Dye GREEN_DYE()
  * @method static Item GUNPOWDER()
- * @method static Potion HARMING_POTION()
- * @method static SplashPotion HARMING_SPLASH_POTION()
- * @method static Potion HEALING_POTION()
- * @method static SplashPotion HEALING_SPLASH_POTION()
  * @method static Item HEART_OF_THE_SEA()
+ * @method static Item HONEYCOMB()
+ * @method static HoneyBottle HONEY_BOTTLE()
+ * @method static Item HOST_ARMOR_TRIM_SMITHING_TEMPLATE()
+ * @method static IceBomb ICE_BOMB()
  * @method static Item INK_SAC()
- * @method static Potion INVISIBILITY_POTION()
- * @method static SplashPotion INVISIBILITY_SPLASH_POTION()
  * @method static Axe IRON_AXE()
  * @method static Armor IRON_BOOTS()
  * @method static Armor IRON_CHESTPLATE()
@@ -189,125 +206,102 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Shovel IRON_SHOVEL()
  * @method static Sword IRON_SWORD()
  * @method static Boat JUNGLE_BOAT()
+ * @method static ItemBlockWallOrFloor JUNGLE_SIGN()
  * @method static Item LAPIS_LAZULI()
  * @method static LiquidBucket LAVA_BUCKET()
- * @method static Potion LEAPING_POTION()
- * @method static SplashPotion LEAPING_SPLASH_POTION()
  * @method static Item LEATHER()
  * @method static Armor LEATHER_BOOTS()
  * @method static Armor LEATHER_CAP()
  * @method static Armor LEATHER_PANTS()
  * @method static Armor LEATHER_TUNIC()
- * @method static Bed LIGHT_BLUE_BED()
- * @method static Dye LIGHT_BLUE_DYE()
- * @method static Bed LIGHT_GRAY_BED()
- * @method static Dye LIGHT_GRAY_DYE()
- * @method static Bed LIME_BED()
- * @method static Dye LIME_DYE()
- * @method static Potion LONG_FIRE_RESISTANCE_POTION()
- * @method static SplashPotion LONG_FIRE_RESISTANCE_SPLASH_POTION()
- * @method static Potion LONG_INVISIBILITY_POTION()
- * @method static SplashPotion LONG_INVISIBILITY_SPLASH_POTION()
- * @method static Potion LONG_LEAPING_POTION()
- * @method static SplashPotion LONG_LEAPING_SPLASH_POTION()
- * @method static Potion LONG_MUNDANE_POTION()
- * @method static SplashPotion LONG_MUNDANE_SPLASH_POTION()
- * @method static Potion LONG_NIGHT_VISION_POTION()
- * @method static SplashPotion LONG_NIGHT_VISION_SPLASH_POTION()
- * @method static Potion LONG_POISON_POTION()
- * @method static SplashPotion LONG_POISON_SPLASH_POTION()
- * @method static Potion LONG_REGENERATION_POTION()
- * @method static SplashPotion LONG_REGENERATION_SPLASH_POTION()
- * @method static Potion LONG_SLOWNESS_POTION()
- * @method static SplashPotion LONG_SLOWNESS_SPLASH_POTION()
- * @method static Potion LONG_SLOW_FALLING_POTION()
- * @method static SplashPotion LONG_SLOW_FALLING_SPLASH_POTION()
- * @method static Potion LONG_STRENGTH_POTION()
- * @method static SplashPotion LONG_STRENGTH_SPLASH_POTION()
- * @method static Potion LONG_SWIFTNESS_POTION()
- * @method static SplashPotion LONG_SWIFTNESS_SPLASH_POTION()
- * @method static Potion LONG_TURTLE_MASTER_POTION()
- * @method static SplashPotion LONG_TURTLE_MASTER_SPLASH_POTION()
- * @method static Potion LONG_WATER_BREATHING_POTION()
- * @method static SplashPotion LONG_WATER_BREATHING_SPLASH_POTION()
- * @method static Potion LONG_WEAKNESS_POTION()
- * @method static SplashPotion LONG_WEAKNESS_SPLASH_POTION()
- * @method static Bed MAGENTA_BED()
- * @method static Dye MAGENTA_DYE()
  * @method static Item MAGMA_CREAM()
+ * @method static Boat MANGROVE_BOAT()
+ * @method static ItemBlockWallOrFloor MANGROVE_SIGN()
+ * @method static Medicine MEDICINE()
  * @method static Melon MELON()
  * @method static MelonSeeds MELON_SEEDS()
  * @method static MilkBucket MILK_BUCKET()
  * @method static Minecart MINECART()
- * @method static Potion MUNDANE_POTION()
- * @method static SplashPotion MUNDANE_SPLASH_POTION()
  * @method static MushroomStew MUSHROOM_STEW()
+ * @method static NameTag NAME_TAG()
  * @method static Item NAUTILUS_SHELL()
+ * @method static Axe NETHERITE_AXE()
+ * @method static Armor NETHERITE_BOOTS()
+ * @method static Armor NETHERITE_CHESTPLATE()
+ * @method static Armor NETHERITE_HELMET()
+ * @method static Hoe NETHERITE_HOE()
+ * @method static Item NETHERITE_INGOT()
+ * @method static Armor NETHERITE_LEGGINGS()
+ * @method static Pickaxe NETHERITE_PICKAXE()
+ * @method static Item NETHERITE_SCRAP()
+ * @method static Shovel NETHERITE_SHOVEL()
+ * @method static Sword NETHERITE_SWORD()
+ * @method static Item NETHERITE_UPGRADE_SMITHING_TEMPLATE()
  * @method static Item NETHER_BRICK()
  * @method static Item NETHER_QUARTZ()
  * @method static Item NETHER_STAR()
- * @method static Potion NIGHT_VISION_POTION()
- * @method static SplashPotion NIGHT_VISION_SPLASH_POTION()
  * @method static Boat OAK_BOAT()
- * @method static Bed ORANGE_BED()
- * @method static Dye ORANGE_DYE()
+ * @method static ItemBlockWallOrFloor OAK_SIGN()
  * @method static PaintingItem PAINTING()
  * @method static Item PAPER()
- * @method static Bed PINK_BED()
- * @method static Dye PINK_DYE()
- * @method static Skull PLAYER_HEAD()
+ * @method static Item PHANTOM_MEMBRANE()
+ * @method static PitcherPod PITCHER_POD()
  * @method static PoisonousPotato POISONOUS_POTATO()
- * @method static Potion POISON_POTION()
- * @method static SplashPotion POISON_SPLASH_POTION()
  * @method static Item POPPED_CHORUS_FRUIT()
  * @method static Potato POTATO()
+ * @method static Potion POTION()
  * @method static Item PRISMARINE_CRYSTALS()
  * @method static Item PRISMARINE_SHARD()
  * @method static Pufferfish PUFFERFISH()
  * @method static PumpkinPie PUMPKIN_PIE()
  * @method static PumpkinSeeds PUMPKIN_SEEDS()
- * @method static Bed PURPLE_BED()
- * @method static Dye PURPLE_DYE()
  * @method static Item RABBIT_FOOT()
  * @method static Item RABBIT_HIDE()
  * @method static RabbitStew RABBIT_STEW()
+ * @method static Item RAISER_ARMOR_TRIM_SMITHING_TEMPLATE()
  * @method static RawBeef RAW_BEEF()
  * @method static RawChicken RAW_CHICKEN()
+ * @method static Item RAW_COPPER()
  * @method static RawFish RAW_FISH()
+ * @method static Item RAW_GOLD()
+ * @method static Item RAW_IRON()
  * @method static RawMutton RAW_MUTTON()
  * @method static RawPorkchop RAW_PORKCHOP()
  * @method static RawRabbit RAW_RABBIT()
  * @method static RawSalmon RAW_SALMON()
  * @method static Record RECORD_11()
  * @method static Record RECORD_13()
+ * @method static Record RECORD_5()
  * @method static Record RECORD_BLOCKS()
  * @method static Record RECORD_CAT()
  * @method static Record RECORD_CHIRP()
  * @method static Record RECORD_FAR()
  * @method static Record RECORD_MALL()
  * @method static Record RECORD_MELLOHI()
+ * @method static Record RECORD_OTHERSIDE()
+ * @method static Record RECORD_PIGSTEP()
  * @method static Record RECORD_STAL()
  * @method static Record RECORD_STRAD()
  * @method static Record RECORD_WAIT()
  * @method static Record RECORD_WARD()
  * @method static Redstone REDSTONE_DUST()
- * @method static Bed RED_BED()
- * @method static Dye RED_DYE()
- * @method static Potion REGENERATION_POTION()
- * @method static SplashPotion REGENERATION_SPLASH_POTION()
+ * @method static Item RIB_ARMOR_TRIM_SMITHING_TEMPLATE()
  * @method static RottenFlesh ROTTEN_FLESH()
  * @method static Item SCUTE()
+ * @method static Item SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE()
+ * @method static Item SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE()
  * @method static Shears SHEARS()
  * @method static Item SHULKER_SHELL()
- * @method static Skull SKELETON_SKULL()
+ * @method static Item SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE()
  * @method static Item SLIMEBALL()
- * @method static Potion SLOWNESS_POTION()
- * @method static SplashPotion SLOWNESS_SPLASH_POTION()
- * @method static Potion SLOW_FALLING_POTION()
- * @method static SplashPotion SLOW_FALLING_SPLASH_POTION()
+ * @method static Item SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE()
  * @method static Snowball SNOWBALL()
  * @method static SpiderEye SPIDER_EYE()
+ * @method static Item SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE()
+ * @method static SplashPotion SPLASH_POTION()
  * @method static Boat SPRUCE_BOAT()
+ * @method static ItemBlockWallOrFloor SPRUCE_SIGN()
+ * @method static Spyglass SPYGLASS()
  * @method static SpawnEgg SQUID_SPAWN_EGG()
  * @method static Steak STEAK()
  * @method static Stick STICK()
@@ -316,49 +310,23 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Pickaxe STONE_PICKAXE()
  * @method static Shovel STONE_SHOVEL()
  * @method static Sword STONE_SWORD()
- * @method static Potion STRENGTH_POTION()
- * @method static SplashPotion STRENGTH_SPLASH_POTION()
  * @method static StringItem STRING()
- * @method static Potion STRONG_HARMING_POTION()
- * @method static SplashPotion STRONG_HARMING_SPLASH_POTION()
- * @method static Potion STRONG_HEALING_POTION()
- * @method static SplashPotion STRONG_HEALING_SPLASH_POTION()
- * @method static Potion STRONG_LEAPING_POTION()
- * @method static SplashPotion STRONG_LEAPING_SPLASH_POTION()
- * @method static Potion STRONG_POISON_POTION()
- * @method static SplashPotion STRONG_POISON_SPLASH_POTION()
- * @method static Potion STRONG_REGENERATION_POTION()
- * @method static SplashPotion STRONG_REGENERATION_SPLASH_POTION()
- * @method static Potion STRONG_STRENGTH_POTION()
- * @method static SplashPotion STRONG_STRENGTH_SPLASH_POTION()
- * @method static Potion STRONG_SWIFTNESS_POTION()
- * @method static SplashPotion STRONG_SWIFTNESS_SPLASH_POTION()
- * @method static Potion STRONG_TURTLE_MASTER_POTION()
- * @method static SplashPotion STRONG_TURTLE_MASTER_SPLASH_POTION()
  * @method static Item SUGAR()
+ * @method static SuspiciousStew SUSPICIOUS_STEW()
  * @method static SweetBerries SWEET_BERRIES()
- * @method static Potion SWIFTNESS_POTION()
- * @method static SplashPotion SWIFTNESS_SPLASH_POTION()
- * @method static Potion THICK_POTION()
- * @method static SplashPotion THICK_SPLASH_POTION()
+ * @method static Item TIDE_ARMOR_TRIM_SMITHING_TEMPLATE()
+ * @method static TorchflowerSeeds TORCHFLOWER_SEEDS()
  * @method static Totem TOTEM()
- * @method static Potion TURTLE_MASTER_POTION()
- * @method static SplashPotion TURTLE_MASTER_SPLASH_POTION()
+ * @method static TurtleHelmet TURTLE_HELMET()
+ * @method static Item VEX_ARMOR_TRIM_SMITHING_TEMPLATE()
  * @method static SpawnEgg VILLAGER_SPAWN_EGG()
- * @method static Potion WATER_BREATHING_POTION()
- * @method static SplashPotion WATER_BREATHING_SPLASH_POTION()
+ * @method static Item WARD_ARMOR_TRIM_SMITHING_TEMPLATE()
+ * @method static ItemBlockWallOrFloor WARPED_SIGN()
  * @method static LiquidBucket WATER_BUCKET()
- * @method static Potion WATER_POTION()
- * @method static SplashPotion WATER_SPLASH_POTION()
- * @method static Potion WEAKNESS_POTION()
- * @method static SplashPotion WEAKNESS_SPLASH_POTION()
+ * @method static Item WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE()
  * @method static Item WHEAT()
  * @method static WheatSeeds WHEAT_SEEDS()
- * @method static Bed WHITE_BED()
- * @method static Dye WHITE_DYE()
- * @method static Potion WITHER_POTION()
- * @method static Skull WITHER_SKELETON_SKULL()
- * @method static SplashPotion WITHER_SPLASH_POTION()
+ * @method static Item WILD_ARMOR_TRIM_SMITHING_TEMPLATE()
  * @method static Axe WOODEN_AXE()
  * @method static Hoe WOODEN_HOE()
  * @method static Pickaxe WOODEN_PICKAXE()
@@ -366,9 +334,6 @@ use pocketmine\utils\CloningRegistryTrait;
  * @method static Sword WOODEN_SWORD()
  * @method static WritableBook WRITABLE_BOOK()
  * @method static WrittenBook WRITTEN_BOOK()
- * @method static Bed YELLOW_BED()
- * @method static Dye YELLOW_DYE()
- * @method static Skull ZOMBIE_HEAD()
  * @method static SpawnEgg ZOMBIE_SPAWN_EGG()
  */
 final class VanillaItems{
@@ -378,8 +343,29 @@ final class VanillaItems{
 		//NOOP
 	}
 
-	protected static function register(string $name, Item $item) : void{
+	/**
+	 * @phpstan-template TItem of Item
+	 * @phpstan-param \Closure(IID) : TItem $createItem
+	 * @phpstan-return TItem
+	 */
+	protected static function register(string $name, \Closure $createItem) : Item{
+		//this sketchy hack allows us to avoid manually writing the constants inline
+		//since type IDs are generated from this class anyway, I'm OK with this hack
+		//nonetheless, we should try to get rid of it in a future major version (e.g by using string type IDs)
+		$reflect = new \ReflectionClass(ItemTypeIds::class);
+		$typeId = $reflect->getConstant(mb_strtoupper($name));
+		if(!is_int($typeId)){
+			//this allows registering new stuff without adding new type ID constants
+			//this reduces the number of mandatory steps to test new features in local development
+			\GlobalLogger::get()->error(self::class . ": No constant type ID found for $name, generating a new one");
+			$typeId = ItemTypeIds::newId();
+		}
+
+		$item = $createItem(new IID($typeId));
+
 		self::_registryRegister($name, $item);
+
+		return $item;
 	}
 
 	/**
@@ -394,344 +380,332 @@ final class VanillaItems{
 	}
 
 	protected static function setup() : void{
-		$factory = ItemFactory::getInstance();
-		self::register("acacia_boat", $factory->get(Ids::BOAT, 4));
-		self::register("air", $factory->get(Ids::AIR, 0, 0));
-		self::register("apple", $factory->get(Ids::APPLE));
-		self::register("arrow", $factory->get(Ids::ARROW));
-		self::register("awkward_potion", $factory->get(Ids::POTION, 4));
-		self::register("awkward_splash_potion", $factory->get(Ids::SPLASH_POTION, 4));
-		self::register("baked_potato", $factory->get(Ids::BAKED_POTATO));
-		self::register("beetroot", $factory->get(Ids::BEETROOT));
-		self::register("beetroot_seeds", $factory->get(Ids::BEETROOT_SEEDS));
-		self::register("beetroot_soup", $factory->get(Ids::BEETROOT_SOUP));
-		self::register("birch_boat", $factory->get(Ids::BOAT, 2));
-		self::register("black_bed", $factory->get(Ids::BED, 15));
-		self::register("black_dye", $factory->get(Ids::DYE, 16));
-		self::register("blaze_powder", $factory->get(Ids::BLAZE_POWDER));
-		self::register("blaze_rod", $factory->get(Ids::BLAZE_ROD));
-		self::register("bleach", $factory->get(Ids::BLEACH));
-		self::register("blue_bed", $factory->get(Ids::BED, 11));
-		self::register("blue_dye", $factory->get(Ids::DYE, 18));
-		self::register("bone", $factory->get(Ids::BONE));
-		self::register("bone_meal", $factory->get(Ids::DYE, 15));
-		self::register("book", $factory->get(Ids::BOOK));
-		self::register("bow", $factory->get(Ids::BOW));
-		self::register("bowl", $factory->get(Ids::BOWL));
-		self::register("bread", $factory->get(Ids::BREAD));
-		self::register("brick", $factory->get(Ids::BRICK));
-		self::register("brown_bed", $factory->get(Ids::BED, 12));
-		self::register("brown_dye", $factory->get(Ids::DYE, 17));
-		self::register("bucket", $factory->get(Ids::BUCKET));
-		self::register("carrot", $factory->get(Ids::CARROT));
-		self::register("chainmail_boots", $factory->get(Ids::CHAINMAIL_BOOTS));
-		self::register("chainmail_chestplate", $factory->get(Ids::CHAINMAIL_CHESTPLATE));
-		self::register("chainmail_helmet", $factory->get(Ids::CHAINMAIL_HELMET));
-		self::register("chainmail_leggings", $factory->get(Ids::CHAINMAIL_LEGGINGS));
-		self::register("charcoal", $factory->get(Ids::COAL, 1));
-		self::register("chemical_aluminium_oxide", $factory->get(Ids::COMPOUND, 13));
-		self::register("chemical_ammonia", $factory->get(Ids::COMPOUND, 36));
-		self::register("chemical_barium_sulphate", $factory->get(Ids::COMPOUND, 20));
-		self::register("chemical_benzene", $factory->get(Ids::COMPOUND, 33));
-		self::register("chemical_boron_trioxide", $factory->get(Ids::COMPOUND, 14));
-		self::register("chemical_calcium_bromide", $factory->get(Ids::COMPOUND, 7));
-		self::register("chemical_calcium_chloride", $factory->get(Ids::COMPOUND, 25));
-		self::register("chemical_cerium_chloride", $factory->get(Ids::COMPOUND, 23));
-		self::register("chemical_charcoal", $factory->get(Ids::COMPOUND, 11));
-		self::register("chemical_crude_oil", $factory->get(Ids::COMPOUND, 29));
-		self::register("chemical_glue", $factory->get(Ids::COMPOUND, 27));
-		self::register("chemical_hydrogen_peroxide", $factory->get(Ids::COMPOUND, 35));
-		self::register("chemical_hypochlorite", $factory->get(Ids::COMPOUND, 28));
-		self::register("chemical_ink", $factory->get(Ids::COMPOUND, 34));
-		self::register("chemical_iron_sulphide", $factory->get(Ids::COMPOUND, 4));
-		self::register("chemical_latex", $factory->get(Ids::COMPOUND, 30));
-		self::register("chemical_lithium_hydride", $factory->get(Ids::COMPOUND, 5));
-		self::register("chemical_luminol", $factory->get(Ids::COMPOUND, 10));
-		self::register("chemical_magnesium_nitrate", $factory->get(Ids::COMPOUND, 3));
-		self::register("chemical_magnesium_oxide", $factory->get(Ids::COMPOUND, 8));
-		self::register("chemical_magnesium_salts", $factory->get(Ids::COMPOUND, 18));
-		self::register("chemical_mercuric_chloride", $factory->get(Ids::COMPOUND, 22));
-		self::register("chemical_polyethylene", $factory->get(Ids::COMPOUND, 16));
-		self::register("chemical_potassium_chloride", $factory->get(Ids::COMPOUND, 21));
-		self::register("chemical_potassium_iodide", $factory->get(Ids::COMPOUND, 31));
-		self::register("chemical_rubbish", $factory->get(Ids::COMPOUND, 17));
-		self::register("chemical_salt", $factory->get(Ids::COMPOUND));
-		self::register("chemical_soap", $factory->get(Ids::COMPOUND, 15));
-		self::register("chemical_sodium_acetate", $factory->get(Ids::COMPOUND, 9));
-		self::register("chemical_sodium_fluoride", $factory->get(Ids::COMPOUND, 32));
-		self::register("chemical_sodium_hydride", $factory->get(Ids::COMPOUND, 6));
-		self::register("chemical_sodium_hydroxide", $factory->get(Ids::COMPOUND, 2));
-		self::register("chemical_sodium_hypochlorite", $factory->get(Ids::COMPOUND, 37));
-		self::register("chemical_sodium_oxide", $factory->get(Ids::COMPOUND, 1));
-		self::register("chemical_sugar", $factory->get(Ids::COMPOUND, 12));
-		self::register("chemical_sulphate", $factory->get(Ids::COMPOUND, 19));
-		self::register("chemical_tungsten_chloride", $factory->get(Ids::COMPOUND, 24));
-		self::register("chemical_water", $factory->get(Ids::COMPOUND, 26));
-		self::register("chorus_fruit", $factory->get(Ids::CHORUS_FRUIT));
-		self::register("clay", $factory->get(Ids::CLAY));
-		self::register("clock", $factory->get(Ids::CLOCK));
-		self::register("clownfish", $factory->get(Ids::CLOWNFISH));
-		self::register("coal", $factory->get(Ids::COAL));
-		self::register("cocoa_beans", $factory->get(Ids::DYE, 3));
-		self::register("compass", $factory->get(Ids::COMPASS));
-		self::register("cooked_chicken", $factory->get(Ids::COOKED_CHICKEN));
-		self::register("cooked_fish", $factory->get(Ids::COOKED_FISH));
-		self::register("cooked_mutton", $factory->get(Ids::COOKED_MUTTON));
-		self::register("cooked_porkchop", $factory->get(Ids::COOKED_PORKCHOP));
-		self::register("cooked_rabbit", $factory->get(Ids::COOKED_RABBIT));
-		self::register("cooked_salmon", $factory->get(Ids::COOKED_SALMON));
-		self::register("cookie", $factory->get(Ids::COOKIE));
-		self::register("creeper_head", $factory->get(Ids::MOB_HEAD, 4));
-		self::register("cyan_bed", $factory->get(Ids::BED, 9));
-		self::register("cyan_dye", $factory->get(Ids::DYE, 6));
-		self::register("dark_oak_boat", $factory->get(Ids::BOAT, 5));
-		self::register("diamond", $factory->get(Ids::DIAMOND));
-		self::register("diamond_axe", $factory->get(Ids::DIAMOND_AXE));
-		self::register("diamond_boots", $factory->get(Ids::DIAMOND_BOOTS));
-		self::register("diamond_chestplate", $factory->get(Ids::DIAMOND_CHESTPLATE));
-		self::register("diamond_helmet", $factory->get(Ids::DIAMOND_HELMET));
-		self::register("diamond_hoe", $factory->get(Ids::DIAMOND_HOE));
-		self::register("diamond_leggings", $factory->get(Ids::DIAMOND_LEGGINGS));
-		self::register("diamond_pickaxe", $factory->get(Ids::DIAMOND_PICKAXE));
-		self::register("diamond_shovel", $factory->get(Ids::DIAMOND_SHOVEL));
-		self::register("diamond_sword", $factory->get(Ids::DIAMOND_SWORD));
-		self::register("dragon_breath", $factory->get(Ids::DRAGON_BREATH));
-		self::register("dragon_head", $factory->get(Ids::MOB_HEAD, 5));
-		self::register("dried_kelp", $factory->get(Ids::DRIED_KELP));
-		self::register("egg", $factory->get(Ids::EGG));
-		self::register("emerald", $factory->get(Ids::EMERALD));
-		self::register("enchanted_golden_apple", $factory->get(Ids::APPLEENCHANTED));
-		self::register("ender_pearl", $factory->get(Ids::ENDER_PEARL));
-		self::register("experience_bottle", $factory->get(Ids::BOTTLE_O_ENCHANTING));
-		self::register("feather", $factory->get(Ids::FEATHER));
-		self::register("fermented_spider_eye", $factory->get(Ids::FERMENTED_SPIDER_EYE));
-		self::register("fire_resistance_potion", $factory->get(Ids::POTION, 12));
-		self::register("fire_resistance_splash_potion", $factory->get(Ids::SPLASH_POTION, 12));
-		self::register("fishing_rod", $factory->get(Ids::FISHING_ROD));
-		self::register("flint", $factory->get(Ids::FLINT));
-		self::register("flint_and_steel", $factory->get(Ids::FLINT_AND_STEEL));
-		self::register("ghast_tear", $factory->get(Ids::GHAST_TEAR));
-		self::register("glass_bottle", $factory->get(Ids::GLASS_BOTTLE));
-		self::register("glistering_melon", $factory->get(Ids::GLISTERING_MELON));
-		self::register("glowstone_dust", $factory->get(Ids::GLOWSTONE_DUST));
-		self::register("gold_ingot", $factory->get(Ids::GOLD_INGOT));
-		self::register("gold_nugget", $factory->get(Ids::GOLDEN_NUGGET));
-		self::register("golden_apple", $factory->get(Ids::GOLDEN_APPLE));
-		self::register("golden_axe", $factory->get(Ids::GOLDEN_AXE));
-		self::register("golden_boots", $factory->get(Ids::GOLDEN_BOOTS));
-		self::register("golden_carrot", $factory->get(Ids::GOLDEN_CARROT));
-		self::register("golden_chestplate", $factory->get(Ids::GOLDEN_CHESTPLATE));
-		self::register("golden_helmet", $factory->get(Ids::GOLDEN_HELMET));
-		self::register("golden_hoe", $factory->get(Ids::GOLDEN_HOE));
-		self::register("golden_leggings", $factory->get(Ids::GOLDEN_LEGGINGS));
-		self::register("golden_pickaxe", $factory->get(Ids::GOLDEN_PICKAXE));
-		self::register("golden_shovel", $factory->get(Ids::GOLDEN_SHOVEL));
-		self::register("golden_sword", $factory->get(Ids::GOLDEN_SWORD));
-		self::register("gray_bed", $factory->get(Ids::BED, 7));
-		self::register("gray_dye", $factory->get(Ids::DYE, 8));
-		self::register("green_bed", $factory->get(Ids::BED, 13));
-		self::register("green_dye", $factory->get(Ids::DYE, 2));
-		self::register("gunpowder", $factory->get(Ids::GUNPOWDER));
-		self::register("harming_potion", $factory->get(Ids::POTION, 23));
-		self::register("harming_splash_potion", $factory->get(Ids::SPLASH_POTION, 23));
-		self::register("healing_potion", $factory->get(Ids::POTION, 21));
-		self::register("healing_splash_potion", $factory->get(Ids::SPLASH_POTION, 21));
-		self::register("heart_of_the_sea", $factory->get(Ids::HEART_OF_THE_SEA));
-		self::register("ink_sac", $factory->get(Ids::DYE));
-		self::register("invisibility_potion", $factory->get(Ids::POTION, 7));
-		self::register("invisibility_splash_potion", $factory->get(Ids::SPLASH_POTION, 7));
-		self::register("iron_axe", $factory->get(Ids::IRON_AXE));
-		self::register("iron_boots", $factory->get(Ids::IRON_BOOTS));
-		self::register("iron_chestplate", $factory->get(Ids::IRON_CHESTPLATE));
-		self::register("iron_helmet", $factory->get(Ids::IRON_HELMET));
-		self::register("iron_hoe", $factory->get(Ids::IRON_HOE));
-		self::register("iron_ingot", $factory->get(Ids::IRON_INGOT));
-		self::register("iron_leggings", $factory->get(Ids::IRON_LEGGINGS));
-		self::register("iron_nugget", $factory->get(Ids::IRON_NUGGET));
-		self::register("iron_pickaxe", $factory->get(Ids::IRON_PICKAXE));
-		self::register("iron_shovel", $factory->get(Ids::IRON_SHOVEL));
-		self::register("iron_sword", $factory->get(Ids::IRON_SWORD));
-		self::register("jungle_boat", $factory->get(Ids::BOAT, 3));
-		self::register("lapis_lazuli", $factory->get(Ids::DYE, 4));
-		self::register("lava_bucket", $factory->get(Ids::BUCKET, 10));
-		self::register("leaping_potion", $factory->get(Ids::POTION, 9));
-		self::register("leaping_splash_potion", $factory->get(Ids::SPLASH_POTION, 9));
-		self::register("leather", $factory->get(Ids::LEATHER));
-		self::register("leather_boots", $factory->get(Ids::LEATHER_BOOTS));
-		self::register("leather_cap", $factory->get(Ids::LEATHER_CAP));
-		self::register("leather_pants", $factory->get(Ids::LEATHER_LEGGINGS));
-		self::register("leather_tunic", $factory->get(Ids::LEATHER_CHESTPLATE));
-		self::register("light_blue_bed", $factory->get(Ids::BED, 3));
-		self::register("light_blue_dye", $factory->get(Ids::DYE, 12));
-		self::register("light_gray_bed", $factory->get(Ids::BED, 8));
-		self::register("light_gray_dye", $factory->get(Ids::DYE, 7));
-		self::register("lime_bed", $factory->get(Ids::BED, 5));
-		self::register("lime_dye", $factory->get(Ids::DYE, 10));
-		self::register("long_fire_resistance_potion", $factory->get(Ids::POTION, 13));
-		self::register("long_fire_resistance_splash_potion", $factory->get(Ids::SPLASH_POTION, 13));
-		self::register("long_invisibility_potion", $factory->get(Ids::POTION, 8));
-		self::register("long_invisibility_splash_potion", $factory->get(Ids::SPLASH_POTION, 8));
-		self::register("long_leaping_potion", $factory->get(Ids::POTION, 10));
-		self::register("long_leaping_splash_potion", $factory->get(Ids::SPLASH_POTION, 10));
-		self::register("long_mundane_potion", $factory->get(Ids::POTION, 2));
-		self::register("long_mundane_splash_potion", $factory->get(Ids::SPLASH_POTION, 2));
-		self::register("long_night_vision_potion", $factory->get(Ids::POTION, 6));
-		self::register("long_night_vision_splash_potion", $factory->get(Ids::SPLASH_POTION, 6));
-		self::register("long_poison_potion", $factory->get(Ids::POTION, 26));
-		self::register("long_poison_splash_potion", $factory->get(Ids::SPLASH_POTION, 26));
-		self::register("long_regeneration_potion", $factory->get(Ids::POTION, 29));
-		self::register("long_regeneration_splash_potion", $factory->get(Ids::SPLASH_POTION, 29));
-		self::register("long_slow_falling_potion", $factory->get(Ids::POTION, 41));
-		self::register("long_slow_falling_splash_potion", $factory->get(Ids::SPLASH_POTION, 41));
-		self::register("long_slowness_potion", $factory->get(Ids::POTION, 18));
-		self::register("long_slowness_splash_potion", $factory->get(Ids::SPLASH_POTION, 18));
-		self::register("long_strength_potion", $factory->get(Ids::POTION, 32));
-		self::register("long_strength_splash_potion", $factory->get(Ids::SPLASH_POTION, 32));
-		self::register("long_swiftness_potion", $factory->get(Ids::POTION, 15));
-		self::register("long_swiftness_splash_potion", $factory->get(Ids::SPLASH_POTION, 15));
-		self::register("long_turtle_master_potion", $factory->get(Ids::POTION, 38));
-		self::register("long_turtle_master_splash_potion", $factory->get(Ids::SPLASH_POTION, 38));
-		self::register("long_water_breathing_potion", $factory->get(Ids::POTION, 20));
-		self::register("long_water_breathing_splash_potion", $factory->get(Ids::SPLASH_POTION, 20));
-		self::register("long_weakness_potion", $factory->get(Ids::POTION, 35));
-		self::register("long_weakness_splash_potion", $factory->get(Ids::SPLASH_POTION, 35));
-		self::register("magenta_bed", $factory->get(Ids::BED, 2));
-		self::register("magenta_dye", $factory->get(Ids::DYE, 13));
-		self::register("magma_cream", $factory->get(Ids::MAGMA_CREAM));
-		self::register("melon", $factory->get(Ids::MELON));
-		self::register("melon_seeds", $factory->get(Ids::MELON_SEEDS));
-		self::register("milk_bucket", $factory->get(Ids::BUCKET, 1));
-		self::register("minecart", $factory->get(Ids::MINECART));
-		self::register("mundane_potion", $factory->get(Ids::POTION, 1));
-		self::register("mundane_splash_potion", $factory->get(Ids::SPLASH_POTION, 1));
-		self::register("mushroom_stew", $factory->get(Ids::MUSHROOM_STEW));
-		self::register("nautilus_shell", $factory->get(Ids::NAUTILUS_SHELL));
-		self::register("nether_brick", $factory->get(Ids::NETHERBRICK));
-		self::register("nether_quartz", $factory->get(Ids::NETHER_QUARTZ));
-		self::register("nether_star", $factory->get(Ids::NETHERSTAR));
-		self::register("night_vision_potion", $factory->get(Ids::POTION, 5));
-		self::register("night_vision_splash_potion", $factory->get(Ids::SPLASH_POTION, 5));
-		self::register("oak_boat", $factory->get(Ids::BOAT));
-		self::register("orange_bed", $factory->get(Ids::BED, 1));
-		self::register("orange_dye", $factory->get(Ids::DYE, 14));
-		self::register("painting", $factory->get(Ids::PAINTING));
-		self::register("paper", $factory->get(Ids::PAPER));
-		self::register("pink_bed", $factory->get(Ids::BED, 6));
-		self::register("pink_dye", $factory->get(Ids::DYE, 9));
-		self::register("player_head", $factory->get(Ids::MOB_HEAD, 3));
-		self::register("poison_potion", $factory->get(Ids::POTION, 25));
-		self::register("poison_splash_potion", $factory->get(Ids::SPLASH_POTION, 25));
-		self::register("poisonous_potato", $factory->get(Ids::POISONOUS_POTATO));
-		self::register("popped_chorus_fruit", $factory->get(Ids::CHORUS_FRUIT_POPPED));
-		self::register("potato", $factory->get(Ids::POTATO));
-		self::register("prismarine_crystals", $factory->get(Ids::PRISMARINE_CRYSTALS));
-		self::register("prismarine_shard", $factory->get(Ids::PRISMARINE_SHARD));
-		self::register("pufferfish", $factory->get(Ids::PUFFERFISH));
-		self::register("pumpkin_pie", $factory->get(Ids::PUMPKIN_PIE));
-		self::register("pumpkin_seeds", $factory->get(Ids::PUMPKIN_SEEDS));
-		self::register("purple_bed", $factory->get(Ids::BED, 10));
-		self::register("purple_dye", $factory->get(Ids::DYE, 5));
-		self::register("rabbit_foot", $factory->get(Ids::RABBIT_FOOT));
-		self::register("rabbit_hide", $factory->get(Ids::RABBIT_HIDE));
-		self::register("rabbit_stew", $factory->get(Ids::RABBIT_STEW));
-		self::register("raw_beef", $factory->get(Ids::BEEF));
-		self::register("raw_chicken", $factory->get(Ids::CHICKEN));
-		self::register("raw_fish", $factory->get(Ids::FISH));
-		self::register("raw_mutton", $factory->get(Ids::MUTTON));
-		self::register("raw_porkchop", $factory->get(Ids::PORKCHOP));
-		self::register("raw_rabbit", $factory->get(Ids::RABBIT));
-		self::register("raw_salmon", $factory->get(Ids::RAW_SALMON));
-		self::register("record_11", $factory->get(Ids::RECORD_11));
-		self::register("record_13", $factory->get(Ids::RECORD_13));
-		self::register("record_blocks", $factory->get(Ids::RECORD_BLOCKS));
-		self::register("record_cat", $factory->get(Ids::RECORD_CAT));
-		self::register("record_chirp", $factory->get(Ids::RECORD_CHIRP));
-		self::register("record_far", $factory->get(Ids::RECORD_FAR));
-		self::register("record_mall", $factory->get(Ids::RECORD_MALL));
-		self::register("record_mellohi", $factory->get(Ids::RECORD_MELLOHI));
-		self::register("record_stal", $factory->get(Ids::RECORD_STAL));
-		self::register("record_strad", $factory->get(Ids::RECORD_STRAD));
-		self::register("record_wait", $factory->get(Ids::RECORD_WAIT));
-		self::register("record_ward", $factory->get(Ids::RECORD_WARD));
-		self::register("red_bed", $factory->get(Ids::BED, 14));
-		self::register("red_dye", $factory->get(Ids::DYE, 1));
-		self::register("redstone_dust", $factory->get(Ids::REDSTONE));
-		self::register("regeneration_potion", $factory->get(Ids::POTION, 28));
-		self::register("regeneration_splash_potion", $factory->get(Ids::SPLASH_POTION, 28));
-		self::register("rotten_flesh", $factory->get(Ids::ROTTEN_FLESH));
-		self::register("scute", $factory->get(Ids::TURTLE_SHELL_PIECE));
-		self::register("shears", $factory->get(Ids::SHEARS));
-		self::register("shulker_shell", $factory->get(Ids::SHULKER_SHELL));
-		self::register("skeleton_skull", $factory->get(Ids::MOB_HEAD));
-		self::register("slimeball", $factory->get(Ids::SLIMEBALL));
-		self::register("slow_falling_potion", $factory->get(Ids::POTION, 40));
-		self::register("slow_falling_splash_potion", $factory->get(Ids::SPLASH_POTION, 40));
-		self::register("slowness_potion", $factory->get(Ids::POTION, 17));
-		self::register("slowness_splash_potion", $factory->get(Ids::SPLASH_POTION, 17));
-		self::register("snowball", $factory->get(Ids::SNOWBALL));
-		self::register("spider_eye", $factory->get(Ids::SPIDER_EYE));
-		self::register("spruce_boat", $factory->get(Ids::BOAT, 1));
-		self::register("squid_spawn_egg", $factory->get(Ids::SPAWN_EGG, 17));
-		self::register("steak", $factory->get(Ids::COOKED_BEEF));
-		self::register("stick", $factory->get(Ids::STICK));
-		self::register("stone_axe", $factory->get(Ids::STONE_AXE));
-		self::register("stone_hoe", $factory->get(Ids::STONE_HOE));
-		self::register("stone_pickaxe", $factory->get(Ids::STONE_PICKAXE));
-		self::register("stone_shovel", $factory->get(Ids::STONE_SHOVEL));
-		self::register("stone_sword", $factory->get(Ids::STONE_SWORD));
-		self::register("strength_potion", $factory->get(Ids::POTION, 31));
-		self::register("strength_splash_potion", $factory->get(Ids::SPLASH_POTION, 31));
-		self::register("string", $factory->get(Ids::STRING));
-		self::register("strong_harming_potion", $factory->get(Ids::POTION, 24));
-		self::register("strong_harming_splash_potion", $factory->get(Ids::SPLASH_POTION, 24));
-		self::register("strong_healing_potion", $factory->get(Ids::POTION, 22));
-		self::register("strong_healing_splash_potion", $factory->get(Ids::SPLASH_POTION, 22));
-		self::register("strong_leaping_potion", $factory->get(Ids::POTION, 11));
-		self::register("strong_leaping_splash_potion", $factory->get(Ids::SPLASH_POTION, 11));
-		self::register("strong_poison_potion", $factory->get(Ids::POTION, 27));
-		self::register("strong_poison_splash_potion", $factory->get(Ids::SPLASH_POTION, 27));
-		self::register("strong_regeneration_potion", $factory->get(Ids::POTION, 30));
-		self::register("strong_regeneration_splash_potion", $factory->get(Ids::SPLASH_POTION, 30));
-		self::register("strong_strength_potion", $factory->get(Ids::POTION, 33));
-		self::register("strong_strength_splash_potion", $factory->get(Ids::SPLASH_POTION, 33));
-		self::register("strong_swiftness_potion", $factory->get(Ids::POTION, 16));
-		self::register("strong_swiftness_splash_potion", $factory->get(Ids::SPLASH_POTION, 16));
-		self::register("strong_turtle_master_potion", $factory->get(Ids::POTION, 39));
-		self::register("strong_turtle_master_splash_potion", $factory->get(Ids::SPLASH_POTION, 39));
-		self::register("sugar", $factory->get(Ids::SUGAR));
-		self::register("sweet_berries", $factory->get(Ids::SWEET_BERRIES));
-		self::register("swiftness_potion", $factory->get(Ids::POTION, 14));
-		self::register("swiftness_splash_potion", $factory->get(Ids::SPLASH_POTION, 14));
-		self::register("thick_potion", $factory->get(Ids::POTION, 3));
-		self::register("thick_splash_potion", $factory->get(Ids::SPLASH_POTION, 3));
-		self::register("totem", $factory->get(Ids::TOTEM));
-		self::register("turtle_master_potion", $factory->get(Ids::POTION, 37));
-		self::register("turtle_master_splash_potion", $factory->get(Ids::SPLASH_POTION, 37));
-		self::register("villager_spawn_egg", $factory->get(Ids::SPAWN_EGG, 15));
-		self::register("water_breathing_potion", $factory->get(Ids::POTION, 19));
-		self::register("water_breathing_splash_potion", $factory->get(Ids::SPLASH_POTION, 19));
-		self::register("water_bucket", $factory->get(Ids::BUCKET, 8));
-		self::register("water_potion", $factory->get(Ids::POTION));
-		self::register("water_splash_potion", $factory->get(Ids::SPLASH_POTION));
-		self::register("weakness_potion", $factory->get(Ids::POTION, 34));
-		self::register("weakness_splash_potion", $factory->get(Ids::SPLASH_POTION, 34));
-		self::register("wheat", $factory->get(Ids::WHEAT));
-		self::register("wheat_seeds", $factory->get(Ids::SEEDS));
-		self::register("white_bed", $factory->get(Ids::BED));
-		self::register("white_dye", $factory->get(Ids::DYE, 19));
-		self::register("wither_potion", $factory->get(Ids::POTION, 36));
-		self::register("wither_skeleton_skull", $factory->get(Ids::MOB_HEAD, 1));
-		self::register("wither_splash_potion", $factory->get(Ids::SPLASH_POTION, 36));
-		self::register("wooden_axe", $factory->get(Ids::WOODEN_AXE));
-		self::register("wooden_hoe", $factory->get(Ids::WOODEN_HOE));
-		self::register("wooden_pickaxe", $factory->get(Ids::WOODEN_PICKAXE));
-		self::register("wooden_shovel", $factory->get(Ids::WOODEN_SHOVEL));
-		self::register("wooden_sword", $factory->get(Ids::WOODEN_SWORD));
-		self::register("writable_book", $factory->get(Ids::WRITABLE_BOOK));
-		self::register("written_book", $factory->get(Ids::WRITTEN_BOOK));
-		self::register("yellow_bed", $factory->get(Ids::BED, 4));
-		self::register("yellow_dye", $factory->get(Ids::DYE, 11));
-		self::register("zombie_head", $factory->get(Ids::MOB_HEAD, 2));
-		self::register("zombie_spawn_egg", $factory->get(Ids::SPAWN_EGG, 32));
+		self::registerArmorItems();
+		self::registerSpawnEggs();
+		self::registerTierToolItems();
+		self::registerSmithingTemplates();
+
+		//this doesn't use the regular register() because it doesn't have an item typeID
+		//in the future we'll probably want to dissociate this from the air block and make a proper null item
+		self::_registryRegister("air", Blocks::AIR()->asItem()->setCount(0));
+
+		self::register("acacia_sign", fn(IID $id) => new ItemBlockWallOrFloor($id, Blocks::ACACIA_SIGN(), Blocks::ACACIA_WALL_SIGN()));
+		self::register("amethyst_shard", fn(IID $id) => new Item($id, "Amethyst Shard"));
+		self::register("apple", fn(IID $id) => new Apple($id, "Apple"));
+		self::register("arrow", fn(IID $id) => new Arrow($id, "Arrow"));
+		self::register("baked_potato", fn(IID $id) => new BakedPotato($id, "Baked Potato"));
+		self::register("bamboo", fn(IID $id) => new Bamboo($id, "Bamboo"));
+		self::register("banner", fn(IID $id) => new Banner($id, Blocks::BANNER(), Blocks::WALL_BANNER()));
+		self::register("beetroot", fn(IID $id) => new Beetroot($id, "Beetroot"));
+		self::register("beetroot_seeds", fn(IID $id) => new BeetrootSeeds($id, "Beetroot Seeds"));
+		self::register("beetroot_soup", fn(IID $id) => new BeetrootSoup($id, "Beetroot Soup"));
+		self::register("birch_sign", fn(IID $id) => new ItemBlockWallOrFloor($id, Blocks::BIRCH_SIGN(), Blocks::BIRCH_WALL_SIGN()));
+		self::register("blaze_powder", fn(IID $id) => new Item($id, "Blaze Powder"));
+		self::register("blaze_rod", fn(IID $id) => new BlazeRod($id, "Blaze Rod"));
+		self::register("bleach", fn(IID $id) => new Item($id, "Bleach"));
+		self::register("bone", fn(IID $id) => new Item($id, "Bone"));
+		self::register("bone_meal", fn(IID $id) => new Fertilizer($id, "Bone Meal"));
+		self::register("book", fn(IID $id) => new Book($id, "Book", [EnchantmentTags::ALL]));
+		self::register("bow", fn(IID $id) => new Bow($id, "Bow", [EnchantmentTags::BOW]));
+		self::register("bowl", fn(IID $id) => new Bowl($id, "Bowl"));
+		self::register("bread", fn(IID $id) => new Bread($id, "Bread"));
+		self::register("brick", fn(IID $id) => new Item($id, "Brick"));
+		self::register("bucket", fn(IID $id) => new Bucket($id, "Bucket"));
+		self::register("carrot", fn(IID $id) => new Carrot($id, "Carrot"));
+		self::register("charcoal", fn(IID $id) => new Coal($id, "Charcoal"));
+		self::register("cherry_sign", fn(IID $id) => new ItemBlockWallOrFloor($id, Blocks::CHERRY_SIGN(), Blocks::CHERRY_WALL_SIGN()));
+		self::register("chemical_aluminium_oxide", fn(IID $id) => new Item($id, "Aluminium Oxide"));
+		self::register("chemical_ammonia", fn(IID $id) => new Item($id, "Ammonia"));
+		self::register("chemical_barium_sulphate", fn(IID $id) => new Item($id, "Barium Sulphate"));
+		self::register("chemical_benzene", fn(IID $id) => new Item($id, "Benzene"));
+		self::register("chemical_boron_trioxide", fn(IID $id) => new Item($id, "Boron Trioxide"));
+		self::register("chemical_calcium_bromide", fn(IID $id) => new Item($id, "Calcium Bromide"));
+		self::register("chemical_calcium_chloride", fn(IID $id) => new Item($id, "Calcium Chloride"));
+		self::register("chemical_cerium_chloride", fn(IID $id) => new Item($id, "Cerium Chloride"));
+		self::register("chemical_charcoal", fn(IID $id) => new Item($id, "Charcoal"));
+		self::register("chemical_crude_oil", fn(IID $id) => new Item($id, "Crude Oil"));
+		self::register("chemical_glue", fn(IID $id) => new Item($id, "Glue"));
+		self::register("chemical_hydrogen_peroxide", fn(IID $id) => new Item($id, "Hydrogen Peroxide"));
+		self::register("chemical_hypochlorite", fn(IID $id) => new Item($id, "Hypochlorite"));
+		self::register("chemical_ink", fn(IID $id) => new Item($id, "Ink"));
+		self::register("chemical_iron_sulphide", fn(IID $id) => new Item($id, "Iron Sulphide"));
+		self::register("chemical_latex", fn(IID $id) => new Item($id, "Latex"));
+		self::register("chemical_lithium_hydride", fn(IID $id) => new Item($id, "Lithium Hydride"));
+		self::register("chemical_luminol", fn(IID $id) => new Item($id, "Luminol"));
+		self::register("chemical_magnesium_nitrate", fn(IID $id) => new Item($id, "Magnesium Nitrate"));
+		self::register("chemical_magnesium_oxide", fn(IID $id) => new Item($id, "Magnesium Oxide"));
+		self::register("chemical_magnesium_salts", fn(IID $id) => new Item($id, "Magnesium Salts"));
+		self::register("chemical_mercuric_chloride", fn(IID $id) => new Item($id, "Mercuric Chloride"));
+		self::register("chemical_polyethylene", fn(IID $id) => new Item($id, "Polyethylene"));
+		self::register("chemical_potassium_chloride", fn(IID $id) => new Item($id, "Potassium Chloride"));
+		self::register("chemical_potassium_iodide", fn(IID $id) => new Item($id, "Potassium Iodide"));
+		self::register("chemical_rubbish", fn(IID $id) => new Item($id, "Rubbish"));
+		self::register("chemical_salt", fn(IID $id) => new Item($id, "Salt"));
+		self::register("chemical_soap", fn(IID $id) => new Item($id, "Soap"));
+		self::register("chemical_sodium_acetate", fn(IID $id) => new Item($id, "Sodium Acetate"));
+		self::register("chemical_sodium_fluoride", fn(IID $id) => new Item($id, "Sodium Fluoride"));
+		self::register("chemical_sodium_hydride", fn(IID $id) => new Item($id, "Sodium Hydride"));
+		self::register("chemical_sodium_hydroxide", fn(IID $id) => new Item($id, "Sodium Hydroxide"));
+		self::register("chemical_sodium_hypochlorite", fn(IID $id) => new Item($id, "Sodium Hypochlorite"));
+		self::register("chemical_sodium_oxide", fn(IID $id) => new Item($id, "Sodium Oxide"));
+		self::register("chemical_sugar", fn(IID $id) => new Item($id, "Sugar"));
+		self::register("chemical_sulphate", fn(IID $id) => new Item($id, "Sulphate"));
+		self::register("chemical_tungsten_chloride", fn(IID $id) => new Item($id, "Tungsten Chloride"));
+		self::register("chemical_water", fn(IID $id) => new Item($id, "Water"));
+		self::register("chorus_fruit", fn(IID $id) => new ChorusFruit($id, "Chorus Fruit"));
+		self::register("clay", fn(IID $id) => new Item($id, "Clay"));
+		self::register("clock", fn(IID $id) => new Clock($id, "Clock"));
+		self::register("clownfish", fn(IID $id) => new Clownfish($id, "Clownfish"));
+		self::register("coal", fn(IID $id) => new Coal($id, "Coal"));
+		self::register("cocoa_beans", fn(IID $id) => new CocoaBeans($id, "Cocoa Beans"));
+		self::register("compass", fn(IID $id) => new Compass($id, "Compass", [EnchantmentTags::COMPASS]));
+		self::register("cooked_chicken", fn(IID $id) => new CookedChicken($id, "Cooked Chicken"));
+		self::register("cooked_fish", fn(IID $id) => new CookedFish($id, "Cooked Fish"));
+		self::register("cooked_mutton", fn(IID $id) => new CookedMutton($id, "Cooked Mutton"));
+		self::register("cooked_porkchop", fn(IID $id) => new CookedPorkchop($id, "Cooked Porkchop"));
+		self::register("cooked_rabbit", fn(IID $id) => new CookedRabbit($id, "Cooked Rabbit"));
+		self::register("cooked_salmon", fn(IID $id) => new CookedSalmon($id, "Cooked Salmon"));
+		self::register("cookie", fn(IID $id) => new Cookie($id, "Cookie"));
+		self::register("copper_ingot", fn(IID $id) => new Item($id, "Copper Ingot"));
+		self::register("coral_fan", fn(IID $id) => new CoralFan($id));
+		self::register("crimson_sign", fn(IID $id) => new ItemBlockWallOrFloor($id, Blocks::CRIMSON_SIGN(), Blocks::CRIMSON_WALL_SIGN()));
+		self::register("dark_oak_sign", fn(IID $id) => new ItemBlockWallOrFloor($id, Blocks::DARK_OAK_SIGN(), Blocks::DARK_OAK_WALL_SIGN()));
+		self::register("diamond", fn(IID $id) => new Item($id, "Diamond"));
+		self::register("disc_fragment_5", fn(IID $id) => new Item($id, "Disc Fragment (5)"));
+		self::register("dragon_breath", fn(IID $id) => new Item($id, "Dragon's Breath"));
+		self::register("dried_kelp", fn(IID $id) => new DriedKelp($id, "Dried Kelp"));
+		//TODO: add interface to dye-colour objects
+		self::register("dye", fn(IID $id) => new Dye($id, "Dye"));
+		self::register("echo_shard", fn(IID $id) => new Item($id, "Echo Shard"));
+		self::register("egg", fn(IID $id) => new Egg($id, "Egg"));
+		self::register("emerald", fn(IID $id) => new Item($id, "Emerald"));
+		self::register("enchanted_book", fn(IID $id) => new EnchantedBook($id, "Enchanted Book", [EnchantmentTags::ALL]));
+		self::register("enchanted_golden_apple", fn(IID $id) => new GoldenAppleEnchanted($id, "Enchanted Golden Apple"));
+		self::register("end_crystal", fn(IID $id) => new EndCrystal($id, "End Crystal"));
+		self::register("ender_pearl", fn(IID $id) => new EnderPearl($id, "Ender Pearl"));
+		self::register("experience_bottle", fn(IID $id) => new ExperienceBottle($id, "Bottle o' Enchanting"));
+		self::register("feather", fn(IID $id) => new Item($id, "Feather"));
+		self::register("fermented_spider_eye", fn(IID $id) => new Item($id, "Fermented Spider Eye"));
+		self::register("fire_charge", fn(IID $id) => new FireCharge($id, "Fire Charge"));
+		self::register("fishing_rod", fn(IID $id) => new FishingRod($id, "Fishing Rod", [EnchantmentTags::FISHING_ROD]));
+		self::register("flint", fn(IID $id) => new Item($id, "Flint"));
+		self::register("flint_and_steel", fn(IID $id) => new FlintSteel($id, "Flint and Steel", [EnchantmentTags::FLINT_AND_STEEL]));
+		self::register("ghast_tear", fn(IID $id) => new Item($id, "Ghast Tear"));
+		self::register("glass_bottle", fn(IID $id) => new GlassBottle($id, "Glass Bottle"));
+		self::register("glistering_melon", fn(IID $id) => new Item($id, "Glistering Melon"));
+		self::register("glow_berries", fn(IID $id) => new GlowBerries($id, "Glow Berries"));
+		self::register("glow_ink_sac", fn(IID $id) => new Item($id, "Glow Ink Sac"));
+		self::register("glowstone_dust", fn(IID $id) => new Item($id, "Glowstone Dust"));
+		self::register("goat_horn", fn(IID $id) => new GoatHorn($id, "Goat Horn"));
+		self::register("gold_ingot", fn(IID $id) => new Item($id, "Gold Ingot"));
+		self::register("gold_nugget", fn(IID $id) => new Item($id, "Gold Nugget"));
+		self::register("golden_apple", fn(IID $id) => new GoldenApple($id, "Golden Apple"));
+		self::register("golden_carrot", fn(IID $id) => new GoldenCarrot($id, "Golden Carrot"));
+		self::register("gunpowder", fn(IID $id) => new Item($id, "Gunpowder"));
+		self::register("heart_of_the_sea", fn(IID $id) => new Item($id, "Heart of the Sea"));
+		self::register("honey_bottle", fn(IID $id) => new HoneyBottle($id, "Honey Bottle"));
+		self::register("honeycomb", fn(IID $id) => new Item($id, "Honeycomb"));
+		self::register("ice_bomb", fn(IID $id) => new IceBomb($id, "Ice Bomb"));
+		self::register("ink_sac", fn(IID $id) => new Item($id, "Ink Sac"));
+		self::register("iron_ingot", fn(IID $id) => new Item($id, "Iron Ingot"));
+		self::register("iron_nugget", fn(IID $id) => new Item($id, "Iron Nugget"));
+		self::register("jungle_sign", fn(IID $id) => new ItemBlockWallOrFloor($id, Blocks::JUNGLE_SIGN(), Blocks::JUNGLE_WALL_SIGN()));
+		self::register("lapis_lazuli", fn(IID $id) => new Item($id, "Lapis Lazuli"));
+		self::register("lava_bucket", fn(IID $id) => new LiquidBucket($id, "Lava Bucket", Blocks::LAVA()));
+		self::register("leather", fn(IID $id) => new Item($id, "Leather"));
+		self::register("magma_cream", fn(IID $id) => new Item($id, "Magma Cream"));
+		self::register("mangrove_sign", fn(IID $id) => new ItemBlockWallOrFloor($id, Blocks::MANGROVE_SIGN(), Blocks::MANGROVE_WALL_SIGN()));
+		self::register("medicine", fn(IID $id) => new Medicine($id, "Medicine"));
+		self::register("melon", fn(IID $id) => new Melon($id, "Melon"));
+		self::register("melon_seeds", fn(IID $id) => new MelonSeeds($id, "Melon Seeds"));
+		self::register("milk_bucket", fn(IID $id) => new MilkBucket($id, "Milk Bucket"));
+		self::register("minecart", fn(IID $id) => new Minecart($id, "Minecart"));
+		self::register("mushroom_stew", fn(IID $id) => new MushroomStew($id, "Mushroom Stew"));
+		self::register("name_tag", fn(IID $id) => new NameTag($id, "Name Tag"));
+		self::register("nautilus_shell", fn(IID $id) => new Item($id, "Nautilus Shell"));
+		self::register("nether_brick", fn(IID $id) => new Item($id, "Nether Brick"));
+		self::register("nether_quartz", fn(IID $id) => new Item($id, "Nether Quartz"));
+		self::register("nether_star", fn(IID $id) => new Item($id, "Nether Star"));
+		self::register("netherite_ingot", fn(IID $id) => new class($id, "Netherite Ingot") extends Item{
+			public function isFireProof() : bool{ return true; }
+		});
+		self::register("netherite_scrap", fn(IID $id) => new class($id, "Netherite Scrap") extends Item{
+			public function isFireProof() : bool{ return true; }
+		});
+		self::register("oak_sign", fn(IID $id) => new ItemBlockWallOrFloor($id, Blocks::OAK_SIGN(), Blocks::OAK_WALL_SIGN()));
+		self::register("painting", fn(IID $id) => new PaintingItem($id, "Painting"));
+		self::register("paper", fn(IID $id) => new Item($id, "Paper"));
+		self::register("phantom_membrane", fn(IID $id) => new Item($id, "Phantom Membrane"));
+		self::register("pitcher_pod", fn(IID $id) => new PitcherPod($id, "Pitcher Pod"));
+		self::register("poisonous_potato", fn(IID $id) => new PoisonousPotato($id, "Poisonous Potato"));
+		self::register("popped_chorus_fruit", fn(IID $id) => new Item($id, "Popped Chorus Fruit"));
+		self::register("potato", fn(IID $id) => new Potato($id, "Potato"));
+		self::register("potion", fn(IID $id) => new Potion($id, "Potion"));
+		self::register("prismarine_crystals", fn(IID $id) => new Item($id, "Prismarine Crystals"));
+		self::register("prismarine_shard", fn(IID $id) => new Item($id, "Prismarine Shard"));
+		self::register("pufferfish", fn(IID $id) => new Pufferfish($id, "Pufferfish"));
+		self::register("pumpkin_pie", fn(IID $id) => new PumpkinPie($id, "Pumpkin Pie"));
+		self::register("pumpkin_seeds", fn(IID $id) => new PumpkinSeeds($id, "Pumpkin Seeds"));
+		self::register("rabbit_foot", fn(IID $id) => new Item($id, "Rabbit's Foot"));
+		self::register("rabbit_hide", fn(IID $id) => new Item($id, "Rabbit Hide"));
+		self::register("rabbit_stew", fn(IID $id) => new RabbitStew($id, "Rabbit Stew"));
+		self::register("raw_beef", fn(IID $id) => new RawBeef($id, "Raw Beef"));
+		self::register("raw_chicken", fn(IID $id) => new RawChicken($id, "Raw Chicken"));
+		self::register("raw_copper", fn(IID $id) => new Item($id, "Raw Copper"));
+		self::register("raw_fish", fn(IID $id) => new RawFish($id, "Raw Fish"));
+		self::register("raw_gold", fn(IID $id) => new Item($id, "Raw Gold"));
+		self::register("raw_iron", fn(IID $id) => new Item($id, "Raw Iron"));
+		self::register("raw_mutton", fn(IID $id) => new RawMutton($id, "Raw Mutton"));
+		self::register("raw_porkchop", fn(IID $id) => new RawPorkchop($id, "Raw Porkchop"));
+		self::register("raw_rabbit", fn(IID $id) => new RawRabbit($id, "Raw Rabbit"));
+		self::register("raw_salmon", fn(IID $id) => new RawSalmon($id, "Raw Salmon"));
+		self::register("record_11", fn(IID $id) => new Record($id, RecordType::DISK_11, "Record 11"));
+		self::register("record_13", fn(IID $id) => new Record($id, RecordType::DISK_13, "Record 13"));
+		self::register("record_5", fn(IID $id) => new Record($id, RecordType::DISK_5, "Record 5"));
+		self::register("record_blocks", fn(IID $id) => new Record($id, RecordType::DISK_BLOCKS, "Record Blocks"));
+		self::register("record_cat", fn(IID $id) => new Record($id, RecordType::DISK_CAT, "Record Cat"));
+		self::register("record_chirp", fn(IID $id) => new Record($id, RecordType::DISK_CHIRP, "Record Chirp"));
+		self::register("record_far", fn(IID $id) => new Record($id, RecordType::DISK_FAR, "Record Far"));
+		self::register("record_mall", fn(IID $id) => new Record($id, RecordType::DISK_MALL, "Record Mall"));
+		self::register("record_mellohi", fn(IID $id) => new Record($id, RecordType::DISK_MELLOHI, "Record Mellohi"));
+		self::register("record_otherside", fn(IID $id) => new Record($id, RecordType::DISK_OTHERSIDE, "Record Otherside"));
+		self::register("record_pigstep", fn(IID $id) => new Record($id, RecordType::DISK_PIGSTEP, "Record Pigstep"));
+		self::register("record_stal", fn(IID $id) => new Record($id, RecordType::DISK_STAL, "Record Stal"));
+		self::register("record_strad", fn(IID $id) => new Record($id, RecordType::DISK_STRAD, "Record Strad"));
+		self::register("record_wait", fn(IID $id) => new Record($id, RecordType::DISK_WAIT, "Record Wait"));
+		self::register("record_ward", fn(IID $id) => new Record($id, RecordType::DISK_WARD, "Record Ward"));
+		self::register("redstone_dust", fn(IID $id) => new Redstone($id, "Redstone"));
+		self::register("rotten_flesh", fn(IID $id) => new RottenFlesh($id, "Rotten Flesh"));
+		self::register("scute", fn(IID $id) => new Item($id, "Scute"));
+		self::register("shears", fn(IID $id) => new Shears($id, "Shears", [EnchantmentTags::SHEARS]));
+		self::register("shulker_shell", fn(IID $id) => new Item($id, "Shulker Shell"));
+		self::register("slimeball", fn(IID $id) => new Item($id, "Slimeball"));
+		self::register("snowball", fn(IID $id) => new Snowball($id, "Snowball"));
+		self::register("spider_eye", fn(IID $id) => new SpiderEye($id, "Spider Eye"));
+		self::register("splash_potion", fn(IID $id) => new SplashPotion($id, "Splash Potion"));
+		self::register("spruce_sign", fn(IID $id) => new ItemBlockWallOrFloor($id, Blocks::SPRUCE_SIGN(), Blocks::SPRUCE_WALL_SIGN()));
+		self::register("spyglass", fn(IID $id) => new Spyglass($id, "Spyglass"));
+		self::register("steak", fn(IID $id) => new Steak($id, "Steak"));
+		self::register("stick", fn(IID $id) => new Stick($id, "Stick"));
+		self::register("string", fn(IID $id) => new StringItem($id, "String"));
+		self::register("sugar", fn(IID $id) => new Item($id, "Sugar"));
+		self::register("suspicious_stew", fn(IID $id) => new SuspiciousStew($id, "Suspicious Stew"));
+		self::register("sweet_berries", fn(IID $id) => new SweetBerries($id, "Sweet Berries"));
+		self::register("torchflower_seeds", fn(IID $id) => new TorchflowerSeeds($id, "Torchflower Seeds"));
+		self::register("totem", fn(IID $id) => new Totem($id, "Totem of Undying"));
+		self::register("warped_sign", fn(IID $id) => new ItemBlockWallOrFloor($id, Blocks::WARPED_SIGN(), Blocks::WARPED_WALL_SIGN()));
+		self::register("water_bucket", fn(IID $id) => new LiquidBucket($id, "Water Bucket", Blocks::WATER()));
+		self::register("wheat", fn(IID $id) => new Item($id, "Wheat"));
+		self::register("wheat_seeds", fn(IID $id) => new WheatSeeds($id, "Wheat Seeds"));
+		self::register("writable_book", fn(IID $id) => new WritableBook($id, "Book & Quill"));
+		self::register("written_book", fn(IID $id) => new WrittenBook($id, "Written Book"));
+
+		foreach(BoatType::cases() as $type){
+			//boat type is static, because different types of wood may have different properties
+			self::register(strtolower($type->name) . "_boat", fn(IID $id) => new Boat($id, $type->getDisplayName() . " Boat", $type));
+		}
 	}
+
+	private static function registerSpawnEggs() : void{
+		self::register("zombie_spawn_egg", fn(IID $id) => new class($id, "Zombie Spawn Egg") extends SpawnEgg{
+			protected function createEntity(World $world, Vector3 $pos, float $yaw, float $pitch) : Entity{
+				return new Zombie(Location::fromObject($pos, $world, $yaw, $pitch));
+			}
+		});
+		self::register("squid_spawn_egg", fn(IID $id) => new class($id, "Squid Spawn Egg") extends SpawnEgg{
+			protected function createEntity(World $world, Vector3 $pos, float $yaw, float $pitch) : Entity{
+				return new Squid(Location::fromObject($pos, $world, $yaw, $pitch));
+			}
+		});
+		self::register("villager_spawn_egg", fn(IID $id) => new class($id, "Villager Spawn Egg") extends SpawnEgg{
+			protected function createEntity(World $world, Vector3 $pos, float $yaw, float $pitch) : Entity{
+				return new Villager(Location::fromObject($pos, $world, $yaw, $pitch));
+			}
+		});
+	}
+
+	private static function registerTierToolItems() : void{
+		self::register("diamond_axe", fn(IID $id) => new Axe($id, "Diamond Axe", ToolTier::DIAMOND, [EnchantmentTags::AXE]));
+		self::register("golden_axe", fn(IID $id) => new Axe($id, "Golden Axe", ToolTier::GOLD, [EnchantmentTags::AXE]));
+		self::register("iron_axe", fn(IID $id) => new Axe($id, "Iron Axe", ToolTier::IRON, [EnchantmentTags::AXE]));
+		self::register("netherite_axe", fn(IID $id) => new Axe($id, "Netherite Axe", ToolTier::NETHERITE, [EnchantmentTags::AXE]));
+		self::register("stone_axe", fn(IID $id) => new Axe($id, "Stone Axe", ToolTier::STONE, [EnchantmentTags::AXE]));
+		self::register("wooden_axe", fn(IID $id) => new Axe($id, "Wooden Axe", ToolTier::WOOD, [EnchantmentTags::AXE]));
+		self::register("diamond_hoe", fn(IID $id) => new Hoe($id, "Diamond Hoe", ToolTier::DIAMOND, [EnchantmentTags::HOE]));
+		self::register("golden_hoe", fn(IID $id) => new Hoe($id, "Golden Hoe", ToolTier::GOLD, [EnchantmentTags::HOE]));
+		self::register("iron_hoe", fn(IID $id) => new Hoe($id, "Iron Hoe", ToolTier::IRON, [EnchantmentTags::HOE]));
+		self::register("netherite_hoe", fn(IID $id) => new Hoe($id, "Netherite Hoe", ToolTier::NETHERITE, [EnchantmentTags::HOE]));
+		self::register("stone_hoe", fn(IID $id) => new Hoe($id, "Stone Hoe", ToolTier::STONE, [EnchantmentTags::HOE]));
+		self::register("wooden_hoe", fn(IID $id) => new Hoe($id, "Wooden Hoe", ToolTier::WOOD, [EnchantmentTags::HOE]));
+		self::register("diamond_pickaxe", fn(IID $id) => new Pickaxe($id, "Diamond Pickaxe", ToolTier::DIAMOND, [EnchantmentTags::PICKAXE]));
+		self::register("golden_pickaxe", fn(IID $id) => new Pickaxe($id, "Golden Pickaxe", ToolTier::GOLD, [EnchantmentTags::PICKAXE]));
+		self::register("iron_pickaxe", fn(IID $id) => new Pickaxe($id, "Iron Pickaxe", ToolTier::IRON, [EnchantmentTags::PICKAXE]));
+		self::register("netherite_pickaxe", fn(IID $id) => new Pickaxe($id, "Netherite Pickaxe", ToolTier::NETHERITE, [EnchantmentTags::PICKAXE]));
+		self::register("stone_pickaxe", fn(IID $id) => new Pickaxe($id, "Stone Pickaxe", ToolTier::STONE, [EnchantmentTags::PICKAXE]));
+		self::register("wooden_pickaxe", fn(IID $id) => new Pickaxe($id, "Wooden Pickaxe", ToolTier::WOOD, [EnchantmentTags::PICKAXE]));
+		self::register("diamond_shovel", fn(IID $id) => new Shovel($id, "Diamond Shovel", ToolTier::DIAMOND, [EnchantmentTags::SHOVEL]));
+		self::register("golden_shovel", fn(IID $id) => new Shovel($id, "Golden Shovel", ToolTier::GOLD, [EnchantmentTags::SHOVEL]));
+		self::register("iron_shovel", fn(IID $id) => new Shovel($id, "Iron Shovel", ToolTier::IRON, [EnchantmentTags::SHOVEL]));
+		self::register("netherite_shovel", fn(IID $id) => new Shovel($id, "Netherite Shovel", ToolTier::NETHERITE, [EnchantmentTags::SHOVEL]));
+		self::register("stone_shovel", fn(IID $id) => new Shovel($id, "Stone Shovel", ToolTier::STONE, [EnchantmentTags::SHOVEL]));
+		self::register("wooden_shovel", fn(IID $id) => new Shovel($id, "Wooden Shovel", ToolTier::WOOD, [EnchantmentTags::SHOVEL]));
+		self::register("diamond_sword", fn(IID $id) => new Sword($id, "Diamond Sword", ToolTier::DIAMOND, [EnchantmentTags::SWORD]));
+		self::register("golden_sword", fn(IID $id) => new Sword($id, "Golden Sword", ToolTier::GOLD, [EnchantmentTags::SWORD]));
+		self::register("iron_sword", fn(IID $id) => new Sword($id, "Iron Sword", ToolTier::IRON, [EnchantmentTags::SWORD]));
+		self::register("netherite_sword", fn(IID $id) => new Sword($id, "Netherite Sword", ToolTier::NETHERITE, [EnchantmentTags::SWORD]));
+		self::register("stone_sword", fn(IID $id) => new Sword($id, "Stone Sword", ToolTier::STONE, [EnchantmentTags::SWORD]));
+		self::register("wooden_sword", fn(IID $id) => new Sword($id, "Wooden Sword", ToolTier::WOOD, [EnchantmentTags::SWORD]));
+	}
+
+	private static function registerArmorItems() : void{
+		self::register("chainmail_boots", fn(IID $id) => new Armor($id, "Chainmail Boots", new ArmorTypeInfo(1, 196, ArmorInventory::SLOT_FEET, material: ArmorMaterials::CHAINMAIL()), [EnchantmentTags::BOOTS]));
+		self::register("diamond_boots", fn(IID $id) => new Armor($id, "Diamond Boots", new ArmorTypeInfo(3, 430, ArmorInventory::SLOT_FEET, 2, material: ArmorMaterials::DIAMOND()), [EnchantmentTags::BOOTS]));
+		self::register("golden_boots", fn(IID $id) => new Armor($id, "Golden Boots", new ArmorTypeInfo(1, 92, ArmorInventory::SLOT_FEET, material: ArmorMaterials::GOLD()), [EnchantmentTags::BOOTS]));
+		self::register("iron_boots", fn(IID $id) => new Armor($id, "Iron Boots", new ArmorTypeInfo(2, 196, ArmorInventory::SLOT_FEET, material: ArmorMaterials::IRON()), [EnchantmentTags::BOOTS]));
+		self::register("leather_boots", fn(IID $id) => new Armor($id, "Leather Boots", new ArmorTypeInfo(1, 66, ArmorInventory::SLOT_FEET, material: ArmorMaterials::LEATHER()), [EnchantmentTags::BOOTS]));
+		self::register("netherite_boots", fn(IID $id) => new Armor($id, "Netherite Boots", new ArmorTypeInfo(3, 482, ArmorInventory::SLOT_FEET, 3, true, material: ArmorMaterials::NETHERITE()), [EnchantmentTags::BOOTS]));
+
+		self::register("chainmail_chestplate", fn(IID $id) => new Armor($id, "Chainmail Chestplate", new ArmorTypeInfo(5, 241, ArmorInventory::SLOT_CHEST, material: ArmorMaterials::CHAINMAIL()), [EnchantmentTags::CHESTPLATE]));
+		self::register("diamond_chestplate", fn(IID $id) => new Armor($id, "Diamond Chestplate", new ArmorTypeInfo(8, 529, ArmorInventory::SLOT_CHEST, 2, material: ArmorMaterials::DIAMOND()), [EnchantmentTags::CHESTPLATE]));
+		self::register("golden_chestplate", fn(IID $id) => new Armor($id, "Golden Chestplate", new ArmorTypeInfo(5, 113, ArmorInventory::SLOT_CHEST, material: ArmorMaterials::GOLD()), [EnchantmentTags::CHESTPLATE]));
+		self::register("iron_chestplate", fn(IID $id) => new Armor($id, "Iron Chestplate", new ArmorTypeInfo(6, 241, ArmorInventory::SLOT_CHEST, material: ArmorMaterials::IRON()), [EnchantmentTags::CHESTPLATE]));
+		self::register("leather_tunic", fn(IID $id) => new Armor($id, "Leather Tunic", new ArmorTypeInfo(3, 81, ArmorInventory::SLOT_CHEST, material: ArmorMaterials::LEATHER()), [EnchantmentTags::CHESTPLATE]));
+		self::register("netherite_chestplate", fn(IID $id) => new Armor($id, "Netherite Chestplate", new ArmorTypeInfo(8, 593, ArmorInventory::SLOT_CHEST, 3, true, material: ArmorMaterials::NETHERITE()), [EnchantmentTags::CHESTPLATE]));
+
+		self::register("chainmail_helmet", fn(IID $id) => new Armor($id, "Chainmail Helmet", new ArmorTypeInfo(2, 166, ArmorInventory::SLOT_HEAD, material: ArmorMaterials::CHAINMAIL()), [EnchantmentTags::HELMET]));
+		self::register("diamond_helmet", fn(IID $id) => new Armor($id, "Diamond Helmet", new ArmorTypeInfo(3, 364, ArmorInventory::SLOT_HEAD, 2, material: ArmorMaterials::DIAMOND()), [EnchantmentTags::HELMET]));
+		self::register("golden_helmet", fn(IID $id) => new Armor($id, "Golden Helmet", new ArmorTypeInfo(2, 78, ArmorInventory::SLOT_HEAD, material: ArmorMaterials::GOLD()), [EnchantmentTags::HELMET]));
+		self::register("iron_helmet", fn(IID $id) => new Armor($id, "Iron Helmet", new ArmorTypeInfo(2, 166, ArmorInventory::SLOT_HEAD, material: ArmorMaterials::IRON()), [EnchantmentTags::HELMET]));
+		self::register("leather_cap", fn(IID $id) => new Armor($id, "Leather Cap", new ArmorTypeInfo(1, 56, ArmorInventory::SLOT_HEAD, material: ArmorMaterials::LEATHER()), [EnchantmentTags::HELMET]));
+		self::register("netherite_helmet", fn(IID $id) => new Armor($id, "Netherite Helmet", new ArmorTypeInfo(3, 408, ArmorInventory::SLOT_HEAD, 3, true, material: ArmorMaterials::NETHERITE()), [EnchantmentTags::HELMET]));
+		self::register("turtle_helmet", fn(IID $id) => new TurtleHelmet($id, "Turtle Shell", new ArmorTypeInfo(2, 276, ArmorInventory::SLOT_HEAD, material: ArmorMaterials::TURTLE()), [EnchantmentTags::HELMET]));
+
+		self::register("chainmail_leggings", fn(IID $id) => new Armor($id, "Chainmail Leggings", new ArmorTypeInfo(4, 226, ArmorInventory::SLOT_LEGS, material: ArmorMaterials::CHAINMAIL()), [EnchantmentTags::LEGGINGS]));
+		self::register("diamond_leggings", fn(IID $id) => new Armor($id, "Diamond Leggings", new ArmorTypeInfo(6, 496, ArmorInventory::SLOT_LEGS, 2, material: ArmorMaterials::DIAMOND()), [EnchantmentTags::LEGGINGS]));
+		self::register("golden_leggings", fn(IID $id) => new Armor($id, "Golden Leggings", new ArmorTypeInfo(3, 106, ArmorInventory::SLOT_LEGS, material: ArmorMaterials::GOLD()), [EnchantmentTags::LEGGINGS]));
+		self::register("iron_leggings", fn(IID $id) => new Armor($id, "Iron Leggings", new ArmorTypeInfo(5, 226, ArmorInventory::SLOT_LEGS, material: ArmorMaterials::IRON()), [EnchantmentTags::LEGGINGS]));
+		self::register("leather_pants", fn(IID $id) => new Armor($id, "Leather Pants", new ArmorTypeInfo(2, 76, ArmorInventory::SLOT_LEGS, material: ArmorMaterials::LEATHER()), [EnchantmentTags::LEGGINGS]));
+		self::register("netherite_leggings", fn(IID $id) => new Armor($id, "Netherite Leggings", new ArmorTypeInfo(6, 556, ArmorInventory::SLOT_LEGS, 3, true, material: ArmorMaterials::NETHERITE()), [EnchantmentTags::LEGGINGS]));
+	}
+
+	private static function registerSmithingTemplates() : void{
+		self::register("netherite_upgrade_smithing_template", fn(IID $id) => new Item($id, "Netherite Upgrade Smithing Template"));
+		self::register("coast_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Coast Armor Trim Smithing Template"));
+		self::register("dune_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Dune Armor Trim Smithing Template"));
+		self::register("eye_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Eye Armor Trim Smithing Template"));
+		self::register("host_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Host Armor Trim Smithing Template"));
+		self::register("raiser_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Raiser Armor Trim Smithing Template"));
+		self::register("rib_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Rib Armor Trim Smithing Template"));
+		self::register("sentry_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Sentry Armor Trim Smithing Template"));
+		self::register("shaper_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Shaper Armor Trim Smithing Template"));
+		self::register("silence_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Silence Armor Trim Smithing Template"));
+		self::register("snout_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Snout Armor Trim Smithing Template"));
+		self::register("spire_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Spire Armor Trim Smithing Template"));
+		self::register("tide_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Tide Armor Trim Smithing Template"));
+		self::register("vex_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Vex Armor Trim Smithing Template"));
+		self::register("ward_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Ward Armor Trim Smithing Template"));
+		self::register("wayfinder_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Wayfinder Armor Trim Smithing Template"));
+		self::register("wild_armor_trim_smithing_template", fn(IID $id) => new Item($id, "Wild Armor Trim Smithing Template"));
+	}
+
 }
diff --git a/src/item/enchantment/AvailableEnchantmentRegistry.php b/src/item/enchantment/AvailableEnchantmentRegistry.php
new file mode 100644
index 0000000000..cae94c666f
--- /dev/null
+++ b/src/item/enchantment/AvailableEnchantmentRegistry.php
@@ -0,0 +1,212 @@
+<?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\item\enchantment;
+
+use pocketmine\item\enchantment\ItemEnchantmentTagRegistry as TagRegistry;
+use pocketmine\item\enchantment\ItemEnchantmentTags as Tags;
+use pocketmine\item\enchantment\VanillaEnchantments as Enchantments;
+use pocketmine\item\Item;
+use pocketmine\utils\SingletonTrait;
+use function array_filter;
+use function array_values;
+use function count;
+use function spl_object_id;
+
+/**
+ * Registry of enchantments that can be applied to items during in-game enchanting (enchanting table, anvil, fishing, etc.).
+ */
+final class AvailableEnchantmentRegistry{
+	use SingletonTrait;
+
+	/** @var Enchantment[] */
+	private array $enchantments = [];
+
+	/** @var string[][] */
+	private array $primaryItemTags = [];
+
+	/** @var string[][] */
+	private array $secondaryItemTags = [];
+
+	private function __construct(){
+		$this->register(Enchantments::PROTECTION(), [Tags::ARMOR], []);
+		$this->register(Enchantments::FIRE_PROTECTION(), [Tags::ARMOR], []);
+		$this->register(Enchantments::FEATHER_FALLING(), [Tags::BOOTS], []);
+		$this->register(Enchantments::BLAST_PROTECTION(), [Tags::ARMOR], []);
+		$this->register(Enchantments::PROJECTILE_PROTECTION(), [Tags::ARMOR], []);
+		$this->register(Enchantments::THORNS(), [Tags::CHESTPLATE], [Tags::HELMET, Tags::LEGGINGS, Tags::BOOTS]);
+		$this->register(Enchantments::RESPIRATION(), [Tags::HELMET], []);
+		$this->register(Enchantments::AQUA_AFFINITY(), [Tags::HELMET], []);
+		$this->register(Enchantments::SHARPNESS(), [Tags::SWORD, Tags::AXE], []);
+		$this->register(Enchantments::KNOCKBACK(), [Tags::SWORD], []);
+		$this->register(Enchantments::FIRE_ASPECT(), [Tags::SWORD], []);
+		$this->register(Enchantments::EFFICIENCY(), [Tags::BLOCK_TOOLS], [Tags::SHEARS]);
+		$this->register(Enchantments::FORTUNE(), [Tags::BLOCK_TOOLS], []);
+		$this->register(Enchantments::SILK_TOUCH(), [Tags::BLOCK_TOOLS], [Tags::SHEARS]);
+		$this->register(
+			Enchantments::UNBREAKING(),
+			[Tags::ARMOR, Tags::WEAPONS, Tags::FISHING_ROD],
+			[Tags::SHEARS, Tags::FLINT_AND_STEEL, Tags::SHIELD, Tags::CARROT_ON_STICK, Tags::ELYTRA, Tags::BRUSH]
+		);
+		$this->register(Enchantments::POWER(), [Tags::BOW], []);
+		$this->register(Enchantments::PUNCH(), [Tags::BOW], []);
+		$this->register(Enchantments::FLAME(), [Tags::BOW], []);
+		$this->register(Enchantments::INFINITY(), [Tags::BOW], []);
+		$this->register(
+			Enchantments::MENDING(),
+			[],
+			[Tags::ARMOR, Tags::WEAPONS, Tags::FISHING_ROD,
+				Tags::SHEARS, Tags::FLINT_AND_STEEL, Tags::SHIELD, Tags::CARROT_ON_STICK, Tags::ELYTRA, Tags::BRUSH]
+		);
+		$this->register(Enchantments::VANISHING(), [], [Tags::ALL]);
+		$this->register(Enchantments::SWIFT_SNEAK(), [], [Tags::LEGGINGS]);
+	}
+
+	/**
+	 * @param string[] $primaryItemTags
+	 * @param string[] $secondaryItemTags
+	 */
+	public function register(Enchantment $enchantment, array $primaryItemTags, array $secondaryItemTags) : void{
+		$this->enchantments[spl_object_id($enchantment)] = $enchantment;
+		$this->setPrimaryItemTags($enchantment, $primaryItemTags);
+		$this->setSecondaryItemTags($enchantment, $secondaryItemTags);
+	}
+
+	public function unregister(Enchantment $enchantment) : void{
+		unset($this->enchantments[spl_object_id($enchantment)]);
+		unset($this->primaryItemTags[spl_object_id($enchantment)]);
+		unset($this->secondaryItemTags[spl_object_id($enchantment)]);
+	}
+
+	public function unregisterAll() : void{
+		$this->enchantments = [];
+		$this->primaryItemTags = [];
+		$this->secondaryItemTags = [];
+	}
+
+	public function isRegistered(Enchantment $enchantment) : bool{
+		return isset($this->enchantments[spl_object_id($enchantment)]);
+	}
+
+	/**
+	 * Returns primary compatibility tags for the specified enchantment.
+	 *
+	 * An item matching at least one of these tags (or its descendents) can be:
+	 * - Offered this enchantment in an enchanting table
+	 * - Enchanted by any means allowed by secondary tags
+	 *
+	 * @return string[]
+	 */
+	public function getPrimaryItemTags(Enchantment $enchantment) : array{
+		return $this->primaryItemTags[spl_object_id($enchantment)] ?? [];
+	}
+
+	/**
+	 * @param string[] $tags
+	 */
+	public function setPrimaryItemTags(Enchantment $enchantment, array $tags) : void{
+		if(!$this->isRegistered($enchantment)){
+			throw new \LogicException("Cannot set primary item tags for non-registered enchantment");
+		}
+		$this->primaryItemTags[spl_object_id($enchantment)] = array_values($tags);
+	}
+
+	/**
+	 * Returns secondary compatibility tags for the specified enchantment.
+	 *
+	 * An item matching at least one of these tags (or its descendents) can be:
+	 * - Combined with an enchanted book with this enchantment in an anvil
+	 * - Obtained as loot with this enchantment, e.g. fishing, treasure chests, mob equipment, etc.
+	 *
+	 * @return string[]
+	 */
+	public function getSecondaryItemTags(Enchantment $enchantment) : array{
+		return $this->secondaryItemTags[spl_object_id($enchantment)] ?? [];
+	}
+
+	/**
+	 * @param string[] $tags
+	 */
+	public function setSecondaryItemTags(Enchantment $enchantment, array $tags) : void{
+		if(!$this->isRegistered($enchantment)){
+			throw new \LogicException("Cannot set secondary item tags for non-registered enchantment");
+		}
+		$this->secondaryItemTags[spl_object_id($enchantment)] = array_values($tags);
+	}
+
+	/**
+	 * Returns enchantments that can be applied to the specified item in an enchanting table (primary only).
+	 *
+	 * @return Enchantment[]
+	 */
+	public function getPrimaryEnchantmentsForItem(Item $item) : array{
+		$itemTags = $item->getEnchantmentTags();
+		if(count($itemTags) === 0 || $item->hasEnchantments()){
+			return [];
+		}
+
+		return array_filter(
+			$this->enchantments,
+			fn(Enchantment $e) => TagRegistry::getInstance()->isTagArrayIntersection($this->getPrimaryItemTags($e), $itemTags)
+		);
+	}
+
+	/**
+	 * Returns all available enchantments compatible with the item.
+	 *
+	 * Warning: not suitable for obtaining enchantments for an enchanting table
+	 * (use {@link AvailableEnchantmentRegistry::getPrimaryEnchantmentsForItem()} for that).
+	 *
+	 * @return Enchantment[]
+	 */
+	public function getAllEnchantmentsForItem(Item $item) : array{
+		if(count($item->getEnchantmentTags()) === 0){
+			return [];
+		}
+
+		return array_filter(
+			$this->enchantments,
+			fn(Enchantment $enchantment) => $this->isAvailableForItem($enchantment, $item)
+		);
+	}
+
+	/**
+	 * Returns whether the specified enchantment can be applied to the particular item.
+	 *
+	 * Warning: not suitable for checking the availability of enchantment for an enchanting table.
+	 */
+	public function isAvailableForItem(Enchantment $enchantment, Item $item) : bool{
+		$itemTags = $item->getEnchantmentTags();
+		$tagRegistry = TagRegistry::getInstance();
+
+		return $tagRegistry->isTagArrayIntersection($this->getPrimaryItemTags($enchantment), $itemTags) ||
+			$tagRegistry->isTagArrayIntersection($this->getSecondaryItemTags($enchantment), $itemTags);
+	}
+
+	/**
+	 * @return Enchantment[]
+	 */
+	public function getAll() : array{
+		return $this->enchantments;
+	}
+}
diff --git a/src/item/enchantment/EnchantingHelper.php b/src/item/enchantment/EnchantingHelper.php
new file mode 100644
index 0000000000..fb4e8f27ce
--- /dev/null
+++ b/src/item/enchantment/EnchantingHelper.php
@@ -0,0 +1,233 @@
+<?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\item\enchantment;
+
+use pocketmine\block\BlockTypeIds;
+use pocketmine\item\enchantment\AvailableEnchantmentRegistry as EnchantmentRegistry;
+use pocketmine\item\Item;
+use pocketmine\item\ItemTypeIds;
+use pocketmine\item\VanillaItems as Items;
+use pocketmine\utils\Limits;
+use pocketmine\utils\Random;
+use pocketmine\world\Position;
+use function abs;
+use function array_filter;
+use function chr;
+use function count;
+use function floor;
+use function max;
+use function min;
+use function mt_rand;
+use function ord;
+use function round;
+
+/**
+ * Helper methods used for enchanting using the enchanting table.
+ */
+final class EnchantingHelper{
+	private const MAX_BOOKSHELF_COUNT = 15;
+
+	private function __construct(){
+		//NOOP
+	}
+
+	/**
+	 * Generates a new random seed for enchant option randomization.
+	 */
+	public static function generateSeed() : int{
+		return mt_rand(Limits::INT32_MIN, Limits::INT32_MAX);
+	}
+
+	/**
+	 * @param EnchantmentInstance[] $enchantments
+	 */
+	public static function enchantItem(Item $item, array $enchantments) : Item{
+		$resultItem = $item->getTypeId() === ItemTypeIds::BOOK ? Items::ENCHANTED_BOOK() : clone $item;
+
+		foreach($enchantments as $enchantment){
+			$resultItem->addEnchantment($enchantment);
+		}
+
+		return $resultItem;
+	}
+
+	/**
+	 * @return EnchantingOption[]
+	 */
+	public static function generateOptions(Position $tablePos, Item $input, int $seed) : array{
+		if($input->isNull() || $input->hasEnchantments()){
+			return [];
+		}
+
+		$random = new Random($seed);
+
+		$bookshelfCount = self::countBookshelves($tablePos);
+		$baseRequiredLevel = $random->nextRange(1, 8) + ($bookshelfCount >> 1) + $random->nextRange(0, $bookshelfCount);
+		$topRequiredLevel = (int) floor(max($baseRequiredLevel / 3, 1));
+		$middleRequiredLevel = (int) floor($baseRequiredLevel * 2 / 3 + 1);
+		$bottomRequiredLevel = max($baseRequiredLevel, $bookshelfCount * 2);
+
+		return [
+			self::createOption($random, $input, $topRequiredLevel),
+			self::createOption($random, $input, $middleRequiredLevel),
+			self::createOption($random, $input, $bottomRequiredLevel),
+		];
+	}
+
+	private static function countBookshelves(Position $tablePos) : int{
+		$bookshelfCount = 0;
+		$world = $tablePos->getWorld();
+
+		for($x = -2; $x <= 2; $x++){
+			for($z = -2; $z <= 2; $z++){
+				// We only check blocks at a distance of 2 blocks from the enchanting table
+				if(abs($x) !== 2 && abs($z) !== 2){
+					continue;
+				}
+
+				// Ensure the space between the bookshelf stack at this X/Z and the enchanting table is empty
+				for($y = 0; $y <= 1; $y++){
+					// Calculate the coordinates of the space between the bookshelf and the enchanting table
+					$spaceX = max(min($x, 1), -1);
+					$spaceZ = max(min($z, 1), -1);
+					$spaceBlock = $world->getBlock($tablePos->add($spaceX, $y, $spaceZ));
+					if($spaceBlock->getTypeId() !== BlockTypeIds::AIR){
+						continue 2;
+					}
+				}
+
+				// Finally, check the number of bookshelves at the current position
+				for($y = 0; $y <= 1; $y++){
+					$block = $world->getBlock($tablePos->add($x, $y, $z));
+					if($block->getTypeId() === BlockTypeIds::BOOKSHELF){
+						$bookshelfCount++;
+						if($bookshelfCount === self::MAX_BOOKSHELF_COUNT){
+							return $bookshelfCount;
+						}
+					}
+				}
+			}
+		}
+
+		return $bookshelfCount;
+	}
+
+	private static function createOption(Random $random, Item $inputItem, int $requiredXpLevel) : EnchantingOption{
+		$enchantingPower = $requiredXpLevel;
+
+		$enchantability = $inputItem->getEnchantability();
+		$enchantingPower = $enchantingPower + $random->nextRange(0, $enchantability >> 2) + $random->nextRange(0, $enchantability >> 2) + 1;
+		// Random bonus for enchanting power between 0.85 and 1.15
+		$bonus = 1 + ($random->nextFloat() + $random->nextFloat() - 1) * 0.15;
+		$enchantingPower = (int) round($enchantingPower * $bonus);
+
+		$resultEnchantments = [];
+		$availableEnchantments = self::getAvailableEnchantments($enchantingPower, $inputItem);
+
+		$lastEnchantment = self::getRandomWeightedEnchantment($random, $availableEnchantments);
+		if($lastEnchantment !== null){
+			$resultEnchantments[] = $lastEnchantment;
+
+			// With probability (power + 1) / 50, continue adding enchantments
+			while($random->nextFloat() <= ($enchantingPower + 1) / 50){
+				// Remove from the list of available enchantments anything that conflicts
+				// with previously-chosen enchantments
+				$availableEnchantments = array_filter(
+					$availableEnchantments,
+					function(EnchantmentInstance $e) use ($lastEnchantment){
+						return $e->getType() !== $lastEnchantment->getType() &&
+							$e->getType()->isCompatibleWith($lastEnchantment->getType());
+					}
+				);
+
+				$lastEnchantment = self::getRandomWeightedEnchantment($random, $availableEnchantments);
+				if($lastEnchantment === null){
+					break;
+				}
+
+				$resultEnchantments[] = $lastEnchantment;
+				$enchantingPower >>= 1;
+			}
+		}
+
+		return new EnchantingOption($requiredXpLevel, self::getRandomOptionName($random), $resultEnchantments);
+	}
+
+	/**
+	 * @return EnchantmentInstance[]
+	 */
+	private static function getAvailableEnchantments(int $enchantingPower, Item $item) : array{
+		$list = [];
+
+		foreach(EnchantmentRegistry::getInstance()->getPrimaryEnchantmentsForItem($item) as $enchantment){
+			for($lvl = $enchantment->getMaxLevel(); $lvl > 0; $lvl--){
+				if($enchantingPower >= $enchantment->getMinEnchantingPower($lvl) &&
+					$enchantingPower <= $enchantment->getMaxEnchantingPower($lvl)
+				){
+					$list[] = new EnchantmentInstance($enchantment, $lvl);
+					break;
+				}
+			}
+		}
+
+		return $list;
+	}
+
+	/**
+	 * @param EnchantmentInstance[] $enchantments
+	 */
+	private static function getRandomWeightedEnchantment(Random $random, array $enchantments) : ?EnchantmentInstance{
+		if(count($enchantments) === 0){
+			return null;
+		}
+
+		$totalWeight = 0;
+		foreach($enchantments as $enchantment){
+			$totalWeight += $enchantment->getType()->getRarity();
+		}
+
+		$result = null;
+		$randomWeight = $random->nextRange(1, $totalWeight);
+
+		foreach($enchantments as $enchantment){
+			$randomWeight -= $enchantment->getType()->getRarity();
+
+			if($randomWeight <= 0){
+				$result = $enchantment;
+				break;
+			}
+		}
+
+		return $result;
+	}
+
+	private static function getRandomOptionName(Random $random) : string{
+		$name = "";
+		for($i = $random->nextRange(5, 15); $i > 0; $i--){
+			$name .= chr($random->nextRange(ord("a"), ord("z")));
+		}
+
+		return $name;
+	}
+}
diff --git a/src/item/enchantment/EnchantingOption.php b/src/item/enchantment/EnchantingOption.php
new file mode 100644
index 0000000000..2bedb0cc41
--- /dev/null
+++ b/src/item/enchantment/EnchantingOption.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\item\enchantment;
+
+/**
+ * Represents an option on the enchanting table menu.
+ * If selected, all the enchantments in the option will be applied to the item.
+ */
+class EnchantingOption{
+
+	/**
+	 * @param EnchantmentInstance[] $enchantments
+	 */
+	public function __construct(
+		private int $requiredXpLevel,
+		private string $displayName,
+		private array $enchantments
+	){}
+
+	/**
+	 * Returns the minimum amount of XP levels required to select this enchantment option.
+	 * It's NOT the number of XP levels that will be subtracted after enchanting.
+	 */
+	public function getRequiredXpLevel() : int{
+		return $this->requiredXpLevel;
+	}
+
+	/**
+	 * Returns the name that will be translated to the 'Standard Galactic Alphabet' client-side.
+	 * This can be any arbitrary text string, since the vanilla client cannot read the text anyway.
+	 * Example: 'bless creature range free'.
+	 */
+	public function getDisplayName() : string{
+		return $this->displayName;
+	}
+
+	/**
+	 * Returns the enchantments that will be applied to the item when this option is clicked.
+	 *
+	 * @return EnchantmentInstance[]
+	 */
+	public function getEnchantments() : array{
+		return $this->enchantments;
+	}
+}
diff --git a/src/item/enchantment/Enchantment.php b/src/item/enchantment/Enchantment.php
index c53dfab7c0..948f4648bc 100644
--- a/src/item/enchantment/Enchantment.php
+++ b/src/item/enchantment/Enchantment.php
@@ -23,9 +23,13 @@ declare(strict_types=1);
 
 namespace pocketmine\item\enchantment;
 
+use DaveRandom\CallbackValidator\CallbackType;
+use DaveRandom\CallbackValidator\ParameterType;
+use DaveRandom\CallbackValidator\ReturnType;
 use pocketmine\lang\Translatable;
 use pocketmine\utils\NotCloneable;
 use pocketmine\utils\NotSerializable;
+use pocketmine\utils\Utils;
 
 /**
  * Manages enchantment type data.
@@ -34,13 +38,32 @@ class Enchantment{
 	use NotCloneable;
 	use NotSerializable;
 
+	/** @var \Closure(int $level) : int $minEnchantingPower */
+	private \Closure $minEnchantingPower;
+
+	/**
+	 * @phpstan-param null|(\Closure(int $level) : int) $minEnchantingPower
+	 *
+	 * @param int $primaryItemFlags     @deprecated
+	 * @param int $secondaryItemFlags   @deprecated
+	 * @param int $enchantingPowerRange Value used to calculate the maximum enchanting power (minEnchantingPower + enchantingPowerRange)
+	 */
 	public function __construct(
 		private Translatable|string $name,
 		private int $rarity,
 		private int $primaryItemFlags,
 		private int $secondaryItemFlags,
-		private int $maxLevel
-	){}
+		private int $maxLevel,
+		?\Closure $minEnchantingPower = null,
+		private int $enchantingPowerRange = 50
+	){
+		$this->minEnchantingPower = $minEnchantingPower ?? fn(int $level) : int => 1;
+
+		Utils::validateCallableSignature(new CallbackType(
+			new ReturnType("int"),
+			new ParameterType("level", "int")
+		), $this->minEnchantingPower);
+	}
 
 	/**
 	 * Returns a translation key for this enchantment's name.
@@ -58,6 +81,9 @@ class Enchantment{
 
 	/**
 	 * Returns a bitset indicating what item types can have this item applied from an enchanting table.
+	 *
+	 * @deprecated
+	 * @see AvailableEnchantmentRegistry::getPrimaryItemTags()
 	 */
 	public function getPrimaryItemFlags() : int{
 		return $this->primaryItemFlags;
@@ -66,6 +92,9 @@ class Enchantment{
 	/**
 	 * Returns a bitset indicating what item types cannot have this item applied from an enchanting table, but can from
 	 * an anvil.
+	 *
+	 * @deprecated
+	 * @see AvailableEnchantmentRegistry::getSecondaryItemTags()
 	 */
 	public function getSecondaryItemFlags() : int{
 		return $this->secondaryItemFlags;
@@ -73,6 +102,9 @@ class Enchantment{
 
 	/**
 	 * Returns whether this enchantment can apply to the item type from an enchanting table.
+	 *
+	 * @deprecated
+	 * @see AvailableEnchantmentRegistry
 	 */
 	public function hasPrimaryItemType(int $flag) : bool{
 		return ($this->primaryItemFlags & $flag) !== 0;
@@ -80,6 +112,9 @@ class Enchantment{
 
 	/**
 	 * Returns whether this enchantment can apply to the item type from an anvil, if it is not a primary item.
+	 *
+	 * @deprecated
+	 * @see AvailableEnchantmentRegistry
 	 */
 	public function hasSecondaryItemType(int $flag) : bool{
 		return ($this->secondaryItemFlags & $flag) !== 0;
@@ -92,5 +127,34 @@ class Enchantment{
 		return $this->maxLevel;
 	}
 
-	//TODO: methods for min/max XP cost bounds based on enchantment level (not needed yet - enchanting is client-side)
+	/**
+	 * Returns whether this enchantment can be applied to the item along with the given enchantment.
+	 */
+	public function isCompatibleWith(Enchantment $other) : bool{
+		return IncompatibleEnchantmentRegistry::getInstance()->areCompatible($this, $other);
+	}
+
+	/**
+	 * Returns the minimum enchanting power value required for the particular level of the enchantment
+	 * to be available in an enchanting table.
+	 *
+	 * Enchanting power is a random value based on the number of bookshelves around an enchanting table
+	 * and the enchantability of the item being enchanted. It is only used when determining the available
+	 * enchantments for the enchantment options.
+	 */
+	public function getMinEnchantingPower(int $level) : int{
+		return ($this->minEnchantingPower)($level);
+	}
+
+	/**
+	 * Returns the maximum enchanting power value allowed for the particular level of the enchantment
+	 * to be available in an enchanting table.
+	 *
+	 * Enchanting power is a random value based on the number of bookshelves around an enchanting table
+	 * and the enchantability of the item being enchanted. It is only used when determining the available
+	 * enchantments for the enchantment options.
+	 */
+	public function getMaxEnchantingPower(int $level) : int{
+		return $this->getMinEnchantingPower($level) + $this->enchantingPowerRange;
+	}
 }
diff --git a/src/item/enchantment/IncompatibleEnchantmentGroups.php b/src/item/enchantment/IncompatibleEnchantmentGroups.php
new file mode 100644
index 0000000000..74574562c5
--- /dev/null
+++ b/src/item/enchantment/IncompatibleEnchantmentGroups.php
@@ -0,0 +1,34 @@
+<?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\item\enchantment;
+
+/**
+ * Constants for groupings of incompatible enchantments.
+ * Enchantments belonging to the same incompatibility group cannot be applied side-by-side on the same item.
+ */
+final class IncompatibleEnchantmentGroups{
+	public const PROTECTION = "protection";
+	public const BOW_INFINITE = "bow_infinite";
+	public const BLOCK_DROPS = "block_drops";
+}
diff --git a/src/item/enchantment/IncompatibleEnchantmentRegistry.php b/src/item/enchantment/IncompatibleEnchantmentRegistry.php
new file mode 100644
index 0000000000..629a159709
--- /dev/null
+++ b/src/item/enchantment/IncompatibleEnchantmentRegistry.php
@@ -0,0 +1,94 @@
+<?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\item\enchantment;
+
+use pocketmine\item\enchantment\IncompatibleEnchantmentGroups as Groups;
+use pocketmine\item\enchantment\VanillaEnchantments as Enchantments;
+use pocketmine\utils\SingletonTrait;
+use function array_intersect_key;
+use function count;
+use function spl_object_id;
+
+/**
+ * Manages which enchantments are incompatible with each other.
+ * Enchantments can be added to groups to make them incompatible with all other enchantments already in that group.
+ */
+final class IncompatibleEnchantmentRegistry{
+	use SingletonTrait;
+
+	/**
+	 * @phpstan-var array<int, array<string, true>>
+	 * @var true[][]
+	 */
+	private array $incompatibilityMap = [];
+
+	private function __construct(){
+		$this->register(Groups::PROTECTION, [Enchantments::PROTECTION(), Enchantments::FIRE_PROTECTION(), Enchantments::BLAST_PROTECTION(), Enchantments::PROJECTILE_PROTECTION()]);
+		$this->register(Groups::BOW_INFINITE, [Enchantments::INFINITY(), Enchantments::MENDING()]);
+		$this->register(Groups::BLOCK_DROPS, [Enchantments::FORTUNE(), Enchantments::SILK_TOUCH()]);
+	}
+
+	/**
+	 * Register incompatibility for an enchantment group.
+	 *
+	 * All enchantments belonging to the same group are incompatible with each other,
+	 * i.e. they cannot be added together on the same item.
+	 *
+	 * @param Enchantment[] $enchantments
+	 */
+	public function register(string $tag, array $enchantments) : void{
+		foreach($enchantments as $enchantment){
+			$this->incompatibilityMap[spl_object_id($enchantment)][$tag] = true;
+		}
+	}
+
+	/**
+	 * Unregister incompatibility for some enchantments of a particular group.
+	 *
+	 * @param Enchantment[] $enchantments
+	 */
+	public function unregister(string $tag, array $enchantments) : void{
+		foreach($enchantments as $enchantment){
+			unset($this->incompatibilityMap[spl_object_id($enchantment)][$tag]);
+		}
+	}
+
+	/**
+	 * Unregister incompatibility for all enchantments of a particular group.
+	 */
+	public function unregisterAll(string $tag) : void{
+		foreach($this->incompatibilityMap as $id => $tags){
+			unset($this->incompatibilityMap[$id][$tag]);
+		}
+	}
+
+	/**
+	 * Returns whether two enchantments can be applied to the same item.
+	 */
+	public function areCompatible(Enchantment $first, Enchantment $second) : bool{
+		$firstIncompatibilities = $this->incompatibilityMap[spl_object_id($first)] ?? [];
+		$secondIncompatibilities = $this->incompatibilityMap[spl_object_id($second)] ?? [];
+		return count(array_intersect_key($firstIncompatibilities, $secondIncompatibilities)) === 0;
+	}
+}
diff --git a/src/item/enchantment/ItemEnchantmentTagRegistry.php b/src/item/enchantment/ItemEnchantmentTagRegistry.php
new file mode 100644
index 0000000000..210cd8e864
--- /dev/null
+++ b/src/item/enchantment/ItemEnchantmentTagRegistry.php
@@ -0,0 +1,190 @@
+<?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\item\enchantment;
+
+use pocketmine\item\enchantment\ItemEnchantmentTags as Tags;
+use pocketmine\utils\SingletonTrait;
+use pocketmine\utils\Utils;
+use function array_diff;
+use function array_intersect;
+use function array_merge;
+use function array_search;
+use function array_shift;
+use function array_unique;
+use function count;
+
+/**
+ * Manages known item enchantment tags and the relations between them.
+ * Used to determine which tags belong to which other tags, and to check if lists of tags intersect.
+ */
+final class ItemEnchantmentTagRegistry{
+	use SingletonTrait;
+
+	/**
+	 * @phpstan-var array<string, list<string>>
+	 * @var string[][]
+	 */
+	private array $tagMap = [];
+
+	private function __construct(){
+		$this->register(Tags::ARMOR, [Tags::HELMET, Tags::CHESTPLATE, Tags::LEGGINGS, Tags::BOOTS]);
+		$this->register(Tags::SHIELD);
+		$this->register(Tags::SWORD);
+		$this->register(Tags::TRIDENT);
+		$this->register(Tags::BOW);
+		$this->register(Tags::CROSSBOW);
+		$this->register(Tags::SHEARS);
+		$this->register(Tags::FLINT_AND_STEEL);
+		$this->register(Tags::BLOCK_TOOLS, [Tags::AXE, Tags::PICKAXE, Tags::SHOVEL, Tags::HOE]);
+		$this->register(Tags::FISHING_ROD);
+		$this->register(Tags::CARROT_ON_STICK);
+		$this->register(Tags::COMPASS);
+		$this->register(Tags::MASK);
+		$this->register(Tags::ELYTRA);
+		$this->register(Tags::BRUSH);
+		$this->register(Tags::WEAPONS, [
+			Tags::SWORD,
+			Tags::TRIDENT,
+			Tags::BOW,
+			Tags::CROSSBOW,
+			Tags::BLOCK_TOOLS,
+		]);
+	}
+
+	/**
+	 * Register tag and its nested tags.
+	 *
+	 * @param string[] $nestedTags
+	 */
+	public function register(string $tag, array $nestedTags = []) : void{
+		$this->assertNotInternalTag($tag);
+
+		foreach($nestedTags as $nestedTag){
+			if(!isset($this->tagMap[$nestedTag])){
+				$this->register($nestedTag);
+			}
+			$this->tagMap[$tag][] = $nestedTag;
+		}
+
+		if(!isset($this->tagMap[$tag])){
+			$this->tagMap[$tag] = [];
+			$this->tagMap[Tags::ALL][] = $tag;
+		}
+	}
+
+	public function unregister(string $tag) : void{
+		if(!isset($this->tagMap[$tag])){
+			return;
+		}
+		$this->assertNotInternalTag($tag);
+
+		unset($this->tagMap[$tag]);
+
+		foreach(Utils::stringifyKeys($this->tagMap) as $key => $nestedTags){
+			if(($nestedKey = array_search($tag, $nestedTags, true)) !== false){
+				unset($this->tagMap[$key][$nestedKey]);
+			}
+		}
+	}
+
+	/**
+	 * Remove specified nested tags.
+	 *
+	 * @param string[] $nestedTags
+	 */
+	public function removeNested(string $tag, array $nestedTags) : void{
+		$this->assertNotInternalTag($tag);
+		$this->tagMap[$tag] = array_diff($this->tagMap[$tag], $nestedTags);
+	}
+
+	/**
+	 * Returns nested tags of a particular tag.
+	 *
+	 * @return string[]
+	 */
+	public function getNested(string $tag) : array{
+		return $this->tagMap[$tag] ?? [];
+	}
+
+	/**
+	 * @param string[] $firstTags
+	 * @param string[] $secondTags
+	 */
+	public function isTagArrayIntersection(array $firstTags, array $secondTags) : bool{
+		if(count($firstTags) === 0 || count($secondTags) === 0){
+			return false;
+		}
+
+		$firstLeafTags = $this->getLeafTagsForArray($firstTags);
+		$secondLeafTags = $this->getLeafTagsForArray($secondTags);
+
+		return count(array_intersect($firstLeafTags, $secondLeafTags)) !== 0;
+	}
+
+	/**
+	 * Returns all tags that are recursively nested within each tag in the array and do not have any nested tags.
+	 *
+	 * @param string[] $tags
+	 *
+	 * @return string[]
+	 */
+	private function getLeafTagsForArray(array $tags) : array{
+		$leafTagArrays = [];
+		foreach($tags as $tag){
+			$leafTagArrays[] = $this->getLeafTags($tag);
+		}
+		return array_unique(array_merge(...$leafTagArrays));
+	}
+
+	/**
+	 * Returns all tags that are recursively nested within the given tag and do not have any nested tags.
+	 *
+	 * @return string[]
+	 */
+	private function getLeafTags(string $tag) : array{
+		$result = [];
+		$tagsToHandle = [$tag];
+
+		while(count($tagsToHandle) !== 0){
+			$currentTag = array_shift($tagsToHandle);
+			$nestedTags = $this->getNested($currentTag);
+
+			if(count($nestedTags) === 0){
+				$result[] = $currentTag;
+			}else{
+				$tagsToHandle = array_merge($tagsToHandle, $nestedTags);
+			}
+		}
+
+		return $result;
+	}
+
+	private function assertNotInternalTag(string $tag) : void{
+		if($tag === Tags::ALL){
+			throw new \InvalidArgumentException(
+				"Cannot perform any operations on the internal item enchantment tag '$tag'"
+			);
+		}
+	}
+}
diff --git a/src/item/enchantment/ItemEnchantmentTags.php b/src/item/enchantment/ItemEnchantmentTags.php
new file mode 100644
index 0000000000..50abf8db3b
--- /dev/null
+++ b/src/item/enchantment/ItemEnchantmentTags.php
@@ -0,0 +1,57 @@
+<?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\item\enchantment;
+
+/**
+ * Tags used by items and enchantments to determine which enchantments can be applied to which items.
+ * Some tags may contain other tags.
+ * @see ItemEnchantmentTagRegistry
+ */
+final class ItemEnchantmentTags{
+	public const ALL = "all";
+	public const ARMOR = "armor";
+	public const HELMET = "helmet";
+	public const CHESTPLATE = "chestplate";
+	public const LEGGINGS = "leggings";
+	public const BOOTS = "boots";
+	public const SHIELD = "shield";
+	public const SWORD = "sword";
+	public const TRIDENT = "trident";
+	public const BOW = "bow";
+	public const CROSSBOW = "crossbow";
+	public const SHEARS = "shears";
+	public const FLINT_AND_STEEL = "flint_and_steel";
+	public const BLOCK_TOOLS = "block_tools";
+	public const AXE = "axe";
+	public const PICKAXE = "pickaxe";
+	public const SHOVEL = "shovel";
+	public const HOE = "hoe";
+	public const FISHING_ROD = "fishing_rod";
+	public const CARROT_ON_STICK = "carrot_on_stick";
+	public const COMPASS = "compass";
+	public const MASK = "mask";
+	public const ELYTRA = "elytra";
+	public const BRUSH = "brush";
+	public const WEAPONS = "weapons";
+}
diff --git a/src/item/enchantment/ItemFlags.php b/src/item/enchantment/ItemFlags.php
index 409c878ff3..5e4ad4d7d8 100644
--- a/src/item/enchantment/ItemFlags.php
+++ b/src/item/enchantment/ItemFlags.php
@@ -23,14 +23,13 @@ declare(strict_types=1);
 
 namespace pocketmine\item\enchantment;
 
+/** @deprecated */
 final class ItemFlags{
 
 	private function __construct(){
 		//NOOP
 	}
 
-	//TODO: this should probably move to protocol
-
 	public const NONE = 0x0;
 	public const ALL = 0xffff;
 	public const ARMOR = self::HEAD | self::TORSO | self::LEGS | self::FEET;
diff --git a/src/item/enchantment/ProtectionEnchantment.php b/src/item/enchantment/ProtectionEnchantment.php
index 4a24fe07eb..be78a23065 100644
--- a/src/item/enchantment/ProtectionEnchantment.php
+++ b/src/item/enchantment/ProtectionEnchantment.php
@@ -29,18 +29,22 @@ use function array_flip;
 use function floor;
 
 class ProtectionEnchantment extends Enchantment{
-	/** @var float */
-	protected $typeModifier;
+	protected float $typeModifier;
 	/** @var int[]|null */
-	protected $applicableDamageTypes = null;
+	protected ?array $applicableDamageTypes = null;
 
 	/**
 	 * ProtectionEnchantment constructor.
 	 *
+	 * @phpstan-param null|(\Closure(int $level) : int) $minEnchantingPower
+	 *
+	 * @param int        $primaryItemFlags      @deprecated
+	 * @param int        $secondaryItemFlags    @deprecated
 	 * @param int[]|null $applicableDamageTypes EntityDamageEvent::CAUSE_* constants which this enchantment type applies to, or null if it applies to all types of damage.
+	 * @param int        $enchantingPowerRange  Value used to calculate the maximum enchanting power (minEnchantingPower + enchantingPowerRange)
 	 */
-	public function __construct(Translatable|string $name, int $rarity, int $primaryItemFlags, int $secondaryItemFlags, int $maxLevel, float $typeModifier, ?array $applicableDamageTypes){
-		parent::__construct($name, $rarity, $primaryItemFlags, $secondaryItemFlags, $maxLevel);
+	public function __construct(Translatable|string $name, int $rarity, int $primaryItemFlags, int $secondaryItemFlags, int $maxLevel, float $typeModifier, ?array $applicableDamageTypes, ?\Closure $minEnchantingPower = null, int $enchantingPowerRange = 50){
+		parent::__construct($name, $rarity, $primaryItemFlags, $secondaryItemFlags, $maxLevel, $minEnchantingPower, $enchantingPowerRange);
 
 		$this->typeModifier = $typeModifier;
 		if($applicableDamageTypes !== null){
diff --git a/src/item/enchantment/StringToEnchantmentParser.php b/src/item/enchantment/StringToEnchantmentParser.php
index e76e716424..47a750ff27 100644
--- a/src/item/enchantment/StringToEnchantmentParser.php
+++ b/src/item/enchantment/StringToEnchantmentParser.php
@@ -43,6 +43,7 @@ final class StringToEnchantmentParser extends StringToTParser{
 		$result->register("fire_aspect", fn() => VanillaEnchantments::FIRE_ASPECT());
 		$result->register("fire_protection", fn() => VanillaEnchantments::FIRE_PROTECTION());
 		$result->register("flame", fn() => VanillaEnchantments::FLAME());
+		$result->register("fortune", fn() => VanillaEnchantments::FORTUNE());
 		$result->register("infinity", fn() => VanillaEnchantments::INFINITY());
 		$result->register("knockback", fn() => VanillaEnchantments::KNOCKBACK());
 		$result->register("mending", fn() => VanillaEnchantments::MENDING());
@@ -51,6 +52,7 @@ final class StringToEnchantmentParser extends StringToTParser{
 		$result->register("protection", fn() => VanillaEnchantments::PROTECTION());
 		$result->register("punch", fn() => VanillaEnchantments::PUNCH());
 		$result->register("respiration", fn() => VanillaEnchantments::RESPIRATION());
+		$result->register("aqua_affinity", fn() => VanillaEnchantments::AQUA_AFFINITY());
 		$result->register("sharpness", fn() => VanillaEnchantments::SHARPNESS());
 		$result->register("silk_touch", fn() => VanillaEnchantments::SILK_TOUCH());
 		$result->register("swift_sneak", fn() => VanillaEnchantments::SWIFT_SNEAK());
diff --git a/src/item/enchantment/VanillaEnchantments.php b/src/item/enchantment/VanillaEnchantments.php
index 2be5eed71e..19ce397163 100644
--- a/src/item/enchantment/VanillaEnchantments.php
+++ b/src/item/enchantment/VanillaEnchantments.php
@@ -33,12 +33,14 @@ use pocketmine\utils\RegistryTrait;
  * @see build/generate-registry-annotations.php
  * @generate-registry-docblock
  *
+ * @method static Enchantment AQUA_AFFINITY()
  * @method static ProtectionEnchantment BLAST_PROTECTION()
  * @method static Enchantment EFFICIENCY()
  * @method static ProtectionEnchantment FEATHER_FALLING()
  * @method static FireAspectEnchantment FIRE_ASPECT()
  * @method static ProtectionEnchantment FIRE_PROTECTION()
  * @method static Enchantment FLAME()
+ * @method static Enchantment FORTUNE()
  * @method static Enchantment INFINITY()
  * @method static KnockbackEnchantment KNOCKBACK()
  * @method static Enchantment MENDING()
@@ -58,46 +60,233 @@ final class VanillaEnchantments{
 	use RegistryTrait;
 
 	protected static function setup() : void{
-		self::register("PROTECTION", new ProtectionEnchantment(KnownTranslationFactory::enchantment_protect_all(), Rarity::COMMON, ItemFlags::ARMOR, ItemFlags::NONE, 4, 0.75, null));
-		self::register("FIRE_PROTECTION", new ProtectionEnchantment(KnownTranslationFactory::enchantment_protect_fire(), Rarity::UNCOMMON, ItemFlags::ARMOR, ItemFlags::NONE, 4, 1.25, [
-			EntityDamageEvent::CAUSE_FIRE,
-			EntityDamageEvent::CAUSE_FIRE_TICK,
-			EntityDamageEvent::CAUSE_LAVA
-			//TODO: check fireballs
-		]));
-		self::register("FEATHER_FALLING", new ProtectionEnchantment(KnownTranslationFactory::enchantment_protect_fall(), Rarity::UNCOMMON, ItemFlags::FEET, ItemFlags::NONE, 4, 2.5, [
-			EntityDamageEvent::CAUSE_FALL
-		]));
-		self::register("BLAST_PROTECTION", new ProtectionEnchantment(KnownTranslationFactory::enchantment_protect_explosion(), Rarity::RARE, ItemFlags::ARMOR, ItemFlags::NONE, 4, 1.5, [
-			EntityDamageEvent::CAUSE_BLOCK_EXPLOSION,
-			EntityDamageEvent::CAUSE_ENTITY_EXPLOSION
-		]));
-		self::register("PROJECTILE_PROTECTION", new ProtectionEnchantment(KnownTranslationFactory::enchantment_protect_projectile(), Rarity::UNCOMMON, ItemFlags::ARMOR, ItemFlags::NONE, 4, 1.5, [
-			EntityDamageEvent::CAUSE_PROJECTILE
-		]));
-		self::register("THORNS", new Enchantment(KnownTranslationFactory::enchantment_thorns(), Rarity::MYTHIC, ItemFlags::TORSO, ItemFlags::HEAD | ItemFlags::LEGS | ItemFlags::FEET, 3));
-		self::register("RESPIRATION", new Enchantment(KnownTranslationFactory::enchantment_oxygen(), Rarity::RARE, ItemFlags::HEAD, ItemFlags::NONE, 3));
+		self::register("PROTECTION", new ProtectionEnchantment(
+			KnownTranslationFactory::enchantment_protect_all(),
+			Rarity::COMMON,
+			0,
+			0,
+			4,
+			0.75,
+			null,
+			fn(int $level) : int => 11 * ($level - 1) + 1,
+			20
+		));
+		self::register("FIRE_PROTECTION", new ProtectionEnchantment(
+			KnownTranslationFactory::enchantment_protect_fire(),
+			Rarity::UNCOMMON,
+			0,
+			0,
+			4,
+			1.25,
+			[
+				EntityDamageEvent::CAUSE_FIRE,
+				EntityDamageEvent::CAUSE_FIRE_TICK,
+				EntityDamageEvent::CAUSE_LAVA
+				//TODO: check fireballs
+			],
+			fn(int $level) : int => 8 * ($level - 1) + 10,
+			12
+		));
+		self::register("FEATHER_FALLING", new ProtectionEnchantment(
+			KnownTranslationFactory::enchantment_protect_fall(),
+			Rarity::UNCOMMON,
+			0,
+			0,
+			4,
+			2.5,
+			[
+				EntityDamageEvent::CAUSE_FALL
+			],
+			fn(int $level) : int => 6 * ($level - 1) + 5,
+			10
+		));
+		self::register("BLAST_PROTECTION", new ProtectionEnchantment(
+			KnownTranslationFactory::enchantment_protect_explosion(),
+			Rarity::RARE,
+			0,
+			0,
+			4,
+			1.5,
+			[
+				EntityDamageEvent::CAUSE_BLOCK_EXPLOSION,
+				EntityDamageEvent::CAUSE_ENTITY_EXPLOSION
+			],
+			fn(int $level) : int => 8 * ($level - 1) + 5,
+			12
+		));
+		self::register("PROJECTILE_PROTECTION", new ProtectionEnchantment(
+			KnownTranslationFactory::enchantment_protect_projectile(),
+			Rarity::UNCOMMON,
+			0,
+			0,
+			4,
+			1.5,
+			[
+				EntityDamageEvent::CAUSE_PROJECTILE
+			],
+			fn(int $level) : int => 6 * ($level - 1) + 3,
+			15
+		));
+		self::register("THORNS", new Enchantment(
+			KnownTranslationFactory::enchantment_thorns(),
+			Rarity::MYTHIC,
+			0,
+			0,
+			3,
+			fn(int $level) : int => 20 * ($level - 1) + 10,
+			50
+		));
+		self::register("RESPIRATION", new Enchantment(
+			KnownTranslationFactory::enchantment_oxygen(),
+			Rarity::RARE,
+			0,
+			0,
+			3,
+			fn(int $level) : int => 10 * $level,
+			30
+		));
+		self::register("AQUA_AFFINITY", new Enchantment(
+			KnownTranslationFactory::enchantment_waterWorker(),
+			Rarity::RARE,
+			0,
+			0,
+			1,
+			null,
+			40
+		));
 
-		self::register("SHARPNESS", new SharpnessEnchantment(KnownTranslationFactory::enchantment_damage_all(), Rarity::COMMON, ItemFlags::SWORD, ItemFlags::AXE, 5));
-		//TODO: smite, bane of arthropods (these don't make sense now because their applicable mobs don't exist yet)
+		self::register("SHARPNESS", new SharpnessEnchantment(
+			KnownTranslationFactory::enchantment_damage_all(),
+			Rarity::COMMON,
+			0,
+			0,
+			5,
+			fn(int $level) : int => 11 * ($level - 1) + 1,
+			20
+		));
+		self::register("KNOCKBACK", new KnockbackEnchantment(
+			KnownTranslationFactory::enchantment_knockback(),
+			Rarity::UNCOMMON,
+			0,
+			0,
+			2,
+			fn(int $level) : int => 20 * ($level - 1) + 5,
+			50
+		));
+		self::register("FIRE_ASPECT", new FireAspectEnchantment(
+			KnownTranslationFactory::enchantment_fire(),
+			Rarity::RARE,
+			0,
+			0,
+			2,
+			fn(int $level) : int => 20 * ($level - 1) + 10,
+			50
+		));
+		//TODO: smite, bane of arthropods, looting (these don't make sense now because their applicable mobs don't exist yet)
 
-		self::register("KNOCKBACK", new KnockbackEnchantment(KnownTranslationFactory::enchantment_knockback(), Rarity::UNCOMMON, ItemFlags::SWORD, ItemFlags::NONE, 2));
-		self::register("FIRE_ASPECT", new FireAspectEnchantment(KnownTranslationFactory::enchantment_fire(), Rarity::RARE, ItemFlags::SWORD, ItemFlags::NONE, 2));
+		self::register("EFFICIENCY", new Enchantment(
+			KnownTranslationFactory::enchantment_digging(),
+			Rarity::COMMON,
+			0,
+			0,
+			5,
+			fn(int $level) : int => 10 * ($level - 1) + 1,
+			50
+		));
+		self::register("FORTUNE", new Enchantment(
+			KnownTranslationFactory::enchantment_lootBonusDigger(),
+			Rarity::RARE,
+			0,
+			0,
+			3,
+			fn(int $level) : int => 9 * ($level - 1) + 15,
+			50
+		));
+		self::register("SILK_TOUCH", new Enchantment(
+			KnownTranslationFactory::enchantment_untouching(),
+			Rarity::MYTHIC,
+			0,
+			0,
+			1,
+			fn(int $level) : int => 15,
+			50
+		));
+		self::register("UNBREAKING", new Enchantment(
+			KnownTranslationFactory::enchantment_durability(),
+			Rarity::UNCOMMON,
+			0,
+			0,
+			3,
+			fn(int $level) : int => 8 * ($level - 1) + 5,
+			50
+		));
 
-		self::register("EFFICIENCY", new Enchantment(KnownTranslationFactory::enchantment_digging(), Rarity::COMMON, ItemFlags::DIG, ItemFlags::SHEARS, 5));
-		self::register("SILK_TOUCH", new Enchantment(KnownTranslationFactory::enchantment_untouching(), Rarity::MYTHIC, ItemFlags::DIG, ItemFlags::SHEARS, 1));
-		self::register("UNBREAKING", new Enchantment(KnownTranslationFactory::enchantment_durability(), Rarity::UNCOMMON, ItemFlags::DIG | ItemFlags::ARMOR | ItemFlags::FISHING_ROD | ItemFlags::BOW, ItemFlags::TOOL | ItemFlags::CARROT_STICK | ItemFlags::ELYTRA, 3));
+		self::register("POWER", new Enchantment(
+			KnownTranslationFactory::enchantment_arrowDamage(),
+			Rarity::COMMON,
+			0,
+			0,
+			5,
+			fn(int $level) : int => 10 * ($level - 1) + 1,
+			15
+		));
+		self::register("PUNCH", new Enchantment(
+			KnownTranslationFactory::enchantment_arrowKnockback(),
+			Rarity::RARE,
+			0,
+			0,
+			2,
+			fn(int $level) : int => 20 * ($level - 1) + 12,
+			25
+		));
+		self::register("FLAME", new Enchantment(
+			KnownTranslationFactory::enchantment_arrowFire(),
+			Rarity::RARE,
+			0,
+			0,
+			1,
+			fn(int $level) : int => 20,
+			30
+		));
+		self::register("INFINITY", new Enchantment(
+			KnownTranslationFactory::enchantment_arrowInfinite(),
+			Rarity::MYTHIC,
+			0,
+			0,
+			1,
+			fn(int $level) : int => 20,
+			30
+		));
 
-		self::register("POWER", new Enchantment(KnownTranslationFactory::enchantment_arrowDamage(), Rarity::COMMON, ItemFlags::BOW, ItemFlags::NONE, 5));
-		self::register("PUNCH", new Enchantment(KnownTranslationFactory::enchantment_arrowKnockback(), Rarity::RARE, ItemFlags::BOW, ItemFlags::NONE, 2));
-		self::register("FLAME", new Enchantment(KnownTranslationFactory::enchantment_arrowFire(), Rarity::RARE, ItemFlags::BOW, ItemFlags::NONE, 1));
-		self::register("INFINITY", new Enchantment(KnownTranslationFactory::enchantment_arrowInfinite(), Rarity::MYTHIC, ItemFlags::BOW, ItemFlags::NONE, 1));
+		self::register("MENDING", new Enchantment(
+			KnownTranslationFactory::enchantment_mending(),
+			Rarity::RARE,
+			0,
+			0,
+			1,
+			fn(int $level) : int => 25,
+			50
+		));
 
-		self::register("MENDING", new Enchantment(KnownTranslationFactory::enchantment_mending(), Rarity::RARE, ItemFlags::NONE, ItemFlags::ALL, 1));
+		self::register("VANISHING", new Enchantment(
+			KnownTranslationFactory::enchantment_curse_vanishing(),
+			Rarity::MYTHIC,
+			0,
+			0,
+			1,
+			fn(int $level) : int => 25,
+			25
+		));
 
-		self::register("VANISHING", new Enchantment(KnownTranslationFactory::enchantment_curse_vanishing(), Rarity::MYTHIC, ItemFlags::NONE, ItemFlags::ALL, 1));
-
-		self::register("SWIFT_SNEAK", new Enchantment(KnownTranslationFactory::enchantment_swift_sneak(), Rarity::MYTHIC, ItemFlags::NONE, ItemFlags::LEGS, 3));
+		self::register("SWIFT_SNEAK", new Enchantment(
+			KnownTranslationFactory::enchantment_swift_sneak(),
+			Rarity::MYTHIC,
+			0,
+			0,
+			3,
+			fn(int $level) : int => 10 * $level,
+			5
+		));
 	}
 
 	protected static function register(string $name, Enchantment $member) : void{
diff --git a/src/lang/KnownTranslationFactory.php b/src/lang/KnownTranslationFactory.php
index c114ae5dea..8153a80d6d 100644
--- a/src/lang/KnownTranslationFactory.php
+++ b/src/lang/KnownTranslationFactory.php
@@ -603,6 +603,31 @@ final class KnownTranslationFactory{
 		return new Translatable(KnownTranslationKeys::COMMANDS_WHITELIST_USAGE, []);
 	}
 
+	public static function commands_xp_failure_widthdrawXp() : Translatable{
+		return new Translatable(KnownTranslationKeys::COMMANDS_XP_FAILURE_WIDTHDRAWXP, []);
+	}
+
+	public static function commands_xp_success(Translatable|string $param0, Translatable|string $param1) : Translatable{
+		return new Translatable(KnownTranslationKeys::COMMANDS_XP_SUCCESS, [
+			0 => $param0,
+			1 => $param1,
+		]);
+	}
+
+	public static function commands_xp_success_levels(Translatable|string $param0, Translatable|string $param1) : Translatable{
+		return new Translatable(KnownTranslationKeys::COMMANDS_XP_SUCCESS_LEVELS, [
+			0 => $param0,
+			1 => $param1,
+		]);
+	}
+
+	public static function commands_xp_success_negative_levels(Translatable|string $param0, Translatable|string $param1) : Translatable{
+		return new Translatable(KnownTranslationKeys::COMMANDS_XP_SUCCESS_NEGATIVE_LEVELS, [
+			0 => $param0,
+			1 => $param1,
+		]);
+	}
+
 	public static function death_attack_anvil(Translatable|string $param0) : Translatable{
 		return new Translatable(KnownTranslationKeys::DEATH_ATTACK_ANVIL, [
 			0 => $param0,
@@ -667,6 +692,12 @@ final class KnownTranslationFactory{
 		]);
 	}
 
+	public static function death_attack_flyIntoWall(Translatable|string $param0) : Translatable{
+		return new Translatable(KnownTranslationKeys::DEATH_ATTACK_FLYINTOWALL, [
+			0 => $param0,
+		]);
+	}
+
 	public static function death_attack_generic(Translatable|string $param0) : Translatable{
 		return new Translatable(KnownTranslationKeys::DEATH_ATTACK_GENERIC, [
 			0 => $param0,
@@ -1025,6 +1056,14 @@ final class KnownTranslationFactory{
 		return new Translatable(KnownTranslationKeys::ITEM_RECORD_CHIRP_DESC, []);
 	}
 
+	public static function item_record_creator_desc() : Translatable{
+		return new Translatable(KnownTranslationKeys::ITEM_RECORD_CREATOR_DESC, []);
+	}
+
+	public static function item_record_creator_music_box_desc() : Translatable{
+		return new Translatable(KnownTranslationKeys::ITEM_RECORD_CREATOR_MUSIC_BOX_DESC, []);
+	}
+
 	public static function item_record_far_desc() : Translatable{
 		return new Translatable(KnownTranslationKeys::ITEM_RECORD_FAR_DESC, []);
 	}
@@ -1045,6 +1084,14 @@ final class KnownTranslationFactory{
 		return new Translatable(KnownTranslationKeys::ITEM_RECORD_PIGSTEP_DESC, []);
 	}
 
+	public static function item_record_precipice_desc() : Translatable{
+		return new Translatable(KnownTranslationKeys::ITEM_RECORD_PRECIPICE_DESC, []);
+	}
+
+	public static function item_record_relic_desc() : Translatable{
+		return new Translatable(KnownTranslationKeys::ITEM_RECORD_RELIC_DESC, []);
+	}
+
 	public static function item_record_stal_desc() : Translatable{
 		return new Translatable(KnownTranslationKeys::ITEM_RECORD_STAL_DESC, []);
 	}
@@ -1536,6 +1583,14 @@ final class KnownTranslationFactory{
 		return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_WHITELIST_DESCRIPTION, []);
 	}
 
+	public static function pocketmine_command_xp_description() : Translatable{
+		return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_XP_DESCRIPTION, []);
+	}
+
+	public static function pocketmine_command_xp_usage() : Translatable{
+		return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_XP_USAGE, []);
+	}
+
 	public static function pocketmine_crash_archive(Translatable|string $param0, Translatable|string $param1) : Translatable{
 		return new Translatable(KnownTranslationKeys::POCKETMINE_CRASH_ARCHIVE, [
 			0 => $param0,
@@ -1606,6 +1661,14 @@ final class KnownTranslationFactory{
 		return new Translatable(KnownTranslationKeys::POCKETMINE_DISCONNECT_BAN_NOREASON, []);
 	}
 
+	public static function pocketmine_disconnect_clientDisconnect() : Translatable{
+		return new Translatable(KnownTranslationKeys::POCKETMINE_DISCONNECT_CLIENTDISCONNECT, []);
+	}
+
+	public static function pocketmine_disconnect_clientReconnect() : Translatable{
+		return new Translatable(KnownTranslationKeys::POCKETMINE_DISCONNECT_CLIENTRECONNECT, []);
+	}
+
 	public static function pocketmine_disconnect_error(Translatable|string $error, Translatable|string $errorId) : Translatable{
 		return new Translatable(KnownTranslationKeys::POCKETMINE_DISCONNECT_ERROR, [
 			"error" => $error,
@@ -1629,6 +1692,14 @@ final class KnownTranslationFactory{
 		return new Translatable(KnownTranslationKeys::POCKETMINE_DISCONNECT_ERROR_LOGINTIMEOUT, []);
 	}
 
+	public static function pocketmine_disconnect_error_respawn() : Translatable{
+		return new Translatable(KnownTranslationKeys::POCKETMINE_DISCONNECT_ERROR_RESPAWN, []);
+	}
+
+	public static function pocketmine_disconnect_error_timeout() : Translatable{
+		return new Translatable(KnownTranslationKeys::POCKETMINE_DISCONNECT_ERROR_TIMEOUT, []);
+	}
+
 	public static function pocketmine_disconnect_incompatibleProtocol(Translatable|string $param0) : Translatable{
 		return new Translatable(KnownTranslationKeys::POCKETMINE_DISCONNECT_INCOMPATIBLEPROTOCOL, [
 			0 => $param0,
@@ -2040,6 +2111,14 @@ final class KnownTranslationFactory{
 		return new Translatable(KnownTranslationKeys::POCKETMINE_PERMISSION_COMMAND_WHITELIST_REMOVE, []);
 	}
 
+	public static function pocketmine_permission_command_xp_other() : Translatable{
+		return new Translatable(KnownTranslationKeys::POCKETMINE_PERMISSION_COMMAND_XP_OTHER, []);
+	}
+
+	public static function pocketmine_permission_command_xp_self() : Translatable{
+		return new Translatable(KnownTranslationKeys::POCKETMINE_PERMISSION_COMMAND_XP_SELF, []);
+	}
+
 	public static function pocketmine_permission_group_console() : Translatable{
 		return new Translatable(KnownTranslationKeys::POCKETMINE_PERMISSION_GROUP_CONSOLE, []);
 	}
diff --git a/src/lang/KnownTranslationKeys.php b/src/lang/KnownTranslationKeys.php
index 0dd623f602..4805d0c568 100644
--- a/src/lang/KnownTranslationKeys.php
+++ b/src/lang/KnownTranslationKeys.php
@@ -137,6 +137,10 @@ final class KnownTranslationKeys{
 	public const COMMANDS_WHITELIST_REMOVE_SUCCESS = "commands.whitelist.remove.success";
 	public const COMMANDS_WHITELIST_REMOVE_USAGE = "commands.whitelist.remove.usage";
 	public const COMMANDS_WHITELIST_USAGE = "commands.whitelist.usage";
+	public const COMMANDS_XP_FAILURE_WIDTHDRAWXP = "commands.xp.failure.widthdrawXp";
+	public const COMMANDS_XP_SUCCESS = "commands.xp.success";
+	public const COMMANDS_XP_SUCCESS_LEVELS = "commands.xp.success.levels";
+	public const COMMANDS_XP_SUCCESS_NEGATIVE_LEVELS = "commands.xp.success.negative.levels";
 	public const DEATH_ATTACK_ANVIL = "death.attack.anvil";
 	public const DEATH_ATTACK_ARROW = "death.attack.arrow";
 	public const DEATH_ATTACK_ARROW_ITEM = "death.attack.arrow.item";
@@ -147,6 +151,7 @@ final class KnownTranslationKeys{
 	public const DEATH_ATTACK_FALL = "death.attack.fall";
 	public const DEATH_ATTACK_FALLINGBLOCK = "death.attack.fallingBlock";
 	public const DEATH_ATTACK_FIREWORKS = "death.attack.fireworks";
+	public const DEATH_ATTACK_FLYINTOWALL = "death.attack.flyIntoWall";
 	public const DEATH_ATTACK_GENERIC = "death.attack.generic";
 	public const DEATH_ATTACK_INFIRE = "death.attack.inFire";
 	public const DEATH_ATTACK_INWALL = "death.attack.inWall";
@@ -227,11 +232,15 @@ final class KnownTranslationKeys{
 	public const ITEM_RECORD_BLOCKS_DESC = "item.record_blocks.desc";
 	public const ITEM_RECORD_CAT_DESC = "item.record_cat.desc";
 	public const ITEM_RECORD_CHIRP_DESC = "item.record_chirp.desc";
+	public const ITEM_RECORD_CREATOR_DESC = "item.record_creator.desc";
+	public const ITEM_RECORD_CREATOR_MUSIC_BOX_DESC = "item.record_creator_music_box.desc";
 	public const ITEM_RECORD_FAR_DESC = "item.record_far.desc";
 	public const ITEM_RECORD_MALL_DESC = "item.record_mall.desc";
 	public const ITEM_RECORD_MELLOHI_DESC = "item.record_mellohi.desc";
 	public const ITEM_RECORD_OTHERSIDE_DESC = "item.record_otherside.desc";
 	public const ITEM_RECORD_PIGSTEP_DESC = "item.record_pigstep.desc";
+	public const ITEM_RECORD_PRECIPICE_DESC = "item.record_precipice.desc";
+	public const ITEM_RECORD_RELIC_DESC = "item.record_relic.desc";
 	public const ITEM_RECORD_STAL_DESC = "item.record_stal.desc";
 	public const ITEM_RECORD_STRAD_DESC = "item.record_strad.desc";
 	public const ITEM_RECORD_WAIT_DESC = "item.record_wait.desc";
@@ -336,6 +345,8 @@ final class KnownTranslationKeys{
 	public const POCKETMINE_COMMAND_VERSION_SERVERSOFTWAREVERSION = "pocketmine.command.version.serverSoftwareVersion";
 	public const POCKETMINE_COMMAND_VERSION_USAGE = "pocketmine.command.version.usage";
 	public const POCKETMINE_COMMAND_WHITELIST_DESCRIPTION = "pocketmine.command.whitelist.description";
+	public const POCKETMINE_COMMAND_XP_DESCRIPTION = "pocketmine.command.xp.description";
+	public const POCKETMINE_COMMAND_XP_USAGE = "pocketmine.command.xp.usage";
 	public const POCKETMINE_CRASH_ARCHIVE = "pocketmine.crash.archive";
 	public const POCKETMINE_CRASH_CREATE = "pocketmine.crash.create";
 	public const POCKETMINE_CRASH_ERROR = "pocketmine.crash.error";
@@ -349,11 +360,15 @@ final class KnownTranslationKeys{
 	public const POCKETMINE_DISCONNECT_BAN_HARDCORE = "pocketmine.disconnect.ban.hardcore";
 	public const POCKETMINE_DISCONNECT_BAN_IP = "pocketmine.disconnect.ban.ip";
 	public const POCKETMINE_DISCONNECT_BAN_NOREASON = "pocketmine.disconnect.ban.noReason";
+	public const POCKETMINE_DISCONNECT_CLIENTDISCONNECT = "pocketmine.disconnect.clientDisconnect";
+	public const POCKETMINE_DISCONNECT_CLIENTRECONNECT = "pocketmine.disconnect.clientReconnect";
 	public const POCKETMINE_DISCONNECT_ERROR = "pocketmine.disconnect.error";
 	public const POCKETMINE_DISCONNECT_ERROR_AUTHENTICATION = "pocketmine.disconnect.error.authentication";
 	public const POCKETMINE_DISCONNECT_ERROR_BADPACKET = "pocketmine.disconnect.error.badPacket";
 	public const POCKETMINE_DISCONNECT_ERROR_INTERNAL = "pocketmine.disconnect.error.internal";
 	public const POCKETMINE_DISCONNECT_ERROR_LOGINTIMEOUT = "pocketmine.disconnect.error.loginTimeout";
+	public const POCKETMINE_DISCONNECT_ERROR_RESPAWN = "pocketmine.disconnect.error.respawn";
+	public const POCKETMINE_DISCONNECT_ERROR_TIMEOUT = "pocketmine.disconnect.error.timeout";
 	public const POCKETMINE_DISCONNECT_INCOMPATIBLEPROTOCOL = "pocketmine.disconnect.incompatibleProtocol";
 	public const POCKETMINE_DISCONNECT_INVALIDSESSION = "pocketmine.disconnect.invalidSession";
 	public const POCKETMINE_DISCONNECT_INVALIDSESSION_BADSIGNATURE = "pocketmine.disconnect.invalidSession.badSignature";
@@ -445,6 +460,8 @@ final class KnownTranslationKeys{
 	public const POCKETMINE_PERMISSION_COMMAND_WHITELIST_LIST = "pocketmine.permission.command.whitelist.list";
 	public const POCKETMINE_PERMISSION_COMMAND_WHITELIST_RELOAD = "pocketmine.permission.command.whitelist.reload";
 	public const POCKETMINE_PERMISSION_COMMAND_WHITELIST_REMOVE = "pocketmine.permission.command.whitelist.remove";
+	public const POCKETMINE_PERMISSION_COMMAND_XP_OTHER = "pocketmine.permission.command.xp.other";
+	public const POCKETMINE_PERMISSION_COMMAND_XP_SELF = "pocketmine.permission.command.xp.self";
 	public const POCKETMINE_PERMISSION_GROUP_CONSOLE = "pocketmine.permission.group.console";
 	public const POCKETMINE_PERMISSION_GROUP_OPERATOR = "pocketmine.permission.group.operator";
 	public const POCKETMINE_PERMISSION_GROUP_USER = "pocketmine.permission.group.user";
diff --git a/src/lang/Language.php b/src/lang/Language.php
index af4d6a3816..29f28917d8 100644
--- a/src/lang/Language.php
+++ b/src/lang/Language.php
@@ -88,19 +88,17 @@ class Language{
 		throw new LanguageNotFoundException("Language directory $path does not exist or is not a directory");
 	}
 
-	/** @var string */
-	protected $langName;
-
+	protected string $langName;
 	/**
 	 * @var string[]
 	 * @phpstan-var array<string, string>
 	 */
-	protected $lang = [];
+	protected array $lang = [];
 	/**
 	 * @var string[]
 	 * @phpstan-var array<string, string>
 	 */
-	protected $fallbackLang = [];
+	protected array $fallbackLang = [];
 
 	/**
 	 * @throws LanguageNotFoundException
@@ -149,7 +147,7 @@ class Language{
 			$baseText = $this->parseTranslation($str, $onlyPrefix);
 		}
 
-		foreach($params as $i => $p){
+		foreach(Utils::promoteKeys($params) as $i => $p){
 			$replacement = $p instanceof Translatable ? $this->translate($p) : (string) $p;
 			$baseText = str_replace("{%$i}", $replacement, $baseText);
 		}
@@ -163,7 +161,7 @@ class Language{
 			$baseText = $this->parseTranslation($c->getText());
 		}
 
-		foreach($c->getParameters() as $i => $p){
+		foreach(Utils::promoteKeys($c->getParameters()) as $i => $p){
 			$replacement = $p instanceof Translatable ? $this->translate($p) : $p;
 			$baseText = str_replace("{%$i}", $replacement, $baseText);
 		}
diff --git a/src/lang/Translatable.php b/src/lang/Translatable.php
index 5c5f1c048a..8dee8f4773 100644
--- a/src/lang/Translatable.php
+++ b/src/lang/Translatable.php
@@ -23,20 +23,20 @@ declare(strict_types=1);
 
 namespace pocketmine\lang;
 
-final class Translatable{
+use pocketmine\utils\Utils;
 
-	/** @var string $text */
-	protected $text;
+final class Translatable{
 	/** @var string[]|Translatable[] $params */
-	protected $params = [];
+	protected array $params = [];
 
 	/**
 	 * @param (float|int|string|Translatable)[] $params
 	 */
-	public function __construct(string $text, array $params = []){
-		$this->text = $text;
-
-		foreach($params as $k => $param){
+	public function __construct(
+		protected string $text,
+		array $params = []
+	){
+		foreach(Utils::promoteKeys($params) as $k => $param){
 			if(!($param instanceof Translatable)){
 				$this->params[$k] = (string) $param;
 			}else{
diff --git a/src/network/NetworkSessionManager.php b/src/network/NetworkSessionManager.php
index 1336b53cc8..aecbc646d9 100644
--- a/src/network/NetworkSessionManager.php
+++ b/src/network/NetworkSessionManager.php
@@ -23,16 +23,23 @@ declare(strict_types=1);
 
 namespace pocketmine\network;
 
+use pocketmine\lang\Translatable;
 use pocketmine\network\mcpe\NetworkSession;
 use function count;
 use function spl_object_id;
 
 class NetworkSessionManager{
 
-	/** @var NetworkSession[] */
+	/**
+	 * @var NetworkSession[]
+	 * @phpstan-var array<int, NetworkSession>
+	 */
 	private array $sessions = [];
 
-	/** @var NetworkSession[] */
+	/**
+	 * @var NetworkSession[]
+	 * @phpstan-var array<int, NetworkSession>
+	 */
 	private array $pendingLoginSessions = [];
 
 	/**
@@ -95,10 +102,13 @@ class NetworkSessionManager{
 
 	/**
 	 * Terminates all connected sessions with the given reason.
+	 *
+	 * @param Translatable|string      $reason                  Shown in the server log - this should be a short one-line message
+	 * @param Translatable|string|null $disconnectScreenMessage Shown on the player's disconnection screen (null will use the reason)
 	 */
-	public function close(string $reason = "") : void{
+	public function close(Translatable|string $reason = "", Translatable|string|null $disconnectScreenMessage = null) : void{
 		foreach($this->sessions as $session){
-			$session->disconnect($reason);
+			$session->disconnect($reason, $disconnectScreenMessage);
 		}
 		$this->sessions = [];
 	}
diff --git a/src/network/mcpe/ChunkRequestTask.php b/src/network/mcpe/ChunkRequestTask.php
index f666140994..13b5db5b79 100644
--- a/src/network/mcpe/ChunkRequestTask.php
+++ b/src/network/mcpe/ChunkRequestTask.php
@@ -25,65 +25,59 @@ namespace pocketmine\network\mcpe;
 
 use pocketmine\network\mcpe\compression\CompressBatchPromise;
 use pocketmine\network\mcpe\compression\Compressor;
-use pocketmine\network\mcpe\convert\GlobalItemTypeDictionary;
-use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\LevelChunkPacket;
 use pocketmine\network\mcpe\protocol\serializer\PacketBatch;
-use pocketmine\network\mcpe\protocol\serializer\PacketSerializerContext;
 use pocketmine\network\mcpe\protocol\types\ChunkPosition;
+use pocketmine\network\mcpe\protocol\types\DimensionIds;
 use pocketmine\network\mcpe\serializer\ChunkSerializer;
 use pocketmine\scheduler\AsyncTask;
+use pocketmine\thread\NonThreadSafeValue;
+use pocketmine\utils\BinaryStream;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\format\io\FastChunkSerializer;
+use function chr;
 
 class ChunkRequestTask extends AsyncTask{
 	private const TLS_KEY_PROMISE = "promise";
-	private const TLS_KEY_ERROR_HOOK = "errorHook";
-
-	/** @var string */
-	protected $chunk;
-	/** @var int */
-	protected $chunkX;
-	/** @var int */
-	protected $chunkZ;
-
-	/** @var Compressor */
-	protected $compressor;
 
+	protected string $chunk;
+	protected int $chunkX;
+	protected int $chunkZ;
+	/** @phpstan-var DimensionIds::* */
+	private int $dimensionId;
+	/** @phpstan-var NonThreadSafeValue<Compressor> */
+	protected NonThreadSafeValue $compressor;
 	private string $tiles;
 
 	/**
-	 * @phpstan-param (\Closure() : void)|null $onError
+	 * @phpstan-param DimensionIds::* $dimensionId
 	 */
-	public function __construct(int $chunkX, int $chunkZ, Chunk $chunk, CompressBatchPromise $promise, Compressor $compressor, ?\Closure $onError = null){
-		$this->compressor = $compressor;
+	public function __construct(int $chunkX, int $chunkZ, int $dimensionId, Chunk $chunk, CompressBatchPromise $promise, Compressor $compressor){
+		$this->compressor = new NonThreadSafeValue($compressor);
 
 		$this->chunk = FastChunkSerializer::serializeTerrain($chunk);
 		$this->chunkX = $chunkX;
 		$this->chunkZ = $chunkZ;
+		$this->dimensionId = $dimensionId;
 		$this->tiles = ChunkSerializer::serializeTiles($chunk);
 
 		$this->storeLocal(self::TLS_KEY_PROMISE, $promise);
-		$this->storeLocal(self::TLS_KEY_ERROR_HOOK, $onError);
 	}
 
 	public function onRun() : void{
 		$chunk = FastChunkSerializer::deserializeTerrain($this->chunk);
-		$subCount = ChunkSerializer::getSubChunkCount($chunk) + ChunkSerializer::LOWER_PADDING_SIZE;
-		$encoderContext = new PacketSerializerContext(GlobalItemTypeDictionary::getInstance()->getDictionary());
-		$payload = ChunkSerializer::serializeFullChunk($chunk, RuntimeBlockMapping::getInstance(), $encoderContext, $this->tiles);
-		$this->setResult($this->compressor->compress(PacketBatch::fromPackets($encoderContext, LevelChunkPacket::create(new ChunkPosition($this->chunkX, $this->chunkZ), $subCount, false, null, $payload))->getBuffer()));
-	}
+		$dimensionId = $this->dimensionId;
 
-	public function onError() : void{
-		/**
-		 * @var \Closure|null $hook
-		 * @phpstan-var (\Closure() : void)|null $hook
-		 */
-		$hook = $this->fetchLocal(self::TLS_KEY_ERROR_HOOK);
-		if($hook !== null){
-			$hook();
-		}
+		$subCount = ChunkSerializer::getSubChunkCount($chunk, $dimensionId);
+		$converter = TypeConverter::getInstance();
+		$payload = ChunkSerializer::serializeFullChunk($chunk, $dimensionId, $converter->getBlockTranslator(), $this->tiles);
+
+		$stream = new BinaryStream();
+		PacketBatch::encodePackets($stream, [LevelChunkPacket::create(new ChunkPosition($this->chunkX, $this->chunkZ), $dimensionId, $subCount, false, null, $payload)]);
+
+		$compressor = $this->compressor->deserialize();
+		$this->setResult(chr($compressor->getNetworkId()) . $compressor->compress($stream->getBuffer()));
 	}
 
 	public function onCompletion() : void{
diff --git a/src/network/mcpe/ComplexWindowMapEntry.php b/src/network/mcpe/ComplexInventoryMapEntry.php
similarity index 97%
rename from src/network/mcpe/ComplexWindowMapEntry.php
rename to src/network/mcpe/ComplexInventoryMapEntry.php
index c2792297b0..dfd3e999a4 100644
--- a/src/network/mcpe/ComplexWindowMapEntry.php
+++ b/src/network/mcpe/ComplexInventoryMapEntry.php
@@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe;
 
 use pocketmine\inventory\Inventory;
 
-final class ComplexWindowMapEntry{
+final class ComplexInventoryMapEntry{
 
 	/**
 	 * @var int[]
diff --git a/src/network/mcpe/EntityEventBroadcaster.php b/src/network/mcpe/EntityEventBroadcaster.php
new file mode 100644
index 0000000000..252563149c
--- /dev/null
+++ b/src/network/mcpe/EntityEventBroadcaster.php
@@ -0,0 +1,93 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\network\mcpe;
+
+use pocketmine\entity\Attribute;
+use pocketmine\entity\effect\EffectInstance;
+use pocketmine\entity\Entity;
+use pocketmine\entity\Human;
+use pocketmine\entity\Living;
+use pocketmine\network\mcpe\protocol\types\entity\MetadataProperty;
+
+/**
+ * This class allows broadcasting entity events to many viewers on the server network.
+ */
+interface EntityEventBroadcaster{
+
+	/**
+	 * @param NetworkSession[] $recipients
+	 * @param Attribute[]      $attributes
+	 */
+	public function syncAttributes(array $recipients, Living $entity, array $attributes) : void;
+
+	/**
+	 * @param NetworkSession[]   $recipients
+	 * @param MetadataProperty[] $properties
+	 *
+	 * @phpstan-param array<int, MetadataProperty> $properties
+	 */
+	public function syncActorData(array $recipients, Entity $entity, array $properties) : void;
+
+	/**
+	 * @param NetworkSession[] $recipients
+	 */
+	public function onEntityEffectAdded(array $recipients, Living $entity, EffectInstance $effect, bool $replacesOldEffect) : void;
+
+	/**
+	 * @param NetworkSession[] $recipients
+	 */
+	public function onEntityEffectRemoved(array $recipients, Living $entity, EffectInstance $effect) : void;
+
+	/**
+	 * @param NetworkSession[] $recipients
+	 */
+	public function onEntityRemoved(array $recipients, Entity $entity) : void;
+
+	/**
+	 * TODO: expand this to more than just humans
+	 *
+	 * @param NetworkSession[] $recipients
+	 */
+	public function onMobMainHandItemChange(array $recipients,Human $mob) : void;
+
+	/**
+	 * @param NetworkSession[] $recipients
+	 */
+	public function onMobOffHandItemChange(array $recipients, Human $mob) : void;
+
+	/**
+	 * @param NetworkSession[] $recipients
+	 */
+	public function onMobArmorChange(array $recipients, Living $mob) : void;
+
+	/**
+	 * @param NetworkSession[] $recipients
+	 */
+	public function onPickUpItem(array $recipients, Entity $collector, Entity $pickedUp) : void;
+
+	/**
+	 * @param NetworkSession[] $recipients
+	 */
+	public function onEmote(array $recipients, Human $from, string $emoteId) : void;
+}
diff --git a/src/network/mcpe/InventoryManager.php b/src/network/mcpe/InventoryManager.php
index fff1e10c70..7df8c734be 100644
--- a/src/network/mcpe/InventoryManager.php
+++ b/src/network/mcpe/InventoryManager.php
@@ -26,31 +26,36 @@ namespace pocketmine\network\mcpe;
 use pocketmine\block\inventory\AnvilInventory;
 use pocketmine\block\inventory\BlockInventory;
 use pocketmine\block\inventory\BrewingStandInventory;
+use pocketmine\block\inventory\CartographyTableInventory;
 use pocketmine\block\inventory\CraftingTableInventory;
 use pocketmine\block\inventory\EnchantInventory;
 use pocketmine\block\inventory\FurnaceInventory;
 use pocketmine\block\inventory\HopperInventory;
 use pocketmine\block\inventory\LoomInventory;
+use pocketmine\block\inventory\SmithingTableInventory;
 use pocketmine\block\inventory\StonecutterInventory;
 use pocketmine\crafting\FurnaceType;
-use pocketmine\inventory\CreativeInventory;
+use pocketmine\data\bedrock\EnchantmentIdMap;
 use pocketmine\inventory\Inventory;
 use pocketmine\inventory\transaction\action\SlotChangeAction;
 use pocketmine\inventory\transaction\InventoryTransaction;
-use pocketmine\item\Item;
-use pocketmine\network\mcpe\convert\TypeConversionException;
-use pocketmine\network\mcpe\convert\TypeConverter;
+use pocketmine\item\enchantment\EnchantingOption;
+use pocketmine\item\enchantment\EnchantmentInstance;
+use pocketmine\network\mcpe\cache\CreativeInventoryCache;
 use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\network\mcpe\protocol\ContainerClosePacket;
 use pocketmine\network\mcpe\protocol\ContainerOpenPacket;
 use pocketmine\network\mcpe\protocol\ContainerSetDataPacket;
-use pocketmine\network\mcpe\protocol\CreativeContentPacket;
 use pocketmine\network\mcpe\protocol\InventoryContentPacket;
 use pocketmine\network\mcpe\protocol\InventorySlotPacket;
 use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
+use pocketmine\network\mcpe\protocol\PlayerEnchantOptionsPacket;
 use pocketmine\network\mcpe\protocol\types\BlockPosition;
+use pocketmine\network\mcpe\protocol\types\Enchant;
+use pocketmine\network\mcpe\protocol\types\EnchantOption as ProtocolEnchantOption;
 use pocketmine\network\mcpe\protocol\types\inventory\ContainerIds;
-use pocketmine\network\mcpe\protocol\types\inventory\CreativeContentEntry;
+use pocketmine\network\mcpe\protocol\types\inventory\FullContainerName;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStack;
 use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\network\mcpe\protocol\types\inventory\NetworkInventoryAction;
 use pocketmine\network\mcpe\protocol\types\inventory\UIInventorySlotOffset;
@@ -59,9 +64,13 @@ use pocketmine\network\PacketHandlingException;
 use pocketmine\player\Player;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\ObjectSet;
+use function array_fill_keys;
+use function array_keys;
 use function array_map;
 use function array_search;
+use function count;
 use function get_class;
+use function implode;
 use function is_int;
 use function max;
 use function spl_object_id;
@@ -70,26 +79,26 @@ use function spl_object_id;
  * @phpstan-type ContainerOpenClosure \Closure(int $id, Inventory $inventory) : (list<ClientboundPacket>|null)
  */
 class InventoryManager{
-	/** @var Inventory[] */
-	private array $windowMap = [];
 	/**
-	 * @var ComplexWindowMapEntry[]
-	 * @phpstan-var array<int, ComplexWindowMapEntry>
+	 * @var InventoryManagerEntry[] spl_object_id(Inventory) => InventoryManagerEntry
+	 * @phpstan-var array<int, InventoryManagerEntry>
 	 */
-	private array $complexWindows = [];
+	private array $inventories = [];
+
 	/**
-	 * @var ComplexWindowMapEntry[]
-	 * @phpstan-var array<int, ComplexWindowMapEntry>
+	 * @var Inventory[] network window ID => Inventory
+	 * @phpstan-var array<int, Inventory>
 	 */
-	private array $complexSlotToWindowMap = [];
+	private array $networkIdToInventoryMap = [];
+	/**
+	 * @var ComplexInventoryMapEntry[] net slot ID => ComplexWindowMapEntry
+	 * @phpstan-var array<int, ComplexInventoryMapEntry>
+	 */
+	private array $complexSlotToInventoryMap = [];
 
 	private int $lastInventoryNetworkId = ContainerIds::FIRST;
+	private int $currentWindowType = WindowTypes::CONTAINER;
 
-	/**
-	 * @var Item[][]
-	 * @phpstan-var array<int, array<int, Item>>
-	 */
-	private array $initiatedSlotChanges = [];
 	private int $clientSelectedHotbarSlot = -1;
 
 	/** @phpstan-var ObjectSet<ContainerOpenClosure> */
@@ -99,12 +108,23 @@ class InventoryManager{
 	/** @phpstan-var \Closure() : void */
 	private ?\Closure $pendingOpenWindowCallback = null;
 
+	private int $nextItemStackId = 1;
+	private ?int $currentItemStackRequestId = null;
+
+	private bool $fullSyncRequested = false;
+
+	/** @var int[] network recipe ID => enchanting table option index */
+	private array $enchantingTableOptions = [];
+	//TODO: this should be based on the total number of crafting recipes - if there are ever 100k recipes, this will
+	//conflict with regular recipes
+	private int $nextEnchantingTableOptionId = 100000;
+
 	public function __construct(
 		private Player $player,
 		private NetworkSession $session
 	){
 		$this->containerOpenCallbacks = new ObjectSet();
-		$this->containerOpenCallbacks->add(\Closure::fromCallable([self::class, 'createContainerOpen']));
+		$this->containerOpenCallbacks->add(self::createContainerOpen(...));
 
 		$this->add(ContainerIds::INVENTORY, $this->player->getInventory());
 		$this->add(ContainerIds::OFFHAND, $this->player->getOffHandInventory());
@@ -112,19 +132,30 @@ class InventoryManager{
 		$this->addComplex(UIInventorySlotOffset::CURSOR, $this->player->getCursorInventory());
 		$this->addComplex(UIInventorySlotOffset::CRAFTING2X2_INPUT, $this->player->getCraftingGrid());
 
-		$this->player->getInventory()->getHeldItemIndexChangeListeners()->add(function() : void{
-			$this->syncSelectedHotbarSlot();
-		});
+		$this->player->getInventory()->getHeldItemIndexChangeListeners()->add($this->syncSelectedHotbarSlot(...));
+	}
+
+	private function associateIdWithInventory(int $id, Inventory $inventory) : void{
+		$this->networkIdToInventoryMap[$id] = $inventory;
+	}
+
+	private function getNewWindowId() : int{
+		$this->lastInventoryNetworkId = max(ContainerIds::FIRST, ($this->lastInventoryNetworkId + 1) % ContainerIds::LAST);
+		return $this->lastInventoryNetworkId;
 	}
 
 	private function add(int $id, Inventory $inventory) : void{
-		$this->windowMap[$id] = $inventory;
+		if(isset($this->inventories[spl_object_id($inventory)])){
+			throw new \InvalidArgumentException("Inventory " . get_class($inventory) . " is already tracked");
+		}
+		$this->inventories[spl_object_id($inventory)] = new InventoryManagerEntry($inventory);
+		$this->associateIdWithInventory($id, $inventory);
 	}
 
 	private function addDynamic(Inventory $inventory) : int{
-		$this->lastInventoryNetworkId = max(ContainerIds::FIRST, ($this->lastInventoryNetworkId + 1) % ContainerIds::LAST);
-		$this->add($this->lastInventoryNetworkId, $inventory);
-		return $this->lastInventoryNetworkId;
+		$id = $this->getNewWindowId();
+		$this->add($id, $inventory);
+		return $id;
 	}
 
 	/**
@@ -132,26 +163,45 @@ class InventoryManager{
 	 * @phpstan-param array<int, int>|int $slotMap
 	 */
 	private function addComplex(array|int $slotMap, Inventory $inventory) : void{
-		$entry = new ComplexWindowMapEntry($inventory, is_int($slotMap) ? [$slotMap => 0] : $slotMap);
-		$this->complexWindows[spl_object_id($inventory)] = $entry;
-		foreach($entry->getSlotMap() as $netSlot => $coreSlot){
-			$this->complexSlotToWindowMap[$netSlot] = $entry;
+		if(isset($this->inventories[spl_object_id($inventory)])){
+			throw new \InvalidArgumentException("Inventory " . get_class($inventory) . " is already tracked");
+		}
+		$complexSlotMap = new ComplexInventoryMapEntry($inventory, is_int($slotMap) ? [$slotMap => 0] : $slotMap);
+		$this->inventories[spl_object_id($inventory)] = new InventoryManagerEntry(
+			$inventory,
+			$complexSlotMap
+		);
+		foreach($complexSlotMap->getSlotMap() as $netSlot => $coreSlot){
+			$this->complexSlotToInventoryMap[$netSlot] = $complexSlotMap;
 		}
 	}
 
+	/**
+	 * @param int[]|int $slotMap
+	 * @phpstan-param array<int, int>|int $slotMap
+	 */
+	private function addComplexDynamic(array|int $slotMap, Inventory $inventory) : int{
+		$this->addComplex($slotMap, $inventory);
+		$id = $this->getNewWindowId();
+		$this->associateIdWithInventory($id, $inventory);
+		return $id;
+	}
+
 	private function remove(int $id) : void{
-		$inventory = $this->windowMap[$id];
-		$splObjectId = spl_object_id($inventory);
-		unset($this->windowMap[$id], $this->initiatedSlotChanges[$id], $this->complexWindows[$splObjectId]);
-		foreach($this->complexSlotToWindowMap as $netSlot => $entry){
-			if($entry->getInventory() === $inventory){
-				unset($this->complexSlotToWindowMap[$netSlot]);
+		$inventory = $this->networkIdToInventoryMap[$id];
+		unset($this->networkIdToInventoryMap[$id]);
+		if($this->getWindowId($inventory) === null){
+			unset($this->inventories[spl_object_id($inventory)]);
+			foreach($this->complexSlotToInventoryMap as $netSlot => $entry){
+				if($entry->getInventory() === $inventory){
+					unset($this->complexSlotToInventoryMap[$netSlot]);
+				}
 			}
 		}
 	}
 
 	public function getWindowId(Inventory $inventory) : ?int{
-		return ($id = array_search($inventory, $this->windowMap, true)) !== false ? $id : null;
+		return ($id = array_search($inventory, $this->networkIdToInventoryMap, true)) !== false ? $id : null;
 	}
 
 	public function getCurrentWindowId() : int{
@@ -159,28 +209,36 @@ class InventoryManager{
 	}
 
 	/**
-	 * @phpstan-return array{Inventory, int}
+	 * @phpstan-return array{Inventory, int}|null
 	 */
 	public function locateWindowAndSlot(int $windowId, int $netSlotId) : ?array{
 		if($windowId === ContainerIds::UI){
-			$entry = $this->complexSlotToWindowMap[$netSlotId] ?? null;
+			$entry = $this->complexSlotToInventoryMap[$netSlotId] ?? null;
 			if($entry === null){
 				return null;
 			}
+			$inventory = $entry->getInventory();
 			$coreSlotId = $entry->mapNetToCore($netSlotId);
-			return $coreSlotId !== null ? [$entry->getInventory(), $coreSlotId] : null;
+			return $coreSlotId !== null && $inventory->slotExists($coreSlotId) ? [$inventory, $coreSlotId] : null;
 		}
-		if(isset($this->windowMap[$windowId])){
-			return [$this->windowMap[$windowId], $netSlotId];
+		$inventory = $this->networkIdToInventoryMap[$windowId] ?? null;
+		if($inventory !== null && $inventory->slotExists($netSlotId)){
+			return [$inventory, $netSlotId];
 		}
 		return null;
 	}
 
-	public function onTransactionStart(InventoryTransaction $tx) : void{
+	private function addPredictedSlotChange(Inventory $inventory, int $slot, ItemStack $item) : void{
+		$this->inventories[spl_object_id($inventory)]->predictions[$slot] = $item;
+	}
+
+	public function addTransactionPredictedSlotChanges(InventoryTransaction $tx) : void{
+		$typeConverter = $this->session->getTypeConverter();
 		foreach($tx->getActions() as $action){
-			if($action instanceof SlotChangeAction && ($windowId = $this->getWindowId($action->getInventory())) !== null){
-				//in some cases the inventory might not have a window ID, but still be referenced by a transaction (e.g. crafting grid changes), so we can't unconditionally record the change here or we might leak things
-				$this->initiatedSlotChanges[$windowId][$action->getSlot()] = $action->getTargetItem();
+			if($action instanceof SlotChangeAction){
+				//TODO: ItemStackRequestExecutor can probably build these predictions with much lower overhead
+				$itemStack = $typeConverter->coreItemStackToNet($action->getTargetItem());
+				$this->addPredictedSlotChange($action->getInventory(), $action->getSlot(), $itemStack);
 			}
 		}
 	}
@@ -189,22 +247,34 @@ class InventoryManager{
 	 * @param NetworkInventoryAction[] $networkInventoryActions
 	 * @throws PacketHandlingException
 	 */
-	public function addPredictedSlotChanges(array $networkInventoryActions) : void{
+	public function addRawPredictedSlotChanges(array $networkInventoryActions) : void{
 		foreach($networkInventoryActions as $action){
-			if($action->sourceType === NetworkInventoryAction::SOURCE_CONTAINER && (
-				isset($this->windowMap[$action->windowId]) ||
-				($action->windowId === ContainerIds::UI && isset($this->complexSlotToWindowMap[$action->inventorySlot]))
-			)){
-				try{
-					$item = TypeConverter::getInstance()->netItemStackToCore($action->newItem->getItemStack());
-				}catch(TypeConversionException $e){
-					throw new PacketHandlingException($e->getMessage(), 0, $e);
-				}
-				$this->initiatedSlotChanges[$action->windowId][$action->inventorySlot] = $item;
+			if($action->sourceType !== NetworkInventoryAction::SOURCE_CONTAINER){
+				continue;
 			}
+
+			//legacy transactions should not modify or predict anything other than these inventories, since these are
+			//the only ones accessible when not in-game (ItemStackRequest is used for everything else)
+			if(match($action->windowId){
+				ContainerIds::INVENTORY, ContainerIds::OFFHAND, ContainerIds::ARMOR => false,
+				default => true
+			}){
+				throw new PacketHandlingException("Legacy transactions cannot predict changes to inventory with ID " . $action->windowId);
+			}
+			$info = $this->locateWindowAndSlot($action->windowId, $action->inventorySlot);
+			if($info === null){
+				continue;
+			}
+
+			[$inventory, $slot] = $info;
+			$this->addPredictedSlotChange($inventory, $slot, $action->newItem->getItemStack());
 		}
 	}
 
+	public function setCurrentItemStackRequestId(?int $id) : void{
+		$this->currentItemStackRequestId = $id;
+	}
+
 	/**
 	 * When the server initiates a window close, it does so by sending a ContainerClose to the client, which causes the
 	 * client to behave as if it initiated the close itself. It responds by sending a ContainerClose back to the server,
@@ -240,6 +310,8 @@ class InventoryManager{
 			$inventory instanceof LoomInventory => UIInventorySlotOffset::LOOM,
 			$inventory instanceof StonecutterInventory => [UIInventorySlotOffset::STONE_CUTTER_INPUT => StonecutterInventory::SLOT_INPUT],
 			$inventory instanceof CraftingTableInventory => UIInventorySlotOffset::CRAFTING3X3_INPUT,
+			$inventory instanceof CartographyTableInventory => UIInventorySlotOffset::CARTOGRAPHY_TABLE,
+			$inventory instanceof SmithingTableInventory => UIInventorySlotOffset::SMITHING_TABLE,
 			default => null,
 		};
 	}
@@ -248,17 +320,24 @@ class InventoryManager{
 		$this->onCurrentWindowRemove();
 
 		$this->openWindowDeferred(function() use ($inventory) : void{
-			$windowId = $this->addDynamic($inventory);
 			if(($slotMap = $this->createComplexSlotMapping($inventory)) !== null){
-				$this->addComplex($slotMap, $inventory);
+				$windowId = $this->addComplexDynamic($slotMap, $inventory);
+			}else{
+				$windowId = $this->addDynamic($inventory);
 			}
 
 			foreach($this->containerOpenCallbacks as $callback){
 				$pks = $callback($windowId, $inventory);
 				if($pks !== null){
+					$windowType = null;
 					foreach($pks as $pk){
+						if($pk instanceof ContainerOpenPacket){
+							//workaround useless bullshit in 1.21 - ContainerClose requires a type now for some reason
+							$windowType = $pk->windowType;
+						}
 						$this->session->sendDataPacket($pk);
 					}
+					$this->currentWindowType = $windowType ?? WindowTypes::CONTAINER;
 					$this->syncContents($inventory);
 					return;
 				}
@@ -281,11 +360,11 @@ class InventoryManager{
 			$blockPosition = BlockPosition::fromVector3($inv->getHolder());
 			$windowType = match(true){
 				$inv instanceof LoomInventory => WindowTypes::LOOM,
-				$inv instanceof FurnaceInventory => match($inv->getFurnaceType()->id()){
-						FurnaceType::FURNACE()->id() => WindowTypes::FURNACE,
-						FurnaceType::BLAST_FURNACE()->id() => WindowTypes::BLAST_FURNACE,
-						FurnaceType::SMOKER()->id() => WindowTypes::SMOKER,
-						default => throw new AssumptionFailedError("Unreachable")
+				$inv instanceof FurnaceInventory => match($inv->getFurnaceType()){
+						FurnaceType::FURNACE => WindowTypes::FURNACE,
+						FurnaceType::BLAST_FURNACE => WindowTypes::BLAST_FURNACE,
+						FurnaceType::SMOKER => WindowTypes::SMOKER,
+						FurnaceType::CAMPFIRE, FurnaceType::SOUL_CAMPFIRE => throw new \LogicException("Campfire inventory cannot be displayed to a player")
 					},
 				$inv instanceof EnchantInventory => WindowTypes::ENCHANTMENT,
 				$inv instanceof BrewingStandInventory => WindowTypes::BREWING_STAND,
@@ -293,6 +372,8 @@ class InventoryManager{
 				$inv instanceof HopperInventory => WindowTypes::HOPPER,
 				$inv instanceof CraftingTableInventory => WindowTypes::WORKBENCH,
 				$inv instanceof StonecutterInventory => WindowTypes::STONECUTTER,
+				$inv instanceof CartographyTableInventory => WindowTypes::CARTOGRAPHY,
+				$inv instanceof SmithingTableInventory => WindowTypes::SMITHING_TABLE,
 				default => WindowTypes::CONTAINER
 			};
 			return [ContainerOpenPacket::blockInv($id, $windowType, $blockPosition)];
@@ -304,30 +385,33 @@ class InventoryManager{
 		$this->onCurrentWindowRemove();
 
 		$this->openWindowDeferred(function() : void{
-			$windowId = $this->addDynamic($this->player->getInventory());
+			$windowId = $this->getNewWindowId();
+			$this->associateIdWithInventory($windowId, $this->player->getInventory());
+			$this->currentWindowType = WindowTypes::INVENTORY;
 
 			$this->session->sendDataPacket(ContainerOpenPacket::entityInv(
 				$windowId,
-				WindowTypes::INVENTORY,
+				$this->currentWindowType,
 				$this->player->getId()
 			));
 		});
 	}
 
 	public function onCurrentWindowRemove() : void{
-		if(isset($this->windowMap[$this->lastInventoryNetworkId])){
+		if(isset($this->networkIdToInventoryMap[$this->lastInventoryNetworkId])){
 			$this->remove($this->lastInventoryNetworkId);
-			$this->session->sendDataPacket(ContainerClosePacket::create($this->lastInventoryNetworkId, true));
+			$this->session->sendDataPacket(ContainerClosePacket::create($this->lastInventoryNetworkId, $this->currentWindowType, true));
 			if($this->pendingCloseWindowId !== null){
 				throw new AssumptionFailedError("We should not have opened a new window while a window was waiting to be closed");
 			}
 			$this->pendingCloseWindowId = $this->lastInventoryNetworkId;
+			$this->enchantingTableOptions = [];
 		}
 	}
 
 	public function onClientRemoveWindow(int $id) : void{
 		if($id === $this->lastInventoryNetworkId){
-			if(isset($this->windowMap[$id]) && $id !== $this->pendingCloseWindowId){
+			if(isset($this->networkIdToInventoryMap[$id]) && $id !== $this->pendingCloseWindowId){
 				$this->remove($id);
 				$this->player->removeCurrentWindow();
 			}
@@ -337,7 +421,7 @@ class InventoryManager{
 
 		//Always send this, even if no window matches. If we told the client to close a window, it will behave as if it
 		//initiated the close and expect an ack.
-		$this->session->sendDataPacket(ContainerClosePacket::create($id, false));
+		$this->session->sendDataPacket(ContainerClosePacket::create($id, $this->currentWindowType, false));
 
 		if($this->pendingCloseWindowId === $id){
 			$this->pendingCloseWindowId = null;
@@ -349,96 +433,225 @@ class InventoryManager{
 		}
 	}
 
-	public function syncSlot(Inventory $inventory, int $slot) : void{
-		$slotMap = $this->complexWindows[spl_object_id($inventory)] ?? null;
-		if($slotMap !== null){
-			$windowId = ContainerIds::UI;
-			$netSlot = $slotMap->mapCoreToNet($slot) ?? null;
+	/**
+	 * Compares itemstack extra data for equality. This is used to verify legacy InventoryTransaction slot predictions.
+	 *
+	 * TODO: It would be preferable if we didn't have to deserialize this, to improve performance and reduce attack
+	 * surface. However, the raw data may not match due to differences in ordering. Investigate whether the
+	 * client-provided NBT is consistently sorted.
+	 */
+	private function itemStackExtraDataEqual(ItemStack $left, ItemStack $right) : bool{
+		if($left->getRawExtraData() === $right->getRawExtraData()){
+			return true;
+		}
+
+		$typeConverter = $this->session->getTypeConverter();
+		$leftExtraData = $typeConverter->deserializeItemStackExtraData($left->getRawExtraData(), $left->getId());
+		$rightExtraData = $typeConverter->deserializeItemStackExtraData($right->getRawExtraData(), $right->getId());
+
+		$leftNbt = $leftExtraData->getNbt();
+		$rightNbt = $rightExtraData->getNbt();
+		return
+			$leftExtraData->getCanPlaceOn() === $rightExtraData->getCanPlaceOn() &&
+			$leftExtraData->getCanDestroy() === $rightExtraData->getCanDestroy() && (
+				$leftNbt === $rightNbt || //this covers null === null and fast object identity
+				($leftNbt !== null && $rightNbt !== null && $leftNbt->equals($rightNbt))
+			);
+	}
+
+	private function itemStacksEqual(ItemStack $left, ItemStack $right) : bool{
+		return
+			$left->getId() === $right->getId() &&
+			$left->getMeta() === $right->getMeta() &&
+			$left->getBlockRuntimeId() === $right->getBlockRuntimeId() &&
+			$left->getCount() === $right->getCount() &&
+			$this->itemStackExtraDataEqual($left, $right);
+	}
+
+	public function onSlotChange(Inventory $inventory, int $slot) : void{
+		$inventoryEntry = $this->inventories[spl_object_id($inventory)] ?? null;
+		if($inventoryEntry === null){
+			//this can happen when an inventory changed during InventoryCloseEvent, or when a temporary inventory
+			//is cleared before removal.
+			return;
+		}
+		$currentItem = $this->session->getTypeConverter()->coreItemStackToNet($inventory->getItem($slot));
+		$clientSideItem = $inventoryEntry->predictions[$slot] ?? null;
+		if($clientSideItem === null || !$this->itemStacksEqual($currentItem, $clientSideItem)){
+			//no prediction or incorrect - do not associate this with the currently active itemstack request
+			$this->trackItemStack($inventoryEntry, $slot, $currentItem, null);
+			$inventoryEntry->pendingSyncs[$slot] = $currentItem;
 		}else{
-			$windowId = $this->getWindowId($inventory);
+			//correctly predicted - associate the change with the currently active itemstack request
+			$this->trackItemStack($inventoryEntry, $slot, $currentItem, $this->currentItemStackRequestId);
+		}
+
+		unset($inventoryEntry->predictions[$slot]);
+	}
+
+	private function sendInventorySlotPackets(int $windowId, int $netSlot, ItemStackWrapper $itemStackWrapper) : void{
+		/*
+		 * TODO: HACK!
+		 * As of 1.20.12, the client ignores change of itemstackID in some cases when the old item == the new item.
+		 * Notably, this happens with armor, offhand and enchanting tables, but not with main inventory.
+		 * While we could track the items previously sent to the client, that's a waste of memory and would
+		 * cost performance. Instead, clear the slot(s) first, then send the new item(s).
+		 * The network cost of doing this is fortunately minimal, as an air itemstack is only 1 byte.
+		 */
+		if($itemStackWrapper->getStackId() !== 0){
+			$this->session->sendDataPacket(InventorySlotPacket::create(
+				$windowId,
+				$netSlot,
+				new FullContainerName($this->lastInventoryNetworkId),
+				new ItemStackWrapper(0, ItemStack::null()),
+				new ItemStackWrapper(0, ItemStack::null())
+			));
+		}
+		//now send the real contents
+		$this->session->sendDataPacket(InventorySlotPacket::create(
+			$windowId,
+			$netSlot,
+			new FullContainerName($this->lastInventoryNetworkId),
+			new ItemStackWrapper(0, ItemStack::null()),
+			$itemStackWrapper
+		));
+	}
+
+	/**
+	 * @param ItemStackWrapper[] $itemStackWrappers
+	 */
+	private function sendInventoryContentPackets(int $windowId, array $itemStackWrappers) : void{
+		/*
+		 * TODO: HACK!
+		 * As of 1.20.12, the client ignores change of itemstackID in some cases when the old item == the new item.
+		 * Notably, this happens with armor, offhand and enchanting tables, but not with main inventory.
+		 * While we could track the items previously sent to the client, that's a waste of memory and would
+		 * cost performance. Instead, clear the slot(s) first, then send the new item(s).
+		 * The network cost of doing this is fortunately minimal, as an air itemstack is only 1 byte.
+		 */
+		$this->session->sendDataPacket(InventoryContentPacket::create(
+			$windowId,
+			array_fill_keys(array_keys($itemStackWrappers), new ItemStackWrapper(0, ItemStack::null())),
+			new FullContainerName($this->lastInventoryNetworkId),
+			new ItemStackWrapper(0, ItemStack::null())
+		));
+		//now send the real contents
+		$this->session->sendDataPacket(InventoryContentPacket::create($windowId, $itemStackWrappers, new FullContainerName($this->lastInventoryNetworkId), new ItemStackWrapper(0, ItemStack::null())));
+	}
+
+	public function syncSlot(Inventory $inventory, int $slot, ItemStack $itemStack) : void{
+		$entry = $this->inventories[spl_object_id($inventory)] ?? null;
+		if($entry === null){
+			throw new \LogicException("Cannot sync an untracked inventory");
+		}
+		$itemStackInfo = $entry->itemStackInfos[$slot];
+		if($itemStackInfo === null){
+			throw new \LogicException("Cannot sync an untracked inventory slot");
+		}
+		if($entry->complexSlotMap !== null){
+			$windowId = ContainerIds::UI;
+			$netSlot = $entry->complexSlotMap->mapCoreToNet($slot) ?? throw new AssumptionFailedError("We already have an ItemStackInfo, so this should not be null");
+		}else{
+			$windowId = $this->getWindowId($inventory) ?? throw new AssumptionFailedError("We already have an ItemStackInfo, so this should not be null");
 			$netSlot = $slot;
 		}
-		if($windowId !== null && $netSlot !== null){
-			$currentItem = $inventory->getItem($slot);
-			$clientSideItem = $this->initiatedSlotChanges[$windowId][$netSlot] ?? null;
-			if($clientSideItem === null || !$clientSideItem->equalsExact($currentItem)){
-				$itemStackWrapper = ItemStackWrapper::legacy(TypeConverter::getInstance()->coreItemStackToNet($currentItem));
-				if($windowId === ContainerIds::OFFHAND){
-					//TODO: HACK!
-					//The client may sometimes ignore the InventorySlotPacket for the offhand slot.
-					//This can cause a lot of problems (totems, arrows, and more...).
-					//The workaround is to send an InventoryContentPacket instead
-					//BDS (Bedrock Dedicated Server) also seems to work this way.
-					$this->session->sendDataPacket(InventoryContentPacket::create($windowId, [$itemStackWrapper]));
-				}else{
-					$this->session->sendDataPacket(InventorySlotPacket::create($windowId, $netSlot, $itemStackWrapper));
-				}
-			}
-			unset($this->initiatedSlotChanges[$windowId][$netSlot]);
+
+		$itemStackWrapper = new ItemStackWrapper($itemStackInfo->getStackId(), $itemStack);
+		if($windowId === ContainerIds::OFFHAND){
+			//TODO: HACK!
+			//The client may sometimes ignore the InventorySlotPacket for the offhand slot.
+			//This can cause a lot of problems (totems, arrows, and more...).
+			//The workaround is to send an InventoryContentPacket instead
+			//BDS (Bedrock Dedicated Server) also seems to work this way.
+			$this->sendInventoryContentPackets($windowId, [$itemStackWrapper]);
+		}else{
+			$this->sendInventorySlotPackets($windowId, $netSlot, $itemStackWrapper);
 		}
+		unset($entry->predictions[$slot], $entry->pendingSyncs[$slot]);
 	}
 
 	public function syncContents(Inventory $inventory) : void{
-		$slotMap = $this->complexWindows[spl_object_id($inventory)] ?? null;
-		if($slotMap !== null){
+		$entry = $this->inventories[spl_object_id($inventory)] ?? null;
+		if($entry === null){
+			//this can happen when an inventory changed during InventoryCloseEvent, or when a temporary inventory
+			//is cleared before removal.
+			return;
+		}
+		if($entry->complexSlotMap !== null){
 			$windowId = ContainerIds::UI;
 		}else{
 			$windowId = $this->getWindowId($inventory);
 		}
-		$typeConverter = TypeConverter::getInstance();
 		if($windowId !== null){
-			if($slotMap !== null){
-				foreach($inventory->getContents(true) as $slotId => $item){
-					$packetSlot = $slotMap->mapCoreToNet($slotId) ?? null;
+			$entry->predictions = [];
+			$entry->pendingSyncs = [];
+			$contents = [];
+			$typeConverter = $this->session->getTypeConverter();
+			foreach($inventory->getContents(true) as $slot => $item){
+				$itemStack = $typeConverter->coreItemStackToNet($item);
+				$info = $this->trackItemStack($entry, $slot, $itemStack, null);
+				$contents[] = new ItemStackWrapper($info->getStackId(), $itemStack);
+			}
+			if($entry->complexSlotMap !== null){
+				foreach($contents as $slotId => $info){
+					$packetSlot = $entry->complexSlotMap->mapCoreToNet($slotId) ?? null;
 					if($packetSlot === null){
 						continue;
 					}
-					unset($this->initiatedSlotChanges[$windowId][$packetSlot]);
-					$this->session->sendDataPacket(InventorySlotPacket::create(
-						$windowId,
-						$packetSlot,
-						ItemStackWrapper::legacy($typeConverter->coreItemStackToNet($inventory->getItem($slotId)))
-					));
+					$this->sendInventorySlotPackets($windowId, $packetSlot, $info);
 				}
 			}else{
-				unset($this->initiatedSlotChanges[$windowId]);
-				$this->session->sendDataPacket(InventoryContentPacket::create($windowId, array_map(function(Item $itemStack) use ($typeConverter) : ItemStackWrapper{
-					return ItemStackWrapper::legacy($typeConverter->coreItemStackToNet($itemStack));
-				}, $inventory->getContents(true))));
+				$this->sendInventoryContentPackets($windowId, $contents);
 			}
 		}
 	}
 
 	public function syncAll() : void{
-		foreach($this->windowMap as $inventory){
-			$this->syncContents($inventory);
-		}
-		foreach($this->complexWindows as $entry){
-			$this->syncContents($entry->getInventory());
+		foreach($this->inventories as $entry){
+			$this->syncContents($entry->inventory);
 		}
 	}
 
-	public function syncMismatchedPredictedSlotChanges() : void{
-		foreach($this->initiatedSlotChanges as $windowId => $slots){
-			foreach($slots as $netSlot => $expectedItem){
-				$located = $this->locateWindowAndSlot($windowId, $netSlot);
-				if($located === null){
-					continue;
-				}
-				[$inventory, $slot] = $located;
+	public function requestSyncAll() : void{
+		$this->fullSyncRequested = true;
+	}
 
-				if(!$inventory->slotExists($slot)){
+	public function syncMismatchedPredictedSlotChanges() : void{
+		$typeConverter = $this->session->getTypeConverter();
+		foreach($this->inventories as $entry){
+			$inventory = $entry->inventory;
+			foreach($entry->predictions as $slot => $expectedItem){
+				if(!$inventory->slotExists($slot) || $entry->itemStackInfos[$slot] === null){
 					continue; //TODO: size desync ???
 				}
-				$actualItem = $inventory->getItem($slot);
-				if(!$actualItem->equalsExact($expectedItem)){
-					$this->session->getLogger()->debug("Detected prediction mismatch in inventory " . get_class($inventory) . "#" . spl_object_id($inventory) . " slot $slot");
-					$this->syncSlot($inventory, $slot);
+
+				//any prediction that still exists at this point is a slot that was predicted to change but didn't
+				$this->session->getLogger()->debug("Detected prediction mismatch in inventory " . get_class($inventory) . "#" . spl_object_id($inventory) . " slot $slot");
+				$entry->pendingSyncs[$slot] = $typeConverter->coreItemStackToNet($inventory->getItem($slot));
+			}
+
+			$entry->predictions = [];
+		}
+	}
+
+	public function flushPendingUpdates() : void{
+		if($this->fullSyncRequested){
+			$this->fullSyncRequested = false;
+			$this->session->getLogger()->debug("Full inventory sync requested, sending contents of " . count($this->inventories) . " inventories");
+			$this->syncAll();
+		}else{
+			foreach($this->inventories as $entry){
+				if(count($entry->pendingSyncs) === 0){
+					continue;
 				}
+				$inventory = $entry->inventory;
+				$this->session->getLogger()->debug("Syncing slots " . implode(", ", array_keys($entry->pendingSyncs)) . " in inventory " . get_class($inventory) . "#" . spl_object_id($inventory));
+				foreach($entry->pendingSyncs as $slot => $itemStack){
+					$this->syncSlot($inventory, $slot, $itemStack);
+				}
+				$entry->pendingSyncs = [];
 			}
 		}
-
-		$this->initiatedSlotChanges = [];
 	}
 
 	public function syncData(Inventory $inventory, int $propertyId, int $value) : void{
@@ -453,11 +666,21 @@ class InventoryManager{
 	}
 
 	public function syncSelectedHotbarSlot() : void{
-		$selected = $this->player->getInventory()->getHeldItemIndex();
+		$playerInventory = $this->player->getInventory();
+		$selected = $playerInventory->getHeldItemIndex();
 		if($selected !== $this->clientSelectedHotbarSlot){
+			$inventoryEntry = $this->inventories[spl_object_id($playerInventory)] ?? null;
+			if($inventoryEntry === null){
+				throw new AssumptionFailedError("Player inventory should always be tracked");
+			}
+			$itemStackInfo = $inventoryEntry->itemStackInfos[$selected] ?? null;
+			if($itemStackInfo === null){
+				throw new AssumptionFailedError("Untracked player inventory slot $selected");
+			}
+
 			$this->session->sendDataPacket(MobEquipmentPacket::create(
 				$this->player->getId(),
-				ItemStackWrapper::legacy(TypeConverter::getInstance()->coreItemStackToNet($this->player->getInventory()->getItemInHand())),
+				new ItemStackWrapper($itemStackInfo->getStackId(), $this->session->getTypeConverter()->coreItemStackToNet($playerInventory->getItemInHand())),
 				$selected,
 				$selected,
 				ContainerIds::INVENTORY
@@ -467,11 +690,55 @@ class InventoryManager{
 	}
 
 	public function syncCreative() : void{
-		$typeConverter = TypeConverter::getInstance();
+		$this->session->sendDataPacket(CreativeInventoryCache::getInstance()->getCache($this->player->getCreativeInventory()));
+	}
 
-		$nextEntryId = 1;
-		$this->session->sendDataPacket(CreativeContentPacket::create(array_map(function(Item $item) use($typeConverter, &$nextEntryId) : CreativeContentEntry{
-			return new CreativeContentEntry($nextEntryId++, $typeConverter->coreItemStackToNet($item));
-		}, $this->player->isSpectator() ? [] : CreativeInventory::getInstance()->getAll())));
+	/**
+	 * @param EnchantingOption[] $options
+	 * @phpstan-param list<EnchantingOption> $options
+	 */
+	public function syncEnchantingTableOptions(array $options) : void{
+		$protocolOptions = [];
+
+		foreach($options as $index => $option){
+			$optionId = $this->nextEnchantingTableOptionId++;
+			$this->enchantingTableOptions[$optionId] = $index;
+
+			$protocolEnchantments = array_map(
+				fn(EnchantmentInstance $e) => new Enchant(EnchantmentIdMap::getInstance()->toId($e->getType()), $e->getLevel()),
+				$option->getEnchantments()
+			);
+			// We don't pay attention to the $slotFlags, $heldActivatedEnchantments and $selfActivatedEnchantments
+			// as everything works fine without them (perhaps these values are used somehow in the BDS).
+			$protocolOptions[] = new ProtocolEnchantOption(
+				$option->getRequiredXpLevel(),
+				0, $protocolEnchantments,
+				[],
+				[],
+				$option->getDisplayName(),
+				$optionId
+			);
+		}
+
+		$this->session->sendDataPacket(PlayerEnchantOptionsPacket::create($protocolOptions));
+	}
+
+	public function getEnchantingTableOptionIndex(int $recipeId) : ?int{
+		return $this->enchantingTableOptions[$recipeId] ?? null;
+	}
+
+	private function newItemStackId() : int{
+		return $this->nextItemStackId++;
+	}
+
+	public function getItemStackInfo(Inventory $inventory, int $slot) : ?ItemStackInfo{
+		$entry = $this->inventories[spl_object_id($inventory)] ?? null;
+		return $entry?->itemStackInfos[$slot] ?? null;
+	}
+
+	private function trackItemStack(InventoryManagerEntry $entry, int $slotId, ItemStack $itemStack, ?int $itemStackRequestId) : ItemStackInfo{
+		//TODO: ItemStack->isNull() would be nice to have here
+		$info = new ItemStackInfo($itemStackRequestId, $itemStack->getId() === 0 ? 0 : $this->newItemStackId());
+		return $entry->itemStackInfos[$slotId] = $info;
 	}
 }
diff --git a/src/network/mcpe/InventoryManagerEntry.php b/src/network/mcpe/InventoryManagerEntry.php
new file mode 100644
index 0000000000..deb2e8e4db
--- /dev/null
+++ b/src/network/mcpe/InventoryManagerEntry.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\network\mcpe;
+
+use pocketmine\inventory\Inventory;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStack;
+
+final class InventoryManagerEntry{
+	/**
+	 * @var ItemStack[]
+	 * @phpstan-var array<int, ItemStack>
+	 */
+	public array $predictions = [];
+
+	/**
+	 * @var ItemStackInfo[]
+	 * @phpstan-var array<int, ItemStackInfo>
+	 */
+	public array $itemStackInfos = [];
+
+	/**
+	 * @var ItemStack[]
+	 * @phpstan-var array<int, ItemStack>
+	 */
+	public array $pendingSyncs = [];
+
+	public function __construct(
+		public Inventory $inventory,
+		public ?ComplexInventoryMapEntry $complexSlotMap = null
+	){}
+}
diff --git a/src/network/mcpe/ItemStackInfo.php b/src/network/mcpe/ItemStackInfo.php
new file mode 100644
index 0000000000..ace138198d
--- /dev/null
+++ b/src/network/mcpe/ItemStackInfo.php
@@ -0,0 +1,36 @@
+<?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;
+
+final class ItemStackInfo{
+
+	public function __construct(
+		private ?int $requestId,
+		private int $stackId
+	){}
+
+	public function getRequestId() : ?int{ return $this->requestId; }
+
+	public function getStackId() : int{ return $this->stackId; }
+}
diff --git a/src/network/mcpe/JwtUtils.php b/src/network/mcpe/JwtUtils.php
index 12d21974dd..259a602d48 100644
--- a/src/network/mcpe/JwtUtils.php
+++ b/src/network/mcpe/JwtUtils.php
@@ -23,28 +23,26 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe;
 
-use FG\ASN1\Exception\ParserException;
-use FG\ASN1\Universal\Integer;
-use FG\ASN1\Universal\Sequence;
 use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\BinaryStream;
 use pocketmine\utils\Utils;
 use function base64_decode;
 use function base64_encode;
+use function bin2hex;
+use function chr;
 use function count;
 use function explode;
-use function gmp_export;
-use function gmp_import;
-use function gmp_init;
-use function gmp_strval;
 use function is_array;
 use function json_decode;
 use function json_encode;
 use function json_last_error_msg;
+use function ltrim;
 use function openssl_error_string;
 use function openssl_pkey_get_details;
 use function openssl_pkey_get_public;
 use function openssl_sign;
 use function openssl_verify;
+use function ord;
 use function preg_match;
 use function rtrim;
 use function sprintf;
@@ -54,13 +52,19 @@ use function str_replace;
 use function str_split;
 use function strlen;
 use function strtr;
-use const GMP_BIG_ENDIAN;
-use const GMP_MSW_FIRST;
+use function substr;
 use const JSON_THROW_ON_ERROR;
 use const OPENSSL_ALGO_SHA384;
 use const STR_PAD_LEFT;
 
 final class JwtUtils{
+	public const BEDROCK_SIGNING_KEY_CURVE_NAME = "secp384r1";
+
+	private const ASN1_INTEGER_TAG = "\x02";
+	private const ASN1_SEQUENCE_TAG = "\x30";
+
+	private const SIGNATURE_PART_LENGTH = 48;
+	private const SIGNATURE_ALGORITHM = OPENSSL_ALGO_SHA384;
 
 	/**
 	 * @return string[]
@@ -97,30 +101,84 @@ final class JwtUtils{
 		return [$header, $body, $signature];
 	}
 
+	private static function signaturePartToAsn1(string $part) : string{
+		if(strlen($part) !== self::SIGNATURE_PART_LENGTH){
+			throw new JwtException("R and S for a SHA384 signature must each be exactly 48 bytes, but have " . strlen($part) . " bytes");
+		}
+		$part = ltrim($part, "\x00");
+		if(ord($part[0]) >= 128){
+			//ASN.1 integers with a leading 1 bit are considered negative - add a leading 0 byte to prevent this
+			//ECDSA signature R and S values are always positive
+			$part = "\x00" . $part;
+		}
+
+		//we can assume the length is 1 byte here - if it were larger than 127, more complex logic would be needed
+		return self::ASN1_INTEGER_TAG . chr(strlen($part)) . $part;
+	}
+
+	private static function rawSignatureToDer(string $rawSignature) : string{
+		if(strlen($rawSignature) !== self::SIGNATURE_PART_LENGTH * 2){
+			throw new JwtException("JWT signature has unexpected length, expected 96, got " . strlen($rawSignature));
+		}
+
+		[$rString, $sString] = str_split($rawSignature, self::SIGNATURE_PART_LENGTH);
+		$sequence = self::signaturePartToAsn1($rString) . self::signaturePartToAsn1($sString);
+
+		//we can assume the length is 1 byte here - if it were larger than 127, more complex logic would be needed
+		return self::ASN1_SEQUENCE_TAG . chr(strlen($sequence)) . $sequence;
+	}
+
+	private static function signaturePartFromAsn1(BinaryStream $stream) : string{
+		$prefix = $stream->get(1);
+		if($prefix !== self::ASN1_INTEGER_TAG){
+			throw new \InvalidArgumentException("Expected an ASN.1 INTEGER tag, got " . bin2hex($prefix));
+		}
+		//we can assume the length is 1 byte here - if it were larger than 127, more complex logic would be needed
+		$length = $stream->getByte();
+		if($length > self::SIGNATURE_PART_LENGTH + 1){ //each part may have an extra leading 0 byte to prevent it being interpreted as a negative number
+			throw new \InvalidArgumentException("Expected at most 49 bytes for signature R or S, got $length");
+		}
+		$part = $stream->get($length);
+		return str_pad(ltrim($part, "\x00"), self::SIGNATURE_PART_LENGTH, "\x00", STR_PAD_LEFT);
+	}
+
+	private static function rawSignatureFromDer(string $derSignature) : string{
+		if($derSignature[0] !== self::ASN1_SEQUENCE_TAG){
+			throw new \InvalidArgumentException("Invalid DER signature, expected ASN.1 SEQUENCE tag, got " . bin2hex($derSignature[0]));
+		}
+
+		//we can assume the length is 1 byte here - if it were larger than 127, more complex logic would be needed
+		$length = ord($derSignature[1]);
+		$parts = substr($derSignature, 2, $length);
+		if(strlen($parts) !== $length){
+			throw new \InvalidArgumentException("Invalid DER signature, expected $length sequence bytes, got " . strlen($parts));
+		}
+
+		$stream = new BinaryStream($parts);
+		$rRaw = self::signaturePartFromAsn1($stream);
+		$sRaw = self::signaturePartFromAsn1($stream);
+
+		if(!$stream->feof()){
+			throw new \InvalidArgumentException("Invalid DER signature, unexpected trailing sequence data");
+		}
+
+		return $rRaw . $sRaw;
+	}
+
 	/**
 	 * @throws JwtException
 	 */
 	public static function verify(string $jwt, \OpenSSLAsymmetricKey $signingKey) : bool{
 		[$header, $body, $signature] = self::split($jwt);
 
-		$plainSignature = self::b64UrlDecode($signature);
-		if(strlen($plainSignature) !== 96){
-			throw new JwtException("JWT signature has unexpected length, expected 96, got " . strlen($plainSignature));
-		}
-
-		[$rString, $sString] = str_split($plainSignature, 48);
-		$convert = fn(string $str) => gmp_strval(gmp_import($str, 1, GMP_BIG_ENDIAN | GMP_MSW_FIRST), 10);
-
-		$sequence = new Sequence(
-			new Integer($convert($rString)),
-			new Integer($convert($sString))
-		);
+		$rawSignature = self::b64UrlDecode($signature);
+		$derSignature = self::rawSignatureToDer($rawSignature);
 
 		$v = openssl_verify(
 			$header . '.' . $body,
-			$sequence->getBinary(),
+			$derSignature,
 			$signingKey,
-			OPENSSL_ALGO_SHA384
+			self::SIGNATURE_ALGORITHM
 		);
 		switch($v){
 			case 0: return false;
@@ -139,33 +197,13 @@ final class JwtUtils{
 
 		openssl_sign(
 			$jwtBody,
-			$rawDerSig,
+			$derSignature,
 			$signingKey,
-			OPENSSL_ALGO_SHA384
+			self::SIGNATURE_ALGORITHM
 		);
 
-		try{
-			$asnObject = Sequence::fromBinary($rawDerSig);
-		}catch(ParserException $e){
-			throw new AssumptionFailedError("Failed to parse OpenSSL signature: " . $e->getMessage(), 0, $e);
-		}
-		if(count($asnObject) !== 2){
-			throw new AssumptionFailedError("OpenSSL produced invalid signature, expected exactly 2 parts");
-		}
-		[$r, $s] = [$asnObject[0], $asnObject[1]];
-		if(!($r instanceof Integer) || !($s instanceof Integer)){
-			throw new AssumptionFailedError("OpenSSL produced invalid signature, expected 2 INTEGER parts");
-		}
-		$rString = $r->getContent();
-		$sString = $s->getContent();
-
-		$toBinary = fn($str) => str_pad(
-			gmp_export(gmp_init($str, 10), 1, GMP_BIG_ENDIAN | GMP_MSW_FIRST),
-			48,
-			"\x00",
-			STR_PAD_LEFT
-		);
-		$jwtSig = JwtUtils::b64UrlEncode($toBinary($rString) . $toBinary($sString));
+		$rawSignature = self::rawSignatureFromDer($derSignature);
+		$jwtSig = self::b64UrlEncode($rawSignature);
 
 		return "$jwtBody.$jwtSig";
 	}
@@ -203,6 +241,17 @@ final class JwtUtils{
 		if($signingKeyOpenSSL === false){
 			throw new JwtException("OpenSSL failed to parse key: " . openssl_error_string());
 		}
+		$details = openssl_pkey_get_details($signingKeyOpenSSL);
+		if($details === false){
+			throw new JwtException("OpenSSL failed to get details from key: " . openssl_error_string());
+		}
+		if(!isset($details['ec']['curve_name'])){
+			throw new JwtException("Expected an EC key");
+		}
+		$curve = $details['ec']['curve_name'];
+		if($curve !== self::BEDROCK_SIGNING_KEY_CURVE_NAME){
+			throw new JwtException("Key must belong to curve " . self::BEDROCK_SIGNING_KEY_CURVE_NAME . ", got $curve");
+		}
 		return $signingKeyOpenSSL;
 	}
 }
diff --git a/src/network/mcpe/NetworkBroadcastUtils.php b/src/network/mcpe/NetworkBroadcastUtils.php
new file mode 100644
index 0000000000..76ae987384
--- /dev/null
+++ b/src/network/mcpe/NetworkBroadcastUtils.php
@@ -0,0 +1,95 @@
+<?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;
+
+use pocketmine\network\mcpe\protocol\ClientboundPacket;
+use pocketmine\player\Player;
+use pocketmine\timings\Timings;
+use function count;
+use function spl_object_id;
+
+final class NetworkBroadcastUtils{
+
+	private function __construct(){
+		//NOOP
+	}
+
+	/**
+	 * @param Player[]            $recipients
+	 * @param ClientboundPacket[] $packets
+	 */
+	public static function broadcastPackets(array $recipients, array $packets) : bool{
+		if(count($packets) === 0){
+			throw new \InvalidArgumentException("Cannot broadcast empty list of packets");
+		}
+
+		return Timings::$broadcastPackets->time(function() use ($recipients, $packets) : bool{
+			/** @var NetworkSession[] $sessions */
+			$sessions = [];
+			foreach($recipients as $player){
+				if($player->isConnected()){
+					$sessions[] = $player->getNetworkSession();
+				}
+			}
+			if(count($sessions) === 0){
+				return false;
+			}
+
+			/** @var PacketBroadcaster[] $uniqueBroadcasters */
+			$uniqueBroadcasters = [];
+			/** @var NetworkSession[][] $broadcasterTargets */
+			$broadcasterTargets = [];
+			foreach($sessions as $recipient){
+				$broadcaster = $recipient->getBroadcaster();
+				$uniqueBroadcasters[spl_object_id($broadcaster)] = $broadcaster;
+				$broadcasterTargets[spl_object_id($broadcaster)][spl_object_id($recipient)] = $recipient;
+			}
+			foreach($uniqueBroadcasters as $broadcaster){
+				$broadcaster->broadcastPackets($broadcasterTargets[spl_object_id($broadcaster)], $packets);
+			}
+
+			return true;
+		});
+	}
+
+	/**
+	 * @param Player[] $recipients
+	 * @phpstan-param \Closure(EntityEventBroadcaster, array<int, NetworkSession>) : void $callback
+	 */
+	public static function broadcastEntityEvent(array $recipients, \Closure $callback) : void{
+		$uniqueBroadcasters = [];
+		$broadcasterTargets = [];
+
+		foreach($recipients as $recipient){
+			$session = $recipient->getNetworkSession();
+			$broadcaster = $session->getEntityEventBroadcaster();
+			$uniqueBroadcasters[spl_object_id($broadcaster)] = $broadcaster;
+			$broadcasterTargets[spl_object_id($broadcaster)][spl_object_id($session)] = $session;
+		}
+
+		foreach($uniqueBroadcasters as $k => $broadcaster){
+			$callback($broadcaster, $broadcasterTargets[$k]);
+		}
+	}
+}
diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php
index ba0b351688..5ade880f34 100644
--- a/src/network/mcpe/NetworkSession.php
+++ b/src/network/mcpe/NetworkSession.php
@@ -23,18 +23,15 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe;
 
-use pocketmine\data\bedrock\EffectIdMap;
-use pocketmine\entity\Attribute;
 use pocketmine\entity\effect\EffectInstance;
-use pocketmine\entity\Entity;
-use pocketmine\entity\Human;
-use pocketmine\entity\Living;
 use pocketmine\event\player\PlayerDuplicateLoginEvent;
+use pocketmine\event\player\PlayerResourcePackOfferEvent;
+use pocketmine\event\server\DataPacketDecodeEvent;
 use pocketmine\event\server\DataPacketReceiveEvent;
 use pocketmine\event\server\DataPacketSendEvent;
 use pocketmine\form\Form;
+use pocketmine\item\Item;
 use pocketmine\lang\KnownTranslationFactory;
-use pocketmine\lang\KnownTranslationKeys;
 use pocketmine\lang\Translatable;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\CompoundTag;
@@ -43,8 +40,6 @@ use pocketmine\network\mcpe\cache\ChunkCache;
 use pocketmine\network\mcpe\compression\CompressBatchPromise;
 use pocketmine\network\mcpe\compression\Compressor;
 use pocketmine\network\mcpe\compression\DecompressionException;
-use pocketmine\network\mcpe\convert\GlobalItemTypeDictionary;
-use pocketmine\network\mcpe\convert\SkinAdapterSingleton;
 use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\encryption\DecryptionException;
 use pocketmine\network\mcpe\encryption\EncryptionContext;
@@ -60,53 +55,46 @@ use pocketmine\network\mcpe\handler\SessionStartPacketHandler;
 use pocketmine\network\mcpe\handler\SpawnResponsePacketHandler;
 use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
 use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket;
+use pocketmine\network\mcpe\protocol\ClientboundCloseFormPacket;
 use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\network\mcpe\protocol\DisconnectPacket;
-use pocketmine\network\mcpe\protocol\EmotePacket;
-use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket;
-use pocketmine\network\mcpe\protocol\MobEffectPacket;
-use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
 use pocketmine\network\mcpe\protocol\ModalFormRequestPacket;
 use pocketmine\network\mcpe\protocol\MovePlayerPacket;
 use pocketmine\network\mcpe\protocol\NetworkChunkPublisherUpdatePacket;
+use pocketmine\network\mcpe\protocol\OpenSignPacket;
 use pocketmine\network\mcpe\protocol\Packet;
 use pocketmine\network\mcpe\protocol\PacketDecodeException;
 use pocketmine\network\mcpe\protocol\PacketPool;
 use pocketmine\network\mcpe\protocol\PlayerListPacket;
+use pocketmine\network\mcpe\protocol\PlayerStartItemCooldownPacket;
 use pocketmine\network\mcpe\protocol\PlayStatusPacket;
-use pocketmine\network\mcpe\protocol\RemoveActorPacket;
+use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\network\mcpe\protocol\serializer\PacketBatch;
 use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
-use pocketmine\network\mcpe\protocol\serializer\PacketSerializerContext;
 use pocketmine\network\mcpe\protocol\ServerboundPacket;
 use pocketmine\network\mcpe\protocol\ServerToClientHandshakePacket;
-use pocketmine\network\mcpe\protocol\SetActorDataPacket;
 use pocketmine\network\mcpe\protocol\SetDifficultyPacket;
 use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket;
 use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket;
 use pocketmine\network\mcpe\protocol\SetTimePacket;
 use pocketmine\network\mcpe\protocol\SetTitlePacket;
-use pocketmine\network\mcpe\protocol\TakeItemActorPacket;
 use pocketmine\network\mcpe\protocol\TextPacket;
 use pocketmine\network\mcpe\protocol\ToastRequestPacket;
 use pocketmine\network\mcpe\protocol\TransferPacket;
+use pocketmine\network\mcpe\protocol\types\AbilitiesData;
+use pocketmine\network\mcpe\protocol\types\AbilitiesLayer;
 use pocketmine\network\mcpe\protocol\types\BlockPosition;
 use pocketmine\network\mcpe\protocol\types\command\CommandData;
 use pocketmine\network\mcpe\protocol\types\command\CommandEnum;
+use pocketmine\network\mcpe\protocol\types\command\CommandOverload;
 use pocketmine\network\mcpe\protocol\types\command\CommandParameter;
 use pocketmine\network\mcpe\protocol\types\command\CommandPermissions;
+use pocketmine\network\mcpe\protocol\types\CompressionAlgorithm;
 use pocketmine\network\mcpe\protocol\types\DimensionIds;
-use pocketmine\network\mcpe\protocol\types\entity\Attribute as NetworkAttribute;
-use pocketmine\network\mcpe\protocol\types\entity\MetadataProperty;
-use pocketmine\network\mcpe\protocol\types\entity\PropertySyncData;
-use pocketmine\network\mcpe\protocol\types\inventory\ContainerIds;
-use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
 use pocketmine\network\mcpe\protocol\types\PlayerPermissions;
-use pocketmine\network\mcpe\protocol\types\UpdateAbilitiesPacketLayer;
 use pocketmine\network\mcpe\protocol\UpdateAbilitiesPacket;
 use pocketmine\network\mcpe\protocol\UpdateAdventureSettingsPacket;
-use pocketmine\network\mcpe\protocol\UpdateAttributesPacket;
 use pocketmine\network\NetworkSessionManager;
 use pocketmine\network\PacketHandlingException;
 use pocketmine\permission\DefaultPermissionNames;
@@ -116,50 +104,48 @@ use pocketmine\player\Player;
 use pocketmine\player\PlayerInfo;
 use pocketmine\player\UsedChunkStatus;
 use pocketmine\player\XboxLivePlayerInfo;
+use pocketmine\promise\Promise;
+use pocketmine\promise\PromiseResolver;
 use pocketmine\Server;
 use pocketmine\timings\Timings;
 use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\BinaryDataException;
+use pocketmine\utils\BinaryStream;
 use pocketmine\utils\ObjectSet;
 use pocketmine\utils\TextFormat;
-use pocketmine\utils\Utils;
+use pocketmine\world\format\io\GlobalItemDataHandlers;
 use pocketmine\world\Position;
+use pocketmine\YmlServerProperties;
 use function array_map;
 use function array_values;
 use function base64_encode;
 use function bin2hex;
 use function count;
-use function function_exists;
 use function get_class;
-use function hrtime;
+use function implode;
 use function in_array;
-use function intdiv;
+use function is_string;
 use function json_encode;
-use function ksort;
-use function min;
+use function ord;
+use function random_bytes;
+use function str_split;
 use function strcasecmp;
 use function strlen;
 use function strtolower;
 use function substr;
 use function time;
 use function ucfirst;
-use function xdebug_is_debugger_active;
 use const JSON_THROW_ON_ERROR;
-use const SORT_NUMERIC;
 
 class NetworkSession{
-	private const INCOMING_PACKET_BATCH_PER_TICK = 2; //usually max 1 per tick, but transactions may arrive separately
-	private const INCOMING_PACKET_BATCH_MAX_BUDGET = 100 * self::INCOMING_PACKET_BATCH_PER_TICK; //enough to account for a 5-second lag spike
+	private const INCOMING_PACKET_BATCH_PER_TICK = 2; //usually max 1 per tick, but transactions arrive separately
+	private const INCOMING_PACKET_BATCH_BUFFER_TICKS = 100; //enough to account for a 5-second lag spike
 
-	/**
-	 * At most this many more packets can be received. If this reaches zero, any additional packets received will cause
-	 * the player to be kicked from the server.
-	 * This number is increased every tick up to a maximum limit.
-	 *
-	 * @see self::INCOMING_PACKET_BATCH_PER_TICK
-	 * @see self::INCOMING_PACKET_BATCH_MAX_BUDGET
-	 */
-	private int $incomingPacketBatchBudget = self::INCOMING_PACKET_BATCH_MAX_BUDGET;
-	private int $lastPacketBudgetUpdateTimeNs;
+	private const INCOMING_GAME_PACKETS_PER_TICK = 2;
+	private const INCOMING_GAME_PACKETS_BUFFER_TICKS = 100;
+
+	private PacketRateLimiter $packetBatchLimiter;
+	private PacketRateLimiter $gamePacketLimiter;
 
 	private \PrefixedLogger $logger;
 	private ?Player $player = null;
@@ -177,18 +163,25 @@ class NetworkSession{
 
 	private ?EncryptionContext $cipher = null;
 
-	/** @var Packet[] */
+	/** @var string[] */
 	private array $sendBuffer = [];
-
 	/**
-	 * @var \SplQueue|CompressBatchPromise[]
-	 * @phpstan-var \SplQueue<CompressBatchPromise>
+	 * @var PromiseResolver[]
+	 * @phpstan-var list<PromiseResolver<true>>
 	 */
+	private array $sendBufferAckPromises = [];
+
+	/** @phpstan-var \SplQueue<array{CompressBatchPromise|string, list<PromiseResolver<true>>}> */
 	private \SplQueue $compressedQueue;
 	private bool $forceAsyncCompression = true;
 	private bool $enableCompression = false; //disabled until handshake completed
 
-	private PacketSerializerContext $packetSerializerContext;
+	private int $nextAckReceiptId = 0;
+	/**
+	 * @var PromiseResolver[][]
+	 * @phpstan-var array<int, list<PromiseResolver<true>>>
+	 */
+	private array $ackPromisesByReceiptId = [];
 
 	private ?InventoryManager $invManager = null;
 
@@ -204,7 +197,9 @@ class NetworkSession{
 		private PacketPool $packetPool,
 		private PacketSender $sender,
 		private PacketBroadcaster $broadcaster,
+		private EntityEventBroadcaster $entityEventBroadcaster,
 		private Compressor $compressor,
+		private TypeConverter $typeConverter,
 		private string $ip,
 		private int $port
 	){
@@ -212,22 +207,19 @@ class NetworkSession{
 
 		$this->compressedQueue = new \SplQueue();
 
-		//TODO: allow this to be injected
-		$this->packetSerializerContext = new PacketSerializerContext(GlobalItemTypeDictionary::getInstance()->getDictionary());
-
 		$this->disposeHooks = new ObjectSet();
 
 		$this->connectTime = time();
-		$this->lastPacketBudgetUpdateTimeNs = hrtime(true);
+		$this->packetBatchLimiter = new PacketRateLimiter("Packet Batches", self::INCOMING_PACKET_BATCH_PER_TICK, self::INCOMING_PACKET_BATCH_BUFFER_TICKS);
+		$this->gamePacketLimiter = new PacketRateLimiter("Game Packets", self::INCOMING_GAME_PACKETS_PER_TICK, self::INCOMING_GAME_PACKETS_BUFFER_TICKS);
 
 		$this->setHandler(new SessionStartPacketHandler(
-			$this->server,
 			$this,
-			fn() => $this->onSessionStartSuccess()
+			$this->onSessionStartSuccess(...)
 		));
 
 		$this->manager->add($this);
-		$this->logger->info("Session opened");
+		$this->logger->info($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_network_session_open()));
 	}
 
 	private function getLogPrefix() : string{
@@ -247,20 +239,24 @@ class NetworkSession{
 			$this,
 			function(PlayerInfo $info) : void{
 				$this->info = $info;
-				$this->logger->info("Player: " . TextFormat::AQUA . $info->getUsername() . TextFormat::RESET);
+				$this->logger->info($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_network_session_playerName(TextFormat::AQUA . $info->getUsername() . TextFormat::RESET)));
 				$this->logger->setPrefix($this->getLogPrefix());
 				$this->manager->markLoginReceived($this);
 			},
-			function(bool $isAuthenticated, bool $authRequired, ?string $error, ?string $clientPubKey) : void{
-				$this->setAuthenticationStatus($isAuthenticated, $authRequired, $error, $clientPubKey);
-			}
+			$this->setAuthenticationStatus(...)
 		));
 	}
 
 	protected function createPlayer() : void{
 		$this->server->createPlayer($this, $this->info, $this->authenticated, $this->cachedOfflinePlayerData)->onCompletion(
-			\Closure::fromCallable([$this, 'onPlayerCreated']),
-			fn() => $this->disconnect("Player creation failed") //TODO: this should never actually occur... right?
+			$this->onPlayerCreated(...),
+			function() : void{
+				//TODO: this should never actually occur... right?
+				$this->disconnectWithError(
+					reason: "Failed to create player",
+					disconnectScreenMessage: KnownTranslationFactory::pocketmine_disconnect_error_internal()
+				);
+			}
 		);
 	}
 
@@ -278,10 +274,10 @@ class NetworkSession{
 
 		$effectManager = $this->player->getEffects();
 		$effectManager->getEffectAddHooks()->add($effectAddHook = function(EffectInstance $effect, bool $replacesOldEffect) : void{
-			$this->onEntityEffectAdded($this->player, $effect, $replacesOldEffect);
+			$this->entityEventBroadcaster->onEntityEffectAdded([$this], $this->player, $effect, $replacesOldEffect);
 		});
 		$effectManager->getEffectRemoveHooks()->add($effectRemoveHook = function(EffectInstance $effect) : void{
-			$this->onEntityEffectRemoved($this->player, $effect);
+			$this->entityEventBroadcaster->onEntityEffectRemoved([$this], $this->player, $effect);
 		});
 		$this->disposeHooks->add(static function() use ($effectManager, $effectAddHook, $effectRemoveHook) : void{
 			$effectManager->getEffectAddHooks()->remove($effectAddHook);
@@ -359,59 +355,70 @@ class NetworkSession{
 			return;
 		}
 
-		if($this->incomingPacketBatchBudget <= 0){
-			if(!function_exists('xdebug_is_debugger_active') || !xdebug_is_debugger_active()){
-				throw new PacketHandlingException("Receiving packets too fast");
-			}else{
-				//when a debugging session is active, the server may halt at any point for an indefinite length of time,
-				//in which time the client will continue to send packets
-				$this->incomingPacketBatchBudget = self::INCOMING_PACKET_BATCH_MAX_BUDGET;
-			}
-		}
-		$this->incomingPacketBatchBudget--;
-
-		if($this->cipher !== null){
-			Timings::$playerNetworkReceiveDecrypt->startTiming();
-			try{
-				$payload = $this->cipher->decrypt($payload);
-			}catch(DecryptionException $e){
-				$this->logger->debug("Encrypted packet: " . base64_encode($payload));
-				throw PacketHandlingException::wrap($e, "Packet decryption error");
-			}finally{
-				Timings::$playerNetworkReceiveDecrypt->stopTiming();
-			}
-		}
-
-		if($this->enableCompression){
-			Timings::$playerNetworkReceiveDecompress->startTiming();
-			try{
-				$decompressed = $this->compressor->decompress($payload);
-			}catch(DecompressionException $e){
-				$this->logger->debug("Failed to decompress packet: " . base64_encode($payload));
-				throw PacketHandlingException::wrap($e, "Compressed packet batch decode error");
-			}finally{
-				Timings::$playerNetworkReceiveDecompress->stopTiming();
-			}
-		}else{
-			$decompressed = $payload;
-		}
-
+		Timings::$playerNetworkReceive->startTiming();
 		try{
-			foreach((new PacketBatch($decompressed))->getPackets($this->packetPool, $this->packetSerializerContext, 1300) as [$packet, $buffer]){
-				if($packet === null){
-					$this->logger->debug("Unknown packet: " . base64_encode($buffer));
-					throw new PacketHandlingException("Unknown packet received");
-				}
+			$this->packetBatchLimiter->decrement();
+
+			if($this->cipher !== null){
+				Timings::$playerNetworkReceiveDecrypt->startTiming();
 				try{
-					$this->handleDataPacket($packet, $buffer);
-				}catch(PacketHandlingException $e){
-					$this->logger->debug($packet->getName() . ": " . base64_encode($buffer));
-					throw PacketHandlingException::wrap($e, "Error processing " . $packet->getName());
+					$payload = $this->cipher->decrypt($payload);
+				}catch(DecryptionException $e){
+					$this->logger->debug("Encrypted packet: " . base64_encode($payload));
+					throw PacketHandlingException::wrap($e, "Packet decryption error");
+				}finally{
+					Timings::$playerNetworkReceiveDecrypt->stopTiming();
 				}
 			}
-		}catch(PacketDecodeException $e){
-			$this->logger->logException($e);
-			throw PacketHandlingException::wrap($e, "Packet batch decode error");
+
+			if(strlen($payload) < 1){
+				throw new PacketHandlingException("No bytes in payload");
+			}
+
+			if($this->enableCompression){
+				$compressionType = ord($payload[0]);
+				$compressed = substr($payload, 1);
+				if($compressionType === CompressionAlgorithm::NONE){
+					$decompressed = $compressed;
+				}elseif($compressionType === $this->compressor->getNetworkId()){
+					Timings::$playerNetworkReceiveDecompress->startTiming();
+					try{
+						$decompressed = $this->compressor->decompress($compressed);
+					}catch(DecompressionException $e){
+						$this->logger->debug("Failed to decompress packet: " . base64_encode($compressed));
+						throw PacketHandlingException::wrap($e, "Compressed packet batch decode error");
+					}finally{
+						Timings::$playerNetworkReceiveDecompress->stopTiming();
+					}
+				}else{
+					throw new PacketHandlingException("Packet compressed with unexpected compression type $compressionType");
+				}
+			}else{
+				$decompressed = $payload;
+			}
+
+			try{
+				$stream = new BinaryStream($decompressed);
+				foreach(PacketBatch::decodeRaw($stream) as $buffer){
+					$this->gamePacketLimiter->decrement();
+					$packet = $this->packetPool->getPacket($buffer);
+					if($packet === null){
+						$this->logger->debug("Unknown packet: " . base64_encode($buffer));
+						throw new PacketHandlingException("Unknown packet received");
+					}
+					try{
+						$this->handleDataPacket($packet, $buffer);
+					}catch(PacketHandlingException $e){
+						$this->logger->debug($packet->getName() . ": " . base64_encode($buffer));
+						throw PacketHandlingException::wrap($e, "Error processing " . $packet->getName());
+					}
+				}
+			}catch(PacketDecodeException|BinaryDataException $e){
+				$this->logger->logException($e);
+				throw PacketHandlingException::wrap($e, "Packet batch decode error");
+			}
+		}finally{
+			Timings::$playerNetworkReceive->stopTiming();
 		}
 	}
 
@@ -423,39 +430,73 @@ class NetworkSession{
 			throw new PacketHandlingException("Unexpected non-serverbound packet");
 		}
 
-		$timings = Timings::getDecodeDataPacketTimings($packet);
+		$timings = Timings::getReceiveDataPacketTimings($packet);
 		$timings->startTiming();
-		try{
-			$stream = PacketSerializer::decoder($buffer, 0, $this->packetSerializerContext);
-			try{
-				$packet->decode($stream);
-			}catch(PacketDecodeException $e){
-				throw PacketHandlingException::wrap($e);
-			}
-			if(!$stream->feof()){
-				$remains = substr($stream->getBuffer(), $stream->getOffset());
-				$this->logger->debug("Still " . strlen($remains) . " bytes unread in " . $packet->getName() . ": " . bin2hex($remains));
-			}
-		}finally{
-			$timings->stopTiming();
-		}
 
-		$timings = Timings::getHandleDataPacketTimings($packet);
-		$timings->startTiming();
 		try{
-			//TODO: I'm not sure DataPacketReceiveEvent should be included in the handler timings, but it needs to be
-			//included for now to ensure the receivePacket timings are counted the way they were before
-			$ev = new DataPacketReceiveEvent($this, $packet);
-			$ev->call();
-			if(!$ev->isCancelled() && ($this->handler === null || !$packet->handle($this->handler))){
-				$this->logger->debug("Unhandled " . $packet->getName() . ": " . base64_encode($stream->getBuffer()));
+			if(DataPacketDecodeEvent::hasHandlers()){
+				$ev = new DataPacketDecodeEvent($this, $packet->pid(), $buffer);
+				$ev->call();
+				if($ev->isCancelled()){
+					return;
+				}
+			}
+
+			$decodeTimings = Timings::getDecodeDataPacketTimings($packet);
+			$decodeTimings->startTiming();
+			try{
+				$stream = PacketSerializer::decoder($buffer, 0);
+				try{
+					$packet->decode($stream);
+				}catch(PacketDecodeException $e){
+					throw PacketHandlingException::wrap($e);
+				}
+				if(!$stream->feof()){
+					$remains = substr($stream->getBuffer(), $stream->getOffset());
+					$this->logger->debug("Still " . strlen($remains) . " bytes unread in " . $packet->getName() . ": " . bin2hex($remains));
+				}
+			}finally{
+				$decodeTimings->stopTiming();
+			}
+
+			if(DataPacketReceiveEvent::hasHandlers()){
+				$ev = new DataPacketReceiveEvent($this, $packet);
+				$ev->call();
+				if($ev->isCancelled()){
+					return;
+				}
+			}
+			$handlerTimings = Timings::getHandleDataPacketTimings($packet);
+			$handlerTimings->startTiming();
+			try{
+				if($this->handler === null || !$packet->handle($this->handler)){
+					$this->logger->debug("Unhandled " . $packet->getName() . ": " . base64_encode($stream->getBuffer()));
+				}
+			}finally{
+				$handlerTimings->stopTiming();
 			}
 		}finally{
 			$timings->stopTiming();
 		}
 	}
 
-	public function sendDataPacket(ClientboundPacket $packet, bool $immediate = false) : bool{
+	public function handleAckReceipt(int $receiptId) : void{
+		if(!$this->connected){
+			return;
+		}
+		if(isset($this->ackPromisesByReceiptId[$receiptId])){
+			$promises = $this->ackPromisesByReceiptId[$receiptId];
+			unset($this->ackPromisesByReceiptId[$receiptId]);
+			foreach($promises as $promise){
+				$promise->resolve(true);
+			}
+		}
+	}
+
+	/**
+	 * @phpstan-param PromiseResolver<true>|null $ackReceiptResolver
+	 */
+	private function sendDataPacketInternal(ClientboundPacket $packet, bool $immediate, ?PromiseResolver $ackReceiptResolver) : bool{
 		if(!$this->connected){
 			return false;
 		}
@@ -467,13 +508,23 @@ class NetworkSession{
 		$timings = Timings::getSendDataPacketTimings($packet);
 		$timings->startTiming();
 		try{
-			$ev = new DataPacketSendEvent([$this], [$packet]);
-			$ev->call();
-			if($ev->isCancelled()){
-				return false;
+			if(DataPacketSendEvent::hasHandlers()){
+				$ev = new DataPacketSendEvent([$this], [$packet]);
+				$ev->call();
+				if($ev->isCancelled()){
+					return false;
+				}
+				$packets = $ev->getPackets();
+			}else{
+				$packets = [$packet];
 			}
 
-			$this->addToSendBuffer($packet);
+			if($ackReceiptResolver !== null){
+				$this->sendBufferAckPromises[] = $ackReceiptResolver;
+			}
+			foreach($packets as $evPacket){
+				$this->addToSendBuffer(self::encodePacketTimed(PacketSerializer::encoder(), $evPacket));
+			}
 			if($immediate){
 				$this->flushSendBuffer(true);
 			}
@@ -484,94 +535,173 @@ class NetworkSession{
 		}
 	}
 
+	public function sendDataPacket(ClientboundPacket $packet, bool $immediate = false) : bool{
+		return $this->sendDataPacketInternal($packet, $immediate, null);
+	}
+
+	/**
+	 * @phpstan-return Promise<true>
+	 */
+	public function sendDataPacketWithReceipt(ClientboundPacket $packet, bool $immediate = false) : Promise{
+		$resolver = new PromiseResolver();
+
+		if(!$this->sendDataPacketInternal($packet, $immediate, $resolver)){
+			$resolver->reject();
+		}
+
+		return $resolver->getPromise();
+	}
+
 	/**
 	 * @internal
 	 */
-	public function addToSendBuffer(ClientboundPacket $packet) : void{
-		$timings = Timings::getSendDataPacketTimings($packet);
+	public static function encodePacketTimed(PacketSerializer $serializer, ClientboundPacket $packet) : string{
+		$timings = Timings::getEncodeDataPacketTimings($packet);
 		$timings->startTiming();
 		try{
-			$this->sendBuffer[] = $packet;
+			$packet->encode($serializer);
+			return $serializer->getBuffer();
 		}finally{
 			$timings->stopTiming();
 		}
 	}
 
+	/**
+	 * @internal
+	 */
+	public function addToSendBuffer(string $buffer) : void{
+		$this->sendBuffer[] = $buffer;
+	}
+
 	private function flushSendBuffer(bool $immediate = false) : void{
 		if(count($this->sendBuffer) > 0){
-			$syncMode = null; //automatic
-			if($immediate){
-				$syncMode = true;
-			}elseif($this->forceAsyncCompression){
-				$syncMode = false;
-			}
+			Timings::$playerNetworkSend->startTiming();
+			try{
+				$syncMode = null; //automatic
+				if($immediate){
+					$syncMode = true;
+				}elseif($this->forceAsyncCompression){
+					$syncMode = false;
+				}
 
-			$batch = PacketBatch::fromPackets($this->packetSerializerContext, ...$this->sendBuffer);
-			if($this->enableCompression){
-				$promise = $this->server->prepareBatch($batch, $this->compressor, $syncMode);
-			}else{
-				$promise = new CompressBatchPromise();
-				$promise->resolve($batch->getBuffer());
+				$stream = new BinaryStream();
+				PacketBatch::encodeRaw($stream, $this->sendBuffer);
+
+				if($this->enableCompression){
+					$batch = $this->server->prepareBatch($stream->getBuffer(), $this->compressor, $syncMode, Timings::$playerNetworkSendCompressSessionBuffer);
+				}else{
+					$batch = $stream->getBuffer();
+				}
+				$this->sendBuffer = [];
+				$ackPromises = $this->sendBufferAckPromises;
+				$this->sendBufferAckPromises = [];
+				$this->queueCompressedNoBufferFlush($batch, $immediate, $ackPromises);
+			}finally{
+				Timings::$playerNetworkSend->stopTiming();
 			}
-			$this->sendBuffer = [];
-			$this->queueCompressedNoBufferFlush($promise, $immediate);
 		}
 	}
 
-	public function getPacketSerializerContext() : PacketSerializerContext{ return $this->packetSerializerContext; }
-
 	public function getBroadcaster() : PacketBroadcaster{ return $this->broadcaster; }
 
+	public function getEntityEventBroadcaster() : EntityEventBroadcaster{ return $this->entityEventBroadcaster; }
+
 	public function getCompressor() : Compressor{
 		return $this->compressor;
 	}
 
-	public function queueCompressed(CompressBatchPromise $payload, bool $immediate = false) : void{
-		$this->flushSendBuffer($immediate); //Maintain ordering if possible
-		$this->queueCompressedNoBufferFlush($payload, $immediate);
-	}
+	public function getTypeConverter() : TypeConverter{ return $this->typeConverter; }
 
-	private function queueCompressedNoBufferFlush(CompressBatchPromise $payload, bool $immediate = false) : void{
-		if($immediate){
-			//Skips all queues
-			$this->sendEncoded($payload->getResult(), true);
-		}else{
-			$this->compressedQueue->enqueue($payload);
-			$payload->onResolve(function(CompressBatchPromise $payload) : void{
-				if($this->connected && $this->compressedQueue->bottom() === $payload){
-					$this->compressedQueue->dequeue(); //result unused
-					$this->sendEncoded($payload->getResult());
-
-					while(!$this->compressedQueue->isEmpty()){
-						/** @var CompressBatchPromise $current */
-						$current = $this->compressedQueue->bottom();
-						if($current->hasResult()){
-							$this->compressedQueue->dequeue();
-
-							$this->sendEncoded($current->getResult());
-						}else{
-							//can't send any more queued until this one is ready
-							break;
-						}
-					}
-				}
-			});
+	public function queueCompressed(CompressBatchPromise|string $payload, bool $immediate = false) : void{
+		Timings::$playerNetworkSend->startTiming();
+		try{
+			$this->flushSendBuffer($immediate); //Maintain ordering if possible
+			$this->queueCompressedNoBufferFlush($payload, $immediate);
+		}finally{
+			Timings::$playerNetworkSend->stopTiming();
 		}
 	}
 
-	private function sendEncoded(string $payload, bool $immediate = false) : void{
+	/**
+	 * @param PromiseResolver[] $ackPromises
+	 *
+	 * @phpstan-param list<PromiseResolver<true>> $ackPromises
+	 */
+	private function queueCompressedNoBufferFlush(CompressBatchPromise|string $batch, bool $immediate = false, array $ackPromises = []) : void{
+		Timings::$playerNetworkSend->startTiming();
+		try{
+			if(is_string($batch)){
+				if($immediate){
+					//Skips all queues
+					$this->sendEncoded($batch, true, $ackPromises);
+				}else{
+					$this->compressedQueue->enqueue([$batch, $ackPromises]);
+					$this->flushCompressedQueue();
+				}
+			}elseif($immediate){
+				//Skips all queues
+				$this->sendEncoded($batch->getResult(), true, $ackPromises);
+			}else{
+				$this->compressedQueue->enqueue([$batch, $ackPromises]);
+				$batch->onResolve(function() : void{
+					if($this->connected){
+						$this->flushCompressedQueue();
+					}
+				});
+			}
+		}finally{
+			Timings::$playerNetworkSend->stopTiming();
+		}
+	}
+
+	private function flushCompressedQueue() : void{
+		Timings::$playerNetworkSend->startTiming();
+		try{
+			while(!$this->compressedQueue->isEmpty()){
+				/** @var CompressBatchPromise|string $current */
+				[$current, $ackPromises] = $this->compressedQueue->bottom();
+				if(is_string($current)){
+					$this->compressedQueue->dequeue();
+					$this->sendEncoded($current, false, $ackPromises);
+
+				}elseif($current->hasResult()){
+					$this->compressedQueue->dequeue();
+					$this->sendEncoded($current->getResult(), false, $ackPromises);
+
+				}else{
+					//can't send any more queued until this one is ready
+					break;
+				}
+			}
+		}finally{
+			Timings::$playerNetworkSend->stopTiming();
+		}
+	}
+
+	/**
+	 * @param PromiseResolver[] $ackPromises
+	 * @phpstan-param list<PromiseResolver<true>> $ackPromises
+	 */
+	private function sendEncoded(string $payload, bool $immediate, array $ackPromises) : void{
 		if($this->cipher !== null){
 			Timings::$playerNetworkSendEncrypt->startTiming();
 			$payload = $this->cipher->encrypt($payload);
 			Timings::$playerNetworkSendEncrypt->stopTiming();
 		}
-		$this->sender->send($payload, $immediate);
+
+		if(count($ackPromises) > 0){
+			$ackReceiptId = $this->nextAckReceiptId++;
+			$this->ackPromisesByReceiptId[$ackReceiptId] = $ackPromises;
+		}else{
+			$ackReceiptId = null;
+		}
+		$this->sender->send($payload, $immediate, $ackReceiptId);
 	}
 
 	/**
 	 * @phpstan-param \Closure() : void $func
 	 */
-	private function tryDisconnect(\Closure $func, string $reason) : void{
+	private function tryDisconnect(\Closure $func, Translatable|string $reason) : void{
 		if($this->connected && !$this->disconnectGuard){
 			$this->disconnectGuard = true;
 			$func();
@@ -584,7 +714,21 @@ class NetworkSession{
 			$this->disposeHooks->clear();
 			$this->setHandler(null);
 			$this->connected = false;
-			$this->logger->info("Session closed due to $reason");
+
+			$ackPromisesByReceiptId = $this->ackPromisesByReceiptId;
+			$this->ackPromisesByReceiptId = [];
+			foreach($ackPromisesByReceiptId as $resolvers){
+				foreach($resolvers as $resolver){
+					$resolver->reject();
+				}
+			}
+			$sendBufferAckPromises = $this->sendBufferAckPromises;
+			$this->sendBufferAckPromises = [];
+			foreach($sendBufferAckPromises as $resolver){
+				$resolver->reject();
+			}
+
+			$this->logger->info($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_network_session_close($reason)));
 		}
 	}
 
@@ -596,13 +740,25 @@ class NetworkSession{
 		$this->invManager = null;
 	}
 
+	private function sendDisconnectPacket(Translatable|string $message) : void{
+		if($message instanceof Translatable){
+			$translated = $this->server->getLanguage()->translate($message);
+		}else{
+			$translated = $message;
+		}
+		$this->sendDataPacket(DisconnectPacket::create(0, $translated, ""));
+	}
+
 	/**
 	 * Disconnects the session, destroying the associated player (if it exists).
+	 *
+	 * @param Translatable|string      $reason                  Shown in the server log - this should be a short one-line message
+	 * @param Translatable|string|null $disconnectScreenMessage Shown on the player's disconnection screen (null will use the reason)
 	 */
-	public function disconnect(string $reason, bool $notify = true) : void{
-		$this->tryDisconnect(function() use ($reason, $notify) : void{
+	public function disconnect(Translatable|string $reason, Translatable|string|null $disconnectScreenMessage = null, bool $notify = true) : void{
+		$this->tryDisconnect(function() use ($reason, $disconnectScreenMessage, $notify) : void{
 			if($notify){
-				$this->sendDataPacket(DisconnectPacket::create($reason));
+				$this->sendDisconnectPacket($disconnectScreenMessage ?? $reason);
 			}
 			if($this->player !== null){
 				$this->player->onPostDisconnect($reason, null);
@@ -610,12 +766,31 @@ class NetworkSession{
 		}, $reason);
 	}
 
+	public function disconnectWithError(Translatable|string $reason, Translatable|string|null $disconnectScreenMessage = null) : void{
+		$errorId = implode("-", str_split(bin2hex(random_bytes(6)), 4));
+
+		$this->disconnect(
+			reason: KnownTranslationFactory::pocketmine_disconnect_error($reason, $errorId)->prefix(TextFormat::RED),
+			disconnectScreenMessage: KnownTranslationFactory::pocketmine_disconnect_error($disconnectScreenMessage ?? $reason, $errorId),
+		);
+	}
+
+	public function disconnectIncompatibleProtocol(int $protocolVersion) : void{
+		$this->tryDisconnect(
+			function() use ($protocolVersion) : void{
+				$this->sendDataPacket(PlayStatusPacket::create($protocolVersion < ProtocolInfo::CURRENT_PROTOCOL ? PlayStatusPacket::LOGIN_FAILED_CLIENT : PlayStatusPacket::LOGIN_FAILED_SERVER), true);
+			},
+			KnownTranslationFactory::pocketmine_disconnect_incompatibleProtocol((string) $protocolVersion)
+		);
+	}
+
 	/**
 	 * Instructs the remote client to connect to a different server.
 	 */
-	public function transfer(string $ip, int $port, string $reason = "transfer") : void{
+	public function transfer(string $ip, int $port, Translatable|string|null $reason = null) : void{
+		$reason ??= KnownTranslationFactory::pocketmine_disconnect_transfer();
 		$this->tryDisconnect(function() use ($ip, $port, $reason) : void{
-			$this->sendDataPacket(TransferPacket::create($ip, $port), true);
+			$this->sendDataPacket(TransferPacket::create($ip, $port, false), true);
 			if($this->player !== null){
 				$this->player->onPostDisconnect($reason, null);
 			}
@@ -625,9 +800,9 @@ class NetworkSession{
 	/**
 	 * Called by the Player when it is closed (for example due to getting kicked).
 	 */
-	public function onPlayerDestroyed(string $reason) : void{
-		$this->tryDisconnect(function() use ($reason) : void{
-			$this->sendDataPacket(DisconnectPacket::create($reason));
+	public function onPlayerDestroyed(Translatable|string $reason, Translatable|string $disconnectScreenMessage) : void{
+		$this->tryDisconnect(function() use ($disconnectScreenMessage) : void{
+			$this->sendDisconnectPacket($disconnectScreenMessage);
 		}, $reason);
 	}
 
@@ -635,7 +810,7 @@ class NetworkSession{
 	 * Called by the network interface to close the session when the client disconnects without server input, for
 	 * example in a timeout condition or voluntary client disconnect.
 	 */
-	public function onClientDisconnect(string $reason) : void{
+	public function onClientDisconnect(Translatable|string $reason) : void{
 		$this->tryDisconnect(function() use ($reason) : void{
 			if($this->player !== null){
 				$this->player->onPostDisconnect($reason, null);
@@ -643,7 +818,7 @@ class NetworkSession{
 		}, $reason);
 	}
 
-	private function setAuthenticationStatus(bool $authenticated, bool $authRequired, ?string $error, ?string $clientPubKey) : void{
+	private function setAuthenticationStatus(bool $authenticated, bool $authRequired, Translatable|string|null $error, ?string $clientPubKey) : void{
 		if(!$this->connected){
 			return;
 		}
@@ -656,7 +831,10 @@ class NetworkSession{
 		}
 
 		if($error !== null){
-			$this->disconnect($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_disconnect_invalidSession($this->server->getLanguage()->translateString($error))));
+			$this->disconnectWithError(
+				reason: KnownTranslationFactory::pocketmine_disconnect_invalidSession($error),
+				disconnectScreenMessage: KnownTranslationFactory::pocketmine_disconnect_error_authentication()
+			);
 
 			return;
 		}
@@ -665,7 +843,7 @@ class NetworkSession{
 
 		if(!$this->authenticated){
 			if($authRequired){
-				$this->disconnect(KnownTranslationKeys::DISCONNECTIONSCREEN_NOTAUTHENTICATED);
+				$this->disconnect("Not authenticated", KnownTranslationFactory::disconnectionScreen_notAuthenticated());
 				return;
 			}
 			if($this->info instanceof XboxLivePlayerInfo){
@@ -675,7 +853,7 @@ class NetworkSession{
 		}
 		$this->logger->debug("Xbox Live authenticated: " . ($this->authenticated ? "YES" : "NO"));
 
-		$checkXUID = $this->server->getConfigGroup()->getPropertyBool("player.verify-xuid", true);
+		$checkXUID = $this->server->getConfigGroup()->getPropertyBool(YmlServerProperties::PLAYER_VERIFY_XUID, true);
 		$myXUID = $this->info instanceof XboxLivePlayerInfo ? $this->info->getXuid() : "";
 		$kickForXUIDMismatch = function(string $xuid) use ($checkXUID, $myXUID) : bool{
 			if($checkXUID && $myXUID !== $xuid){
@@ -699,14 +877,14 @@ class NetworkSession{
 				if($kickForXUIDMismatch($info instanceof XboxLivePlayerInfo ? $info->getXuid() : "")){
 					return;
 				}
-				$ev = new PlayerDuplicateLoginEvent($this, $existingSession);
+				$ev = new PlayerDuplicateLoginEvent($this, $existingSession, KnownTranslationFactory::disconnectionScreen_loggedinOtherLocation(), null);
 				$ev->call();
 				if($ev->isCancelled()){
-					$this->disconnect($ev->getDisconnectMessage());
+					$this->disconnect($ev->getDisconnectReason(), $ev->getDisconnectScreenMessage());
 					return;
 				}
 
-				$existingSession->disconnect($ev->getDisconnectMessage());
+				$existingSession->disconnect($ev->getDisconnectReason(), $ev->getDisconnectScreenMessage());
 			}
 		}
 
@@ -731,9 +909,7 @@ class NetworkSession{
 
 				$this->cipher = EncryptionContext::fakeGCM($encryptionKey);
 
-				$this->setHandler(new HandshakePacketHandler(function() : void{
-					$this->onServerLoginSuccess();
-				}));
+				$this->setHandler(new HandshakePacketHandler($this->onServerLoginSuccess(...)));
 				$this->logger->debug("Enabled encryption");
 			}));
 		}else{
@@ -747,14 +923,26 @@ class NetworkSession{
 		$this->sendDataPacket(PlayStatusPacket::create(PlayStatusPacket::LOGIN_SUCCESS));
 
 		$this->logger->debug("Initiating resource packs phase");
-		$this->setHandler(new ResourcePacksPacketHandler($this, $this->server->getResourcePackManager(), function() : void{
+
+		$packManager = $this->server->getResourcePackManager();
+		$resourcePacks = $packManager->getResourceStack();
+		$keys = [];
+		foreach($resourcePacks as $resourcePack){
+			$key = $packManager->getPackEncryptionKey($resourcePack->getPackId());
+			if($key !== null){
+				$keys[$resourcePack->getPackId()] = $key;
+			}
+		}
+		$event = new PlayerResourcePackOfferEvent($this->info, $resourcePacks, $keys, $packManager->resourcePacksRequired());
+		$event->call();
+		$this->setHandler(new ResourcePacksPacketHandler($this, $event->getResourcePacks(), $event->getEncryptionKeys(), $event->mustAccept(), function() : void{
 			$this->createPlayer();
 		}));
 	}
 
 	private function beginSpawnSequence() : void{
 		$this->setHandler(new PreSpawnPacketHandler($this->server, $this->player, $this, $this->invManager));
-		$this->player->setImmobile(); //TODO: HACK: fix client-side falling pre-spawn
+		$this->player->setNoClientPredictions(); //TODO: HACK: fix client-side falling pre-spawn
 
 		$this->logger->debug("Waiting for chunk radius request");
 	}
@@ -762,14 +950,12 @@ class NetworkSession{
 	public function notifyTerrainReady() : void{
 		$this->logger->debug("Sending spawn notification, waiting for spawn response");
 		$this->sendDataPacket(PlayStatusPacket::create(PlayStatusPacket::PLAYER_SPAWN));
-		$this->setHandler(new SpawnResponsePacketHandler(function() : void{
-			$this->onClientSpawnResponse();
-		}));
+		$this->setHandler(new SpawnResponsePacketHandler($this->onClientSpawnResponse(...)));
 	}
 
 	private function onClientSpawnResponse() : void{
 		$this->logger->debug("Received spawn response, entering in-game phase");
-		$this->player->setImmobile(false); //TODO: HACK: we set this during the spawn sequence to prevent the client sending junk movements
+		$this->player->setNoClientPredictions(false); //TODO: HACK: we set this during the spawn sequence to prevent the client sending junk movements
 		$this->player->doFirstSpawn();
 		$this->forceAsyncCompression = false;
 		$this->setHandler(new InGamePacketHandler($this->player, $this, $this->invManager));
@@ -782,7 +968,7 @@ class NetworkSession{
 	}
 
 	public function onServerRespawn() : void{
-		$this->syncAttributes($this->player, $this->player->getAttributeMap()->getAll());
+		$this->entityEventBroadcaster->syncAttributes([$this], $this->player, $this->player->getAttributeMap()->getAll());
 		$this->player->sendData(null);
 
 		$this->syncAbilities($this->player);
@@ -833,7 +1019,7 @@ class NetworkSession{
 	}
 
 	public function syncGameMode(GameMode $mode, bool $isRollback = false) : void{
-		$this->sendDataPacket(SetPlayerGameTypePacket::create(TypeConverter::getInstance()->coreGameModeToProtocol($mode)));
+		$this->sendDataPacket(SetPlayerGameTypePacket::create($this->typeConverter->coreGameModeToProtocol($mode)));
 		if($this->player !== null){
 			$this->syncAbilities($this->player);
 			$this->syncAdventureSettings(); //TODO: we might be able to do this with the abilities packet alone
@@ -848,33 +1034,46 @@ class NetworkSession{
 
 		//ALL of these need to be set for the base layer, otherwise the client will cry
 		$boolAbilities = [
-			UpdateAbilitiesPacketLayer::ABILITY_ALLOW_FLIGHT => $for->getAllowFlight(),
-			UpdateAbilitiesPacketLayer::ABILITY_FLYING => $for->isFlying(),
-			UpdateAbilitiesPacketLayer::ABILITY_NO_CLIP => !$for->hasBlockCollision(),
-			UpdateAbilitiesPacketLayer::ABILITY_OPERATOR => $isOp,
-			UpdateAbilitiesPacketLayer::ABILITY_TELEPORT => $for->hasPermission(DefaultPermissionNames::COMMAND_TELEPORT_SELF),
-			UpdateAbilitiesPacketLayer::ABILITY_INVULNERABLE => $for->isCreative(),
-			UpdateAbilitiesPacketLayer::ABILITY_MUTED => !$for->hasPermission(DefaultPermissionNames::GAME_CHAT),
-			UpdateAbilitiesPacketLayer::ABILITY_WORLD_BUILDER => false,
-			UpdateAbilitiesPacketLayer::ABILITY_INFINITE_RESOURCES => !$for->hasFiniteResources(),
-			UpdateAbilitiesPacketLayer::ABILITY_LIGHTNING => false,
-			UpdateAbilitiesPacketLayer::ABILITY_BUILD => $for->hasPermission(DefaultPermissionNames::GAME_BLOCK_PLACE),
-			UpdateAbilitiesPacketLayer::ABILITY_MINE => $for->hasPermission(DefaultPermissionNames::GAME_BLOCK_BREAK),
-			UpdateAbilitiesPacketLayer::ABILITY_DOORS_AND_SWITCHES => $for->hasPermission(DefaultPermissionNames::GAME_BLOCK_INTERACT),
-			UpdateAbilitiesPacketLayer::ABILITY_OPEN_CONTAINERS => $for->hasPermission(DefaultPermissionNames::GAME_BLOCK_INTERACT) || $for->hasPermission(DefaultPermissionNames::GAME_ENTITY_INTERACT), //not perfect, but this is a pain to implement right now
-			UpdateAbilitiesPacketLayer::ABILITY_ATTACK_PLAYERS => $for->hasPermission(DefaultPermissionNames::GAME_PLAYER_ATTACK),
-			UpdateAbilitiesPacketLayer::ABILITY_ATTACK_MOBS => $for->hasPermission(DefaultPermissionNames::GAME_ENTITY_ATTACK),
+			AbilitiesLayer::ABILITY_ALLOW_FLIGHT => $for->getAllowFlight(),
+			AbilitiesLayer::ABILITY_FLYING => $for->isFlying(),
+			AbilitiesLayer::ABILITY_NO_CLIP => !$for->hasBlockCollision(),
+			AbilitiesLayer::ABILITY_OPERATOR => $isOp,
+			AbilitiesLayer::ABILITY_TELEPORT => $for->hasPermission(DefaultPermissionNames::COMMAND_TELEPORT_SELF),
+			AbilitiesLayer::ABILITY_INVULNERABLE => $for->isCreative(),
+			AbilitiesLayer::ABILITY_MUTED => !$for->hasPermission(DefaultPermissionNames::GAME_CHAT),
+			AbilitiesLayer::ABILITY_WORLD_BUILDER => false,
+			AbilitiesLayer::ABILITY_INFINITE_RESOURCES => !$for->hasFiniteResources(),
+			AbilitiesLayer::ABILITY_LIGHTNING => false,
+			AbilitiesLayer::ABILITY_BUILD => $for->hasPermission(DefaultPermissionNames::GAME_BLOCK_PLACE),
+			AbilitiesLayer::ABILITY_MINE => $for->hasPermission(DefaultPermissionNames::GAME_BLOCK_BREAK),
+			AbilitiesLayer::ABILITY_DOORS_AND_SWITCHES => $for->hasPermission(DefaultPermissionNames::GAME_BLOCK_INTERACT),
+			AbilitiesLayer::ABILITY_OPEN_CONTAINERS => $for->hasPermission(DefaultPermissionNames::GAME_BLOCK_INTERACT) || $for->hasPermission(DefaultPermissionNames::GAME_ENTITY_INTERACT), //not perfect, but this is a pain to implement right now
+			AbilitiesLayer::ABILITY_ATTACK_PLAYERS => $for->hasPermission(DefaultPermissionNames::GAME_PLAYER_ATTACK),
+			AbilitiesLayer::ABILITY_ATTACK_MOBS => $for->hasPermission(DefaultPermissionNames::GAME_ENTITY_ATTACK),
+			AbilitiesLayer::ABILITY_PRIVILEGED_BUILDER => false,
 		];
 
-		$this->sendDataPacket(UpdateAbilitiesPacket::create(
+		$layers = [
+			//TODO: dynamic flying speed! FINALLY!!!!!!!!!!!!!!!!!
+			new AbilitiesLayer(AbilitiesLayer::LAYER_BASE, $boolAbilities, 0.05, 0.1),
+		];
+		if(!$for->hasBlockCollision()){
+			//TODO: HACK! In 1.19.80, the client starts falling in our faux spectator mode when it clips into a
+			//block. We can't seem to prevent this short of forcing the player to always fly when block collision is
+			//disabled. Also, for some reason the client always reads flight state from this layer if present, even
+			//though the player isn't in spectator mode.
+
+			$layers[] = new AbilitiesLayer(AbilitiesLayer::LAYER_SPECTATOR, [
+				AbilitiesLayer::ABILITY_FLYING => true,
+			], null, null);
+		}
+
+		$this->sendDataPacket(UpdateAbilitiesPacket::create(new AbilitiesData(
 			$isOp ? CommandPermissions::OPERATOR : CommandPermissions::NORMAL,
 			$isOp ? PlayerPermissions::OPERATOR : PlayerPermissions::MEMBER,
 			$for->getId(),
-			[
-				//TODO: dynamic flying speed! FINALLY!!!!!!!!!!!!!!!!!
-				new UpdateAbilitiesPacketLayer(UpdateAbilitiesPacketLayer::LAYER_BASE, $boolAbilities, 0.05, 0.1),
-			]
-		));
+			$layers
+		)));
 	}
 
 	public function syncAdventureSettings() : void{
@@ -891,44 +1090,9 @@ class NetworkSession{
 		));
 	}
 
-	/**
-	 * @param Attribute[] $attributes
-	 */
-	public function syncAttributes(Living $entity, array $attributes) : void{
-		if(count($attributes) > 0){
-			$this->sendDataPacket(UpdateAttributesPacket::create($entity->getId(), array_map(function(Attribute $attr) : NetworkAttribute{
-				return new NetworkAttribute($attr->getId(), $attr->getMinValue(), $attr->getMaxValue(), $attr->getValue(), $attr->getDefaultValue(), []);
-			}, $attributes), 0));
-		}
-	}
-
-	/**
-	 * @param MetadataProperty[] $properties
-	 * @phpstan-param array<int, MetadataProperty> $properties
-	 */
-	public function syncActorData(Entity $entity, array $properties) : void{
-		//TODO: HACK! as of 1.18.10, the client responds differently to the same data ordered in different orders - for
-		//example, sending HEIGHT in the list before FLAGS when unsetting the SWIMMING flag results in a hitbox glitch
-		ksort($properties, SORT_NUMERIC);
-		$this->sendDataPacket(SetActorDataPacket::create($entity->getId(), $properties, new PropertySyncData([], []), 0));
-	}
-
-	public function onEntityEffectAdded(Living $entity, EffectInstance $effect, bool $replacesOldEffect) : void{
-		//TODO: we may need yet another effect <=> ID map in the future depending on protocol changes
-		$this->sendDataPacket(MobEffectPacket::add($entity->getId(), $replacesOldEffect, EffectIdMap::getInstance()->toId($effect->getType()), $effect->getAmplifier(), $effect->isVisible(), $effect->getDuration()));
-	}
-
-	public function onEntityEffectRemoved(Living $entity, EffectInstance $effect) : void{
-		$this->sendDataPacket(MobEffectPacket::remove($entity->getId(), EffectIdMap::getInstance()->toId($effect->getType())));
-	}
-
-	public function onEntityRemoved(Entity $entity) : void{
-		$this->sendDataPacket(RemoveActorPacket::create($entity->getId()));
-	}
-
 	public function syncAvailableCommands() : void{
 		$commandData = [];
-		foreach($this->server->getCommandMap()->getCommands() as $name => $command){
+		foreach($this->server->getCommandMap()->getCommands() as $command){
 			if(isset($commandData[$command->getLabel()]) || $command->getLabel() === "help" || !$command->testPermissionSilent($this->player)){
 				continue;
 			}
@@ -952,8 +1116,9 @@ class NetworkSession{
 				0,
 				$aliasObj,
 				[
-					[CommandParameter::standard("args", AvailableCommandsPacket::ARG_TYPE_RAWTEXT, 0, true)]
-				]
+					new CommandOverload(chaining: false, parameters: [CommandParameter::standard("args", AvailableCommandsPacket::ARG_TYPE_RAWTEXT, 0, true)])
+				],
+				chainedSubCommandData: []
 			);
 
 			$commandData[$command->getLabel()] = $data;
@@ -962,26 +1127,39 @@ class NetworkSession{
 		$this->sendDataPacket(AvailableCommandsPacket::create($commandData, [], [], []));
 	}
 
+	/**
+	 * @return string[][]
+	 * @phpstan-return array{string, string[]}
+	 */
+	public function prepareClientTranslatableMessage(Translatable $message) : array{
+		//we can't send nested translations to the client, so make sure they are always pre-translated by the server
+		$language = $this->player->getLanguage();
+		$parameters = array_map(fn(string|Translatable $p) => $p instanceof Translatable ? $language->translate($p) : $p, $message->getParameters());
+		return [$language->translateString($message->getText(), $parameters, "pocketmine."), $parameters];
+	}
+
 	public function onChatMessage(Translatable|string $message) : void{
 		if($message instanceof Translatable){
-			$language = $this->player->getLanguage();
 			if(!$this->server->isLanguageForced()){
-				//we can't send nested translations to the client, so make sure they are always pre-translated by the server
-				$parameters = array_map(fn(string|Translatable $p) => $p instanceof Translatable ? $language->translate($p) : $p, $message->getParameters());
-				$this->sendDataPacket(TextPacket::translation($language->translateString($message->getText(), $parameters, "pocketmine."), $parameters));
+				$this->sendDataPacket(TextPacket::translation(...$this->prepareClientTranslatableMessage($message)));
 			}else{
-				$this->sendDataPacket(TextPacket::raw($language->translate($message)));
+				$this->sendDataPacket(TextPacket::raw($this->player->getLanguage()->translate($message)));
 			}
 		}else{
 			$this->sendDataPacket(TextPacket::raw($message));
 		}
 	}
 
-	/**
-	 * @param string[] $parameters
-	 */
-	public function onJukeboxPopup(string $key, array $parameters) : void{
-		$this->sendDataPacket(TextPacket::jukeboxPopup($key, $parameters));
+	public function onJukeboxPopup(Translatable|string $message) : void{
+		$parameters = [];
+		if($message instanceof Translatable){
+			if(!$this->server->isLanguageForced()){
+				[$message, $parameters] = $this->prepareClientTranslatableMessage($message);
+			}else{
+				$message = $this->player->getLanguage()->translate($message);
+			}
+		}
+		$this->sendDataPacket(TextPacket::jukeboxPopup($message, $parameters));
 	}
 
 	public function onPopup(string $message) : void{
@@ -996,14 +1174,16 @@ class NetworkSession{
 		return $this->sendDataPacket(ModalFormRequestPacket::create($id, json_encode($form, JSON_THROW_ON_ERROR)));
 	}
 
+	public function onCloseAllForms() : void{
+		$this->sendDataPacket(ClientboundCloseFormPacket::create());
+	}
+
 	/**
 	 * Instructs the networksession to start using the chunk at the given coordinates. This may occur asynchronously.
 	 * @param \Closure $onCompletion To be called when chunk sending has completed.
 	 * @phpstan-param \Closure() : void $onCompletion
 	 */
 	public function startUsingChunk(int $chunkX, int $chunkZ, \Closure $onCompletion) : void{
-		Utils::validateCallableSignature(function() : void{}, $onCompletion);
-
 		$world = $this->player->getLocation()->getWorld();
 		ChunkCache::getInstance($world, $this->compressor)->request($chunkX, $chunkZ)->onResolve(
 
@@ -1017,7 +1197,7 @@ class NetworkSession{
 					$this->logger->debug("Tried to send no-longer-active chunk $chunkX $chunkZ in world " . $world->getFolderName());
 					return;
 				}
-				if(!$status->equals(UsedChunkStatus::REQUESTED_SENDING())){
+				if($status !== UsedChunkStatus::REQUESTED_SENDING){
 					//TODO: make this an error
 					//this could be triggered due to the shitty way that chunk resends are handled
 					//right now - not because of the spammy re-requesting, but because the chunk status reverts
@@ -1061,47 +1241,17 @@ class NetworkSession{
 		return $this->invManager;
 	}
 
-	/**
-	 * TODO: expand this to more than just humans
-	 */
-	public function onMobMainHandItemChange(Human $mob) : void{
-		//TODO: we could send zero for slot here because remote players don't need to know which slot was selected
-		$inv = $mob->getInventory();
-		$this->sendDataPacket(MobEquipmentPacket::create($mob->getId(), ItemStackWrapper::legacy(TypeConverter::getInstance()->coreItemStackToNet($inv->getItemInHand())), $inv->getHeldItemIndex(), $inv->getHeldItemIndex(), ContainerIds::INVENTORY));
-	}
-
-	public function onMobOffHandItemChange(Human $mob) : void{
-		$inv = $mob->getOffHandInventory();
-		$this->sendDataPacket(MobEquipmentPacket::create($mob->getId(), ItemStackWrapper::legacy(TypeConverter::getInstance()->coreItemStackToNet($inv->getItem(0))), 0, 0, ContainerIds::OFFHAND));
-	}
-
-	public function onMobArmorChange(Living $mob) : void{
-		$inv = $mob->getArmorInventory();
-		$converter = TypeConverter::getInstance();
-		$this->sendDataPacket(MobArmorEquipmentPacket::create(
-			$mob->getId(),
-			ItemStackWrapper::legacy($converter->coreItemStackToNet($inv->getHelmet())),
-			ItemStackWrapper::legacy($converter->coreItemStackToNet($inv->getChestplate())),
-			ItemStackWrapper::legacy($converter->coreItemStackToNet($inv->getLeggings())),
-			ItemStackWrapper::legacy($converter->coreItemStackToNet($inv->getBoots()))
-		));
-	}
-
-	public function onPlayerPickUpItem(Player $collector, Entity $pickedUp) : void{
-		$this->sendDataPacket(TakeItemActorPacket::create($collector->getId(), $pickedUp->getId()));
-	}
-
 	/**
 	 * @param Player[] $players
 	 */
 	public function syncPlayerList(array $players) : void{
 		$this->sendDataPacket(PlayerListPacket::add(array_map(function(Player $player) : PlayerListEntry{
-			return PlayerListEntry::createAdditionEntry($player->getUniqueId(), $player->getId(), $player->getDisplayName(), SkinAdapterSingleton::get()->toSkinData($player->getSkin()), $player->getXuid());
+			return PlayerListEntry::createAdditionEntry($player->getUniqueId(), $player->getId(), $player->getDisplayName(), $this->typeConverter->getSkinAdapter()->toSkinData($player->getSkin()), $player->getXuid());
 		}, $players)));
 	}
 
 	public function onPlayerAdded(Player $p) : void{
-		$this->sendDataPacket(PlayerListPacket::add([PlayerListEntry::createAdditionEntry($p->getUniqueId(), $p->getId(), $p->getDisplayName(), SkinAdapterSingleton::get()->toSkinData($p->getSkin()), $p->getXuid())]));
+		$this->sendDataPacket(PlayerListPacket::add([PlayerListEntry::createAdditionEntry($p->getUniqueId(), $p->getId(), $p->getDisplayName(), $this->typeConverter->getSkinAdapter()->toSkinData($p->getSkin()), $p->getXuid())]));
 	}
 
 	public function onPlayerRemoved(Player $p) : void{
@@ -1134,14 +1284,21 @@ class NetworkSession{
 		$this->sendDataPacket(SetTitlePacket::setAnimationTimes($fadeIn, $stay, $fadeOut));
 	}
 
-	public function onEmote(Human $from, string $emoteId) : void{
-		$this->sendDataPacket(EmotePacket::create($from->getId(), $emoteId, EmotePacket::FLAG_SERVER));
-	}
-
 	public function onToastNotification(string $title, string $body) : void{
 		$this->sendDataPacket(ToastRequestPacket::create($title, $body));
 	}
 
+	public function onOpenSignEditor(Vector3 $signPosition, bool $frontSide) : void{
+		$this->sendDataPacket(OpenSignPacket::create(BlockPosition::fromVector3($signPosition), $frontSide));
+	}
+
+	public function onItemCooldownChanged(Item $item, int $ticks) : void{
+		$this->sendDataPacket(PlayerStartItemCooldownPacket::create(
+			GlobalItemDataHandlers::getSerializer()->serializeType($item)->getName(),
+			$ticks
+		));
+	}
+
 	public function tick() : void{
 		if(!$this->isConnected()){
 			$this->dispose();
@@ -1150,7 +1307,7 @@ class NetworkSession{
 
 		if($this->info === null){
 			if(time() >= $this->connectTime + 10){
-				$this->disconnect("Login timeout");
+				$this->disconnectWithError(KnownTranslationFactory::pocketmine_disconnect_error_loginTimeout());
 			}
 
 			return;
@@ -1160,25 +1317,20 @@ class NetworkSession{
 			$this->player->doChunkRequests();
 
 			$dirtyAttributes = $this->player->getAttributeMap()->needSend();
-			$this->syncAttributes($this->player, $dirtyAttributes);
+			$this->entityEventBroadcaster->syncAttributes([$this], $this->player, $dirtyAttributes);
 			foreach($dirtyAttributes as $attribute){
 				//TODO: we might need to send these to other players in the future
 				//if that happens, this will need to become more complex than a flag on the attribute itself
 				$attribute->markSynchronized();
 			}
 		}
+		Timings::$playerNetworkSendInventorySync->startTiming();
+		try{
+			$this->invManager?->flushPendingUpdates();
+		}finally{
+			Timings::$playerNetworkSendInventorySync->stopTiming();
+		}
 
 		$this->flushSendBuffer();
-
-		$nowNs = hrtime(true);
-		$timeSinceLastUpdateNs = $nowNs - $this->lastPacketBudgetUpdateTimeNs;
-		if($timeSinceLastUpdateNs > 50_000_000){
-			$ticksSinceLastUpdate = intdiv($timeSinceLastUpdateNs, 50_000_000);
-			$this->incomingPacketBatchBudget = min(
-				$this->incomingPacketBatchBudget + (self::INCOMING_PACKET_BATCH_PER_TICK * 2 * $ticksSinceLastUpdate),
-				self::INCOMING_PACKET_BATCH_MAX_BUDGET
-			);
-			$this->lastPacketBudgetUpdateTimeNs = $nowNs;
-		}
 	}
 }
diff --git a/src/network/mcpe/PacketRateLimiter.php b/src/network/mcpe/PacketRateLimiter.php
new file mode 100644
index 0000000000..3f0fbf768a
--- /dev/null
+++ b/src/network/mcpe/PacketRateLimiter.php
@@ -0,0 +1,81 @@
+<?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;
+
+use pocketmine\network\PacketHandlingException;
+use function hrtime;
+use function intdiv;
+use function min;
+
+final class PacketRateLimiter{
+	/**
+	 * At most this many more packets can be received. If this reaches zero, any additional packets received will cause
+	 * the player to be kicked from the server.
+	 * This number is increased every tick up to a maximum limit, and decreased by one every time a packet is received.
+	 */
+	private int $budget;
+	private int $lastUpdateTimeNs;
+	private int $maxBudget;
+
+	public function __construct(
+		private string $name,
+		private int $averagePerTick,
+		int $maxBufferTicks,
+		private int $updateFrequencyNs = 50_000_000,
+	){
+		$this->maxBudget = $this->averagePerTick * $maxBufferTicks;
+		$this->budget = $this->maxBudget;
+		$this->lastUpdateTimeNs = hrtime(true);
+	}
+
+	/**
+	 * @throws PacketHandlingException if the rate limit has been exceeded
+	 */
+	public function decrement(int $amount = 1) : void{
+		if($this->budget <= 0){
+			$this->update();
+			if($this->budget <= 0){
+				throw new PacketHandlingException("Exceeded rate limit for \"$this->name\"");
+			}
+		}
+		$this->budget -= $amount;
+	}
+
+	public function update() : void{
+		$nowNs = hrtime(true);
+		$timeSinceLastUpdateNs = $nowNs - $this->lastUpdateTimeNs;
+		if($timeSinceLastUpdateNs > $this->updateFrequencyNs){
+			$ticksSinceLastUpdate = intdiv($timeSinceLastUpdateNs, $this->updateFrequencyNs);
+			/*
+			 * If the server takes an abnormally long time to process a tick, add the budget for time difference to
+			 * compensate. This extra budget may be very large, but it will disappear the next time a normal update
+			 * occurs. This ensures that backlogs during a large lag spike don't cause everyone to get kicked.
+			 * As long as all the backlogged packets are processed before the next tick, everything should be OK for
+			 * clients behaving normally.
+			 */
+			$this->budget = min($this->budget, $this->maxBudget) + ($this->averagePerTick * 2 * $ticksSinceLastUpdate);
+			$this->lastUpdateTimeNs = $nowNs;
+		}
+	}
+}
diff --git a/src/network/mcpe/PacketSender.php b/src/network/mcpe/PacketSender.php
index 4842ea93e9..36e556fe4a 100644
--- a/src/network/mcpe/PacketSender.php
+++ b/src/network/mcpe/PacketSender.php
@@ -28,7 +28,7 @@ interface PacketSender{
 	/**
 	 * Pushes a packet into the channel to be processed.
 	 */
-	public function send(string $payload, bool $immediate) : void;
+	public function send(string $payload, bool $immediate, ?int $receiptId) : void;
 
 	/**
 	 * Closes the channel, terminating the connection.
diff --git a/src/network/mcpe/StandardEntityEventBroadcaster.php b/src/network/mcpe/StandardEntityEventBroadcaster.php
new file mode 100644
index 0000000000..3e2df39948
--- /dev/null
+++ b/src/network/mcpe/StandardEntityEventBroadcaster.php
@@ -0,0 +1,154 @@
+<?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;
+
+use pocketmine\data\bedrock\EffectIdMap;
+use pocketmine\entity\Attribute;
+use pocketmine\entity\effect\EffectInstance;
+use pocketmine\entity\Entity;
+use pocketmine\entity\Human;
+use pocketmine\entity\Living;
+use pocketmine\network\mcpe\convert\TypeConverter;
+use pocketmine\network\mcpe\protocol\ClientboundPacket;
+use pocketmine\network\mcpe\protocol\EmotePacket;
+use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket;
+use pocketmine\network\mcpe\protocol\MobEffectPacket;
+use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
+use pocketmine\network\mcpe\protocol\RemoveActorPacket;
+use pocketmine\network\mcpe\protocol\SetActorDataPacket;
+use pocketmine\network\mcpe\protocol\TakeItemActorPacket;
+use pocketmine\network\mcpe\protocol\types\entity\PropertySyncData;
+use pocketmine\network\mcpe\protocol\types\entity\UpdateAttribute;
+use pocketmine\network\mcpe\protocol\types\inventory\ContainerIds;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStack;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
+use pocketmine\network\mcpe\protocol\UpdateAttributesPacket;
+use function array_map;
+use function count;
+use function ksort;
+use const SORT_NUMERIC;
+
+final class StandardEntityEventBroadcaster implements EntityEventBroadcaster{
+
+	public function __construct(
+		private PacketBroadcaster $broadcaster,
+		private TypeConverter $typeConverter
+	){}
+
+	/**
+	 * @param NetworkSession[] $recipients
+	 */
+	private function sendDataPacket(array $recipients, ClientboundPacket $packet) : void{
+		$this->broadcaster->broadcastPackets($recipients, [$packet]);
+	}
+
+	public function syncAttributes(array $recipients, Living $entity, array $attributes) : void{
+		if(count($attributes) > 0){
+			$this->sendDataPacket($recipients, UpdateAttributesPacket::create(
+				$entity->getId(),
+				array_map(fn(Attribute $attr) => new UpdateAttribute($attr->getId(), $attr->getMinValue(), $attr->getMaxValue(), $attr->getValue(), $attr->getMinValue(), $attr->getMaxValue(), $attr->getDefaultValue(), []), $attributes),
+				0
+			));
+		}
+	}
+
+	public function syncActorData(array $recipients, Entity $entity, array $properties) : void{
+		//TODO: HACK! as of 1.18.10, the client responds differently to the same data ordered in different orders - for
+		//example, sending HEIGHT in the list before FLAGS when unsetting the SWIMMING flag results in a hitbox glitch
+		ksort($properties, SORT_NUMERIC);
+		$this->sendDataPacket($recipients, SetActorDataPacket::create($entity->getId(), $properties, new PropertySyncData([], []), 0));
+	}
+
+	public function onEntityEffectAdded(array $recipients, Living $entity, EffectInstance $effect, bool $replacesOldEffect) : void{
+		//TODO: we may need yet another effect <=> ID map in the future depending on protocol changes
+		$this->sendDataPacket($recipients, MobEffectPacket::add(
+			$entity->getId(),
+			$replacesOldEffect,
+			EffectIdMap::getInstance()->toId($effect->getType()),
+			$effect->getAmplifier(),
+			$effect->isVisible(),
+			$effect->getDuration(),
+			tick: 0
+		));
+	}
+
+	public function onEntityEffectRemoved(array $recipients, Living $entity, EffectInstance $effect) : void{
+		$this->sendDataPacket($recipients, MobEffectPacket::remove($entity->getId(), EffectIdMap::getInstance()->toId($effect->getType()), tick: 0));
+	}
+
+	public function onEntityRemoved(array $recipients, Entity $entity) : void{
+		$this->sendDataPacket($recipients, RemoveActorPacket::create($entity->getId()));
+	}
+
+	public function onMobMainHandItemChange(array $recipients, Human $mob) : void{
+		//TODO: we could send zero for slot here because remote players don't need to know which slot was selected
+		$inv = $mob->getInventory();
+		$this->sendDataPacket($recipients, MobEquipmentPacket::create(
+			$mob->getId(),
+			ItemStackWrapper::legacy($this->typeConverter->coreItemStackToNet($inv->getItemInHand())),
+			$inv->getHeldItemIndex(),
+			$inv->getHeldItemIndex(),
+			ContainerIds::INVENTORY
+		));
+	}
+
+	public function onMobOffHandItemChange(array $recipients, Human $mob) : void{
+		$inv = $mob->getOffHandInventory();
+		$this->sendDataPacket($recipients, MobEquipmentPacket::create(
+			$mob->getId(),
+			ItemStackWrapper::legacy($this->typeConverter->coreItemStackToNet($inv->getItem(0))),
+			0,
+			0,
+			ContainerIds::OFFHAND
+		));
+	}
+
+	public function onMobArmorChange(array $recipients, Living $mob) : void{
+		$inv = $mob->getArmorInventory();
+		$converter = $this->typeConverter;
+		$this->sendDataPacket($recipients, MobArmorEquipmentPacket::create(
+			$mob->getId(),
+			ItemStackWrapper::legacy($converter->coreItemStackToNet($inv->getHelmet())),
+			ItemStackWrapper::legacy($converter->coreItemStackToNet($inv->getChestplate())),
+			ItemStackWrapper::legacy($converter->coreItemStackToNet($inv->getLeggings())),
+			ItemStackWrapper::legacy($converter->coreItemStackToNet($inv->getBoots())),
+			new ItemStackWrapper(0, ItemStack::null())
+		));
+	}
+
+	public function onPickUpItem(array $recipients, Entity $collector, Entity $pickedUp) : void{
+		$this->sendDataPacket($recipients, TakeItemActorPacket::create($collector->getId(), $pickedUp->getId()));
+	}
+
+	public function onEmote(array $recipients, Human $from, string $emoteId) : void{
+		$this->sendDataPacket($recipients, EmotePacket::create(
+			$from->getId(),
+			$emoteId,
+			0, //seems to be irrelevant for the client, we cannot risk rebroadcasting random values received
+			"",
+			"",
+			EmotePacket::FLAG_SERVER | EmotePacket::FLAG_MUTE_ANNOUNCEMENT
+		));
+	}
+}
diff --git a/src/network/mcpe/StandardPacketBroadcaster.php b/src/network/mcpe/StandardPacketBroadcaster.php
index 9cba70739c..7a91b397be 100644
--- a/src/network/mcpe/StandardPacketBroadcaster.php
+++ b/src/network/mcpe/StandardPacketBroadcaster.php
@@ -23,45 +23,72 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe;
 
+use pocketmine\event\server\DataPacketSendEvent;
 use pocketmine\network\mcpe\protocol\serializer\PacketBatch;
+use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
 use pocketmine\Server;
+use pocketmine\timings\Timings;
+use pocketmine\utils\BinaryStream;
+use function count;
+use function log;
 use function spl_object_id;
+use function strlen;
 
 final class StandardPacketBroadcaster implements PacketBroadcaster{
-	public function __construct(private Server $server){}
+	public function __construct(
+		private Server $server
+	){}
 
 	public function broadcastPackets(array $recipients, array $packets) : void{
-		$buffers = [];
-		$compressors = [];
-		$targetMap = [];
-		foreach($recipients as $recipient){
-			$serializerContext = $recipient->getPacketSerializerContext();
-			$bufferId = spl_object_id($serializerContext);
-			if(!isset($buffers[$bufferId])){
-				$buffers[$bufferId] = PacketBatch::fromPackets($serializerContext, ...$packets);
+		//TODO: this shouldn't really be called here, since the broadcaster might be replaced by an alternative
+		//implementation that doesn't fire events
+		if(DataPacketSendEvent::hasHandlers()){
+			$ev = new DataPacketSendEvent($recipients, $packets);
+			$ev->call();
+			if($ev->isCancelled()){
+				return;
 			}
+			$packets = $ev->getPackets();
+		}
 
+		$compressors = [];
+
+		$targetsByCompressor = [];
+		foreach($recipients as $recipient){
 			//TODO: different compressors might be compatible, it might not be necessary to split them up by object
 			$compressor = $recipient->getCompressor();
 			$compressors[spl_object_id($compressor)] = $compressor;
 
-			$targetMap[$bufferId][spl_object_id($compressor)][] = $recipient;
+			$targetsByCompressor[spl_object_id($compressor)][] = $recipient;
 		}
 
-		foreach($targetMap as $bufferId => $compressorMap){
-			$buffer = $buffers[$bufferId];
-			foreach($compressorMap as $compressorId => $compressorTargets){
-				$compressor = $compressors[$compressorId];
-				if(!$compressor->willCompress($buffer->getBuffer())){
-					foreach($compressorTargets as $target){
-						foreach($packets as $pk){
-							$target->addToSendBuffer($pk);
-						}
-					}
-				}else{
-					$promise = $this->server->prepareBatch($buffer, $compressor);
-					foreach($compressorTargets as $target){
-						$target->queueCompressed($promise);
+		$totalLength = 0;
+		$packetBuffers = [];
+		foreach($packets as $packet){
+			$buffer = NetworkSession::encodePacketTimed(PacketSerializer::encoder(), $packet);
+			//varint length prefix + packet buffer
+			$totalLength += (((int) log(strlen($buffer), 128)) + 1) + strlen($buffer);
+			$packetBuffers[] = $buffer;
+		}
+
+		foreach($targetsByCompressor as $compressorId => $compressorTargets){
+			$compressor = $compressors[$compressorId];
+
+			$threshold = $compressor->getCompressionThreshold();
+			if(count($compressorTargets) > 1 && $threshold !== null && $totalLength >= $threshold){
+				//do not prepare shared batch unless we're sure it will be compressed
+				$stream = new BinaryStream();
+				PacketBatch::encodeRaw($stream, $packetBuffers);
+				$batchBuffer = $stream->getBuffer();
+
+				$batch = $this->server->prepareBatch($batchBuffer, $compressor, timings: Timings::$playerNetworkSendCompressBroadcast);
+				foreach($compressorTargets as $target){
+					$target->queueCompressed($batch);
+				}
+			}else{
+				foreach($compressorTargets as $target){
+					foreach($packetBuffers as $packetBuffer){
+						$target->addToSendBuffer($packetBuffer);
 					}
 				}
 			}
diff --git a/src/network/mcpe/auth/ProcessLoginTask.php b/src/network/mcpe/auth/ProcessLoginTask.php
index 553fef68f2..b4c9e6d9ca 100644
--- a/src/network/mcpe/auth/ProcessLoginTask.php
+++ b/src/network/mcpe/auth/ProcessLoginTask.php
@@ -23,22 +23,28 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\auth;
 
-use pocketmine\lang\KnownTranslationKeys;
+use pocketmine\lang\KnownTranslationFactory;
+use pocketmine\lang\Translatable;
 use pocketmine\network\mcpe\JwtException;
 use pocketmine\network\mcpe\JwtUtils;
 use pocketmine\network\mcpe\protocol\types\login\JwtChainLinkBody;
 use pocketmine\network\mcpe\protocol\types\login\JwtHeader;
 use pocketmine\scheduler\AsyncTask;
+use pocketmine\thread\NonThreadSafeValue;
 use function base64_decode;
 use function igbinary_serialize;
 use function igbinary_unserialize;
-use function openssl_error_string;
 use function time;
 
 class ProcessLoginTask extends AsyncTask{
 	private const TLS_KEY_ON_COMPLETION = "completion";
 
-	public const MOJANG_ROOT_PUBLIC_KEY = "MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE8ELkixyLcwlZryUQcu1TvPOmI2B7vX83ndnWRUaXm74wFfa5f/lwQNTfrLVHa2PmenpGI6JhIMUJaWZrjmMj90NoKNFSNBuKdm8rYiXsfaz3K36x/1U26HpG0ZxK/V1V";
+	/**
+	 * New Mojang root auth key. Mojang notified third-party developers of this change prior to the release of 1.20.0.
+	 * Expectations were that this would be used starting a "couple of weeks" after the release, but as of 2023-07-01,
+	 * it has not yet been deployed.
+	 */
+	public const MOJANG_ROOT_PUBLIC_KEY = "MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAECRXueJeTDqNRRgJi/vlRufByu/2G0i2Ebt6YMar5QX/R0DIIyrJMcUpruK4QveTfJSTp3Shlq4Gk34cD/4GUWwkv0DVuzeuB+tXija7HBxii03NHDbPAD0AKnLr2wdAp";
 
 	private const CLOCK_DRIFT_MAX = 60;
 
@@ -48,8 +54,10 @@ class ProcessLoginTask extends AsyncTask{
 	 * Whether the keychain signatures were validated correctly. This will be set to an error message if any link in the
 	 * keychain is invalid for whatever reason (bad signature, not in nbf-exp window, etc). If this is non-null, the
 	 * keychain might have been tampered with. The player will always be disconnected if this is non-null.
+	 *
+	 * @phpstan-var NonThreadSafeValue<Translatable>|string|null
 	 */
-	private ?string $error = "Unknown";
+	private NonThreadSafeValue|string|null $error = "Unknown";
 	/**
 	 * Whether the player is logged into Xbox Live. This is true if any link in the keychain is signed with the Mojang
 	 * root public key.
@@ -59,7 +67,7 @@ class ProcessLoginTask extends AsyncTask{
 
 	/**
 	 * @param string[] $chainJwts
-	 * @phpstan-param \Closure(bool $isAuthenticated, bool $authRequired, ?string $error, ?string $clientPublicKey) : void $onCompletion
+	 * @phpstan-param \Closure(bool $isAuthenticated, bool $authRequired, Translatable|string|null $error, ?string $clientPublicKey) : void $onCompletion
 	 */
 	public function __construct(
 		array $chainJwts,
@@ -76,7 +84,8 @@ class ProcessLoginTask extends AsyncTask{
 			$this->clientPublicKey = $this->validateChain();
 			$this->error = null;
 		}catch(VerifyLoginException $e){
-			$this->error = $e->getMessage();
+			$disconnectMessage = $e->getDisconnectMessage();
+			$this->error = $disconnectMessage instanceof Translatable ? new NonThreadSafeValue($disconnectMessage) : $disconnectMessage;
 		}
 	}
 
@@ -109,19 +118,20 @@ class ProcessLoginTask extends AsyncTask{
 		try{
 			[$headersArray, $claimsArray, ] = JwtUtils::parse($jwt);
 		}catch(JwtException $e){
-			throw new VerifyLoginException("Failed to parse JWT: " . $e->getMessage(), 0, $e);
+			throw new VerifyLoginException("Failed to parse JWT: " . $e->getMessage(), null, 0, $e);
 		}
 
 		$mapper = new \JsonMapper();
 		$mapper->bExceptionOnMissingData = true;
 		$mapper->bExceptionOnUndefinedProperty = true;
+		$mapper->bStrictObjectTypeChecking = true;
 		$mapper->bEnforceMapType = false;
 
 		try{
 			/** @var JwtHeader $headers */
 			$headers = $mapper->map($headersArray, new JwtHeader());
 		}catch(\JsonMapper_Exception $e){
-			throw new VerifyLoginException("Invalid JWT header: " . $e->getMessage(), 0, $e);
+			throw new VerifyLoginException("Invalid JWT header: " . $e->getMessage(), null, 0, $e);
 		}
 
 		$headerDerKey = base64_decode($headers->x5u, true);
@@ -131,24 +141,24 @@ class ProcessLoginTask extends AsyncTask{
 
 		if($currentPublicKey === null){
 			if(!$first){
-				throw new VerifyLoginException(KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_MISSINGKEY);
+				throw new VerifyLoginException("Missing JWT public key", KnownTranslationFactory::pocketmine_disconnect_invalidSession_missingKey());
 			}
 		}elseif($headerDerKey !== $currentPublicKey){
 			//Fast path: if the header key doesn't match what we expected, the signature isn't going to validate anyway
-			throw new VerifyLoginException(KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_BADSIGNATURE);
+			throw new VerifyLoginException("Invalid JWT signature", KnownTranslationFactory::pocketmine_disconnect_invalidSession_badSignature());
 		}
 
 		try{
 			$signingKeyOpenSSL = JwtUtils::parseDerPublicKey($headerDerKey);
 		}catch(JwtException $e){
-			throw new VerifyLoginException("Invalid JWT public key: " . openssl_error_string());
+			throw new VerifyLoginException("Invalid JWT public key: " . $e->getMessage(), null, 0, $e);
 		}
 		try{
 			if(!JwtUtils::verify($jwt, $signingKeyOpenSSL)){
-				throw new VerifyLoginException(KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_BADSIGNATURE);
+				throw new VerifyLoginException("Invalid JWT signature", KnownTranslationFactory::pocketmine_disconnect_invalidSession_badSignature());
 			}
 		}catch(JwtException $e){
-			throw new VerifyLoginException($e->getMessage(), 0, $e);
+			throw new VerifyLoginException($e->getMessage(), null, 0, $e);
 		}
 
 		if($headers->x5u === self::MOJANG_ROOT_PUBLIC_KEY){
@@ -158,22 +168,23 @@ class ProcessLoginTask extends AsyncTask{
 		$mapper = new \JsonMapper();
 		$mapper->bExceptionOnUndefinedProperty = false; //we only care about the properties we're using in this case
 		$mapper->bExceptionOnMissingData = true;
+		$mapper->bStrictObjectTypeChecking = true;
 		$mapper->bEnforceMapType = false;
 		$mapper->bRemoveUndefinedAttributes = true;
 		try{
 			/** @var JwtChainLinkBody $claims */
 			$claims = $mapper->map($claimsArray, new JwtChainLinkBody());
 		}catch(\JsonMapper_Exception $e){
-			throw new VerifyLoginException("Invalid chain link body: " . $e->getMessage(), 0, $e);
+			throw new VerifyLoginException("Invalid chain link body: " . $e->getMessage(), null, 0, $e);
 		}
 
 		$time = time();
 		if(isset($claims->nbf) && $claims->nbf > $time + self::CLOCK_DRIFT_MAX){
-			throw new VerifyLoginException(KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_TOOEARLY);
+			throw new VerifyLoginException("JWT not yet valid", KnownTranslationFactory::pocketmine_disconnect_invalidSession_tooEarly());
 		}
 
 		if(isset($claims->exp) && $claims->exp < $time - self::CLOCK_DRIFT_MAX){
-			throw new VerifyLoginException(KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_TOOLATE);
+			throw new VerifyLoginException("JWT expired", KnownTranslationFactory::pocketmine_disconnect_invalidSession_tooLate());
 		}
 
 		if(isset($claims->identityPublicKey)){
@@ -181,6 +192,12 @@ class ProcessLoginTask extends AsyncTask{
 			if($identityPublicKey === false){
 				throw new VerifyLoginException("Invalid identityPublicKey: base64 error decoding");
 			}
+			try{
+				//verify key format and parameters
+				JwtUtils::parseDerPublicKey($identityPublicKey);
+			}catch(JwtException $e){
+				throw new VerifyLoginException("Invalid identityPublicKey: " . $e->getMessage(), null, 0, $e);
+			}
 			$currentPublicKey = $identityPublicKey; //if there are further links, the next link should be signed with this
 		}
 	}
@@ -188,9 +205,9 @@ class ProcessLoginTask extends AsyncTask{
 	public function onCompletion() : void{
 		/**
 		 * @var \Closure $callback
-		 * @phpstan-var \Closure(bool, bool, ?string, ?string) : void $callback
+		 * @phpstan-var \Closure(bool, bool, Translatable|string|null, ?string) : void $callback
 		 */
 		$callback = $this->fetchLocal(self::TLS_KEY_ON_COMPLETION);
-		$callback($this->authenticated, $this->authRequired, $this->error, $this->clientPublicKey);
+		$callback($this->authenticated, $this->authRequired, $this->error instanceof NonThreadSafeValue ? $this->error->deserialize() : $this->error, $this->clientPublicKey);
 	}
 }
diff --git a/src/network/mcpe/auth/VerifyLoginException.php b/src/network/mcpe/auth/VerifyLoginException.php
index b112215a81..b58c97416c 100644
--- a/src/network/mcpe/auth/VerifyLoginException.php
+++ b/src/network/mcpe/auth/VerifyLoginException.php
@@ -23,6 +23,16 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\auth;
 
+use pocketmine\lang\Translatable;
+
 class VerifyLoginException extends \RuntimeException{
 
+	private Translatable|string $disconnectMessage;
+
+	public function __construct(string $message, Translatable|string|null $disconnectMessage = null, int $code = 0, ?\Throwable $previous = null){
+		parent::__construct($message, $code, $previous);
+		$this->disconnectMessage = $disconnectMessage ?? $message;
+	}
+
+	public function getDisconnectMessage() : Translatable|string{ return $this->disconnectMessage; }
 }
diff --git a/src/network/mcpe/cache/ChunkCache.php b/src/network/mcpe/cache/ChunkCache.php
index 15b6969456..12e7697762 100644
--- a/src/network/mcpe/cache/ChunkCache.php
+++ b/src/network/mcpe/cache/ChunkCache.php
@@ -27,6 +27,7 @@ use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\ChunkRequestTask;
 use pocketmine\network\mcpe\compression\CompressBatchPromise;
 use pocketmine\network\mcpe\compression\Compressor;
+use pocketmine\network\mcpe\protocol\types\DimensionIds;
 use pocketmine\world\ChunkListener;
 use pocketmine\world\ChunkListenerNoOpTrait;
 use pocketmine\world\format\Chunk;
@@ -77,7 +78,10 @@ class ChunkCache implements ChunkListener{
 		}
 	}
 
-	/** @var CompressBatchPromise[] */
+	/**
+	 * @var CompressBatchPromise[]
+	 * @phpstan-var array<int, CompressBatchPromise>
+	 */
 	private array $caches = [];
 
 	private int $hits = 0;
@@ -116,16 +120,10 @@ class ChunkCache implements ChunkListener{
 				new ChunkRequestTask(
 					$chunkX,
 					$chunkZ,
+					DimensionIds::OVERWORLD, //TODO: not hardcode this
 					$chunk,
 					$this->caches[$chunkHash],
-					$this->compressor,
-					function() use ($chunkHash, $chunkX, $chunkZ) : void{
-						$this->world->getLogger()->error("Failed preparing chunk $chunkX $chunkZ, retrying");
-
-						if(isset($this->caches[$chunkHash])){
-							$this->restartPendingRequest($chunkX, $chunkZ);
-						}
-					}
+					$this->compressor
 				)
 			);
 
@@ -143,32 +141,19 @@ class ChunkCache implements ChunkListener{
 		return $existing !== null;
 	}
 
-	/**
-	 * Restarts an async request for an unresolved chunk.
-	 *
-	 * @throws \InvalidArgumentException
-	 */
-	private function restartPendingRequest(int $chunkX, int $chunkZ) : void{
-		$chunkHash = World::chunkHash($chunkX, $chunkZ);
-		$existing = $this->caches[$chunkHash] ?? null;
-		if($existing === null || $existing->hasResult()){
-			throw new \InvalidArgumentException("Restart can only be applied to unresolved promises");
-		}
-		$existing->cancel();
-		unset($this->caches[$chunkHash]);
-
-		$this->request($chunkX, $chunkZ)->onResolve(...$existing->getResolveCallbacks());
-	}
-
 	/**
 	 * @throws \InvalidArgumentException
 	 */
 	private function destroyOrRestart(int $chunkX, int $chunkZ) : void{
-		$cache = $this->caches[World::chunkHash($chunkX, $chunkZ)] ?? null;
+		$chunkPosHash = World::chunkHash($chunkX, $chunkZ);
+		$cache = $this->caches[$chunkPosHash] ?? null;
 		if($cache !== null){
 			if(!$cache->hasResult()){
 				//some requesters are waiting for this chunk, so their request needs to be fulfilled
-				$this->restartPendingRequest($chunkX, $chunkZ);
+				$cache->cancel();
+				unset($this->caches[$chunkPosHash]);
+
+				$this->request($chunkX, $chunkZ)->onResolve(...$cache->getResolveCallbacks());
 			}else{
 				//dump the cache, it'll be regenerated the next time it's requested
 				$this->destroy($chunkX, $chunkZ);
diff --git a/src/network/mcpe/cache/CraftingDataCache.php b/src/network/mcpe/cache/CraftingDataCache.php
index 8589f1881c..14523f74c7 100644
--- a/src/network/mcpe/cache/CraftingDataCache.php
+++ b/src/network/mcpe/cache/CraftingDataCache.php
@@ -25,18 +25,18 @@ namespace pocketmine\network\mcpe\cache;
 
 use pocketmine\crafting\CraftingManager;
 use pocketmine\crafting\FurnaceType;
+use pocketmine\crafting\ShapedRecipe;
+use pocketmine\crafting\ShapelessRecipe;
 use pocketmine\crafting\ShapelessRecipeType;
-use pocketmine\item\Item;
-use pocketmine\network\mcpe\convert\ItemTranslator;
 use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\CraftingDataPacket;
-use pocketmine\network\mcpe\protocol\types\inventory\ItemStack;
 use pocketmine\network\mcpe\protocol\types\recipe\CraftingRecipeBlockName;
 use pocketmine\network\mcpe\protocol\types\recipe\FurnaceRecipe as ProtocolFurnaceRecipe;
 use pocketmine\network\mcpe\protocol\types\recipe\FurnaceRecipeBlockName;
+use pocketmine\network\mcpe\protocol\types\recipe\IntIdMetaItemDescriptor;
 use pocketmine\network\mcpe\protocol\types\recipe\PotionContainerChangeRecipe as ProtocolPotionContainerChangeRecipe;
 use pocketmine\network\mcpe\protocol\types\recipe\PotionTypeRecipe as ProtocolPotionTypeRecipe;
-use pocketmine\network\mcpe\protocol\types\recipe\RecipeIngredient;
+use pocketmine\network\mcpe\protocol\types\recipe\RecipeUnlockingRequirement;
 use pocketmine\network\mcpe\protocol\types\recipe\ShapedRecipe as ProtocolShapedRecipe;
 use pocketmine\network\mcpe\protocol\types\recipe\ShapelessRecipe as ProtocolShapelessRecipe;
 use pocketmine\timings\Timings;
@@ -76,66 +76,68 @@ final class CraftingDataCache{
 	private function buildCraftingDataCache(CraftingManager $manager) : CraftingDataPacket{
 		Timings::$craftingDataCacheRebuild->startTiming();
 
-		$counter = 0;
 		$nullUUID = Uuid::fromString(Uuid::NIL);
 		$converter = TypeConverter::getInstance();
 		$recipesWithTypeIds = [];
-		foreach($manager->getShapelessRecipes() as $list){
-			foreach($list as $recipe){
-				$typeTag = match($recipe->getType()->id()){
-					ShapelessRecipeType::CRAFTING()->id() => CraftingRecipeBlockName::CRAFTING_TABLE,
-					ShapelessRecipeType::STONECUTTER()->id() => CraftingRecipeBlockName::STONECUTTER,
-					default => throw new AssumptionFailedError("Unreachable"),
+
+		$noUnlockingRequirement = new RecipeUnlockingRequirement(null);
+		foreach($manager->getCraftingRecipeIndex() as $index => $recipe){
+			if($recipe instanceof ShapelessRecipe){
+				$typeTag = match($recipe->getType()){
+					ShapelessRecipeType::CRAFTING => CraftingRecipeBlockName::CRAFTING_TABLE,
+					ShapelessRecipeType::STONECUTTER => CraftingRecipeBlockName::STONECUTTER,
+					ShapelessRecipeType::CARTOGRAPHY => CraftingRecipeBlockName::CARTOGRAPHY_TABLE,
+					ShapelessRecipeType::SMITHING => CraftingRecipeBlockName::SMITHING_TABLE,
 				};
 				$recipesWithTypeIds[] = new ProtocolShapelessRecipe(
 					CraftingDataPacket::ENTRY_SHAPELESS,
-					Binary::writeInt(++$counter),
-					array_map(function(Item $item) use ($converter) : RecipeIngredient{
-						return $converter->coreItemStackToRecipeIngredient($item);
-					}, $recipe->getIngredientList()),
-					array_map(function(Item $item) use ($converter) : ItemStack{
-						return $converter->coreItemStackToNet($item);
-					}, $recipe->getResults()),
+					Binary::writeInt($index),
+					array_map($converter->coreRecipeIngredientToNet(...), $recipe->getIngredientList()),
+					array_map($converter->coreItemStackToNet(...), $recipe->getResults()),
 					$nullUUID,
 					$typeTag,
 					50,
-					$counter
+					$noUnlockingRequirement,
+					$index
 				);
-			}
-		}
-		foreach($manager->getShapedRecipes() as $list){
-			foreach($list as $recipe){
+			}elseif($recipe instanceof ShapedRecipe){
 				$inputs = [];
 
 				for($row = 0, $height = $recipe->getHeight(); $row < $height; ++$row){
 					for($column = 0, $width = $recipe->getWidth(); $column < $width; ++$column){
-						$inputs[$row][$column] = $converter->coreItemStackToRecipeIngredient($recipe->getIngredient($column, $row));
+						$inputs[$row][$column] = $converter->coreRecipeIngredientToNet($recipe->getIngredient($column, $row));
 					}
 				}
 				$recipesWithTypeIds[] = $r = new ProtocolShapedRecipe(
 					CraftingDataPacket::ENTRY_SHAPED,
-					Binary::writeInt(++$counter),
+					Binary::writeInt($index),
 					$inputs,
-					array_map(function(Item $item) use ($converter) : ItemStack{
-						return $converter->coreItemStackToNet($item);
-					}, $recipe->getResults()),
+					array_map($converter->coreItemStackToNet(...), $recipe->getResults()),
 					$nullUUID,
 					CraftingRecipeBlockName::CRAFTING_TABLE,
 					50,
-					$counter
+					true,
+					$noUnlockingRequirement,
+					$index,
 				);
+			}else{
+				//TODO: probably special recipe types
 			}
 		}
 
-		foreach(FurnaceType::getAll() as $furnaceType){
-			$typeTag = match($furnaceType->id()){
-				FurnaceType::FURNACE()->id() => FurnaceRecipeBlockName::FURNACE,
-				FurnaceType::BLAST_FURNACE()->id() => FurnaceRecipeBlockName::BLAST_FURNACE,
-				FurnaceType::SMOKER()->id() => FurnaceRecipeBlockName::SMOKER,
-				default => throw new AssumptionFailedError("Unreachable"),
+		foreach(FurnaceType::cases() as $furnaceType){
+			$typeTag = match($furnaceType){
+				FurnaceType::FURNACE => FurnaceRecipeBlockName::FURNACE,
+				FurnaceType::BLAST_FURNACE => FurnaceRecipeBlockName::BLAST_FURNACE,
+				FurnaceType::SMOKER => FurnaceRecipeBlockName::SMOKER,
+				FurnaceType::CAMPFIRE => FurnaceRecipeBlockName::CAMPFIRE,
+				FurnaceType::SOUL_CAMPFIRE => FurnaceRecipeBlockName::SOUL_CAMPFIRE
 			};
 			foreach($manager->getFurnaceRecipeManager($furnaceType)->getAll() as $recipe){
-				$input = $converter->coreItemStackToNet($recipe->getInput());
+				$input = $converter->coreRecipeIngredientToNet($recipe->getInput())->getDescriptor();
+				if(!$input instanceof IntIdMetaItemDescriptor){
+					throw new AssumptionFailedError();
+				}
 				$recipesWithTypeIds[] = new ProtocolFurnaceRecipe(
 					CraftingDataPacket::ENTRY_FURNACE_DATA,
 					$input->getId(),
@@ -147,35 +149,37 @@ final class CraftingDataCache{
 		}
 
 		$potionTypeRecipes = [];
-		foreach($manager->getPotionTypeRecipes() as $recipes){
-			foreach($recipes as $recipe){
-				$input = $converter->coreItemStackToNet($recipe->getInput());
-				$ingredient = $converter->coreItemStackToNet($recipe->getIngredient());
-				$output = $converter->coreItemStackToNet($recipe->getOutput());
-				$potionTypeRecipes[] = new ProtocolPotionTypeRecipe(
-					$input->getId(),
-					$input->getMeta(),
-					$ingredient->getId(),
-					$ingredient->getMeta(),
-					$output->getId(),
-					$output->getMeta()
-				);
+		foreach($manager->getPotionTypeRecipes() as $recipe){
+			$input = $converter->coreRecipeIngredientToNet($recipe->getInput())->getDescriptor();
+			$ingredient = $converter->coreRecipeIngredientToNet($recipe->getIngredient())->getDescriptor();
+			if(!$input instanceof IntIdMetaItemDescriptor || !$ingredient instanceof IntIdMetaItemDescriptor){
+				throw new AssumptionFailedError();
 			}
+			$output = $converter->coreItemStackToNet($recipe->getOutput());
+			$potionTypeRecipes[] = new ProtocolPotionTypeRecipe(
+				$input->getId(),
+				$input->getMeta(),
+				$ingredient->getId(),
+				$ingredient->getMeta(),
+				$output->getId(),
+				$output->getMeta()
+			);
 		}
 
 		$potionContainerChangeRecipes = [];
-		$itemTranslator = ItemTranslator::getInstance();
-		foreach($manager->getPotionContainerChangeRecipes() as $recipes){
-			foreach($recipes as $recipe){
-				$input = $itemTranslator->toNetworkId($recipe->getInputItemId(), 0);
-				$ingredient = $itemTranslator->toNetworkId($recipe->getIngredient()->getId(), 0);
-				$output = $itemTranslator->toNetworkId($recipe->getOutputItemId(), 0);
-				$potionContainerChangeRecipes[] = new ProtocolPotionContainerChangeRecipe(
-					$input[0],
-					$ingredient[0],
-					$output[0]
-				);
+		$itemTypeDictionary = $converter->getItemTypeDictionary();
+		foreach($manager->getPotionContainerChangeRecipes() as $recipe){
+			$input = $itemTypeDictionary->fromStringId($recipe->getInputItemId());
+			$ingredient = $converter->coreRecipeIngredientToNet($recipe->getIngredient())->getDescriptor();
+			if(!$ingredient instanceof IntIdMetaItemDescriptor){
+				throw new AssumptionFailedError();
 			}
+			$output = $itemTypeDictionary->fromStringId($recipe->getOutputItemId());
+			$potionContainerChangeRecipes[] = new ProtocolPotionContainerChangeRecipe(
+				$input,
+				$ingredient->getId(),
+				$output
+			);
 		}
 
 		Timings::$craftingDataCacheRebuild->stopTiming();
diff --git a/src/network/mcpe/cache/CreativeInventoryCache.php b/src/network/mcpe/cache/CreativeInventoryCache.php
new file mode 100644
index 0000000000..04fc52604c
--- /dev/null
+++ b/src/network/mcpe/cache/CreativeInventoryCache.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\network\mcpe\cache;
+
+use pocketmine\inventory\CreativeInventory;
+use pocketmine\network\mcpe\convert\TypeConverter;
+use pocketmine\network\mcpe\protocol\CreativeContentPacket;
+use pocketmine\network\mcpe\protocol\types\inventory\CreativeContentEntry;
+use pocketmine\utils\SingletonTrait;
+use function spl_object_id;
+
+final class CreativeInventoryCache{
+	use SingletonTrait;
+
+	/**
+	 * @var CreativeContentPacket[]
+	 * @phpstan-var array<int, CreativeContentPacket>
+	 */
+	private array $caches = [];
+
+	public function getCache(CreativeInventory $inventory) : CreativeContentPacket{
+		$id = spl_object_id($inventory);
+		if(!isset($this->caches[$id])){
+			$inventory->getDestructorCallbacks()->add(function() use ($id) : void{
+				unset($this->caches[$id]);
+			});
+			$inventory->getContentChangedCallbacks()->add(function() use ($id) : void{
+				unset($this->caches[$id]);
+			});
+			$this->caches[$id] = $this->buildCreativeInventoryCache($inventory);
+		}
+		return $this->caches[$id];
+	}
+
+	/**
+	 * Rebuild the cache for the given inventory.
+	 */
+	private function buildCreativeInventoryCache(CreativeInventory $inventory) : CreativeContentPacket{
+		$entries = [];
+		$typeConverter = TypeConverter::getInstance();
+		//creative inventory may have holes if items were unregistered - ensure network IDs used are always consistent
+		foreach($inventory->getAll() as $k => $item){
+			$entries[] = new CreativeContentEntry($k, $typeConverter->coreItemStackToNet($item));
+		}
+
+		return CreativeContentPacket::create($entries);
+	}
+}
diff --git a/src/network/mcpe/cache/StaticPacketCache.php b/src/network/mcpe/cache/StaticPacketCache.php
index 4cf878fc39..88a5226002 100644
--- a/src/network/mcpe/cache/StaticPacketCache.php
+++ b/src/network/mcpe/cache/StaticPacketCache.php
@@ -23,13 +23,13 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\cache;
 
+use pocketmine\data\bedrock\BedrockDataFiles;
 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\CacheableNbt;
 use pocketmine\utils\Filesystem;
 use pocketmine\utils\SingletonTrait;
-use Symfony\Component\Filesystem\Path;
 
 class StaticPacketCache{
 	use SingletonTrait;
@@ -43,8 +43,8 @@ class StaticPacketCache{
 
 	private static function make() : self{
 		return new self(
-			BiomeDefinitionListPacket::create(self::loadCompoundFromFile(Path::join(\pocketmine\BEDROCK_DATA_PATH, 'biome_definitions.nbt'))),
-			AvailableActorIdentifiersPacket::create(self::loadCompoundFromFile(Path::join(\pocketmine\BEDROCK_DATA_PATH, 'entity_identifiers.nbt')))
+			BiomeDefinitionListPacket::create(self::loadCompoundFromFile(BedrockDataFiles::BIOME_DEFINITIONS_NBT)),
+			AvailableActorIdentifiersPacket::create(self::loadCompoundFromFile(BedrockDataFiles::ENTITY_IDENTIFIERS_NBT))
 		);
 	}
 
diff --git a/src/network/mcpe/compression/CompressBatchPromise.php b/src/network/mcpe/compression/CompressBatchPromise.php
index 3b8c9680ba..12ac35c604 100644
--- a/src/network/mcpe/compression/CompressBatchPromise.php
+++ b/src/network/mcpe/compression/CompressBatchPromise.php
@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\compression;
 
-use pocketmine\utils\Utils;
 use function array_push;
 
 class CompressBatchPromise{
@@ -42,9 +41,6 @@ class CompressBatchPromise{
 	 */
 	public function onResolve(\Closure ...$callbacks) : void{
 		$this->checkCancelled();
-		foreach($callbacks as $callback){
-			Utils::validateCallableSignature(function(CompressBatchPromise $promise) : void{}, $callback);
-		}
 		if($this->result !== null){
 			foreach($callbacks as $callback){
 				$callback($this);
diff --git a/src/network/mcpe/compression/CompressBatchTask.php b/src/network/mcpe/compression/CompressBatchTask.php
index b863076fa1..a513cfa86c 100644
--- a/src/network/mcpe/compression/CompressBatchTask.php
+++ b/src/network/mcpe/compression/CompressBatchTask.php
@@ -24,21 +24,28 @@ declare(strict_types=1);
 namespace pocketmine\network\mcpe\compression;
 
 use pocketmine\scheduler\AsyncTask;
+use pocketmine\thread\NonThreadSafeValue;
+use function chr;
 
 class CompressBatchTask extends AsyncTask{
 
 	private const TLS_KEY_PROMISE = "promise";
 
+	/** @phpstan-var NonThreadSafeValue<Compressor> */
+	private NonThreadSafeValue $compressor;
+
 	public function __construct(
 		private string $data,
 		CompressBatchPromise $promise,
-		private Compressor $compressor
+		Compressor $compressor
 	){
+		$this->compressor = new NonThreadSafeValue($compressor);
 		$this->storeLocal(self::TLS_KEY_PROMISE, $promise);
 	}
 
 	public function onRun() : void{
-		$this->setResult($this->compressor->compress($this->data));
+		$compressor = $this->compressor->deserialize();
+		$this->setResult(chr($compressor->getNetworkId()) . $compressor->compress($this->data));
 	}
 
 	public function onCompletion() : void{
diff --git a/src/network/mcpe/compression/Compressor.php b/src/network/mcpe/compression/Compressor.php
index e15c7eb85a..fbb98e7890 100644
--- a/src/network/mcpe/compression/Compressor.php
+++ b/src/network/mcpe/compression/Compressor.php
@@ -23,14 +23,31 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\compression;
 
+use pocketmine\network\mcpe\protocol\types\CompressionAlgorithm;
+
 interface Compressor{
-
-	public function willCompress(string $data) : bool;
-
 	/**
 	 * @throws DecompressionException
 	 */
 	public function decompress(string $payload) : string;
 
 	public function compress(string $payload) : string;
+
+	/**
+	 * Returns the canonical ID of this compressor, used to tell the remote end how to decompress a packet compressed
+	 * with this compressor.
+	 *
+	 * @return CompressionAlgorithm::*
+	 */
+	public function getNetworkId() : int;
+
+	/**
+	 * Returns the minimum size of packet batch that the compressor will attempt to compress.
+	 *
+	 * The compressor's output **MUST** still be valid input for the decompressor even if the compressor input is
+	 * below this threshold.
+	 * However, it may choose to use a cheaper compression option (e.g. zlib level 0, which simply wraps the data and
+	 * doesn't attempt to compress it) to avoid wasting CPU time.
+	 */
+	public function getCompressionThreshold() : ?int;
 }
diff --git a/src/network/mcpe/compression/ZlibCompressor.php b/src/network/mcpe/compression/ZlibCompressor.php
index a9ad2718e0..e908721c7a 100644
--- a/src/network/mcpe/compression/ZlibCompressor.php
+++ b/src/network/mcpe/compression/ZlibCompressor.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\compression;
 
+use pocketmine\network\mcpe\protocol\types\CompressionAlgorithm;
 use pocketmine\utils\SingletonTrait;
 use pocketmine\utils\Utils;
 use function function_exists;
@@ -37,7 +38,7 @@ final class ZlibCompressor implements Compressor{
 
 	public const DEFAULT_LEVEL = 7;
 	public const DEFAULT_THRESHOLD = 256;
-	public const DEFAULT_MAX_DECOMPRESSION_SIZE = 2 * 1024 * 1024;
+	public const DEFAULT_MAX_DECOMPRESSION_SIZE = 8 * 1024 * 1024;
 
 	/**
 	 * @see SingletonTrait::make()
@@ -48,12 +49,12 @@ final class ZlibCompressor implements Compressor{
 
 	public function __construct(
 		private int $level,
-		private int $minCompressionSize,
+		private ?int $minCompressionSize,
 		private int $maxDecompressionSize
 	){}
 
-	public function willCompress(string $data) : bool{
-		return $this->minCompressionSize > -1 && strlen($data) >= $this->minCompressionSize;
+	public function getCompressionThreshold() : ?int{
+		return $this->minCompressionSize;
 	}
 
 	/**
@@ -67,16 +68,16 @@ final class ZlibCompressor implements Compressor{
 		return $result;
 	}
 
-	private static function zlib_encode(string $data, int $level) : string{
-		return Utils::assumeNotFalse(zlib_encode($data, ZLIB_ENCODING_RAW, $level), "ZLIB compression failed");
+	public function compress(string $payload) : string{
+		$compressible = $this->minCompressionSize !== null && strlen($payload) >= $this->minCompressionSize;
+		$level = $compressible ? $this->level : 0;
+
+		return function_exists('libdeflate_deflate_compress') ?
+			libdeflate_deflate_compress($payload, $level) :
+			Utils::assumeNotFalse(zlib_encode($payload, ZLIB_ENCODING_RAW, $level), "ZLIB compression failed");
 	}
 
-	public function compress(string $payload) : string{
-		if(function_exists('libdeflate_deflate_compress')){
-			return $this->willCompress($payload) ?
-				libdeflate_deflate_compress($payload, $this->level) :
-				self::zlib_encode($payload, 0);
-		}
-		return self::zlib_encode($payload, $this->willCompress($payload) ? $this->level : 0);
+	public function getNetworkId() : int{
+		return CompressionAlgorithm::ZLIB;
 	}
 }
diff --git a/src/network/mcpe/convert/BlockStateDictionary.php b/src/network/mcpe/convert/BlockStateDictionary.php
new file mode 100644
index 0000000000..d20448f95c
--- /dev/null
+++ b/src/network/mcpe/convert/BlockStateDictionary.php
@@ -0,0 +1,200 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\network\mcpe\convert;
+
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\data\bedrock\block\BlockTypeNames;
+use pocketmine\nbt\NbtDataException;
+use pocketmine\nbt\TreeRoot;
+use pocketmine\network\mcpe\protocol\serializer\NetworkNbtSerializer;
+use pocketmine\utils\Utils;
+use function array_key_first;
+use function array_map;
+use function count;
+use function get_debug_type;
+use function is_array;
+use function is_int;
+use function is_string;
+use function json_decode;
+use const JSON_THROW_ON_ERROR;
+
+/**
+ * Handles translation of network block runtime IDs into blockstate data, and vice versa
+ */
+final class BlockStateDictionary{
+	/**
+	 * @var int[][]|int[]
+	 * @phpstan-var array<string, array<string, int>|int>
+	 */
+	private array $stateDataToStateIdLookup = [];
+
+	/**
+	 * @var int[][]|null
+	 * @phpstan-var array<string, array<int, int>|int>|null
+	 */
+	private ?array $idMetaToStateIdLookupCache = null;
+
+	/**
+	 * @param BlockStateDictionaryEntry[] $states
+	 *
+	 * @phpstan-param list<BlockStateDictionaryEntry> $states
+	 */
+	public function __construct(
+		private array $states
+	){
+		$table = [];
+		foreach($this->states as $stateId => $stateNbt){
+			$table[$stateNbt->getStateName()][$stateNbt->getRawStateProperties()] = $stateId;
+		}
+
+		//setup fast path for stateless blocks
+		foreach(Utils::stringifyKeys($table) as $name => $stateIds){
+			if(count($stateIds) === 1){
+				$this->stateDataToStateIdLookup[$name] = $stateIds[array_key_first($stateIds)];
+			}else{
+				$this->stateDataToStateIdLookup[$name] = $stateIds;
+			}
+		}
+	}
+
+	/**
+	 * @return int[][]
+	 * @phpstan-return array<string, array<int, int>|int>
+	 */
+	private function getIdMetaToStateIdLookup() : array{
+		if($this->idMetaToStateIdLookupCache === null){
+			$table = [];
+			//TODO: if we ever allow mutating the dictionary, this would need to be rebuilt on modification
+
+			foreach($this->states as $i => $state){
+				$table[$state->getStateName()][$state->getMeta()] = $i;
+			}
+
+			$this->idMetaToStateIdLookupCache = [];
+			foreach(Utils::stringifyKeys($table) as $name => $metaToStateId){
+				//if only one meta value exists
+				if(count($metaToStateId) === 1){
+					$this->idMetaToStateIdLookupCache[$name] = $metaToStateId[array_key_first($metaToStateId)];
+				}else{
+					$this->idMetaToStateIdLookupCache[$name] = $metaToStateId;
+				}
+			}
+		}
+
+		return $this->idMetaToStateIdLookupCache;
+	}
+
+	public function generateDataFromStateId(int $networkRuntimeId) : ?BlockStateData{
+		return ($this->states[$networkRuntimeId] ?? null)?->generateStateData();
+	}
+
+	/**
+	 * Searches for the appropriate state ID which matches the given blockstate NBT.
+	 * Returns null if there were no matches.
+	 */
+	public function lookupStateIdFromData(BlockStateData $data) : ?int{
+		$name = $data->getName();
+
+		$lookup = $this->stateDataToStateIdLookup[$name] ?? null;
+		return match(true){
+			$lookup === null => null,
+			is_int($lookup) => $lookup,
+			is_array($lookup) => $lookup[BlockStateDictionaryEntry::encodeStateProperties($data->getStates())] ?? null
+		};
+	}
+
+	/**
+	 * Returns the blockstate meta value associated with the given blockstate runtime ID.
+	 * This is used for serializing crafting recipe inputs.
+	 */
+	public function getMetaFromStateId(int $networkRuntimeId) : ?int{
+		return ($this->states[$networkRuntimeId] ?? null)?->getMeta();
+	}
+
+	/**
+	 * Returns the blockstate data associated with the given block ID and meta value.
+	 * This is used for deserializing crafting recipe inputs.
+	 */
+	public function lookupStateIdFromIdMeta(string $id, int $meta) : ?int{
+		$metas = $this->getIdMetaToStateIdLookup()[$id] ?? null;
+		return match(true){
+			$metas === null => null,
+			is_int($metas) => $metas,
+			is_array($metas) => $metas[$meta] ?? null
+		};
+	}
+
+	/**
+	 * Returns an array mapping runtime ID => blockstate data.
+	 * @return BlockStateDictionaryEntry[]
+	 * @phpstan-return array<int, BlockStateDictionaryEntry>
+	 */
+	public function getStates() : array{ return $this->states; }
+
+	/**
+	 * @return BlockStateData[]
+	 * @phpstan-return list<BlockStateData>
+	 *
+	 * @throws NbtDataException
+	 */
+	public static function loadPaletteFromString(string $blockPaletteContents) : array{
+		return array_map(
+			fn(TreeRoot $root) => BlockStateData::fromNbt($root->mustGetCompoundTag()),
+			(new NetworkNbtSerializer())->readMultiple($blockPaletteContents)
+		);
+	}
+
+	public static function loadFromString(string $blockPaletteContents, string $metaMapContents) : self{
+		$metaMap = json_decode($metaMapContents, flags: JSON_THROW_ON_ERROR);
+		if(!is_array($metaMap)){
+			throw new \InvalidArgumentException("Invalid metaMap, expected array for root type, got " . get_debug_type($metaMap));
+		}
+
+		$entries = [];
+
+		$uniqueNames = [];
+
+		//this hack allows the internal cache index to use interned strings which are already available in the
+		//core code anyway, saving around 40 KB of memory
+		foreach((new \ReflectionClass(BlockTypeNames::class))->getConstants() as $value){
+			if(is_string($value)){
+				$uniqueNames[$value] = $value;
+			}
+		}
+
+		foreach(self::loadPaletteFromString($blockPaletteContents) as $i => $state){
+			$meta = $metaMap[$i] ?? null;
+			if($meta === null){
+				throw new \InvalidArgumentException("Missing associated meta value for state $i (" . $state->toNbt() . ")");
+			}
+			if(!is_int($meta)){
+				throw new \InvalidArgumentException("Invalid metaMap offset $i, expected int, got " . get_debug_type($meta));
+			}
+			$uniqueName = $uniqueNames[$state->getName()] ??= $state->getName();
+			$entries[$i] = new BlockStateDictionaryEntry($uniqueName, $state->getStates(), $meta);
+		}
+
+		return new self($entries);
+	}
+}
diff --git a/src/network/mcpe/convert/BlockStateDictionaryEntry.php b/src/network/mcpe/convert/BlockStateDictionaryEntry.php
new file mode 100644
index 0000000000..28cc3960dc
--- /dev/null
+++ b/src/network/mcpe/convert/BlockStateDictionaryEntry.php
@@ -0,0 +1,98 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\network\mcpe\convert;
+
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\nbt\LittleEndianNbtSerializer;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\Tag;
+use pocketmine\nbt\TreeRoot;
+use pocketmine\utils\Utils;
+use function count;
+use function ksort;
+use const SORT_STRING;
+
+final class BlockStateDictionaryEntry{
+	/**
+	 * @var string[]
+	 * @phpstan-var array<string, string>
+	 */
+	private static array $uniqueRawStates = [];
+
+	private string $rawStateProperties;
+
+	/**
+	 * @param Tag[] $stateProperties
+	 * @phpstan-param array<string, Tag> $stateProperties
+	 */
+	public function __construct(
+		private string $stateName,
+		array $stateProperties,
+		private int $meta
+	){
+		$rawStateProperties = self::encodeStateProperties($stateProperties);
+		$this->rawStateProperties = self::$uniqueRawStates[$rawStateProperties] ??= $rawStateProperties;
+	}
+
+	public function getStateName() : string{ return $this->stateName; }
+
+	public function getRawStateProperties() : string{ return $this->rawStateProperties; }
+
+	public function generateStateData() : BlockStateData{
+		return new BlockStateData(
+			$this->stateName,
+			self::decodeStateProperties($this->rawStateProperties),
+			BlockStateData::CURRENT_VERSION
+		);
+	}
+
+	public function getMeta() : int{ return $this->meta; }
+
+	/**
+	 * @return Tag[]
+	 */
+	public static function decodeStateProperties(string $rawProperties) : array{
+		if($rawProperties === ""){
+			return [];
+		}
+		return (new LittleEndianNbtSerializer())->read($rawProperties)->mustGetCompoundTag()->getValue();
+	}
+
+	/**
+	 * @param Tag[] $properties
+	 * @phpstan-param array<string, Tag> $properties
+	 */
+	public static function encodeStateProperties(array $properties) : string{
+		if(count($properties) === 0){
+			return "";
+		}
+		//TODO: make a more efficient encoding - NBT will do for now, but it's not very compact
+		ksort($properties, SORT_STRING);
+		$tag = new CompoundTag();
+		foreach(Utils::stringifyKeys($properties) as $k => $v){
+			$tag->setTag($k, $v);
+		}
+		return (new LittleEndianNbtSerializer())->write(new TreeRoot($tag));
+	}
+}
diff --git a/src/network/mcpe/convert/BlockTranslator.php b/src/network/mcpe/convert/BlockTranslator.php
new file mode 100644
index 0000000000..4113f86ce4
--- /dev/null
+++ b/src/network/mcpe/convert/BlockTranslator.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\convert;
+
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\data\bedrock\block\BlockStateSerializeException;
+use pocketmine\data\bedrock\block\BlockStateSerializer;
+use pocketmine\data\bedrock\block\BlockTypeNames;
+use pocketmine\utils\AssumptionFailedError;
+
+/**
+ * @internal
+ */
+final class BlockTranslator{
+	/**
+	 * @var int[]
+	 * @phpstan-var array<int, int>
+	 */
+	private array $networkIdCache = [];
+
+	/** Used when a blockstate can't be correctly serialized (e.g. because it's unknown) */
+	private BlockStateData $fallbackStateData;
+	private int $fallbackStateId;
+
+	public function __construct(
+		private BlockStateDictionary $blockStateDictionary,
+		private BlockStateSerializer $blockStateSerializer
+	){
+		$this->fallbackStateData = BlockStateData::current(BlockTypeNames::INFO_UPDATE, []);
+		$this->fallbackStateId = $this->blockStateDictionary->lookupStateIdFromData($this->fallbackStateData) ??
+			throw new AssumptionFailedError(BlockTypeNames::INFO_UPDATE . " should always exist");
+	}
+
+	public function internalIdToNetworkId(int $internalStateId) : int{
+		if(isset($this->networkIdCache[$internalStateId])){
+			return $this->networkIdCache[$internalStateId];
+		}
+
+		try{
+			$blockStateData = $this->blockStateSerializer->serialize($internalStateId);
+
+			$networkId = $this->blockStateDictionary->lookupStateIdFromData($blockStateData);
+			if($networkId === null){
+				throw new AssumptionFailedError("Unmapped blockstate returned by blockstate serializer: " . $blockStateData->toNbt());
+			}
+		}catch(BlockStateSerializeException){
+			//TODO: this will swallow any error caused by invalid block properties; this is not ideal, but it should be
+			//covered by unit tests, so this is probably a safe assumption.
+			$networkId = $this->fallbackStateId;
+		}
+
+		return $this->networkIdCache[$internalStateId] = $networkId;
+	}
+
+	/**
+	 * Looks up the network state data associated with the given internal state ID.
+	 */
+	public function internalIdToNetworkStateData(int $internalStateId) : BlockStateData{
+		//we don't directly use the blockstate serializer here - we can't assume that the network blockstate NBT is the
+		//same as the disk blockstate NBT, in case we decide to have different world version than network version (or in
+		//case someone wants to implement multi version).
+		$networkRuntimeId = $this->internalIdToNetworkId($internalStateId);
+
+		return $this->blockStateDictionary->generateDataFromStateId($networkRuntimeId) ?? throw new AssumptionFailedError("We just looked up this state ID, so it must exist");
+	}
+
+	public function getBlockStateDictionary() : BlockStateDictionary{ return $this->blockStateDictionary; }
+
+	public function getFallbackStateData() : BlockStateData{ return $this->fallbackStateData; }
+}
diff --git a/src/network/mcpe/convert/ItemTranslator.php b/src/network/mcpe/convert/ItemTranslator.php
index 375199601a..2c5ad0607f 100644
--- a/src/network/mcpe/convert/ItemTranslator.php
+++ b/src/network/mcpe/convert/ItemTranslator.php
@@ -23,183 +23,104 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\convert;
 
-use pocketmine\data\bedrock\LegacyItemIdToStringIdMap;
+use pocketmine\data\bedrock\item\BlockItemIdMap;
+use pocketmine\data\bedrock\item\ItemDeserializer;
+use pocketmine\data\bedrock\item\ItemSerializer;
+use pocketmine\data\bedrock\item\ItemTypeDeserializeException;
+use pocketmine\data\bedrock\item\ItemTypeSerializeException;
+use pocketmine\data\bedrock\item\SavedItemData;
+use pocketmine\item\Item;
+use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\network\mcpe\protocol\serializer\ItemTypeDictionary;
 use pocketmine\utils\AssumptionFailedError;
-use pocketmine\utils\Filesystem;
-use pocketmine\utils\SingletonTrait;
-use pocketmine\utils\Utils;
-use Symfony\Component\Filesystem\Path;
-use function array_key_exists;
-use function is_array;
-use function is_numeric;
-use function is_string;
-use function json_decode;
 
 /**
  * This class handles translation between network item ID+metadata to PocketMine-MP internal ID+metadata and vice versa.
  */
 final class ItemTranslator{
-	use SingletonTrait;
+	public const NO_BLOCK_RUNTIME_ID = 0; //this is technically a valid block runtime ID, but is used to represent "no block" (derp mojang)
 
-	/**
-	 * @var int[]
-	 * @phpstan-var array<int, int>
-	 */
-	private array $simpleCoreToNetMapping = [];
-	/**
-	 * @var int[]
-	 * @phpstan-var array<int, int>
-	 */
-	private array $simpleNetToCoreMapping = [];
-
-	/**
-	 * runtimeId = array[internalId][metadata]
-	 * @var int[][]
-	 * @phpstan-var array<int, array<int, int>>
-	 */
-	private array $complexCoreToNetMapping = [];
-	/**
-	 * [internalId, metadata] = array[runtimeId]
-	 * @var int[][]
-	 * @phpstan-var array<int, array{int, int}>
-	 */
-	private array $complexNetToCoreMapping = [];
-
-	private static function make() : self{
-		$data = Filesystem::fileGetContents(Path::join(\pocketmine\BEDROCK_DATA_PATH, 'r16_to_current_item_map.json'));
-		$json = json_decode($data, true);
-		if(!is_array($json) || !isset($json["simple"], $json["complex"]) || !is_array($json["simple"]) || !is_array($json["complex"])){
-			throw new AssumptionFailedError("Invalid item table format");
-		}
-
-		$legacyStringToIntMap = LegacyItemIdToStringIdMap::getInstance();
-
-		/** @phpstan-var array<string, int> $simpleMappings */
-		$simpleMappings = [];
-		foreach($json["simple"] as $oldId => $newId){
-			if(!is_string($oldId) || !is_string($newId)){
-				throw new AssumptionFailedError("Invalid item table format");
-			}
-			$intId = $legacyStringToIntMap->stringToLegacy($oldId);
-			if($intId === null){
-				//new item without a fixed legacy ID - we can't handle this right now
-				continue;
-			}
-			$simpleMappings[$newId] = $intId;
-		}
-		foreach(Utils::stringifyKeys($legacyStringToIntMap->getStringToLegacyMap()) as $stringId => $intId){
-			if(isset($simpleMappings[$stringId])){
-				throw new \UnexpectedValueException("Old ID $stringId collides with new ID");
-			}
-			$simpleMappings[$stringId] = $intId;
-		}
-
-		/** @phpstan-var array<string, array{int, int}> $complexMappings */
-		$complexMappings = [];
-		foreach($json["complex"] as $oldId => $map){
-			if(!is_string($oldId) || !is_array($map)){
-				throw new AssumptionFailedError("Invalid item table format");
-			}
-			foreach($map as $meta => $newId){
-				if(!is_numeric($meta) || !is_string($newId)){
-					throw new AssumptionFailedError("Invalid item table format");
-				}
-				$intId = $legacyStringToIntMap->stringToLegacy($oldId);
-				if($intId === null){
-					//new item without a fixed legacy ID - we can't handle this right now
-					continue;
-				}
-				$complexMappings[$newId] = [$intId, (int) $meta];
-			}
-		}
-
-		return new self(GlobalItemTypeDictionary::getInstance()->getDictionary(), $simpleMappings, $complexMappings);
-	}
-
-	/**
-	 * @param int[]   $simpleMappings
-	 * @param int[][] $complexMappings
-	 * @phpstan-param array<string, int> $simpleMappings
-	 * @phpstan-param array<string, array<int, int>> $complexMappings
-	 */
-	public function __construct(ItemTypeDictionary $dictionary, array $simpleMappings, array $complexMappings){
-		foreach($dictionary->getEntries() as $entry){
-			$stringId = $entry->getStringId();
-			$netId = $entry->getNumericId();
-			if(isset($complexMappings[$stringId])){
-				[$id, $meta] = $complexMappings[$stringId];
-				$this->complexCoreToNetMapping[$id][$meta] = $netId;
-				$this->complexNetToCoreMapping[$netId] = [$id, $meta];
-			}elseif(isset($simpleMappings[$stringId])){
-				$this->simpleCoreToNetMapping[$simpleMappings[$stringId]] = $netId;
-				$this->simpleNetToCoreMapping[$netId] = $simpleMappings[$stringId];
-			}else{
-				//not all items have a legacy mapping - for now, we only support the ones that do
-				continue;
-			}
-		}
-	}
+	public function __construct(
+		private ItemTypeDictionary $itemTypeDictionary,
+		private BlockStateDictionary $blockStateDictionary,
+		private ItemSerializer $itemSerializer,
+		private ItemDeserializer $itemDeserializer,
+		private BlockItemIdMap $blockItemIdMap
+	){}
 
 	/**
 	 * @return int[]|null
-	 * @phpstan-return array{int, int}|null
+	 * @phpstan-return array{int, int, ?int}|null
 	 */
-	public function toNetworkIdQuiet(int $internalId, int $internalMeta) : ?array{
-		if($internalMeta === -1){
-			$internalMeta = 0x7fff;
+	public function toNetworkIdQuiet(Item $item) : ?array{
+		try{
+			return $this->toNetworkId($item);
+		}catch(ItemTypeSerializeException){
+			return null;
 		}
-		if(isset($this->complexCoreToNetMapping[$internalId][$internalMeta])){
-			return [$this->complexCoreToNetMapping[$internalId][$internalMeta], 0];
-		}
-		if(array_key_exists($internalId, $this->simpleCoreToNetMapping)){
-			return [$this->simpleCoreToNetMapping[$internalId], $internalMeta];
-		}
-
-		return null;
 	}
 
 	/**
 	 * @return int[]
-	 * @phpstan-return array{int, int}
+	 * @phpstan-return array{int, int, ?int}
+	 *
+	 * @throws ItemTypeSerializeException
 	 */
-	public function toNetworkId(int $internalId, int $internalMeta) : array{
-		return $this->toNetworkIdQuiet($internalId, $internalMeta) ??
-			throw new \InvalidArgumentException("Unmapped ID/metadata combination $internalId:$internalMeta");
-	}
+	public function toNetworkId(Item $item) : array{
+		//TODO: we should probably come up with a cache for this
 
-	/**
-	 * @phpstan-param-out bool $isComplexMapping
-	 * @return int[]
-	 * @phpstan-return array{int, int}
-	 * @throws TypeConversionException
-	 */
-	public function fromNetworkId(int $networkId, int $networkMeta, ?bool &$isComplexMapping = null) : array{
-		if(isset($this->complexNetToCoreMapping[$networkId])){
-			if($networkMeta !== 0){
-				throw new TypeConversionException("Unexpected non-zero network meta on complex item mapping");
+		$itemData = $this->itemSerializer->serializeType($item);
+
+		$numericId = $this->itemTypeDictionary->fromStringId($itemData->getName());
+		$blockStateData = $itemData->getBlock();
+
+		if($blockStateData !== null){
+			$blockRuntimeId = $this->blockStateDictionary->lookupStateIdFromData($blockStateData);
+			if($blockRuntimeId === null){
+				throw new AssumptionFailedError("Unmapped blockstate returned by blockstate serializer: " . $blockStateData->toNbt());
 			}
-			$isComplexMapping = true;
-			return $this->complexNetToCoreMapping[$networkId];
+		}else{
+			$blockRuntimeId = null;
 		}
-		$isComplexMapping = false;
-		if(isset($this->simpleNetToCoreMapping[$networkId])){
-			return [$this->simpleNetToCoreMapping[$networkId], $networkMeta];
-		}
-		throw new TypeConversionException("Unmapped network ID/metadata combination $networkId:$networkMeta");
+
+		return [$numericId, $itemData->getMeta(), $blockRuntimeId];
+	}
+
+	/**
+	 * @throws ItemTypeSerializeException
+	 */
+	public function toNetworkNbt(Item $item) : CompoundTag{
+		//TODO: this relies on the assumption that network item NBT is the same as disk item NBT, which may not always
+		//be true - if we stick on an older world version while updating network version, this could be a problem (and
+		//may be a problem for multi version implementations)
+		return $this->itemSerializer->serializeStack($item)->toNbt();
 	}
 
 	/**
-	 * @return int[]
-	 * @phpstan-return array{int, int}
 	 * @throws TypeConversionException
 	 */
-	public function fromNetworkIdWithWildcardHandling(int $networkId, int $networkMeta) : array{
-		$isComplexMapping = false;
-		if($networkMeta !== 0x7fff){
-			return $this->fromNetworkId($networkId, $networkMeta);
+	public function fromNetworkId(int $networkId, int $networkMeta, int $networkBlockRuntimeId) : Item{
+		try{
+			$stringId = $this->itemTypeDictionary->fromIntId($networkId);
+		}catch(\InvalidArgumentException $e){
+			//TODO: a quiet version of fromIntId() would be better than catching InvalidArgumentException
+			throw TypeConversionException::wrap($e, "Invalid network itemstack ID $networkId");
+		}
+
+		$blockStateData = null;
+		if($this->blockItemIdMap->lookupBlockId($stringId) !== null){
+			$blockStateData = $this->blockStateDictionary->generateDataFromStateId($networkBlockRuntimeId);
+			if($blockStateData === null){
+				throw new TypeConversionException("Blockstate runtimeID $networkBlockRuntimeId does not correspond to any known blockstate");
+			}
+		}elseif($networkBlockRuntimeId !== self::NO_BLOCK_RUNTIME_ID){
+			throw new TypeConversionException("Item $stringId is not a blockitem, but runtime ID $networkBlockRuntimeId was provided");
+		}
+
+		try{
+			return $this->itemDeserializer->deserializeType(new SavedItemData($stringId, $networkMeta, $blockStateData));
+		}catch(ItemTypeDeserializeException $e){
+			throw TypeConversionException::wrap($e, "Invalid network itemstack data");
 		}
-		[$id, $meta] = $this->fromNetworkId($networkId, 0, $isComplexMapping);
-		return [$id, $isComplexMapping ? $meta : -1];
 	}
 }
diff --git a/src/network/mcpe/convert/GlobalItemTypeDictionary.php b/src/network/mcpe/convert/ItemTypeDictionaryFromDataHelper.php
similarity index 73%
rename from src/network/mcpe/convert/GlobalItemTypeDictionary.php
rename to src/network/mcpe/convert/ItemTypeDictionaryFromDataHelper.php
index 0795d2fde2..d962063d35 100644
--- a/src/network/mcpe/convert/GlobalItemTypeDictionary.php
+++ b/src/network/mcpe/convert/ItemTypeDictionaryFromDataHelper.php
@@ -26,38 +26,28 @@ namespace pocketmine\network\mcpe\convert;
 use pocketmine\network\mcpe\protocol\serializer\ItemTypeDictionary;
 use pocketmine\network\mcpe\protocol\types\ItemTypeEntry;
 use pocketmine\utils\AssumptionFailedError;
-use pocketmine\utils\Filesystem;
-use pocketmine\utils\SingletonTrait;
-use Symfony\Component\Filesystem\Path;
+use pocketmine\utils\Utils;
 use function is_array;
 use function is_bool;
 use function is_int;
 use function is_string;
 use function json_decode;
 
-final class GlobalItemTypeDictionary{
-	use SingletonTrait;
+final class ItemTypeDictionaryFromDataHelper{
 
-	private static function make() : self{
-		$data = Filesystem::fileGetContents(Path::join(\pocketmine\BEDROCK_DATA_PATH, 'required_item_list.json'));
+	public static function loadFromString(string $data) : ItemTypeDictionary{
 		$table = json_decode($data, true);
 		if(!is_array($table)){
 			throw new AssumptionFailedError("Invalid item list format");
 		}
 
 		$params = [];
-		foreach($table as $name => $entry){
+		foreach(Utils::promoteKeys($table) as $name => $entry){
 			if(!is_array($entry) || !is_string($name) || !isset($entry["component_based"], $entry["runtime_id"]) || !is_bool($entry["component_based"]) || !is_int($entry["runtime_id"])){
 				throw new AssumptionFailedError("Invalid item list format");
 			}
 			$params[] = new ItemTypeEntry($name, $entry["runtime_id"], $entry["component_based"]);
 		}
-		return new self(new ItemTypeDictionary($params));
+		return new ItemTypeDictionary($params);
 	}
-
-	public function __construct(
-		private ItemTypeDictionary $dictionary
-	){}
-
-	public function getDictionary() : ItemTypeDictionary{ return $this->dictionary; }
 }
diff --git a/src/network/mcpe/convert/RuntimeBlockMapping.php b/src/network/mcpe/convert/RuntimeBlockMapping.php
deleted file mode 100644
index 53b146be6f..0000000000
--- a/src/network/mcpe/convert/RuntimeBlockMapping.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\network\mcpe\convert;
-
-use pocketmine\block\Block;
-use pocketmine\block\BlockLegacyIds;
-use pocketmine\data\bedrock\LegacyBlockIdToStringIdMap;
-use pocketmine\nbt\tag\CompoundTag;
-use pocketmine\network\mcpe\protocol\serializer\NetworkNbtSerializer;
-use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
-use pocketmine\network\mcpe\protocol\serializer\PacketSerializerContext;
-use pocketmine\utils\Filesystem;
-use pocketmine\utils\SingletonTrait;
-use Symfony\Component\Filesystem\Path;
-
-/**
- * @internal
- */
-final class RuntimeBlockMapping{
-	use SingletonTrait;
-
-	/** @var int[] */
-	private array $legacyToRuntimeMap = [];
-	/** @var int[] */
-	private array $runtimeToLegacyMap = [];
-	/** @var CompoundTag[] */
-	private array $bedrockKnownStates;
-
-	private static function make() : self{
-		return new self(
-			Path::join(\pocketmine\BEDROCK_DATA_PATH, "canonical_block_states.nbt"),
-			Path::join(\pocketmine\BEDROCK_DATA_PATH, "r12_to_current_block_map.bin")
-		);
-	}
-
-	public function __construct(string $canonicalBlockStatesFile, string $r12ToCurrentBlockMapFile){
-		$stream = PacketSerializer::decoder(
-			Filesystem::fileGetContents($canonicalBlockStatesFile),
-			0,
-			new PacketSerializerContext(GlobalItemTypeDictionary::getInstance()->getDictionary())
-		);
-		$list = [];
-		while(!$stream->feof()){
-			$list[] = $stream->getNbtCompoundRoot();
-		}
-		$this->bedrockKnownStates = $list;
-
-		$this->setupLegacyMappings($r12ToCurrentBlockMapFile);
-	}
-
-	private function setupLegacyMappings(string $r12ToCurrentBlockMapFile) : void{
-		$legacyIdMap = LegacyBlockIdToStringIdMap::getInstance();
-		/** @var R12ToCurrentBlockMapEntry[] $legacyStateMap */
-		$legacyStateMap = [];
-		$legacyStateMapReader = PacketSerializer::decoder(
-			Filesystem::fileGetContents($r12ToCurrentBlockMapFile),
-			0,
-			new PacketSerializerContext(GlobalItemTypeDictionary::getInstance()->getDictionary())
-		);
-		$nbtReader = new NetworkNbtSerializer();
-		while(!$legacyStateMapReader->feof()){
-			$id = $legacyStateMapReader->getString();
-			$meta = $legacyStateMapReader->getLShort();
-
-			$offset = $legacyStateMapReader->getOffset();
-			$state = $nbtReader->read($legacyStateMapReader->getBuffer(), $offset)->mustGetCompoundTag();
-			$legacyStateMapReader->setOffset($offset);
-			$legacyStateMap[] = new R12ToCurrentBlockMapEntry($id, $meta, $state);
-		}
-
-		/**
-		 * @var int[][] $idToStatesMap string id -> int[] list of candidate state indices
-		 */
-		$idToStatesMap = [];
-		foreach($this->bedrockKnownStates as $k => $state){
-			$idToStatesMap[$state->getString("name")][] = $k;
-		}
-		foreach($legacyStateMap as $pair){
-			$id = $legacyIdMap->stringToLegacy($pair->getId());
-			if($id === null){
-				throw new \RuntimeException("No legacy ID matches " . $pair->getId());
-			}
-			$data = $pair->getMeta();
-			if($data > 15){
-				//we can't handle metadata with more than 4 bits
-				continue;
-			}
-			$mappedState = $pair->getBlockState();
-			$mappedName = $mappedState->getString("name");
-			if(!isset($idToStatesMap[$mappedName])){
-				throw new \RuntimeException("Mapped new state does not appear in network table");
-			}
-			foreach($idToStatesMap[$mappedName] as $k){
-				$networkState = $this->bedrockKnownStates[$k];
-				if($mappedState->equals($networkState)){
-					$this->registerMapping($k, $id, $data);
-					continue 2;
-				}
-			}
-			throw new \RuntimeException("Mapped new state does not appear in network table");
-		}
-	}
-
-	public function toRuntimeId(int $internalStateId) : int{
-		return $this->legacyToRuntimeMap[$internalStateId] ?? $this->legacyToRuntimeMap[BlockLegacyIds::INFO_UPDATE << Block::INTERNAL_METADATA_BITS];
-	}
-
-	public function fromRuntimeId(int $runtimeId) : int{
-		return $this->runtimeToLegacyMap[$runtimeId];
-	}
-
-	private function registerMapping(int $staticRuntimeId, int $legacyId, int $legacyMeta) : void{
-		$this->legacyToRuntimeMap[($legacyId << Block::INTERNAL_METADATA_BITS) | $legacyMeta] = $staticRuntimeId;
-		$this->runtimeToLegacyMap[$staticRuntimeId] = ($legacyId << Block::INTERNAL_METADATA_BITS) | $legacyMeta;
-	}
-
-	/**
-	 * @return CompoundTag[]
-	 */
-	public function getBedrockKnownStates() : array{
-		return $this->bedrockKnownStates;
-	}
-}
diff --git a/src/network/mcpe/convert/TypeConverter.php b/src/network/mcpe/convert/TypeConverter.php
index 2c7a3415ef..e886b2b8be 100644
--- a/src/network/mcpe/convert/TypeConverter.php
+++ b/src/network/mcpe/convert/TypeConverter.php
@@ -23,47 +23,86 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\convert;
 
-use pocketmine\block\BlockLegacyIds;
-use pocketmine\inventory\transaction\action\CreateItemAction;
-use pocketmine\inventory\transaction\action\DestroyItemAction;
-use pocketmine\inventory\transaction\action\DropItemAction;
-use pocketmine\inventory\transaction\action\InventoryAction;
-use pocketmine\inventory\transaction\action\SlotChangeAction;
-use pocketmine\item\Durable;
+use pocketmine\block\VanillaBlocks;
+use pocketmine\crafting\ExactRecipeIngredient;
+use pocketmine\crafting\MetaWildcardRecipeIngredient;
+use pocketmine\crafting\RecipeIngredient;
+use pocketmine\crafting\TagWildcardRecipeIngredient;
+use pocketmine\data\bedrock\BedrockDataFiles;
+use pocketmine\data\bedrock\item\BlockItemIdMap;
+use pocketmine\data\bedrock\item\ItemTypeNames;
 use pocketmine\item\Item;
-use pocketmine\item\ItemFactory;
-use pocketmine\item\ItemIds;
 use pocketmine\item\VanillaItems;
 use pocketmine\nbt\NbtException;
 use pocketmine\nbt\tag\CompoundTag;
-use pocketmine\nbt\tag\IntTag;
-use pocketmine\network\mcpe\InventoryManager;
+use pocketmine\network\mcpe\protocol\serializer\ItemTypeDictionary;
+use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
 use pocketmine\network\mcpe\protocol\types\GameMode as ProtocolGameMode;
-use pocketmine\network\mcpe\protocol\types\inventory\ContainerIds;
 use pocketmine\network\mcpe\protocol\types\inventory\ItemStack;
-use pocketmine\network\mcpe\protocol\types\inventory\NetworkInventoryAction;
-use pocketmine\network\mcpe\protocol\types\inventory\UIInventorySlotOffset;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackExtraData;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackExtraDataShield;
 use pocketmine\network\mcpe\protocol\types\recipe\IntIdMetaItemDescriptor;
-use pocketmine\network\mcpe\protocol\types\recipe\RecipeIngredient;
+use pocketmine\network\mcpe\protocol\types\recipe\RecipeIngredient as ProtocolRecipeIngredient;
 use pocketmine\network\mcpe\protocol\types\recipe\StringIdMetaItemDescriptor;
+use pocketmine\network\mcpe\protocol\types\recipe\TagItemDescriptor;
 use pocketmine\player\GameMode;
-use pocketmine\player\Player;
 use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Filesystem;
 use pocketmine\utils\SingletonTrait;
+use pocketmine\world\format\io\GlobalBlockStateHandlers;
+use pocketmine\world\format\io\GlobalItemDataHandlers;
+use function get_class;
 
 class TypeConverter{
 	use SingletonTrait;
 
-	private const DAMAGE_TAG = "Damage"; //TAG_Int
-	private const DAMAGE_TAG_CONFLICT_RESOLUTION = "___Damage_ProtocolCollisionResolution___";
 	private const PM_ID_TAG = "___Id___";
-	private const PM_META_TAG = "___Meta___";
 
+	private const RECIPE_INPUT_WILDCARD_META = 0x7fff;
+
+	private BlockItemIdMap $blockItemIdMap;
+	private BlockTranslator $blockTranslator;
+	private ItemTranslator $itemTranslator;
+	private ItemTypeDictionary $itemTypeDictionary;
 	private int $shieldRuntimeId;
 
+	private SkinAdapter $skinAdapter;
+
 	public function __construct(){
 		//TODO: inject stuff via constructor
-		$this->shieldRuntimeId = GlobalItemTypeDictionary::getInstance()->getDictionary()->fromStringId("minecraft:shield");
+		$this->blockItemIdMap = BlockItemIdMap::getInstance();
+
+		$canonicalBlockStatesRaw = Filesystem::fileGetContents(BedrockDataFiles::CANONICAL_BLOCK_STATES_NBT);
+		$metaMappingRaw = Filesystem::fileGetContents(BedrockDataFiles::BLOCK_STATE_META_MAP_JSON);
+		$this->blockTranslator = new BlockTranslator(
+			BlockStateDictionary::loadFromString($canonicalBlockStatesRaw, $metaMappingRaw),
+			GlobalBlockStateHandlers::getSerializer()
+		);
+
+		$this->itemTypeDictionary = ItemTypeDictionaryFromDataHelper::loadFromString(Filesystem::fileGetContents(BedrockDataFiles::REQUIRED_ITEM_LIST_JSON));
+		$this->shieldRuntimeId = $this->itemTypeDictionary->fromStringId(ItemTypeNames::SHIELD);
+
+		$this->itemTranslator = new ItemTranslator(
+			$this->itemTypeDictionary,
+			$this->blockTranslator->getBlockStateDictionary(),
+			GlobalItemDataHandlers::getSerializer(),
+			GlobalItemDataHandlers::getDeserializer(),
+			$this->blockItemIdMap
+		);
+
+		$this->skinAdapter = new LegacySkinAdapter();
+	}
+
+	public function getBlockTranslator() : BlockTranslator{ return $this->blockTranslator; }
+
+	public function getItemTypeDictionary() : ItemTypeDictionary{ return $this->itemTypeDictionary; }
+
+	public function getItemTranslator() : ItemTranslator{ return $this->itemTranslator; }
+
+	public function getSkinAdapter() : SkinAdapter{ return $this->skinAdapter; }
+
+	public function setSkinAdapter(SkinAdapter $skinAdapter) : void{
+		$this->skinAdapter = $skinAdapter;
 	}
 
 	/**
@@ -73,248 +112,168 @@ class TypeConverter{
 	 * @internal
 	 */
 	public function coreGameModeToProtocol(GameMode $gamemode) : int{
-		switch($gamemode->id()){
-			case GameMode::SURVIVAL()->id():
-				return ProtocolGameMode::SURVIVAL;
-			case GameMode::CREATIVE()->id():
-			case GameMode::SPECTATOR()->id():
-				return ProtocolGameMode::CREATIVE;
-			case GameMode::ADVENTURE()->id():
-				return ProtocolGameMode::ADVENTURE;
-			default:
-				throw new AssumptionFailedError("Unknown game mode");
-		}
-	}
-
-	public function protocolGameModeName(GameMode $gameMode) : string{
-		switch($gameMode->id()){
-			case GameMode::SURVIVAL()->id(): return "Survival";
-			case GameMode::ADVENTURE()->id(): return "Adventure";
-			default: return "Creative";
-		}
+		return match($gamemode){
+			GameMode::SURVIVAL => ProtocolGameMode::SURVIVAL,
+			//TODO: native spectator support
+			GameMode::CREATIVE, GameMode::SPECTATOR => ProtocolGameMode::CREATIVE,
+			GameMode::ADVENTURE => ProtocolGameMode::ADVENTURE,
+		};
 	}
 
 	public function protocolGameModeToCore(int $gameMode) : ?GameMode{
-		switch($gameMode){
-			case ProtocolGameMode::SURVIVAL:
-				return GameMode::SURVIVAL();
-			case ProtocolGameMode::CREATIVE:
-				return GameMode::CREATIVE();
-			case ProtocolGameMode::ADVENTURE:
-				return GameMode::ADVENTURE();
-			case ProtocolGameMode::CREATIVE_VIEWER:
-			case ProtocolGameMode::SURVIVAL_VIEWER:
-				return GameMode::SPECTATOR();
-			default:
-				return null;
-		}
+		return match($gameMode){
+			ProtocolGameMode::SURVIVAL => GameMode::SURVIVAL,
+			ProtocolGameMode::CREATIVE => GameMode::CREATIVE,
+			ProtocolGameMode::ADVENTURE => GameMode::ADVENTURE,
+			ProtocolGameMode::SURVIVAL_VIEWER, ProtocolGameMode::CREATIVE_VIEWER => GameMode::SPECTATOR,
+			//TODO: native spectator support
+			default => null,
+		};
 	}
 
-	public function coreItemStackToRecipeIngredient(Item $itemStack) : RecipeIngredient{
-		if($itemStack->isNull()){
-			return new RecipeIngredient(null, 0);
+	public function coreRecipeIngredientToNet(?RecipeIngredient $ingredient) : ProtocolRecipeIngredient{
+		if($ingredient === null){
+			return new ProtocolRecipeIngredient(null, 0);
 		}
-		if($itemStack->hasAnyDamageValue()){
-			[$id, ] = ItemTranslator::getInstance()->toNetworkId($itemStack->getId(), 0);
-			$meta = 0x7fff;
+		if($ingredient instanceof MetaWildcardRecipeIngredient){
+			$id = $this->itemTypeDictionary->fromStringId($ingredient->getItemId());
+			$meta = self::RECIPE_INPUT_WILDCARD_META;
+			$descriptor = new IntIdMetaItemDescriptor($id, $meta);
+		}elseif($ingredient instanceof ExactRecipeIngredient){
+			$item = $ingredient->getItem();
+			[$id, $meta, $blockRuntimeId] = $this->itemTranslator->toNetworkId($item);
+			if($blockRuntimeId !== null){
+				$meta = $this->blockTranslator->getBlockStateDictionary()->getMetaFromStateId($blockRuntimeId);
+				if($meta === null){
+					throw new AssumptionFailedError("Every block state should have an associated meta value");
+				}
+			}
+			$descriptor = new IntIdMetaItemDescriptor($id, $meta);
+		}elseif($ingredient instanceof TagWildcardRecipeIngredient){
+			$descriptor = new TagItemDescriptor($ingredient->getTagName());
 		}else{
-			[$id, $meta] = ItemTranslator::getInstance()->toNetworkId($itemStack->getId(), $itemStack->getMeta());
+			throw new \LogicException("Unsupported recipe ingredient type " . get_class($ingredient) . ", only " . ExactRecipeIngredient::class . " and " . MetaWildcardRecipeIngredient::class . " are supported");
 		}
-		return new RecipeIngredient(new IntIdMetaItemDescriptor($id, $meta), $itemStack->getCount());
+
+		return new ProtocolRecipeIngredient($descriptor, 1);
 	}
 
-	public function recipeIngredientToCoreItemStack(RecipeIngredient $ingredient) : Item{
+	public function netRecipeIngredientToCore(ProtocolRecipeIngredient $ingredient) : ?RecipeIngredient{
 		$descriptor = $ingredient->getDescriptor();
 		if($descriptor === null){
-			return VanillaItems::AIR();
-		}
-		if($descriptor instanceof IntIdMetaItemDescriptor){
-			[$id, $meta] = ItemTranslator::getInstance()->fromNetworkIdWithWildcardHandling($descriptor->getId(), $descriptor->getMeta());
-			return ItemFactory::getInstance()->get($id, $meta, $ingredient->getCount());
-		}
-		if($descriptor instanceof StringIdMetaItemDescriptor){
-			$intId = GlobalItemTypeDictionary::getInstance()->getDictionary()->fromStringId($descriptor->getId());
-			[$id, $meta] = ItemTranslator::getInstance()->fromNetworkIdWithWildcardHandling($intId, $descriptor->getMeta());
-			return ItemFactory::getInstance()->get($id, $meta, $ingredient->getCount());
+			return null;
 		}
 
-		throw new \LogicException("Unsupported conversion of recipe ingredient to core item stack");
+		if($descriptor instanceof TagItemDescriptor){
+			return new TagWildcardRecipeIngredient($descriptor->getTag());
+		}
+
+		if($descriptor instanceof IntIdMetaItemDescriptor){
+			$stringId = $this->itemTypeDictionary->fromIntId($descriptor->getId());
+			$meta = $descriptor->getMeta();
+		}elseif($descriptor instanceof StringIdMetaItemDescriptor){
+			$stringId = $descriptor->getId();
+			$meta = $descriptor->getMeta();
+		}else{
+			throw new \LogicException("Unsupported conversion of recipe ingredient to core item stack");
+		}
+
+		if($meta === self::RECIPE_INPUT_WILDCARD_META){
+			return new MetaWildcardRecipeIngredient($stringId);
+		}
+
+		$blockRuntimeId = null;
+		if(($blockId = $this->blockItemIdMap->lookupBlockId($stringId)) !== null){
+			$blockRuntimeId = $this->blockTranslator->getBlockStateDictionary()->lookupStateIdFromIdMeta($blockId, $meta);
+			if($blockRuntimeId !== null){
+				$meta = 0;
+			}
+		}
+		$result = $this->itemTranslator->fromNetworkId(
+			$this->itemTypeDictionary->fromStringId($stringId),
+			$meta,
+			$blockRuntimeId ?? ItemTranslator::NO_BLOCK_RUNTIME_ID
+		);
+		return new ExactRecipeIngredient($result);
 	}
 
 	public function coreItemStackToNet(Item $itemStack) : ItemStack{
 		if($itemStack->isNull()){
 			return ItemStack::null();
 		}
-		$nbt = null;
-		if($itemStack->hasNamedTag()){
-			$nbt = clone $itemStack->getNamedTag();
+		$nbt = $itemStack->getNamedTag();
+		if($nbt->count() === 0){
+			$nbt = null;
+		}else{
+			$nbt = clone $nbt;
 		}
 
-		$isBlockItem = $itemStack->getId() < 256;
-
-		$idMeta = ItemTranslator::getInstance()->toNetworkIdQuiet($itemStack->getId(), $itemStack->getMeta());
+		$idMeta = $this->itemTranslator->toNetworkIdQuiet($itemStack);
 		if($idMeta === null){
 			//Display unmapped items as INFO_UPDATE, but stick something in their NBT to make sure they don't stack with
 			//other unmapped items.
-			[$id, $meta] = ItemTranslator::getInstance()->toNetworkId(ItemIds::INFO_UPDATE, 0);
+			[$id, $meta, $blockRuntimeId] = $this->itemTranslator->toNetworkId(VanillaBlocks::INFO_UPDATE()->asItem());
 			if($nbt === null){
 				$nbt = new CompoundTag();
 			}
-			$nbt->setInt(self::PM_ID_TAG, $itemStack->getId());
-			$nbt->setInt(self::PM_META_TAG, $itemStack->getMeta());
+			$nbt->setLong(self::PM_ID_TAG, $itemStack->getStateId());
 		}else{
-			[$id, $meta] = $idMeta;
-
-			if($itemStack instanceof Durable && $itemStack->getDamage() > 0){
-				if($nbt !== null){
-					if(($existing = $nbt->getTag(self::DAMAGE_TAG)) !== null){
-						$nbt->removeTag(self::DAMAGE_TAG);
-						$nbt->setTag(self::DAMAGE_TAG_CONFLICT_RESOLUTION, $existing);
-					}
-				}else{
-					$nbt = new CompoundTag();
-				}
-				$nbt->setInt(self::DAMAGE_TAG, $itemStack->getDamage());
-				$meta = 0;
-			}elseif($isBlockItem && $itemStack->getMeta() !== 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, $itemStack->getMeta());
-				$meta = 0;
-			}
+			[$id, $meta, $blockRuntimeId] = $idMeta;
 		}
 
-		$blockRuntimeId = 0;
-		if($isBlockItem){
-			$block = $itemStack->getBlock();
-			if($block->getId() !== BlockLegacyIds::AIR){
-				$blockRuntimeId = RuntimeBlockMapping::getInstance()->toRuntimeId($block->getFullId());
-			}
-		}
+		$extraData = $id === $this->shieldRuntimeId ?
+			new ItemStackExtraDataShield($nbt, canPlaceOn: [], canDestroy: [], blockingTick: 0) :
+			new ItemStackExtraData($nbt, canPlaceOn: [], canDestroy: []);
+		$extraDataSerializer = PacketSerializer::encoder();
+		$extraData->write($extraDataSerializer);
 
 		return new ItemStack(
 			$id,
 			$meta,
 			$itemStack->getCount(),
-			$blockRuntimeId,
-			$nbt,
-			[],
-			[],
-			$id === $this->shieldRuntimeId ? 0 : null
+			$blockRuntimeId ?? ItemTranslator::NO_BLOCK_RUNTIME_ID,
+			$extraDataSerializer->getBuffer(),
 		);
 	}
 
 	/**
+	 * WARNING: Avoid this in server-side code. If you need to compare ItemStacks provided by the client to the
+	 * server, prefer encoding the server's itemstack and comparing the serialized ItemStack, instead of converting
+	 * the client's ItemStack to a core Item.
+	 * This method will fully decode the item's extra data, which can be very costly if the item has a lot of NBT data.
+	 *
 	 * @throws TypeConversionException
 	 */
 	public function netItemStackToCore(ItemStack $itemStack) : Item{
 		if($itemStack->getId() === 0){
 			return VanillaItems::AIR();
 		}
-		$compound = $itemStack->getNbt();
+		$extraData = $this->deserializeItemStackExtraData($itemStack->getRawExtraData(), $itemStack->getId());
 
-		[$id, $meta] = ItemTranslator::getInstance()->fromNetworkId($itemStack->getId(), $itemStack->getMeta());
+		$compound = $extraData->getNbt();
+
+		$itemResult = $this->itemTranslator->fromNetworkId($itemStack->getId(), $itemStack->getMeta(), $itemStack->getBlockRuntimeId());
 
 		if($compound !== null){
 			$compound = clone $compound;
-			if(($idTag = $compound->getTag(self::PM_ID_TAG)) instanceof IntTag){
-				$id = $idTag->getValue();
-				$compound->removeTag(self::PM_ID_TAG);
-			}
-			if(($damageTag = $compound->getTag(self::DAMAGE_TAG)) instanceof IntTag){
-				$meta = $damageTag->getValue();
-				$compound->removeTag(self::DAMAGE_TAG);
-				if(($conflicted = $compound->getTag(self::DAMAGE_TAG_CONFLICT_RESOLUTION)) !== null){
-					$compound->removeTag(self::DAMAGE_TAG_CONFLICT_RESOLUTION);
-					$compound->setTag(self::DAMAGE_TAG, $conflicted);
-				}
-			}elseif(($metaTag = $compound->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();
-				$compound->removeTag(self::PM_META_TAG);
-			}
-			if($compound->count() === 0){
-				$compound = null;
-			}
-		}
-		if($id < -0x8000 || $id >= 0x7fff){
-			throw new TypeConversionException("Item ID must be in range " . -0x8000 . " ... " . 0x7fff . " (received $id)");
-		}
-		if($meta < 0 || $meta >= 0x7fff){ //this meta value may have been restored from the NBT
-			throw new TypeConversionException("Item meta must be in range 0 ... " . 0x7fff . " (received $meta)");
 		}
 
-		try{
-			return ItemFactory::getInstance()->get(
-				$id,
-				$meta,
-				$itemStack->getCount(),
-				$compound
-			);
-		}catch(NbtException $e){
-			throw TypeConversionException::wrap($e, "Bad itemstack NBT data");
+		$itemResult->setCount($itemStack->getCount());
+		if($compound !== null){
+			try{
+				$itemResult->setNamedTag($compound);
+			}catch(NbtException $e){
+				throw TypeConversionException::wrap($e, "Bad itemstack NBT data");
+			}
 		}
+
+		return $itemResult;
 	}
 
-	/**
-	 * @throws TypeConversionException
-	 */
-	public function createInventoryAction(NetworkInventoryAction $action, Player $player, InventoryManager $inventoryManager) : ?InventoryAction{
-		if($action->oldItem->getItemStack()->equals($action->newItem->getItemStack())){
-			//filter out useless noise in 1.13
-			return null;
-		}
-		try{
-			$old = $this->netItemStackToCore($action->oldItem->getItemStack());
-		}catch(TypeConversionException $e){
-			throw TypeConversionException::wrap($e, "Inventory action: oldItem");
-		}
-		try{
-			$new = $this->netItemStackToCore($action->newItem->getItemStack());
-		}catch(TypeConversionException $e){
-			throw TypeConversionException::wrap($e, "Inventory action: newItem");
-		}
-		switch($action->sourceType){
-			case NetworkInventoryAction::SOURCE_CONTAINER:
-				if($action->windowId === ContainerIds::UI && $action->inventorySlot === UIInventorySlotOffset::CREATED_ITEM_OUTPUT){
-					return null; //useless noise
-				}
-				$located = $inventoryManager->locateWindowAndSlot($action->windowId, $action->inventorySlot);
-				if($located !== null){
-					[$window, $slot] = $located;
-					return new SlotChangeAction($window, $slot, $old, $new);
-				}
-
-				throw new TypeConversionException("No open container with window ID $action->windowId");
-			case NetworkInventoryAction::SOURCE_WORLD:
-				if($action->inventorySlot !== NetworkInventoryAction::ACTION_MAGIC_SLOT_DROP_ITEM){
-					throw new TypeConversionException("Only expecting drop-item world actions from the client!");
-				}
-
-				return new DropItemAction($new);
-			case NetworkInventoryAction::SOURCE_CREATIVE:
-				switch($action->inventorySlot){
-					case NetworkInventoryAction::ACTION_MAGIC_SLOT_CREATIVE_DELETE_ITEM:
-						return new DestroyItemAction($new);
-					case NetworkInventoryAction::ACTION_MAGIC_SLOT_CREATIVE_CREATE_ITEM:
-						return new CreateItemAction($old);
-					default:
-						throw new TypeConversionException("Unexpected creative action type $action->inventorySlot");
-
-				}
-			case NetworkInventoryAction::SOURCE_TODO:
-				//These are used to balance a transaction that involves special actions, like crafting, enchanting, etc.
-				//The vanilla server just accepted these without verifying them. We don't need to care about them since
-				//we verify crafting by checking for imbalances anyway.
-				return null;
-			default:
-				throw new TypeConversionException("Unknown inventory source type $action->sourceType");
-		}
+	public function deserializeItemStackExtraData(string $extraData, int $id) : ItemStackExtraData{
+		$extraDataDeserializer = PacketSerializer::decoder($extraData, 0);
+		return $id === $this->shieldRuntimeId ?
+			ItemStackExtraDataShield::read($extraDataDeserializer) :
+			ItemStackExtraData::read($extraDataDeserializer);
 	}
 }
diff --git a/src/network/mcpe/encryption/EncryptionContext.php b/src/network/mcpe/encryption/EncryptionContext.php
index 0077513637..8c0b9bf74c 100644
--- a/src/network/mcpe/encryption/EncryptionContext.php
+++ b/src/network/mcpe/encryption/EncryptionContext.php
@@ -34,8 +34,7 @@ use function substr;
 class EncryptionContext{
 	private const CHECKSUM_ALGO = "sha256";
 
-	/** @var bool */
-	public static $ENABLED = true;
+	public static bool $ENABLED = true;
 
 	private string $key;
 
diff --git a/src/network/mcpe/encryption/EncryptionUtils.php b/src/network/mcpe/encryption/EncryptionUtils.php
index 920c54a7ef..4ad9ceb31c 100644
--- a/src/network/mcpe/encryption/EncryptionUtils.php
+++ b/src/network/mcpe/encryption/EncryptionUtils.php
@@ -33,6 +33,7 @@ use function hex2bin;
 use function openssl_digest;
 use function openssl_error_string;
 use function openssl_pkey_derive;
+use function openssl_pkey_get_details;
 use function str_pad;
 use const STR_PAD_LEFT;
 
@@ -42,7 +43,20 @@ final class EncryptionUtils{
 		//NOOP
 	}
 
+	private static function validateKey(\OpenSSLAsymmetricKey $key) : void{
+		$keyDetails = Utils::assumeNotFalse(openssl_pkey_get_details($key));
+		if(!isset($keyDetails["ec"]["curve_name"])){
+			throw new \InvalidArgumentException("Key must be an EC key");
+		}
+		$curveName = $keyDetails["ec"]["curve_name"];
+		if($curveName !== JwtUtils::BEDROCK_SIGNING_KEY_CURVE_NAME){
+			throw new \InvalidArgumentException("Key must belong to the " . JwtUtils::BEDROCK_SIGNING_KEY_CURVE_NAME . " elliptic curve, got $curveName");
+		}
+	}
+
 	public static function generateSharedSecret(\OpenSSLAsymmetricKey $localPriv, \OpenSSLAsymmetricKey $remotePub) : \GMP{
+		self::validateKey($localPriv);
+		self::validateKey($remotePub);
 		$hexSecret = openssl_pkey_derive($remotePub, $localPriv, 48);
 		if($hexSecret === false){
 			throw new \InvalidArgumentException("Failed to derive shared secret: " . openssl_error_string());
diff --git a/src/network/mcpe/handler/DeathPacketHandler.php b/src/network/mcpe/handler/DeathPacketHandler.php
index 6347d8f659..9ed1a72f25 100644
--- a/src/network/mcpe/handler/DeathPacketHandler.php
+++ b/src/network/mcpe/handler/DeathPacketHandler.php
@@ -32,7 +32,6 @@ use pocketmine\network\mcpe\protocol\PlayerActionPacket;
 use pocketmine\network\mcpe\protocol\RespawnPacket;
 use pocketmine\network\mcpe\protocol\types\PlayerAction;
 use pocketmine\player\Player;
-use function array_map;
 
 class DeathPacketHandler extends PacketHandler{
 	public function __construct(
@@ -54,9 +53,7 @@ class DeathPacketHandler extends PacketHandler{
 		if($this->deathMessage instanceof Translatable){
 			$language = $this->player->getLanguage();
 			if(!$this->player->getServer()->isLanguageForced()){
-				//we can't send nested translations to the client, so make sure they are always pre-translated by the server
-				$parameters = array_map(fn(string|Translatable $p) => $p instanceof Translatable ? $language->translate($p) : $p, $this->deathMessage->getParameters());
-				$message = $language->translateString($this->deathMessage->getText(), $parameters, "pocketmine.");
+				[$message, $parameters] = $this->session->prepareClientTranslatableMessage($this->deathMessage);
 			}else{
 				$message = $language->translate($this->deathMessage);
 			}
diff --git a/src/network/mcpe/handler/InGamePacketHandler.php b/src/network/mcpe/handler/InGamePacketHandler.php
index cc2c24776c..6c7402b529 100644
--- a/src/network/mcpe/handler/InGamePacketHandler.php
+++ b/src/network/mcpe/handler/InGamePacketHandler.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\network\mcpe\handler;
 
 use pocketmine\block\BaseSign;
-use pocketmine\block\ItemFrame;
 use pocketmine\block\Lectern;
 use pocketmine\block\tile\Sign;
 use pocketmine\block\utils\SignText;
@@ -32,10 +31,10 @@ use pocketmine\entity\animation\ConsumingItemAnimation;
 use pocketmine\entity\Attribute;
 use pocketmine\entity\InvalidSkinException;
 use pocketmine\event\player\PlayerEditBookEvent;
-use pocketmine\inventory\transaction\action\InventoryAction;
-use pocketmine\inventory\transaction\CraftingTransaction;
+use pocketmine\inventory\transaction\action\DropItemAction;
 use pocketmine\inventory\transaction\InventoryTransaction;
-use pocketmine\inventory\transaction\TransactionException;
+use pocketmine\inventory\transaction\TransactionBuilder;
+use pocketmine\inventory\transaction\TransactionCancelledException;
 use pocketmine\inventory\transaction\TransactionValidationException;
 use pocketmine\item\VanillaItems;
 use pocketmine\item\WritableBook;
@@ -45,9 +44,6 @@ use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\StringTag;
-use pocketmine\network\mcpe\convert\SkinAdapterSingleton;
-use pocketmine\network\mcpe\convert\TypeConversionException;
-use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\InventoryManager;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\ActorEventPacket;
@@ -60,11 +56,11 @@ use pocketmine\network\mcpe\protocol\BossEventPacket;
 use pocketmine\network\mcpe\protocol\CommandBlockUpdatePacket;
 use pocketmine\network\mcpe\protocol\CommandRequestPacket;
 use pocketmine\network\mcpe\protocol\ContainerClosePacket;
-use pocketmine\network\mcpe\protocol\CraftingEventPacket;
 use pocketmine\network\mcpe\protocol\EmotePacket;
 use pocketmine\network\mcpe\protocol\InteractPacket;
 use pocketmine\network\mcpe\protocol\InventoryTransactionPacket;
-use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket;
+use pocketmine\network\mcpe\protocol\ItemStackRequestPacket;
+use pocketmine\network\mcpe\protocol\ItemStackResponsePacket;
 use pocketmine\network\mcpe\protocol\LabTablePacket;
 use pocketmine\network\mcpe\protocol\LecternUpdatePacket;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
@@ -80,7 +76,6 @@ 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\RequestAbilityPacket;
 use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket;
 use pocketmine\network\mcpe\protocol\ServerSettingsRequestPacket;
 use pocketmine\network\mcpe\protocol\SetActorMotionPacket;
@@ -96,7 +91,8 @@ use pocketmine\network\mcpe\protocol\types\inventory\MismatchTransactionData;
 use pocketmine\network\mcpe\protocol\types\inventory\NetworkInventoryAction;
 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\stackrequest\ItemStackRequest;
+use pocketmine\network\mcpe\protocol\types\inventory\stackresponse\ItemStackResponse;
 use pocketmine\network\mcpe\protocol\types\inventory\UseItemOnEntityTransactionData;
 use pocketmine\network\mcpe\protocol\types\inventory\UseItemTransactionData;
 use pocketmine\network\mcpe\protocol\types\PlayerAction;
@@ -108,17 +104,17 @@ use pocketmine\player\Player;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Limits;
 use pocketmine\utils\TextFormat;
+use pocketmine\utils\Utils;
 use pocketmine\world\format\Chunk;
 use function array_push;
-use function base64_encode;
 use function count;
 use function fmod;
+use function get_debug_type;
+use function implode;
 use function in_array;
-use function is_bool;
 use function is_infinite;
 use function is_nan;
 use function json_decode;
-use function json_encode;
 use function max;
 use function mb_strlen;
 use function microtime;
@@ -133,21 +129,17 @@ use const JSON_THROW_ON_ERROR;
 class InGamePacketHandler extends PacketHandler{
 	private const MAX_FORM_RESPONSE_DEPTH = 2; //modal/simple will be 1, custom forms 2 - they will never contain anything other than string|int|float|bool|null
 
-	/** @var CraftingTransaction|null */
-	protected $craftingTransaction = null;
-
-	/** @var float */
-	protected $lastRightClickTime = 0.0;
-	/** @var UseItemTransactionData|null */
-	protected $lastRightClickData = null;
+	protected float $lastRightClickTime = 0.0;
+	protected ?UseItemTransactionData $lastRightClickData = null;
 
 	protected ?Vector3 $lastPlayerAuthInputPosition = null;
 	protected ?float $lastPlayerAuthInputYaw = null;
 	protected ?float $lastPlayerAuthInputPitch = null;
 	protected ?int $lastPlayerAuthInputFlags = null;
 
-	/** @var bool */
-	public $forceMoveSync = false;
+	public bool $forceMoveSync = false;
+
+	protected ?string $lastRequestedFullSkinId = null;
 
 	public function __construct(
 		private Player $player,
@@ -204,7 +196,7 @@ class InGamePacketHandler extends PacketHandler{
 		}
 
 		$hasMoved = $this->lastPlayerAuthInputPosition === null || !$this->lastPlayerAuthInputPosition->equals($rawPos);
-		$newPos = $rawPos->round(4)->subtract(0, 1.62, 0);
+		$newPos = $rawPos->subtract(0, 1.62, 0)->round(4);
 
 		if($this->forceMoveSync && $hasMoved){
 			$curPos = $this->player->getLocation();
@@ -212,7 +204,7 @@ class InGamePacketHandler extends PacketHandler{
 			if($newPos->distanceSquared($curPos) > 1){  //Tolerate up to 1 block to avoid problems with client-sided physics when spawning in blocks
 				$this->session->getLogger()->debug("Got outdated pre-teleport movement, received " . $newPos . ", expected " . $curPos);
 				//Still getting movements from before teleport, ignore them
-				return false;
+				return true;
 			}
 
 			// Once we get a movement within a reasonable distance, treat it as a teleport ACK and remove position lock
@@ -227,11 +219,13 @@ class InGamePacketHandler extends PacketHandler{
 			$sprinting = $this->resolveOnOffInputFlags($inputFlags, PlayerAuthInputFlags::START_SPRINTING, PlayerAuthInputFlags::STOP_SPRINTING);
 			$swimming = $this->resolveOnOffInputFlags($inputFlags, PlayerAuthInputFlags::START_SWIMMING, PlayerAuthInputFlags::STOP_SWIMMING);
 			$gliding = $this->resolveOnOffInputFlags($inputFlags, PlayerAuthInputFlags::START_GLIDING, PlayerAuthInputFlags::STOP_GLIDING);
+			$flying = $this->resolveOnOffInputFlags($inputFlags, PlayerAuthInputFlags::START_FLYING, PlayerAuthInputFlags::STOP_FLYING);
 			$mismatch =
 				($sneaking !== null && !$this->player->toggleSneak($sneaking)) |
 				($sprinting !== null && !$this->player->toggleSprint($sprinting)) |
 				($swimming !== null && !$this->player->toggleSwim($swimming)) |
-				($gliding !== null && !$this->player->toggleGlide($gliding));
+				($gliding !== null && !$this->player->toggleGlide($gliding)) |
+				($flying !== null && !$this->player->toggleFlight($flying));
 			if((bool) $mismatch){
 				$this->player->sendData([$this->player]);
 			}
@@ -239,6 +233,9 @@ class InGamePacketHandler extends PacketHandler{
 			if($packet->hasFlag(PlayerAuthInputFlags::START_JUMPING)){
 				$this->player->jump();
 			}
+			if($packet->hasFlag(PlayerAuthInputFlags::MISSED_SWING)){
+				$this->player->missSwing();
+			}
 		}
 
 		if(!$this->forceMoveSync && $hasMoved){
@@ -254,7 +251,7 @@ class InGamePacketHandler extends PacketHandler{
 			if(count($blockActions) > 100){
 				throw new PacketHandlingException("Too many block actions in PlayerAuthInputPacket");
 			}
-			foreach($blockActions as $k => $blockAction){
+			foreach(Utils::promoteKeys($blockActions) as $k => $blockAction){
 				$actionHandled = false;
 				if($blockAction instanceof PlayerBlockActionStopBreak){
 					$actionHandled = $this->handlePlayerActionFromData($blockAction->getActionType(), new BlockPosition(0, 0, 0), Facing::DOWN);
@@ -274,13 +271,22 @@ class InGamePacketHandler extends PacketHandler{
 			if(count($useItemTransaction->getTransactionData()->getActions()) > 100){
 				throw new PacketHandlingException("Too many actions in item use transaction");
 			}
-			$this->inventoryManager->addPredictedSlotChanges($useItemTransaction->getTransactionData()->getActions());
+
+			$this->inventoryManager->setCurrentItemStackRequestId($useItemTransaction->getRequestId());
+			$this->inventoryManager->addRawPredictedSlotChanges($useItemTransaction->getTransactionData()->getActions());
 			if(!$this->handleUseItemTransaction($useItemTransaction->getTransactionData())){
 				$packetHandled = false;
 				$this->session->getLogger()->debug("Unhandled transaction in PlayerAuthInputPacket (type " . $useItemTransaction->getTransactionData()->getActionType() . ")");
 			}else{
 				$this->inventoryManager->syncMismatchedPredictedSlotChanges();
 			}
+			$this->inventoryManager->setCurrentItemStackRequestId(null);
+		}
+
+		$itemStackRequest = $packet->getItemStackRequest();
+		if($itemStackRequest !== null){
+			$result = $this->handleSingleItemStackRequest($itemStackRequest);
+			$this->session->sendDataPacket(ItemStackResponsePacket::create([$result]));
 		}
 
 		return $packetHandled;
@@ -314,17 +320,21 @@ class InGamePacketHandler extends PacketHandler{
 	public function handleInventoryTransaction(InventoryTransactionPacket $packet) : bool{
 		$result = true;
 
-		if(count($packet->trData->getActions()) > 100){
+		if(count($packet->trData->getActions()) > 50){
 			throw new PacketHandlingException("Too many actions in inventory transaction");
 		}
+		if(count($packet->requestChangedSlots) > 10){
+			throw new PacketHandlingException("Too many slot sync requests in inventory transaction");
+		}
 
-		$this->inventoryManager->addPredictedSlotChanges($packet->trData->getActions());
+		$this->inventoryManager->setCurrentItemStackRequestId($packet->requestId);
+		$this->inventoryManager->addRawPredictedSlotChanges($packet->trData->getActions());
 
 		if($packet->trData instanceof NormalTransactionData){
-			$result = $this->handleNormalTransaction($packet->trData);
+			$result = $this->handleNormalTransaction($packet->trData, $packet->requestId);
 		}elseif($packet->trData instanceof MismatchTransactionData){
 			$this->session->getLogger()->debug("Mismatch transaction received");
-			$this->inventoryManager->syncAll();
+			$this->inventoryManager->requestSyncAll();
 			$result = true;
 		}elseif($packet->trData instanceof UseItemTransactionData){
 			$result = $this->handleUseItemTransaction($packet->trData);
@@ -334,96 +344,130 @@ class InGamePacketHandler extends PacketHandler{
 			$result = $this->handleReleaseItemTransaction($packet->trData);
 		}
 
-		if($this->craftingTransaction === null){ //don't sync if we're waiting to complete a crafting transaction
-			$this->inventoryManager->syncMismatchedPredictedSlotChanges();
+		$this->inventoryManager->syncMismatchedPredictedSlotChanges();
+
+		//requestChangedSlots asks the server to always send out the contents of the specified slots, even if they
+		//haven't changed. Handling these is necessary to ensure the client inventory stays in sync if the server
+		//rejects the transaction. The most common example of this is equipping armor by right-click, which doesn't send
+		//a legacy prediction action for the destination armor slot.
+		foreach($packet->requestChangedSlots as $containerInfo){
+			foreach($containerInfo->getChangedSlotIndexes() as $netSlot){
+				[$windowId, $slot] = ItemStackContainerIdTranslator::translate($containerInfo->getContainerId(), $this->inventoryManager->getCurrentWindowId(), $netSlot);
+				$inventoryAndSlot = $this->inventoryManager->locateWindowAndSlot($windowId, $slot);
+				if($inventoryAndSlot !== null){ //trigger the normal slot sync logic
+					$this->inventoryManager->onSlotChange($inventoryAndSlot[0], $inventoryAndSlot[1]);
+				}
+			}
 		}
+
+		$this->inventoryManager->setCurrentItemStackRequestId(null);
 		return $result;
 	}
 
-	private function handleNormalTransaction(NormalTransactionData $data) : bool{
-		/** @var InventoryAction[] $actions */
-		$actions = [];
+	private function executeInventoryTransaction(InventoryTransaction $transaction, int $requestId) : bool{
+		$this->player->setUsingItem(false);
 
-		$isCraftingPart = false;
-		$converter = TypeConverter::getInstance();
-		foreach($data->getActions() as $networkInventoryAction){
-			if(
-				$networkInventoryAction->sourceType === NetworkInventoryAction::SOURCE_TODO || (
-					$this->craftingTransaction !== null &&
-					!$networkInventoryAction->oldItem->getItemStack()->equals($networkInventoryAction->newItem->getItemStack()) &&
-					$networkInventoryAction->sourceType === NetworkInventoryAction::SOURCE_CONTAINER &&
-					$networkInventoryAction->windowId === ContainerIds::UI &&
-					$networkInventoryAction->inventorySlot === UIInventorySlotOffset::CREATED_ITEM_OUTPUT
-				)
-			){
-				$isCraftingPart = true;
-			}
+		$this->inventoryManager->setCurrentItemStackRequestId($requestId);
+		$this->inventoryManager->addTransactionPredictedSlotChanges($transaction);
+		try{
+			$transaction->execute();
+		}catch(TransactionValidationException $e){
+			$this->inventoryManager->requestSyncAll();
+			$logger = $this->session->getLogger();
+			$logger->debug("Invalid inventory transaction $requestId: " . $e->getMessage());
 
-			try{
-				$action = $converter->createInventoryAction($networkInventoryAction, $this->player, $this->inventoryManager);
-				if($action !== null){
-					$actions[] = $action;
-				}
-			}catch(TypeConversionException $e){
-				$this->session->getLogger()->debug("Error unpacking inventory action: " . $e->getMessage());
-				return false;
-			}
-		}
+			return false;
+		}catch(TransactionCancelledException){
+			$this->session->getLogger()->debug("Inventory transaction $requestId cancelled by a plugin");
 
-		if($isCraftingPart){
-			if($this->craftingTransaction === null){
-				//TODO: this might not be crafting if there is a special inventory open (anvil, enchanting, loom etc)
-				$this->craftingTransaction = new CraftingTransaction($this->player, $this->player->getServer()->getCraftingManager(), $actions);
-			}else{
-				foreach($actions as $action){
-					$this->craftingTransaction->addAction($action);
-				}
-			}
-
-			try{
-				$this->craftingTransaction->validate();
-			}catch(TransactionValidationException $e){
-				//transaction is incomplete - crafting transaction comes in lots of little bits, so we have to collect
-				//all of the parts before we can execute it
-				return true;
-			}
-			$this->player->setUsingItem(false);
-			try{
-				$this->craftingTransaction->execute();
-			}catch(TransactionException $e){
-				$this->session->getLogger()->debug("Failed to execute crafting transaction: " . $e->getMessage());
-				return false;
-			}finally{
-				$this->craftingTransaction = null;
-			}
-		}else{
-			//normal transaction fallthru
-			if($this->craftingTransaction !== null){
-				$this->session->getLogger()->debug("Got unexpected normal inventory action with incomplete crafting transaction, refusing to execute crafting");
-				$this->craftingTransaction = null;
-				return false;
-			}
-
-			if(count($actions) === 0){
-				//TODO: 1.13+ often sends transactions with nothing but useless crap in them, no need for the debug noise
-				return true;
-			}
-
-			$this->player->setUsingItem(false);
-			$transaction = new InventoryTransaction($this->player, $actions);
-			try{
-				$transaction->execute();
-			}catch(TransactionException $e){
-				$logger = $this->session->getLogger();
-				$logger->debug("Failed to execute inventory transaction: " . $e->getMessage());
-				$logger->debug("Actions: " . json_encode($data->getActions()));
-				return false;
-			}
+			return false;
+		}finally{
+			$this->inventoryManager->syncMismatchedPredictedSlotChanges();
+			$this->inventoryManager->setCurrentItemStackRequestId(null);
 		}
 
 		return true;
 	}
 
+	private function handleNormalTransaction(NormalTransactionData $data, int $itemStackRequestId) : bool{
+		//When the ItemStackRequest system is used, this transaction type is used for dropping items by pressing Q.
+		//I don't know why they don't just use ItemStackRequest for that too, which already supports dropping items by
+		//clicking them outside an open inventory menu, but for now it is what it is.
+		//Fortunately, this means we can be much stricter about the validation criteria.
+
+		$actionCount = count($data->getActions());
+		if($actionCount > 2){
+			if($actionCount > 5){
+				throw new PacketHandlingException("Too many actions ($actionCount) in normal inventory transaction");
+			}
+
+			//Due to a bug in the game, this transaction type is still sent when a player edits a book. We don't need
+			//these transactions for editing books, since we have BookEditPacket, so we can just ignore them.
+			$this->session->getLogger()->debug("Ignoring normal inventory transaction with $actionCount actions (drop-item should have exactly 2 actions)");
+			return false;
+		}
+
+		$sourceSlot = null;
+		$clientItemStack = null;
+		$droppedCount = null;
+
+		foreach($data->getActions() as $networkInventoryAction){
+			if($networkInventoryAction->sourceType === NetworkInventoryAction::SOURCE_WORLD && $networkInventoryAction->inventorySlot == NetworkInventoryAction::ACTION_MAGIC_SLOT_DROP_ITEM){
+				$droppedCount = $networkInventoryAction->newItem->getItemStack()->getCount();
+				if($droppedCount <= 0){
+					throw new PacketHandlingException("Expected positive count for dropped item");
+				}
+			}elseif($networkInventoryAction->sourceType === NetworkInventoryAction::SOURCE_CONTAINER && $networkInventoryAction->windowId === ContainerIds::INVENTORY){
+				//mobile players can drop an item from a non-selected hotbar slot
+				$sourceSlot = $networkInventoryAction->inventorySlot;
+				$clientItemStack = $networkInventoryAction->oldItem->getItemStack();
+			}else{
+				$this->session->getLogger()->debug("Unexpected inventory action type $networkInventoryAction->sourceType in drop item transaction");
+				return false;
+			}
+		}
+		if($sourceSlot === null || $clientItemStack === null || $droppedCount === null){
+			$this->session->getLogger()->debug("Missing information in drop item transaction, need source slot, client item stack and dropped count");
+			return false;
+		}
+
+		$inventory = $this->player->getInventory();
+
+		if(!$inventory->slotExists($sourceSlot)){
+			return false; //TODO: size desync??
+		}
+
+		$sourceSlotItem = $inventory->getItem($sourceSlot);
+		if($sourceSlotItem->getCount() < $droppedCount){
+			return false;
+		}
+		$serverItemStack = $this->session->getTypeConverter()->coreItemStackToNet($sourceSlotItem);
+		//Sadly we don't have itemstack IDs here, so we have to compare the basic item properties to ensure that we're
+		//dropping the item the client expects (inventory might be out of sync with the client).
+		if(
+			$serverItemStack->getId() !== $clientItemStack->getId() ||
+			$serverItemStack->getMeta() !== $clientItemStack->getMeta() ||
+			$serverItemStack->getCount() !== $clientItemStack->getCount() ||
+			$serverItemStack->getBlockRuntimeId() !== $clientItemStack->getBlockRuntimeId()
+			//Raw extraData may not match because of TAG_Compound key ordering differences, and decoding it to compare
+			//is costly. Assume that we're in sync if id+meta+count+runtimeId match.
+			//NB: Make sure $clientItemStack isn't used to create the dropped item, as that would allow the client
+			//to change the item NBT since we're not validating it.
+		){
+			return false;
+		}
+
+		//this modifies $sourceSlotItem
+		$droppedItem = $sourceSlotItem->pop($droppedCount);
+
+		$builder = new TransactionBuilder();
+		$builder->getInventory($inventory)->setItem($sourceSlot, $sourceSlotItem);
+		$builder->addAction(new DropItemAction($droppedItem));
+
+		$transaction = new InventoryTransaction($this->player, $builder->generateActions());
+		return $this->executeInventoryTransaction($transaction, $itemStackRequestId);
+	}
+
 	private function handleUseItemTransaction(UseItemTransactionData $data) : bool{
 		$this->player->selectHotbarSlot($data->getHotbarSlot());
 
@@ -449,15 +493,18 @@ class InGamePacketHandler extends PacketHandler{
 
 				$blockPos = $data->getBlockPosition();
 				$vBlockPos = new Vector3($blockPos->getX(), $blockPos->getY(), $blockPos->getZ());
-				if(!$this->player->interactBlock($vBlockPos, $data->getFace(), $clickPos)){
-					$this->onFailedBlockAction($vBlockPos, $data->getFace());
-				}
+				$this->player->interactBlock($vBlockPos, $data->getFace(), $clickPos);
+				//always sync this in case plugins caused a different result than the client expected
+				//we *could* try to enhance detection of plugin-altered behaviour, but this would require propagating
+				//more information up the stack. For now I think this is good enough.
+				//if only the client would tell us what blocks it thinks changed...
+				$this->syncBlocksNearby($vBlockPos, $data->getFace());
 				return true;
 			case UseItemTransactionData::ACTION_BREAK_BLOCK:
 				$blockPos = $data->getBlockPosition();
 				$vBlockPos = new Vector3($blockPos->getX(), $blockPos->getY(), $blockPos->getZ());
 				if(!$this->player->breakBlock($vBlockPos)){
-					$this->onFailedBlockAction($vBlockPos, null);
+					$this->syncBlocksNearby($vBlockPos, null);
 				}
 				return true;
 			case UseItemTransactionData::ACTION_CLICK_AIR:
@@ -485,9 +532,9 @@ class InGamePacketHandler extends PacketHandler{
 	}
 
 	/**
-	 * Internal function used to execute rollbacks when an action fails on a block.
+	 * Syncs blocks nearby to ensure that the client and server agree on the world's blocks after a block interaction.
 	 */
-	private function onFailedBlockAction(Vector3 $blockPos, ?int $face) : void{
+	private function syncBlocksNearby(Vector3 $blockPos, ?int $face) : void{
 		if($blockPos->distanceSquared($this->player->getLocation()) < 10000){
 			$blocks = $blockPos->sidesArray();
 			if($face !== null){
@@ -535,6 +582,52 @@ class InGamePacketHandler extends PacketHandler{
 		return false;
 	}
 
+	private function handleSingleItemStackRequest(ItemStackRequest $request) : ItemStackResponse{
+		if(count($request->getActions()) > 60){
+			//recipe book auto crafting can affect all slots of the inventory when consuming inputs or producing outputs
+			//this means there could be as many as 50 CraftingConsumeInput actions or Place (taking the result) actions
+			//in a single request (there are certain ways items can be arranged which will result in the same stack
+			//being taken from multiple times, but this is behaviour with a calculable limit)
+			//this means there SHOULD be AT MOST 53 actions in a single request, but 60 is a nice round number.
+			//n64Stacks = ?
+			//n1Stacks = 45 - n64Stacks
+			//nItemsRequiredFor1Craft = 9
+			//nResults = floor((n1Stacks + (n64Stacks * 64)) / nItemsRequiredFor1Craft)
+			//nTakeActionsTotal = floor(64 / nResults) + max(1, 64 % nResults) + ((nResults * nItemsRequiredFor1Craft) - (n64Stacks * 64))
+			throw new PacketHandlingException("Too many actions in ItemStackRequest");
+		}
+		$executor = new ItemStackRequestExecutor($this->player, $this->inventoryManager, $request);
+		try{
+			$transaction = $executor->generateInventoryTransaction();
+			$result = $this->executeInventoryTransaction($transaction, $request->getRequestId());
+		}catch(ItemStackRequestProcessException $e){
+			$result = false;
+			$this->session->getLogger()->debug("ItemStackRequest #" . $request->getRequestId() . " failed: " . $e->getMessage());
+			$this->session->getLogger()->debug(implode("\n", Utils::printableExceptionInfo($e)));
+			$this->inventoryManager->requestSyncAll();
+		}
+
+		if(!$result){
+			return new ItemStackResponse(ItemStackResponse::RESULT_ERROR, $request->getRequestId());
+		}
+		return $executor->buildItemStackResponse();
+	}
+
+	public function handleItemStackRequest(ItemStackRequestPacket $packet) : bool{
+		$responses = [];
+		if(count($packet->getRequests()) > 80){
+			//TODO: we can probably lower this limit, but this will do for now
+			throw new PacketHandlingException("Too many requests in ItemStackRequestPacket");
+		}
+		foreach($packet->getRequests() as $request){
+			$responses[] = $this->handleSingleItemStackRequest($request);
+		}
+
+		$this->session->sendDataPacket(ItemStackResponsePacket::create($responses));
+
+		return true;
+	}
+
 	public function handleMobEquipment(MobEquipmentPacket $packet) : bool{
 		if($packet->windowId === ContainerIds::OFFHAND){
 			return true; //this happens when we put an item into the offhand
@@ -578,7 +671,7 @@ class InGamePacketHandler extends PacketHandler{
 	}
 
 	public function handleActorPickRequest(ActorPickRequestPacket $packet) : bool{
-		return false; //TODO
+		return $this->player->pickEntity($packet->actorUniqueId);
 	}
 
 	public function handlePlayerAction(PlayerActionPacket $packet) : bool{
@@ -592,7 +685,7 @@ class InGamePacketHandler extends PacketHandler{
 			case PlayerAction::START_BREAK:
 				self::validateFacing($face);
 				if(!$this->player->attackBlock($pos, $face)){
-					$this->onFailedBlockAction($pos, $face);
+					$this->syncBlocksNearby($pos, $face);
 				}
 
 				break;
@@ -647,10 +740,6 @@ class InGamePacketHandler extends PacketHandler{
 		return true; //this packet is useless
 	}
 
-	public function handleCraftingEvent(CraftingEventPacket $packet) : bool{
-		return true; //this is a broken useless packet, so we don't use it
-	}
-
 	public function handleBlockActorData(BlockActorDataPacket $packet) : bool{
 		$pos = new Vector3($packet->blockPosition->getX(), $packet->blockPosition->getY(), $packet->blockPosition->getZ());
 		if($pos->distanceSquared($this->player->getLocation()) > 10000){
@@ -662,27 +751,32 @@ class InGamePacketHandler extends PacketHandler{
 		if(!($nbt instanceof CompoundTag)) throw new AssumptionFailedError("PHPStan should ensure this is a CompoundTag"); //for phpstorm's benefit
 
 		if($block instanceof BaseSign){
-			if(($textBlobTag = $nbt->getTag(Sign::TAG_TEXT_BLOB)) instanceof StringTag){
-				try{
-					$text = SignText::fromBlob($textBlobTag->getValue());
-				}catch(\InvalidArgumentException $e){
-					throw PacketHandlingException::wrap($e, "Invalid sign text update");
-				}
-
-				try{
-					if(!$block->updateText($this->player, $text)){
-						foreach($this->player->getWorld()->createBlockUpdatePackets([$pos]) as $updatePacket){
-							$this->session->sendDataPacket($updatePacket);
-						}
-					}
-				}catch(\UnexpectedValueException $e){
-					throw PacketHandlingException::wrap($e);
-				}
-
-				return true;
+			$frontTextTag = $nbt->getTag(Sign::TAG_FRONT_TEXT);
+			if(!$frontTextTag instanceof CompoundTag){
+				throw new PacketHandlingException("Invalid tag type " . get_debug_type($frontTextTag) . " for tag \"" . Sign::TAG_FRONT_TEXT . "\" in sign update data");
+			}
+			$textBlobTag = $frontTextTag->getTag(Sign::TAG_TEXT_BLOB);
+			if(!$textBlobTag instanceof StringTag){
+				throw new PacketHandlingException("Invalid tag type " . get_debug_type($textBlobTag) . " for tag \"" . Sign::TAG_TEXT_BLOB . "\" in sign update data");
 			}
 
-			$this->session->getLogger()->debug("Invalid sign update data: " . base64_encode($packet->nbt->getEncodedNbt()));
+			try{
+				$text = SignText::fromBlob($textBlobTag->getValue());
+			}catch(\InvalidArgumentException $e){
+				throw PacketHandlingException::wrap($e, "Invalid sign text update");
+			}
+
+			try{
+				if(!$block->updateText($this->player, $text)){
+					foreach($this->player->getWorld()->createBlockUpdatePackets([$pos]) as $updatePacket){
+						$this->session->sendDataPacket($updatePacket);
+					}
+				}
+			}catch(\UnexpectedValueException $e){
+				throw PacketHandlingException::wrap($e);
+			}
+
+			return true;
 		}
 
 		return false;
@@ -693,8 +787,8 @@ class InGamePacketHandler extends PacketHandler{
 	}
 
 	public function handleSetPlayerGameType(SetPlayerGameTypePacket $packet) : bool{
-		$gameMode = TypeConverter::getInstance()->protocolGameModeToCore($packet->gamemode);
-		if($gameMode === null || !$gameMode->equals($this->player->getGamemode())){
+		$gameMode = $this->session->getTypeConverter()->protocolGameModeToCore($packet->gamemode);
+		if($gameMode !== $this->player->getGamemode()){
 			//Set this back to default. TODO: handle this properly
 			$this->session->syncGameMode($this->player->getGamemode(), true);
 		}
@@ -715,15 +809,6 @@ class InGamePacketHandler extends PacketHandler{
 		return true;
 	}
 
-	public function handleItemFrameDropItem(ItemFrameDropItemPacket $packet) : bool{
-		$blockPosition = $packet->blockPosition;
-		$block = $this->player->getWorld()->getBlockAt($blockPosition->getX(), $blockPosition->getY(), $blockPosition->getZ());
-		if($block instanceof ItemFrame && $block->getFramedItem() !== null){
-			return $this->player->attackBlock(new Vector3($blockPosition->getX(), $blockPosition->getY(), $blockPosition->getZ()), $block->getFacing());
-		}
-		return false;
-	}
-
 	public function handleBossEvent(BossEventPacket $packet) : bool{
 		return false; //TODO
 	}
@@ -745,8 +830,17 @@ class InGamePacketHandler extends PacketHandler{
 	}
 
 	public function handlePlayerSkin(PlayerSkinPacket $packet) : bool{
+		if($packet->skin->getFullSkinId() === $this->lastRequestedFullSkinId){
+			//TODO: HACK! In 1.19.60, the client sends its skin back to us if we sent it a skin different from the one
+			//it's using. We need to prevent this from causing a feedback loop.
+			$this->session->getLogger()->debug("Refused duplicate skin change request");
+			return true;
+		}
+		$this->lastRequestedFullSkinId = $packet->skin->getFullSkinId();
+
+		$this->session->getLogger()->debug("Processing skin change request");
 		try{
-			$skin = SkinAdapterSingleton::get()->fromSkinData($packet->skin);
+			$skin = $this->session->getTypeConverter()->getSkinAdapter()->fromSkinData($packet->skin);
 		}catch(InvalidSkinException $e){
 			throw PacketHandlingException::wrap($e, "Invalid skin in PlayerSkinPacket");
 		}
@@ -776,8 +870,12 @@ class InGamePacketHandler extends PacketHandler{
 	}
 
 	public function handleBookEdit(BookEditPacket $packet) : bool{
+		$inventory = $this->player->getInventory();
+		if(!$inventory->slotExists($packet->inventorySlot)){
+			return false;
+		}
 		//TODO: break this up into book API things
-		$oldBook = $this->player->getInventory()->getItem($packet->inventorySlot);
+		$oldBook = $inventory->getItem($packet->inventorySlot);
 		if(!($oldBook instanceof WritableBook)){
 			return false;
 		}
@@ -892,11 +990,6 @@ class InGamePacketHandler extends PacketHandler{
 	}
 
 	public function handleLecternUpdate(LecternUpdatePacket $packet) : bool{
-		if($packet->dropBook){
-			//Drop book is handled with an interact event on use item transaction
-			return true;
-		}
-
 		$pos = $packet->blockPosition;
 		$chunkX = $pos->getX() >> Chunk::COORD_BIT_SIZE;
 		$chunkZ = $pos->getZ() >> Chunk::COORD_BIT_SIZE;
@@ -908,7 +1001,7 @@ class InGamePacketHandler extends PacketHandler{
 		$lectern = $world->getBlockAt($pos->getX(), $pos->getY(), $pos->getZ());
 		if($lectern instanceof Lectern && $this->player->canInteract($lectern->getPosition(), 15)){
 			if(!$lectern->onPageTurn($packet->page)){
-				$this->onFailedBlockAction($lectern->getPosition(), null);
+				$this->syncBlocksNearby($lectern->getPosition(), null);
 			}
 			return true;
 		}
@@ -934,22 +1027,4 @@ class InGamePacketHandler extends PacketHandler{
 		$this->player->emote($packet->getEmoteId());
 		return true;
 	}
-
-	public function handleRequestAbility(RequestAbilityPacket $packet) : bool{
-		if($packet->getAbilityId() === RequestAbilityPacket::ABILITY_FLYING){
-			$isFlying = $packet->getAbilityValue();
-			if(!is_bool($isFlying)){
-				throw new PacketHandlingException("Flying ability should always have a bool value");
-			}
-			if($isFlying !== $this->player->isFlying()){
-				if(!$this->player->toggleFlight($isFlying)){
-					$this->session->syncAbilities($this->player);
-				}
-			}
-
-			return true;
-		}
-
-		return false;
-	}
 }
diff --git a/src/network/mcpe/handler/ItemStackContainerIdTranslator.php b/src/network/mcpe/handler/ItemStackContainerIdTranslator.php
new file mode 100644
index 0000000000..e9356dd73b
--- /dev/null
+++ b/src/network/mcpe/handler/ItemStackContainerIdTranslator.php
@@ -0,0 +1,98 @@
+<?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\handler;
+
+use pocketmine\network\mcpe\protocol\types\inventory\ContainerIds;
+use pocketmine\network\mcpe\protocol\types\inventory\ContainerUIIds;
+use pocketmine\network\PacketHandlingException;
+
+final class ItemStackContainerIdTranslator{
+
+	private function __construct(){
+		//NOOP
+	}
+
+	/**
+	 * @return int[]
+	 * @phpstan-return array{int, int}
+	 * @throws PacketHandlingException
+	 */
+	public static function translate(int $containerInterfaceId, int $currentWindowId, int $slotId) : array{
+		return match($containerInterfaceId){
+			ContainerUIIds::ARMOR => [ContainerIds::ARMOR, $slotId],
+
+			ContainerUIIds::HOTBAR,
+			ContainerUIIds::INVENTORY,
+			ContainerUIIds::COMBINED_HOTBAR_AND_INVENTORY => [ContainerIds::INVENTORY, $slotId],
+
+			//TODO: HACK! The client sends an incorrect slot ID for the offhand as of 1.19.70 (though this doesn't really matter since the offhand has only 1 slot anyway)
+			ContainerUIIds::OFFHAND => [ContainerIds::OFFHAND, 0],
+
+			ContainerUIIds::ANVIL_INPUT,
+			ContainerUIIds::ANVIL_MATERIAL,
+			ContainerUIIds::BEACON_PAYMENT,
+			ContainerUIIds::CARTOGRAPHY_ADDITIONAL,
+			ContainerUIIds::CARTOGRAPHY_INPUT,
+			ContainerUIIds::COMPOUND_CREATOR_INPUT,
+			ContainerUIIds::CRAFTING_INPUT,
+			ContainerUIIds::CREATED_OUTPUT,
+			ContainerUIIds::CURSOR,
+			ContainerUIIds::ENCHANTING_INPUT,
+			ContainerUIIds::ENCHANTING_MATERIAL,
+			ContainerUIIds::GRINDSTONE_ADDITIONAL,
+			ContainerUIIds::GRINDSTONE_INPUT,
+			ContainerUIIds::LAB_TABLE_INPUT,
+			ContainerUIIds::LOOM_DYE,
+			ContainerUIIds::LOOM_INPUT,
+			ContainerUIIds::LOOM_MATERIAL,
+			ContainerUIIds::MATERIAL_REDUCER_INPUT,
+			ContainerUIIds::MATERIAL_REDUCER_OUTPUT,
+			ContainerUIIds::SMITHING_TABLE_INPUT,
+			ContainerUIIds::SMITHING_TABLE_MATERIAL,
+			ContainerUIIds::SMITHING_TABLE_TEMPLATE,
+			ContainerUIIds::STONECUTTER_INPUT,
+			ContainerUIIds::TRADE2_INGREDIENT1,
+			ContainerUIIds::TRADE2_INGREDIENT2,
+			ContainerUIIds::TRADE_INGREDIENT1,
+			ContainerUIIds::TRADE_INGREDIENT2 => [ContainerIds::UI, $slotId],
+
+			ContainerUIIds::BARREL,
+			ContainerUIIds::BLAST_FURNACE_INGREDIENT,
+			ContainerUIIds::BREWING_STAND_FUEL,
+			ContainerUIIds::BREWING_STAND_INPUT,
+			ContainerUIIds::BREWING_STAND_RESULT,
+			ContainerUIIds::FURNACE_FUEL,
+			ContainerUIIds::FURNACE_INGREDIENT,
+			ContainerUIIds::FURNACE_RESULT,
+			ContainerUIIds::HORSE_EQUIP,
+			ContainerUIIds::LEVEL_ENTITY, //chest
+			ContainerUIIds::SHULKER_BOX,
+			ContainerUIIds::SMOKER_INGREDIENT => [$currentWindowId, $slotId],
+
+			//all preview slots are ignored, since the client shouldn't be modifying those directly
+
+			default => throw new PacketHandlingException("Unexpected container UI ID $containerInterfaceId")
+		};
+	}
+}
diff --git a/src/network/mcpe/handler/ItemStackRequestExecutor.php b/src/network/mcpe/handler/ItemStackRequestExecutor.php
new file mode 100644
index 0000000000..6db8f1e12b
--- /dev/null
+++ b/src/network/mcpe/handler/ItemStackRequestExecutor.php
@@ -0,0 +1,400 @@
+<?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\handler;
+
+use pocketmine\block\inventory\EnchantInventory;
+use pocketmine\inventory\Inventory;
+use pocketmine\inventory\transaction\action\CreateItemAction;
+use pocketmine\inventory\transaction\action\DestroyItemAction;
+use pocketmine\inventory\transaction\action\DropItemAction;
+use pocketmine\inventory\transaction\CraftingTransaction;
+use pocketmine\inventory\transaction\EnchantingTransaction;
+use pocketmine\inventory\transaction\InventoryTransaction;
+use pocketmine\inventory\transaction\TransactionBuilder;
+use pocketmine\inventory\transaction\TransactionBuilderInventory;
+use pocketmine\item\Item;
+use pocketmine\network\mcpe\InventoryManager;
+use pocketmine\network\mcpe\protocol\types\inventory\ContainerUIIds;
+use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\CraftingConsumeInputStackRequestAction;
+use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\CraftingCreateSpecificResultStackRequestAction;
+use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\CraftRecipeAutoStackRequestAction;
+use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\CraftRecipeStackRequestAction;
+use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\CreativeCreateStackRequestAction;
+use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\DeprecatedCraftingResultsStackRequestAction;
+use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\DestroyStackRequestAction;
+use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\DropStackRequestAction;
+use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\ItemStackRequest;
+use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\ItemStackRequestAction;
+use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\ItemStackRequestSlotInfo;
+use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\PlaceStackRequestAction;
+use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\SwapStackRequestAction;
+use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\TakeStackRequestAction;
+use pocketmine\network\mcpe\protocol\types\inventory\stackresponse\ItemStackResponse;
+use pocketmine\network\mcpe\protocol\types\inventory\UIInventorySlotOffset;
+use pocketmine\player\Player;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Utils;
+use function array_key_first;
+use function count;
+use function spl_object_id;
+
+class ItemStackRequestExecutor{
+	private TransactionBuilder $builder;
+
+	/** @var ItemStackRequestSlotInfo[] */
+	private array $requestSlotInfos = [];
+
+	private ?InventoryTransaction $specialTransaction = null;
+
+	/** @var Item[] */
+	private array $craftingResults = [];
+
+	private ?Item $nextCreatedItem = null;
+	private bool $createdItemFromCreativeInventory = false;
+	private int $createdItemsTakenCount = 0;
+
+	public function __construct(
+		private Player $player,
+		private InventoryManager $inventoryManager,
+		private ItemStackRequest $request
+	){
+		$this->builder = new TransactionBuilder();
+	}
+
+	protected function prettyInventoryAndSlot(Inventory $inventory, int $slot) : string{
+		if($inventory instanceof TransactionBuilderInventory){
+			$inventory = $inventory->getActualInventory();
+		}
+		return (new \ReflectionClass($inventory))->getShortName() . "#" . spl_object_id($inventory) . ", slot: $slot";
+	}
+
+	/**
+	 * @throws ItemStackRequestProcessException
+	 */
+	private function matchItemStack(Inventory $inventory, int $slotId, int $clientItemStackId) : void{
+		$info = $this->inventoryManager->getItemStackInfo($inventory, $slotId);
+		if($info === null){
+			throw new AssumptionFailedError("The inventory is tracked and the slot is valid, so this should not be null");
+		}
+
+		if(!($clientItemStackId < 0 ? $info->getRequestId() === $clientItemStackId : $info->getStackId() === $clientItemStackId)){
+			throw new ItemStackRequestProcessException(
+				$this->prettyInventoryAndSlot($inventory, $slotId) . ": " .
+				"Mismatched expected itemstack, " .
+				"client expected: $clientItemStackId, server actual: " . $info->getStackId() . ", last modified by request: " . ($info->getRequestId() ?? "none")
+			);
+		}
+	}
+
+	/**
+	 * @phpstan-return array{TransactionBuilderInventory, int}
+	 *
+	 * @throws ItemStackRequestProcessException
+	 */
+	protected function getBuilderInventoryAndSlot(ItemStackRequestSlotInfo $info) : array{
+		[$windowId, $slotId] = ItemStackContainerIdTranslator::translate($info->getContainerName()->getContainerId(), $this->inventoryManager->getCurrentWindowId(), $info->getSlotId());
+		$windowAndSlot = $this->inventoryManager->locateWindowAndSlot($windowId, $slotId);
+		if($windowAndSlot === null){
+			throw new ItemStackRequestProcessException("No open inventory matches container UI ID: " . $info->getContainerName()->getContainerId() . ", slot ID: " . $info->getSlotId());
+		}
+		[$inventory, $slot] = $windowAndSlot;
+		if(!$inventory->slotExists($slot)){
+			throw new ItemStackRequestProcessException("No such inventory slot :" . $this->prettyInventoryAndSlot($inventory, $slot));
+		}
+
+		if($info->getStackId() !== $this->request->getRequestId()){ //the itemstack may have been modified by the current request
+			$this->matchItemStack($inventory, $slot, $info->getStackId());
+		}
+
+		return [$this->builder->getInventory($inventory), $slot];
+	}
+
+	/**
+	 * @throws ItemStackRequestProcessException
+	 */
+	protected function transferItems(ItemStackRequestSlotInfo $source, ItemStackRequestSlotInfo $destination, int $count) : void{
+		$removed = $this->removeItemFromSlot($source, $count);
+		$this->addItemToSlot($destination, $removed, $count);
+	}
+
+	/**
+	 * Deducts items from an inventory slot, returning a stack containing the removed items.
+	 * @throws ItemStackRequestProcessException
+	 */
+	protected function removeItemFromSlot(ItemStackRequestSlotInfo $slotInfo, int $count) : Item{
+		if($slotInfo->getContainerName()->getContainerId() === ContainerUIIds::CREATED_OUTPUT && $slotInfo->getSlotId() === UIInventorySlotOffset::CREATED_ITEM_OUTPUT){
+			//special case for the "created item" output slot
+			//TODO: do we need to send a response for this slot info?
+			return $this->takeCreatedItem($count);
+		}
+		$this->requestSlotInfos[] = $slotInfo;
+		[$inventory, $slot] = $this->getBuilderInventoryAndSlot($slotInfo);
+		if($count < 1){
+			//this should be impossible at the protocol level, but in case of buggy core code this will prevent exploits
+			throw new ItemStackRequestProcessException($this->prettyInventoryAndSlot($inventory, $slot) . ": Cannot take less than 1 items from a stack");
+		}
+
+		$existingItem = $inventory->getItem($slot);
+		if($existingItem->getCount() < $count){
+			throw new ItemStackRequestProcessException($this->prettyInventoryAndSlot($inventory, $slot) . ": Cannot take $count items from a stack of " . $existingItem->getCount());
+		}
+
+		$removed = $existingItem->pop($count);
+		$inventory->setItem($slot, $existingItem);
+
+		return $removed;
+	}
+
+	/**
+	 * Adds items to the target slot, if they are stackable.
+	 * @throws ItemStackRequestProcessException
+	 */
+	protected function addItemToSlot(ItemStackRequestSlotInfo $slotInfo, Item $item, int $count) : void{
+		$this->requestSlotInfos[] = $slotInfo;
+		[$inventory, $slot] = $this->getBuilderInventoryAndSlot($slotInfo);
+		if($count < 1){
+			//this should be impossible at the protocol level, but in case of buggy core code this will prevent exploits
+			throw new ItemStackRequestProcessException($this->prettyInventoryAndSlot($inventory, $slot) . ": Cannot take less than 1 items from a stack");
+		}
+
+		$existingItem = $inventory->getItem($slot);
+		if(!$existingItem->isNull() && !$existingItem->canStackWith($item)){
+			throw new ItemStackRequestProcessException($this->prettyInventoryAndSlot($inventory, $slot) . ": Can only add items to an empty slot, or a slot containing the same item");
+		}
+
+		//we can't use the existing item here; it may be an empty stack
+		$newItem = clone $item;
+		$newItem->setCount($existingItem->getCount() + $count);
+		$inventory->setItem($slot, $newItem);
+	}
+
+	protected function dropItem(Item $item, int $count) : void{
+		if($count < 1){
+			throw new ItemStackRequestProcessException("Cannot drop less than 1 of an item");
+		}
+		$this->builder->addAction(new DropItemAction((clone $item)->setCount($count)));
+	}
+
+	/**
+	 * @throws ItemStackRequestProcessException
+	 */
+	protected function setNextCreatedItem(?Item $item, bool $creative = false) : void{
+		if($item !== null && $item->isNull()){
+			$item = null;
+		}
+		if($this->nextCreatedItem !== null){
+			//while this is more complicated than simply adding the action when the item is taken, this ensures that
+			//plugins can tell the difference between 1 item that got split into 2 slots, vs 2 separate items.
+			if($this->createdItemFromCreativeInventory && $this->createdItemsTakenCount > 0){
+				$this->nextCreatedItem->setCount($this->createdItemsTakenCount);
+				$this->builder->addAction(new CreateItemAction($this->nextCreatedItem));
+			}elseif($this->createdItemsTakenCount < $this->nextCreatedItem->getCount()){
+				throw new ItemStackRequestProcessException("Not all of the previous created item was taken");
+			}
+		}
+		$this->nextCreatedItem = $item;
+		$this->createdItemFromCreativeInventory = $creative;
+		$this->createdItemsTakenCount = 0;
+	}
+
+	/**
+	 * @throws ItemStackRequestProcessException
+	 */
+	protected function beginCrafting(int $recipeId, int $repetitions) : void{
+		if($this->specialTransaction !== null){
+			throw new ItemStackRequestProcessException("Another special transaction is already in progress");
+		}
+		if($repetitions < 1){
+			throw new ItemStackRequestProcessException("Cannot craft a recipe less than 1 time");
+		}
+		if($repetitions > 256){
+			//TODO: we can probably lower this limit to 64, but I'm unsure if there are cases where the client may
+			//request more than 64 repetitions of a recipe.
+			//It's already hard-limited to 256 repetitions in the protocol, so this is just a sanity check.
+			throw new ItemStackRequestProcessException("Cannot craft a recipe more than 256 times");
+		}
+		$craftingManager = $this->player->getServer()->getCraftingManager();
+		$recipe = $craftingManager->getCraftingRecipeFromIndex($recipeId);
+		if($recipe === null){
+			throw new ItemStackRequestProcessException("No such crafting recipe index: $recipeId");
+		}
+
+		$this->specialTransaction = new CraftingTransaction($this->player, $craftingManager, [], $recipe, $repetitions);
+
+		//TODO: Since the system assumes that crafting can only be done in the crafting grid, we have to give it a
+		//crafting grid to make the API happy. No implementation of getResultsFor() actually uses the crafting grid
+		//right now, so this will work, but this will become a problem in the future for things like shulker boxes and
+		//custom crafting recipes.
+		$craftingResults = $recipe->getResultsFor($this->player->getCraftingGrid());
+		foreach($craftingResults as $k => $craftingResult){
+			$craftingResult->setCount($craftingResult->getCount() * $repetitions);
+			$this->craftingResults[$k] = $craftingResult;
+		}
+		if(count($this->craftingResults) === 1){
+			//for multi-output recipes, later actions will tell us which result to create and when
+			$this->setNextCreatedItem($this->craftingResults[array_key_first($this->craftingResults)]);
+		}
+	}
+
+	/**
+	 * @throws ItemStackRequestProcessException
+	 */
+	protected function takeCreatedItem(int $count) : Item{
+		if($count < 1){
+			//this should be impossible at the protocol level, but in case of buggy core code this will prevent exploits
+			throw new ItemStackRequestProcessException("Cannot take less than 1 created item");
+		}
+		$createdItem = $this->nextCreatedItem;
+		if($createdItem === null){
+			throw new ItemStackRequestProcessException("No created item is waiting to be taken");
+		}
+
+		if(!$this->createdItemFromCreativeInventory){
+			$availableCount = $createdItem->getCount() - $this->createdItemsTakenCount;
+			if($count > $availableCount){
+				throw new ItemStackRequestProcessException("Not enough created items available to be taken (have $availableCount, tried to take $count)");
+			}
+		}
+
+		$this->createdItemsTakenCount += $count;
+		$takenItem = clone $createdItem;
+		$takenItem->setCount($count);
+		if(!$this->createdItemFromCreativeInventory && $this->createdItemsTakenCount >= $createdItem->getCount()){
+			$this->setNextCreatedItem(null);
+		}
+		return $takenItem;
+	}
+
+	/**
+	 * @throws ItemStackRequestProcessException
+	 */
+	private function assertDoingCrafting() : void{
+		if(!$this->specialTransaction instanceof CraftingTransaction && !$this->specialTransaction instanceof EnchantingTransaction){
+			if($this->specialTransaction === null){
+				throw new ItemStackRequestProcessException("Expected CraftRecipe or CraftRecipeAuto action to precede this action");
+			}else{
+				throw new ItemStackRequestProcessException("A different special transaction is already in progress");
+			}
+		}
+	}
+
+	/**
+	 * @throws ItemStackRequestProcessException
+	 */
+	protected function processItemStackRequestAction(ItemStackRequestAction $action) : void{
+		if(
+			$action instanceof TakeStackRequestAction ||
+			$action instanceof PlaceStackRequestAction
+		){
+			$this->transferItems($action->getSource(), $action->getDestination(), $action->getCount());
+		}elseif($action instanceof SwapStackRequestAction){
+			$this->requestSlotInfos[] = $action->getSlot1();
+			$this->requestSlotInfos[] = $action->getSlot2();
+
+			[$inventory1, $slot1] = $this->getBuilderInventoryAndSlot($action->getSlot1());
+			[$inventory2, $slot2] = $this->getBuilderInventoryAndSlot($action->getSlot2());
+
+			$item1 = $inventory1->getItem($slot1);
+			$item2 = $inventory2->getItem($slot2);
+			$inventory1->setItem($slot1, $item2);
+			$inventory2->setItem($slot2, $item1);
+		}elseif($action instanceof DropStackRequestAction){
+			//TODO: this action has a "randomly" field, I have no idea what it's used for
+			$dropped = $this->removeItemFromSlot($action->getSource(), $action->getCount());
+			$this->builder->addAction(new DropItemAction($dropped));
+
+		}elseif($action instanceof DestroyStackRequestAction){
+			$destroyed = $this->removeItemFromSlot($action->getSource(), $action->getCount());
+			$this->builder->addAction(new DestroyItemAction($destroyed));
+
+		}elseif($action instanceof CreativeCreateStackRequestAction){
+			$item = $this->player->getCreativeInventory()->getItem($action->getCreativeItemId());
+			if($item === null){
+				throw new ItemStackRequestProcessException("No such creative item index: " . $action->getCreativeItemId());
+			}
+
+			$this->setNextCreatedItem($item, true);
+		}elseif($action instanceof CraftRecipeStackRequestAction){
+			$window = $this->player->getCurrentWindow();
+			if($window instanceof EnchantInventory){
+				$optionId = $this->inventoryManager->getEnchantingTableOptionIndex($action->getRecipeId());
+				if($optionId !== null && ($option = $window->getOption($optionId)) !== null){
+					$this->specialTransaction = new EnchantingTransaction($this->player, $option, $optionId + 1);
+					$this->setNextCreatedItem($window->getOutput($optionId));
+				}
+			}else{
+				$this->beginCrafting($action->getRecipeId(), $action->getRepetitions());
+			}
+		}elseif($action instanceof CraftRecipeAutoStackRequestAction){
+			$this->beginCrafting($action->getRecipeId(), $action->getRepetitions());
+		}elseif($action instanceof CraftingConsumeInputStackRequestAction){
+			$this->assertDoingCrafting();
+			$this->removeItemFromSlot($action->getSource(), $action->getCount()); //output discarded - we allow CraftingTransaction to verify the balance
+
+		}elseif($action instanceof CraftingCreateSpecificResultStackRequestAction){
+			$this->assertDoingCrafting();
+
+			$nextResultItem = $this->craftingResults[$action->getResultIndex()] ?? null;
+			if($nextResultItem === null){
+				throw new ItemStackRequestProcessException("No such crafting result index: " . $action->getResultIndex());
+			}
+			$this->setNextCreatedItem($nextResultItem);
+		}elseif($action instanceof DeprecatedCraftingResultsStackRequestAction){
+			//no obvious use
+		}else{
+			throw new ItemStackRequestProcessException("Unhandled item stack request action");
+		}
+	}
+
+	/**
+	 * @throws ItemStackRequestProcessException
+	 */
+	public function generateInventoryTransaction() : InventoryTransaction{
+		foreach(Utils::promoteKeys($this->request->getActions()) as $k => $action){
+			try{
+				$this->processItemStackRequestAction($action);
+			}catch(ItemStackRequestProcessException $e){
+				throw new ItemStackRequestProcessException("Error processing action $k (" . (new \ReflectionClass($action))->getShortName() . "): " . $e->getMessage(), 0, $e);
+			}
+		}
+		$this->setNextCreatedItem(null);
+		$inventoryActions = $this->builder->generateActions();
+
+		$transaction = $this->specialTransaction ?? new InventoryTransaction($this->player);
+		foreach($inventoryActions as $action){
+			$transaction->addAction($action);
+		}
+
+		return $transaction;
+	}
+
+	public function buildItemStackResponse() : ItemStackResponse{
+		$builder = new ItemStackResponseBuilder($this->request->getRequestId(), $this->inventoryManager);
+		foreach($this->requestSlotInfos as $requestInfo){
+			$builder->addSlot($requestInfo->getContainerName()->getContainerId(), $requestInfo->getSlotId());
+		}
+
+		return $builder->build();
+	}
+}
diff --git a/src/network/mcpe/handler/ItemStackRequestProcessException.php b/src/network/mcpe/handler/ItemStackRequestProcessException.php
new file mode 100644
index 0000000000..7d5c667cfb
--- /dev/null
+++ b/src/network/mcpe/handler/ItemStackRequestProcessException.php
@@ -0,0 +1,31 @@
+<?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\handler;
+
+/**
+ * Thrown when an error occurs during processing of an ItemStackRequest.
+ */
+final class ItemStackRequestProcessException extends \RuntimeException{
+
+}
diff --git a/src/network/mcpe/handler/ItemStackResponseBuilder.php b/src/network/mcpe/handler/ItemStackResponseBuilder.php
new file mode 100644
index 0000000000..1369e3ba72
--- /dev/null
+++ b/src/network/mcpe/handler/ItemStackResponseBuilder.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\handler;
+
+use pocketmine\inventory\Inventory;
+use pocketmine\item\Durable;
+use pocketmine\network\mcpe\InventoryManager;
+use pocketmine\network\mcpe\protocol\types\inventory\ContainerUIIds;
+use pocketmine\network\mcpe\protocol\types\inventory\FullContainerName;
+use pocketmine\network\mcpe\protocol\types\inventory\stackresponse\ItemStackResponse;
+use pocketmine\network\mcpe\protocol\types\inventory\stackresponse\ItemStackResponseContainerInfo;
+use pocketmine\network\mcpe\protocol\types\inventory\stackresponse\ItemStackResponseSlotInfo;
+use pocketmine\utils\AssumptionFailedError;
+
+final class ItemStackResponseBuilder{
+
+	/**
+	 * @var int[][]
+	 * @phpstan-var array<int, array<int, int>>
+	 */
+	private array $changedSlots = [];
+
+	public function __construct(
+		private int $requestId,
+		private InventoryManager $inventoryManager
+	){}
+
+	public function addSlot(int $containerInterfaceId, int $slotId) : void{
+		$this->changedSlots[$containerInterfaceId][$slotId] = $slotId;
+	}
+
+	/**
+	 * @phpstan-return array{Inventory, int}
+	 */
+	private function getInventoryAndSlot(int $containerInterfaceId, int $slotId) : ?array{
+		[$windowId, $slotId] = ItemStackContainerIdTranslator::translate($containerInterfaceId, $this->inventoryManager->getCurrentWindowId(), $slotId);
+		$windowAndSlot = $this->inventoryManager->locateWindowAndSlot($windowId, $slotId);
+		if($windowAndSlot === null){
+			return null;
+		}
+		[$inventory, $slot] = $windowAndSlot;
+		if(!$inventory->slotExists($slot)){
+			return null;
+		}
+
+		return [$inventory, $slot];
+	}
+
+	public function build() : ItemStackResponse{
+		$responseInfosByContainer = [];
+		foreach($this->changedSlots as $containerInterfaceId => $slotIds){
+			if($containerInterfaceId === ContainerUIIds::CREATED_OUTPUT){
+				continue;
+			}
+			foreach($slotIds as $slotId){
+				$inventoryAndSlot = $this->getInventoryAndSlot($containerInterfaceId, $slotId);
+				if($inventoryAndSlot === null){
+					//a plugin may have closed the inventory during an event, or the slot may have been invalid
+					continue;
+				}
+				[$inventory, $slot] = $inventoryAndSlot;
+
+				$itemStackInfo = $this->inventoryManager->getItemStackInfo($inventory, $slot);
+				if($itemStackInfo === null){
+					throw new AssumptionFailedError("ItemStackInfo should never be null for an open inventory");
+				}
+				$item = $inventory->getItem($slot);
+
+				$responseInfosByContainer[$containerInterfaceId][] = new ItemStackResponseSlotInfo(
+					$slotId,
+					$slotId,
+					$item->getCount(),
+					$itemStackInfo->getStackId(),
+					$item->getCustomName(),
+					$item instanceof Durable ? $item->getDamage() : 0,
+				);
+			}
+		}
+
+		$responseContainerInfos = [];
+		foreach($responseInfosByContainer as $containerInterfaceId => $responseInfos){
+			$responseContainerInfos[] = new ItemStackResponseContainerInfo(new FullContainerName($containerInterfaceId), $responseInfos);
+		}
+
+		return new ItemStackResponse(ItemStackResponse::RESULT_OK, $this->requestId, $responseContainerInfos);
+	}
+}
diff --git a/src/network/mcpe/handler/LoginPacketHandler.php b/src/network/mcpe/handler/LoginPacketHandler.php
index 80f162697a..c15753dad3 100644
--- a/src/network/mcpe/handler/LoginPacketHandler.php
+++ b/src/network/mcpe/handler/LoginPacketHandler.php
@@ -26,15 +26,12 @@ namespace pocketmine\network\mcpe\handler;
 use pocketmine\entity\InvalidSkinException;
 use pocketmine\event\player\PlayerPreLoginEvent;
 use pocketmine\lang\KnownTranslationFactory;
-use pocketmine\lang\KnownTranslationKeys;
+use pocketmine\lang\Translatable;
 use pocketmine\network\mcpe\auth\ProcessLoginTask;
-use pocketmine\network\mcpe\convert\SkinAdapterSingleton;
 use pocketmine\network\mcpe\JwtException;
 use pocketmine\network\mcpe\JwtUtils;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\LoginPacket;
-use pocketmine\network\mcpe\protocol\PlayStatusPacket;
-use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\network\mcpe\protocol\types\login\AuthenticationData;
 use pocketmine\network\mcpe\protocol\types\login\ClientData;
 use pocketmine\network\mcpe\protocol\types\login\ClientDataToSkinDataHelper;
@@ -53,7 +50,7 @@ use function is_array;
 class LoginPacketHandler extends PacketHandler{
 	/**
 	 * @phpstan-param \Closure(PlayerInfo) : void $playerInfoConsumer
-	 * @phpstan-param \Closure(bool $isAuthenticated, bool $authRequired, ?string $error, ?string $clientPubKey) : void $authCallback
+	 * @phpstan-param \Closure(bool $isAuthenticated, bool $authRequired, Translatable|string|null $error, ?string $clientPubKey) : void $authCallback
 	 */
 	public function __construct(
 		private Server $server,
@@ -63,32 +60,23 @@ class LoginPacketHandler extends PacketHandler{
 	){}
 
 	public function handleLogin(LoginPacket $packet) : bool{
-		if(!$this->isCompatibleProtocol($packet->protocol)){
-			$this->session->sendDataPacket(PlayStatusPacket::create($packet->protocol < ProtocolInfo::CURRENT_PROTOCOL ? PlayStatusPacket::LOGIN_FAILED_CLIENT : PlayStatusPacket::LOGIN_FAILED_SERVER), true);
-
-			//This pocketmine disconnect message will only be seen by the console (PlayStatusPacket causes the messages to be shown for the client)
-			$this->session->disconnect(
-				$this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_disconnect_incompatibleProtocol((string) $packet->protocol)),
-				false
-			);
-
-			return true;
-		}
-
 		$extraData = $this->fetchAuthData($packet->chainDataJwt);
 
 		if(!Player::isValidUserName($extraData->displayName)){
-			$this->session->disconnect(KnownTranslationKeys::DISCONNECTIONSCREEN_INVALIDNAME);
+			$this->session->disconnectWithError(KnownTranslationFactory::disconnectionScreen_invalidName());
 
 			return true;
 		}
 
 		$clientData = $this->parseClientData($packet->clientDataJwt);
+
 		try{
-			$skin = SkinAdapterSingleton::get()->fromSkinData(ClientDataToSkinDataHelper::fromClientData($clientData));
+			$skin = $this->session->getTypeConverter()->getSkinAdapter()->fromSkinData(ClientDataToSkinDataHelper::fromClientData($clientData));
 		}catch(\InvalidArgumentException | InvalidSkinException $e){
-			$this->session->getLogger()->debug("Invalid skin: " . $e->getMessage());
-			$this->session->disconnect(KnownTranslationKeys::DISCONNECTIONSCREEN_INVALIDSKIN);
+			$this->session->disconnectWithError(
+				reason: "Invalid skin: " . $e->getMessage(),
+				disconnectScreenMessage: KnownTranslationFactory::disconnectionScreen_invalidSkin()
+			);
 
 			return true;
 		}
@@ -97,6 +85,9 @@ class LoginPacketHandler extends PacketHandler{
 			throw new PacketHandlingException("Invalid login UUID");
 		}
 		$uuid = Uuid::fromString($extraData->identity);
+		$arrClientData = (array) $clientData;
+		$arrClientData["TitleID"] = $extraData->titleId;
+
 		if($extraData->XUID !== ""){
 			$playerInfo = new XboxLivePlayerInfo(
 				$extraData->XUID,
@@ -104,7 +95,7 @@ class LoginPacketHandler extends PacketHandler{
 				$uuid,
 				$skin,
 				$clientData->LanguageCode,
-				(array) $clientData
+				$arrClientData
 			);
 		}else{
 			$playerInfo = new PlayerInfo(
@@ -112,7 +103,7 @@ class LoginPacketHandler extends PacketHandler{
 				$uuid,
 				$skin,
 				$clientData->LanguageCode,
-				(array) $clientData
+				$arrClientData
 			);
 		}
 		($this->playerInfoConsumer)($playerInfo);
@@ -124,18 +115,27 @@ class LoginPacketHandler extends PacketHandler{
 			$this->server->requiresAuthentication()
 		);
 		if($this->server->getNetwork()->getValidConnectionCount() > $this->server->getMaxPlayers()){
-			$ev->setKickReason(PlayerPreLoginEvent::KICK_REASON_SERVER_FULL, KnownTranslationKeys::DISCONNECTIONSCREEN_SERVERFULL);
+			$ev->setKickFlag(PlayerPreLoginEvent::KICK_FLAG_SERVER_FULL, KnownTranslationFactory::disconnectionScreen_serverFull());
 		}
 		if(!$this->server->isWhitelisted($playerInfo->getUsername())){
-			$ev->setKickReason(PlayerPreLoginEvent::KICK_REASON_SERVER_WHITELISTED, "Server is whitelisted");
+			$ev->setKickFlag(PlayerPreLoginEvent::KICK_FLAG_SERVER_WHITELISTED, KnownTranslationFactory::pocketmine_disconnect_whitelisted());
 		}
-		if($this->server->getNameBans()->isBanned($playerInfo->getUsername()) || $this->server->getIPBans()->isBanned($this->session->getIp())){
-			$ev->setKickReason(PlayerPreLoginEvent::KICK_REASON_BANNED, "You are banned");
+
+		$banMessage = null;
+		if(($banEntry = $this->server->getNameBans()->getEntry($playerInfo->getUsername())) !== null){
+			$banReason = $banEntry->getReason();
+			$banMessage = $banReason === "" ? KnownTranslationFactory::pocketmine_disconnect_ban_noReason() : KnownTranslationFactory::pocketmine_disconnect_ban($banReason);
+		}elseif(($banEntry = $this->server->getIPBans()->getEntry($this->session->getIp())) !== null){
+			$banReason = $banEntry->getReason();
+			$banMessage = KnownTranslationFactory::pocketmine_disconnect_ban($banReason !== "" ? $banReason : KnownTranslationFactory::pocketmine_disconnect_ban_ip());
+		}
+		if($banMessage !== null){
+			$ev->setKickFlag(PlayerPreLoginEvent::KICK_FLAG_BANNED, $banMessage);
 		}
 
 		$ev->call();
 		if(!$ev->isAllowed()){
-			$this->session->disconnect($ev->getFinalKickMessage());
+			$this->session->disconnect($ev->getFinalDisconnectReason(), $ev->getFinalDisconnectScreenMessage());
 			return true;
 		}
 
@@ -150,7 +150,7 @@ class LoginPacketHandler extends PacketHandler{
 	protected function fetchAuthData(JwtChain $chain) : AuthenticationData{
 		/** @var AuthenticationData|null $extraData */
 		$extraData = null;
-		foreach($chain->chain as $k => $jwt){
+		foreach($chain->chain as $jwt){
 			//validate every chain element
 			try{
 				[, $claims, ] = JwtUtils::parse($jwt);
@@ -169,6 +169,7 @@ class LoginPacketHandler extends PacketHandler{
 				$mapper->bEnforceMapType = false; //TODO: we don't really need this as an array, but right now we don't have enough models
 				$mapper->bExceptionOnMissingData = true;
 				$mapper->bExceptionOnUndefinedProperty = true;
+				$mapper->bStrictObjectTypeChecking = true;
 				try{
 					/** @var AuthenticationData $extraData */
 					$extraData = $mapper->map($claims["extraData"], new AuthenticationData());
@@ -197,6 +198,7 @@ class LoginPacketHandler extends PacketHandler{
 		$mapper->bEnforceMapType = false; //TODO: we don't really need this as an array, but right now we don't have enough models
 		$mapper->bExceptionOnMissingData = true;
 		$mapper->bExceptionOnUndefinedProperty = true;
+		$mapper->bStrictObjectTypeChecking = true;
 		try{
 			$clientData = $mapper->map($clientDataClaims, new ClientData());
 		}catch(\JsonMapper_Exception $e){
@@ -215,8 +217,4 @@ class LoginPacketHandler extends PacketHandler{
 		$this->server->getAsyncPool()->submitTask(new ProcessLoginTask($packet->chainDataJwt->chain, $packet->clientDataJwt, $authRequired, $this->authCallback));
 		$this->session->setHandler(null); //drop packets received during login verification
 	}
-
-	protected function isCompatibleProtocol(int $protocolVersion) : bool{
-		return $protocolVersion === ProtocolInfo::CURRENT_PROTOCOL;
-	}
 }
diff --git a/src/network/mcpe/handler/PreSpawnPacketHandler.php b/src/network/mcpe/handler/PreSpawnPacketHandler.php
index 04c51d3fb3..b80874938c 100644
--- a/src/network/mcpe/handler/PreSpawnPacketHandler.php
+++ b/src/network/mcpe/handler/PreSpawnPacketHandler.php
@@ -26,8 +26,6 @@ namespace pocketmine\network\mcpe\handler;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\network\mcpe\cache\CraftingDataCache;
 use pocketmine\network\mcpe\cache\StaticPacketCache;
-use pocketmine\network\mcpe\convert\GlobalItemTypeDictionary;
-use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\InventoryManager;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\PlayerAuthInputPacket;
@@ -39,11 +37,13 @@ use pocketmine\network\mcpe\protocol\types\CacheableNbt;
 use pocketmine\network\mcpe\protocol\types\DimensionIds;
 use pocketmine\network\mcpe\protocol\types\Experiments;
 use pocketmine\network\mcpe\protocol\types\LevelSettings;
+use pocketmine\network\mcpe\protocol\types\NetworkPermissions;
 use pocketmine\network\mcpe\protocol\types\PlayerMovementSettings;
-use pocketmine\network\mcpe\protocol\types\PlayerMovementType;
+use pocketmine\network\mcpe\protocol\types\ServerAuthMovementMode;
 use pocketmine\network\mcpe\protocol\types\SpawnSettings;
 use pocketmine\player\Player;
 use pocketmine\Server;
+use pocketmine\timings\Timings;
 use pocketmine\VersionInfo;
 use Ramsey\Uuid\Uuid;
 use function sprintf;
@@ -60,89 +60,98 @@ class PreSpawnPacketHandler extends PacketHandler{
 	){}
 
 	public function setUp() : void{
-		$location = $this->player->getLocation();
-		$world = $location->getWorld();
+		Timings::$playerNetworkSendPreSpawnGameData->startTiming();
+		try{
+			$location = $this->player->getLocation();
+			$world = $location->getWorld();
 
-		$this->session->getLogger()->debug("Preparing StartGamePacket");
-		$levelSettings = new LevelSettings();
-		$levelSettings->seed = -1;
-		$levelSettings->spawnSettings = new SpawnSettings(SpawnSettings::BIOME_TYPE_DEFAULT, "", DimensionIds::OVERWORLD); //TODO: implement this properly
-		$levelSettings->worldGamemode = TypeConverter::getInstance()->coreGameModeToProtocol($this->server->getGamemode());
-		$levelSettings->difficulty = $world->getDifficulty();
-		$levelSettings->spawnPosition = BlockPosition::fromVector3($world->getSpawnLocation());
-		$levelSettings->hasAchievementsDisabled = true;
-		$levelSettings->time = $world->getTime();
-		$levelSettings->eduEditionOffer = 0;
-		$levelSettings->rainLevel = 0; //TODO: implement these properly
-		$levelSettings->lightningLevel = 0;
-		$levelSettings->commandsEnabled = true;
-		$levelSettings->gameRules = [
-			"naturalregeneration" => new BoolGameRule(false, false) //Hack for client side regeneration
-		];
-		$levelSettings->experiments = new Experiments([], false);
+			$typeConverter = $this->session->getTypeConverter();
 
-		$this->session->sendDataPacket(StartGamePacket::create(
-			$this->player->getId(),
-			$this->player->getId(),
-			TypeConverter::getInstance()->coreGameModeToProtocol($this->player->getGamemode()),
-			$this->player->getOffsetPosition($location),
-			$location->pitch,
-			$location->yaw,
-			new CacheableNbt(CompoundTag::create()), //TODO: we don't care about this right now
-			$levelSettings,
-			"",
-			$this->server->getMotd(),
-			"",
-			false,
-			new PlayerMovementSettings(PlayerMovementType::SERVER_AUTHORITATIVE_V1, 0, false),
-			0,
-			0,
-			"",
-			false,
-			sprintf("%s %s", VersionInfo::NAME, VersionInfo::VERSION()->getFullVersion(true)),
-			Uuid::fromString(Uuid::NIL),
-			false,
-			[],
-			0,
-			GlobalItemTypeDictionary::getInstance()->getDictionary()->getEntries(),
-		));
+			$this->session->getLogger()->debug("Preparing StartGamePacket");
+			$levelSettings = new LevelSettings();
+			$levelSettings->seed = -1;
+			$levelSettings->spawnSettings = new SpawnSettings(SpawnSettings::BIOME_TYPE_DEFAULT, "", DimensionIds::OVERWORLD); //TODO: implement this properly
+			$levelSettings->worldGamemode = $typeConverter->coreGameModeToProtocol($this->server->getGamemode());
+			$levelSettings->difficulty = $world->getDifficulty();
+			$levelSettings->spawnPosition = BlockPosition::fromVector3($world->getSpawnLocation());
+			$levelSettings->hasAchievementsDisabled = true;
+			$levelSettings->time = $world->getTime();
+			$levelSettings->eduEditionOffer = 0;
+			$levelSettings->rainLevel = 0; //TODO: implement these properly
+			$levelSettings->lightningLevel = 0;
+			$levelSettings->commandsEnabled = true;
+			$levelSettings->gameRules = [
+				"naturalregeneration" => new BoolGameRule(false, false) //Hack for client side regeneration
+			];
+			$levelSettings->experiments = new Experiments([], false);
 
-		$this->session->getLogger()->debug("Sending actor identifiers");
-		$this->session->sendDataPacket(StaticPacketCache::getInstance()->getAvailableActorIdentifiers());
+			$this->session->sendDataPacket(StartGamePacket::create(
+				$this->player->getId(),
+				$this->player->getId(),
+				$typeConverter->coreGameModeToProtocol($this->player->getGamemode()),
+				$this->player->getOffsetPosition($location),
+				$location->pitch,
+				$location->yaw,
+				new CacheableNbt(CompoundTag::create()), //TODO: we don't care about this right now
+				$levelSettings,
+				"",
+				$this->server->getMotd(),
+				"",
+				false,
+				new PlayerMovementSettings(ServerAuthMovementMode::SERVER_AUTHORITATIVE_V2, 0, false),
+				0,
+				0,
+				"",
+				true,
+				sprintf("%s %s", VersionInfo::NAME, VersionInfo::VERSION()->getFullVersion(true)),
+				Uuid::fromString(Uuid::NIL),
+				false,
+				false,
+				new NetworkPermissions(disableClientSounds: true),
+				[],
+				0,
+				$typeConverter->getItemTypeDictionary()->getEntries(),
+			));
 
-		$this->session->getLogger()->debug("Sending biome definitions");
-		$this->session->sendDataPacket(StaticPacketCache::getInstance()->getBiomeDefs());
+			$this->session->getLogger()->debug("Sending actor identifiers");
+			$this->session->sendDataPacket(StaticPacketCache::getInstance()->getAvailableActorIdentifiers());
 
-		$this->session->getLogger()->debug("Sending attributes");
-		$this->session->syncAttributes($this->player, $this->player->getAttributeMap()->getAll());
+			$this->session->getLogger()->debug("Sending biome definitions");
+			$this->session->sendDataPacket(StaticPacketCache::getInstance()->getBiomeDefs());
 
-		$this->session->getLogger()->debug("Sending available commands");
-		$this->session->syncAvailableCommands();
+			$this->session->getLogger()->debug("Sending attributes");
+			$this->session->getEntityEventBroadcaster()->syncAttributes([$this->session], $this->player, $this->player->getAttributeMap()->getAll());
 
-		$this->session->getLogger()->debug("Sending abilities");
-		$this->session->syncAbilities($this->player);
-		$this->session->syncAdventureSettings();
+			$this->session->getLogger()->debug("Sending available commands");
+			$this->session->syncAvailableCommands();
 
-		$this->session->getLogger()->debug("Sending effects");
-		foreach($this->player->getEffects()->all() as $effect){
-			$this->session->onEntityEffectAdded($this->player, $effect, false);
+			$this->session->getLogger()->debug("Sending abilities");
+			$this->session->syncAbilities($this->player);
+			$this->session->syncAdventureSettings();
+
+			$this->session->getLogger()->debug("Sending effects");
+			foreach($this->player->getEffects()->all() as $effect){
+				$this->session->getEntityEventBroadcaster()->onEntityEffectAdded([$this->session], $this->player, $effect, false);
+			}
+
+			$this->session->getLogger()->debug("Sending actor metadata");
+			$this->player->sendData([$this->player]);
+
+			$this->session->getLogger()->debug("Sending inventory");
+			$this->inventoryManager->syncAll();
+			$this->inventoryManager->syncSelectedHotbarSlot();
+
+			$this->session->getLogger()->debug("Sending creative inventory data");
+			$this->inventoryManager->syncCreative();
+
+			$this->session->getLogger()->debug("Sending crafting data");
+			$this->session->sendDataPacket(CraftingDataCache::getInstance()->getCache($this->server->getCraftingManager()));
+
+			$this->session->getLogger()->debug("Sending player list");
+			$this->session->syncPlayerList($this->server->getOnlinePlayers());
+		}finally{
+			Timings::$playerNetworkSendPreSpawnGameData->stopTiming();
 		}
-
-		$this->session->getLogger()->debug("Sending actor metadata");
-		$this->player->sendData([$this->player]);
-
-		$this->session->getLogger()->debug("Sending inventory");
-		$this->inventoryManager->syncAll();
-		$this->inventoryManager->syncSelectedHotbarSlot();
-
-		$this->session->getLogger()->debug("Sending creative inventory data");
-		$this->inventoryManager->syncCreative();
-
-		$this->session->getLogger()->debug("Sending crafting data");
-		$this->session->sendDataPacket(CraftingDataCache::getInstance()->getCache($this->server->getCraftingManager()));
-
-		$this->session->getLogger()->debug("Sending player list");
-		$this->session->syncPlayerList($this->server->getOnlinePlayers());
 	}
 
 	public function handleRequestChunkRadius(RequestChunkRadiusPacket $packet) : bool{
diff --git a/src/network/mcpe/handler/ResourcePacksPacketHandler.php b/src/network/mcpe/handler/ResourcePacksPacketHandler.php
index d1ba857240..5e26713946 100644
--- a/src/network/mcpe/handler/ResourcePacksPacketHandler.php
+++ b/src/network/mcpe/handler/ResourcePacksPacketHandler.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\handler;
 
-use pocketmine\lang\KnownTranslationKeys;
+use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\network\mcpe\protocol\ResourcePackChunkDataPacket;
@@ -37,12 +37,13 @@ use pocketmine\network\mcpe\protocol\types\resourcepacks\ResourcePackInfoEntry;
 use pocketmine\network\mcpe\protocol\types\resourcepacks\ResourcePackStackEntry;
 use pocketmine\network\mcpe\protocol\types\resourcepacks\ResourcePackType;
 use pocketmine\resourcepacks\ResourcePack;
-use pocketmine\resourcepacks\ResourcePackManager;
+use function array_keys;
 use function array_map;
 use function ceil;
 use function count;
 use function implode;
 use function strpos;
+use function strtolower;
 use function substr;
 
 /**
@@ -50,50 +51,89 @@ use function substr;
  * packs to the client.
  */
 class ResourcePacksPacketHandler extends PacketHandler{
-	private const PACK_CHUNK_SIZE = 128 * 1024; //128KB
+	private const PACK_CHUNK_SIZE = 256 * 1024; //256KB
+
+	/**
+	 * Larger values allow downloading more chunks at the same time, increasing download speed, but the client may choke
+	 * and cause the download speed to drop (due to ACKs taking too long to arrive).
+	 */
+	private const MAX_CONCURRENT_CHUNK_REQUESTS = 1;
+
+	/**
+	 * @var ResourcePack[]
+	 * @phpstan-var array<string, ResourcePack>
+	 */
+	private array $resourcePacksById = [];
 
 	/** @var bool[][] uuid => [chunk index => hasSent] */
 	private array $downloadedChunks = [];
 
+	/** @phpstan-var \SplQueue<array{ResourcePack, int}> */
+	private \SplQueue $requestQueue;
+
+	private int $activeRequests = 0;
+
 	/**
-	 * @phpstan-param \Closure() : void $completionCallback
+	 * @param ResourcePack[] $resourcePackStack
+	 * @param string[]       $encryptionKeys    pack UUID => key, leave unset for any packs that are not encrypted
+	 *
+	 * @phpstan-param list<ResourcePack>    $resourcePackStack
+	 * @phpstan-param array<string, string> $encryptionKeys
+	 * @phpstan-param \Closure() : void     $completionCallback
 	 */
 	public function __construct(
 		private NetworkSession $session,
-		private ResourcePackManager $resourcePackManager,
+		private array $resourcePackStack,
+		private array $encryptionKeys,
+		private bool $mustAccept,
 		private \Closure $completionCallback
-	){}
+	){
+		$this->requestQueue = new \SplQueue();
+		foreach($resourcePackStack as $pack){
+			$this->resourcePacksById[$pack->getPackId()] = $pack;
+		}
+	}
+
+	private function getPackById(string $id) : ?ResourcePack{
+		return $this->resourcePacksById[strtolower($id)] ?? null;
+	}
 
 	public function setUp() : void{
 		$resourcePackEntries = array_map(function(ResourcePack $pack) : ResourcePackInfoEntry{
 			//TODO: more stuff
-			$encryptionKey = $this->resourcePackManager->getPackEncryptionKey($pack->getPackId());
 
 			return new ResourcePackInfoEntry(
 				$pack->getPackId(),
 				$pack->getPackVersion(),
 				$pack->getPackSize(),
-				$encryptionKey ?? "",
+				$this->encryptionKeys[$pack->getPackId()] ?? "",
 				"",
 				$pack->getPackId(),
 				false
 			);
-		}, $this->resourcePackManager->getResourceStack());
+		}, $this->resourcePackStack);
 		//TODO: support forcing server packs
-		$this->session->sendDataPacket(ResourcePacksInfoPacket::create($resourcePackEntries, [], $this->resourcePackManager->resourcePacksRequired(), false, false));
+		$this->session->sendDataPacket(ResourcePacksInfoPacket::create(
+			resourcePackEntries: $resourcePackEntries,
+			mustAccept: $this->mustAccept,
+			hasAddons: false,
+			hasScripts: false
+		));
 		$this->session->getLogger()->debug("Waiting for client to accept resource packs");
 	}
 
 	private function disconnectWithError(string $error) : void{
-		$this->session->getLogger()->error("Error downloading resource packs: " . $error);
-		$this->session->disconnect(KnownTranslationKeys::DISCONNECTIONSCREEN_RESOURCEPACK);
+		$this->session->disconnectWithError(
+			reason: "Error downloading resource packs: " . $error,
+			disconnectScreenMessage: KnownTranslationFactory::disconnectionScreen_resourcePack()
+		);
 	}
 
 	public function handleResourcePackClientResponse(ResourcePackClientResponsePacket $packet) : bool{
 		switch($packet->status){
 			case ResourcePackClientResponsePacket::STATUS_REFUSED:
 				//TODO: add lang strings for this
-				$this->session->disconnect("You must accept resource packs to join this server.", true);
+				$this->session->disconnect("Refused resource packs", "You must accept resource packs to join this server.", true);
 				break;
 			case ResourcePackClientResponsePacket::STATUS_SEND_PACKS:
 				foreach($packet->packIds as $uuid){
@@ -102,11 +142,11 @@ class ResourcePacksPacketHandler extends PacketHandler{
 					if($splitPos !== false){
 						$uuid = substr($uuid, 0, $splitPos);
 					}
-					$pack = $this->resourcePackManager->getPackById($uuid);
+					$pack = $this->getPackById($uuid);
 
 					if(!($pack instanceof ResourcePack)){
 						//Client requested a resource pack but we don't have it available on the server
-						$this->disconnectWithError("Unknown pack $uuid requested, available packs: " . implode(", ", $this->resourcePackManager->getPackIdList()));
+						$this->disconnectWithError("Unknown pack $uuid requested, available packs: " . implode(", ", array_keys($this->resourcePacksById)));
 						return false;
 					}
 
@@ -126,7 +166,7 @@ class ResourcePacksPacketHandler extends PacketHandler{
 			case ResourcePackClientResponsePacket::STATUS_HAVE_ALL_PACKS:
 				$stack = array_map(static function(ResourcePack $pack) : ResourcePackStackEntry{
 					return new ResourcePackStackEntry($pack->getPackId(), $pack->getPackVersion(), ""); //TODO: subpacks
-				}, $this->resourcePackManager->getResourceStack());
+				}, $this->resourcePackStack);
 
 				//we support chemistry blocks by default, the client should already have this installed
 				$stack[] = new ResourcePackStackEntry("0fba4063-dba1-4281-9b89-ff9390653530", "1.0.0", "");
@@ -134,7 +174,7 @@ class ResourcePacksPacketHandler extends PacketHandler{
 				//we don't force here, because it doesn't have user-facing effects
 				//but it does have an annoying side-effect when true: it makes
 				//the client remove its own non-server-supplied resource packs.
-				$this->session->sendDataPacket(ResourcePackStackPacket::create($stack, [], false, ProtocolInfo::MINECRAFT_VERSION_NETWORK, new Experiments([], false)));
+				$this->session->sendDataPacket(ResourcePackStackPacket::create($stack, [], false, ProtocolInfo::MINECRAFT_VERSION_NETWORK, new Experiments([], false), false));
 				$this->session->getLogger()->debug("Applying resource pack stack");
 				break;
 			case ResourcePackClientResponsePacket::STATUS_COMPLETED:
@@ -149,9 +189,9 @@ class ResourcePacksPacketHandler extends PacketHandler{
 	}
 
 	public function handleResourcePackChunkRequest(ResourcePackChunkRequestPacket $packet) : bool{
-		$pack = $this->resourcePackManager->getPackById($packet->packId);
+		$pack = $this->getPackById($packet->packId);
 		if(!($pack instanceof ResourcePack)){
-			$this->disconnectWithError("Invalid request for chunk $packet->chunkIndex of unknown pack $packet->packId, available packs: " . implode(", ", $this->resourcePackManager->getPackIdList()));
+			$this->disconnectWithError("Invalid request for chunk $packet->chunkIndex of unknown pack $packet->packId, available packs: " . implode(", ", array_keys($this->resourcePacksById)));
 			return false;
 		}
 
@@ -174,8 +214,37 @@ class ResourcePacksPacketHandler extends PacketHandler{
 			$this->downloadedChunks[$packId][$packet->chunkIndex] = true;
 		}
 
-		$this->session->sendDataPacket(ResourcePackChunkDataPacket::create($packId, $packet->chunkIndex, $offset, $pack->getPackChunk($offset, self::PACK_CHUNK_SIZE)));
+		$this->requestQueue->enqueue([$pack, $packet->chunkIndex]);
+		$this->processChunkRequestQueue();
 
 		return true;
 	}
+
+	private function processChunkRequestQueue() : void{
+		if($this->activeRequests >= self::MAX_CONCURRENT_CHUNK_REQUESTS || $this->requestQueue->isEmpty()){
+			return;
+		}
+		/**
+		 * @var ResourcePack $pack
+		 * @var int          $chunkIndex
+		 */
+		[$pack, $chunkIndex] = $this->requestQueue->dequeue();
+
+		$packId = $pack->getPackId();
+		$offset = $chunkIndex * self::PACK_CHUNK_SIZE;
+		$chunkData = $pack->getPackChunk($offset, self::PACK_CHUNK_SIZE);
+		$this->activeRequests++;
+		$this->session
+			->sendDataPacketWithReceipt(ResourcePackChunkDataPacket::create($packId, $chunkIndex, $offset, $chunkData))
+			->onCompletion(
+				function() : void{
+					$this->activeRequests--;
+					$this->processChunkRequestQueue();
+				},
+				function() : void{
+					//this may have been rejected because of a disconnection - this will do nothing in that case
+					$this->disconnectWithError("Plugin interrupted sending of resource packs");
+				}
+			);
+	}
 }
diff --git a/src/network/mcpe/handler/SessionStartPacketHandler.php b/src/network/mcpe/handler/SessionStartPacketHandler.php
index 687422de20..8163574dbd 100644
--- a/src/network/mcpe/handler/SessionStartPacketHandler.php
+++ b/src/network/mcpe/handler/SessionStartPacketHandler.php
@@ -23,14 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\handler;
 
-use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\NetworkSettingsPacket;
-use pocketmine\network\mcpe\protocol\PlayStatusPacket;
 use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\network\mcpe\protocol\RequestNetworkSettingsPacket;
-use pocketmine\network\mcpe\protocol\types\CompressionAlgorithm;
-use pocketmine\Server;
 
 final class SessionStartPacketHandler extends PacketHandler{
 
@@ -38,7 +34,6 @@ final class SessionStartPacketHandler extends PacketHandler{
 	 * @phpstan-param \Closure() : void $onSuccess
 	 */
 	public function __construct(
-		private Server $server,
 		private NetworkSession $session,
 		private \Closure $onSuccess
 	){}
@@ -46,13 +41,7 @@ final class SessionStartPacketHandler extends PacketHandler{
 	public function handleRequestNetworkSettings(RequestNetworkSettingsPacket $packet) : bool{
 		$protocolVersion = $packet->getProtocolVersion();
 		if(!$this->isCompatibleProtocol($protocolVersion)){
-			$this->session->sendDataPacket(PlayStatusPacket::create($protocolVersion < ProtocolInfo::CURRENT_PROTOCOL ? PlayStatusPacket::LOGIN_FAILED_CLIENT : PlayStatusPacket::LOGIN_FAILED_SERVER), true);
-
-			//This pocketmine disconnect message will only be seen by the console (PlayStatusPacket causes the messages to be shown for the client)
-			$this->session->disconnect(
-				$this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_disconnect_incompatibleProtocol((string) $protocolVersion)),
-				false
-			);
+			$this->session->disconnectIncompatibleProtocol($protocolVersion);
 
 			return true;
 		}
@@ -60,7 +49,7 @@ final class SessionStartPacketHandler extends PacketHandler{
 		//TODO: we're filling in the defaults to get pre-1.19.30 behaviour back for now, but we should explore the new options in the future
 		$this->session->sendDataPacket(NetworkSettingsPacket::create(
 			NetworkSettingsPacket::COMPRESS_EVERYTHING,
-			CompressionAlgorithm::ZLIB,
+			$this->session->getCompressor()->getNetworkId(),
 			false,
 			0,
 			0
diff --git a/src/network/mcpe/handler/SpawnResponsePacketHandler.php b/src/network/mcpe/handler/SpawnResponsePacketHandler.php
index 554322af59..2ebb9d2b6b 100644
--- a/src/network/mcpe/handler/SpawnResponsePacketHandler.php
+++ b/src/network/mcpe/handler/SpawnResponsePacketHandler.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\network\mcpe\handler;
 
 use pocketmine\network\mcpe\protocol\PlayerAuthInputPacket;
+use pocketmine\network\mcpe\protocol\PlayerSkinPacket;
 use pocketmine\network\mcpe\protocol\SetLocalPlayerAsInitializedPacket;
 
 final class SpawnResponsePacketHandler extends PacketHandler{
@@ -37,6 +38,13 @@ final class SpawnResponsePacketHandler extends PacketHandler{
 		return true;
 	}
 
+	public function handlePlayerSkin(PlayerSkinPacket $packet) : bool{
+		//TODO: REMOVE THIS
+		//As of 1.19.60, we receive this packet during pre-spawn for no obvious reason. The skin is still sent in the
+		//login packet, so we can ignore this one. If unhandled, this packet makes a huge debug spam in the log.
+		return true;
+	}
+
 	public function handlePlayerAuthInput(PlayerAuthInputPacket $packet) : bool{
 		//the client will send this every tick once we start sending chunks, but we don't handle it in this stage
 		//this is very spammy so we filter it out
diff --git a/src/network/mcpe/raklib/PthreadsChannelReader.php b/src/network/mcpe/raklib/PthreadsChannelReader.php
index d5b52c7903..44057c27c8 100644
--- a/src/network/mcpe/raklib/PthreadsChannelReader.php
+++ b/src/network/mcpe/raklib/PthreadsChannelReader.php
@@ -23,10 +23,14 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\raklib;
 
+use pmmp\thread\ThreadSafeArray;
 use raklib\server\ipc\InterThreadChannelReader;
 
 final class PthreadsChannelReader implements InterThreadChannelReader{
-	public function __construct(private \Threaded $buffer){}
+	/**
+	 * @phpstan-param ThreadSafeArray<int, string> $buffer
+	 */
+	public function __construct(private ThreadSafeArray $buffer){}
 
 	public function read() : ?string{
 		return $this->buffer->shift();
diff --git a/src/network/mcpe/raklib/PthreadsChannelWriter.php b/src/network/mcpe/raklib/PthreadsChannelWriter.php
index 5462f77767..a85415d8da 100644
--- a/src/network/mcpe/raklib/PthreadsChannelWriter.php
+++ b/src/network/mcpe/raklib/PthreadsChannelWriter.php
@@ -23,10 +23,14 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\raklib;
 
+use pmmp\thread\ThreadSafeArray;
 use raklib\server\ipc\InterThreadChannelWriter;
 
 final class PthreadsChannelWriter implements InterThreadChannelWriter{
-	public function __construct(private \Threaded $buffer){}
+	/**
+	 * @phpstan-param ThreadSafeArray<int, string> $buffer
+	 */
+	public function __construct(private ThreadSafeArray $buffer){}
 
 	public function write(string $str) : void{
 		$this->buffer[] = $str;
diff --git a/src/network/mcpe/raklib/RakLibInterface.php b/src/network/mcpe/raklib/RakLibInterface.php
index bf1f75c269..44328f8f3f 100644
--- a/src/network/mcpe/raklib/RakLibInterface.php
+++ b/src/network/mcpe/raklib/RakLibInterface.php
@@ -23,20 +23,26 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\raklib;
 
+use pmmp\thread\ThreadSafeArray;
+use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\network\AdvancedNetworkInterface;
 use pocketmine\network\mcpe\compression\ZlibCompressor;
 use pocketmine\network\mcpe\convert\TypeConverter;
+use pocketmine\network\mcpe\EntityEventBroadcaster;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\PacketBroadcaster;
 use pocketmine\network\mcpe\protocol\PacketPool;
 use pocketmine\network\mcpe\protocol\ProtocolInfo;
-use pocketmine\network\mcpe\StandardPacketBroadcaster;
 use pocketmine\network\Network;
 use pocketmine\network\NetworkInterfaceStartException;
 use pocketmine\network\PacketHandlingException;
+use pocketmine\player\GameMode;
 use pocketmine\Server;
-use pocketmine\snooze\SleeperNotifier;
+use pocketmine\thread\ThreadCrashException;
+use pocketmine\timings\Timings;
 use pocketmine\utils\Utils;
+use pocketmine\YmlServerProperties;
+use raklib\generic\DisconnectReason;
 use raklib\generic\SocketException;
 use raklib\protocol\EncapsulatedPacket;
 use raklib\protocol\PacketReliability;
@@ -46,10 +52,8 @@ use raklib\server\ServerEventListener;
 use raklib\utils\InternetAddress;
 use function addcslashes;
 use function base64_encode;
-use function bin2hex;
 use function implode;
 use function mt_rand;
-use function random_bytes;
 use function rtrim;
 use function substr;
 use const PHP_INT_MAX;
@@ -75,18 +79,42 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
 	private RakLibToUserThreadMessageReceiver $eventReceiver;
 	private UserToRakLibThreadMessageSender $interface;
 
-	private SleeperNotifier $sleeper;
+	private int $sleeperNotifierId;
 
-	private PacketBroadcaster $broadcaster;
+	private PacketBroadcaster $packetBroadcaster;
+	private EntityEventBroadcaster $entityEventBroadcaster;
+	private TypeConverter $typeConverter;
 
-	public function __construct(Server $server, string $ip, int $port, bool $ipV6){
+	public function __construct(
+		Server $server,
+		string $ip,
+		int $port,
+		bool $ipV6,
+		PacketBroadcaster $packetBroadcaster,
+		EntityEventBroadcaster $entityEventBroadcaster,
+		TypeConverter $typeConverter
+	){
 		$this->server = $server;
+		$this->packetBroadcaster = $packetBroadcaster;
+		$this->entityEventBroadcaster = $entityEventBroadcaster;
+		$this->typeConverter = $typeConverter;
+
 		$this->rakServerId = mt_rand(0, PHP_INT_MAX);
 
-		$this->sleeper = new SleeperNotifier();
+		$sleeperEntry = $this->server->getTickSleeper()->addNotifier(function() : void{
+			Timings::$connection->startTiming();
+			try{
+				while($this->eventReceiver->handle($this));
+			}finally{
+				Timings::$connection->stopTiming();
+			}
+		});
+		$this->sleeperNotifierId = $sleeperEntry->getNotifierId();
 
-		$mainToThreadBuffer = new \Threaded();
-		$threadToMainBuffer = new \Threaded();
+		/** @phpstan-var ThreadSafeArray<int, string> $mainToThreadBuffer */
+		$mainToThreadBuffer = new ThreadSafeArray();
+		/** @phpstan-var ThreadSafeArray<int, string> $threadToMainBuffer */
+		$threadToMainBuffer = new ThreadSafeArray();
 
 		$this->rakLib = new RakLibServer(
 			$this->server->getLogger(),
@@ -94,9 +122,9 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
 			$threadToMainBuffer,
 			new InternetAddress($ip, $port, $ipV6 ? 6 : 4),
 			$this->rakServerId,
-			$this->server->getConfigGroup()->getPropertyInt("network.max-mtu-size", 1492),
+			$this->server->getConfigGroup()->getPropertyInt(YmlServerProperties::NETWORK_MAX_MTU_SIZE, 1492),
 			self::MCPE_RAKNET_PROTOCOL_VERSION,
-			$this->sleeper
+			$sleeperEntry
 		);
 		$this->eventReceiver = new RakLibToUserThreadMessageReceiver(
 			new PthreadsChannelReader($threadToMainBuffer)
@@ -104,14 +132,9 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
 		$this->interface = new UserToRakLibThreadMessageSender(
 			new PthreadsChannelWriter($mainToThreadBuffer)
 		);
-
-		$this->broadcaster = new StandardPacketBroadcaster($this->server);
 	}
 
 	public function start() : void{
-		$this->server->getTickSleeper()->addNotifier($this->sleeper, function() : void{
-			while($this->eventReceiver->handle($this));
-		});
 		$this->server->getLogger()->debug("Waiting for RakLib to start...");
 		try{
 			$this->rakLib->startAndWait();
@@ -129,17 +152,22 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
 		if(!$this->rakLib->isRunning()){
 			$e = $this->rakLib->getCrashInfo();
 			if($e !== null){
-				throw new \RuntimeException("RakLib crashed: " . $e->makePrettyMessage());
+				throw new ThreadCrashException("RakLib crashed", $e);
 			}
 			throw new \Exception("RakLib Thread crashed without crash information");
 		}
 	}
 
-	public function onClientDisconnect(int $sessionId, string $reason) : void{
+	public function onClientDisconnect(int $sessionId, int $reason) : void{
 		if(isset($this->sessions[$sessionId])){
 			$session = $this->sessions[$sessionId];
 			unset($this->sessions[$sessionId]);
-			$session->onClientDisconnect($reason);
+			$session->onClientDisconnect(match($reason){
+				DisconnectReason::CLIENT_DISCONNECT => KnownTranslationFactory::pocketmine_disconnect_clientDisconnect(),
+				DisconnectReason::PEER_TIMEOUT => KnownTranslationFactory::pocketmine_disconnect_error_timeout(),
+				DisconnectReason::CLIENT_RECONNECT => KnownTranslationFactory::pocketmine_disconnect_clientReconnect(),
+				default => "Unknown RakLib disconnect reason (ID $reason)"
+			});
 		}
 	}
 
@@ -151,7 +179,7 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
 	}
 
 	public function shutdown() : void{
-		$this->server->getTickSleeper()->removeNotifier($this->sleeper);
+		$this->server->getTickSleeper()->removeNotifier($this->sleeperNotifierId);
 		$this->rakLib->quit();
 	}
 
@@ -161,8 +189,10 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
 			$this->network->getSessionManager(),
 			PacketPool::getInstance(),
 			new RakLibPacketSender($sessionId, $this),
-			$this->broadcaster,
+			$this->packetBroadcaster,
+			$this->entityEventBroadcaster,
 			ZlibCompressor::getInstance(), //TODO: this shouldn't be hardcoded, but we might need the RakNet protocol version to select it
+			$this->typeConverter,
 			$address,
 			$port
 		);
@@ -179,18 +209,24 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
 			$session = $this->sessions[$sessionId];
 			$address = $session->getIp();
 			$buf = substr($packet, 1);
+			$name = $session->getDisplayName();
 			try{
 				$session->handleEncoded($buf);
 			}catch(PacketHandlingException $e){
-				$errorId = bin2hex(random_bytes(6));
-
 				$logger = $session->getLogger();
-				$logger->error("Bad packet (error ID $errorId): " . $e->getMessage());
 
+				$session->disconnectWithError(
+					reason: "Bad packet: " . $e->getMessage(),
+					disconnectScreenMessage: KnownTranslationFactory::pocketmine_disconnect_error_badPacket()
+				);
 				//intentionally doesn't use logException, we don't want spammy packet error traces to appear in release mode
 				$logger->debug(implode("\n", Utils::printableExceptionInfo($e)));
-				$session->disconnect("Packet processing error (Error ID: $errorId)");
+
 				$this->interface->blockAddress($address, 5);
+			}catch(\Throwable $e){
+				//record the name of the player who caused the crash, to make it easier to find the reproducing steps
+				$this->server->getLogger()->emergency("Crash occurred while handling a packet from session: $name");
+				throw $e;
 			}
 		}
 	}
@@ -216,7 +252,9 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
 	}
 
 	public function onPacketAck(int $sessionId, int $identifierACK) : void{
-
+		if(isset($this->sessions[$sessionId])){
+			$this->sessions[$sessionId]->handleAckReceipt($identifierACK);
+		}
 	}
 
 	public function setName(string $name) : void{
@@ -232,7 +270,11 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
 				$info->getMaxPlayerCount(),
 				$this->rakServerId,
 				$this->server->getName(),
-				TypeConverter::getInstance()->protocolGameModeName($this->server->getGamemode())
+				match($this->server->getGamemode()){
+					GameMode::SURVIVAL => "Survival",
+					GameMode::ADVENTURE => "Adventure",
+					default => "Creative"
+				}
 			]) . ";"
 		);
 	}
@@ -249,12 +291,13 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
 		$this->network->getBandwidthTracker()->add($bytesSentDiff, $bytesReceivedDiff);
 	}
 
-	public function putPacket(int $sessionId, string $payload, bool $immediate = true) : void{
+	public function putPacket(int $sessionId, string $payload, bool $immediate = true, ?int $receiptId = null) : void{
 		if(isset($this->sessions[$sessionId])){
 			$pk = new EncapsulatedPacket();
 			$pk->buffer = self::MCPE_RAKNET_PACKET_ID . $payload;
 			$pk->reliability = PacketReliability::RELIABLE_ORDERED;
 			$pk->orderChannel = 0;
+			$pk->identifierACK = $receiptId;
 
 			$this->interface->sendEncapsulated($sessionId, $pk, $immediate);
 		}
diff --git a/src/network/mcpe/raklib/RakLibPacketSender.php b/src/network/mcpe/raklib/RakLibPacketSender.php
index d940c282b4..df8cf9a00e 100644
--- a/src/network/mcpe/raklib/RakLibPacketSender.php
+++ b/src/network/mcpe/raklib/RakLibPacketSender.php
@@ -33,9 +33,9 @@ class RakLibPacketSender implements PacketSender{
 		private RakLibInterface $handler
 	){}
 
-	public function send(string $payload, bool $immediate) : void{
+	public function send(string $payload, bool $immediate, ?int $receiptId) : void{
 		if(!$this->closed){
-			$this->handler->putPacket($this->sessionId, $payload, $immediate);
+			$this->handler->putPacket($this->sessionId, $payload, $immediate, $receiptId);
 		}
 	}
 
diff --git a/src/network/mcpe/raklib/RakLibServer.php b/src/network/mcpe/raklib/RakLibServer.php
index 8444a07bca..5137b94ba2 100644
--- a/src/network/mcpe/raklib/RakLibServer.php
+++ b/src/network/mcpe/raklib/RakLibServer.php
@@ -23,161 +23,90 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\raklib;
 
-use pocketmine\snooze\SleeperNotifier;
+use pmmp\thread\Thread as NativeThread;
+use pmmp\thread\ThreadSafeArray;
+use pocketmine\snooze\SleeperHandlerEntry;
+use pocketmine\thread\log\ThreadSafeLogger;
+use pocketmine\thread\NonThreadSafeValue;
 use pocketmine\thread\Thread;
-use raklib\generic\Socket;
+use pocketmine\thread\ThreadCrashException;
 use raklib\generic\SocketException;
 use raklib\server\ipc\RakLibToUserThreadMessageSender;
 use raklib\server\ipc\UserToRakLibThreadMessageReceiver;
 use raklib\server\Server;
+use raklib\server\ServerSocket;
 use raklib\server\SimpleProtocolAcceptor;
 use raklib\utils\ExceptionTraceCleaner;
 use raklib\utils\InternetAddress;
-use function error_get_last;
 use function gc_enable;
 use function ini_set;
-use function register_shutdown_function;
-use const PTHREADS_INHERIT_NONE;
 
 class RakLibServer extends Thread{
-	private InternetAddress $address;
-
-	/** @var \ThreadedLogger */
-	protected $logger;
-
-	/** @var bool */
-	protected $cleanShutdown = false;
-	/** @var bool */
-	protected $ready = false;
-
-	/** @var \Threaded */
-	protected $mainToThreadBuffer;
-	/** @var \Threaded */
-	protected $threadToMainBuffer;
-
-	/** @var string */
-	protected $mainPath;
-
-	/** @var int */
-	protected $serverId;
-	/** @var int */
-	protected $maxMtuSize;
-
-	private int $protocolVersion;
-
-	/** @var SleeperNotifier */
-	protected $mainThreadNotifier;
-
-	/** @var RakLibThreadCrashInfo|null */
-	public $crashInfo = null;
-
-	public function __construct(
-		\ThreadedLogger $logger,
-		\Threaded $mainToThreadBuffer,
-		\Threaded $threadToMainBuffer,
-		InternetAddress $address,
-		int $serverId,
-		int $maxMtuSize,
-		int $protocolVersion,
-		SleeperNotifier $sleeper
-	){
-		$this->address = $address;
-
-		$this->serverId = $serverId;
-		$this->maxMtuSize = $maxMtuSize;
-
-		$this->logger = $logger;
-
-		$this->mainToThreadBuffer = $mainToThreadBuffer;
-		$this->threadToMainBuffer = $threadToMainBuffer;
-
-		$this->mainPath = \pocketmine\PATH;
-
-		$this->protocolVersion = $protocolVersion;
-
-		$this->mainThreadNotifier = $sleeper;
-	}
+	protected bool $ready = false;
+	protected string $mainPath;
+	/** @phpstan-var NonThreadSafeValue<InternetAddress> */
+	protected NonThreadSafeValue $address;
 
 	/**
-	 * @return void
+	 * @phpstan-param ThreadSafeArray<int, string> $mainToThreadBuffer
+	 * @phpstan-param ThreadSafeArray<int, string> $threadToMainBuffer
 	 */
-	public function shutdownHandler(){
-		if($this->cleanShutdown !== true && $this->crashInfo === null){
-			$error = error_get_last();
-
-			if($error !== null){
-				$this->logger->emergency("Fatal error: " . $error["message"] . " in " . $error["file"] . " on line " . $error["line"]);
-				$this->setCrashInfo(RakLibThreadCrashInfo::fromLastErrorInfo($error));
-			}else{
-				$this->logger->emergency("RakLib shutdown unexpectedly");
-			}
-		}
+	public function __construct(
+		protected ThreadSafeLogger $logger,
+		protected ThreadSafeArray $mainToThreadBuffer,
+		protected ThreadSafeArray $threadToMainBuffer,
+		InternetAddress $address,
+		protected int $serverId,
+		protected int $maxMtuSize,
+		protected int $protocolVersion,
+		protected SleeperHandlerEntry $sleeperEntry
+	){
+		$this->mainPath = \pocketmine\PATH;
+		$this->address = new NonThreadSafeValue($address);
 	}
 
-	public function getCrashInfo() : ?RakLibThreadCrashInfo{
-		return $this->crashInfo;
-	}
-
-	private function setCrashInfo(RakLibThreadCrashInfo $info) : void{
-		$this->synchronized(function(RakLibThreadCrashInfo $info) : void{
-			$this->crashInfo = $info;
-			$this->notify();
-		}, $info);
-	}
-
-	public function startAndWait(int $options = PTHREADS_INHERIT_NONE) : void{
+	public function startAndWait(int $options = NativeThread::INHERIT_NONE) : void{
 		$this->start($options);
 		$this->synchronized(function() : void{
-			while(!$this->ready && $this->crashInfo === null){
+			while(!$this->ready && $this->getCrashInfo() === null){
 				$this->wait();
 			}
-			$crashInfo = $this->crashInfo;
+			$crashInfo = $this->getCrashInfo();
 			if($crashInfo !== null){
-				if($crashInfo->getClass() === SocketException::class){
+				if($crashInfo->getType() === SocketException::class){
 					throw new SocketException($crashInfo->getMessage());
 				}
-				throw new \RuntimeException("RakLib failed to start: " . $crashInfo->makePrettyMessage());
+				throw new ThreadCrashException("RakLib failed to start", $crashInfo);
 			}
 		});
 	}
 
 	protected function onRun() : void{
-		try{
-			gc_enable();
-			ini_set("display_errors", '1');
-			ini_set("display_startup_errors", '1');
+		gc_enable();
+		ini_set("display_errors", '1');
+		ini_set("display_startup_errors", '1');
+		\GlobalLogger::set($this->logger);
 
-			register_shutdown_function([$this, "shutdownHandler"]);
-
-			try{
-				$socket = new Socket($this->address);
-			}catch(SocketException $e){
-				$this->setCrashInfo(RakLibThreadCrashInfo::fromThrowable($e));
-				return;
-			}
-			$manager = new Server(
-				$this->serverId,
-				$this->logger,
-				$socket,
-				$this->maxMtuSize,
-				new SimpleProtocolAcceptor($this->protocolVersion),
-				new UserToRakLibThreadMessageReceiver(new PthreadsChannelReader($this->mainToThreadBuffer)),
-				new RakLibToUserThreadMessageSender(new SnoozeAwarePthreadsChannelWriter($this->threadToMainBuffer, $this->mainThreadNotifier)),
-				new ExceptionTraceCleaner($this->mainPath)
-			);
-			$this->synchronized(function() : void{
-				$this->ready = true;
-				$this->notify();
-			});
-			while(!$this->isKilled){
-				$manager->tickProcessor();
-			}
-			$manager->waitShutdown();
-			$this->cleanShutdown = true;
-		}catch(\Throwable $e){
-			$this->setCrashInfo(RakLibThreadCrashInfo::fromThrowable($e));
-			$this->logger->logException($e);
+		$socket = new ServerSocket($this->address->deserialize());
+		$manager = new Server(
+			$this->serverId,
+			$this->logger,
+			$socket,
+			$this->maxMtuSize,
+			new SimpleProtocolAcceptor($this->protocolVersion),
+			new UserToRakLibThreadMessageReceiver(new PthreadsChannelReader($this->mainToThreadBuffer)),
+			new RakLibToUserThreadMessageSender(new SnoozeAwarePthreadsChannelWriter($this->threadToMainBuffer, $this->sleeperEntry->createNotifier())),
+			new ExceptionTraceCleaner($this->mainPath),
+			recvMaxSplitParts: 512
+		);
+		$this->synchronized(function() : void{
+			$this->ready = true;
+			$this->notify();
+		});
+		while(!$this->isKilled){
+			$manager->tickProcessor();
 		}
+		$manager->waitShutdown();
 	}
 
 	public function getThreadName() : string{
diff --git a/src/network/mcpe/raklib/RakLibThreadCrashInfo.php b/src/network/mcpe/raklib/RakLibThreadCrashInfo.php
deleted file mode 100644
index 60e04b4b4e..0000000000
--- a/src/network/mcpe/raklib/RakLibThreadCrashInfo.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\network\mcpe\raklib;
-
-use pocketmine\utils\Filesystem;
-use function get_class;
-use function sprintf;
-
-final class RakLibThreadCrashInfo{
-
-	public function __construct(
-		private ?string $class,
-		private string $message,
-		private string $file,
-		private int $line
-	){}
-
-	public static function fromThrowable(\Throwable $e) : self{
-		return new self(get_class($e), $e->getMessage(), $e->getFile(), $e->getLine());
-	}
-
-	/**
-	 * @phpstan-param array{message: string, file: string, line: int} $info
-	 */
-	public static function fromLastErrorInfo(array $info) : self{
-		return new self(null, $info["message"], $info["file"], $info["line"]);
-	}
-
-	public function getClass() : ?string{ return $this->class; }
-
-	public function getMessage() : string{ return $this->message; }
-
-	public function getFile() : string{ return $this->file; }
-
-	public function getLine() : int{ return $this->line; }
-
-	public function makePrettyMessage() : string{
-		return sprintf("%s: \"%s\" in %s on line %d", $this->class ?? "Fatal error", $this->message, Filesystem::cleanPath($this->file), $this->line);
-	}
-}
diff --git a/src/network/mcpe/raklib/SnoozeAwarePthreadsChannelWriter.php b/src/network/mcpe/raklib/SnoozeAwarePthreadsChannelWriter.php
index 739acf051f..28f7be2b5e 100644
--- a/src/network/mcpe/raklib/SnoozeAwarePthreadsChannelWriter.php
+++ b/src/network/mcpe/raklib/SnoozeAwarePthreadsChannelWriter.php
@@ -23,12 +23,16 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\raklib;
 
+use pmmp\thread\ThreadSafeArray;
 use pocketmine\snooze\SleeperNotifier;
 use raklib\server\ipc\InterThreadChannelWriter;
 
 final class SnoozeAwarePthreadsChannelWriter implements InterThreadChannelWriter{
+	/**
+	 * @phpstan-param ThreadSafeArray<int, string> $buffer
+	 */
 	public function __construct(
-		private \Threaded $buffer,
+		private ThreadSafeArray $buffer,
 		private SleeperNotifier $notifier
 	){}
 
diff --git a/src/network/mcpe/serializer/ChunkSerializer.php b/src/network/mcpe/serializer/ChunkSerializer.php
index 473ad615d8..9120f34a7e 100644
--- a/src/network/mcpe/serializer/ChunkSerializer.php
+++ b/src/network/mcpe/serializer/ChunkSerializer.php
@@ -27,32 +27,50 @@ use pocketmine\block\tile\Spawnable;
 use pocketmine\data\bedrock\BiomeIds;
 use pocketmine\data\bedrock\LegacyBiomeIdToStringIdMap;
 use pocketmine\nbt\TreeRoot;
-use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\BlockTranslator;
 use pocketmine\network\mcpe\protocol\serializer\NetworkNbtSerializer;
 use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
-use pocketmine\network\mcpe\protocol\serializer\PacketSerializerContext;
+use pocketmine\network\mcpe\protocol\types\DimensionIds;
 use pocketmine\utils\Binary;
 use pocketmine\utils\BinaryStream;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\format\PalettedBlockArray;
 use pocketmine\world\format\SubChunk;
-use function chr;
 use function count;
-use function str_repeat;
 
 final class ChunkSerializer{
-	public const LOWER_PADDING_SIZE = 4;
-
 	private function __construct(){
 		//NOOP
 	}
 
+	/**
+	 * Returns the min/max subchunk index expected in the protocol.
+	 * This has no relation to the world height supported by PM.
+	 *
+	 * @phpstan-param DimensionIds::* $dimensionId
+	 * @return int[]
+	 * @phpstan-return array{int, int}
+	 */
+	public static function getDimensionChunkBounds(int $dimensionId) : array{
+		return match($dimensionId){
+			DimensionIds::OVERWORLD => [-4, 19],
+			DimensionIds::NETHER => [0, 7],
+			DimensionIds::THE_END => [0, 15],
+			default => throw new \InvalidArgumentException("Unknown dimension ID $dimensionId"),
+		};
+	}
+
 	/**
 	 * Returns the number of subchunks that will be sent from the given chunk.
 	 * Chunks are sent in a stack, so every chunk below the top non-empty one must be sent.
+	 *
+	 * @phpstan-param DimensionIds::* $dimensionId
 	 */
-	public static function getSubChunkCount(Chunk $chunk) : int{
-		for($y = Chunk::MAX_SUBCHUNK_INDEX, $count = count($chunk->getSubChunks()); $y >= Chunk::MIN_SUBCHUNK_INDEX; --$y, --$count){
+	public static function getSubChunkCount(Chunk $chunk, int $dimensionId) : int{
+		//if the protocol world bounds ever exceed the PM supported bounds again in the future, we might need to
+		//polyfill some stuff here
+		[$minSubChunkIndex, $maxSubChunkIndex] = self::getDimensionChunkBounds($dimensionId);
+		for($y = $maxSubChunkIndex, $count = $maxSubChunkIndex - $minSubChunkIndex + 1; $y >= $minSubChunkIndex; --$y, --$count){
 			if($chunk->getSubChunk($y)->isEmptyFast()){
 				continue;
 			}
@@ -62,24 +80,26 @@ final class ChunkSerializer{
 		return 0;
 	}
 
-	public static function serializeFullChunk(Chunk $chunk, RuntimeBlockMapping $blockMapper, PacketSerializerContext $encoderContext, ?string $tiles = null) : string{
-		$stream = PacketSerializer::encoder($encoderContext);
+	/**
+	 * @phpstan-param DimensionIds::* $dimensionId
+	 */
+	public static function serializeFullChunk(Chunk $chunk, int $dimensionId, BlockTranslator $blockTranslator, ?string $tiles = null) : string{
+		$stream = PacketSerializer::encoder();
 
-		//TODO: HACK! fill in fake subchunks to make up for the new negative space client-side
-		for($y = 0; $y < self::LOWER_PADDING_SIZE; $y++){
-			$stream->putByte(8); //subchunk version 8
-			$stream->putByte(0); //0 layers - client will treat this as all-air
+		$subChunkCount = self::getSubChunkCount($chunk, $dimensionId);
+		$writtenCount = 0;
+
+		[$minSubChunkIndex, $maxSubChunkIndex] = self::getDimensionChunkBounds($dimensionId);
+		for($y = $minSubChunkIndex; $writtenCount < $subChunkCount; ++$y, ++$writtenCount){
+			self::serializeSubChunk($chunk->getSubChunk($y), $blockTranslator, $stream, false);
 		}
 
-		$subChunkCount = self::getSubChunkCount($chunk);
-		for($y = Chunk::MIN_SUBCHUNK_INDEX, $writtenCount = 0; $writtenCount < $subChunkCount; ++$y, ++$writtenCount){
-			self::serializeSubChunk($chunk->getSubChunk($y), $blockMapper, $stream, false);
+		$biomeIdMap = LegacyBiomeIdToStringIdMap::getInstance();
+		//all biomes must always be written :(
+		for($y = $minSubChunkIndex; $y <= $maxSubChunkIndex; ++$y){
+			self::serializeBiomePalette($chunk->getSubChunk($y)->getBiomeArray(), $biomeIdMap, $stream);
 		}
 
-		//TODO: right now we don't support 3D natively, so we just 3Dify our 2D biomes so they fill the column
-		$encodedBiomePalette = self::serializeBiomesAsPalette($chunk);
-		$stream->put(str_repeat($encodedBiomePalette, 24));
-
 		$stream->putByte(0); //border block array count
 		//Border block entry format: 1 byte (4 bits X, 4 bits Z). These are however useless since they crash the regular client.
 
@@ -91,12 +111,14 @@ final class ChunkSerializer{
 		return $stream->getBuffer();
 	}
 
-	public static function serializeSubChunk(SubChunk $subChunk, RuntimeBlockMapping $blockMapper, PacketSerializer $stream, bool $persistentBlockStates) : void{
+	public static function serializeSubChunk(SubChunk $subChunk, BlockTranslator $blockTranslator, PacketSerializer $stream, bool $persistentBlockStates) : void{
 		$layers = $subChunk->getBlockLayers();
 		$stream->putByte(8); //version
 
 		$stream->putByte(count($layers));
 
+		$blockStateDictionary = $blockTranslator->getBlockStateDictionary();
+
 		foreach($layers as $blocks){
 			$bitsPerBlock = $blocks->getBitsPerBlock();
 			$words = $blocks->getWordArray();
@@ -113,16 +135,44 @@ final class ChunkSerializer{
 			if($persistentBlockStates){
 				$nbtSerializer = new NetworkNbtSerializer();
 				foreach($palette as $p){
-					$stream->put($nbtSerializer->write(new TreeRoot($blockMapper->getBedrockKnownStates()[$blockMapper->toRuntimeId($p)])));
+					//TODO: introduce a binary cache for this
+					$state = $blockStateDictionary->generateDataFromStateId($blockTranslator->internalIdToNetworkId($p));
+					if($state === null){
+						$state = $blockTranslator->getFallbackStateData();
+					}
+
+					$stream->put($nbtSerializer->write(new TreeRoot($state->toNbt())));
 				}
 			}else{
 				foreach($palette as $p){
-					$stream->put(Binary::writeUnsignedVarInt($blockMapper->toRuntimeId($p) << 1));
+					$stream->put(Binary::writeUnsignedVarInt($blockTranslator->internalIdToNetworkId($p) << 1));
 				}
 			}
 		}
 	}
 
+	private static function serializeBiomePalette(PalettedBlockArray $biomePalette, LegacyBiomeIdToStringIdMap $biomeIdMap, PacketSerializer $stream) : void{
+		$biomePaletteBitsPerBlock = $biomePalette->getBitsPerBlock();
+		$stream->putByte(($biomePaletteBitsPerBlock << 1) | 1); //the last bit is non-persistence (like for blocks), though it has no effect on biomes since they always use integer IDs
+		$stream->put($biomePalette->getWordArray());
+
+		//these LSHIFT by 1 uvarints are optimizations: the client expects zigzag varints here
+		//but since we know they are always unsigned, we can avoid the extra fcall overhead of
+		//zigzag and just shift directly.
+		$biomePaletteArray = $biomePalette->getPalette();
+		if($biomePaletteBitsPerBlock !== 0){
+			$stream->putUnsignedVarInt(count($biomePaletteArray) << 1);
+		}
+
+		foreach($biomePaletteArray as $p){
+			if($biomeIdMap->legacyToString($p) === null){
+				//make sure we aren't sending bogus biomes - the 1.18.0 client crashes if we do this
+				$p = BiomeIds::OCEAN;
+			}
+			$stream->put(Binary::writeUnsignedVarInt($p << 1));
+		}
+	}
+
 	public static function serializeTiles(Chunk $chunk) : string{
 		$stream = new BinaryStream();
 		foreach($chunk->getTiles() as $tile){
@@ -133,39 +183,4 @@ final class ChunkSerializer{
 
 		return $stream->getBuffer();
 	}
-
-	private static function serializeBiomesAsPalette(Chunk $chunk) : string{
-		$biomeIdMap = LegacyBiomeIdToStringIdMap::getInstance();
-		$biomePalette = new PalettedBlockArray($chunk->getBiomeId(0, 0));
-		for($x = 0; $x < 16; ++$x){
-			for($z = 0; $z < 16; ++$z){
-				$biomeId = $chunk->getBiomeId($x, $z);
-				if($biomeIdMap->legacyToString($biomeId) === null){
-					//make sure we aren't sending bogus biomes - the 1.18.0 client crashes if we do this
-					$biomeId = BiomeIds::OCEAN;
-				}
-				for($y = 0; $y < 16; ++$y){
-					$biomePalette->set($x, $y, $z, $biomeId);
-				}
-			}
-		}
-
-		$biomePaletteBitsPerBlock = $biomePalette->getBitsPerBlock();
-		$encodedBiomePalette =
-			chr(($biomePaletteBitsPerBlock << 1) | 1) . //the last bit is non-persistence (like for blocks), though it has no effect on biomes since they always use integer IDs
-			$biomePalette->getWordArray();
-
-		//these LSHIFT by 1 uvarints are optimizations: the client expects zigzag varints here
-		//but since we know they are always unsigned, we can avoid the extra fcall overhead of
-		//zigzag and just shift directly.
-		$biomePaletteArray = $biomePalette->getPalette();
-		if($biomePaletteBitsPerBlock !== 0){
-			$encodedBiomePalette .= Binary::writeUnsignedVarInt(count($biomePaletteArray) << 1);
-		}
-		foreach($biomePaletteArray as $p){
-			$encodedBiomePalette .= Binary::writeUnsignedVarInt($p << 1);
-		}
-
-		return $encodedBiomePalette;
-	}
 }
diff --git a/src/network/query/QueryInfo.php b/src/network/query/QueryInfo.php
index 1dc0dcf7e8..0bf5b4f65e 100644
--- a/src/network/query/QueryInfo.php
+++ b/src/network/query/QueryInfo.php
@@ -29,6 +29,8 @@ use pocketmine\plugin\Plugin;
 use pocketmine\Server;
 use pocketmine\utils\Binary;
 use pocketmine\utils\Utils;
+use pocketmine\YmlServerProperties;
+use function array_map;
 use function chr;
 use function count;
 use function str_replace;
@@ -41,7 +43,7 @@ final class QueryInfo{
 	private bool $listPlugins;
 	/** @var Plugin[] */
 	private array $plugins;
-	/** @var Player[] */
+	/** @var string[] */
 	private array $players;
 
 	private string $gametype;
@@ -65,11 +67,11 @@ final class QueryInfo{
 
 	public function __construct(Server $server){
 		$this->serverName = $server->getMotd();
-		$this->listPlugins = $server->getConfigGroup()->getPropertyBool("settings.query-plugins", true);
+		$this->listPlugins = $server->getConfigGroup()->getPropertyBool(YmlServerProperties::SETTINGS_QUERY_PLUGINS, true);
 		$this->plugins = $server->getPluginManager()->getPlugins();
-		$this->players = $server->getOnlinePlayers();
+		$this->players = array_map(fn(Player $p) => $p->getName(), $server->getOnlinePlayers());
 
-		$this->gametype = ($server->getGamemode()->equals(GameMode::SURVIVAL()) || $server->getGamemode()->equals(GameMode::ADVENTURE())) ? "SMP" : "CMP";
+		$this->gametype = ($server->getGamemode() === GameMode::SURVIVAL || $server->getGamemode() === GameMode::ADVENTURE) ? "SMP" : "CMP";
 		$this->version = $server->getVersion();
 		$this->server_engine = $server->getName() . " " . $server->getPocketMineVersion();
 		$world = $server->getWorldManager()->getDefaultWorld();
@@ -122,17 +124,17 @@ final class QueryInfo{
 	}
 
 	/**
-	 * @return Player[]
+	 * @return string[]
 	 */
 	public function getPlayerList() : array{
 		return $this->players;
 	}
 
 	/**
-	 * @param Player[] $players
+	 * @param string[] $players
 	 */
 	public function setPlayerList(array $players) : void{
-		Utils::validateArrayValueType($players, function(Player $_) : void{});
+		Utils::validateArrayValueType($players, function(string $_) : void{});
 		$this->players = $players;
 		$this->destroyCache();
 	}
@@ -226,7 +228,7 @@ final class QueryInfo{
 
 		$query .= "\x00\x01player_\x00\x00";
 		foreach($this->players as $player){
-			$query .= $player->getName() . "\x00";
+			$query .= $player . "\x00";
 		}
 		$query .= "\x00";
 
diff --git a/src/permission/BanEntry.php b/src/permission/BanEntry.php
index eef28f222b..0d5ed0c76b 100644
--- a/src/permission/BanEntry.php
+++ b/src/permission/BanEntry.php
@@ -33,8 +33,7 @@ use function strtolower;
 use function trim;
 
 class BanEntry{
-	/** @var string */
-	public static $format = "Y-m-d H:i:s O";
+	public static string $format = "Y-m-d H:i:s O";
 
 	private string $name;
 	private \DateTime $creationDate;
diff --git a/src/permission/BanList.php b/src/permission/BanList.php
index b09cd98c90..36826ed66f 100644
--- a/src/permission/BanList.php
+++ b/src/permission/BanList.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\permission;
 
+use pocketmine\utils\Utils;
 use function fclose;
 use function fgets;
 use function fopen;
@@ -32,7 +33,10 @@ use function strtolower;
 use function trim;
 
 class BanList{
-	/** @var BanEntry[] */
+	/**
+	 * @var BanEntry[]
+	 * @phpstan-var array<string, BanEntry>
+	 */
 	private array $list = [];
 
 	private bool $enabled = true;
@@ -101,7 +105,7 @@ class BanList{
 	}
 
 	public function removeExpired() : void{
-		foreach($this->list as $name => $entry){
+		foreach(Utils::promoteKeys($this->list) as $name => $entry){
 			if($entry->hasExpired()){
 				unset($this->list[$name]);
 			}
diff --git a/src/permission/DefaultPermissionNames.php b/src/permission/DefaultPermissionNames.php
index 7ea4b306d4..2b6ebfa79c 100644
--- a/src/permission/DefaultPermissionNames.php
+++ b/src/permission/DefaultPermissionNames.php
@@ -34,17 +34,13 @@ final class DefaultPermissionNames{
 	public const COMMAND_DEFAULTGAMEMODE = "pocketmine.command.defaultgamemode";
 	public const COMMAND_DIFFICULTY = "pocketmine.command.difficulty";
 	public const COMMAND_DUMPMEMORY = "pocketmine.command.dumpmemory";
-	public const COMMAND_EFFECT = "pocketmine.command.effect";
 	public const COMMAND_EFFECT_OTHER = "pocketmine.command.effect.other";
 	public const COMMAND_EFFECT_SELF = "pocketmine.command.effect.self";
-	public const COMMAND_ENCHANT = "pocketmine.command.enchant";
 	public const COMMAND_ENCHANT_OTHER = "pocketmine.command.enchant.other";
 	public const COMMAND_ENCHANT_SELF = "pocketmine.command.enchant.self";
-	public const COMMAND_GAMEMODE = "pocketmine.command.gamemode";
 	public const COMMAND_GAMEMODE_OTHER = "pocketmine.command.gamemode.other";
 	public const COMMAND_GAMEMODE_SELF = "pocketmine.command.gamemode.self";
 	public const COMMAND_GC = "pocketmine.command.gc";
-	public const COMMAND_GIVE = "pocketmine.command.give";
 	public const COMMAND_GIVE_OTHER = "pocketmine.command.give.other";
 	public const COMMAND_GIVE_SELF = "pocketmine.command.give.self";
 	public const COMMAND_HELP = "pocketmine.command.help";
@@ -63,12 +59,10 @@ final class DefaultPermissionNames{
 	public const COMMAND_SAY = "pocketmine.command.say";
 	public const COMMAND_SEED = "pocketmine.command.seed";
 	public const COMMAND_SETWORLDSPAWN = "pocketmine.command.setworldspawn";
-	public const COMMAND_SPAWNPOINT = "pocketmine.command.spawnpoint";
 	public const COMMAND_SPAWNPOINT_OTHER = "pocketmine.command.spawnpoint.other";
 	public const COMMAND_SPAWNPOINT_SELF = "pocketmine.command.spawnpoint.self";
 	public const COMMAND_STATUS = "pocketmine.command.status";
 	public const COMMAND_STOP = "pocketmine.command.stop";
-	public const COMMAND_TELEPORT = "pocketmine.command.teleport";
 	public const COMMAND_TELEPORT_OTHER = "pocketmine.command.teleport.other";
 	public const COMMAND_TELEPORT_SELF = "pocketmine.command.teleport.self";
 	public const COMMAND_TELL = "pocketmine.command.tell";
@@ -78,7 +72,6 @@ final class DefaultPermissionNames{
 	public const COMMAND_TIME_START = "pocketmine.command.time.start";
 	public const COMMAND_TIME_STOP = "pocketmine.command.time.stop";
 	public const COMMAND_TIMINGS = "pocketmine.command.timings";
-	public const COMMAND_TITLE = "pocketmine.command.title";
 	public const COMMAND_TITLE_OTHER = "pocketmine.command.title.other";
 	public const COMMAND_TITLE_SELF = "pocketmine.command.title.self";
 	public const COMMAND_TRANSFERSERVER = "pocketmine.command.transferserver";
@@ -91,6 +84,8 @@ final class DefaultPermissionNames{
 	public const COMMAND_WHITELIST_LIST = "pocketmine.command.whitelist.list";
 	public const COMMAND_WHITELIST_RELOAD = "pocketmine.command.whitelist.reload";
 	public const COMMAND_WHITELIST_REMOVE = "pocketmine.command.whitelist.remove";
+  public const COMMAND_XP_OTHER = "pocketmine.command.xp.other";
+	public const COMMAND_XP_SELF = "pocketmine.command.xp.self";
 	public const GAME_BLOCK_BREAK = "pocketmine.game.block.break";
 	public const GAME_BLOCK_INTERACT = "pocketmine.game.block.interact";
 	public const GAME_BLOCK_PLACE = "pocketmine.game.block.place";
diff --git a/src/permission/DefaultPermissions.php b/src/permission/DefaultPermissions.php
index c951e2de04..359faedc09 100644
--- a/src/permission/DefaultPermissions.php
+++ b/src/permission/DefaultPermissions.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\permission;
 
+use pocketmine\lang\KnownTranslationFactory as l10n;
 use pocketmine\permission\DefaultPermissionNames as Names;
 
 abstract class DefaultPermissions{
@@ -46,98 +47,75 @@ abstract class DefaultPermissions{
 		return PermissionManager::getInstance()->getPermission($candidate->getName());
 	}
 
-	private static function registerDeprecatedPermission(string $name) : Permission{
-		$permission = new Permission($name, "Deprecated, kept for backwards compatibility only");
-		PermissionManager::getInstance()->addPermission($permission);
-		return $permission;
-	}
-
 	public static function registerCorePermissions() : void{
-		$consoleRoot = self::registerPermission(new Permission(self::ROOT_CONSOLE, "Grants all console permissions"));
-		$operatorRoot = self::registerPermission(new Permission(self::ROOT_OPERATOR, "Grants all operator permissions"), [$consoleRoot]);
-		$everyoneRoot = self::registerPermission(new Permission(self::ROOT_USER, "Grants all non-sensitive permissions that everyone gets by default"), [$operatorRoot]);
+		$consoleRoot = self::registerPermission(new Permission(self::ROOT_CONSOLE, l10n::pocketmine_permission_group_console()));
+		$operatorRoot = self::registerPermission(new Permission(self::ROOT_OPERATOR, l10n::pocketmine_permission_group_operator()), [$consoleRoot]);
+		$everyoneRoot = self::registerPermission(new Permission(self::ROOT_USER, l10n::pocketmine_permission_group_user()), [$operatorRoot]);
 
-		self::registerPermission(new Permission(Names::BROADCAST_ADMIN, "Allows the user to receive administrative broadcasts"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::BROADCAST_USER, "Allows the user to receive user broadcasts"), [$everyoneRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_BAN_IP, "Allows the user to ban IP addresses"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_BAN_LIST, "Allows the user to list banned players"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_BAN_PLAYER, "Allows the user to ban players"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_CLEAR_OTHER, "Allows the user to clear inventory of other players"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_CLEAR_SELF, "Allows the user to clear their own inventory"), [$everyoneRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_DEFAULTGAMEMODE, "Allows the user to change the default gamemode"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_DIFFICULTY, "Allows the user to change the game difficulty"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_DUMPMEMORY, "Allows the user to dump memory contents"), [$consoleRoot]);
-
-		$effectRoot = self::registerDeprecatedPermission(Names::COMMAND_EFFECT);
-		self::registerPermission(new Permission(Names::COMMAND_EFFECT_OTHER, "Allows the user to modify effects of other players"), [$operatorRoot, $effectRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_EFFECT_SELF, "Allows the user to modify their own effects"), [$operatorRoot, $effectRoot]);
-
-		$enchantRoot = self::registerDeprecatedPermission(Names::COMMAND_ENCHANT);
-		self::registerPermission(new Permission(Names::COMMAND_ENCHANT_OTHER, "Allows the user to enchant the held items of other players"), [$operatorRoot, $enchantRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_ENCHANT_SELF, "Allows the user to enchant their own held item"), [$operatorRoot, $enchantRoot]);
-
-		$gameModeRoot = self::registerDeprecatedPermission(Names::COMMAND_GAMEMODE);
-		self::registerPermission(new Permission(Names::COMMAND_GAMEMODE_OTHER, "Allows the user to change the game mode of other players"), [$operatorRoot, $gameModeRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_GAMEMODE_SELF, "Allows the user to change their own game mode"), [$operatorRoot, $gameModeRoot]);
-
-		self::registerPermission(new Permission(Names::COMMAND_GC, "Allows the user to fire garbage collection tasks"), [$operatorRoot]);
-
-		$giveRoot = self::registerDeprecatedPermission(Names::COMMAND_GIVE);
-		self::registerPermission(new Permission(Names::COMMAND_GIVE_OTHER, "Allows the user to give items to other players"), [$operatorRoot, $giveRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_GIVE_SELF, "Allows the user to give items to themselves"), [$operatorRoot, $giveRoot]);
-
-		self::registerPermission(new Permission(Names::COMMAND_HELP, "Allows the user to view the help menu"), [$everyoneRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_KICK, "Allows the user to kick players"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_KILL_OTHER, "Allows the user to kill other players"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_KILL_SELF, "Allows the user to commit suicide"), [$everyoneRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_LIST, "Allows the user to list all online players"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_ME, "Allows the user to perform a chat action"), [$everyoneRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_OP_GIVE, "Allows the user to give a player operator status"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_OP_TAKE, "Allows the user to take a player's operator status"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_PARTICLE, "Allows the user to create particle effects"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_PLUGINS, "Allows the user to view the list of plugins"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_SAVE_DISABLE, "Allows the user to disable automatic saving"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_SAVE_ENABLE, "Allows the user to enable automatic saving"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_SAVE_PERFORM, "Allows the user to perform a manual save"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_SAY, "Allows the user to talk as the console"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_SEED, "Allows the user to view the seed of the world"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_SETWORLDSPAWN, "Allows the user to change the world spawn"), [$operatorRoot]);
-
-		$spawnpointRoot = self::registerDeprecatedPermission(Names::COMMAND_SPAWNPOINT);
-		self::registerPermission(new Permission(Names::COMMAND_SPAWNPOINT_OTHER, "Allows the user to change the respawn point of other players"), [$operatorRoot, $spawnpointRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_SPAWNPOINT_SELF, "Allows the user to change their own respawn point"), [$operatorRoot, $spawnpointRoot]);
-
-		self::registerPermission(new Permission(Names::COMMAND_STATUS, "Allows the user to view the server performance"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_STOP, "Allows the user to stop the server"), [$operatorRoot]);
-
-		$teleportRoot = self::registerDeprecatedPermission(Names::COMMAND_TELEPORT);
-		self::registerPermission(new Permission(Names::COMMAND_TELEPORT_OTHER, "Allows the user to teleport other players"), [$operatorRoot, $teleportRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_TELEPORT_SELF, "Allows the user to teleport themselves"), [$operatorRoot, $teleportRoot]);
-
-		self::registerPermission(new Permission(Names::COMMAND_TELL, "Allows the user to privately message another player"), [$everyoneRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_TIME_ADD, "Allows the user to fast-forward time"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_TIME_QUERY, "Allows the user query the time"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_TIME_SET, "Allows the user to change the time"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_TIME_START, "Allows the user to restart the time"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_TIME_STOP, "Allows the user to stop the time"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_TIMINGS, "Allows the user to record timings to analyse server performance"), [$operatorRoot]);
-
-		$titleRoot = self::registerDeprecatedPermission(Names::COMMAND_TITLE);
-		self::registerPermission(new Permission(Names::COMMAND_TITLE_OTHER, "Allows the user to send a title to the specified player"), [$operatorRoot, $titleRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_TITLE_SELF, "Allows the user to send a title to themselves"), [$operatorRoot, $titleRoot]);
-
-		self::registerPermission(new Permission(Names::COMMAND_TRANSFERSERVER, "Allows the user to transfer self to another server"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_UNBAN_IP, "Allows the user to unban IP addresses"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_UNBAN_PLAYER, "Allows the user to unban players"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_VERSION, "Allows the user to view the version of the server"), [$everyoneRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_WHITELIST_ADD, "Allows the user to add a player to the server whitelist"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_WHITELIST_DISABLE, "Allows the user to disable the server whitelist"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_WHITELIST_ENABLE, "Allows the user to enable the server whitelist"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_WHITELIST_LIST, "Allows the user to list all players on the server whitelist"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_WHITELIST_RELOAD, "Allows the user to reload the server whitelist"), [$operatorRoot]);
-		self::registerPermission(new Permission(Names::COMMAND_WHITELIST_REMOVE, "Allows the user to remove a player from the server whitelist"), [$operatorRoot]);
-
-		self::registerPermission(new Permission(Names::GAME_CHAT, "Allows the user to chat"), [$everyoneRoot]);
+		self::registerPermission(new Permission(Names::BROADCAST_ADMIN, l10n::pocketmine_permission_broadcast_admin()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::BROADCAST_USER, l10n::pocketmine_permission_broadcast_user()), [$everyoneRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_BAN_IP, l10n::pocketmine_permission_command_ban_ip()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_BAN_LIST, l10n::pocketmine_permission_command_ban_list()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_BAN_PLAYER, l10n::pocketmine_permission_command_ban_player()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_CLEAR_OTHER, l10n::pocketmine_permission_command_clear_other()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_CLEAR_SELF, l10n::pocketmine_permission_command_clear_self()), [$everyoneRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_DEFAULTGAMEMODE, l10n::pocketmine_permission_command_defaultgamemode()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_DIFFICULTY, l10n::pocketmine_permission_command_difficulty()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_DUMPMEMORY, l10n::pocketmine_permission_command_dumpmemory()), [$consoleRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_EFFECT_OTHER, l10n::pocketmine_permission_command_effect_other()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_EFFECT_SELF, l10n::pocketmine_permission_command_effect_self()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_ENCHANT_OTHER, l10n::pocketmine_permission_command_enchant_other()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_ENCHANT_SELF, l10n::pocketmine_permission_command_enchant_self()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_GAMEMODE_OTHER, l10n::pocketmine_permission_command_gamemode_other()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_GAMEMODE_SELF, l10n::pocketmine_permission_command_gamemode_self()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_GC, l10n::pocketmine_permission_command_gc()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_GIVE_OTHER, l10n::pocketmine_permission_command_give_other()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_GIVE_SELF, l10n::pocketmine_permission_command_give_self()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_HELP, l10n::pocketmine_permission_command_help()), [$everyoneRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_KICK, l10n::pocketmine_permission_command_kick()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_KILL_OTHER, l10n::pocketmine_permission_command_kill_other()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_KILL_SELF, l10n::pocketmine_permission_command_kill_self()), [$everyoneRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_LIST, l10n::pocketmine_permission_command_list()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_ME, l10n::pocketmine_permission_command_me()), [$everyoneRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_OP_GIVE, l10n::pocketmine_permission_command_op_give()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_OP_TAKE, l10n::pocketmine_permission_command_op_take()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_PARTICLE, l10n::pocketmine_permission_command_particle()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_PLUGINS, l10n::pocketmine_permission_command_plugins()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_SAVE_DISABLE, l10n::pocketmine_permission_command_save_disable()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_SAVE_ENABLE, l10n::pocketmine_permission_command_save_enable()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_SAVE_PERFORM, l10n::pocketmine_permission_command_save_perform()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_SAY, l10n::pocketmine_permission_command_say()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_SEED, l10n::pocketmine_permission_command_seed()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_SETWORLDSPAWN, l10n::pocketmine_permission_command_setworldspawn()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_SPAWNPOINT_OTHER, l10n::pocketmine_permission_command_spawnpoint_other()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_SPAWNPOINT_SELF, l10n::pocketmine_permission_command_spawnpoint_self()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_STATUS, l10n::pocketmine_permission_command_status()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_STOP, l10n::pocketmine_permission_command_stop()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_TELEPORT_OTHER, l10n::pocketmine_permission_command_teleport_other()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_TELEPORT_SELF, l10n::pocketmine_permission_command_teleport_self()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_TELL, l10n::pocketmine_permission_command_tell()), [$everyoneRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_TIME_ADD, l10n::pocketmine_permission_command_time_add()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_TIME_QUERY, l10n::pocketmine_permission_command_time_query()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_TIME_SET, l10n::pocketmine_permission_command_time_set()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_TIME_START, l10n::pocketmine_permission_command_time_start()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_TIME_STOP, l10n::pocketmine_permission_command_time_stop()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_TIMINGS, l10n::pocketmine_permission_command_timings()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_TITLE_OTHER, l10n::pocketmine_permission_command_title_other()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_TITLE_SELF, l10n::pocketmine_permission_command_title_self()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_TRANSFERSERVER, l10n::pocketmine_permission_command_transferserver()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_UNBAN_IP, l10n::pocketmine_permission_command_unban_ip()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_UNBAN_PLAYER, l10n::pocketmine_permission_command_unban_player()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_VERSION, l10n::pocketmine_permission_command_version()), [$everyoneRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_WHITELIST_ADD, l10n::pocketmine_permission_command_whitelist_add()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_WHITELIST_DISABLE, l10n::pocketmine_permission_command_whitelist_disable()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_WHITELIST_ENABLE, l10n::pocketmine_permission_command_whitelist_enable()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_WHITELIST_LIST, l10n::pocketmine_permission_command_whitelist_list()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_WHITELIST_RELOAD, l10n::pocketmine_permission_command_whitelist_reload()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_WHITELIST_REMOVE, l10n::pocketmine_permission_command_whitelist_remove()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_XP_OTHER, l10n::pocketmine_permission_command_xp_other()), [$operatorRoot]);
+		self::registerPermission(new Permission(Names::COMMAND_XP_SELF, l10n::pocketmine_permission_command_xp_self()), [$operatorRoot]);
+    
+    self::registerPermission(new Permission(Names::GAME_CHAT, "Allows the user to chat"), [$everyoneRoot]);
 
 		$survivalRoot = self::registerPermission(new Permission(Names::GROUP_GAMEMODE_SURVIVAL));
 		$creativeRoot = self::registerPermission(new Permission(Names::GROUP_GAMEMODE_CREATIVE));
diff --git a/src/permission/Permissible.php b/src/permission/Permissible.php
index 2047dcec7d..b3527e1c40 100644
--- a/src/permission/Permissible.php
+++ b/src/permission/Permissible.php
@@ -35,32 +35,26 @@ interface Permissible{
 	 *
 	 * @internal
 	 * @see Permissible::addAttachment() for normal permission assignments
-	 * @param Permission|string $name
 	 */
-	public function setBasePermission($name, bool $grant) : void;
+	public function setBasePermission(Permission|string $name, bool $grant) : void;
 
 	/**
 	 * Unsets a baseline permission previously set. If it wasn't already set, this will have no effect.
 	 * Note that this might have different results than setting the permission to false.
 	 *
 	 * @internal
-	 * @param Permission|string $name
 	 */
-	public function unsetBasePermission($name) : void;
+	public function unsetBasePermission(Permission|string $name) : void;
 
 	/**
 	 * Checks if this instance has a permission overridden
-	 *
-	 * @param string|Permission $name
 	 */
-	public function isPermissionSet($name) : bool;
+	public function isPermissionSet(Permission|string $name) : bool;
 
 	/**
 	 * Returns the permission value if overridden, or the default value if not
-	 *
-	 * @param string|Permission $name
 	 */
-	public function hasPermission($name) : bool;
+	public function hasPermission(Permission|string $name) : bool;
 
 	public function addAttachment(Plugin $plugin, ?string $name = null, ?bool $value = null) : PermissionAttachment;
 
diff --git a/src/permission/PermissibleDelegateTrait.php b/src/permission/PermissibleDelegateTrait.php
index fa051ecd8c..22f6508484 100644
--- a/src/permission/PermissibleDelegateTrait.php
+++ b/src/permission/PermissibleDelegateTrait.php
@@ -31,31 +31,19 @@ trait PermissibleDelegateTrait{
 	/** @var Permissible */
 	private $perm;
 
-	/**
-	 * @param Permission|string $name
-	 */
-	public function setBasePermission($name, bool $value) : void{
-		$this->perm->setBasePermission($name, $value);
+	public function setBasePermission(Permission|string $name, bool $grant) : void{
+		$this->perm->setBasePermission($name, $grant);
 	}
 
-	/**
-	 * @param Permission|string $name
-	 */
-	public function unsetBasePermission($name) : void{
+	public function unsetBasePermission(Permission|string $name) : void{
 		$this->perm->unsetBasePermission($name);
 	}
 
-	/**
-	 * @param Permission|string $name
-	 */
-	public function isPermissionSet($name) : bool{
+	public function isPermissionSet(Permission|string $name) : bool{
 		return $this->perm->isPermissionSet($name);
 	}
 
-	/**
-	 * @param Permission|string $name
-	 */
-	public function hasPermission($name) : bool{
+	public function hasPermission(Permission|string $name) : bool{
 		return $this->perm->hasPermission($name);
 	}
 
diff --git a/src/permission/PermissibleInternal.php b/src/permission/PermissibleInternal.php
index 2401869a96..49c34b49a4 100644
--- a/src/permission/PermissibleInternal.php
+++ b/src/permission/PermissibleInternal.php
@@ -69,7 +69,7 @@ class PermissibleInternal implements Permissible{
 		$this->recalculatePermissions();
 	}
 
-	public function setBasePermission($name, bool $grant) : void{
+	public function setBasePermission(Permission|string $name, bool $grant) : void{
 		if($name instanceof Permission){
 			$name = $name->getName();
 		}
@@ -77,22 +77,16 @@ class PermissibleInternal implements Permissible{
 		$this->recalculatePermissions();
 	}
 
-	public function unsetBasePermission($name) : void{
+	public function unsetBasePermission(Permission|string $name) : void{
 		unset($this->rootPermissions[$name instanceof Permission ? $name->getName() : $name]);
 		$this->recalculatePermissions();
 	}
 
-	/**
-	 * @param Permission|string $name
-	 */
-	public function isPermissionSet($name) : bool{
+	public function isPermissionSet(Permission|string $name) : bool{
 		return isset($this->permissions[$name instanceof Permission ? $name->getName() : $name]);
 	}
 
-	/**
-	 * @param Permission|string $name
-	 */
-	public function hasPermission($name) : bool{
+	public function hasPermission(Permission|string $name) : bool{
 		if($name instanceof Permission){
 			$name = $name->getName();
 		}
diff --git a/src/permission/Permission.php b/src/permission/Permission.php
index f73f33ab86..fc10e35877 100644
--- a/src/permission/Permission.php
+++ b/src/permission/Permission.php
@@ -27,11 +27,13 @@ declare(strict_types=1);
 
 namespace pocketmine\permission;
 
+use pocketmine\lang\Translatable;
+
 /**
  * Represents a permission
  */
 class Permission{
-	private string $description;
+	private Translatable|string $description;
 
 	/**
 	 * Creates a new Permission object to be attached to Permissible objects
@@ -41,7 +43,7 @@ class Permission{
 	 */
 	public function __construct(
 		private string $name,
-		?string $description = null,
+		Translatable|string|null $description = null,
 		private array $children = []
 	){
 		$this->description = $description ?? ""; //TODO: wtf ????
@@ -61,11 +63,11 @@ class Permission{
 		return $this->children;
 	}
 
-	public function getDescription() : string{
+	public function getDescription() : Translatable|string{
 		return $this->description;
 	}
 
-	public function setDescription(string $value) : void{
+	public function setDescription(Translatable|string $value) : void{
 		$this->description = $value;
 	}
 
diff --git a/src/permission/PermissionAttachment.php b/src/permission/PermissionAttachment.php
index 68f5440699..79c66ba8a1 100644
--- a/src/permission/PermissionAttachment.php
+++ b/src/permission/PermissionAttachment.php
@@ -25,10 +25,14 @@ namespace pocketmine\permission;
 
 use pocketmine\plugin\Plugin;
 use pocketmine\plugin\PluginException;
+use pocketmine\utils\Utils;
 use function spl_object_id;
 
 class PermissionAttachment{
-	/** @var bool[] */
+	/**
+	 * @var bool[]
+	 * @phpstan-var array<string, bool>
+	 */
 	private array $permissions = [];
 
 	/**
@@ -60,6 +64,7 @@ class PermissionAttachment{
 
 	/**
 	 * @return bool[]
+	 * @phpstan-return array<string, bool>
 	 */
 	public function getPermissions() : array{
 		return $this->permissions;
@@ -78,9 +83,10 @@ class PermissionAttachment{
 
 	/**
 	 * @param bool[] $permissions
+	 * @phpstan-param array<string, bool> $permissions
 	 */
 	public function setPermissions(array $permissions) : void{
-		foreach($permissions as $key => $value){
+		foreach(Utils::stringifyKeys($permissions) as $key => $value){
 			$this->permissions[$key] = $value;
 		}
 		$this->recalculatePermissibles();
@@ -96,10 +102,7 @@ class PermissionAttachment{
 		$this->recalculatePermissibles();
 	}
 
-	/**
-	 * @param string|Permission $name
-	 */
-	public function setPermission($name, bool $value) : void{
+	public function setPermission(Permission|string $name, bool $value) : void{
 		$name = $name instanceof Permission ? $name->getName() : $name;
 		if(isset($this->permissions[$name])){
 			if($this->permissions[$name] === $value){
@@ -120,10 +123,7 @@ class PermissionAttachment{
 		$this->recalculatePermissibles();
 	}
 
-	/**
-	 * @param string|Permission $name
-	 */
-	public function unsetPermission($name) : void{
+	public function unsetPermission(Permission|string $name) : void{
 		$name = $name instanceof Permission ? $name->getName() : $name;
 		if(isset($this->permissions[$name])){
 			unset($this->permissions[$name]);
diff --git a/src/permission/PermissionManager.php b/src/permission/PermissionManager.php
index b1c762bdf3..c9e37f5e94 100644
--- a/src/permission/PermissionManager.php
+++ b/src/permission/PermissionManager.php
@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\permission;
 
+use pocketmine\Server;
+use pocketmine\utils\Utils;
 use function count;
 use function spl_object_id;
 
@@ -37,10 +39,16 @@ class PermissionManager{
 		return self::$instance;
 	}
 
-	/** @var Permission[] */
-	protected $permissions = [];
-	/** @var PermissibleInternal[][] */
-	protected $permSubs = [];
+	/**
+	 * @var Permission[]
+	 * @phpstan-var array<string, Permission>
+	 */
+	protected array $permissions = [];
+	/**
+	 * @var PermissibleInternal[][]
+	 * @phpstan-var array<string, array<int, PermissibleInternal>>
+	 */
+	protected array $permSubs = [];
 
 	public function getPermission(string $name) : ?Permission{
 		return $this->permissions[$name] ?? null;
@@ -56,10 +64,7 @@ class PermissionManager{
 		return false;
 	}
 
-	/**
-	 * @param string|Permission $permission
-	 */
-	public function removePermission($permission) : void{
+	public function removePermission(Permission|string $permission) : void{
 		if($permission instanceof Permission){
 			unset($this->permissions[$permission->getName()]);
 		}else{
@@ -67,6 +72,10 @@ class PermissionManager{
 		}
 	}
 
+	/**
+	 * @deprecated Superseded by server chat broadcast channels
+	 * @see Server::subscribeToBroadcastChannel()
+	 */
 	public function subscribeToPermission(string $permission, PermissibleInternal $permissible) : void{
 		if(!isset($this->permSubs[$permission])){
 			$this->permSubs[$permission] = [];
@@ -74,25 +83,37 @@ class PermissionManager{
 		$this->permSubs[$permission][spl_object_id($permissible)] = $permissible;
 	}
 
+	/**
+	 * @deprecated Superseded by server chat broadcast channels
+	 * @see Server::unsubscribeFromBroadcastChannel()
+	 */
 	public function unsubscribeFromPermission(string $permission, PermissibleInternal $permissible) : void{
-		if(isset($this->permSubs[$permission])){
-			unset($this->permSubs[$permission][spl_object_id($permissible)]);
-			if(count($this->permSubs[$permission]) === 0){
-				unset($this->permSubs[$permission]);
-			}
-		}
-	}
-
-	public function unsubscribeFromAllPermissions(PermissibleInternal $permissible) : void{
-		foreach($this->permSubs as $permission => &$subs){
-			unset($subs[spl_object_id($permissible)]);
-			if(count($subs) === 0){
+		if(isset($this->permSubs[$permission][spl_object_id($permissible)])){
+			if(count($this->permSubs[$permission]) === 1){
 				unset($this->permSubs[$permission]);
+			}else{
+				unset($this->permSubs[$permission][spl_object_id($permissible)]);
 			}
 		}
 	}
 
 	/**
+	 * @deprecated Superseded by server chat broadcast channels
+	 * @see Server::unsubscribeFromAllBroadcastChannels()
+	 */
+	public function unsubscribeFromAllPermissions(PermissibleInternal $permissible) : void{
+		foreach(Utils::promoteKeys($this->permSubs) as $permission => $subs){
+			if(count($subs) === 1 && isset($subs[spl_object_id($permissible)])){
+				unset($this->permSubs[$permission]);
+			}else{
+				unset($this->permSubs[$permission][spl_object_id($permissible)]);
+			}
+		}
+	}
+
+	/**
+	 * @deprecated Superseded by server chat broadcast channels
+	 * @see Server::getBroadcastChannelSubscribers()
 	 * @return PermissibleInternal[]
 	 */
 	public function getPermissionSubscriptions(string $permission) : array{
diff --git a/src/permission/PermissionParser.php b/src/permission/PermissionParser.php
index d1a901e67b..bbc68aaa55 100644
--- a/src/permission/PermissionParser.php
+++ b/src/permission/PermissionParser.php
@@ -58,11 +58,9 @@ class PermissionParser{
 	private const KEY_DESCRIPTION = "description";
 
 	/**
-	 * @param bool|string $value
-	 *
 	 * @throws PermissionParserException
 	 */
-	public static function defaultFromString($value) : string{
+	public static function defaultFromString(bool|string $value) : string{
 		if(is_bool($value)){
 			return $value ? self::DEFAULT_TRUE : self::DEFAULT_FALSE;
 		}
diff --git a/src/player/ChunkSelector.php b/src/player/ChunkSelector.php
index d88ef5fa44..14d6b2888b 100644
--- a/src/player/ChunkSelector.php
+++ b/src/player/ChunkSelector.php
@@ -30,7 +30,7 @@ use const M_SQRT2;
 final class ChunkSelector{
 
 	/**
-	 * @preturn \Generator|int[]
+	 * @return \Generator|int[]
 	 * @phpstan-return \Generator<int, int, void, void>
 	 */
 	public function selectChunks(int $radius, int $centerX, int $centerZ) : \Generator{
@@ -54,23 +54,23 @@ final class ChunkSelector{
 					//If the chunk is in the radius, others at the same offsets in different quadrants are also guaranteed to be.
 
 					/* Top right quadrant */
-					yield World::chunkHash($centerX + $x, $centerZ + $z);
+					yield $subRadius => World::chunkHash($centerX + $x, $centerZ + $z);
 					/* Top left quadrant */
-					yield World::chunkHash($centerX - $x - 1, $centerZ + $z);
+					yield $subRadius => World::chunkHash($centerX - $x - 1, $centerZ + $z);
 					/* Bottom right quadrant */
-					yield World::chunkHash($centerX + $x, $centerZ - $z - 1);
+					yield $subRadius => World::chunkHash($centerX + $x, $centerZ - $z - 1);
 					/* Bottom left quadrant */
-					yield World::chunkHash($centerX - $x - 1, $centerZ - $z - 1);
+					yield $subRadius => World::chunkHash($centerX - $x - 1, $centerZ - $z - 1);
 
 					if($x !== $z){
 						/* Top right quadrant mirror */
-						yield World::chunkHash($centerX + $z, $centerZ + $x);
+						yield $subRadius => World::chunkHash($centerX + $z, $centerZ + $x);
 						/* Top left quadrant mirror */
-						yield World::chunkHash($centerX - $z - 1, $centerZ + $x);
+						yield $subRadius => World::chunkHash($centerX - $z - 1, $centerZ + $x);
 						/* Bottom right quadrant mirror */
-						yield World::chunkHash($centerX + $z, $centerZ - $x - 1);
+						yield $subRadius => World::chunkHash($centerX + $z, $centerZ - $x - 1);
 						/* Bottom left quadrant mirror */
-						yield World::chunkHash($centerX - $z - 1, $centerZ - $x - 1);
+						yield $subRadius => World::chunkHash($centerX - $z - 1, $centerZ - $x - 1);
 					}
 				}
 			}
diff --git a/src/player/GameMode.php b/src/player/GameMode.php
index f41067921a..0021a57440 100644
--- a/src/player/GameMode.php
+++ b/src/player/GameMode.php
@@ -26,76 +26,80 @@ namespace pocketmine\player;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\lang\Translatable;
 use pocketmine\permission\DefaultPermissionNames;
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 use function mb_strtolower;
+use function spl_object_id;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static GameMode ADVENTURE()
  * @method static GameMode CREATIVE()
  * @method static GameMode SPECTATOR()
  * @method static GameMode SURVIVAL()
+ *
+ * @phpstan-type TMetadata array{0: string, 1: Translatable, 2: string, 3: list<string>}
  */
-final class GameMode{
-	use EnumTrait {
-		__construct as Enum___construct;
-		register as Enum_register;
-	}
+enum GameMode{
+	use LegacyEnumShimTrait;
 
-	/** @var self[] */
-	protected static $aliasMap = [];
-
-	protected static function setup() : void{
-		self::registerAll(
-			new self("survival", "Survival", KnownTranslationFactory::gameMode_survival(), DefaultPermissionNames::GROUP_GAMEMODE_SURVIVAL, ["survival", "s", "0"]),
-			new self("creative", "Creative", KnownTranslationFactory::gameMode_creative(), DefaultPermissionNames::GROUP_GAMEMODE_CREATIVE, ["creative", "c", "1"]),
-			new self("adventure", "Adventure", KnownTranslationFactory::gameMode_adventure(), DefaultPermissionNames::GROUP_GAMEMODE_ADVENTURE, ["adventure", "a", "2"]),
-			new self("spectator", "Spectator", KnownTranslationFactory::gameMode_spectator(), DefaultPermissionNames::GROUP_GAMEMODE_SPECTATOR, ["spectator", "v", "view", "3"])
-		);
-	}
-
-	protected static function register(self $member) : void{
-		self::Enum_register($member);
-		foreach($member->getAliases() as $alias){
-			self::$aliasMap[mb_strtolower($alias)] = $member;
-		}
-	}
+	case SURVIVAL;
+	case CREATIVE;
+	case ADVENTURE;
+	case SPECTATOR;
 
 	public static function fromString(string $str) : ?self{
-		self::checkInit();
-		return self::$aliasMap[mb_strtolower($str)] ?? null;
+		/**
+		 * @var self[]|null $aliasMap
+		 * @phpstan-var array<string, self>|null $aliasMap
+		 */
+		static $aliasMap = null;
+
+		if($aliasMap === null){
+			$aliasMap = [];
+			foreach(self::cases() as $case){
+				foreach($case->getAliases() as $alias){
+					$aliasMap[$alias] = $case;
+				}
+			}
+		}
+
+		return $aliasMap[mb_strtolower($str)] ?? null;
 	}
 
 	/**
-	 * @param string[] $aliases
+	 * @phpstan-return TMetadata
 	 */
-	private function __construct(
-		string $enumName,
-		private string $englishName,
-		private Translatable $translatableName,
-		private string $permissionGroupName,
-		private array $aliases = []
-	){
-		$this->Enum___construct($enumName);
+	private function getMetadata() : array{
+		/** @phpstan-var array<int, TMetadata> $cache */
+		static $cache = [];
+
+		return $cache[spl_object_id($this)] ??= match($this){
+			self::SURVIVAL => ["Survival", KnownTranslationFactory::gameMode_survival(), DefaultPermissionNames::GROUP_GAMEMODE_SURVIVAL, ["survival", "s", "0"]],
+			self::CREATIVE => ["Creative", KnownTranslationFactory::gameMode_creative(), DefaultPermissionNames::GROUP_GAMEMODE_CREATIVE, ["creative", "c", "1"]],
+			self::ADVENTURE => ["Adventure", KnownTranslationFactory::gameMode_adventure(), DefaultPermissionNames::GROUP_GAMEMODE_ADVENTURE, ["adventure", "a", "2"]],
+			self::SPECTATOR => ["Spectator", KnownTranslationFactory::gameMode_spectator(), DefaultPermissionNames::GROUP_GAMEMODE_SPECTATOR, ["spectator", "v", "view", "3"]]
+		};
 	}
 
 	public function getEnglishName() : string{
-		return $this->englishName;
+		return $this->getMetadata()[0];
 	}
 
-	public function getTranslatableName() : Translatable{ return $this->translatableName; }
+	public function getTranslatableName() : Translatable{
+		return $this->getMetadata()[1];
+	}
 
-	public function getPermissionGroupName() : string{ return $this->permissionGroupName; }
+	public function getPermissionGroupName() : string{
+    return $this->getMetadata()[2];
+  }
 
 	/**
 	 * @return string[]
 	 */
 	public function getAliases() : array{
-		return $this->aliases;
+		return $this->getMetadata()[3];
 	}
 
 	//TODO: ability sets per gamemode
diff --git a/src/player/Player.php b/src/player/Player.php
index 3b899cb8fd..23150bb046 100644
--- a/src/player/Player.php
+++ b/src/player/Player.php
@@ -23,8 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\player;
 
+use pocketmine\block\BaseSign;
 use pocketmine\block\Bed;
-use pocketmine\block\BlockLegacyIds;
+use pocketmine\block\BlockTypeTags;
 use pocketmine\block\UnknownBlock;
 use pocketmine\block\VanillaBlocks;
 use pocketmine\command\CommandSender;
@@ -51,11 +52,12 @@ use pocketmine\event\player\PlayerBedLeaveEvent;
 use pocketmine\event\player\PlayerBlockPickEvent;
 use pocketmine\event\player\PlayerChangeSkinEvent;
 use pocketmine\event\player\PlayerChatEvent;
-use pocketmine\event\player\PlayerCommandPreprocessEvent;
 use pocketmine\event\player\PlayerDeathEvent;
 use pocketmine\event\player\PlayerDisplayNameChangeEvent;
+use pocketmine\event\player\PlayerDropItemEvent;
 use pocketmine\event\player\PlayerEmoteEvent;
 use pocketmine\event\player\PlayerEntityInteractEvent;
+use pocketmine\event\player\PlayerEntityPickEvent;
 use pocketmine\event\player\PlayerExhaustEvent;
 use pocketmine\event\player\PlayerGameModeChangeEvent;
 use pocketmine\event\player\PlayerInteractEvent;
@@ -65,6 +67,7 @@ use pocketmine\event\player\PlayerItemUseEvent;
 use pocketmine\event\player\PlayerJoinEvent;
 use pocketmine\event\player\PlayerJumpEvent;
 use pocketmine\event\player\PlayerKickEvent;
+use pocketmine\event\player\PlayerMissSwingEvent;
 use pocketmine\event\player\PlayerMoveEvent;
 use pocketmine\event\player\PlayerPostChunkSendEvent;
 use pocketmine\event\player\PlayerQuitEvent;
@@ -79,6 +82,7 @@ use pocketmine\event\player\PlayerViewDistanceChangeEvent;
 use pocketmine\form\Form;
 use pocketmine\form\FormValidationException;
 use pocketmine\inventory\CallbackInventoryListener;
+use pocketmine\inventory\CreativeInventory;
 use pocketmine\inventory\Inventory;
 use pocketmine\inventory\PlayerCraftingInventory;
 use pocketmine\inventory\PlayerCursorInventory;
@@ -96,7 +100,6 @@ use pocketmine\item\Item;
 use pocketmine\item\ItemUseResult;
 use pocketmine\item\Releasable;
 use pocketmine\lang\KnownTranslationFactory;
-use pocketmine\lang\KnownTranslationKeys;
 use pocketmine\lang\Language;
 use pocketmine\lang\Translatable;
 use pocketmine\math\Vector3;
@@ -115,12 +118,16 @@ use pocketmine\permission\DefaultPermissionNames;
 use pocketmine\permission\DefaultPermissions;
 use pocketmine\permission\PermissibleBase;
 use pocketmine\permission\PermissibleDelegateTrait;
+use pocketmine\player\chat\StandardChatFormatter;
 use pocketmine\Server;
+use pocketmine\ServerProperties;
 use pocketmine\timings\Timings;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\TextFormat;
 use pocketmine\world\ChunkListener;
 use pocketmine\world\ChunkListenerNoOpTrait;
+use pocketmine\world\ChunkLoader;
+use pocketmine\world\ChunkTicker;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\Position;
 use pocketmine\world\sound\EntityAttackNoDamageSound;
@@ -129,9 +136,11 @@ use pocketmine\world\sound\FireExtinguishSound;
 use pocketmine\world\sound\ItemBreakSound;
 use pocketmine\world\sound\Sound;
 use pocketmine\world\World;
+use pocketmine\YmlServerProperties;
 use Ramsey\Uuid\UuidInterface;
 use function abs;
 use function array_filter;
+use function array_shift;
 use function assert;
 use function count;
 use function explode;
@@ -213,6 +222,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	protected array $permanentWindows = [];
 	protected PlayerCursorInventory $cursorInventory;
 	protected PlayerCraftingInventory $craftingGrid;
+	protected CreativeInventory $creativeInventory;
 
 	protected int $messageCounter = 2;
 
@@ -237,12 +247,16 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	protected array $loadQueue = [];
 	protected int $nextChunkOrderRun = 5;
 
+	/** @var true[] */
+	private array $tickingChunks = [];
+
 	protected int $viewDistance = -1;
 	protected int $spawnThreshold;
 	protected int $spawnChunkLoadCount = 0;
 	protected int $chunksPerTick;
 	protected ChunkSelector $chunkSelector;
-	protected PlayerChunkLoader $chunkLoader;
+	protected ChunkLoader $chunkLoader;
+	protected ChunkTicker $chunkTicker;
 
 	/** @var bool[] map: raw UUID (string) => bool */
 	protected array $hiddenPlayers = [];
@@ -251,8 +265,8 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	protected ?float $lastMovementProcess = null;
 
 	protected int $inAirTicks = 0;
-	/** @var float */
-	protected $stepHeight = 0.6;
+
+	protected float $stepHeight = 0.6;
 
 	protected ?Vector3 $sleeping = null;
 	private ?Position $spawnPosition = null;
@@ -269,7 +283,11 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	protected string $locale = "en_US";
 
 	protected int $startAction = -1;
-	/** @var int[] ID => ticks map */
+
+	/**
+	 * @phpstan-var array<int|string, int>
+	 * @var int[] stateId|cooldownTag => ticks map
+	 */
 	protected array $usedItemsCooldown = [];
 
 	private int $lastEmoteTick = 0;
@@ -298,24 +316,26 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		$this->uuid = $this->playerInfo->getUuid();
 		$this->xuid = $this->playerInfo instanceof XboxLivePlayerInfo ? $this->playerInfo->getXuid() : "";
 
+		$this->creativeInventory = CreativeInventory::getInstance();
+
 		$rootPermissions = [DefaultPermissions::ROOT_USER => true];
 		if($this->server->isOp($this->username)){
 			$rootPermissions[DefaultPermissions::ROOT_OPERATOR] = true;
 		}
 		$this->perm = new PermissibleBase($rootPermissions);
-		$this->chunksPerTick = $this->server->getConfigGroup()->getPropertyInt("chunk-sending.per-tick", 4);
-		$this->spawnThreshold = (int) (($this->server->getConfigGroup()->getPropertyInt("chunk-sending.spawn-radius", 4) ** 2) * M_PI);
+		$this->chunksPerTick = $this->server->getConfigGroup()->getPropertyInt(YmlServerProperties::CHUNK_SENDING_PER_TICK, 4);
+		$this->spawnThreshold = (int) (($this->server->getConfigGroup()->getPropertyInt(YmlServerProperties::CHUNK_SENDING_SPAWN_RADIUS, 4) ** 2) * M_PI);
 		$this->chunkSelector = new ChunkSelector();
 
-		$this->chunkLoader = new PlayerChunkLoader($spawnLocation);
-
+		$this->chunkLoader = new class implements ChunkLoader{};
+		$this->chunkTicker = new ChunkTicker();
 		$world = $spawnLocation->getWorld();
 		//load the spawn chunk so we can see the terrain
 		$xSpawnChunk = $spawnLocation->getFloorX() >> Chunk::COORD_BIT_SIZE;
 		$zSpawnChunk = $spawnLocation->getFloorZ() >> Chunk::COORD_BIT_SIZE;
 		$world->registerChunkLoader($this->chunkLoader, $xSpawnChunk, $zSpawnChunk, true);
 		$world->registerChunkListener($this, $xSpawnChunk, $zSpawnChunk);
-		$this->usedChunks[World::chunkHash($xSpawnChunk, $zSpawnChunk)] = UsedChunkStatus::NEEDED();
+		$this->usedChunks[World::chunkHash($xSpawnChunk, $zSpawnChunk)] = UsedChunkStatus::NEEDED;
 
 		parent::__construct($spawnLocation, $this->playerInfo->getSkin(), $namedtag);
 	}
@@ -356,7 +376,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		$this->lastPlayed = $nbt->getLong(self::TAG_LAST_PLAYED, $now);
 
 		if(!$this->server->getForceGamemode() && ($gameModeTag = $nbt->getTag(self::TAG_GAME_MODE)) instanceof IntTag){
-			$this->internalSetGameMode(GameModeIdMap::getInstance()->fromId($gameModeTag->getValue()) ?? GameMode::SURVIVAL()); //TODO: bad hack here to avoid crashes on corrupted data
+			$this->internalSetGameMode(GameModeIdMap::getInstance()->fromId($gameModeTag->getValue()) ?? GameMode::SURVIVAL); //TODO: bad hack here to avoid crashes on corrupted data
 		}else{
 			$this->internalSetGameMode($this->server->getGamemode());
 		}
@@ -573,7 +593,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 
 		$this->viewDistance = $newViewDistance;
 
-		$this->spawnThreshold = (int) (min($this->viewDistance, $this->server->getConfigGroup()->getPropertyInt("chunk-sending.spawn-radius", 4)) ** 2 * M_PI);
+		$this->spawnThreshold = (int) (min($this->viewDistance, $this->server->getConfigGroup()->getPropertyInt(YmlServerProperties::CHUNK_SENDING_SPAWN_RADIUS, 4)) ** 2 * M_PI);
 
 		$this->nextChunkOrderRun = 0;
 
@@ -618,6 +638,10 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		$this->displayName = $ev->getNewName();
 	}
 
+	public function canBeRenamed() : bool{
+		return false;
+	}
+
 	/**
 	 * Returns the player's locale, e.g. en_US.
 	 */
@@ -681,7 +705,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	 */
 	public function getItemCooldownExpiry(Item $item) : int{
 		$this->checkItemCooldowns();
-		return $this->usedItemsCooldown[$item->getId()] ?? 0;
+		return $this->usedItemsCooldown[$item->getCooldownTag() ?? $item->getStateId()] ?? 0;
 	}
 
 	/**
@@ -689,7 +713,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	 */
 	public function hasItemCooldown(Item $item) : bool{
 		$this->checkItemCooldowns();
-		return isset($this->usedItemsCooldown[$item->getId()]);
+		return isset($this->usedItemsCooldown[$item->getCooldownTag() ?? $item->getStateId()]);
 	}
 
 	/**
@@ -698,7 +722,8 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	public function resetItemCooldown(Item $item, ?int $ticks = null) : void{
 		$ticks = $ticks ?? $item->getCooldownTicks();
 		if($ticks > 0){
-			$this->usedItemsCooldown[$item->getId()] = $this->server->getTick() + $ticks;
+			$this->usedItemsCooldown[$item->getCooldownTag() ?? $item->getStateId()] = $this->server->getTick() + $ticks;
+			$this->getNetworkSession()->onItemCooldownChanged($item, $ticks);
 		}
 	}
 
@@ -750,11 +775,13 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		$world->unregisterChunkLoader($this->chunkLoader, $x, $z);
 		$world->unregisterChunkListener($this, $x, $z);
 		unset($this->loadQueue[$index]);
+		$world->unregisterTickingChunk($this->chunkTicker, $x, $z);
+		unset($this->tickingChunks[$index]);
 	}
 
 	protected function spawnEntitiesOnAllChunks() : void{
 		foreach($this->usedChunks as $chunkHash => $status){
-			if($status->equals(UsedChunkStatus::SENT())){
+			if($status === UsedChunkStatus::SENT){
 				World::getXZ($chunkHash, $chunkX, $chunkZ);
 				$this->spawnEntitiesOnChunk($chunkX, $chunkZ);
 			}
@@ -796,28 +823,31 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 
 			++$count;
 
-			$this->usedChunks[$index] = UsedChunkStatus::REQUESTED_GENERATION();
+			$this->usedChunks[$index] = UsedChunkStatus::REQUESTED_GENERATION;
 			$this->activeChunkGenerationRequests[$index] = true;
 			unset($this->loadQueue[$index]);
-			$this->getWorld()->registerChunkLoader($this->chunkLoader, $X, $Z, true);
-			$this->getWorld()->registerChunkListener($this, $X, $Z);
+			$world->registerChunkLoader($this->chunkLoader, $X, $Z, true);
+			$world->registerChunkListener($this, $X, $Z);
+			if(isset($this->tickingChunks[$index])){
+				$world->registerTickingChunk($this->chunkTicker, $X, $Z);
+			}
 
-			$this->getWorld()->requestChunkPopulation($X, $Z, $this->chunkLoader)->onCompletion(
+			$world->requestChunkPopulation($X, $Z, $this->chunkLoader)->onCompletion(
 				function() use ($X, $Z, $index, $world) : void{
 					if(!$this->isConnected() || !isset($this->usedChunks[$index]) || $world !== $this->getWorld()){
 						return;
 					}
-					if(!$this->usedChunks[$index]->equals(UsedChunkStatus::REQUESTED_GENERATION())){
+					if($this->usedChunks[$index] !== UsedChunkStatus::REQUESTED_GENERATION){
 						//We may have previously requested this, decided we didn't want it, and then decided we did want
 						//it again, all before the generation request got executed. In that case, the promise would have
 						//multiple callbacks for this player. In that case, only the first one matters.
 						return;
 					}
 					unset($this->activeChunkGenerationRequests[$index]);
-					$this->usedChunks[$index] = UsedChunkStatus::REQUESTED_SENDING();
+					$this->usedChunks[$index] = UsedChunkStatus::REQUESTED_SENDING;
 
 					$this->getNetworkSession()->startUsingChunk($X, $Z, function() use ($X, $Z, $index) : void{
-						$this->usedChunks[$index] = UsedChunkStatus::SENT();
+						$this->usedChunks[$index] = UsedChunkStatus::SENT;
 						if($this->spawnChunkLoadCount === -1){
 							$this->spawnEntitiesOnChunk($X, $Z);
 						}elseif($this->spawnChunkLoadCount++ === $this->spawnThreshold){
@@ -886,6 +916,31 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		}
 	}
 
+	/**
+	 * @param true[] $oldTickingChunks
+	 * @param true[] $newTickingChunks
+	 *
+	 * @phpstan-param array<int, true> $oldTickingChunks
+	 * @phpstan-param array<int, true> $newTickingChunks
+	 */
+	private function updateTickingChunkRegistrations(array $oldTickingChunks, array $newTickingChunks) : void{
+		$world = $this->getWorld();
+		foreach($oldTickingChunks as $hash => $_){
+			if(!isset($newTickingChunks[$hash]) && !isset($this->loadQueue[$hash])){
+				//we are (probably) still using this chunk, but it's no longer within ticking range
+				World::getXZ($hash, $tickingChunkX, $tickingChunkZ);
+				$world->unregisterTickingChunk($this->chunkTicker, $tickingChunkX, $tickingChunkZ);
+			}
+		}
+		foreach($newTickingChunks as $hash => $_){
+			if(!isset($oldTickingChunks[$hash]) && !isset($this->loadQueue[$hash])){
+				//we were already using this chunk, but it is now within ticking range
+				World::getXZ($hash, $tickingChunkX, $tickingChunkZ);
+				$world->registerTickingChunk($this->chunkTicker, $tickingChunkX, $tickingChunkZ);
+			}
+		}
+	}
+
 	/**
 	 * Calculates which new chunks this player needs to use, and which currently-used chunks it needs to stop using.
 	 * This is based on factors including the player's current render radius and current position.
@@ -898,16 +953,23 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		Timings::$playerChunkOrder->startTiming();
 
 		$newOrder = [];
+		$tickingChunks = [];
 		$unloadChunks = $this->usedChunks;
 
+		$world = $this->getWorld();
+		$tickingChunkRadius = $world->getChunkTickRadius();
+
 		foreach($this->chunkSelector->selectChunks(
 			$this->server->getAllowedViewDistance($this->viewDistance),
 			$this->location->getFloorX() >> Chunk::COORD_BIT_SIZE,
 			$this->location->getFloorZ() >> Chunk::COORD_BIT_SIZE
-		) as $hash){
-			if(!isset($this->usedChunks[$hash]) || $this->usedChunks[$hash]->equals(UsedChunkStatus::NEEDED())){
+		) as $radius => $hash){
+			if(!isset($this->usedChunks[$hash]) || $this->usedChunks[$hash] === UsedChunkStatus::NEEDED){
 				$newOrder[$hash] = true;
 			}
+			if($radius < $tickingChunkRadius){
+				$tickingChunks[$hash] = true;
+			}
 			unset($unloadChunks[$hash]);
 		}
 
@@ -917,8 +979,11 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		}
 
 		$this->loadQueue = $newOrder;
+
+		$this->updateTickingChunkRegistrations($this->tickingChunks, $tickingChunks);
+		$this->tickingChunks = $tickingChunks;
+
 		if(count($this->loadQueue) > 0 || count($unloadChunks) > 0){
-			$this->chunkLoader->setCurrentLocation($this->location);
 			$this->getNetworkSession()->syncViewAreaCenterPoint($this->location, $this->viewDistance);
 		}
 
@@ -953,7 +1018,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	 */
 	public function hasReceivedChunk(int $chunkX, int $chunkZ) : bool{
 		$status = $this->usedChunks[World::chunkHash($chunkX, $chunkZ)] ?? null;
-		return $status !== null && $status->equals(UsedChunkStatus::SENT());
+		return $status === UsedChunkStatus::SENT;
 	}
 
 	/**
@@ -1065,7 +1130,6 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		$this->gamemode = $gameMode;
 
 		$this->setBasePermission($this->gamemode->getPermissionGroupName(), true);
-
 		$this->hungerManager->setEnabled($this->isSurvival());
 
 		if($this->isSpectator()){
@@ -1088,10 +1152,10 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	}
 
 	/**
-	 * Sets the gamemode, and if needed, kicks the Player.
+	 * Sets the provided gamemode.
 	 */
 	public function setGamemode(GameMode $gm) : bool{
-		if($this->gamemode->equals($gm)){
+		if($this->gamemode === $gm){
 			return false;
 		}
 
@@ -1120,7 +1184,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	 * @param bool $literal whether a literal check should be performed
 	 */
 	public function isSurvival(bool $literal = false) : bool{
-		return $this->gamemode->equals(GameMode::SURVIVAL()) || (!$literal && $this->gamemode->equals(GameMode::ADVENTURE()));
+		return $this->gamemode === GameMode::SURVIVAL || (!$literal && $this->gamemode === GameMode::ADVENTURE);
 	}
 
 	/**
@@ -1130,7 +1194,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	 * @param bool $literal whether a literal check should be performed
 	 */
 	public function isCreative(bool $literal = false) : bool{
-		return $this->gamemode->equals(GameMode::CREATIVE()) || (!$literal && $this->gamemode->equals(GameMode::SPECTATOR()));
+		return $this->gamemode === GameMode::CREATIVE || (!$literal && $this->gamemode === GameMode::SPECTATOR);
 	}
 
 	/**
@@ -1140,21 +1204,17 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	 * @param bool $literal whether a literal check should be performed
 	 */
 	public function isAdventure(bool $literal = false) : bool{
-		return $this->gamemode->equals(GameMode::ADVENTURE()) || (!$literal && $this->gamemode->equals(GameMode::SPECTATOR()));
+		return $this->gamemode === GameMode::ADVENTURE || (!$literal && $this->gamemode === GameMode::SPECTATOR);
 	}
 
 	public function isSpectator() : bool{
-		return $this->gamemode->equals(GameMode::SPECTATOR());
+		return $this->gamemode === GameMode::SPECTATOR;
 	}
 
 	public function hasFiniteResources() : bool{
 		return !$this->hasPermission(DefaultPermissionNames::GAME_ITEM_CREATE);
 	}
 
-	public function isFireProof() : bool{
-		return $this->isCreative();
-	}
-
 	public function getDrops() : array{
 		if($this->hasFiniteResources()){
 			return parent::getDrops();
@@ -1172,7 +1232,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	}
 
 	protected function checkGroundState(float $wantedX, float $wantedY, float $wantedZ, float $dx, float $dy, float $dz) : void{
-		if($this->isSpectator()){
+		if($this->gamemode === GameMode::SPECTATOR){
 			$this->onGround = false;
 		}else{
 			$bb = clone $this->boundingBox;
@@ -1216,6 +1276,15 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	 * @param Vector3 $newPos Coordinates of the player's feet, centered horizontally at the base of their bounding box.
 	 */
 	public function handleMovement(Vector3 $newPos) : void{
+		Timings::$playerMove->startTiming();
+		try{
+			$this->actuallyHandleMovement($newPos);
+		}finally{
+			Timings::$playerMove->stopTiming();
+		}
+	}
+
+	private function actuallyHandleMovement(Vector3 $newPos) : void{
 		$this->moveRateLimit--;
 		if($this->moveRateLimit < 0){
 			return;
@@ -1226,7 +1295,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 
 		$revert = false;
 
-		if($distanceSquared > 100){
+		if($distanceSquared > 225){ //15 blocks
 			//TODO: this is probably too big if we process every movement
 			/* !!! BEWARE YE WHO ENTER HERE !!!
 			 *
@@ -1238,7 +1307,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 			 * If you must tamper with this code, be aware that this can cause very nasty results. Do not waste our time
 			 * asking for help if you suffer the consequences of messing with this.
 			 */
-			$this->logger->debug("Moved too fast, reverting movement");
+			$this->logger->debug("Moved too fast (" . sqrt($distanceSquared) . " blocks in 1 movement), reverting movement");
 			$this->logger->debug("Old position: " . $oldPos->asVector3() . ", new position: " . $newPos);
 			$revert = true;
 		}elseif(!$this->getWorld()->isInLoadedTerrain($newPos)){
@@ -1276,18 +1345,20 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		$deltaAngle = abs($this->lastLocation->yaw - $to->yaw) + abs($this->lastLocation->pitch - $to->pitch);
 
 		if($delta > 0.0001 || $deltaAngle > 1.0){
-			$ev = new PlayerMoveEvent($this, $from, $to);
+			if(PlayerMoveEvent::hasHandlers()){
+				$ev = new PlayerMoveEvent($this, $from, $to);
 
-			$ev->call();
+				$ev->call();
 
-			if($ev->isCancelled()){
-				$this->revertMovement($from);
-				return;
-			}
+				if($ev->isCancelled()){
+					$this->revertMovement($from);
+					return;
+				}
 
-			if($to->distanceSquared($ev->getTo()) > 0.01){ //If plugins modify the destination
-				$this->teleport($ev->getTo());
-				return;
+				if($to->distanceSquared($ev->getTo()) > 0.01){ //If plugins modify the destination
+					$this->teleport($ev->getTo());
+					return;
+				}
 			}
 
 			$this->lastLocation = $to;
@@ -1331,7 +1402,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	public function setMotion(Vector3 $motion) : bool{
 		if(parent::setMotion($motion)){
 			$this->broadcastMotion();
-			$this->getNetworkSession()->sendDataPacket(SetActorMotionPacket::create($this->id, $motion));
+			$this->getNetworkSession()->sendDataPacket(SetActorMotionPacket::create($this->id, $motion, tick: 0));
 
 			return true;
 		}
@@ -1369,18 +1440,24 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		$this->timings->startTiming();
 
 		if($this->spawned){
+			Timings::$playerMove->startTiming();
 			$this->processMostRecentMovements();
-			$this->motion = new Vector3(0, 0, 0); //TODO: HACK! (Fixes player knockback being messed up)
+			$this->motion = Vector3::zero(); //TODO: HACK! (Fixes player knockback being messed up)
 			if($this->onGround){
 				$this->inAirTicks = 0;
 			}else{
 				$this->inAirTicks += $tickDiff;
 			}
+			Timings::$playerMove->stopTiming();
 
 			Timings::$entityBaseTick->startTiming();
 			$this->entityBaseTick($tickDiff);
 			Timings::$entityBaseTick->stopTiming();
 
+			if($this->isCreative() && $this->fireTicks > 1){
+				$this->fireTicks = 1;
+			}
+
 			if(!$this->isSpectator() && $this->isAlive()){
 				Timings::$playerCheckNearEntities->startTiming();
 				$this->checkNearEntities();
@@ -1443,25 +1520,18 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 					$messagePart = substr($messagePart, 1);
 				}
 
-				$ev = new PlayerCommandPreprocessEvent($this, $messagePart);
-				$ev->call();
-
-				if($ev->isCancelled()){
-					break;
-				}
-
-				if(str_starts_with($ev->getMessage(), "/")){
+				if(str_starts_with($messagePart, "/")){
 					Timings::$playerCommand->startTiming();
-					$this->server->dispatchCommand($ev->getPlayer(), substr($ev->getMessage(), 1));
+					$this->server->dispatchCommand($this, substr($messagePart, 1));
 					Timings::$playerCommand->stopTiming();
 				}else{
-					$ev = new PlayerChatEvent($this, $ev->getMessage(), $this->server->getBroadcastChannelSubscribers(Server::BROADCAST_CHANNEL_USERS));
+					$ev = new PlayerChatEvent($this, $messagePart, $this->server->getBroadcastChannelSubscribers(Server::BROADCAST_CHANNEL_USERS), new StandardChatFormatter());
 					if(!$this->hasPermission(DefaultPermissionNames::GAME_CHAT)){
 						$ev->cancel();
 					}
 					$ev->call();
 					if(!$ev->isCancelled()){
-						$this->server->broadcastMessage($this->getServer()->getLanguage()->translateString($ev->getFormat(), [$ev->getPlayer()->getDisplayName(), $ev->getMessage()]), $ev->getRecipients());
+						$this->server->broadcastMessage($ev->getFormatter()->format($ev->getPlayer()->getDisplayName(), $ev->getMessage()), $ev->getRecipients());
 					}
 				}
 			}
@@ -1490,6 +1560,51 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		return true;
 	}
 
+	/**
+	 * @param Item[] $extraReturnedItems
+	 */
+	private function returnItemsFromAction(Item $oldHeldItem, Item $newHeldItem, array $extraReturnedItems) : void{
+		$heldItemChanged = false;
+
+		if(!$newHeldItem->equalsExact($oldHeldItem) && $oldHeldItem->equalsExact($this->inventory->getItemInHand())){
+			//determine if the item was changed in some meaningful way, or just damaged/changed count
+			//if it was really changed we always need to set it, whether we have finite resources or not
+			$newReplica = clone $oldHeldItem;
+			$newReplica->setCount($newHeldItem->getCount());
+			if($newReplica instanceof Durable && $newHeldItem instanceof Durable){
+				$newReplica->setDamage($newHeldItem->getDamage());
+			}
+			$damagedOrDeducted = $newReplica->equalsExact($newHeldItem);
+
+			if(!$damagedOrDeducted || $this->hasFiniteResources()){
+				if($newHeldItem instanceof Durable && $newHeldItem->isBroken()){
+					$this->broadcastSound(new ItemBreakSound());
+				}
+				$this->inventory->setItemInHand($newHeldItem);
+				$heldItemChanged = true;
+			}
+		}
+
+		if(!$heldItemChanged){
+			$newHeldItem = $oldHeldItem;
+		}
+
+		if($heldItemChanged && count($extraReturnedItems) > 0 && $newHeldItem->isNull()){
+			$this->inventory->setItemInHand(array_shift($extraReturnedItems));
+		}
+		foreach($this->inventory->addItem(...$extraReturnedItems) as $drop){
+			//TODO: we can't generate a transaction for this since the items aren't coming from an inventory :(
+			$ev = new PlayerDropItemEvent($this, $drop);
+			if($this->isSpectator()){
+				$ev->cancel();
+			}
+			$ev->call();
+			if(!$ev->isCancelled()){
+				$this->dropItem($drop);
+			}
+		}
+	}
+
 	/**
 	 * Activates the item in hand, for example throwing a projectile.
 	 *
@@ -1511,18 +1626,14 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 			return false;
 		}
 
-		$result = $item->onClickAir($this, $directionVector);
-		if($result->equals(ItemUseResult::FAIL())){
+		$returnedItems = [];
+		$result = $item->onClickAir($this, $directionVector, $returnedItems);
+		if($result === ItemUseResult::FAIL){
 			return false;
 		}
 
-		$this->resetItemCooldown($item);
-		if($this->hasFiniteResources() && !$item->equalsExact($oldItem) && $oldItem->equalsExact($this->inventory->getItemInHand())){
-			if($item instanceof Durable && $item->isBroken()){
-				$this->broadcastSound(new ItemBreakSound());
-			}
-			$this->inventory->setItemInHand($item);
-		}
+		$this->resetItemCooldown($oldItem);
+		$this->returnItemsFromAction($oldItem, $item, $returnedItems);
 
 		$this->setUsingItem($item instanceof Releasable && $item->canStartUsingItem($this));
 
@@ -1550,13 +1661,10 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 			}
 
 			$this->setUsingItem(false);
-			$this->resetItemCooldown($slot);
+			$this->resetItemCooldown($oldItem);
 
-			if($this->hasFiniteResources() && $oldItem->equalsExact($this->inventory->getItemInHand())){
-				$slot->pop();
-				$this->inventory->setItemInHand($slot);
-				$this->inventory->addItem($slot->getResidue());
-			}
+			$slot->pop();
+			$this->returnItemsFromAction($oldItem, $slot, [$slot->getResidue()]);
 
 			return true;
 		}
@@ -1578,15 +1686,11 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 
 			$oldItem = clone $item;
 
-			$result = $item->onReleaseUsing($this);
-			if($result->equals(ItemUseResult::SUCCESS())){
-				$this->resetItemCooldown($item);
-				if(!$item->equalsExact($oldItem) && $oldItem->equalsExact($this->inventory->getItemInHand())){
-					if($item instanceof Durable && $item->isBroken()){
-						$this->broadcastSound(new ItemBreakSound());
-					}
-					$this->inventory->setItemInHand($item);
-				}
+			$returnedItems = [];
+			$result = $item->onReleaseUsing($this, $returnedItems);
+			if($result === ItemUseResult::SUCCESS){
+				$this->resetItemCooldown($oldItem);
+				$this->returnItemsFromAction($oldItem, $item, $returnedItems);
 				return true;
 			}
 
@@ -1612,29 +1716,58 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		$ev->call();
 
 		if(!$ev->isCancelled()){
-			if($existingSlot !== -1){
-				if($existingSlot < $this->inventory->getHotbarSize()){
-					$this->inventory->setHeldItemIndex($existingSlot);
-				}else{
-					$this->inventory->swap($this->inventory->getHeldItemIndex(), $existingSlot);
-				}
-			}else{
-				$firstEmpty = $this->inventory->firstEmpty();
-				if($firstEmpty === -1){ //full inventory
-					$this->inventory->setItemInHand($item);
-				}elseif($firstEmpty < $this->inventory->getHotbarSize()){
-					$this->inventory->setItem($firstEmpty, $item);
-					$this->inventory->setHeldItemIndex($firstEmpty);
-				}else{
-					$this->inventory->swap($this->inventory->getHeldItemIndex(), $firstEmpty);
-					$this->inventory->setItemInHand($item);
-				}
-			}
+			$this->equipOrAddPickedItem($existingSlot, $item);
 		}
 
 		return true;
 	}
 
+	public function pickEntity(int $entityId) : bool{
+		$entity = $this->getWorld()->getEntity($entityId);
+		if($entity === null){
+			return true;
+		}
+
+		$item = $entity->getPickedItem();
+		if($item === null){
+			return true;
+		}
+
+		$ev = new PlayerEntityPickEvent($this, $entity, $item);
+		$existingSlot = $this->inventory->first($item);
+		if($existingSlot === -1 && $this->hasFiniteResources()){
+			$ev->cancel();
+		}
+		$ev->call();
+
+		if(!$ev->isCancelled()){
+			$this->equipOrAddPickedItem($existingSlot, $item);
+		}
+
+		return true;
+	}
+
+	private function equipOrAddPickedItem(int $existingSlot, Item $item) : void{
+		if($existingSlot !== -1){
+			if($existingSlot < $this->inventory->getHotbarSize()){
+				$this->inventory->setHeldItemIndex($existingSlot);
+			}else{
+				$this->inventory->swap($this->inventory->getHeldItemIndex(), $existingSlot);
+			}
+		}else{
+			$firstEmpty = $this->inventory->firstEmpty();
+			if($firstEmpty === -1){ //full inventory
+				$this->inventory->setItemInHand($item);
+			}elseif($firstEmpty < $this->inventory->getHotbarSize()){
+				$this->inventory->setItem($firstEmpty, $item);
+				$this->inventory->setHeldItemIndex($firstEmpty);
+			}else{
+				$this->inventory->swap($this->inventory->getHeldItemIndex(), $firstEmpty);
+				$this->inventory->setItemInHand($item);
+			}
+		}
+	}
+
 	/**
 	 * Performs a left-click (attack) action on the block.
 	 *
@@ -1661,13 +1794,13 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		}
 
 		$block = $target->getSide($face);
-		if($block->getId() === BlockLegacyIds::FIRE){
+		if($block->hasTypeTag(BlockTypeTags::FIRE)){
 			$this->getWorld()->setBlock($block->getPosition(), VanillaBlocks::AIR());
 			$this->getWorld()->addSound($block->getPosition()->add(0.5, 0.5, 0.5), new FireExtinguishSound());
 			return true;
 		}
 
-		if(!$this->isCreative() && !$block->getBreakInfo()->breaksInstantly()){
+		if(!$this->isCreative() && !$target->getBreakInfo()->breaksInstantly()){
 			$this->blockBreakHandler = new SurvivalBlockBreakHandler($this, $pos, $target, $face, 16);
 		}
 
@@ -1699,13 +1832,9 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 			$this->stopBreakBlock($pos);
 			$item = $this->inventory->getItemInHand();
 			$oldItem = clone $item;
-			if($this->getWorld()->useBreakOn($pos, $item, $this, true)){
-				if($this->hasFiniteResources() && !$item->equalsExact($oldItem) && $oldItem->equalsExact($this->inventory->getItemInHand())){
-					if($item instanceof Durable && $item->isBroken()){
-						$this->broadcastSound(new ItemBreakSound());
-					}
-					$this->inventory->setItemInHand($item);
-				}
+			$returnedItems = [];
+			if($this->getWorld()->useBreakOn($pos, $item, $this, true, $returnedItems)){
+				$this->returnItemsFromAction($oldItem, $item, $returnedItems);
 				$this->hungerManager->exhaust(0.005, PlayerExhaustEvent::CAUSE_MINING);
 				return true;
 			}
@@ -1728,13 +1857,9 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 			$this->broadcastAnimation(new ArmSwingAnimation($this), $this->getViewers());
 			$item = $this->inventory->getItemInHand(); //this is a copy of the real item
 			$oldItem = clone $item;
-			if($this->getWorld()->useItemOn($pos, $item, $face, $clickOffset, $this, true)){
-				if($this->hasFiniteResources() && !$item->equalsExact($oldItem) && $oldItem->equalsExact($this->inventory->getItemInHand())){
-					if($item instanceof Durable && $item->isBroken()){
-						$this->broadcastSound(new ItemBreakSound());
-					}
-					$this->inventory->setItemInHand($item);
-				}
+			$returnedItems = [];
+			if($this->getWorld()->useItemOn($pos, $item, $face, $clickOffset, $this, true, $returnedItems)){
+				$this->returnItemsFromAction($oldItem, $item, $returnedItems);
 				return true;
 			}
 		}else{
@@ -1769,7 +1894,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		}elseif(!$this->hasPermission($entity instanceof Player ? DefaultPermissionNames::GAME_PLAYER_ATTACK : DefaultPermissionNames::GAME_ENTITY_ATTACK)){
 			$this->logger->debug("Cancelled attack of entity " . $entity->getId() . " due to lack of attack permission");
 			$ev->cancel();
-		}elseif($entity instanceof Player && !$this->server->getConfigGroup()->getConfigBool("pvp")){
+		}elseif($entity instanceof Player && !$this->server->getConfigGroup()->getConfigBool(ServerProperties::PVP)){
 			$this->logger->debug("Cancelled attack of player " . $entity->getId() . " due to PvP being disabled globally");
 			$ev->cancel();
 		}
@@ -1813,12 +1938,9 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		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($entity) && $this->hasFiniteResources() && $oldItem->equalsExact($this->inventory->getItemInHand())){ //always fire the hook, even if we are survival
-				if($heldItem instanceof Durable && $heldItem->isBroken()){
-					$this->broadcastSound(new ItemBreakSound());
-				}
-				$this->inventory->setItemInHand($heldItem);
-			}
+			$returnedItems = [];
+			$heldItem->onAttackEntity($entity, $returnedItems);
+			$this->returnItemsFromAction($oldItem, $heldItem, $returnedItems);
 
 			$this->hungerManager->exhaust(0.1, PlayerExhaustEvent::CAUSE_ATTACK);
 		}
@@ -1826,6 +1948,19 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		return true;
 	}
 
+	/**
+	 * Performs actions associated with the attack action (left-click) without a target entity.
+	 * Under normal circumstances, this will just play the no-damage attack sound and the arm-swing animation.
+	 */
+	public function missSwing() : void{
+		$ev = new PlayerMissSwingEvent($this);
+		$ev->call();
+		if(!$ev->isCancelled()){
+			$this->broadcastSound(new EntityAttackNoDamageSound());
+			$this->broadcastAnimation(new ArmSwingAnimation($this), $this->getViewers());
+		}
+	}
+
 	/**
 	 * Interacts with the given entity using the currently-held item.
 	 */
@@ -2011,19 +2146,8 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		$this->getNetworkSession()->onChatMessage($message);
 	}
 
-	/**
-	 * @deprecated Use {@link Player::sendMessage()} with a Translatable instead.
-	 * @param string[]|Translatable[] $parameters
-	 */
-	public function sendTranslation(string $message, array $parameters = []) : void{
-		$this->sendMessage(new Translatable($message, $parameters));
-	}
-
-	/**
-	 * @param string[] $args
-	 */
-	public function sendJukeboxPopup(string $key, array $args) : void{
-		$this->getNetworkSession()->onJukeboxPopup($key, $args);
+	public function sendJukeboxPopup(Translatable|string $message) : void{
+		$this->getNetworkSession()->onJukeboxPopup($message);
 	}
 
 	/**
@@ -2058,10 +2182,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		}
 	}
 
-	/**
-	 * @param mixed $responseData
-	 */
-	public function onFormSubmit(int $formId, $responseData) : bool{
+	public function onFormSubmit(int $formId, mixed $responseData) : bool{
 		if(!isset($this->forms[$formId])){
 			$this->logger->debug("Got unexpected response for form $formId");
 			return false;
@@ -2079,17 +2200,24 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		return true;
 	}
 
+	/**
+	 * Closes the current viewing form and forms in queue.
+	 */
+	public function closeAllForms() : void{
+		$this->getNetworkSession()->onCloseAllForms();
+	}
+
 	/**
 	 * Transfers a player to another server.
 	 *
-	 * @param string $address The IP address or hostname of the destination server
-	 * @param int    $port    The destination port, defaults to 19132
-	 * @param string $message Message to show in the console when closing the player
+	 * @param string                   $address The IP address or hostname of the destination server
+	 * @param int                      $port    The destination port, defaults to 19132
+	 * @param Translatable|string|null $message Message to show in the console when closing the player, null will use the default message
 	 *
 	 * @return bool if transfer was successful.
 	 */
-	public function transfer(string $address, int $port = 19132, string $message = "transfer") : bool{
-		$ev = new PlayerTransferEvent($this, $address, $port, $message);
+	public function transfer(string $address, int $port = 19132, Translatable|string|null $message = null) : bool{
+		$ev = new PlayerTransferEvent($this, $address, $port, $message ?? KnownTranslationFactory::pocketmine_disconnect_transfer());
 		$ev->call();
 		if(!$ev->isCancelled()){
 			$this->getNetworkSession()->transfer($ev->getAddress(), $ev->getPort(), $ev->getMessage());
@@ -2101,16 +2229,24 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 
 	/**
 	 * Kicks a player from the server
+	 *
+	 * @param Translatable|string      $reason                  Shown in the server log - this should be a short one-line message
+	 * @param Translatable|string|null $quitMessage             Message to broadcast to online players (null will use default)
+	 * @param Translatable|string|null $disconnectScreenMessage Shown on the player's disconnection screen (null will use the reason)
 	 */
-	public function kick(string $reason = "", Translatable|string|null $quitMessage = null) : bool{
-		$ev = new PlayerKickEvent($this, $reason, $quitMessage ?? $this->getLeaveMessage());
+	public function kick(Translatable|string $reason = "", Translatable|string|null $quitMessage = null, Translatable|string|null $disconnectScreenMessage = null) : bool{
+		$ev = new PlayerKickEvent($this, $reason, $quitMessage ?? $this->getLeaveMessage(), $disconnectScreenMessage);
 		$ev->call();
 		if(!$ev->isCancelled()){
-			$reason = $ev->getReason();
+			$reason = $ev->getDisconnectReason();
 			if($reason === ""){
-				$reason = KnownTranslationKeys::DISCONNECTIONSCREEN_NOREASON;
+				$reason = KnownTranslationFactory::disconnectionScreen_noReason();
 			}
-			$this->disconnect($reason, $ev->getQuitMessage());
+			$disconnectScreenMessage = $ev->getDisconnectScreenMessage() ?? $reason;
+			if($disconnectScreenMessage === ""){
+				$disconnectScreenMessage = KnownTranslationFactory::disconnectionScreen_noReason();
+			}
+			$this->disconnect($reason, $ev->getQuitMessage(), $disconnectScreenMessage);
 
 			return true;
 		}
@@ -2127,15 +2263,16 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	 *
 	 * Note for internals developers: Do not call this from network sessions. It will cause a feedback loop.
 	 *
-	 * @param string                   $reason      Shown to the player, usually this will appear on their disconnect screen.
-	 * @param Translatable|string|null $quitMessage Message to broadcast to online players (null will use default)
+	 * @param Translatable|string      $reason                  Shown in the server log - this should be a short one-line message
+	 * @param Translatable|string|null $quitMessage             Message to broadcast to online players (null will use default)
+	 * @param Translatable|string|null $disconnectScreenMessage Shown on the player's disconnection screen (null will use the reason)
 	 */
-	public function disconnect(string $reason, Translatable|string|null $quitMessage = null) : void{
+	public function disconnect(Translatable|string $reason, Translatable|string|null $quitMessage = null, Translatable|string|null $disconnectScreenMessage = null) : void{
 		if(!$this->isConnected()){
 			return;
 		}
 
-		$this->getNetworkSession()->onPlayerDestroyed($reason);
+		$this->getNetworkSession()->onPlayerDestroyed($reason, $disconnectScreenMessage ?? $reason);
 		$this->onPostDisconnect($reason, $quitMessage);
 	}
 
@@ -2143,10 +2280,10 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 	 * @internal
 	 * This method executes post-disconnect actions and cleanups.
 	 *
-	 * @param string                   $reason      Shown to the player, usually this will appear on their disconnect screen.
+	 * @param Translatable|string      $reason      Shown in the server log - this should be a short one-line message
 	 * @param Translatable|string|null $quitMessage Message to broadcast to online players (null will use default)
 	 */
-	public function onPostDisconnect(string $reason, Translatable|string|null $quitMessage) : void{
+	public function onPostDisconnect(Translatable|string $reason, Translatable|string|null $quitMessage) : void{
 		if($this->isConnected()){
 			throw new \LogicException("Player is still connected");
 		}
@@ -2278,16 +2415,10 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 			}
 
 			$clearInventory = fn(Inventory $inventory) => $inventory->setContents(array_filter($inventory->getContents(), fn(Item $item) => $item->keepOnDeath()));
-			if($this->inventory !== null){
-				$this->inventory->setHeldItemIndex(0);
-				$clearInventory($this->inventory);
-			}
-			if($this->armorInventory !== null){
-				$clearInventory($this->armorInventory);
-			}
-			if($this->offHandInventory !== null){
-				$clearInventory($this->offHandInventory);
-			}
+			$this->inventory->setHeldItemIndex(0);
+			$clearInventory($this->inventory);
+			$clearInventory($this->armorInventory);
+			$clearInventory($this->offHandInventory);
 		}
 
 		if(!$ev->getKeepXp()){
@@ -2301,7 +2432,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 
 		$this->startDeathAnimation();
 
-		$this->getNetworkSession()->onServerDeath($ev->getDeathMessage());
+		$this->getNetworkSession()->onServerDeath($ev->getDeathScreenMessage());
 	}
 
 	protected function onDeathUpdate(int $tickDiff) : bool{
@@ -2311,7 +2442,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 
 	public function respawn() : void{
 		if($this->server->isHardcore()){
-			if($this->kick("You have been banned because you died in hardcore mode")){ //this allows plugins to prevent the ban by cancelling PlayerKickEvent
+			if($this->kick(KnownTranslationFactory::pocketmine_disconnect_ban(KnownTranslationFactory::pocketmine_disconnect_ban_hardcore()))){ //this allows plugins to prevent the ban by cancelling PlayerKickEvent
 				$this->server->getNameBans()->addBan($this->getName(), "Died in hardcore mode");
 			}
 			return;
@@ -2367,7 +2498,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 			},
 			function() : void{
 				if($this->isConnected()){
-					$this->disconnect("Unable to find a respawn position");
+					$this->getNetworkSession()->disconnectWithError(KnownTranslationFactory::pocketmine_disconnect_error_respawn());
 				}
 			}
 		);
@@ -2483,6 +2614,24 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		return $this->craftingGrid;
 	}
 
+	/**
+	 * Returns the creative inventory shown to the player.
+	 * Unless changed by a plugin, this is usually the same for all players.
+	 */
+	public function getCreativeInventory() : CreativeInventory{
+		return $this->creativeInventory;
+	}
+
+	/**
+	 * To set a custom creative inventory, you need to make a clone of a CreativeInventory instance.
+	 */
+	public function setCreativeInventory(CreativeInventory $inventory) : void{
+		$this->creativeInventory = $inventory;
+		if($this->spawned && $this->isConnected()){
+			$this->getNetworkSession()->getInvManager()?->syncCreative();
+		}
+	}
+
 	/**
 	 * @internal Called to clean up crafting grid and cursor inventory when it is detected that the player closed their
 	 * inventory.
@@ -2584,6 +2733,20 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		$this->permanentWindows = [];
 	}
 
+	/**
+	 * Opens the player's sign editor GUI for the sign at the given position.
+	 * TODO: add support for editing the rear side of the sign (not currently supported due to technical limitations)
+	 */
+	public function openSignEditor(Vector3 $position) : void{
+		$block = $this->getWorld()->getBlock($position);
+		if($block instanceof BaseSign){
+			$this->getWorld()->setBlock($position, $block->setEditorEntityRuntimeId($this->getId()));
+			$this->getNetworkSession()->onOpenSignEditor($position, true);
+		}else{
+			throw new \InvalidArgumentException("Block at this position is not a sign");
+		}
+	}
+
 	use ChunkListenerNoOpTrait {
 		onChunkChanged as private;
 		onChunkUnloaded as private;
@@ -2591,8 +2754,8 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 
 	public function onChunkChanged(int $chunkX, int $chunkZ, Chunk $chunk) : void{
 		$status = $this->usedChunks[$hash = World::chunkHash($chunkX, $chunkZ)] ?? null;
-		if($status !== null && $status->equals(UsedChunkStatus::SENT())){
-			$this->usedChunks[$hash] = UsedChunkStatus::NEEDED();
+		if($status === UsedChunkStatus::SENT){
+			$this->usedChunks[$hash] = UsedChunkStatus::NEEDED;
 			$this->nextChunkOrderRun = 0;
 		}
 	}
diff --git a/src/player/UsedChunkStatus.php b/src/player/UsedChunkStatus.php
index 69e249a24d..dda41fe7e7 100644
--- a/src/player/UsedChunkStatus.php
+++ b/src/player/UsedChunkStatus.php
@@ -23,28 +23,22 @@ declare(strict_types=1);
 
 namespace pocketmine\player;
 
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static UsedChunkStatus NEEDED()
  * @method static UsedChunkStatus REQUESTED_GENERATION()
  * @method static UsedChunkStatus REQUESTED_SENDING()
  * @method static UsedChunkStatus SENT()
  */
-final class UsedChunkStatus{
-	use EnumTrait;
+enum UsedChunkStatus{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("NEEDED"),
-			new self("REQUESTED_GENERATION"),
-			new self("REQUESTED_SENDING"),
-			new self("SENT")
-		);
-	}
+	case NEEDED;
+	case REQUESTED_GENERATION;
+	case REQUESTED_SENDING;
+	case SENT;
 }
diff --git a/src/player/chat/ChatFormatter.php b/src/player/chat/ChatFormatter.php
new file mode 100644
index 0000000000..5e85985ec6
--- /dev/null
+++ b/src/player/chat/ChatFormatter.php
@@ -0,0 +1,38 @@
+<?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\player\chat;
+
+use pocketmine\lang\Translatable;
+
+/**
+ * Formats chat messages for broadcasting. Used in PlayerChatEvent.
+ */
+interface ChatFormatter{
+	/**
+	 * Returns the formatted message to broadcast.
+	 * This can return a plain string (which will be used as-is) or a Translatable (which will be translated into
+	 * each recipient's language).
+	 */
+	public function format(string $username, string $message) : Translatable|string;
+}
diff --git a/src/player/chat/LegacyRawChatFormatter.php b/src/player/chat/LegacyRawChatFormatter.php
new file mode 100644
index 0000000000..1d77890de6
--- /dev/null
+++ b/src/player/chat/LegacyRawChatFormatter.php
@@ -0,0 +1,41 @@
+<?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\player\chat;
+
+use function str_replace;
+
+/**
+ * Legacy raw string chat formatter with the same behaviour as the old PlayerChatEvent::setFormat() API.
+ * The format string should contain the placeholders {%0} and {%1} for the username and message respectively.
+ */
+final class LegacyRawChatFormatter implements ChatFormatter{
+
+	public function __construct(
+		private string $format
+	){}
+
+	public function format(string $username, string $message) : string{
+		return str_replace(["{%0}", "{%1}"], [$username, $message], $this->format);
+	}
+}
diff --git a/src/player/chat/StandardChatFormatter.php b/src/player/chat/StandardChatFormatter.php
new file mode 100644
index 0000000000..e077b9b47d
--- /dev/null
+++ b/src/player/chat/StandardChatFormatter.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\player\chat;
+
+use pocketmine\lang\KnownTranslationFactory;
+use pocketmine\lang\Translatable;
+
+/**
+ * Standard chat formatter, formats messages in the default Minecraft way.
+ */
+final class StandardChatFormatter implements ChatFormatter{
+
+	public function format(string $username, string $message) : Translatable{
+		return KnownTranslationFactory::chat_type_text($username, $message);
+	}
+}
diff --git a/src/plugin/ApiVersion.php b/src/plugin/ApiVersion.php
index bcf7e59a04..d95b66576c 100644
--- a/src/plugin/ApiVersion.php
+++ b/src/plugin/ApiVersion.php
@@ -70,7 +70,6 @@ final class ApiVersion{
 	 * @return string[]
 	 */
 	public static function checkAmbiguousVersions(array $versions) : array{
-		/** @var VersionString[][] $indexedVersions */
 		$indexedVersions = [];
 
 		foreach($versions as $str){
@@ -85,9 +84,8 @@ final class ApiVersion{
 			}
 		}
 
-		/** @var VersionString[] $result */
 		$result = [];
-		foreach($indexedVersions as $major => $list){
+		foreach($indexedVersions as $list){
 			if(count($list) > 1){
 				array_push($result, ...$list);
 			}
diff --git a/src/plugin/PharPluginLoader.php b/src/plugin/PharPluginLoader.php
index b812f20c8a..a8dc04804a 100644
--- a/src/plugin/PharPluginLoader.php
+++ b/src/plugin/PharPluginLoader.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\plugin;
 
+use pocketmine\thread\ThreadSafeClassLoader;
 use function is_file;
 use function str_ends_with;
 
@@ -31,7 +32,7 @@ use function str_ends_with;
  */
 class PharPluginLoader implements PluginLoader{
 	public function __construct(
-		private \DynamicClassLoader $loader
+		private ThreadSafeClassLoader $loader
 	){}
 
 	public function canLoadPlugin(string $path) : bool{
diff --git a/src/plugin/PluginBase.php b/src/plugin/PluginBase.php
index c8f3e1c399..da2eae824d 100644
--- a/src/plugin/PluginBase.php
+++ b/src/plugin/PluginBase.php
@@ -30,19 +30,16 @@ use pocketmine\command\PluginCommand;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\scheduler\TaskScheduler;
 use pocketmine\Server;
-use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Config;
 use pocketmine\utils\Utils;
 use Symfony\Component\Filesystem\Path;
+use function copy;
 use function count;
 use function dirname;
-use function fclose;
 use function file_exists;
-use function fopen;
 use function mkdir;
 use function rtrim;
 use function str_contains;
-use function stream_copy_to_stream;
 use function strtolower;
 use function trim;
 use const DIRECTORY_SEPARATOR;
@@ -50,6 +47,8 @@ use const DIRECTORY_SEPARATOR;
 abstract class PluginBase implements Plugin, CommandExecutor{
 	private bool $isEnabled = false;
 
+	private string $resourceFolder;
+
 	private ?Config $config = null;
 	private string $configFile;
 
@@ -67,9 +66,11 @@ abstract class PluginBase implements Plugin, CommandExecutor{
 		$this->dataFolder = rtrim($dataFolder, "/" . DIRECTORY_SEPARATOR) . "/";
 		//TODO: this is accessed externally via reflection, not unused
 		$this->file = rtrim($file, "/" . DIRECTORY_SEPARATOR) . "/";
+		$this->resourceFolder = Path::join($this->file, "resources") . "/";
+
 		$this->configFile = Path::join($this->dataFolder, "config.yml");
 
-		$prefix = $this->getDescription()->getPrefix();
+		$prefix = $this->description->getPrefix();
 		$this->logger = new PluginLogger($server->getLogger(), $prefix !== "" ? $prefix : $this->getName());
 		$this->scheduler = new TaskScheduler($this->getFullName());
 
@@ -144,9 +145,9 @@ abstract class PluginBase implements Plugin, CommandExecutor{
 	private function registerYamlCommands() : void{
 		$pluginCmds = [];
 
-		foreach(Utils::stringifyKeys($this->getDescription()->getCommands()) as $key => $data){
+		foreach(Utils::stringifyKeys($this->description->getCommands()) as $key => $data){
 			if(str_contains($key, ":")){
-				$this->logger->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_commandError($key, $this->getDescription()->getFullName(), ":")));
+				$this->logger->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_commandError($key, $this->description->getFullName(), ":")));
 				continue;
 			}
 
@@ -162,7 +163,7 @@ abstract class PluginBase implements Plugin, CommandExecutor{
 			$aliasList = [];
 			foreach($data->getAliases() as $alias){
 				if(str_contains($alias, ":")){
-					$this->logger->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_aliasError($alias, $this->getDescription()->getFullName(), ":")));
+					$this->logger->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_aliasError($alias, $this->description->getFullName(), ":")));
 					continue;
 				}
 				$aliasList[] = $alias;
@@ -180,7 +181,7 @@ abstract class PluginBase implements Plugin, CommandExecutor{
 		}
 
 		if(count($pluginCmds) > 0){
-			$this->server->getCommandMap()->registerAll($this->getDescription()->getName(), $pluginCmds);
+			$this->server->getCommandMap()->registerAll($this->description->getName(), $pluginCmds);
 		}
 	}
 
@@ -189,9 +190,9 @@ abstract class PluginBase implements Plugin, CommandExecutor{
 	 * @phpstan-return (Command&PluginOwned)|null
 	 */
 	public function getCommand(string $name){
-		$command = $this->getServer()->getPluginCommand($name);
+		$command = $this->server->getPluginCommand($name);
 		if($command === null || $command->getOwningPlugin() !== $this){
-			$command = $this->getServer()->getPluginCommand(strtolower($this->description->getName()) . ":" . $name);
+			$command = $this->server->getPluginCommand(strtolower($this->description->getName()) . ":" . $name);
 		}
 
 		if($command instanceof PluginOwned && $command->getOwningPlugin() === $this){
@@ -209,6 +210,27 @@ abstract class PluginBase implements Plugin, CommandExecutor{
 	}
 
 	/**
+	 * Returns the path to the folder where the plugin's embedded resource files are usually located.
+	 * Note: This is NOT the same as the data folder. The files in this folder should be considered read-only.
+	 */
+	public function getResourceFolder() : string{
+		return $this->resourceFolder;
+	}
+
+	/**
+	 * Returns the full path to a data file in the plugin's resources folder.
+	 * This path can be used with standard PHP functions like fopen() or file_get_contents().
+	 *
+	 * Note: Any path returned by this function should be considered READ-ONLY.
+	 */
+	public function getResourcePath(string $filename) : string{
+		return Path::join($this->getResourceFolder(), $filename);
+	}
+
+	/**
+	 * @deprecated Prefer using standard PHP functions with {@link PluginBase::getResourcePath()}, like
+	 * file_get_contents() or fopen().
+	 *
 	 * Gets an embedded resource on the plugin file.
 	 * WARNING: You must close the resource given using fclose()
 	 *
@@ -226,26 +248,21 @@ abstract class PluginBase implements Plugin, CommandExecutor{
 			return false;
 		}
 
-		if(($resource = $this->getResource($filename)) === null){
+		$source = Path::join($this->resourceFolder, $filename);
+		if(!file_exists($source)){
 			return false;
 		}
 
-		$out = Path::join($this->dataFolder, $filename);
-		if(!file_exists(dirname($out))){
-			mkdir(dirname($out), 0755, true);
-		}
-
-		if(file_exists($out) && !$replace){
+		$destination = Path::join($this->dataFolder, $filename);
+		if(file_exists($destination) && !$replace){
 			return false;
 		}
 
-		$fp = fopen($out, "wb");
-		if($fp === false) throw new AssumptionFailedError("fopen() should not fail with wb flags");
+		if(!file_exists(dirname($destination))){
+			mkdir(dirname($destination), 0755, true);
+		}
 
-		$ret = stream_copy_to_stream($resource, $fp) > 0;
-		fclose($fp);
-		fclose($resource);
-		return $ret;
+		return copy($source, $destination);
 	}
 
 	/**
diff --git a/src/plugin/PluginDescription.php b/src/plugin/PluginDescription.php
index 614fb4d081..35ae2ba329 100644
--- a/src/plugin/PluginDescription.php
+++ b/src/plugin/PluginDescription.php
@@ -26,6 +26,7 @@ namespace pocketmine\plugin;
 use pocketmine\permission\Permission;
 use pocketmine\permission\PermissionParser;
 use pocketmine\permission\PermissionParserException;
+use pocketmine\utils\Utils;
 use function array_map;
 use function array_values;
 use function get_debug_type;
@@ -111,7 +112,7 @@ class PluginDescription{
 	/**
 	 * @param string|mixed[] $yamlString
 	 */
-	public function __construct($yamlString){
+	public function __construct(array|string $yamlString){
 		if(is_string($yamlString)){
 			$map = yaml_parse($yamlString);
 			if($map === false){
@@ -151,7 +152,7 @@ class PluginDescription{
 		$this->compatibleOperatingSystems = array_map("\strval", (array) ($plugin[self::KEY_OS] ?? []));
 
 		if(isset($plugin[self::KEY_COMMANDS]) && is_array($plugin[self::KEY_COMMANDS])){
-			foreach($plugin[self::KEY_COMMANDS] as $commandName => $commandData){
+			foreach(Utils::promoteKeys($plugin[self::KEY_COMMANDS]) as $commandName => $commandData){
 				if(!is_string($commandName)){
 					throw new PluginDescriptionParseException("Invalid Plugin commands, key must be the name of the command");
 				}
@@ -177,7 +178,7 @@ class PluginDescription{
 		if(isset($plugin[self::KEY_EXTENSIONS])){
 			$extensions = (array) $plugin[self::KEY_EXTENSIONS];
 			$isLinear = $extensions === array_values($extensions);
-			foreach($extensions as $k => $v){
+			foreach(Utils::promoteKeys($extensions) as $k => $v){
 				if($isLinear){
 					$k = $v;
 					$v = "*";
@@ -203,7 +204,7 @@ class PluginDescription{
 			}
 			$this->order = $order;
 		}else{
-			$this->order = PluginEnableOrder::POSTWORLD();
+			$this->order = PluginEnableOrder::POSTWORLD;
 		}
 
 		$this->authors = [];
diff --git a/src/plugin/PluginEnableOrder.php b/src/plugin/PluginEnableOrder.php
index 5e6255a16e..c942ea33f9 100644
--- a/src/plugin/PluginEnableOrder.php
+++ b/src/plugin/PluginEnableOrder.php
@@ -23,63 +23,48 @@ declare(strict_types=1);
 
 namespace pocketmine\plugin;
 
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 use function mb_strtolower;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
  * @method static PluginEnableOrder POSTWORLD()
  * @method static PluginEnableOrder STARTUP()
  */
-final class PluginEnableOrder{
-	use EnumTrait {
-		__construct as Enum___construct;
-		register as Enum_register;
-	}
+enum PluginEnableOrder{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("startup", ["startup"]),
-			new self("postworld", ["postworld"])
-		);
-	}
-
-	/**
-	 * @var self[]
-	 * @phpstan-var array<string, self>
-	 */
-	private static array $aliasMap = [];
-
-	protected static function register(self $member) : void{
-		self::Enum_register($member);
-		foreach($member->getAliases() as $alias){
-			self::$aliasMap[mb_strtolower($alias)] = $member;
-		}
-	}
+	case STARTUP;
+	case POSTWORLD;
 
 	public static function fromString(string $name) : ?self{
-		self::checkInit();
-		return self::$aliasMap[mb_strtolower($name)] ?? null;
-	}
+		/**
+		 * @var self[]|null $aliasMap
+		 * @phpstan-var array<string, self>|null $aliasMap
+		 */
+		static $aliasMap = null;
 
-	/**
-	 * @param string[] $aliases
-	 * @phpstan-param list<string> $aliases
-	 */
-	private function __construct(
-		string $enumName,
-		private array $aliases
-	){
-		$this->Enum___construct($enumName);
+		if($aliasMap === null){
+			$aliasMap = [];
+			foreach(self::cases() as $case){
+				foreach($case->getAliases() as $alias){
+					$aliasMap[$alias] = $case;
+				}
+			}
+		}
+		return $aliasMap[mb_strtolower($name)] ?? null;
 	}
 
 	/**
 	 * @return string[]
 	 * @phpstan-return list<string>
 	 */
-	public function getAliases() : array{ return $this->aliases; }
+	public function getAliases() : array{
+		return match($this){
+			self::STARTUP => ["startup"],
+			self::POSTWORLD => ["postworld"]
+		};
+	}
 }
diff --git a/src/plugin/PluginGraylist.php b/src/plugin/PluginGraylist.php
index 84aa3f7924..ff9d718322 100644
--- a/src/plugin/PluginGraylist.php
+++ b/src/plugin/PluginGraylist.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\plugin;
 
+use pocketmine\utils\Utils;
 use function array_flip;
 use function is_array;
 use function is_float;
@@ -77,7 +78,7 @@ class PluginGraylist{
 			if(!is_array($array["plugins"])){
 				throw new \InvalidArgumentException("\"plugins\" must be an array");
 			}
-			foreach($array["plugins"] as $k => $v){
+			foreach(Utils::promoteKeys($array["plugins"]) as $k => $v){
 				if(!is_string($v) && !is_int($v) && !is_float($v)){
 					throw new \InvalidArgumentException("\"plugins\" contains invalid element at position $k");
 				}
diff --git a/src/plugin/PluginLoadTriage.php b/src/plugin/PluginLoadTriage.php
index 5da1d38274..77d1026684 100644
--- a/src/plugin/PluginLoadTriage.php
+++ b/src/plugin/PluginLoadTriage.php
@@ -28,15 +28,15 @@ final class PluginLoadTriage{
 	 * @var PluginLoadTriageEntry[]
 	 * @phpstan-var array<string, PluginLoadTriageEntry>
 	 */
-	public $plugins = [];
+	public array $plugins = [];
 	/**
 	 * @var string[][]
 	 * @phpstan-var array<string, list<string>>
 	 */
-	public $dependencies = [];
+	public array $dependencies = [];
 	/**
 	 * @var string[][]
 	 * @phpstan-var array<string, list<string>>
 	 */
-	public $softDependencies = [];
+	public array $softDependencies = [];
 }
diff --git a/src/plugin/PluginManager.php b/src/plugin/PluginManager.php
index 88fd773e28..f84698aa08 100644
--- a/src/plugin/PluginManager.php
+++ b/src/plugin/PluginManager.php
@@ -37,7 +37,7 @@ use pocketmine\permission\DefaultPermissions;
 use pocketmine\permission\PermissionManager;
 use pocketmine\permission\PermissionParser;
 use pocketmine\Server;
-use pocketmine\timings\TimingsHandler;
+use pocketmine\timings\Timings;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Utils;
 use Symfony\Component\Filesystem\Path;
@@ -69,11 +69,17 @@ use function strtolower;
  * Manages all the plugins
  */
 class PluginManager{
-	/** @var Plugin[] */
-	protected $plugins = [];
+	/**
+	 * @var Plugin[]
+	 * @phpstan-var array<string, Plugin>
+	 */
+	protected array $plugins = [];
 
-	/** @var Plugin[] */
-	protected $enabledPlugins = [];
+	/**
+	 * @var Plugin[]
+	 * @phpstan-var array<string, Plugin>
+	 */
+	protected array $enabledPlugins = [];
 
 	/** @var array<string, array<string, true>> */
 	private array $pluginDependents = [];
@@ -84,7 +90,7 @@ class PluginManager{
 	 * @var PluginLoader[]
 	 * @phpstan-var array<class-string<PluginLoader>, PluginLoader>
 	 */
-	protected $fileAssociations = [];
+	protected array $fileAssociations = [];
 
 	public function __construct(
 		private Server $server,
@@ -114,6 +120,7 @@ class PluginManager{
 
 	/**
 	 * @return Plugin[]
+	 * @phpstan-return array<string, Plugin>
 	 */
 	public function getPlugins() : array{
 		return $this->plugins;
@@ -510,9 +517,12 @@ class PluginManager{
 
 			unset($this->enabledPlugins[$plugin->getDescription()->getName()]);
 			foreach(Utils::stringifyKeys($this->pluginDependents) as $dependency => $dependentList){
-				unset($this->pluginDependents[$dependency][$plugin->getDescription()->getName()]);
-				if(count($this->pluginDependents[$dependency]) === 0){
-					unset($this->pluginDependents[$dependency]);
+				if(isset($this->pluginDependents[$dependency][$plugin->getDescription()->getName()])){
+					if(count($this->pluginDependents[$dependency]) === 1){
+						unset($this->pluginDependents[$dependency]);
+					}else{
+						unset($this->pluginDependents[$dependency][$plugin->getDescription()->getName()]);
+					}
 				}
 			}
 
@@ -523,7 +533,7 @@ class PluginManager{
 	}
 
 	public function tickSchedulers(int $currentTick) : void{
-		foreach($this->enabledPlugins as $pluginName => $p){
+		foreach(Utils::promoteKeys($this->enabledPlugins) as $pluginName => $p){
 			if(isset($this->enabledPlugins[$pluginName])){
 				//the plugin may have been disabled as a result of updating other plugins' schedulers, and therefore
 				//removed from enabledPlugins; however, foreach will still see it due to copy-on-write
@@ -647,11 +657,16 @@ class PluginManager{
 
 		$handlerName = Utils::getNiceClosureName($handler);
 
+		$reflect = new \ReflectionFunction($handler);
+		if($reflect->isGenerator()){
+			throw new PluginException("Generator function $handlerName cannot be used as an event handler");
+		}
+
 		if(!$plugin->isEnabled()){
 			throw new PluginException("Plugin attempted to register event handler " . $handlerName . "() to event " . $event . " while not enabled");
 		}
 
-		$timings = new TimingsHandler("Plugin: " . $plugin->getDescription()->getFullName() . " Event: " . $handlerName . "(" . (new \ReflectionClass($event))->getShortName() . ")");
+		$timings = Timings::getEventHandlerTimings($event, $handlerName, $plugin->getDescription()->getFullName());
 
 		$registeredListener = new RegisteredListener($handler, $priority, $plugin, $handleCancelled, $timings);
 		HandlerListManager::global()->getListFor($event)->register($registeredListener);
diff --git a/src/promise/Promise.php b/src/promise/Promise.php
index e7188197c7..c09037158b 100644
--- a/src/promise/Promise.php
+++ b/src/promise/Promise.php
@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\promise;
 
+use pocketmine\utils\Utils;
+use function count;
 use function spl_object_id;
 
 /**
@@ -41,8 +43,11 @@ final class Promise{
 	 * @phpstan-param \Closure() : void $onFailure
 	 */
 	public function onCompletion(\Closure $onSuccess, \Closure $onFailure) : void{
-		if($this->shared->resolved){
-			$this->shared->result === null ? $onFailure() : $onSuccess($this->shared->result);
+		$state = $this->shared->state;
+		if($state === true){
+			$onSuccess($this->shared->result);
+		}elseif($state === false){
+			$onFailure();
 		}else{
 			$this->shared->onSuccess[spl_object_id($onSuccess)] = $onSuccess;
 			$this->shared->onFailure[spl_object_id($onFailure)] = $onFailure;
@@ -50,6 +55,58 @@ final class Promise{
 	}
 
 	public function isResolved() : bool{
-		return $this->shared->resolved;
+		//TODO: perhaps this should return true when rejected? currently there's no way to tell if a promise was
+		//rejected or just hasn't been resolved yet
+		return $this->shared->state === true;
+	}
+
+	/**
+	 * Returns a promise that will resolve only once all the Promises in
+	 * `$promises` have resolved. The resolution value of the returned promise
+	 * will be an array containing the resolution values of each Promises in
+	 * `$promises` indexed by the respective Promises' array keys.
+	 *
+	 * @param Promise[] $promises
+	 *
+	 * @phpstan-template TPromiseValue
+	 * @phpstan-template TKey of array-key
+	 * @phpstan-param array<TKey, Promise<TPromiseValue>> $promises
+	 *
+	 * @phpstan-return Promise<array<TKey, TPromiseValue>>
+	 */
+	public static function all(array $promises) : Promise{
+		/** @phpstan-var PromiseResolver<array<TKey, TPromiseValue>> $resolver */
+		$resolver = new PromiseResolver();
+		if(count($promises) === 0){
+			$resolver->resolve([]);
+			return $resolver->getPromise();
+		}
+		$values = [];
+		$toResolve = count($promises);
+		$continue = true;
+
+		foreach(Utils::promoteKeys($promises) as $key => $promise){
+			$promise->onCompletion(
+				function(mixed $value) use ($resolver, $key, $toResolve, &$values) : void{
+					$values[$key] = $value;
+
+					if(count($values) === $toResolve){
+						$resolver->resolve($values);
+					}
+				},
+				function() use ($resolver, &$continue) : void{
+					if($continue){
+						$continue = false;
+						$resolver->reject();
+					}
+				}
+			);
+
+			if(!$continue){
+				break;
+			}
+		}
+
+		return $resolver->getPromise();
 	}
 }
diff --git a/src/promise/PromiseResolver.php b/src/promise/PromiseResolver.php
index 30a60e0cd6..2019f261d0 100644
--- a/src/promise/PromiseResolver.php
+++ b/src/promise/PromiseResolver.php
@@ -38,14 +38,13 @@ final class PromiseResolver{
 	}
 
 	/**
-	 * @param mixed $value
 	 * @phpstan-param TValue $value
 	 */
-	public function resolve($value) : void{
-		if($this->shared->resolved){
+	public function resolve(mixed $value) : void{
+		if($this->shared->state !== null){
 			throw new \LogicException("Promise has already been resolved/rejected");
 		}
-		$this->shared->resolved = true;
+		$this->shared->state = true;
 		$this->shared->result = $value;
 		foreach($this->shared->onSuccess as $c){
 			$c($value);
@@ -55,10 +54,10 @@ final class PromiseResolver{
 	}
 
 	public function reject() : void{
-		if($this->shared->resolved){
+		if($this->shared->state !== null){
 			throw new \LogicException("Promise has already been resolved/rejected");
 		}
-		$this->shared->resolved = true;
+		$this->shared->state = false;
 		foreach($this->shared->onFailure as $c){
 			$c();
 		}
diff --git a/src/promise/PromiseSharedData.php b/src/promise/PromiseSharedData.php
index f4b1e38498..8bc2691f46 100644
--- a/src/promise/PromiseSharedData.php
+++ b/src/promise/PromiseSharedData.php
@@ -41,11 +41,8 @@ final class PromiseSharedData{
 	 */
 	public array $onFailure = [];
 
-	public bool $resolved = false;
+	public ?bool $state = null;
 
-	/**
-	 * @var mixed
-	 * @phpstan-var TValue|null
-	 */
-	public $result = null;
+	/** @phpstan-var TValue */
+	public mixed $result;
 }
diff --git a/src/resourcepacks/ResourcePack.php b/src/resourcepacks/ResourcePack.php
index 04feeeb3d7..cdab3447b8 100644
--- a/src/resourcepacks/ResourcePack.php
+++ b/src/resourcepacks/ResourcePack.php
@@ -60,6 +60,8 @@ interface ResourcePack{
 	 * @param int $start  Offset to start reading the chunk from
 	 * @param int $length Maximum length of data to return.
 	 *
+	 * @phpstan-param positive-int $length
+	 *
 	 * @return string byte-array
 	 * @throws \InvalidArgumentException if the chunk does not exist
 	 */
diff --git a/src/resourcepacks/ResourcePackManager.php b/src/resourcepacks/ResourcePackManager.php
index 6429ac06bb..baf16ca207 100644
--- a/src/resourcepacks/ResourcePackManager.php
+++ b/src/resourcepacks/ResourcePackManager.php
@@ -25,6 +25,7 @@ namespace pocketmine\resourcepacks;
 
 use pocketmine\utils\Config;
 use pocketmine\utils\Filesystem;
+use pocketmine\utils\Utils;
 use Symfony\Component\Filesystem\Path;
 use function array_keys;
 use function copy;
@@ -87,7 +88,7 @@ class ResourcePackManager{
 			throw new \InvalidArgumentException("\"resource_stack\" key should contain a list of pack names");
 		}
 
-		foreach($resourceStack as $pos => $pack){
+		foreach(Utils::promoteKeys($resourceStack) as $pos => $pack){
 			if(!is_string($pack) && !is_int($pack) && !is_float($pack)){
 				$logger->critical("Found invalid entry in resource pack list at offset $pos of type " . gettype($pack));
 				continue;
@@ -154,6 +155,13 @@ class ResourcePackManager{
 		return $this->serverForceResources;
 	}
 
+	/**
+	 * Sets whether players must accept resource packs in order to join.
+	 */
+	public function setResourcePacksRequired(bool $value) : void{
+		$this->serverForceResources = $value;
+	}
+
 	/**
 	 * Returns an array of resource packs in use, sorted in order of priority.
 	 * @return ResourcePack[]
diff --git a/src/resourcepacks/ZippedResourcePack.php b/src/resourcepacks/ZippedResourcePack.php
index 36d71216fb..c4daeedf7b 100644
--- a/src/resourcepacks/ZippedResourcePack.php
+++ b/src/resourcepacks/ZippedResourcePack.php
@@ -41,15 +41,9 @@ use function preg_match;
 use function strlen;
 
 class ZippedResourcePack implements ResourcePack{
-
-	/** @var string */
-	protected $path;
-
-	/** @var Manifest */
-	protected $manifest;
-
-	/** @var string|null */
-	protected $sha256 = null;
+	protected string $path;
+	protected Manifest $manifest;
+	protected ?string $sha256 = null;
 
 	/** @var resource */
 	protected $fileResource;
@@ -114,6 +108,7 @@ class ZippedResourcePack implements ResourcePack{
 
 		$mapper = new \JsonMapper();
 		$mapper->bExceptionOnMissingData = true;
+		$mapper->bStrictObjectTypeChecking = true;
 
 		try{
 			/** @var Manifest $manifest */
@@ -159,6 +154,9 @@ class ZippedResourcePack implements ResourcePack{
 	}
 
 	public function getPackChunk(int $start, int $length) : string{
+		if($length < 1){
+			throw new \InvalidArgumentException("Pack length must be positive");
+		}
 		fseek($this->fileResource, $start);
 		if(feof($this->fileResource)){
 			throw new \InvalidArgumentException("Requested a resource pack chunk with invalid start offset");
diff --git a/src/scheduler/AsyncPool.php b/src/scheduler/AsyncPool.php
index 9029eb5935..bb79df507f 100644
--- a/src/scheduler/AsyncPool.php
+++ b/src/scheduler/AsyncPool.php
@@ -23,44 +23,35 @@ declare(strict_types=1);
 
 namespace pocketmine\scheduler;
 
+use pmmp\thread\Thread as NativeThread;
 use pocketmine\snooze\SleeperHandler;
-use pocketmine\snooze\SleeperNotifier;
+use pocketmine\thread\log\ThreadSafeLogger;
+use pocketmine\thread\ThreadCrashException;
+use pocketmine\thread\ThreadSafeClassLoader;
+use pocketmine\timings\Timings;
+use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Utils;
 use function array_keys;
 use function array_map;
 use function assert;
 use function count;
+use function get_class;
 use function spl_object_id;
 use function time;
 use const PHP_INT_MAX;
-use const PTHREADS_INHERIT_INI;
 
 /**
  * Manages general-purpose worker threads used for processing asynchronous tasks, and the tasks submitted to those
  * workers.
  */
 class AsyncPool{
-	private const WORKER_START_OPTIONS = PTHREADS_INHERIT_INI;
-
-	/** @var int */
-	protected $size;
+	private const WORKER_START_OPTIONS = NativeThread::INHERIT_INI | NativeThread::INHERIT_COMMENTS;
 
 	/**
-	 * @var \SplQueue[]|AsyncTask[][]
-	 * @phpstan-var array<int, \SplQueue<AsyncTask>>
-	 */
-	private array $taskQueues = [];
-
-	/**
-	 * @var AsyncWorker[]
-	 * @phpstan-var array<int, AsyncWorker>
+	 * @var AsyncPoolWorkerEntry[]
+	 * @phpstan-var array<int, AsyncPoolWorkerEntry>
 	 */
 	private array $workers = [];
-	/**
-	 * @var int[]
-	 * @phpstan-var array<int, int>
-	 */
-	private array $workerLastUsed = [];
 
 	/**
 	 * @var \Closure[]
@@ -69,14 +60,12 @@ class AsyncPool{
 	private array $workerStartHooks = [];
 
 	public function __construct(
-		int $size,
+		protected int $size,
 		private int $workerMemoryLimit,
-		private \ClassLoader $classLoader,
-		private \ThreadedLogger $logger,
+		private ThreadSafeClassLoader $classLoader,
+		private ThreadSafeLogger $logger,
 		private SleeperHandler $eventLoop
-	){
-		$this->size = $size;
-	}
+	){}
 
 	/**
 	 * Returns the maximum size of the pool. Note that there may be less active workers than this number.
@@ -132,24 +121,23 @@ class AsyncPool{
 	 * Fetches the worker with the specified ID, starting it if it does not exist, and firing any registered worker
 	 * start hooks.
 	 */
-	private function getWorker(int $worker) : AsyncWorker{
-		if(!isset($this->workers[$worker])){
-			$notifier = new SleeperNotifier();
-			$this->workers[$worker] = new AsyncWorker($this->logger, $worker, $this->workerMemoryLimit, $notifier);
-			$this->eventLoop->addNotifier($notifier, function() use ($worker) : void{
-				$this->collectTasksFromWorker($worker);
+	private function getWorker(int $workerId) : AsyncPoolWorkerEntry{
+		if(!isset($this->workers[$workerId])){
+			$sleeperEntry = $this->eventLoop->addNotifier(function() use ($workerId) : void{
+				$this->collectTasksFromWorker($workerId);
 			});
-			$this->workers[$worker]->setClassLoaders([$this->classLoader]);
-			$this->workers[$worker]->start(self::WORKER_START_OPTIONS);
-
-			$this->taskQueues[$worker] = new \SplQueue();
+			$this->workers[$workerId] = new AsyncPoolWorkerEntry(new AsyncWorker($this->logger, $workerId, $this->workerMemoryLimit, $sleeperEntry), $sleeperEntry->getNotifierId());
+			$this->workers[$workerId]->worker->setClassLoaders([$this->classLoader]);
+			$this->workers[$workerId]->worker->start(self::WORKER_START_OPTIONS);
 
 			foreach($this->workerStartHooks as $hook){
-				$hook($worker);
+				$hook($workerId);
 			}
+		}else{
+			$this->checkCrashedWorker($workerId, null);
 		}
 
-		return $this->workers[$worker];
+		return $this->workers[$workerId];
 	}
 
 	/**
@@ -163,12 +151,9 @@ class AsyncPool{
 			throw new \InvalidArgumentException("Cannot submit the same AsyncTask instance more than once");
 		}
 
-		$task->progressUpdates = new \Threaded();
 		$task->setSubmitted();
 
-		$this->getWorker($worker)->stack($task);
-		$this->taskQueues[$worker]->enqueue($task);
-		$this->workerLastUsed[$worker] = time();
+		$this->getWorker($worker)->submit($task);
 	}
 
 	/**
@@ -181,8 +166,8 @@ class AsyncPool{
 	public function selectWorker() : int{
 		$worker = null;
 		$minUsage = PHP_INT_MAX;
-		foreach($this->taskQueues as $i => $queue){
-			if(($usage = $queue->count()) < $minUsage){
+		foreach($this->workers as $i => $entry){
+			if(($usage = $entry->tasks->count()) < $minUsage){
 				$worker = $i;
 				$minUsage = $usage;
 				if($usage === 0){
@@ -218,6 +203,33 @@ class AsyncPool{
 		return $worker;
 	}
 
+	private function checkCrashedWorker(int $workerId, ?AsyncTask $crashedTask) : void{
+		$entry = $this->workers[$workerId];
+		if($entry->worker->isTerminated()){
+			if($crashedTask === null){
+				foreach($entry->tasks as $task){
+					if($task->isTerminated()){
+						$crashedTask = $task;
+						break;
+					}elseif(!$task->isFinished()){
+						break;
+					}
+				}
+			}
+			$info = $entry->worker->getCrashInfo();
+			if($info !== null){
+				if($crashedTask !== null){
+					$message = "Worker $workerId crashed while running task " . get_class($crashedTask) . "#" . spl_object_id($crashedTask);
+				}else{
+					$message = "Worker $workerId crashed while doing unknown work";
+				}
+				throw new ThreadCrashException($message, $info);
+			}else{
+				throw new \RuntimeException("Worker $workerId crashed for unknown reason");
+			}
+		}
+	}
+
 	/**
 	 * Collects finished and/or crashed tasks from the workers, firing their on-completion hooks where appropriate.
 	 *
@@ -225,13 +237,13 @@ class AsyncPool{
 	 * @return bool whether there are tasks left to be collected
 	 */
 	public function collectTasks() : bool{
-		foreach($this->taskQueues as $worker => $queue){
-			$this->collectTasksFromWorker($worker);
+		foreach($this->workers as $workerId => $entry){
+			$this->collectTasksFromWorker($workerId);
 		}
 
 		//we check this in a second loop, because task collection could have caused new tasks to be added to the queues
-		foreach($this->taskQueues as $queue){
-			if(!$queue->isEmpty()){
+		foreach($this->workers as $entry){
+			if(!$entry->tasks->isEmpty()){
 				return true;
 			}
 		}
@@ -239,22 +251,21 @@ class AsyncPool{
 	}
 
 	public function collectTasksFromWorker(int $worker) : bool{
-		if(!isset($this->taskQueues[$worker])){
+		if(!isset($this->workers[$worker])){
 			throw new \InvalidArgumentException("No such worker $worker");
 		}
-		$queue = $this->taskQueues[$worker];
+		$queue = $this->workers[$worker]->tasks;
 		$more = false;
 		while(!$queue->isEmpty()){
 			/** @var AsyncTask $task */
 			$task = $queue->bottom();
-			$task->checkProgressUpdates();
 			if($task->isFinished()){ //make sure the task actually executed before trying to collect
 				$queue->dequeue();
 
-				if($task->isCrashed()){
-					$this->logger->critical("Could not execute asynchronous task " . (new \ReflectionClass($task))->getShortName() . ": Task crashed");
-					$task->onError();
-				}elseif(!$task->hasCancelledRun()){
+				if($task->isTerminated()){
+					$this->checkCrashedWorker($worker, $task);
+					throw new AssumptionFailedError("checkCrashedWorker() should have thrown an exception, making this unreachable");
+				}else{
 					/*
 					 * It's possible for a task to submit a progress update and then finish before the progress
 					 * update is detected by the parent thread, so here we consume any missed updates.
@@ -264,15 +275,18 @@ class AsyncPool{
 					 * lost. Thus, it's necessary to do one last check here to make sure all progress updates have
 					 * been consumed before completing.
 					 */
-					$task->checkProgressUpdates();
-					$task->onCompletion();
+					$this->checkTaskProgressUpdates($task);
+					Timings::getAsyncTaskCompletionTimings($task)->time(function() use ($task) : void{
+						$task->onCompletion();
+					});
 				}
 			}else{
+				$this->checkTaskProgressUpdates($task);
 				$more = true;
 				break; //current task is still running, skip to next worker
 			}
 		}
-		$this->workers[$worker]->collect();
+		$this->workers[$worker]->worker->collect();
 		return $more;
 	}
 
@@ -283,17 +297,17 @@ class AsyncPool{
 	 * @phpstan-return array<int, int>
 	 */
 	public function getTaskQueueSizes() : array{
-		return array_map(function(\SplQueue $queue) : int{ return $queue->count(); }, $this->taskQueues);
+		return array_map(function(AsyncPoolWorkerEntry $entry) : int{ return $entry->tasks->count(); }, $this->workers);
 	}
 
 	public function shutdownUnusedWorkers() : int{
 		$ret = 0;
 		$time = time();
-		foreach($this->taskQueues as $i => $queue){
-			if((!isset($this->workerLastUsed[$i]) || $this->workerLastUsed[$i] + 300 < $time) && $queue->isEmpty()){
-				$this->workers[$i]->quit();
-				$this->eventLoop->removeNotifier($this->workers[$i]->getNotifier());
-				unset($this->workers[$i], $this->taskQueues[$i], $this->workerLastUsed[$i]);
+		foreach($this->workers as $i => $entry){
+			if($entry->lastUsed + 300 < $time && $entry->tasks->isEmpty()){
+				$entry->worker->quit();
+				$this->eventLoop->removeNotifier($entry->sleeperNotifierId);
+				unset($this->workers[$i]);
 				$ret++;
 			}
 		}
@@ -310,11 +324,15 @@ class AsyncPool{
 		}
 
 		foreach($this->workers as $worker){
-			$worker->quit();
-			$this->eventLoop->removeNotifier($worker->getNotifier());
+			$worker->worker->quit();
+			$this->eventLoop->removeNotifier($worker->sleeperNotifierId);
 		}
 		$this->workers = [];
-		$this->taskQueues = [];
-		$this->workerLastUsed = [];
+	}
+
+	private function checkTaskProgressUpdates(AsyncTask $task) : void{
+		Timings::getAsyncTaskProgressUpdateTimings($task)->time(function() use ($task) : void{
+			$task->checkProgressUpdates();
+		});
 	}
 }
diff --git a/src/scheduler/AsyncPoolWorkerEntry.php b/src/scheduler/AsyncPoolWorkerEntry.php
new file mode 100644
index 0000000000..0c62ab9319
--- /dev/null
+++ b/src/scheduler/AsyncPoolWorkerEntry.php
@@ -0,0 +1,53 @@
+<?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\scheduler;
+
+use function time;
+
+/**
+ * @internal
+ */
+final class AsyncPoolWorkerEntry{
+
+	public int $lastUsed;
+	/**
+	 * @var \SplQueue|AsyncTask[]
+	 * @phpstan-var \SplQueue<AsyncTask>
+	 */
+	public \SplQueue $tasks;
+
+	public function __construct(
+		public readonly AsyncWorker $worker,
+		public readonly int $sleeperNotifierId
+	){
+		$this->lastUsed = time();
+		$this->tasks = new \SplQueue();
+	}
+
+	public function submit(AsyncTask $task) : void{
+		$this->tasks->enqueue($task);
+		$this->lastUsed = time();
+		$this->worker->stack($task);
+	}
+}
diff --git a/src/scheduler/AsyncTask.php b/src/scheduler/AsyncTask.php
index 831753f4d1..b0b64347ad 100644
--- a/src/scheduler/AsyncTask.php
+++ b/src/scheduler/AsyncTask.php
@@ -23,11 +23,15 @@ declare(strict_types=1);
 
 namespace pocketmine\scheduler;
 
-use pocketmine\utils\AssumptionFailedError;
+use pmmp\thread\Runnable;
+use pmmp\thread\ThreadSafe;
+use pmmp\thread\ThreadSafeArray;
+use pocketmine\thread\NonThreadSafeValue;
+use function array_key_exists;
 use function igbinary_serialize;
 use function igbinary_unserialize;
+use function is_null;
 use function is_scalar;
-use function is_string;
 use function spl_object_id;
 
 /**
@@ -51,55 +55,40 @@ use function spl_object_id;
  * thread, e.g. during {@link AsyncTask::onCompletion()} or {@link AsyncTask::onProgressUpdate()}. This means that
  * whatever you do in onRun() must be able to work without the Server instance.
  *
- * WARNING: Any non-Threaded objects WILL BE SERIALIZED when assigned to members of AsyncTasks or other Threaded object.
- * If later accessed from said Threaded object, you will be operating on a COPY OF THE OBJECT, NOT THE ORIGINAL OBJECT.
- * If you want to store non-serializable objects to access when the task completes, store them using
+ * If you want to store non-thread-safe objects to access when the task completes, store them using
  * {@link AsyncTask::storeLocal}.
- *
- * WARNING: Arrays are converted to Volatile objects when assigned as members of Threaded objects.
- * Keep this in mind when using arrays stored as members of your AsyncTask.
  */
-abstract class AsyncTask extends \Threaded{
+abstract class AsyncTask extends Runnable{
 	/**
-	 * @var \ArrayObject|mixed[]|null object hash => mixed data
-	 * @phpstan-var \ArrayObject<int, array<string, mixed>>|null
+	 * @var mixed[][] object hash => mixed data
+	 * @phpstan-var array<int, array<string, mixed>>
 	 *
-	 * Used to store objects which are only needed on one thread and should not be serialized.
+	 * Used to store thread-local data to be used by onCompletion().
 	 */
-	private static ?\ArrayObject $threadLocalStorage = null;
+	private static array $threadLocalStorage = [];
 
-	/** @var AsyncWorker|null $worker */
-	public $worker = null;
+	/** @phpstan-var ThreadSafeArray<int, string>|null */
+	private ?ThreadSafeArray $progressUpdates = null;
 
-	/** @var \Threaded */
-	public $progressUpdates;
+	private ThreadSafe|string|int|bool|null|float $result = null;
 
-	private string|int|bool|null|float $result = null;
-	private bool $serialized = false;
-	private bool $cancelRun = false;
 	private bool $submitted = false;
-
-	private bool $crashed = false;
 	private bool $finished = false;
 
 	public function run() : void{
 		$this->result = null;
 
-		if(!$this->cancelRun){
-			try{
-				$this->onRun();
-			}catch(\Throwable $e){
-				$this->crashed = true;
-				$this->worker->handleException($e);
-			}
-		}
+		$this->onRun();
 
 		$this->finished = true;
-		$this->worker->getNotifier()->wakeupSleeper();
+		AsyncWorker::getNotifier()->wakeupSleeper();
 	}
 
+	/**
+	 * @deprecated
+	 */
 	public function isCrashed() : bool{
-		return $this->crashed || $this->isTerminated();
+		return $this->isTerminated();
 	}
 
 	/**
@@ -107,7 +96,7 @@ abstract class AsyncTask extends \Threaded{
 	 * because it is not true prior to task execution.
 	 */
 	public function isFinished() : bool{
-		return $this->finished || $this->isCrashed();
+		return $this->finished || $this->isTerminated();
 	}
 
 	public function hasResult() : bool{
@@ -118,26 +107,28 @@ abstract class AsyncTask extends \Threaded{
 	 * @return mixed
 	 */
 	public function getResult(){
-		if($this->serialized){
-			if(!is_string($this->result)) throw new AssumptionFailedError("Result expected to be a serialized string");
-			return igbinary_unserialize($this->result);
+		if($this->result instanceof NonThreadSafeValue){
+			return $this->result->deserialize();
 		}
 		return $this->result;
 	}
 
+	public function setResult(mixed $result) : void{
+		$this->result = is_scalar($result) || is_null($result) || $result instanceof ThreadSafe ? $result : new NonThreadSafeValue($result);
+	}
+
 	/**
-	 * @param mixed $result
+	 * @deprecated
 	 */
-	public function setResult($result) : void{
-		$this->result = ($this->serialized = !is_scalar($result)) ? igbinary_serialize($result) : $result;
-	}
-
 	public function cancelRun() : void{
-		$this->cancelRun = true;
+		//NOOP
 	}
 
+	/**
+	 * @deprecated
+	 */
 	public function hasCancelledRun() : bool{
-		return $this->cancelRun;
+		return false;
 	}
 
 	public function setSubmitted() : void{
@@ -167,17 +158,23 @@ abstract class AsyncTask extends \Threaded{
 	 *
 	 * @param mixed $progress A value that can be safely serialize()'ed.
 	 */
-	public function publishProgress($progress) : void{
-		$this->progressUpdates[] = igbinary_serialize($progress);
+	public function publishProgress(mixed $progress) : void{
+		$progressUpdates = $this->progressUpdates;
+		if($progressUpdates === null){
+			$progressUpdates = $this->progressUpdates = new ThreadSafeArray();
+		}
+		$progressUpdates[] = igbinary_serialize($progress) ?? throw new \InvalidArgumentException("Progress must be serializable");
 	}
 
 	/**
 	 * @internal Only call from AsyncPool.php on the main thread
 	 */
 	public function checkProgressUpdates() : void{
-		while($this->progressUpdates->count() !== 0){
-			$progress = $this->progressUpdates->shift();
-			$this->onProgressUpdate(igbinary_unserialize($progress));
+		$progressUpdates = $this->progressUpdates;
+		if($progressUpdates !== null){
+			while(($progress = $progressUpdates->shift()) !== null){
+				$this->onProgressUpdate(igbinary_unserialize($progress));
+			}
 		}
 	}
 
@@ -194,8 +191,7 @@ abstract class AsyncTask extends \Threaded{
 	}
 
 	/**
-	 * Called from the main thread when the async task experiences an error during onRun(). Use this for things like
-	 * promise rejection.
+	 * @deprecated No longer used
 	 */
 	public function onError() : void{
 
@@ -214,19 +210,8 @@ abstract class AsyncTask extends \Threaded{
 	 *
 	 * Objects stored in this storage can be retrieved using fetchLocal() on the same thread that this method was called
 	 * from.
-	 *
-	 * @param mixed $complexData the data to store
 	 */
-	protected function storeLocal(string $key, $complexData) : void{
-		if(self::$threadLocalStorage === null){
-			/*
-			 * It's necessary to use an object (not array) here because pthreads is stupid. Non-default array statics
-			 * will be inherited when task classes are copied to the worker thread, which would cause unwanted
-			 * inheritance of primitive thread-locals, which we really don't want for various reasons.
-			 * It won't try to inherit objects though, so this is the easiest solution.
-			 */
-			self::$threadLocalStorage = new \ArrayObject();
-		}
+	protected function storeLocal(string $key, mixed $complexData) : void{
 		self::$threadLocalStorage[spl_object_id($this)][$key] = $complexData;
 	}
 
@@ -242,7 +227,7 @@ abstract class AsyncTask extends \Threaded{
 	 */
 	protected function fetchLocal(string $key){
 		$id = spl_object_id($this);
-		if(self::$threadLocalStorage === null || !isset(self::$threadLocalStorage[$id][$key])){
+		if(!isset(self::$threadLocalStorage[$id]) || !array_key_exists($key, self::$threadLocalStorage[$id])){
 			throw new \InvalidArgumentException("No matching thread-local data found on this thread");
 		}
 
@@ -251,12 +236,7 @@ abstract class AsyncTask extends \Threaded{
 
 	final public function __destruct(){
 		$this->reallyDestruct();
-		if(self::$threadLocalStorage !== null && isset(self::$threadLocalStorage[$h = spl_object_id($this)])){
-			unset(self::$threadLocalStorage[$h]);
-			if(self::$threadLocalStorage->count() === 0){
-				self::$threadLocalStorage = null;
-			}
-		}
+		unset(self::$threadLocalStorage[spl_object_id($this)]);
 	}
 
 	/**
diff --git a/src/scheduler/AsyncWorker.php b/src/scheduler/AsyncWorker.php
index 7262f9597f..5fdfb1ebb7 100644
--- a/src/scheduler/AsyncWorker.php
+++ b/src/scheduler/AsyncWorker.php
@@ -23,8 +23,12 @@ declare(strict_types=1);
 
 namespace pocketmine\scheduler;
 
+use pmmp\thread\Thread as NativeThread;
+use pocketmine\snooze\SleeperHandlerEntry;
 use pocketmine\snooze\SleeperNotifier;
+use pocketmine\thread\log\ThreadSafeLogger;
 use pocketmine\thread\Worker;
+use pocketmine\utils\AssumptionFailedError;
 use function gc_enable;
 use function ini_set;
 
@@ -32,15 +36,20 @@ class AsyncWorker extends Worker{
 	/** @var mixed[] */
 	private static array $store = [];
 
+	private static ?SleeperNotifier $notifier = null;
+
 	public function __construct(
-		private \ThreadedLogger $logger,
+		private ThreadSafeLogger $logger,
 		private int $id,
 		private int $memoryLimit,
-		private SleeperNotifier $notifier
+		private SleeperHandlerEntry $sleeperEntry
 	){}
 
-	public function getNotifier() : SleeperNotifier{
-		return $this->notifier;
+	public static function getNotifier() : SleeperNotifier{
+		if(self::$notifier !== null){
+			return self::$notifier;
+		}
+		throw new AssumptionFailedError("SleeperNotifier not found in thread-local storage");
 	}
 
 	protected function onRun() : void{
@@ -55,16 +64,14 @@ class AsyncWorker extends Worker{
 			ini_set('memory_limit', '-1');
 			$this->logger->debug("No memory limit set");
 		}
+
+		self::$notifier = $this->sleeperEntry->createNotifier();
 	}
 
-	public function getLogger() : \ThreadedLogger{
+	public function getLogger() : ThreadSafeLogger{
 		return $this->logger;
 	}
 
-	public function handleException(\Throwable $e) : void{
-		$this->logger->logException($e);
-	}
-
 	public function getThreadName() : string{
 		return "AsyncWorker#" . $this->id;
 	}
@@ -77,10 +84,10 @@ class AsyncWorker extends Worker{
 	 * Saves mixed data into the worker's thread-local object store. This can be used to store objects which you
 	 * want to use on this worker thread from multiple AsyncTasks.
 	 *
-	 * @param mixed $value
+	 * @deprecated Use static class properties instead.
 	 */
-	public function saveToThreadStore(string $identifier, $value) : void{
-		if(\Thread::getCurrentThread() !== $this){
+	public function saveToThreadStore(string $identifier, mixed $value) : void{
+		if(NativeThread::getCurrentThread() !== $this){
 			throw new \LogicException("Thread-local data can only be stored in the thread context");
 		}
 		self::$store[$identifier] = $value;
@@ -94,10 +101,10 @@ class AsyncWorker extends Worker{
 	 *
 	 * Objects stored in this storage may ONLY be retrieved while the task is running.
 	 *
-	 * @return mixed
+	 * @deprecated Use static class properties instead.
 	 */
-	public function getFromThreadStore(string $identifier){
-		if(\Thread::getCurrentThread() !== $this){
+	public function getFromThreadStore(string $identifier) : mixed{
+		if(NativeThread::getCurrentThread() !== $this){
 			throw new \LogicException("Thread-local data can only be fetched in the thread context");
 		}
 		return self::$store[$identifier] ?? null;
@@ -105,9 +112,11 @@ class AsyncWorker extends Worker{
 
 	/**
 	 * Removes previously-stored mixed data from the worker's thread-local object store.
+	 *
+	 * @deprecated Use static class properties instead.
 	 */
 	public function removeFromThreadStore(string $identifier) : void{
-		if(\Thread::getCurrentThread() !== $this){
+		if(NativeThread::getCurrentThread() !== $this){
 			throw new \LogicException("Thread-local data can only be removed in the thread context");
 		}
 		unset(self::$store[$identifier]);
diff --git a/src/scheduler/DumpWorkerMemoryTask.php b/src/scheduler/DumpWorkerMemoryTask.php
index b1cf3840c7..5ef787b5b8 100644
--- a/src/scheduler/DumpWorkerMemoryTask.php
+++ b/src/scheduler/DumpWorkerMemoryTask.php
@@ -23,8 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\scheduler;
 
+use pmmp\thread\Thread as NativeThread;
 use pocketmine\MemoryManager;
 use Symfony\Component\Filesystem\Path;
+use function assert;
 
 /**
  * Task used to dump memory from AsyncWorkers
@@ -37,12 +39,14 @@ class DumpWorkerMemoryTask extends AsyncTask{
 	){}
 
 	public function onRun() : void{
+		$worker = NativeThread::getCurrentThread();
+		assert($worker instanceof AsyncWorker);
 		MemoryManager::dumpMemory(
-			$this->worker,
-			Path::join($this->outputFolder, "AsyncWorker#" . $this->worker->getAsyncWorkerId()),
+			$worker,
+			Path::join($this->outputFolder, "AsyncWorker#" . $worker->getAsyncWorkerId()),
 			$this->maxNesting,
 			$this->maxStringSize,
-			new \PrefixedLogger($this->worker->getLogger(), "Memory Dump")
+			new \PrefixedLogger($worker->getLogger(), "Memory Dump")
 		);
 	}
 }
diff --git a/src/scheduler/Task.php b/src/scheduler/Task.php
index bde405a637..db42b477ad 100644
--- a/src/scheduler/Task.php
+++ b/src/scheduler/Task.php
@@ -26,8 +26,12 @@ namespace pocketmine\scheduler;
 use pocketmine\utils\Utils;
 
 abstract class Task{
+	/** @phpstan-var TaskHandler<static>|null  */
 	private ?TaskHandler $taskHandler = null;
 
+	/**
+	 * @phpstan-return TaskHandler<static>|null
+	 */
 	final public function getHandler() : ?TaskHandler{
 		return $this->taskHandler;
 	}
@@ -36,6 +40,9 @@ abstract class Task{
 		return Utils::getNiceClassName($this);
 	}
 
+	/**
+	 * @phpstan-param TaskHandler<static>|null $taskHandler
+	 */
 	final public function setHandler(?TaskHandler $taskHandler) : void{
 		if($this->taskHandler === null || $taskHandler === null){
 			$this->taskHandler = $taskHandler;
diff --git a/src/scheduler/TaskHandler.php b/src/scheduler/TaskHandler.php
index 50d9f01b00..985344b649 100644
--- a/src/scheduler/TaskHandler.php
+++ b/src/scheduler/TaskHandler.php
@@ -26,35 +26,31 @@ namespace pocketmine\scheduler;
 use pocketmine\timings\Timings;
 use pocketmine\timings\TimingsHandler;
 
+/**
+ * @template TTask of Task
+ */
 class TaskHandler{
+	protected int $nextRun;
 
-	/** @var Task */
-	protected $task;
-
-	/** @var int */
-	protected $delay;
-
-	/** @var int */
-	protected $period;
-
-	/** @var int */
-	protected $nextRun;
-
-	/** @var bool */
-	protected $cancelled = false;
+	protected bool $cancelled = false;
 
 	private TimingsHandler $timings;
 
 	private string $taskName;
 	private string $ownerName;
 
-	public function __construct(Task $task, int $delay = -1, int $period = -1, ?string $ownerName = null){
+	/**
+	 * @phpstan-param TTask $task
+	 */
+	public function __construct(
+		protected Task $task,
+		protected int $delay = -1,
+		protected int $period = -1,
+		?string $ownerName = null
+	){
 		if($task->getHandler() !== null){
 			throw new \InvalidArgumentException("Cannot assign multiple handlers to the same task");
 		}
-		$this->task = $task;
-		$this->delay = $delay;
-		$this->period = $period;
 		$this->taskName = $task->getName();
 		$this->ownerName = $ownerName ?? "Unknown";
 		$this->timings = Timings::getScheduledTaskTimings($this, $period);
@@ -76,6 +72,9 @@ class TaskHandler{
 		$this->nextRun = $ticks;
 	}
 
+	/**
+	 * @phpstan-return TTask
+	 */
 	public function getTask() : Task{
 		return $this->task;
 	}
diff --git a/src/scheduler/TaskScheduler.php b/src/scheduler/TaskScheduler.php
index 335686e13a..3e2b089c6c 100644
--- a/src/scheduler/TaskScheduler.php
+++ b/src/scheduler/TaskScheduler.php
@@ -33,20 +33,16 @@ use pocketmine\utils\ReversePriorityQueue;
 class TaskScheduler{
 	private bool $enabled = true;
 
-	/**
-	 * @var ReversePriorityQueue
-	 * @phpstan-var ReversePriorityQueue<int, TaskHandler>
-	 */
-	protected $queue;
+	/** @phpstan-var ReversePriorityQueue<int, TaskHandler<covariant Task>> */
+	protected ReversePriorityQueue $queue;
 
 	/**
 	 * @var ObjectSet|TaskHandler[]
-	 * @phpstan-var ObjectSet<TaskHandler>
+	 * @phpstan-var ObjectSet<TaskHandler<covariant Task>>
 	 */
-	protected $tasks;
+	protected ObjectSet $tasks;
 
-	/** @var int */
-	protected $currentTick = 0;
+	protected int $currentTick = 0;
 
 	public function __construct(
 		private ?string $owner = null
@@ -55,18 +51,42 @@ class TaskScheduler{
 		$this->tasks = new ObjectSet();
 	}
 
+	/**
+	 * @phpstan-template TTask of Task
+	 * @phpstan-param TTask $task
+	 *
+	 * @phpstan-return TaskHandler<TTask>
+	 */
 	public function scheduleTask(Task $task) : TaskHandler{
 		return $this->addTask($task, -1, -1);
 	}
 
+	/**
+	 * @phpstan-template TTask of Task
+	 * @phpstan-param TTask $task
+	 *
+	 * @phpstan-return TaskHandler<TTask>
+	 */
 	public function scheduleDelayedTask(Task $task, int $delay) : TaskHandler{
 		return $this->addTask($task, $delay, -1);
 	}
 
+	/**
+	 * @phpstan-template TTask of Task
+	 * @phpstan-param TTask $task
+	 *
+	 * @phpstan-return TaskHandler<TTask>
+	 */
 	public function scheduleRepeatingTask(Task $task, int $period) : TaskHandler{
 		return $this->addTask($task, -1, $period);
 	}
 
+	/**
+	 * @phpstan-template TTask of Task
+	 * @phpstan-param TTask $task
+	 *
+	 * @phpstan-return TaskHandler<TTask>
+	 */
 	public function scheduleDelayedRepeatingTask(Task $task, int $delay, int $period) : TaskHandler{
 		return $this->addTask($task, $delay, $period);
 	}
@@ -81,10 +101,19 @@ class TaskScheduler{
 		}
 	}
 
+	/**
+	 * @phpstan-param TaskHandler<covariant Task> $task
+	 */
 	public function isQueued(TaskHandler $task) : bool{
 		return $this->tasks->contains($task);
 	}
 
+	/**
+	 * @phpstan-template TTask of Task
+	 * @phpstan-param TTask $task
+	 *
+	 * @phpstan-return TaskHandler<TTask>
+	 */
 	private function addTask(Task $task, int $delay, int $period) : TaskHandler{
 		if(!$this->enabled){
 			throw new \LogicException("Tried to schedule task to disabled scheduler");
@@ -103,6 +132,11 @@ class TaskScheduler{
 		return $this->handle(new TaskHandler($task, $delay, $period, $this->owner));
 	}
 
+	/**
+	 * @phpstan-template TTask of Task
+	 * @phpstan-param TaskHandler<TTask> $handler
+	 * @phpstan-return TaskHandler<TTask>
+	 */
 	private function handle(TaskHandler $handler) : TaskHandler{
 		if($handler->isDelayed()){
 			$nextRun = $this->currentTick + $handler->getDelay();
@@ -132,7 +166,7 @@ class TaskScheduler{
 		}
 		$this->currentTick = $currentTick;
 		while($this->isReady($this->currentTick)){
-			/** @var TaskHandler $task */
+			/** @phpstan-var TaskHandler<covariant Task> $task */
 			$task = $this->queue->extract();
 			if($task->isCancelled()){
 				$this->tasks->remove($task);
diff --git a/src/stats/SendUsageTask.php b/src/stats/SendUsageTask.php
index ed141fd538..d218774b5f 100644
--- a/src/stats/SendUsageTask.php
+++ b/src/stats/SendUsageTask.php
@@ -31,6 +31,7 @@ use pocketmine\utils\Internet;
 use pocketmine\utils\Process;
 use pocketmine\utils\Utils;
 use pocketmine\VersionInfo;
+use pocketmine\YmlServerProperties;
 use Ramsey\Uuid\Uuid;
 use function array_map;
 use function array_values;
@@ -49,17 +50,15 @@ class SendUsageTask extends AsyncTask{
 	public const TYPE_STATUS = 2;
 	public const TYPE_CLOSE = 3;
 
-	/** @var string */
-	public $endpoint;
-	/** @var string */
-	public $data;
+	public string $endpoint;
+	public string $data;
 
 	/**
 	 * @param string[] $playerList
 	 * @phpstan-param array<string, string> $playerList
 	 */
 	public function __construct(Server $server, int $type, array $playerList = []){
-		$endpoint = "http://" . $server->getConfigGroup()->getPropertyString("anonymous-statistics.host", "stats.pocketmine.net") . "/";
+		$endpoint = "http://" . $server->getConfigGroup()->getPropertyString(YmlServerProperties::ANONYMOUS_STATISTICS_HOST, "stats.pocketmine.net") . "/";
 
 		$data = [];
 		$data["uniqueServerId"] = $server->getServerUniqueId()->toString();
diff --git a/src/thread/CommonThreadPartsTrait.php b/src/thread/CommonThreadPartsTrait.php
index d39256924c..e1c9d7c6bb 100644
--- a/src/thread/CommonThreadPartsTrait.php
+++ b/src/thread/CommonThreadPartsTrait.php
@@ -23,28 +23,38 @@ declare(strict_types=1);
 
 namespace pocketmine\thread;
 
+use pmmp\thread\Thread as NativeThread;
+use pmmp\thread\ThreadSafeArray;
+use pocketmine\crash\CrashDump;
 use pocketmine\errorhandler\ErrorToExceptionHandler;
 use pocketmine\Server;
+use function error_get_last;
 use function error_reporting;
+use function implode;
+use function register_shutdown_function;
+use function set_exception_handler;
 
 trait CommonThreadPartsTrait{
-	/** @var \Threaded|\ClassLoader[]|null  */
-	private ?\Threaded $classLoaders = null;
-	/** @var string|null */
-	protected $composerAutoloaderPath;
+	/**
+	 * @var ThreadSafeArray|ThreadSafeClassLoader[]|null
+	 * @phpstan-var ThreadSafeArray<int, ThreadSafeClassLoader>|null
+	 */
+	private ?ThreadSafeArray $classLoaders = null;
+	protected ?string $composerAutoloaderPath = null;
 
-	/** @var bool */
-	protected $isKilled = false;
+	protected bool $isKilled = false;
+
+	private ?ThreadCrashInfo $crashInfo = null;
 
 	/**
-	 * @return \ClassLoader[]
+	 * @return ThreadSafeClassLoader[]
 	 */
 	public function getClassLoaders() : ?array{
 		return $this->classLoaders !== null ? (array) $this->classLoaders : null;
 	}
 
 	/**
-	 * @param \ClassLoader[] $autoloaders
+	 * @param ThreadSafeClassLoader[] $autoloaders
 	 */
 	public function setClassLoaders(?array $autoloaders = null) : void{
 		$this->composerAutoloaderPath = \pocketmine\COMPOSER_AUTOLOADER_PATH;
@@ -54,23 +64,22 @@ trait CommonThreadPartsTrait{
 		}
 
 		if($this->classLoaders === null){
-			$this->classLoaders = new \Threaded();
+			$loaders = $this->classLoaders = new ThreadSafeArray();
 		}else{
+			$loaders = $this->classLoaders;
 			foreach($this->classLoaders as $k => $autoloader){
 				unset($this->classLoaders[$k]);
 			}
 		}
 		foreach($autoloaders as $autoloader){
-			$this->classLoaders[] = $autoloader;
+			$loaders[] = $autoloader;
 		}
 	}
 
 	/**
 	 * Registers the class loaders for this thread.
 	 *
-	 * WARNING: This method MUST be called from any descendent threads' run() method to make autoloading usable.
-	 * If you do not do this, you will not be able to use new classes that were not loaded when the thread was started
-	 * (unless you are using a custom autoloader).
+	 * @internal
 	 */
 	public function registerClassLoaders() : void{
 		if($this->composerAutoloaderPath !== null){
@@ -79,18 +88,89 @@ trait CommonThreadPartsTrait{
 		$autoloaders = $this->classLoaders;
 		if($autoloaders !== null){
 			foreach($autoloaders as $autoloader){
-				/** @var \ClassLoader $autoloader */
+				/** @var ThreadSafeClassLoader $autoloader */
 				$autoloader->register(false);
 			}
 		}
 	}
 
+	public function getCrashInfo() : ?ThreadCrashInfo{ return $this->crashInfo; }
+
+	public function start(int $options = NativeThread::INHERIT_NONE) : bool{
+		ThreadManager::getInstance()->add($this);
+
+		if($this->getClassLoaders() === null){
+			$this->setClassLoaders();
+		}
+		return parent::start($options);
+	}
+
 	final public function run() : void{
 		error_reporting(-1);
 		$this->registerClassLoaders();
 		//set this after the autoloader is registered
 		ErrorToExceptionHandler::set();
+
+		//this permits adding extra functionality to the exception and shutdown handlers via overriding
+		set_exception_handler($this->onUncaughtException(...));
+		register_shutdown_function($this->onShutdown(...));
+
 		$this->onRun();
+		$this->isKilled = true;
+	}
+
+	/**
+	 * Stops the thread using the best way possible. Try to stop it yourself before calling this.
+	 */
+	public function quit() : void{
+		$this->isKilled = true;
+
+		if(!$this->isJoined()){
+			$this->notify();
+			$this->join();
+		}
+
+		ThreadManager::getInstance()->remove($this);
+	}
+
+	/**
+	 * Called by set_exception_handler() when an uncaught exception is thrown.
+	 */
+	protected function onUncaughtException(\Throwable $e) : void{
+		$this->synchronized(function() use ($e) : void{
+			$this->crashInfo = ThreadCrashInfo::fromThrowable($e, $this->getThreadName());
+			\GlobalLogger::get()->logException($e);
+		});
+	}
+
+	/**
+	 * Called by register_shutdown_function() when the thread shuts down. This may be because of a benign shutdown, or
+	 * because of a fatal error. Use isKilled to determine which.
+	 */
+	protected function onShutdown() : void{
+		$this->synchronized(function() : void{
+			if($this->isTerminated() && $this->crashInfo === null){
+				$last = error_get_last();
+				if($last !== null && ($last["type"] & CrashDump::FATAL_ERROR_MASK) !== 0){
+					//fatal error
+					$crashInfo = ThreadCrashInfo::fromLastErrorInfo($last, $this->getThreadName());
+				}else{
+					//probably misused exit()
+					$crashInfo = ThreadCrashInfo::fromThrowable(new \RuntimeException("Thread crashed without an error - perhaps exit() was called?"), $this->getThreadName());
+				}
+				$this->crashInfo = $crashInfo;
+
+				$lines = [];
+				//mimic exception printed format
+				$lines[] = "Fatal error: " . $crashInfo->makePrettyMessage();
+				$lines[] = "--- Stack trace ---";
+				foreach($crashInfo->getTrace() as $frame){
+					$lines[] = "  " . $frame->getPrintableFrame();
+				}
+				$lines[] = "--- End of fatal error information ---";
+				\GlobalLogger::get()->critical(implode("\n", $lines));
+			}
+		});
 	}
 
 	/**
diff --git a/src/thread/NonThreadSafeValue.php b/src/thread/NonThreadSafeValue.php
new file mode 100644
index 0000000000..d0c65f4a44
--- /dev/null
+++ b/src/thread/NonThreadSafeValue.php
@@ -0,0 +1,58 @@
+<?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\thread;
+
+use pmmp\thread\ThreadSafe;
+use function get_debug_type;
+use function igbinary_serialize;
+use function igbinary_unserialize;
+
+/**
+ * This class automatically serializes values which can't be shared between threads.
+ * This class does NOT enable sharing the variable between threads. Each call to deserialize() will return a new copy
+ * of the variable.
+ *
+ * @phpstan-template TValue
+ */
+final class NonThreadSafeValue extends ThreadSafe{
+	private string $variable;
+
+	/**
+	 * @phpstan-param TValue $variable
+	 */
+	public function __construct(
+		mixed $variable
+	){
+		$this->variable = igbinary_serialize($variable) ?? throw new \InvalidArgumentException("Cannot serialize variable of type " . get_debug_type($variable));
+	}
+
+	/**
+	 * Returns a deserialized copy of the original variable.
+	 *
+	 * @phpstan-return TValue
+	 */
+	public function deserialize() : mixed{
+		return igbinary_unserialize($this->variable);
+	}
+}
diff --git a/src/thread/Thread.php b/src/thread/Thread.php
index 1c73cb1e2f..a6c36e14c7 100644
--- a/src/thread/Thread.php
+++ b/src/thread/Thread.php
@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\thread;
 
+use pmmp\thread\Thread as NativeThread;
 use pocketmine\scheduler\AsyncTask;
-use const PTHREADS_INHERIT_NONE;
 
 /**
  * Specialized Thread class aimed at PocketMine-MP-related usages. It handles setting up autoloading and error handling.
@@ -35,30 +35,6 @@ use const PTHREADS_INHERIT_NONE;
  * CPU.
  * @see AsyncTask
  */
-abstract class Thread extends \Thread{
+abstract class Thread extends NativeThread{
 	use CommonThreadPartsTrait;
-
-	public function start(int $options = PTHREADS_INHERIT_NONE) : bool{
-		//this is intentionally not traitified
-		ThreadManager::getInstance()->add($this);
-
-		if($this->getClassLoaders() === null){
-			$this->setClassLoaders();
-		}
-		return parent::start($options);
-	}
-
-	/**
-	 * Stops the thread using the best way possible. Try to stop it yourself before calling this.
-	 */
-	public function quit() : void{
-		$this->isKilled = true;
-
-		if(!$this->isJoined()){
-			$this->notify();
-			$this->join();
-		}
-
-		ThreadManager::getInstance()->remove($this);
-	}
 }
diff --git a/src/thread/ThreadCrashException.php b/src/thread/ThreadCrashException.php
new file mode 100644
index 0000000000..0eba379344
--- /dev/null
+++ b/src/thread/ThreadCrashException.php
@@ -0,0 +1,38 @@
+<?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\thread;
+
+final class ThreadCrashException extends ThreadException{
+
+	private ThreadCrashInfo $crashInfo;
+
+	public function __construct(string $message, ThreadCrashInfo $crashInfo){
+		parent::__construct($message);
+		$this->crashInfo = $crashInfo;
+	}
+
+	public function getCrashInfo() : ThreadCrashInfo{
+		return $this->crashInfo;
+	}
+}
diff --git a/src/thread/ThreadCrashInfo.php b/src/thread/ThreadCrashInfo.php
new file mode 100644
index 0000000000..66aae927a8
--- /dev/null
+++ b/src/thread/ThreadCrashInfo.php
@@ -0,0 +1,89 @@
+<?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\thread;
+
+use pmmp\thread\ThreadSafe;
+use pmmp\thread\ThreadSafeArray;
+use pocketmine\errorhandler\ErrorTypeToStringMap;
+use pocketmine\utils\Filesystem;
+use pocketmine\utils\Utils;
+use function get_class;
+use function sprintf;
+
+final class ThreadCrashInfo extends ThreadSafe{
+
+	/** @phpstan-var ThreadSafeArray<int, ThreadCrashInfoFrame> */
+	private ThreadSafeArray $trace;
+
+	/**
+	 * @param ThreadCrashInfoFrame[] $trace
+	 */
+	public function __construct(
+		private string $type,
+		private string $message,
+		private string $file,
+		private int $line,
+		array $trace,
+		private string $threadName
+	){
+		$this->trace = ThreadSafeArray::fromArray($trace);
+	}
+
+	public static function fromThrowable(\Throwable $e, string $threadName) : self{
+		return new self(get_class($e), $e->getMessage(), $e->getFile(), $e->getLine(), Utils::printableTraceWithMetadata($e->getTrace()), $threadName);
+	}
+
+	/**
+	 * @phpstan-param array{type: int, message: string, file: string, line: int} $info
+	 */
+	public static function fromLastErrorInfo(array $info, string $threadName) : self{
+		try{
+			$class = ErrorTypeToStringMap::get($info["type"]);
+		}catch(\InvalidArgumentException){
+			$class = "Unknown error type (" . $info["type"] . ")";
+		}
+		return new self($class, $info["message"], $info["file"], $info["line"], Utils::printableTraceWithMetadata(Utils::currentTrace()), $threadName);
+	}
+
+	public function getType() : string{ return $this->type; }
+
+	public function getMessage() : string{ return $this->message; }
+
+	public function getFile() : string{ return $this->file; }
+
+	public function getLine() : int{ return $this->line; }
+
+	/**
+	 * @return ThreadCrashInfoFrame[]
+	 */
+	public function getTrace() : array{
+		return (array) $this->trace;
+	}
+
+	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);
+	}
+}
diff --git a/src/thread/ThreadCrashInfoFrame.php b/src/thread/ThreadCrashInfoFrame.php
new file mode 100644
index 0000000000..27f470387c
--- /dev/null
+++ b/src/thread/ThreadCrashInfoFrame.php
@@ -0,0 +1,41 @@
+<?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\thread;
+
+use pmmp\thread\ThreadSafe;
+
+final class ThreadCrashInfoFrame extends ThreadSafe{
+
+	public function __construct(
+		private string $printableFrame,
+		private ?string $file,
+		private int $line,
+	){}
+
+	public function getPrintableFrame() : string{ return $this->printableFrame; }
+
+	public function getFile() : ?string{ return $this->file; }
+
+	public function getLine() : int{ return $this->line; }
+}
diff --git a/src/thread/ThreadManager.php b/src/thread/ThreadManager.php
index b22a424e75..0ec7f1b13c 100644
--- a/src/thread/ThreadManager.php
+++ b/src/thread/ThreadManager.php
@@ -23,9 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\thread;
 
+use pmmp\thread\ThreadSafe;
+use pmmp\thread\ThreadSafeArray;
 use function spl_object_id;
 
-class ThreadManager extends \Volatile{
+class ThreadManager extends ThreadSafe{
 
 	private static ?self $instance = null;
 
@@ -40,22 +42,19 @@ class ThreadManager extends \Volatile{
 		return self::$instance;
 	}
 
-	/**
-	 * @param Worker|Thread $thread
-	 */
-	public function add($thread) : void{
-		if($thread instanceof Thread || $thread instanceof Worker){
-			$this[spl_object_id($thread)] = $thread;
-		}
+	/** @phpstan-var ThreadSafeArray<int, Thread|Worker> */
+	private ThreadSafeArray $threads;
+
+	private function __construct(){
+		$this->threads = new ThreadSafeArray();
 	}
 
-	/**
-	 * @param Worker|Thread $thread
-	 */
-	public function remove($thread) : void{
-		if($thread instanceof Thread || $thread instanceof Worker){
-			unset($this[spl_object_id($thread)]);
-		}
+	public function add(Worker|Thread $thread) : void{
+		$this->threads[spl_object_id($thread)] = $thread;
+	}
+
+	public function remove(Worker|Thread $thread) : void{
+		unset($this->threads[spl_object_id($thread)]);
 	}
 
 	/**
@@ -66,7 +65,7 @@ class ThreadManager extends \Volatile{
 		/**
 		 * @var Worker|Thread $thread
 		 */
-		foreach($this as $key => $thread){
+		foreach($this->threads as $key => $thread){
 			$array[$key] = $thread;
 		}
 
diff --git a/src/thread/ThreadSafeClassLoader.php b/src/thread/ThreadSafeClassLoader.php
new file mode 100644
index 0000000000..fd9e6afed6
--- /dev/null
+++ b/src/thread/ThreadSafeClassLoader.php
@@ -0,0 +1,182 @@
+<?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\thread;
+
+use pmmp\thread\ThreadSafe;
+use pmmp\thread\ThreadSafeArray;
+use function class_exists;
+use function count;
+use function explode;
+use function file_exists;
+use function interface_exists;
+use function method_exists;
+use function spl_autoload_register;
+use function str_replace;
+use function strrpos;
+use function substr;
+use function trait_exists;
+use function trim;
+use const DIRECTORY_SEPARATOR;
+
+/**
+ * This autoloader can be used and updated from multiple threads.
+ * Useful if classes need to be dynamically added after threads have already been started.
+ *
+ * This is used to facilitate loading plugin classes, enabling plugins to be loaded after the server has started.
+ */
+class ThreadSafeClassLoader extends ThreadSafe{
+
+	/**
+	 * @var ThreadSafeArray|string[]
+	 * @phpstan-var ThreadSafeArray<int, string>
+	 */
+	private ThreadSafeArray $fallbackLookup;
+	/**
+	 * @var ThreadSafeArray|string[][]
+	 * @phpstan-var ThreadSafeArray<string, ThreadSafeArray<int, string>>
+	 */
+	private ThreadSafeArray $psr4Lookup;
+
+	public function __construct(){
+		$this->fallbackLookup = new ThreadSafeArray();
+		$this->psr4Lookup = new ThreadSafeArray();
+	}
+
+	protected function normalizePath(string $path) : string{
+		$parts = explode("://", $path, 2);
+		if(count($parts) === 2){
+			return $parts[0] . "://" . str_replace('/', DIRECTORY_SEPARATOR, $parts[1]);
+		}
+		return str_replace('/', DIRECTORY_SEPARATOR, $parts[0]);
+	}
+
+	public function addPath(string $namespacePrefix, string $path, bool $prepend = false) : void{
+		$path = $this->normalizePath($path);
+		if($namespacePrefix === '' || $namespacePrefix === '\\'){
+			$this->fallbackLookup->synchronized(function() use ($path, $prepend) : void{
+				$this->appendOrPrependLookupEntry($this->fallbackLookup, $path, $prepend);
+			});
+		}else{
+			$namespacePrefix = trim($namespacePrefix, '\\') . '\\';
+			$this->psr4Lookup->synchronized(function() use ($namespacePrefix, $path, $prepend) : void{
+				$list = $this->psr4Lookup[$namespacePrefix] ?? null;
+				if($list === null){
+					$list = $this->psr4Lookup[$namespacePrefix] = new ThreadSafeArray();
+				}
+				$this->appendOrPrependLookupEntry($list, $path, $prepend);
+			});
+		}
+	}
+
+	/**
+	 * @phpstan-param ThreadSafeArray<int, string> $list
+	 */
+	protected function appendOrPrependLookupEntry(ThreadSafeArray $list, string $entry, bool $prepend) : void{
+		if($prepend){
+			$entries = $this->getAndRemoveLookupEntries($list);
+			$list[] = $entry;
+			foreach($entries as $removedEntry){
+				$list[] = $removedEntry;
+			}
+		}else{
+			$list[] = $entry;
+		}
+	}
+
+	/**
+	 * @return string[]
+	 *
+	 * @phpstan-param ThreadSafeArray<int, string> $list
+	 * @phpstan-return list<string>
+	 */
+	protected function getAndRemoveLookupEntries(ThreadSafeArray $list) : array{
+		$entries = [];
+		while(($entry = $list->shift()) !== null){
+			$entries[] = $entry;
+		}
+		return $entries;
+	}
+
+	public function register(bool $prepend = false) : bool{
+		return spl_autoload_register(function(string $name) : void{
+			$this->loadClass($name);
+		}, true, $prepend);
+	}
+
+	/**
+	 * Called when there is a class to load
+	 */
+	public function loadClass(string $name) : bool{
+		$path = $this->findClass($name);
+		if($path !== null){
+			include($path);
+			if(!class_exists($name, false) && !interface_exists($name, false) && !trait_exists($name, false)){
+				return false;
+			}
+
+			if(method_exists($name, "onClassLoaded") && (new \ReflectionClass($name))->getMethod("onClassLoaded")->isStatic()){
+				$name::onClassLoaded();
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns the path for the class, if any
+	 */
+	public function findClass(string $name) : ?string{
+		$baseName = str_replace("\\", DIRECTORY_SEPARATOR, $name);
+
+		foreach($this->fallbackLookup as $path){
+			$filename = $path . DIRECTORY_SEPARATOR . $baseName . ".php";
+			if(file_exists($filename)){
+				return $filename;
+			}
+		}
+
+		// PSR-4 lookup
+		$logicalPathPsr4 = $baseName . ".php";
+
+		return $this->psr4Lookup->synchronized(function() use ($name, $logicalPathPsr4) : ?string{
+			$subPath = $name;
+			while(false !== $lastPos = strrpos($subPath, '\\')){
+				$subPath = substr($subPath, 0, $lastPos);
+				$search = $subPath . '\\';
+				$lookup = $this->psr4Lookup[$search] ?? null;
+				if($lookup !== null){
+					$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+					foreach($lookup as $dir){
+						if(file_exists($file = $dir . $pathEnd)){
+							return $file;
+						}
+					}
+				}
+			}
+			return null;
+		});
+	}
+}
diff --git a/src/thread/Worker.php b/src/thread/Worker.php
index 572da3c678..cc0b56046a 100644
--- a/src/thread/Worker.php
+++ b/src/thread/Worker.php
@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\thread;
 
+use pmmp\thread\Worker as NativeWorker;
 use pocketmine\scheduler\AsyncTask;
-use const PTHREADS_INHERIT_NONE;
 
 /**
  * Specialized Worker class for PocketMine-MP-related use cases. It handles setting up autoloading and error handling.
@@ -36,33 +36,6 @@ use const PTHREADS_INHERIT_NONE;
  * If you want to run tasks on other CPU cores, check out AsyncTask first.
  * @see AsyncTask
  */
-abstract class Worker extends \Worker{
+abstract class Worker extends NativeWorker{
 	use CommonThreadPartsTrait;
-
-	public function start(int $options = PTHREADS_INHERIT_NONE) : bool{
-		//this is intentionally not traitified
-		ThreadManager::getInstance()->add($this);
-
-		if($this->getClassLoaders() === null){
-			$this->setClassLoaders();
-		}
-		return parent::start($options);
-	}
-
-	/**
-	 * Stops the thread using the best way possible. Try to stop it yourself before calling this.
-	 */
-	public function quit() : void{
-		$this->isKilled = true;
-
-		if(!$this->isShutdown()){
-			$this->synchronized(function() : void{
-				while($this->unstack() !== null);
-			});
-			$this->notify();
-			$this->shutdown();
-		}
-
-		ThreadManager::getInstance()->remove($this);
-	}
 }
diff --git a/src/thread/log/AttachableThreadSafeLogger.php b/src/thread/log/AttachableThreadSafeLogger.php
new file mode 100644
index 0000000000..16c06f7ffd
--- /dev/null
+++ b/src/thread/log/AttachableThreadSafeLogger.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\thread\log;
+
+use pmmp\thread\ThreadSafeArray;
+
+abstract class AttachableThreadSafeLogger extends ThreadSafeLogger{
+
+	/**
+	 * @var ThreadSafeArray|ThreadSafeLoggerAttachment[]
+	 * @phpstan-var ThreadSafeArray<int, ThreadSafeLoggerAttachment>
+	 */
+	protected ThreadSafeArray $attachments;
+
+	public function __construct(){
+		$this->attachments = new ThreadSafeArray();
+	}
+
+	public function addAttachment(ThreadSafeLoggerAttachment $attachment) : void{
+		$this->attachments[] = $attachment;
+	}
+
+	public function removeAttachment(ThreadSafeLoggerAttachment $attachment) : void{
+		foreach($this->attachments as $i => $a){
+			if($attachment === $a){
+				unset($this->attachments[$i]);
+			}
+		}
+	}
+
+	public function removeAttachments() : void{
+		foreach($this->attachments as $i => $a){
+			unset($this->attachments[$i]);
+		}
+	}
+
+	/**
+	 * @return ThreadSafeLoggerAttachment[]
+	 */
+	public function getAttachments() : array{
+		return (array) $this->attachments;
+	}
+}
diff --git a/src/thread/log/ThreadSafeLogger.php b/src/thread/log/ThreadSafeLogger.php
new file mode 100644
index 0000000000..a937f8f58f
--- /dev/null
+++ b/src/thread/log/ThreadSafeLogger.php
@@ -0,0 +1,30 @@
+<?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\thread\log;
+
+use pmmp\thread\ThreadSafe;
+
+abstract class ThreadSafeLogger extends ThreadSafe implements \Logger{
+
+}
diff --git a/src/thread/log/ThreadSafeLoggerAttachment.php b/src/thread/log/ThreadSafeLoggerAttachment.php
new file mode 100644
index 0000000000..1482605779
--- /dev/null
+++ b/src/thread/log/ThreadSafeLoggerAttachment.php
@@ -0,0 +1,30 @@
+<?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\thread\log;
+
+use pmmp\thread\ThreadSafe;
+
+abstract class ThreadSafeLoggerAttachment extends ThreadSafe{
+	abstract public function log(string $level, string $message) : void;
+}
diff --git a/src/timings/Timings.php b/src/timings/Timings.php
index 1f8426969f..77f8efee64 100644
--- a/src/timings/Timings.php
+++ b/src/timings/Timings.php
@@ -25,102 +25,70 @@ namespace pocketmine\timings;
 
 use pocketmine\block\tile\Tile;
 use pocketmine\entity\Entity;
+use pocketmine\event\Event;
 use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\network\mcpe\protocol\ServerboundPacket;
 use pocketmine\player\Player;
+use pocketmine\scheduler\AsyncTask;
+use pocketmine\scheduler\Task;
 use pocketmine\scheduler\TaskHandler;
-use function dechex;
+use function get_class;
+use function str_starts_with;
 
 abstract class Timings{
-	public const INCLUDED_BY_OTHER_TIMINGS_PREFIX = "** ";
+	public const GROUP_MINECRAFT = "Minecraft";
+	public const GROUP_BREAKDOWN = "Minecraft - Breakdown";
 
 	private static bool $initialized = false;
 
-	/** @var TimingsHandler */
-	public static $fullTick;
-	/** @var TimingsHandler */
-	public static $serverTick;
-	/** @var TimingsHandler */
-	public static $serverInterrupts;
-	/** @var TimingsHandler */
-	public static $memoryManager;
-	/** @var TimingsHandler */
-	public static $garbageCollector;
-	/** @var TimingsHandler */
-	public static $titleTick;
-	/** @var TimingsHandler */
-	public static $playerNetworkSend;
-	/** @var TimingsHandler */
-	public static $playerNetworkSendCompress;
-	/** @var TimingsHandler */
-	public static $playerNetworkSendEncrypt;
-	/** @var TimingsHandler */
-	public static $playerNetworkReceive;
-	/** @var TimingsHandler */
-	public static $playerNetworkReceiveDecompress;
-	/** @var TimingsHandler */
-	public static $playerNetworkReceiveDecrypt;
-	/** @var TimingsHandler */
-	public static $playerChunkOrder;
-	/** @var TimingsHandler */
-	public static $playerChunkSend;
-	/** @var TimingsHandler */
-	public static $connection;
-	/** @var TimingsHandler */
-	public static $scheduler;
-	/** @var TimingsHandler */
-	public static $serverCommand;
-	/** @var TimingsHandler */
-	public static $worldLoad;
-	/** @var TimingsHandler */
-	public static $worldSave;
-	/** @var TimingsHandler */
-	public static $population;
-	/** @var TimingsHandler */
-	public static $generationCallback;
-	/** @var TimingsHandler */
-	public static $permissibleCalculation;
-	/** @var TimingsHandler */
-	public static $permissibleCalculationDiff;
-	/** @var TimingsHandler */
-	public static $permissibleCalculationCallback;
+	public static TimingsHandler $fullTick;
+	public static TimingsHandler $serverTick;
+	public static TimingsHandler $serverInterrupts;
+	public static TimingsHandler $memoryManager;
+	public static TimingsHandler $garbageCollector;
+	public static TimingsHandler $titleTick;
+	public static TimingsHandler $playerNetworkSend;
+	public static TimingsHandler $playerNetworkSendCompress;
+	public static TimingsHandler $playerNetworkSendCompressBroadcast;
+	public static TimingsHandler $playerNetworkSendCompressSessionBuffer;
+	public static TimingsHandler $playerNetworkSendEncrypt;
+	public static TimingsHandler $playerNetworkSendInventorySync;
+	public static TimingsHandler $playerNetworkSendPreSpawnGameData;
+	public static TimingsHandler $playerNetworkReceive;
+	public static TimingsHandler $playerNetworkReceiveDecompress;
+	public static TimingsHandler $playerNetworkReceiveDecrypt;
+	public static TimingsHandler $playerChunkOrder;
+	public static TimingsHandler $playerChunkSend;
+	public static TimingsHandler $connection;
+	public static TimingsHandler $scheduler;
+	public static TimingsHandler $serverCommand;
+	public static TimingsHandler $permissibleCalculation;
+	public static TimingsHandler $permissibleCalculationDiff;
+	public static TimingsHandler $permissibleCalculationCallback;
+	public static TimingsHandler $entityMove;
+	public static TimingsHandler $entityMoveCollision;
+	public static TimingsHandler $projectileMove;
+	public static TimingsHandler $projectileMoveRayTrace;
+	public static TimingsHandler $playerCheckNearEntities;
+	public static TimingsHandler $entityBaseTick;
+	public static TimingsHandler $livingEntityBaseTick;
+	public static TimingsHandler $itemEntityBaseTick;
 
-	/** @var TimingsHandler */
-	public static $entityMove;
-	/** @var TimingsHandler */
-	public static $playerCheckNearEntities;
-	/** @var TimingsHandler */
-	public static $tickEntity;
-	/** @var TimingsHandler */
-	public static $tickTileEntity;
+	public static TimingsHandler $schedulerSync;
+	public static TimingsHandler $schedulerAsync;
 
-	/** @var TimingsHandler */
-	public static $entityBaseTick;
-	/** @var TimingsHandler */
-	public static $livingEntityBaseTick;
+	public static TimingsHandler $playerCommand;
+	public static TimingsHandler $craftingDataCacheRebuild;
 
-	/** @var TimingsHandler */
-	public static $schedulerSync;
-	/** @var TimingsHandler */
-	public static $schedulerAsync;
-
-	/** @var TimingsHandler */
-	public static $playerCommand;
-
-	/** @var TimingsHandler */
-	public static $craftingDataCacheRebuild;
-
-	/** @var TimingsHandler */
-	public static $syncPlayerDataLoad;
-	/** @var TimingsHandler */
-	public static $syncPlayerDataSave;
+	public static TimingsHandler $syncPlayerDataLoad;
+	public static TimingsHandler $syncPlayerDataSave;
 
 	/** @var TimingsHandler[] */
-	public static $entityTypeTimingMap = [];
+	public static array $entityTypeTimingMap = [];
 	/** @var TimingsHandler[] */
-	public static $tileEntityTypeTimingMap = [];
+	public static array $tileEntityTypeTimingMap = [];
 	/** @var TimingsHandler[] */
-	public static $packetReceiveTimingMap = [];
+	public static array $packetReceiveTimingMap = [];
 
 	/** @var TimingsHandler[] */
 	private static array $packetDecodeTimingMap = [];
@@ -128,12 +96,38 @@ abstract class Timings{
 	private static array $packetHandleTimingMap = [];
 
 	/** @var TimingsHandler[] */
-	public static $packetSendTimingMap = [];
-	/** @var TimingsHandler[] */
-	public static $pluginTaskTimingMap = [];
+	private static array $packetEncodeTimingMap = [];
 
-	/** @var TimingsHandler */
-	public static $broadcastPackets;
+	/** @var TimingsHandler[] */
+	public static array $packetSendTimingMap = [];
+	/** @var TimingsHandler[] */
+	public static array $pluginTaskTimingMap = [];
+
+	/**
+	 * @var TimingsHandler[]
+	 * @phpstan-var array<string, TimingsHandler>
+	 */
+	private static array $commandTimingMap = [];
+
+	public static TimingsHandler $broadcastPackets;
+
+	public static TimingsHandler $playerMove;
+
+	/** @var TimingsHandler[] */
+	private static array $events = [];
+	/** @var TimingsHandler[][] */
+	private static array $eventHandlers = [];
+
+	private static TimingsHandler $asyncTaskProgressUpdateParent;
+	private static TimingsHandler $asyncTaskCompletionParent;
+	private static TimingsHandler $asyncTaskErrorParent;
+
+	/** @var TimingsHandler[] */
+	private static array $asyncTaskProgressUpdate = [];
+	/** @var TimingsHandler[] */
+	private static array $asyncTaskCompletion = [];
+	/** @var TimingsHandler[] */
+	private static array $asyncTaskError = [];
 
 	public static function init() : void{
 		if(self::$initialized){
@@ -142,56 +136,70 @@ abstract class Timings{
 		self::$initialized = true;
 
 		self::$fullTick = new TimingsHandler("Full Server Tick");
-		self::$serverTick = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Server Tick Update Cycle", self::$fullTick);
-		self::$serverInterrupts = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Server Mid-Tick Processing", self::$fullTick);
+		self::$serverTick = new TimingsHandler("Server Tick Update Cycle", self::$fullTick);
+		self::$serverInterrupts = new TimingsHandler("Server Mid-Tick Processing", self::$fullTick);
 		self::$memoryManager = new TimingsHandler("Memory Manager");
 		self::$garbageCollector = new TimingsHandler("Garbage Collector", self::$memoryManager);
 		self::$titleTick = new TimingsHandler("Console Title Tick");
 
-		self::$playerNetworkSend = new TimingsHandler("Player Network Send");
-		self::$playerNetworkSendCompress = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Player Network Send - Compression", self::$playerNetworkSend);
-		self::$playerNetworkSendEncrypt = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Player Network Send - Encryption", self::$playerNetworkSend);
-
-		self::$playerNetworkReceive = new TimingsHandler("Player Network Receive");
-		self::$playerNetworkReceiveDecompress = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Player Network Receive - Decompression", self::$playerNetworkReceive);
-		self::$playerNetworkReceiveDecrypt = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Player Network Receive - Decryption", self::$playerNetworkReceive);
-
-		self::$broadcastPackets = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Broadcast Packets", self::$playerNetworkSend);
-
-		self::$playerChunkOrder = new TimingsHandler("Player Order Chunks");
-		self::$playerChunkSend = new TimingsHandler("Player Send Chunks");
 		self::$connection = new TimingsHandler("Connection Handler");
+
+		self::$playerNetworkSend = new TimingsHandler("Player Network Send", self::$connection);
+		self::$playerNetworkSendCompress = new TimingsHandler("Player Network Send - Compression", self::$playerNetworkSend);
+		self::$playerNetworkSendCompressBroadcast = new TimingsHandler("Player Network Send - Compression (Broadcast)", self::$playerNetworkSendCompress);
+		self::$playerNetworkSendCompressSessionBuffer = new TimingsHandler("Player Network Send - Compression (Session Buffer)", self::$playerNetworkSendCompress);
+		self::$playerNetworkSendEncrypt = new TimingsHandler("Player Network Send - Encryption", self::$playerNetworkSend);
+		self::$playerNetworkSendInventorySync = new TimingsHandler("Player Network Send - Inventory Sync", self::$playerNetworkSend);
+		self::$playerNetworkSendPreSpawnGameData = new TimingsHandler("Player Network Send - Pre-Spawn Game Data", self::$playerNetworkSend);
+
+		self::$playerNetworkReceive = new TimingsHandler("Player Network Receive", self::$connection);
+		self::$playerNetworkReceiveDecompress = new TimingsHandler("Player Network Receive - Decompression", self::$playerNetworkReceive);
+		self::$playerNetworkReceiveDecrypt = new TimingsHandler("Player Network Receive - Decryption", self::$playerNetworkReceive);
+
+		self::$broadcastPackets = new TimingsHandler("Broadcast Packets", self::$playerNetworkSend);
+
+		self::$playerMove = new TimingsHandler("Player Movement");
+		self::$playerChunkOrder = new TimingsHandler("Player Order Chunks");
+		self::$playerChunkSend = new TimingsHandler("Player Network Send - Chunks", self::$playerNetworkSend);
 		self::$scheduler = new TimingsHandler("Scheduler");
 		self::$serverCommand = new TimingsHandler("Server Command");
-		self::$worldLoad = new TimingsHandler("World Load");
-		self::$worldSave = new TimingsHandler("World Save");
-		self::$population = new TimingsHandler("World Population");
-		self::$generationCallback = new TimingsHandler("World Generation Callback");
 		self::$permissibleCalculation = new TimingsHandler("Permissible Calculation");
-		self::$permissibleCalculationDiff = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Permissible Calculation - Diff", self::$permissibleCalculation);
-		self::$permissibleCalculationCallback = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Permissible Calculation - Callbacks", self::$permissibleCalculation);
+		self::$permissibleCalculationDiff = new TimingsHandler("Permissible Calculation - Diff", self::$permissibleCalculation);
+		self::$permissibleCalculationCallback = new TimingsHandler("Permissible Calculation - Callbacks", self::$permissibleCalculation);
 
 		self::$syncPlayerDataLoad = new TimingsHandler("Player Data Load");
 		self::$syncPlayerDataSave = new TimingsHandler("Player Data Save");
 
-		self::$entityMove = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "entityMove");
-		self::$playerCheckNearEntities = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "checkNearEntities");
-		self::$tickEntity = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "tickEntity");
-		self::$tickTileEntity = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "tickTileEntity");
+		self::$entityMove = new TimingsHandler("Entity Movement");
+		self::$entityMoveCollision = new TimingsHandler("Entity Movement - Collision Checks", self::$entityMove);
 
-		self::$entityBaseTick = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "entityBaseTick");
-		self::$livingEntityBaseTick = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "livingEntityBaseTick");
+		self::$projectileMove = new TimingsHandler("Projectile Movement", self::$entityMove);
+		self::$projectileMoveRayTrace = new TimingsHandler("Projectile Movement - Ray Tracing", self::$projectileMove);
 
-		self::$schedulerSync = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Scheduler - Sync Tasks");
-		self::$schedulerAsync = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Scheduler - Async Tasks");
+		self::$playerCheckNearEntities = new TimingsHandler("checkNearEntities");
+		self::$entityBaseTick = new TimingsHandler("Entity Base Tick");
+		self::$livingEntityBaseTick = new TimingsHandler("Entity Base Tick - Living");
+		self::$itemEntityBaseTick = new TimingsHandler("Entity Base Tick - ItemEntity");
 
-		self::$playerCommand = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "playerCommand");
-		self::$craftingDataCacheRebuild = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "craftingDataCacheRebuild");
+		self::$schedulerSync = new TimingsHandler("Scheduler - Sync Tasks");
+
+		self::$schedulerAsync = new TimingsHandler("Scheduler - Async Tasks");
+		self::$asyncTaskProgressUpdateParent = new TimingsHandler("Async Tasks - Progress Updates", self::$schedulerAsync);
+		self::$asyncTaskCompletionParent = new TimingsHandler("Async Tasks - Completion Handlers", self::$schedulerAsync);
+		self::$asyncTaskErrorParent = new TimingsHandler("Async Tasks - Error Handlers", self::$schedulerAsync);
+
+		self::$playerCommand = new TimingsHandler("Player Command");
+		self::$craftingDataCacheRebuild = new TimingsHandler("Build CraftingDataPacket Cache");
 
 	}
 
+	/**
+	 * @template TTask of Task
+	 * @phpstan-param TaskHandler<TTask> $task
+	 */
 	public static function getScheduledTaskTimings(TaskHandler $task, int $period) : TimingsHandler{
-		$name = "Task: " . $task->getOwnerName() . " Runnable: " . $task->getTaskName();
+		self::init();
+		$name = "Task: " . $task->getTaskName();
 
 		if($period > 0){
 			$name .= "(interval:" . $period . ")";
@@ -200,67 +208,153 @@ abstract class Timings{
 		}
 
 		if(!isset(self::$pluginTaskTimingMap[$name])){
-			self::$pluginTaskTimingMap[$name] = new TimingsHandler($name, self::$schedulerSync);
+			self::$pluginTaskTimingMap[$name] = new TimingsHandler($name, self::$schedulerSync, $task->getOwnerName());
 		}
 
 		return self::$pluginTaskTimingMap[$name];
 	}
 
+	/**
+	 * @phpstan-param class-string<covariant object> $class
+	 */
+	private static function shortenCoreClassName(string $class, string $prefix) : string{
+		if(str_starts_with($class, $prefix)){
+			return (new \ReflectionClass($class))->getShortName();
+		}
+		return $class;
+	}
+
 	public static function getEntityTimings(Entity $entity) : TimingsHandler{
-		$entityType = (new \ReflectionClass($entity))->getShortName();
-		if(!isset(self::$entityTypeTimingMap[$entityType])){
+		self::init();
+		if(!isset(self::$entityTypeTimingMap[$entity::class])){
 			if($entity instanceof Player){
-				self::$entityTypeTimingMap[$entityType] = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "tickEntity - EntityPlayer", self::$tickEntity);
+				//the timings viewer calculates average player count by looking at this timer, so we need to ensure it has
+				//a name it can identify. However, we also want to make it obvious if this is a custom Player class.
+				$displayName = $entity::class !== Player::class ? "Player (" . $entity::class . ")" : "Player";
 			}else{
-				self::$entityTypeTimingMap[$entityType] = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "tickEntity - " . $entityType, self::$tickEntity);
+				$displayName = self::shortenCoreClassName($entity::class, "pocketmine\\entity\\");
 			}
+			self::$entityTypeTimingMap[$entity::class] = new TimingsHandler("Entity Tick - " . $displayName);
 		}
 
-		return self::$entityTypeTimingMap[$entityType];
+		return self::$entityTypeTimingMap[$entity::class];
 	}
 
 	public static function getTileEntityTimings(Tile $tile) : TimingsHandler{
-		$tileType = (new \ReflectionClass($tile))->getShortName();
-		if(!isset(self::$tileEntityTypeTimingMap[$tileType])){
-			self::$tileEntityTypeTimingMap[$tileType] = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "tickTileEntity - " . $tileType, self::$tickTileEntity);
+		self::init();
+		if(!isset(self::$tileEntityTypeTimingMap[$tile::class])){
+			self::$tileEntityTypeTimingMap[$tile::class] = new TimingsHandler(
+				"Block Entity Tick - " . self::shortenCoreClassName($tile::class, "pocketmine\\block\\tile\\")
+			);
 		}
 
-		return self::$tileEntityTypeTimingMap[$tileType];
+		return self::$tileEntityTypeTimingMap[$tile::class];
 	}
 
 	public static function getReceiveDataPacketTimings(ServerboundPacket $pk) : TimingsHandler{
-		$pid = $pk->pid();
-		if(!isset(self::$packetReceiveTimingMap[$pid])){
-			$pkName = (new \ReflectionClass($pk))->getShortName();
-			self::$packetReceiveTimingMap[$pid] = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "receivePacket - " . $pkName . " [0x" . dechex($pid) . "]", self::$playerNetworkReceive);
+		self::init();
+		if(!isset(self::$packetReceiveTimingMap[$pk::class])){
+			self::$packetReceiveTimingMap[$pk::class] = new TimingsHandler("Receive - " . $pk->getName(), self::$playerNetworkReceive);
 		}
 
-		return self::$packetReceiveTimingMap[$pid];
+		return self::$packetReceiveTimingMap[$pk::class];
 	}
 
 	public static function getDecodeDataPacketTimings(ServerboundPacket $pk) : TimingsHandler{
-		$pid = $pk->pid();
-		return self::$packetDecodeTimingMap[$pid] ??= new TimingsHandler(
-			self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Decode - " . $pk->getName() . " [0x" . dechex($pid) . "]",
+		return self::$packetDecodeTimingMap[$pk::class] ??= new TimingsHandler(
+			"Decode - " . $pk->getName(),
 			self::getReceiveDataPacketTimings($pk)
 		);
 	}
 
 	public static function getHandleDataPacketTimings(ServerboundPacket $pk) : TimingsHandler{
-		$pid = $pk->pid();
-		return self::$packetHandleTimingMap[$pid] ??= new TimingsHandler(
-			self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Handler - " . $pk->getName() . " [0x" . dechex($pid) . "]",
+		return self::$packetHandleTimingMap[$pk::class] ??= new TimingsHandler(
+			"Handler - " . $pk->getName(),
 			self::getReceiveDataPacketTimings($pk)
 		);
 	}
 
+	public static function getEncodeDataPacketTimings(ClientboundPacket $pk) : TimingsHandler{
+		return self::$packetEncodeTimingMap[$pk::class] ??= new TimingsHandler(
+			"Encode - " . $pk->getName(),
+			self::getSendDataPacketTimings($pk)
+		);
+	}
+
 	public static function getSendDataPacketTimings(ClientboundPacket $pk) : TimingsHandler{
-		$pid = $pk->pid();
-		if(!isset(self::$packetSendTimingMap[$pid])){
-			$pkName = (new \ReflectionClass($pk))->getShortName();
-			self::$packetSendTimingMap[$pid] = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "sendPacket - " . $pkName . " [0x" . dechex($pid) . "]", self::$playerNetworkSend);
+		self::init();
+		if(!isset(self::$packetSendTimingMap[$pk::class])){
+			self::$packetSendTimingMap[$pk::class] = new TimingsHandler("Send - " . $pk->getName(), self::$playerNetworkSend);
 		}
 
-		return self::$packetSendTimingMap[$pid];
+		return self::$packetSendTimingMap[$pk::class];
+	}
+
+	public static function getCommandDispatchTimings(string $commandName) : TimingsHandler{
+		self::init();
+
+		return self::$commandTimingMap[$commandName] ??= new TimingsHandler("Command - " . $commandName);
+	}
+
+	public static function getEventTimings(Event $event) : TimingsHandler{
+		$eventClass = get_class($event);
+		if(!isset(self::$events[$eventClass])){
+			self::$events[$eventClass] = new TimingsHandler(self::shortenCoreClassName($eventClass, "pocketmine\\event\\"), group: "Events");
+		}
+
+		return self::$events[$eventClass];
+	}
+
+	/**
+	 * @phpstan-param class-string<covariant Event> $event
+	 */
+	public static function getEventHandlerTimings(string $event, string $handlerName, string $group) : TimingsHandler{
+		if(!isset(self::$eventHandlers[$event][$handlerName])){
+			self::$eventHandlers[$event][$handlerName] = new TimingsHandler($handlerName . "(" . self::shortenCoreClassName($event, "pocketmine\\event\\") . ")", group: $group);
+		}
+
+		return self::$eventHandlers[$event][$handlerName];
+	}
+
+	public static function getAsyncTaskProgressUpdateTimings(AsyncTask $task, string $group = self::GROUP_MINECRAFT) : TimingsHandler{
+		$taskClass = $task::class;
+		if(!isset(self::$asyncTaskProgressUpdate[$taskClass])){
+			self::init();
+			self::$asyncTaskProgressUpdate[$taskClass] = new TimingsHandler(
+				"AsyncTask - " . self::shortenCoreClassName($taskClass, "pocketmine\\") . " - Progress Updates",
+				self::$asyncTaskProgressUpdateParent,
+				$group
+			);
+		}
+
+		return self::$asyncTaskProgressUpdate[$taskClass];
+	}
+
+	public static function getAsyncTaskCompletionTimings(AsyncTask $task, string $group = self::GROUP_MINECRAFT) : TimingsHandler{
+		$taskClass = $task::class;
+		if(!isset(self::$asyncTaskCompletion[$taskClass])){
+			self::init();
+			self::$asyncTaskCompletion[$taskClass] = new TimingsHandler(
+				"AsyncTask - " . self::shortenCoreClassName($taskClass, "pocketmine\\") . " - Completion Handler",
+				self::$asyncTaskCompletionParent,
+				$group
+			);
+		}
+
+		return self::$asyncTaskCompletion[$taskClass];
+	}
+
+	public static function getAsyncTaskErrorTimings(AsyncTask $task, string $group = self::GROUP_MINECRAFT) : TimingsHandler{
+		$taskClass = $task::class;
+		if(!isset(self::$asyncTaskError[$taskClass])){
+			self::init();
+			self::$asyncTaskError[$taskClass] = new TimingsHandler(
+				"AsyncTask - " . self::shortenCoreClassName($taskClass, "pocketmine\\") . " - Error Handler",
+				self::$asyncTaskErrorParent,
+				$group
+			);
+		}
+
+		return self::$asyncTaskError[$taskClass];
 	}
 }
diff --git a/src/timings/TimingsHandler.php b/src/timings/TimingsHandler.php
index a619e3ba84..574dd6d2b8 100644
--- a/src/timings/TimingsHandler.php
+++ b/src/timings/TimingsHandler.php
@@ -23,18 +23,21 @@ declare(strict_types=1);
 
 namespace pocketmine\timings;
 
-use pocketmine\entity\Living;
 use pocketmine\Server;
-use function count;
+use pocketmine\utils\Utils;
 use function hrtime;
+use function implode;
+use function spl_object_id;
 
 class TimingsHandler{
+	private const FORMAT_VERSION = 2; //peak timings fix
+
 	private static bool $enabled = false;
 	private static int $timingStart = 0;
 
 	/** @return string[] */
 	public static function printTimings() : array{
-		$result = ["Minecraft"];
+		$groups = [];
 
 		foreach(TimingsRecord::getAll() as $timings){
 			$time = $timings->getTotalTime();
@@ -46,25 +49,33 @@ class TimingsHandler{
 
 			$avg = $time / $count;
 
-			$result[] = "    " . $timings->getName() . " Time: $time Count: " . $count . " Avg: $avg Violations: " . $timings->getViolations();
+			$group = $timings->getGroup();
+			$groups[$group][] = implode(" ", [
+				$timings->getName(),
+				"Time: $time",
+				"Count: $count",
+				"Avg: $avg",
+				"Violations: " . $timings->getViolations(),
+				"RecordId: " . $timings->getId(),
+				"ParentRecordId: " . ($timings->getParentId() ?? "none"),
+				"TimerId: " . $timings->getTimerId(),
+				"Ticks: " . $timings->getTicksActive(),
+				"Peak: " . $timings->getPeakTime(),
+			]);
+		}
+		$result = [];
+
+		foreach(Utils::stringifyKeys($groups) as $groupName => $lines){
+			$result[] = $groupName;
+			foreach($lines as $line){
+				$result[] = "    $line";
+			}
 		}
 
 		$result[] = "# Version " . Server::getInstance()->getVersion();
 		$result[] = "# " . Server::getInstance()->getName() . " " . Server::getInstance()->getPocketMineVersion();
 
-		$entities = 0;
-		$livingEntities = 0;
-		foreach(Server::getInstance()->getWorldManager()->getWorlds() as $world){
-			$entities += count($world->getEntities());
-			foreach($world->getEntities() as $e){
-				if($e instanceof Living){
-					++$livingEntities;
-				}
-			}
-		}
-
-		$result[] = "# Entities " . $entities;
-		$result[] = "# LivingEntities " . $livingEntities;
+		$result[] = "# FormatVersion " . self::FORMAT_VERSION;
 
 		$sampleTime = hrtime(true) - self::$timingStart;
 		$result[] = "Sample time $sampleTime (" . ($sampleTime / 1000000000) . "s)";
@@ -85,7 +96,7 @@ class TimingsHandler{
 	}
 
 	public static function reload() : void{
-		TimingsRecord::clearRecords();
+		TimingsRecord::reset();
 		if(self::$enabled){
 			self::$timingStart = hrtime(true);
 		}
@@ -97,16 +108,25 @@ class TimingsHandler{
 		}
 	}
 
-	private ?TimingsRecord $record = null;
+	private ?TimingsRecord $rootRecord = null;
 	private int $timingDepth = 0;
 
+	/**
+	 * @var TimingsRecord[]
+	 * @phpstan-var array<int, TimingsRecord>
+	 */
+	private array $recordsByParent = [];
+
 	public function __construct(
 		private string $name,
-		private ?TimingsHandler $parent = null
+		private ?TimingsHandler $parent = null,
+		private string $group = Timings::GROUP_MINECRAFT
 	){}
 
 	public function getName() : string{ return $this->name; }
 
+	public function getGroup() : string{ return $this->group; }
+
 	public function startTiming() : void{
 		if(self::$enabled){
 			$this->internalStartTiming(hrtime(true));
@@ -115,13 +135,24 @@ class TimingsHandler{
 
 	private function internalStartTiming(int $now) : void{
 		if(++$this->timingDepth === 1){
-			if($this->record === null){
-				$this->record = new TimingsRecord($this);
-			}
-			$this->record->startTiming($now);
 			if($this->parent !== null){
 				$this->parent->internalStartTiming($now);
 			}
+
+			$current = TimingsRecord::getCurrentRecord();
+			if($current !== null){
+				$record = $this->recordsByParent[spl_object_id($current)] ?? null;
+				if($record === null){
+					$record = new TimingsRecord($this, $current);
+					$this->recordsByParent[spl_object_id($current)] = $record;
+				}
+			}else{
+				if($this->rootRecord === null){
+					$this->rootRecord = new TimingsRecord($this, null);
+				}
+				$record = $this->rootRecord;
+			}
+			$record->startTiming($now);
 		}
 	}
 
@@ -142,10 +173,13 @@ class TimingsHandler{
 			return;
 		}
 
-		if($this->record !== null){
-			//this might be null if a timings reset occurred while the timer was running
-			$this->record->stopTiming($now);
+		$record = TimingsRecord::getCurrentRecord();
+		$timerId = spl_object_id($this);
+		for(; $record !== null && $record->getTimerId() !== $timerId; $record = TimingsRecord::getCurrentRecord()){
+			\GlobalLogger::get()->error("Timer \"" . $record->getName() . "\" should have been stopped before stopping timer \"" . $this->name . "\"");
+			$record->stopTiming($now);
 		}
+		$record?->stopTiming($now);
 		if($this->parent !== null){
 			$this->parent->internalStopTiming($now);
 		}
@@ -170,7 +204,9 @@ class TimingsHandler{
 	/**
 	 * @internal
 	 */
-	public function destroyCycles() : void{
-		$this->record = null;
+	public function reset() : void{
+		$this->rootRecord = null;
+		$this->recordsByParent = [];
+		$this->timingDepth = 0;
 	}
 }
diff --git a/src/timings/TimingsRecord.php b/src/timings/TimingsRecord.php
index 8ee752ae2b..2e4928d8a6 100644
--- a/src/timings/TimingsRecord.php
+++ b/src/timings/TimingsRecord.php
@@ -24,7 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\timings;
 
 use pocketmine\Server;
-use function round;
+use pocketmine\utils\AssumptionFailedError;
+use function floor;
 use function spl_object_id;
 
 /**
@@ -39,11 +40,17 @@ final class TimingsRecord{
 	 */
 	private static array $records = [];
 
-	public static function clearRecords() : void{
+	private static ?self $currentRecord = null;
+
+	/**
+	 * @internal
+	 */
+	public static function reset() : void{
 		foreach(self::$records as $record){
-			$record->handler->destroyCycles();
+			$record->handler->reset();
 		}
 		self::$records = [];
+		self::$currentRecord = null;
 	}
 
 	/**
@@ -55,11 +62,14 @@ final class TimingsRecord{
 	public static function tick(bool $measure = true) : void{
 		if($measure){
 			foreach(self::$records as $record){
-				if($record->curTickTotal > Server::TARGET_NANOSECONDS_PER_TICK){
-					$record->violations += (int) round($record->curTickTotal / Server::TARGET_NANOSECONDS_PER_TICK);
+				if($record->curCount > 0){
+					if($record->curTickTotal > Server::TARGET_NANOSECONDS_PER_TICK){
+						$record->violations += (int) floor($record->curTickTotal / Server::TARGET_NANOSECONDS_PER_TICK);
+					}
+					$record->curTickTotal = 0;
+					$record->curCount = 0;
+					$record->ticksActive++;
 				}
-				$record->curTickTotal = 0;
-				$record->curCount = 0;
 			}
 		}else{
 			foreach(self::$records as $record){
@@ -78,16 +88,27 @@ final class TimingsRecord{
 	private int $totalTime = 0;
 	private int $curTickTotal = 0;
 	private int $violations = 0;
+	private int $ticksActive = 0;
+	private int $peakTime = 0;
 
 	public function __construct(
 		//I'm not the biggest fan of this cycle, but it seems to be the most effective way to avoid leaking anything.
-		private TimingsHandler $handler
+		private TimingsHandler $handler,
+		private ?TimingsRecord $parentRecord
 	){
 		self::$records[spl_object_id($this)] = $this;
 	}
 
+	public function getId() : int{ return spl_object_id($this); }
+
+	public function getParentId() : ?int{ return $this->parentRecord?->getId(); }
+
+	public function getTimerId() : int{ return spl_object_id($this->handler); }
+
 	public function getName() : string{ return $this->handler->getName(); }
 
+	public function getGroup() : string{ return $this->handler->getGroup(); }
+
 	public function getCount() : int{ return $this->count; }
 
 	public function getCurCount() : int{ return $this->curCount; }
@@ -100,19 +121,40 @@ final class TimingsRecord{
 
 	public function getViolations() : int{ return $this->violations; }
 
+	public function getTicksActive() : int{ return $this->ticksActive; }
+
+	public function getPeakTime() : int{ return $this->peakTime; }
+
 	public function startTiming(int $now) : void{
 		$this->start = $now;
+		self::$currentRecord = $this;
 	}
 
 	public function stopTiming(int $now) : void{
 		if($this->start == 0){
 			return;
 		}
+		if(self::$currentRecord !== $this){
+			if(self::$currentRecord === null){
+				//timings may have been stopped while this timer was running
+				return;
+			}
+
+			throw new AssumptionFailedError("stopTiming() called on a non-current timer");
+		}
+		self::$currentRecord = $this->parentRecord;
 		$diff = $now - $this->start;
 		$this->totalTime += $diff;
 		$this->curTickTotal += $diff;
 		++$this->curCount;
 		++$this->count;
 		$this->start = 0;
+		if($diff > $this->peakTime){
+			$this->peakTime = $diff;
+		}
+	}
+
+	public static function getCurrentRecord() : ?self{
+		return self::$currentRecord;
 	}
 }
diff --git a/src/updater/UpdateCheckTask.php b/src/updater/UpdateCheckTask.php
index ae56682f3e..af73f05af4 100644
--- a/src/updater/UpdateCheckTask.php
+++ b/src/updater/UpdateCheckTask.php
@@ -55,6 +55,7 @@ class UpdateCheckTask extends AsyncTask{
 				}else{
 					$mapper = new \JsonMapper();
 					$mapper->bExceptionOnMissingData = true;
+					$mapper->bStrictObjectTypeChecking = true;
 					$mapper->bEnforceMapType = false;
 					try{
 						/** @var UpdateInfo $responseObj */
diff --git a/src/updater/UpdateChecker.php b/src/updater/UpdateChecker.php
index b33d271a8d..4a3ee34446 100644
--- a/src/updater/UpdateChecker.php
+++ b/src/updater/UpdateChecker.php
@@ -27,19 +27,16 @@ use pocketmine\event\server\UpdateNotifyEvent;
 use pocketmine\Server;
 use pocketmine\utils\VersionString;
 use pocketmine\VersionInfo;
+use pocketmine\YmlServerProperties;
 use function date;
 use function strtolower;
 use function ucfirst;
 
 class UpdateChecker{
 
-	/** @var Server */
-	protected $server;
-	/** @var string */
-	protected $endpoint;
-	/** @var UpdateInfo|null */
-	protected $updateInfo = null;
-
+	protected Server $server;
+	protected string $endpoint;
+	protected ?UpdateInfo $updateInfo = null;
 	private \Logger $logger;
 
 	public function __construct(Server $server, string $endpoint){
@@ -47,7 +44,7 @@ class UpdateChecker{
 		$this->logger = new \PrefixedLogger($server->getLogger(), "Update Checker");
 		$this->endpoint = "http://$endpoint/api/";
 
-		if($server->getConfigGroup()->getPropertyBool("auto-updater.enabled", true)){
+		if($server->getConfigGroup()->getPropertyBool(YmlServerProperties::AUTO_UPDATER_ENABLED, true)){
 			$this->doCheck();
 		}
 	}
@@ -63,7 +60,7 @@ class UpdateChecker{
 		$this->checkUpdate($updateInfo);
 		if($this->hasUpdate()){
 			(new UpdateNotifyEvent($this))->call();
-			if($this->server->getConfigGroup()->getPropertyBool("auto-updater.on-update.warn-console", true)){
+			if($this->server->getConfigGroup()->getPropertyBool(YmlServerProperties::AUTO_UPDATER_ON_UPDATE_WARN_CONSOLE, true)){
 				$this->showConsoleUpdate();
 			}
 		}else{
@@ -161,7 +158,7 @@ class UpdateChecker{
 	 * Returns the channel used for update checking (stable, beta, dev)
 	 */
 	public function getChannel() : string{
-		return strtolower($this->server->getConfigGroup()->getPropertyString("auto-updater.preferred-channel", "stable"));
+		return strtolower($this->server->getConfigGroup()->getPropertyString(YmlServerProperties::AUTO_UPDATER_PREFERRED_CHANNEL, "stable"));
 	}
 
 	/**
diff --git a/src/utils/Config.php b/src/utils/Config.php
index 670d6bda32..cabc8fe166 100644
--- a/src/utils/Config.php
+++ b/src/utils/Config.php
@@ -89,7 +89,7 @@ class Config{
 	private bool $changed = false;
 
 	/** @var int[] */
-	public static $formats = [
+	public static array $formats = [
 		"properties" => Config::PROPERTIES,
 		"cnf" => Config::CNF,
 		"conf" => Config::CNF,
@@ -338,11 +338,7 @@ class Config{
 		$this->remove($k);
 	}
 
-	/**
-	 * @param string $key
-	 * @param mixed  $value
-	 */
-	public function setNested($key, $value) : void{
+	public function setNested(string $key, mixed $value) : void{
 		$vars = explode(".", $key);
 		$base = array_shift($vars);
 
@@ -365,13 +361,7 @@ class Config{
 		$this->changed = true;
 	}
 
-	/**
-	 * @param string $key
-	 * @param mixed  $default
-	 *
-	 * @return mixed
-	 */
-	public function getNested($key, $default = null){
+	public function getNested(string $key, mixed $default = null) : mixed{
 		if(isset($this->nestedCache[$key])){
 			return $this->nestedCache[$key];
 		}
@@ -417,21 +407,11 @@ class Config{
 		}
 	}
 
-	/**
-	 * @param string $k
-	 * @param mixed  $default
-	 *
-	 * @return bool|mixed
-	 */
-	public function get($k, $default = false){
+	public function get(string $k, mixed $default = false) : mixed{
 		return $this->config[$k] ?? $default;
 	}
 
-	/**
-	 * @param string $k key to be set
-	 * @param mixed  $v value to set key
-	 */
-	public function set($k, $v = true) : void{
+	public function set(string $k, mixed $v = true) : void{
 		$this->config[$k] = $v;
 		$this->changed = true;
 		foreach(Utils::stringifyKeys($this->nestedCache) as $nestedKey => $nvalue){
@@ -451,10 +431,9 @@ class Config{
 	}
 
 	/**
-	 * @param string $k
-	 * @param bool   $lowercase If set, searches Config in single-case / lowercase.
+	 * @param bool $lowercase If set, searches Config in single-case / lowercase.
 	 */
-	public function exists($k, bool $lowercase = false) : bool{
+	public function exists(string $k, bool $lowercase = false) : bool{
 		if($lowercase){
 			$k = strtolower($k); //Convert requested  key to lower
 			$array = array_change_key_case($this->config, CASE_LOWER); //Change all keys in array to lower
@@ -464,10 +443,7 @@ class Config{
 		}
 	}
 
-	/**
-	 * @param string $k
-	 */
-	public function remove($k) : void{
+	public function remove(string $k) : void{
 		unset($this->config[$k]);
 		$this->changed = true;
 	}
@@ -495,7 +471,7 @@ class Config{
 	 * @phpstan-param array<string, mixed> $data
 	 * @phpstan-param-out array<string, mixed> $data
 	 */
-	private function fillDefaults(array $default, &$data) : int{
+	private function fillDefaults(array $default, array &$data) : int{
 		$changed = 0;
 		foreach(Utils::stringifyKeys($default) as $k => $v){
 			if(is_array($v)){
diff --git a/src/utils/EnumTrait.php b/src/utils/EnumTrait.php
index ba0a4fcf24..7427e69f49 100644
--- a/src/utils/EnumTrait.php
+++ b/src/utils/EnumTrait.php
@@ -28,7 +28,10 @@ namespace pocketmine\utils;
  * __callStatic().
  *
  * Classes using this trait need to include \@method tags in their class docblock for every enum member.
- * Alternatively, just put \@generate-registry-docblock in the docblock and run tools/generate-registry-annotations.php
+ * Alternatively, just put \@generate-registry-docblock in the docblock and run build/generate-registry-annotations.php
+ *
+ * @deprecated Use native PHP 8.1 enums instead. Use {@link LegacyEnumShimTrait} if you need to provide backwards
+ * compatible EnumTrait-like API for migrated enums.
  */
 trait EnumTrait{
 	use RegistryTrait;
diff --git a/src/utils/Filesystem.php b/src/utils/Filesystem.php
index 106cddf448..c927b7f61a 100644
--- a/src/utils/Filesystem.php
+++ b/src/utils/Filesystem.php
@@ -160,12 +160,7 @@ final class Filesystem{
 	 */
 	public static function getCleanedPaths() : array{ return self::$cleanedPaths; }
 
-	/**
-	 * @param string $path
-	 *
-	 * @return string
-	 */
-	public static function cleanPath($path){
+	public static function cleanPath(string $path) : string{
 		$result = str_replace([DIRECTORY_SEPARATOR, ".php", "phar://"], ["/", "", ""], $path);
 
 		//remove relative paths
diff --git a/src/utils/Internet.php b/src/utils/Internet.php
index 4aa39cb362..07b3c7a338 100644
--- a/src/utils/Internet.php
+++ b/src/utils/Internet.php
@@ -64,19 +64,15 @@ use const SOCK_DGRAM;
 use const SOL_UDP;
 
 class Internet{
-	/** @var string|false */
-	public static $ip = false;
-	/** @var bool */
-	public static $online = true;
+	public static string|false $ip = false;
+	public static bool $online = true;
 
 	/**
 	 * Lazily gets the External IP using an external service and caches the result
 	 *
 	 * @param bool $force default false, force IP check even when cached
-	 *
-	 * @return string|false
 	 */
-	public static function getIP(bool $force = false){
+	public static function getIP(bool $force = false) : string|false{
 		if(!self::$online){
 			return false;
 		}elseif(self::$ip !== false && !$force){
@@ -171,7 +167,7 @@ class Internet{
 	 * @phpstan-param TErrorVar                    $err
 	 * @phpstan-param-out TErrorVar|string         $err
 	 */
-	public static function postURL(string $page, $args, int $timeout = 10, array $extraHeaders = [], &$err = null) : ?InternetRequestResult{
+	public static function postURL(string $page, array|string $args, int $timeout = 10, array $extraHeaders = [], &$err = null) : ?InternetRequestResult{
 		try{
 			return self::simpleCurl($page, $timeout, $extraHeaders, [
 				CURLOPT_POST => 1,
@@ -187,7 +183,7 @@ class Internet{
 	 * General cURL shorthand function.
 	 * NOTE: This is a blocking operation and can take a significant amount of time. It is inadvisable to use this method on the main thread.
 	 *
-	 * @param float|int     $timeout      The maximum connect timeout and timeout in seconds, correct to ms.
+	 * @param float         $timeout      The maximum connect timeout and timeout in seconds, correct to ms.
 	 * @param string[]      $extraHeaders extra headers to send as a plain string array
 	 * @param array         $extraOpts    extra CURLOPT_* to set as an [opt => value] map
 	 * @param \Closure|null $onSuccess    function to be called if there is no error. Accepts a resource argument as the cURL handle.
@@ -197,7 +193,7 @@ class Internet{
 	 *
 	 * @throws InternetException if a cURL error occurs
 	 */
-	public static function simpleCurl(string $page, $timeout = 10, array $extraHeaders = [], array $extraOpts = [], ?\Closure $onSuccess = null) : InternetRequestResult{
+	public static function simpleCurl(string $page, float $timeout = 10, array $extraHeaders = [], array $extraOpts = [], ?\Closure $onSuccess = null) : InternetRequestResult{
 		if(!self::$online){
 			throw new InternetException("Cannot execute web request while offline");
 		}
diff --git a/src/utils/LegacyEnumShimTrait.php b/src/utils/LegacyEnumShimTrait.php
new file mode 100644
index 0000000000..4bb3587ab9
--- /dev/null
+++ b/src/utils/LegacyEnumShimTrait.php
@@ -0,0 +1,92 @@
+<?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\utils;
+
+use function count;
+use function mb_strtoupper;
+use function spl_object_id;
+
+/**
+ * Offers a shim to make a native enum behave similarly to a legacy {@link EnumTrait} enum.
+ * Used to provide backwards compatibility for enums that have been migrated to native PHP 8.1 enums.
+ *
+ * @deprecated
+ */
+trait LegacyEnumShimTrait{
+
+	/**
+	 * @param mixed[] $arguments
+	 */
+	public static function __callStatic(string $name, array $arguments) : self{
+		if(count($arguments) > 0){
+			throw new \ArgumentCountError("Expected exactly 0 arguments, " . count($arguments) . " passed");
+		}
+		return self::getAll()[mb_strtoupper($name)];
+	}
+
+	/**
+	 * Returns a list of all cases, indexed by name.
+	 *
+	 * @return self[]
+	 * @phpstan-return array<string, self>
+	 */
+	public static function getAll() : array{
+		/** @var array<string, self>|null $result */
+		static $result = null;
+		if($result === null){
+			$result = [];
+			foreach(self::cases() as $case){
+				$result[mb_strtoupper($case->name)] = $case;
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Shim for {@link \UnitEnum::name}.
+	 *
+	 * @deprecated Use the native enum's name property instead.
+	 */
+	public function name() : string{
+		return $this->name;
+	}
+
+	/**
+	 * Alias of spl_object_id($this).
+	 *
+	 * @deprecated
+	 */
+	public function id() : int{
+		return spl_object_id($this);
+	}
+
+	/**
+	 * Returns whether the two objects are equivalent.
+	 *
+	 * @deprecated Native enums can be safely compared with ===.
+	 */
+	public function equals(self $other) : bool{
+		return $this === $other;
+	}
+}
diff --git a/src/utils/MainLogger.php b/src/utils/MainLogger.php
index 139388af72..2eaee78831 100644
--- a/src/utils/MainLogger.php
+++ b/src/utils/MainLogger.php
@@ -23,28 +23,28 @@ declare(strict_types=1);
 
 namespace pocketmine\utils;
 
-use LogLevel;
+use pmmp\thread\Thread as NativeThread;
+use pocketmine\thread\log\AttachableThreadSafeLogger;
+use pocketmine\thread\log\ThreadSafeLoggerAttachment;
 use pocketmine\thread\Thread;
 use pocketmine\thread\Worker;
 use function implode;
 use function sprintf;
 use const PHP_EOL;
-use const PTHREADS_INHERIT_NONE;
 
-class MainLogger extends \AttachableThreadedLogger implements \BufferedLogger{
-	/** @var bool */
-	protected $logDebug;
+class MainLogger extends AttachableThreadSafeLogger implements \BufferedLogger{
+	protected bool $logDebug;
 
 	private string $format = TextFormat::AQUA . "[%s] " . TextFormat::RESET . "%s[%s/%s]: %s" . TextFormat::RESET;
 	private bool $useFormattingCodes = false;
 	private string $mainThreadName;
 	private string $timezone;
-	private MainLoggerThread $logWriterThread;
+	private ?MainLoggerThread $logWriterThread = null;
 
 	/**
 	 * @throws \RuntimeException
 	 */
-	public function __construct(string $logFile, bool $useFormattingCodes, string $mainThreadName, \DateTimeZone $timezone, bool $logDebug = false){
+	public function __construct(?string $logFile, bool $useFormattingCodes, string $mainThreadName, \DateTimeZone $timezone, bool $logDebug = false, ?string $logArchiveDir = null){
 		parent::__construct();
 		$this->logDebug = $logDebug;
 
@@ -52,8 +52,10 @@ class MainLogger extends \AttachableThreadedLogger implements \BufferedLogger{
 		$this->mainThreadName = $mainThreadName;
 		$this->timezone = $timezone->getName();
 
-		$this->logWriterThread = new MainLoggerThread($logFile);
-		$this->logWriterThread->start(PTHREADS_INHERIT_NONE);
+		if($logFile !== null){
+			$this->logWriterThread = new MainLoggerThread($logFile, $logArchiveDir);
+			$this->logWriterThread->start(NativeThread::INHERIT_NONE);
+		}
 	}
 
 	/**
@@ -131,28 +133,28 @@ class MainLogger extends \AttachableThreadedLogger implements \BufferedLogger{
 
 	public function log($level, $message){
 		switch($level){
-			case LogLevel::EMERGENCY:
+			case \LogLevel::EMERGENCY:
 				$this->emergency($message);
 				break;
-			case LogLevel::ALERT:
+			case \LogLevel::ALERT:
 				$this->alert($message);
 				break;
-			case LogLevel::CRITICAL:
+			case \LogLevel::CRITICAL:
 				$this->critical($message);
 				break;
-			case LogLevel::ERROR:
+			case \LogLevel::ERROR:
 				$this->error($message);
 				break;
-			case LogLevel::WARNING:
+			case \LogLevel::WARNING:
 				$this->warning($message);
 				break;
-			case LogLevel::NOTICE:
+			case \LogLevel::NOTICE:
 				$this->notice($message);
 				break;
-			case LogLevel::INFO:
+			case \LogLevel::INFO:
 				$this->info($message);
 				break;
-			case LogLevel::DEBUG:
+			case \LogLevel::DEBUG:
 				$this->debug($message);
 				break;
 		}
@@ -166,23 +168,19 @@ class MainLogger extends \AttachableThreadedLogger implements \BufferedLogger{
 	}
 
 	public function shutdownLogWriterThread() : void{
-		if(\Thread::getCurrentThreadId() === $this->logWriterThread->getCreatorId()){
-			$this->logWriterThread->shutdown();
-		}else{
-			throw new \LogicException("Only the creator thread can shutdown the logger thread");
+		if($this->logWriterThread !== null){
+			if(NativeThread::getCurrentThreadId() === $this->logWriterThread->getCreatorId()){
+				$this->logWriterThread->shutdown();
+			}else{
+				throw new \LogicException("Only the creator thread can shutdown the logger thread");
+			}
 		}
 	}
 
-	/**
-	 * @param string $message
-	 * @param string $level
-	 * @param string $prefix
-	 * @param string $color
-	 */
-	protected function send($message, $level, $prefix, $color) : void{
+	protected function send(string $message, string $level, string $prefix, string $color) : void{
 		$time = new \DateTime('now', new \DateTimeZone($this->timezone));
 
-		$thread = \Thread::getCurrentThread();
+		$thread = NativeThread::getCurrentThread();
 		if($thread === null){
 			$threadName = $this->mainThreadName . " thread";
 		}elseif($thread instanceof Thread || $thread instanceof Worker){
@@ -199,8 +197,13 @@ class MainLogger extends \AttachableThreadedLogger implements \BufferedLogger{
 
 		$this->synchronized(function() use ($message, $level, $time) : void{
 			Terminal::writeLine($message);
-			$this->logWriterThread->write($time->format("Y-m-d") . " " . TextFormat::clean($message) . PHP_EOL);
+			if($this->logWriterThread !== null){
+				$this->logWriterThread->write($time->format("Y-m-d") . " " . TextFormat::clean($message) . PHP_EOL);
+			}
 
+			/**
+			 * @var ThreadSafeLoggerAttachment $attachment
+			 */
 			foreach($this->attachments as $attachment){
 				$attachment->log($level, $message);
 			}
@@ -208,11 +211,11 @@ class MainLogger extends \AttachableThreadedLogger implements \BufferedLogger{
 	}
 
 	public function syncFlushBuffer() : void{
-		$this->logWriterThread->syncFlushBuffer();
+		$this->logWriterThread?->syncFlushBuffer();
 	}
 
 	public function __destruct(){
-		if(!$this->logWriterThread->isJoined() && \Thread::getCurrentThreadId() === $this->logWriterThread->getCreatorId()){
+		if($this->logWriterThread !== null && !$this->logWriterThread->isJoined() && NativeThread::getCurrentThreadId() === $this->logWriterThread->getCreatorId()){
 			$this->shutdownLogWriterThread();
 		}
 	}
diff --git a/src/utils/MainLoggerThread.php b/src/utils/MainLoggerThread.php
index b565621340..990644f65c 100644
--- a/src/utils/MainLoggerThread.php
+++ b/src/utils/MainLoggerThread.php
@@ -23,22 +23,44 @@ declare(strict_types=1);
 
 namespace pocketmine\utils;
 
+use pmmp\thread\Thread;
+use pmmp\thread\ThreadSafeArray;
+use function clearstatcache;
+use function date;
 use function fclose;
+use function file_exists;
 use function fopen;
+use function fstat;
 use function fwrite;
+use function is_dir;
+use function is_file;
 use function is_resource;
+use function mkdir;
+use function pathinfo;
+use function rename;
+use function strlen;
 use function touch;
+use const PATHINFO_EXTENSION;
+use const PATHINFO_FILENAME;
 
-final class MainLoggerThread extends \Thread{
-	private \Threaded $buffer;
+final class MainLoggerThread extends Thread{
+
+	/** @phpstan-var ThreadSafeArray<int, string> */
+	private ThreadSafeArray $buffer;
 	private bool $syncFlush = false;
 	private bool $shutdown = false;
 
 	public function __construct(
-		private string $logFile
+		private string $logFile,
+		private ?string $archiveDir,
+		private readonly int $maxFileSize = 32 * 1024 * 1024 //32 MB
 	){
-		$this->buffer = new \Threaded();
+		$this->buffer = new ThreadSafeArray();
 		touch($this->logFile);
+		if($this->archiveDir !== null && !@mkdir($this->archiveDir) && !is_dir($this->archiveDir)){
+			throw new \RuntimeException("Unable to create archive directory: " . (
+				is_file($this->archiveDir) ? "it already exists and is not a directory" : "permission denied"));
+		}
 	}
 
 	public function write(string $line) : void{
@@ -68,14 +90,64 @@ final class MainLoggerThread extends \Thread{
 		$this->join();
 	}
 
+	/** @return resource */
+	private function openLogFile(string $file, int &$size){
+		$logResource = fopen($file, "ab");
+		if(!is_resource($logResource)){
+			throw new \RuntimeException("Couldn't open log file");
+		}
+		$stat = fstat($logResource);
+		if($stat === false){
+			throw new AssumptionFailedError("fstat() should not fail here");
+		}
+		$size = $stat['size'];
+		return $logResource;
+	}
+
+	/**
+	 * @param resource $logResource
+	 * @return resource
+	 */
+	private function archiveLogFile($logResource, int &$size, string $archiveDir){
+		fclose($logResource);
+
+		clearstatcache();
+
+		$i = 0;
+		$date = date("Y-m-d\TH.i.s");
+		$baseName = pathinfo($this->logFile, PATHINFO_FILENAME);
+		$extension = pathinfo($this->logFile, PATHINFO_EXTENSION);
+		do{
+			//this shouldn't be necessary, but in case the user messes with the system time for some reason ...
+			$fileName = "$baseName.$date.$i.$extension";
+			$out = $this->archiveDir . "/" . $fileName;
+			$i++;
+		}while(file_exists($out));
+
+		//the user may have externally deleted the whole directory - make sure it exists before we do anything
+		@mkdir($archiveDir);
+		rename($this->logFile, $out);
+
+		$logResource = $this->openLogFile($this->logFile, $size);
+		fwrite($logResource, "--- Starting new log file - old log file archived as $fileName ---\n");
+
+		return $logResource;
+	}
+
+	private function logFileReadyToArchive(int $size) : bool{
+		return $size >= $this->maxFileSize;
+	}
+
 	/**
 	 * @param resource $logResource
 	 */
-	private function writeLogStream($logResource) : void{
-		while($this->buffer->count() > 0){
-			/** @var string $chunk */
-			$chunk = $this->buffer->shift();
+	private function writeLogStream(&$logResource, int &$size, ?string $archiveDir) : void{
+		while(($chunk = $this->buffer->shift()) !== null){
 			fwrite($logResource, $chunk);
+			$size += strlen($chunk);
+			if($archiveDir !== null && $this->logFileReadyToArchive($size)){
+				$logResource = $this->archiveLogFile($logResource, $size, $archiveDir);
+			}
 		}
 
 		$this->synchronized(function() : void{
@@ -87,13 +159,15 @@ final class MainLoggerThread extends \Thread{
 	}
 
 	public function run() : void{
-		$logResource = fopen($this->logFile, "ab");
-		if(!is_resource($logResource)){
-			throw new \RuntimeException("Couldn't open log file");
+		$size = 0;
+		$logResource = $this->openLogFile($this->logFile, $size);
+		$archiveDir = $this->archiveDir;
+		if($archiveDir !== null && $this->logFileReadyToArchive($size)){
+			$logResource = $this->archiveLogFile($logResource, $size, $archiveDir);
 		}
 
 		while(!$this->shutdown){
-			$this->writeLogStream($logResource);
+			$this->writeLogStream($logResource, $size, $archiveDir);
 			$this->synchronized(function() : void{
 				if(!$this->shutdown && !$this->syncFlush){
 					$this->wait();
@@ -101,7 +175,7 @@ final class MainLoggerThread extends \Thread{
 			});
 		}
 
-		$this->writeLogStream($logResource);
+		$this->writeLogStream($logResource, $size, $archiveDir);
 
 		fclose($logResource);
 	}
diff --git a/src/utils/Process.php b/src/utils/Process.php
index 96169b34f1..1370ab27c7 100644
--- a/src/utils/Process.php
+++ b/src/utils/Process.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\utils;
 
-use pocketmine\thread\ThreadManager;
+use pocketmine\thread\Thread;
 use function count;
 use function exec;
 use function fclose;
@@ -122,10 +122,13 @@ final class Process{
 
 		//TODO: more OS
 
-		return count(ThreadManager::getInstance()->getAll()) + 2; //MainLogger + Main Thread
+		return Thread::getRunningCount() + 1; //pmmpthread doesn't count the main thread
 	}
 
-	public static function kill(int $pid, bool $subprocesses) : void{
+	/**
+	 * @param bool $subprocesses @deprecated
+	 */
+	public static function kill(int $pid, bool $subprocesses = false) : void{
 		$logger = \GlobalLogger::get();
 		if($logger instanceof MainLogger){
 			$logger->syncFlushBuffer();
@@ -157,7 +160,7 @@ final class Process{
 	 *
 	 * @return int process exit code
 	 */
-	public static function execute(string $command, string &$stdout = null, string &$stderr = null) : int{
+	public static function execute(string $command, ?string &$stdout = null, ?string &$stderr = null) : int{
 		$process = proc_open($command, [
 			["pipe", "r"],
 			["pipe", "w"],
diff --git a/src/utils/Random.php b/src/utils/Random.php
index e0318c50a1..77f655b89a 100644
--- a/src/utils/Random.php
+++ b/src/utils/Random.php
@@ -40,8 +40,7 @@ class Random{
 	private int $z;
 	private int $w;
 
-	/** @var int */
-	protected $seed;
+	protected int $seed;
 
 	/**
 	 * @param int $seed Integer to be used as seed.
diff --git a/src/utils/RegistryTrait.php b/src/utils/RegistryTrait.php
index f8ffc11438..f1972b5187 100644
--- a/src/utils/RegistryTrait.php
+++ b/src/utils/RegistryTrait.php
@@ -33,12 +33,12 @@ use function preg_match;
  * These faux constants are exposed in static class methods, which are handled using __callStatic().
  *
  * Classes using this trait need to include \@method tags in their class docblock for every faux constant.
- * Alternatively, just put \@generate-registry-docblock in the docblock and run tools/generate-registry-annotations.php
+ * Alternatively, just put \@generate-registry-docblock in the docblock and run build/generate-registry-annotations.php
  */
 trait RegistryTrait{
 	/**
-	 * @var object[]
-	 * @phpstan-var array<string, object>
+	 * @var object[]|null
+	 * @phpstan-var array<string, object>|null
 	 */
 	private static $members = null;
 
@@ -54,6 +54,9 @@ trait RegistryTrait{
 	 * @throws \InvalidArgumentException
 	 */
 	private static function _registryRegister(string $name, object $member) : void{
+		if(self::$members === null){
+			throw new AssumptionFailedError("Cannot register members outside of " . self::class . "::setup()");
+		}
 		self::verifyName($name);
 		$upperName = mb_strtoupper($name);
 		if(isset(self::$members[$upperName])){
@@ -86,6 +89,9 @@ trait RegistryTrait{
 	 */
 	private static function _registryFromString(string $name) : object{
 		self::checkInit();
+		if(self::$members === null){
+			throw new AssumptionFailedError(self::class . "::checkInit() did not initialize self::\$members correctly");
+		}
 		$upperName = mb_strtoupper($name);
 		if(!isset(self::$members[$upperName])){
 			throw new \InvalidArgumentException("No such registry member: " . self::class . "::" . $upperName);
@@ -108,6 +114,13 @@ trait RegistryTrait{
 		if(count($arguments) > 0){
 			throw new \ArgumentCountError("Expected exactly 0 arguments, " . count($arguments) . " passed");
 		}
+
+		//fast path
+		if(self::$members !== null && isset(self::$members[$name])){
+			return self::preprocessMember(self::$members[$name]);
+		}
+
+		//fallback
 		try{
 			return self::_registryFromString($name);
 		}catch(\InvalidArgumentException $e){
@@ -121,8 +134,6 @@ trait RegistryTrait{
 	 */
 	private static function _registryGetAll() : array{
 		self::checkInit();
-		return array_map(function(object $o) : object{
-			return self::preprocessMember($o);
-		}, self::$members);
+		return array_map(self::preprocessMember(...), self::$members ?? throw new AssumptionFailedError(self::class . "::checkInit() did not initialize self::\$members correctly"));
 	}
 }
diff --git a/src/utils/ServerKiller.php b/src/utils/ServerKiller.php
index 1739643d0a..514a265ba6 100644
--- a/src/utils/ServerKiller.php
+++ b/src/utils/ServerKiller.php
@@ -24,32 +24,28 @@ declare(strict_types=1);
 namespace pocketmine\utils;
 
 use pocketmine\thread\Thread;
-use function time;
+use function hrtime;
+use function intdiv;
 
 class ServerKiller extends Thread{
-
-	/** @var int */
-	public $time;
-
 	private bool $stopped = false;
 
-	/**
-	 * @param int $time
-	 */
-	public function __construct($time = 15){
-		$this->time = $time;
-	}
+	public function __construct(
+		public int $time = 15
+	){}
 
 	protected function onRun() : void{
-		$start = time();
-		$this->synchronized(function() : void{
-			if(!$this->stopped){
-				$this->wait($this->time * 1000000);
+		$start = hrtime(true);
+		$remaining = $this->time * 1_000_000;
+		$this->synchronized(function() use (&$remaining, $start) : void{
+			while(!$this->stopped && $remaining > 0){
+				$this->wait($remaining);
+				$remaining -= intdiv(hrtime(true) - $start, 1000);
 			}
 		});
-		if(time() - $start >= $this->time){
+		if($remaining <= 0){
 			echo "\nTook too long to stop, server was killed forcefully!\n";
-			@Process::kill(Process::pid(), true);
+			@Process::kill(Process::pid());
 		}
 	}
 
diff --git a/src/utils/StringToTParser.php b/src/utils/StringToTParser.php
index f87db71737..d98153ac15 100644
--- a/src/utils/StringToTParser.php
+++ b/src/utils/StringToTParser.php
@@ -59,7 +59,22 @@ abstract class StringToTParser{
 	}
 
 	/**
-	 * Tries to parse the specified string into an enchantment.
+	 * Registers a new alias for an existing known alias.
+	 */
+	public function registerAlias(string $existing, string $alias) : void{
+		$existingKey = $this->reprocess($existing);
+		if(!isset($this->callbackMap[$existingKey])){
+			throw new \InvalidArgumentException("Cannot register new alias for unknown existing alias \"$existing\"");
+		}
+		$newKey = $this->reprocess($alias);
+		if(isset($this->callbackMap[$newKey])){
+			throw new \InvalidArgumentException("Alias \"$newKey\" is already registered");
+		}
+		$this->callbackMap[$newKey] = $this->callbackMap[$existingKey];
+	}
+
+	/**
+	 * Tries to parse the specified string into a corresponding instance of T.
 	 * @phpstan-return T|null
 	 */
 	public function parse(string $input){
diff --git a/src/utils/Terminal.php b/src/utils/Terminal.php
index 7144b8a9b7..49b4224ec8 100644
--- a/src/utils/Terminal.php
+++ b/src/utils/Terminal.php
@@ -92,7 +92,7 @@ abstract class Terminal{
 
 		self::$FORMAT_RESET = "\x1b[m";
 
-		$color = fn(int $code) => "\x1b[38;5;${code}m";
+		$color = fn(int $code) => "\x1b[38;5;{$code}m";
 
 		self::$COLOR_BLACK = $color(16);
 		self::$COLOR_DARK_BLUE = $color(19);
diff --git a/src/utils/Timezone.php b/src/utils/Timezone.php
index 4b50e74806..7f1dcf0e41 100644
--- a/src/utils/Timezone.php
+++ b/src/utils/Timezone.php
@@ -102,10 +102,7 @@ abstract class Timezone{
 		\GlobalLogger::get()->warning("Timezone could not be automatically determined or was set to an invalid value. An incorrect timezone will result in incorrect timestamps on console logs. It has been set to \"UTC\" by default. You can change it on the php.ini file.");
 	}
 
-	/**
-	 * @return string|false
-	 */
-	public static function detectSystemTimezone(){
+	public static function detectSystemTimezone() : string|false{
 		switch(Utils::getOS()){
 			case Utils::OS_WINDOWS:
 				$regex = '/(UTC)(\+*\-*\d*\d*\:*\d*\d*)/';
@@ -179,10 +176,8 @@ abstract class Timezone{
 
 	/**
 	 * @param string $offset In the format of +09:00, +02:00, -04:00 etc.
-	 *
-	 * @return string|false
 	 */
-	private static function parseOffset($offset){
+	private static function parseOffset(string $offset) : string|false{
 		//Make signed offsets unsigned for date_parse
 		if(str_starts_with($offset, '-')){
 			$negative_offset = true;
diff --git a/src/utils/Utils.php b/src/utils/Utils.php
index 183b749542..c8be174d6a 100644
--- a/src/utils/Utils.php
+++ b/src/utils/Utils.php
@@ -31,6 +31,7 @@ use DaveRandom\CallbackValidator\CallbackType;
 use pocketmine\entity\Location;
 use pocketmine\errorhandler\ErrorTypeToStringMap;
 use pocketmine\math\Vector3;
+use pocketmine\thread\ThreadCrashInfoFrame;
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidInterface;
 use function array_combine;
@@ -66,6 +67,8 @@ use function is_nan;
 use function is_object;
 use function is_string;
 use function mb_check_encoding;
+use function mt_getrandmax;
+use function mt_rand;
 use function ob_end_clean;
 use function ob_get_contents;
 use function ob_start;
@@ -79,7 +82,7 @@ use function preg_match_all;
 use function preg_replace;
 use function shell_exec;
 use function spl_object_id;
-use function str_ends_with;
+use function str_contains;
 use function str_pad;
 use function str_split;
 use function str_starts_with;
@@ -120,7 +123,7 @@ final class Utils{
 	 */
 	public static function getNiceClosureName(\Closure $closure) : string{
 		$func = new \ReflectionFunction($closure);
-		if(!str_ends_with($func->getName(), '{closure}')){
+		if(!str_contains($func->getName(), '{closure')){
 			//closure wraps a named function, can be done with reflection or fromCallable()
 			//isClosure() is useless here because it just tells us if $func is reflecting a Closure object
 
@@ -172,16 +175,17 @@ final class Utils{
 	}
 
 	/**
-	 * @phpstan-template T of object
+	 * @phpstan-template TKey of array-key
+	 * @phpstan-template TValue of object
 	 *
 	 * @param object[] $array
-	 * @phpstan-param T[] $array
+	 * @phpstan-param array<TKey, TValue> $array
 	 *
 	 * @return object[]
-	 * @phpstan-return T[]
+	 * @phpstan-return array<TKey, TValue>
 	 */
 	public static function cloneObjectArray(array $array) : array{
-		/** @phpstan-var \Closure(T) : T $callback */
+		/** @phpstan-var \Closure(TValue) : TValue $callback */
 		$callback = self::cloneCallback();
 		return array_map($callback, $array);
 	}
@@ -346,10 +350,8 @@ final class Utils{
 
 	/**
 	 * Returns a string that can be printed, replaces non-printable characters
-	 *
-	 * @param mixed $str
 	 */
-	public static function printable($str) : string{
+	public static function printable(mixed $str) : string{
 		if(!is_string($str)){
 			return gettype($str);
 		}
@@ -370,10 +372,7 @@ final class Utils{
 		return $hash;
 	}
 
-	/**
-	 * @param object $value
-	 */
-	public static function getReferenceCount($value, bool $includeCurrent = true) : int{
+	public static function getReferenceCount(object $value, bool $includeCurrent = true) : int{
 		ob_start();
 		debug_zval_dump($value);
 		$contents = ob_get_contents();
@@ -406,7 +405,7 @@ final class Utils{
 	}
 
 	/**
-	 * @param mixed[] $trace
+	 * @param mixed[][] $trace
 	 * @return string[]
 	 */
 	public static function printableExceptionInfo(\Throwable $e, $trace = null) : array{
@@ -448,6 +447,7 @@ final class Utils{
 	 * @phpstan-param list<array<string, mixed>> $trace
 	 *
 	 * @return string[]
+	 * @phpstan-return list<string>
 	 */
 	public static function printableTrace(array $trace, int $maxStringLength = 80) : array{
 		$messages = [];
@@ -459,7 +459,7 @@ final class Utils{
 				}else{
 					$args = $trace[$i]["params"];
 				}
-				/** @var mixed[] $args */
+				/** @phpstan-var array<int, mixed> $args */
 
 				$paramsList = [];
 				$offset = 0;
@@ -474,6 +474,30 @@ final class Utils{
 		return $messages;
 	}
 
+	/**
+	 * Similar to {@link Utils::printableTrace()}, but associates metadata such as file and line number with each frame.
+	 * This is used to transmit thread-safe information about crash traces to the main thread when a thread crashes.
+	 *
+	 * @param mixed[][] $rawTrace
+	 * @phpstan-param list<array<string, mixed>> $rawTrace
+	 *
+	 * @return ThreadCrashInfoFrame[]
+	 */
+	public static function printableTraceWithMetadata(array $rawTrace, int $maxStringLength = 80) : array{
+		$printableTrace = self::printableTrace($rawTrace, $maxStringLength);
+		$safeTrace = [];
+		foreach($printableTrace as $frameId => $printableFrame){
+			$rawFrame = $rawTrace[$frameId];
+			$safeTrace[$frameId] = new ThreadCrashInfoFrame(
+				$printableFrame,
+				$rawFrame["file"] ?? "unknown",
+				$rawFrame["line"] ?? 0
+			);
+		}
+
+		return $safeTrace;
+	}
+
 	/**
 	 * @return mixed[][]
 	 * @phpstan-return list<array<string, mixed>>
@@ -587,6 +611,18 @@ final class Utils{
 		}
 	}
 
+	/**
+	 * Gets rid of PHPStan BenevolentUnionType on array keys, so that wrong type errors get reported properly
+	 * Use this if you don't care what the key type is and just want proper PHPStan error reporting
+	 *
+	 * @phpstan-template TValueType
+	 * @phpstan-param array<TValueType> $array
+	 * @phpstan-return array<int|string, TValueType>
+	 */
+	public static function promoteKeys(array $array) : array{
+		return $array;
+	}
+
 	public static function checkUTF8(string $string) : void{
 		if(!mb_check_encoding($string, 'UTF-8')){
 			throw new \InvalidArgumentException("Text must be valid UTF-8");
@@ -654,4 +690,12 @@ final class Utils{
 		//jit not available
 		return null;
 	}
+
+	/**
+	 * Returns a random float between 0.0 and 1.0
+	 * Drop-in replacement for lcg_value()
+	 */
+	public static function getRandomFloat() : float{
+		return mt_rand() / mt_getrandmax();
+	}
 }
diff --git a/src/wizard/SetupWizard.php b/src/wizard/SetupWizard.php
index c9170bd8dd..0f1a99f4b3 100644
--- a/src/wizard/SetupWizard.php
+++ b/src/wizard/SetupWizard.php
@@ -27,13 +27,13 @@ declare(strict_types=1);
  */
 namespace pocketmine\wizard;
 
-use pocketmine\data\java\GameModeIdMap;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\lang\Language;
 use pocketmine\lang\LanguageNotFoundException;
 use pocketmine\lang\Translatable;
 use pocketmine\player\GameMode;
 use pocketmine\Server;
+use pocketmine\ServerProperties;
 use pocketmine\utils\Config;
 use pocketmine\utils\Internet;
 use pocketmine\utils\InternetException;
@@ -48,8 +48,11 @@ use const PHP_EOL;
 use const STDIN;
 
 class SetupWizard{
+	/** @deprecated */
 	public const DEFAULT_NAME = Server::DEFAULT_SERVER_NAME;
+	/** @deprecated */
 	public const DEFAULT_PORT = Server::DEFAULT_PORT_IPV4;
+	/** @deprecated */
 	public const DEFAULT_PLAYERS = Server::DEFAULT_MAX_PLAYERS;
 
 	private Language $lang;
@@ -91,7 +94,7 @@ class SetupWizard{
 
 		//this has to happen here to prevent user avoiding agreeing to license
 		$config = new Config(Path::join($this->dataPath, "server.properties"), Config::PROPERTIES);
-		$config->set("language", $lang);
+		$config->set(ServerProperties::LANGUAGE, $lang);
 		$config->save();
 
 		if(strtolower($this->getInput($this->lang->translate(KnownTranslationFactory::skip_installer()), "n", "y/N")) === "y"){
@@ -101,10 +104,12 @@ class SetupWizard{
 
 		$this->writeLine();
 		$this->welcome();
-		$this->generateBaseConfig();
-		$this->generateUserFiles();
 
-		$this->networkFunctions();
+		$this->generateBaseConfig($config);
+		$this->generateUserFiles($config);
+		$this->networkFunctions($config);
+		$config->save();
+
 		$this->printIpDetails();
 
 		$this->endWizard();
@@ -151,32 +156,33 @@ LICENSE;
 		}
 	}
 
-	private function generateBaseConfig() : void{
-		$config = new Config(Path::join($this->dataPath, "server.properties"), Config::PROPERTIES);
-
-		$config->set("motd", ($name = $this->getInput($this->lang->translate(KnownTranslationFactory::name_your_server()), self::DEFAULT_NAME)));
-		$config->set("server-name", $name);
+	private function generateBaseConfig(Config $config) : void{
+		$config->set(ServerProperties::MOTD, ($name = $this->getInput($this->lang->translate(KnownTranslationFactory::name_your_server()), Server::DEFAULT_SERVER_NAME)));
 
 		$this->message($this->lang->translate(KnownTranslationFactory::port_warning()));
 
-		$config->set("server-port", $this->askPort(KnownTranslationFactory::server_port_v4(), Server::DEFAULT_PORT_IPV4));
-		$config->set("server-portv6", $this->askPort(KnownTranslationFactory::server_port_v6(), Server::DEFAULT_PORT_IPV6));
+		$config->set(ServerProperties::SERVER_PORT_IPV4, $this->askPort(KnownTranslationFactory::server_port_v4(), Server::DEFAULT_PORT_IPV4));
+		$config->set(ServerProperties::SERVER_PORT_IPV6, $this->askPort(KnownTranslationFactory::server_port_v6(), Server::DEFAULT_PORT_IPV6));
 
 		$this->message($this->lang->translate(KnownTranslationFactory::gamemode_info()));
 
 		do{
-			$gamemode = GameModeIdMap::getInstance()->fromId((int) $this->getInput($this->lang->translate(KnownTranslationFactory::default_gamemode()), (string) GameModeIdMap::getInstance()->toId(GameMode::SURVIVAL())));
+			$input = (int) $this->getInput($this->lang->translate(KnownTranslationFactory::default_gamemode()), "0");
+			$gamemode = match($input){
+				0 => GameMode::SURVIVAL,
+				1 => GameMode::CREATIVE,
+				default => null
+			};
 		}while($gamemode === null);
-		$config->set("gamemode", $gamemode->name());
+		//TODO: this probably shouldn't use the enum name directly
+		$config->set(ServerProperties::GAME_MODE, $gamemode->name);
 
-		$config->set("max-players", (int) $this->getInput($this->lang->translate(KnownTranslationFactory::max_players()), (string) self::DEFAULT_PLAYERS));
+		$config->set(ServerProperties::MAX_PLAYERS, (int) $this->getInput($this->lang->translate(KnownTranslationFactory::max_players()), (string) Server::DEFAULT_MAX_PLAYERS));
 
-		$config->set("view-distance", (int) $this->getInput($this->lang->translate(KnownTranslationFactory::view_distance()), (string) Server::DEFAULT_MAX_VIEW_DISTANCE));
-
-		$config->save();
+		$config->set(ServerProperties::VIEW_DISTANCE, (int) $this->getInput($this->lang->translate(KnownTranslationFactory::view_distance()), (string) Server::DEFAULT_MAX_VIEW_DISTANCE));
 	}
 
-	private function generateUserFiles() : void{
+	private function generateUserFiles(Config $config) : void{
 		$this->message($this->lang->translate(KnownTranslationFactory::op_info()));
 
 		$op = strtolower($this->getInput($this->lang->translate(KnownTranslationFactory::op_who()), ""));
@@ -190,27 +196,22 @@ LICENSE;
 
 		$this->message($this->lang->translate(KnownTranslationFactory::whitelist_info()));
 
-		$config = new Config(Path::join($this->dataPath, "server.properties"), Config::PROPERTIES);
 		if(strtolower($this->getInput($this->lang->translate(KnownTranslationFactory::whitelist_enable()), "n", "y/N")) === "y"){
 			$this->error($this->lang->translate(KnownTranslationFactory::whitelist_warning()));
-			$config->set("white-list", true);
+			$config->set(ServerProperties::WHITELIST, true);
 		}else{
-			$config->set("white-list", false);
+			$config->set(ServerProperties::WHITELIST, false);
 		}
-		$config->save();
 	}
 
-	private function networkFunctions() : void{
-		$config = new Config(Path::join($this->dataPath, "server.properties"), Config::PROPERTIES);
+	private function networkFunctions(Config $config) : void{
 		$this->error($this->lang->translate(KnownTranslationFactory::query_warning1()));
 		$this->error($this->lang->translate(KnownTranslationFactory::query_warning2()));
 		if(strtolower($this->getInput($this->lang->translate(KnownTranslationFactory::query_disable()), "n", "y/N")) === "y"){
-			$config->set("enable-query", false);
+			$config->set(ServerProperties::ENABLE_QUERY, false);
 		}else{
-			$config->set("enable-query", true);
+			$config->set(ServerProperties::ENABLE_QUERY, true);
 		}
-
-		$config->save();
 	}
 
 	private function printIpDetails() : void{
diff --git a/src/world/BlockTransaction.php b/src/world/BlockTransaction.php
index 5f7e9f9faa..46cbc7903f 100644
--- a/src/world/BlockTransaction.php
+++ b/src/world/BlockTransaction.php
@@ -28,7 +28,10 @@ use pocketmine\math\Vector3;
 use pocketmine\utils\Utils;
 
 class BlockTransaction{
-	/** @var Block[][][] */
+	/**
+	 * @var Block[][][]
+	 * @phpstan-var array<int, array<int, array<int, Block>>>
+	 */
 	private array $blocks = [];
 
 	/**
diff --git a/src/world/TickingChunkLoader.php b/src/world/ChunkTicker.php
similarity index 68%
rename from src/world/TickingChunkLoader.php
rename to src/world/ChunkTicker.php
index c081571c32..c85c5f0e6d 100644
--- a/src/world/TickingChunkLoader.php
+++ b/src/world/ChunkTicker.php
@@ -24,13 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\world;
 
 /**
- * TickingChunkLoader includes all of the same functionality as ChunkLoader (it can be used in the same way).
- * However, using this version will also cause chunks around the loader's reported coordinates to get random block
- * updates.
+ * Used to signal to the World that a chunk should be ticked.
+ *
+ * @see World::registerTickingChunk()
+ * @see World::unregisterTickingChunk()
  */
-interface TickingChunkLoader extends ChunkLoader{
+final class ChunkTicker{
 
-	public function getX() : float;
-
-	public function getZ() : float;
 }
diff --git a/src/world/Explosion.php b/src/world/Explosion.php
index 5ccdc0faaf..601f9109e2 100644
--- a/src/world/Explosion.php
+++ b/src/world/Explosion.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\world;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
+use pocketmine\block\RuntimeBlockStateRegistry;
 use pocketmine\block\TNT;
 use pocketmine\block\VanillaBlocks;
 use pocketmine\entity\Entity;
@@ -35,6 +35,7 @@ use pocketmine\event\entity\EntityExplodeEvent;
 use pocketmine\item\VanillaItems;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
+use pocketmine\utils\AssumptionFailedError;
 use pocketmine\world\format\SubChunk;
 use pocketmine\world\particle\HugeExplodeSeedParticle;
 use pocketmine\world\sound\ExplodeSound;
@@ -48,35 +49,27 @@ use function sqrt;
 
 class Explosion{
 	private int $rays = 16;
-	/** @var World */
-	public $world;
-	/** @var Position */
-	public $source;
-	/** @var float */
-	public $size;
+	public World $world;
 
 	/** @var Block[] */
-	public $affectedBlocks = [];
-	/** @var float */
-	public $stepLen = 0.3;
-
-	private Entity|Block|null $what;
+	public array $affectedBlocks = [];
+	public float $stepLen = 0.3;
 
 	private SubChunkExplorer $subChunkExplorer;
 
-	public function __construct(Position $center, float $size, Entity|Block|null $what = null){
-		if(!$center->isValid()){
+	public function __construct(
+		public Position $source,
+		public float $radius,
+		private Entity|Block|null $what = null
+	){
+		if(!$this->source->isValid()){
 			throw new \InvalidArgumentException("Position does not have a valid world");
 		}
-		$this->source = $center;
-		$this->world = $center->getWorld();
+		$this->world = $this->source->getWorld();
 
-		if($size <= 0){
-			throw new \InvalidArgumentException("Explosion radius must be greater than 0, got $size");
+		if($radius <= 0){
+			throw new \InvalidArgumentException("Explosion radius must be greater than 0, got $radius");
 		}
-		$this->size = $size;
-
-		$this->what = $what;
 		$this->subChunkExplorer = new SubChunkExplorer($this->world);
 	}
 
@@ -85,11 +78,11 @@ class Explosion{
 	 * will be destroyed.
 	 */
 	public function explodeA() : bool{
-		if($this->size < 0.1){
+		if($this->radius < 0.1){
 			return false;
 		}
 
-		$blockFactory = BlockFactory::getInstance();
+		$blockFactory = RuntimeBlockStateRegistry::getInstance();
 
 		$mRays = $this->rays - 1;
 		for($i = 0; $i < $this->rays; ++$i){
@@ -104,7 +97,7 @@ class Explosion{
 						$pointerY = $this->source->y;
 						$pointerZ = $this->source->z;
 
-						for($blastForce = $this->size * (mt_rand(700, 1300) / 1000); $blastForce > 0; $blastForce -= $this->stepLen * 0.75){
+						for($blastForce = $this->radius * (mt_rand(700, 1300) / 1000); $blastForce > 0; $blastForce -= $this->stepLen * 0.75){
 							$x = (int) $pointerX;
 							$y = (int) $pointerY;
 							$z = (int) $pointerZ;
@@ -119,10 +112,14 @@ class Explosion{
 							if($this->subChunkExplorer->moveTo($vBlockX, $vBlockY, $vBlockZ) === SubChunkExplorerStatus::INVALID){
 								continue;
 							}
+							$subChunk = $this->subChunkExplorer->currentSubChunk;
+							if($subChunk === null){
+								throw new AssumptionFailedError("SubChunkExplorer subchunk should not be null here");
+							}
 
-							$state = $this->subChunkExplorer->currentSubChunk->getFullBlock($vBlockX & SubChunk::COORD_MASK, $vBlockY & SubChunk::COORD_MASK, $vBlockZ & SubChunk::COORD_MASK);
+							$state = $subChunk->getBlockStateId($vBlockX & SubChunk::COORD_MASK, $vBlockY & SubChunk::COORD_MASK, $vBlockZ & SubChunk::COORD_MASK);
 
-							$blastResistance = $blockFactory->blastResistance[$state];
+							$blastResistance = $blockFactory->blastResistance[$state] ?? 0;
 							if($blastResistance >= 0){
 								$blastForce -= ($blastResistance / 5 + 0.3) * $this->stepLen;
 								if($blastForce > 0){
@@ -150,7 +147,7 @@ class Explosion{
 	 */
 	public function explodeB() : bool{
 		$source = (new Vector3($this->source->x, $this->source->y, $this->source->z))->floor();
-		$yield = min(100, (1 / $this->size) * 100);
+		$yield = min(100, (1 / $this->radius) * 100);
 
 		if($this->what instanceof Entity){
 			$ev = new EntityExplodeEvent($this->what, $this->source, $this->affectedBlocks, $yield);
@@ -163,7 +160,7 @@ class Explosion{
 			}
 		}
 
-		$explosionSize = $this->size * 2;
+		$explosionSize = $this->radius * 2;
 		$minX = (int) floor($this->source->x - $explosionSize - 1);
 		$maxX = (int) ceil($this->source->x + $explosionSize + 1);
 		$minY = (int) floor($this->source->y - $explosionSize - 1);
diff --git a/src/world/Position.php b/src/world/Position.php
index 13fd4e6320..62a4b51f57 100644
--- a/src/world/Position.php
+++ b/src/world/Position.php
@@ -28,16 +28,9 @@ use pocketmine\utils\AssumptionFailedError;
 use function assert;
 
 class Position extends Vector3{
+	public ?World $world = null;
 
-	/** @var World|null */
-	public $world = null;
-
-	/**
-	 * @param float|int $x
-	 * @param float|int $y
-	 * @param float|int $z
-	 */
-	public function __construct($x, $y, $z, ?World $world){
+	public function __construct(float|int $x, float|int $y, float|int $z, ?World $world){
 		parent::__construct($x, $y, $z);
 		if($world !== null && !$world->isLoaded()){
 			throw new \InvalidArgumentException("Specified world has been unloaded and cannot be used");
diff --git a/src/world/SimpleChunkManager.php b/src/world/SimpleChunkManager.php
index 908f7ab363..221adbe899 100644
--- a/src/world/SimpleChunkManager.php
+++ b/src/world/SimpleChunkManager.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\world;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
+use pocketmine\block\RuntimeBlockStateRegistry;
 use pocketmine\block\VanillaBlocks;
 use pocketmine\utils\Limits;
 use pocketmine\world\format\Chunk;
@@ -32,7 +32,7 @@ use pocketmine\world\format\Chunk;
 class SimpleChunkManager implements ChunkManager{
 
 	/** @var Chunk[] */
-	protected $chunks = [];
+	protected array $chunks = [];
 
 	public function __construct(
 		private int $minY,
@@ -41,14 +41,14 @@ class SimpleChunkManager implements ChunkManager{
 
 	public function getBlockAt(int $x, int $y, int $z) : Block{
 		if($this->isInWorld($x, $y, $z) && ($chunk = $this->getChunk($x >> Chunk::COORD_BIT_SIZE, $z >> Chunk::COORD_BIT_SIZE)) !== null){
-			return BlockFactory::getInstance()->fromFullBlock($chunk->getFullBlock($x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK));
+			return RuntimeBlockStateRegistry::getInstance()->fromStateId($chunk->getBlockStateId($x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK));
 		}
 		return VanillaBlocks::AIR();
 	}
 
 	public function setBlockAt(int $x, int $y, int $z, Block $block) : void{
 		if(($chunk = $this->getChunk($x >> Chunk::COORD_BIT_SIZE, $z >> Chunk::COORD_BIT_SIZE)) !== null){
-			$chunk->setFullBlock($x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK, $block->getFullId());
+			$chunk->setBlockStateId($x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK, $block->getStateId());
 		}else{
 			throw new \InvalidArgumentException("Cannot set block at coordinates x=$x,y=$y,z=$z, terrain is not loaded or out of bounds");
 		}
diff --git a/src/world/World.php b/src/world/World.php
index f804e691f4..60a0e01e1a 100644
--- a/src/world/World.php
+++ b/src/world/World.php
@@ -28,14 +28,16 @@ namespace pocketmine\world;
 
 use pocketmine\block\Air;
 use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
-use pocketmine\block\BlockLegacyIds;
+use pocketmine\block\BlockTypeIds;
+use pocketmine\block\RuntimeBlockStateRegistry;
 use pocketmine\block\tile\Spawnable;
 use pocketmine\block\tile\Tile;
 use pocketmine\block\tile\TileFactory;
 use pocketmine\block\UnknownBlock;
 use pocketmine\block\VanillaBlocks;
 use pocketmine\data\bedrock\BiomeIds;
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\data\bedrock\block\BlockStateDeserializeException;
 use pocketmine\data\SavedDataLoadingException;
 use pocketmine\entity\Entity;
 use pocketmine\entity\EntityFactory;
@@ -50,6 +52,8 @@ use pocketmine\event\world\ChunkLoadEvent;
 use pocketmine\event\world\ChunkPopulateEvent;
 use pocketmine\event\world\ChunkUnloadEvent;
 use pocketmine\event\world\SpawnChangeEvent;
+use pocketmine\event\world\WorldDifficultyChangeEvent;
+use pocketmine\event\world\WorldDisplayNameChangeEvent;
 use pocketmine\event\world\WorldParticleEvent;
 use pocketmine\event\world\WorldSaveEvent;
 use pocketmine\event\world\WorldSoundEvent;
@@ -64,28 +68,29 @@ use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\StringTag;
-use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\TypeConverter;
+use pocketmine\network\mcpe\NetworkBroadcastUtils;
 use pocketmine\network\mcpe\protocol\BlockActorDataPacket;
 use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\network\mcpe\protocol\types\BlockPosition;
 use pocketmine\network\mcpe\protocol\UpdateBlockPacket;
 use pocketmine\permission\DefaultPermissionNames;
-use pocketmine\player\ChunkSelector;
 use pocketmine\player\Player;
 use pocketmine\promise\Promise;
 use pocketmine\promise\PromiseResolver;
 use pocketmine\scheduler\AsyncPool;
 use pocketmine\Server;
 use pocketmine\ServerConfigGroup;
-use pocketmine\timings\Timings;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Limits;
 use pocketmine\utils\ReversePriorityQueue;
+use pocketmine\utils\Utils;
 use pocketmine\world\biome\Biome;
 use pocketmine\world\biome\BiomeRegistry;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\format\io\ChunkData;
 use pocketmine\world\format\io\exception\CorruptedChunkException;
+use pocketmine\world\format\io\GlobalBlockStateHandlers;
 use pocketmine\world\format\io\WritableWorldProvider;
 use pocketmine\world\format\LightArray;
 use pocketmine\world\format\SubChunk;
@@ -101,9 +106,11 @@ use pocketmine\world\particle\Particle;
 use pocketmine\world\sound\BlockPlaceSound;
 use pocketmine\world\sound\Sound;
 use pocketmine\world\utils\SubChunkExplorer;
+use pocketmine\YmlServerProperties;
 use function abs;
 use function array_filter;
 use function array_key_exists;
+use function array_keys;
 use function array_map;
 use function array_merge;
 use function array_sum;
@@ -115,7 +122,6 @@ use function get_class;
 use function gettype;
 use function is_a;
 use function is_object;
-use function lcg_value;
 use function max;
 use function microtime;
 use function min;
@@ -143,8 +149,8 @@ class World implements ChunkManager{
 
 	private static int $worldIdCounter = 1;
 
-	public const Y_MAX = 256;
-	public const Y_MIN = 0;
+	public const Y_MAX = 320;
+	public const Y_MIN = -64;
 
 	public const TIME_DAY = 1000;
 	public const TIME_NOON = 6000;
@@ -189,7 +195,7 @@ class World implements ChunkManager{
 	 * @var Entity[] entity runtime ID => Entity
 	 * @phpstan-var array<int, Entity>
 	 */
-	public $updateEntities = [];
+	public array $updateEntities = [];
 
 	private bool $inDynamicStateRecalculation = false;
 	/**
@@ -197,6 +203,11 @@ class World implements ChunkManager{
 	 * @phpstan-var array<ChunkPosHash, array<ChunkBlockPosHash, Block>>
 	 */
 	private array $blockCache = [];
+	/**
+	 * @var AxisAlignedBB[][][] chunkHash => [relativeBlockHash => AxisAlignedBB[]]
+	 * @phpstan-var array<ChunkPosHash, array<ChunkBlockPosHash, list<AxisAlignedBB>>>
+	 */
+	private array $blockCollisionBoxCache = [];
 
 	private int $sendTimeTicker = 0;
 
@@ -208,15 +219,26 @@ class World implements ChunkManager{
 	private int $maxY;
 
 	/**
-	 * @var TickingChunkLoader[] spl_object_id => TickingChunkLoader
-	 * @phpstan-var array<int, TickingChunkLoader>
+	 * @var ChunkTicker[][] chunkHash => [spl_object_id => ChunkTicker]
+	 * @phpstan-var array<ChunkPosHash, array<int, ChunkTicker>>
 	 */
-	private array $tickingLoaders = [];
+	private array $registeredTickingChunks = [];
+
 	/**
-	 * @var int[] spl_object_id => number of chunks
-	 * @phpstan-var array<int, int>
+	 * Set of chunks which are definitely ready for ticking.
+	 *
+	 * @var int[]
+	 * @phpstan-var array<ChunkPosHash, ChunkPosHash>
 	 */
-	private array $tickingLoaderCounter = [];
+	private array $validTickingChunks = [];
+
+	/**
+	 * Set of chunks which might be ready for ticking. These will be checked at the next tick.
+	 * @var int[]
+	 * @phpstan-var array<ChunkPosHash, ChunkPosHash>
+	 */
+	private array $recheckTickingChunks = [];
+
 	/**
 	 * @var ChunkLoader[][] chunkHash => [spl_object_id => ChunkLoader]
 	 * @phpstan-var array<ChunkPosHash, array<int, ChunkLoader>>
@@ -247,8 +269,7 @@ class World implements ChunkManager{
 	private array $unloadQueue = [];
 
 	private int $time;
-	/** @var bool */
-	public $stopTime = false;
+	public bool $stopTime = false;
 
 	private float $sunAnglePercentage = 0.0;
 	private int $skyLightReduction = 0;
@@ -329,11 +350,9 @@ class World implements ChunkManager{
 	 */
 	private array $randomTickBlocks = [];
 
-	/** @var WorldTimings */
-	public $timings;
+	public WorldTimings $timings;
 
-	/** @var float */
-	public $tickRateTime = 0;
+	public float $tickRateTime = 0;
 
 	private bool $doingTick = false;
 
@@ -361,7 +380,7 @@ class World implements ChunkManager{
 
 	private const MORTON3D_BIT_SIZE = 21;
 	private const BLOCKHASH_Y_BITS = 9;
-	private const BLOCKHASH_Y_PADDING = 128; //size (in blocks) of padding after both boundaries of the Y axis
+	private const BLOCKHASH_Y_PADDING = 64; //size (in blocks) of padding after both boundaries of the Y axis
 	private const BLOCKHASH_Y_OFFSET = self::BLOCKHASH_Y_PADDING - self::Y_MIN;
 	private const BLOCKHASH_Y_MASK = (1 << self::BLOCKHASH_Y_BITS) - 1;
 	private const BLOCKHASH_XZ_MASK = (1 << self::MORTON3D_BIT_SIZE) - 1;
@@ -496,14 +515,14 @@ class World implements ChunkManager{
 		$this->time = $this->provider->getWorldData()->getTime();
 
 		$cfg = $this->server->getConfigGroup();
-		$this->chunkTickRadius = min($this->server->getViewDistance(), max(1, $cfg->getPropertyInt("chunk-ticking.tick-radius", 4)));
+		$this->chunkTickRadius = min($this->server->getViewDistance(), max(0, $cfg->getPropertyInt(YmlServerProperties::CHUNK_TICKING_TICK_RADIUS, 4)));
 		if($cfg->getPropertyInt("chunk-ticking.per-tick", 40) <= 0){
 			//TODO: this needs l10n
 			$this->logger->warning("\"chunk-ticking.per-tick\" setting is deprecated, but you've used it to disable chunk ticking. Set \"chunk-ticking.tick-radius\" to 0 in \"pocketmine.yml\" instead.");
 			$this->chunkTickRadius = 0;
 		}
-		$this->tickedBlocksPerSubchunkPerTick = $cfg->getPropertyInt("chunk-ticking.blocks-per-subchunk-per-tick", self::DEFAULT_TICKED_BLOCKS_PER_SUBCHUNK_PER_TICK);
-		$this->maxConcurrentChunkPopulationTasks = $cfg->getPropertyInt("chunk-generation.population-queue-size", 2);
+		$this->tickedBlocksPerSubchunkPerTick = $cfg->getPropertyInt(YmlServerProperties::CHUNK_TICKING_BLOCKS_PER_SUBCHUNK_PER_TICK, self::DEFAULT_TICKED_BLOCKS_PER_SUBCHUNK_PER_TICK);
+		$this->maxConcurrentChunkPopulationTasks = $cfg->getPropertyInt(YmlServerProperties::CHUNK_GENERATION_POPULATION_QUEUE_SIZE, 2);
 
 		$this->initRandomTickBlocksFromConfig($cfg);
 
@@ -524,27 +543,33 @@ class World implements ChunkManager{
 	private function initRandomTickBlocksFromConfig(ServerConfigGroup $cfg) : void{
 		$dontTickBlocks = [];
 		$parser = StringToItemParser::getInstance();
-		foreach($cfg->getProperty("chunk-ticking.disable-block-ticking", []) as $name){
+		foreach($cfg->getProperty(YmlServerProperties::CHUNK_TICKING_DISABLE_BLOCK_TICKING, []) as $name){
 			$name = (string) $name;
 			$item = $parser->parse($name);
 			if($item !== null){
 				$block = $item->getBlock();
 			}elseif(preg_match("/^-?\d+$/", $name) === 1){
-				$block = BlockFactory::getInstance()->get((int) $name, 0);
+				//TODO: this is a really sketchy hack - remove this as soon as possible
+				try{
+					$blockStateData = GlobalBlockStateHandlers::getUpgrader()->upgradeIntIdMeta((int) $name, 0);
+				}catch(BlockStateDeserializeException){
+					continue;
+				}
+				$block = RuntimeBlockStateRegistry::getInstance()->fromStateId(GlobalBlockStateHandlers::getDeserializer()->deserialize($blockStateData));
 			}else{
 				//TODO: we probably ought to log an error here
 				continue;
 			}
 
-			if($block->getId() !== BlockLegacyIds::AIR){
+			if($block->getTypeId() !== BlockTypeIds::AIR){
 				$dontTickBlocks[$block->getTypeId()] = $name;
 			}
 		}
 
-		foreach(BlockFactory::getInstance()->getAllKnownStates() as $state){
+		foreach(RuntimeBlockStateRegistry::getInstance()->getAllKnownStates() as $state){
 			$dontTickName = $dontTickBlocks[$state->getTypeId()] ?? null;
 			if($dontTickName === null && $state->ticksRandomly()){
-				$this->randomTickBlocks[$state->getFullId()] = true;
+				$this->randomTickBlocks[$state->getStateId()] = true;
 			}
 		}
 	}
@@ -629,6 +654,7 @@ class World implements ChunkManager{
 
 		$this->provider->close();
 		$this->blockCache = [];
+		$this->blockCollisionBoxCache = [];
 
 		$this->unloaded = true;
 	}
@@ -670,23 +696,26 @@ class World implements ChunkManager{
 	 */
 	public function addSound(Vector3 $pos, Sound $sound, ?array $players = null) : void{
 		$players ??= $this->getViewersForPosition($pos);
-		$ev = new WorldSoundEvent($this, $sound, $pos, $players);
 
-		$ev->call();
+		if(WorldSoundEvent::hasHandlers()){
+			$ev = new WorldSoundEvent($this, $sound, $pos, $players);
+			$ev->call();
+			if($ev->isCancelled()){
+				return;
+			}
 
-		if($ev->isCancelled()){
-			return;
+			$sound = $ev->getSound();
+			$players = $ev->getRecipients();
 		}
 
-		$pk = $ev->getSound()->encode($pos);
-		$players = $ev->getRecipients();
+		$pk = $sound->encode($pos);
 		if(count($pk) > 0){
 			if($players === $this->getViewersForPosition($pos)){
 				foreach($pk as $e){
 					$this->broadcastPacketToViewers($pos, $e);
 				}
 			}else{
-				$this->server->broadcastPackets($this->filterViewersForPosition($pos, $players), $pk);
+				NetworkBroadcastUtils::broadcastPackets($this->filterViewersForPosition($pos, $players), $pk);
 			}
 		}
 	}
@@ -696,23 +725,26 @@ class World implements ChunkManager{
 	 */
 	public function addParticle(Vector3 $pos, Particle $particle, ?array $players = null) : void{
 		$players ??= $this->getViewersForPosition($pos);
-		$ev = new WorldParticleEvent($this, $particle, $pos, $players);
 
-		$ev->call();
+		if(WorldParticleEvent::hasHandlers()){
+			$ev = new WorldParticleEvent($this, $particle, $pos, $players);
+			$ev->call();
+			if($ev->isCancelled()){
+				return;
+			}
 
-		if($ev->isCancelled()){
-			return;
+			$particle = $ev->getParticle();
+			$players = $ev->getRecipients();
 		}
 
-		$pk = $ev->getParticle()->encode($pos);
-		$players = $ev->getRecipients();
+		$pk = $particle->encode($pos);
 		if(count($pk) > 0){
 			if($players === $this->getViewersForPosition($pos)){
 				foreach($pk as $e){
 					$this->broadcastPacketToViewers($pos, $e);
 				}
 			}else{
-				$this->server->broadcastPackets($this->filterViewersForPosition($pos, $ev->getRecipients()), $pk);
+				NetworkBroadcastUtils::broadcastPackets($this->filterViewersForPosition($pos, $players), $pk);
 			}
 		}
 	}
@@ -784,15 +816,6 @@ class World implements ChunkManager{
 
 		$this->chunkLoaders[$chunkHash][$loaderId] = $loader;
 
-		if($loader instanceof TickingChunkLoader){
-			if(!isset($this->tickingLoaders[$loaderId])){
-				$this->tickingLoaderCounter[$loaderId] = 1;
-				$this->tickingLoaders[$loaderId] = $loader;
-			}else{
-				++$this->tickingLoaderCounter[$loaderId];
-			}
-		}
-
 		$this->cancelUnloadChunkRequest($chunkX, $chunkZ);
 
 		if($autoLoad){
@@ -804,19 +827,15 @@ class World implements ChunkManager{
 		$chunkHash = World::chunkHash($chunkX, $chunkZ);
 		$loaderId = spl_object_id($loader);
 		if(isset($this->chunkLoaders[$chunkHash][$loaderId])){
-			unset($this->chunkLoaders[$chunkHash][$loaderId]);
-			if(count($this->chunkLoaders[$chunkHash]) === 0){
+			if(count($this->chunkLoaders[$chunkHash]) === 1){
 				unset($this->chunkLoaders[$chunkHash]);
 				$this->unloadChunkRequest($chunkX, $chunkZ, true);
 				if(isset($this->chunkPopulationRequestMap[$chunkHash]) && !isset($this->activeChunkPopulationTasks[$chunkHash])){
 					$this->chunkPopulationRequestMap[$chunkHash]->reject();
 					unset($this->chunkPopulationRequestMap[$chunkHash]);
 				}
-			}
-
-			if(isset($this->tickingLoaderCounter[$loaderId]) && --$this->tickingLoaderCounter[$loaderId] === 0){
-				unset($this->tickingLoaderCounter[$loaderId]);
-				unset($this->tickingLoaders[$loaderId]);
+			}else{
+				unset($this->chunkLoaders[$chunkHash][$loaderId]);
 			}
 		}
 	}
@@ -844,11 +863,12 @@ class World implements ChunkManager{
 	public function unregisterChunkListener(ChunkListener $listener, int $chunkX, int $chunkZ) : void{
 		$hash = World::chunkHash($chunkX, $chunkZ);
 		if(isset($this->chunkListeners[$hash])){
-			unset($this->chunkListeners[$hash][spl_object_id($listener)]);
-			unset($this->playerChunkListeners[$hash][spl_object_id($listener)]);
-			if(count($this->chunkListeners[$hash]) === 0){
+			if(count($this->chunkListeners[$hash]) === 1){
 				unset($this->chunkListeners[$hash]);
 				unset($this->playerChunkListeners[$hash]);
+			}else{
+				unset($this->chunkListeners[$hash][spl_object_id($listener)]);
+				unset($this->playerChunkListeners[$hash][spl_object_id($listener)]);
 			}
 		}
 	}
@@ -931,9 +951,7 @@ class World implements ChunkManager{
 			$this->providerGarbageCollectionTicker = 0;
 		}
 
-		//Do block updates
 		$this->timings->scheduledBlockUpdates->startTiming();
-
 		//Delayed updates
 		while($this->scheduledBlockUpdateQueue->count() > 0 && $this->scheduledBlockUpdateQueue->current()["priority"] <= $currentTick){
 			/** @var Vector3 $vec */
@@ -945,7 +963,9 @@ class World implements ChunkManager{
 			$block = $this->getBlock($vec);
 			$block->onScheduledUpdate();
 		}
+		$this->timings->scheduledBlockUpdates->stopTiming();
 
+		$this->timings->neighbourBlockUpdates->startTiming();
 		//Normal updates
 		while($this->neighbourBlockUpdateQueue->count() > 0){
 			$index = $this->neighbourBlockUpdateQueue->dequeue();
@@ -956,23 +976,24 @@ class World implements ChunkManager{
 			}
 
 			$block = $this->getBlockAt($x, $y, $z);
-			$block->readStateFromWorld(); //for blocks like fences, force recalculation of connected AABBs
 
-			$ev = new BlockUpdateEvent($block);
-			$ev->call();
-			if(!$ev->isCancelled()){
-				foreach($this->getNearbyEntities(AxisAlignedBB::one()->offset($x, $y, $z)) as $entity){
-					$entity->onNearbyBlockChange();
+			if(BlockUpdateEvent::hasHandlers()){
+				$ev = new BlockUpdateEvent($block);
+				$ev->call();
+				if($ev->isCancelled()){
+					continue;
 				}
-				$block->onNearbyBlockChange();
 			}
+			foreach($this->getNearbyEntities(AxisAlignedBB::one()->offset($x, $y, $z)) as $entity){
+				$entity->onNearbyBlockChange();
+			}
+			$block->onNearbyBlockChange();
 		}
 
-		$this->timings->scheduledBlockUpdates->stopTiming();
+		$this->timings->neighbourBlockUpdates->stopTiming();
 
 		$this->timings->entityTick->startTiming();
 		//Update entities that need update
-		Timings::$tickEntity->startTiming();
 		foreach($this->updateEntities as $id => $entity){
 			if($entity->isClosed() || $entity->isFlaggedForDespawn() || !$entity->onUpdate($currentTick)){
 				unset($this->updateEntities[$id]);
@@ -981,7 +1002,6 @@ class World implements ChunkManager{
 				$entity->close();
 			}
 		}
-		Timings::$tickEntity->stopTiming();
 		$this->timings->entityTick->stopTiming();
 
 		$this->timings->randomChunkUpdates->startTiming();
@@ -997,8 +1017,12 @@ class World implements ChunkManager{
 						continue;
 					}
 					World::getXZ($index, $chunkX, $chunkZ);
+					if(!$this->isChunkLoaded($chunkX, $chunkZ)){
+						//a previous chunk may have caused this one to be unloaded by a ChunkListener
+						continue;
+					}
 					if(count($blocks) > 512){
-						$chunk = $this->getChunk($chunkX, $chunkZ);
+						$chunk = $this->getChunk($chunkX, $chunkZ) ?? throw new AssumptionFailedError("We already checked that the chunk is loaded");
 						foreach($this->getChunkPlayers($chunkX, $chunkZ) as $p){
 							$p->onChunkChanged($chunkX, $chunkZ, $chunk);
 						}
@@ -1022,7 +1046,7 @@ class World implements ChunkManager{
 			World::getXZ($index, $chunkX, $chunkZ);
 			$chunkPlayers = $this->getChunkPlayers($chunkX, $chunkZ);
 			if(count($chunkPlayers) > 0){
-				$this->server->broadcastPackets($chunkPlayers, $entries);
+				NetworkBroadcastUtils::broadcastPackets($chunkPlayers, $entries);
 			}
 		}
 
@@ -1069,7 +1093,7 @@ class World implements ChunkManager{
 	public function createBlockUpdatePackets(array $blocks) : array{
 		$packets = [];
 
-		$blockMapping = RuntimeBlockMapping::getInstance();
+		$blockTranslator = TypeConverter::getInstance()->getBlockTranslator();
 
 		foreach($blocks as $b){
 			if(!($b instanceof Vector3)){
@@ -1078,14 +1102,32 @@ class World implements ChunkManager{
 
 			$fullBlock = $this->getBlockAt($b->x, $b->y, $b->z);
 			$blockPosition = BlockPosition::fromVector3($b);
+
+			$tile = $this->getTileAt($b->x, $b->y, $b->z);
+			if($tile instanceof Spawnable){
+				$expectedClass = $fullBlock->getIdInfo()->getTileClass();
+				if($expectedClass !== null && $tile instanceof $expectedClass && count($fakeStateProperties = $tile->getRenderUpdateBugWorkaroundStateProperties($fullBlock)) > 0){
+					$originalStateData = $blockTranslator->internalIdToNetworkStateData($fullBlock->getStateId());
+					$fakeStateData = new BlockStateData(
+						$originalStateData->getName(),
+						array_merge($originalStateData->getStates(), $fakeStateProperties),
+						$originalStateData->getVersion()
+					);
+					$packets[] = UpdateBlockPacket::create(
+						$blockPosition,
+						$blockTranslator->getBlockStateDictionary()->lookupStateIdFromData($fakeStateData) ?? throw new AssumptionFailedError("Unmapped fake blockstate data: " . $fakeStateData->toNbt()),
+						UpdateBlockPacket::FLAG_NETWORK,
+						UpdateBlockPacket::DATA_LAYER_NORMAL
+					);
+				}
+			}
 			$packets[] = UpdateBlockPacket::create(
 				$blockPosition,
-				$blockMapping->toRuntimeId($fullBlock->getFullId()),
+				$blockTranslator->internalIdToNetworkId($fullBlock->getStateId()),
 				UpdateBlockPacket::FLAG_NETWORK,
 				UpdateBlockPacket::DATA_LAYER_NORMAL
 			);
 
-			$tile = $this->getTileAt($b->x, $b->y, $b->z);
 			if($tile instanceof Spawnable){
 				$packets[] = BlockActorDataPacket::create($blockPosition, $tile->getSerializedSpawnCompound());
 			}
@@ -1097,6 +1139,7 @@ class World implements ChunkManager{
 	public function clearCache(bool $force = false) : void{
 		if($force){
 			$this->blockCache = [];
+			$this->blockCollisionBoxCache = [];
 		}else{
 			$count = 0;
 			foreach($this->blockCache as $list){
@@ -1106,6 +1149,16 @@ class World implements ChunkManager{
 					break;
 				}
 			}
+
+			$count = 0;
+			foreach($this->blockCollisionBoxCache as $list){
+				$count += count($list);
+				if($count > 2048){
+					//TODO: Is this really the best logic?
+					$this->blockCollisionBoxCache = [];
+					break;
+				}
+			}
 		}
 	}
 
@@ -1121,68 +1174,92 @@ class World implements ChunkManager{
 		if($block instanceof UnknownBlock){
 			throw new \InvalidArgumentException("Cannot do random-tick on unknown block");
 		}
-		$this->randomTickBlocks[$block->getFullId()] = true;
+		$this->randomTickBlocks[$block->getStateId()] = true;
 	}
 
 	public function removeRandomTickedBlock(Block $block) : void{
-		unset($this->randomTickBlocks[$block->getFullId()]);
+		unset($this->randomTickBlocks[$block->getStateId()]);
 	}
 
 	/**
-	 * Returns the radius of chunks to be ticked around each ticking chunk loader (usually players). This is referred to
-	 * as "simulation distance" in the Minecraft: Bedrock world options screen.
+	 * Returns the radius of chunks to be ticked around each player. This is referred to as "simulation distance" in the
+	 * Minecraft: Bedrock world options screen.
 	 */
 	public function getChunkTickRadius() : int{
 		return $this->chunkTickRadius;
 	}
 
 	/**
-	 * Sets the radius of chunks ticked around each ticking chunk loader (usually players).
+	 * Sets the radius of chunks ticked around each player. This may not take effect immediately, since each player
+	 * needs to recalculate their tick radius.
 	 */
 	public function setChunkTickRadius(int $radius) : void{
 		$this->chunkTickRadius = $radius;
 	}
 
+	/**
+	 * Returns a list of chunk position hashes (as returned by World::chunkHash()) which are currently valid for
+	 * ticking.
+	 *
+	 * @return int[]
+	 * @phpstan-return list<ChunkPosHash>
+	 */
+	public function getTickingChunks() : array{
+		return array_keys($this->validTickingChunks);
+	}
+
+	/**
+	 * Instructs the World to tick the specified chunk, for as long as this chunk ticker (or any other chunk ticker) is
+	 * registered to it.
+	 */
+	public function registerTickingChunk(ChunkTicker $ticker, int $chunkX, int $chunkZ) : void{
+		$chunkPosHash = World::chunkHash($chunkX, $chunkZ);
+		$this->registeredTickingChunks[$chunkPosHash][spl_object_id($ticker)] = $ticker;
+		$this->recheckTickingChunks[$chunkPosHash] = $chunkPosHash;
+	}
+
+	/**
+	 * Unregisters the given chunk ticker from the specified chunk. If there are other tickers still registered to the
+	 * chunk, it will continue to be ticked.
+	 */
+	public function unregisterTickingChunk(ChunkTicker $ticker, int $chunkX, int $chunkZ) : void{
+		$chunkHash = World::chunkHash($chunkX, $chunkZ);
+		$tickerId = spl_object_id($ticker);
+		if(isset($this->registeredTickingChunks[$chunkHash][$tickerId])){
+			if(count($this->registeredTickingChunks[$chunkHash]) === 1){
+				unset(
+					$this->registeredTickingChunks[$chunkHash],
+					$this->recheckTickingChunks[$chunkHash],
+					$this->validTickingChunks[$chunkHash]
+				);
+			}else{
+				unset($this->registeredTickingChunks[$chunkHash][$tickerId]);
+			}
+		}
+	}
+
 	private function tickChunks() : void{
-		if($this->chunkTickRadius <= 0 || count($this->tickingLoaders) === 0){
+		if($this->chunkTickRadius <= 0 || count($this->registeredTickingChunks) === 0){
 			return;
 		}
 
-		$this->timings->randomChunkUpdatesChunkSelection->startTiming();
+		if(count($this->recheckTickingChunks) > 0){
+			$this->timings->randomChunkUpdatesChunkSelection->startTiming();
 
-		/** @var bool[] $chunkTickList chunkhash => dummy */
-		$chunkTickList = [];
+			$chunkTickableCache = [];
 
-		$chunkTickableCache = [];
-
-		$centerChunks = [];
-
-		$selector = new ChunkSelector();
-		foreach($this->tickingLoaders as $loader){
-			$centerChunkX = (int) floor($loader->getX()) >> Chunk::COORD_BIT_SIZE;
-			$centerChunkZ = (int) floor($loader->getZ()) >> Chunk::COORD_BIT_SIZE;
-			$centerChunkPosHash = World::chunkHash($centerChunkX, $centerChunkZ);
-			if(isset($centerChunks[$centerChunkPosHash])){
-				//we already queued chunks in this radius because of a previous loader on the same chunk
-				continue;
-			}
-			$centerChunks[$centerChunkPosHash] = true;
-
-			foreach($selector->selectChunks(
-				$this->chunkTickRadius,
-				$centerChunkX,
-				$centerChunkZ
-			) as $hash){
+			foreach($this->recheckTickingChunks as $hash => $_){
 				World::getXZ($hash, $chunkX, $chunkZ);
-				if(!isset($chunkTickList[$hash]) && isset($this->chunks[$hash]) && $this->isChunkTickable($chunkX, $chunkZ, $chunkTickableCache)){
-					$chunkTickList[$hash] = true;
+				if($this->isChunkTickable($chunkX, $chunkZ, $chunkTickableCache)){
+					$this->validTickingChunks[$hash] = $hash;
 				}
 			}
+			$this->recheckTickingChunks = [];
+
+			$this->timings->randomChunkUpdatesChunkSelection->stopTiming();
 		}
 
-		$this->timings->randomChunkUpdatesChunkSelection->stopTiming();
-
-		foreach($chunkTickList as $index => $_){
+		foreach($this->validTickingChunks as $index => $_){
 			World::getXZ($index, $chunkX, $chunkZ);
 
 			$this->tickChunk($chunkX, $chunkZ);
@@ -1230,11 +1307,35 @@ class World implements ChunkManager{
 		return true;
 	}
 
+	/**
+	 * Marks the 3x3 square of chunks centered on the specified chunk for chunk ticking eligibility recheck.
+	 *
+	 * This should be used whenever the chunk's eligibility to be ticked is changed. This includes:
+	 * - Loading/unloading the chunk (the chunk may be registered for ticking before it is loaded)
+	 * - Locking/unlocking the chunk (e.g. world population)
+	 * - Light populated state change (i.e. scheduled for light population, or light population completed)
+	 * - Arbitrary chunk replacement (i.e. setChunk() or similar)
+	 */
+	private function markTickingChunkForRecheck(int $chunkX, int $chunkZ) : void{
+		for($cx = -1; $cx <= 1; ++$cx){
+			for($cz = -1; $cz <= 1; ++$cz){
+				$chunkHash = World::chunkHash($chunkX + $cx, $chunkZ + $cz);
+				unset($this->validTickingChunks[$chunkHash]);
+				if(isset($this->registeredTickingChunks[$chunkHash])){
+					$this->recheckTickingChunks[$chunkHash] = $chunkHash;
+				}else{
+					unset($this->recheckTickingChunks[$chunkHash]);
+				}
+			}
+		}
+	}
+
 	private function orderLightPopulation(int $chunkX, int $chunkZ) : void{
 		$chunkHash = World::chunkHash($chunkX, $chunkZ);
 		$lightPopulatedState = $this->chunks[$chunkHash]->isLightPopulated();
 		if($lightPopulatedState === false){
 			$this->chunks[$chunkHash]->setLightPopulated(null);
+			$this->markTickingChunkForRecheck($chunkX, $chunkZ);
 
 			$this->workerPool->submitTask(new LightPopulationTask(
 				$this->chunks[$chunkHash],
@@ -1258,6 +1359,7 @@ class World implements ChunkManager{
 						$chunk->getSubChunk($y)->setBlockSkyLightArray($lightArray);
 					}
 					$chunk->setLightPopulated(true);
+					$this->markTickingChunkForRecheck($chunkX, $chunkZ);
 				}
 			));
 		}
@@ -1273,7 +1375,7 @@ class World implements ChunkManager{
 			$entity->onRandomUpdate();
 		}
 
-		$blockFactory = BlockFactory::getInstance();
+		$blockFactory = RuntimeBlockStateRegistry::getInstance();
 		foreach($chunk->getSubChunks() as $Y => $subChunk){
 			if(!$subChunk->isEmptyFast()){
 				$k = 0;
@@ -1287,10 +1389,10 @@ class World implements ChunkManager{
 					$z = ($k >> (SubChunk::COORD_BIT_SIZE * 2)) & SubChunk::COORD_MASK;
 					$k >>= (SubChunk::COORD_BIT_SIZE * 3);
 
-					$state = $subChunk->getFullBlock($x, $y, $z);
+					$state = $subChunk->getBlockStateId($x, $y, $z);
 
 					if(isset($this->randomTickBlocks[$state])){
-						$block = $blockFactory->fromFullBlock($state);
+						$block = $blockFactory->fromStateId($state);
 						$block->position($this, $chunkX * Chunk::EDGE_LENGTH + $x, ($Y << SubChunk::COORD_BIT_SIZE) + $y, $chunkZ * Chunk::EDGE_LENGTH + $z);
 						$block->onRandomTick();
 					}
@@ -1314,10 +1416,15 @@ class World implements ChunkManager{
 
 		(new WorldSaveEvent($this))->call();
 
+		$timings = $this->timings->syncDataSave;
+		$timings->startTiming();
+
 		$this->provider->getWorldData()->setTime($this->time);
 		$this->saveChunks();
 		$this->provider->getWorldData()->save();
 
+		$timings->stopTiming();
+
 		return true;
 	}
 
@@ -1327,10 +1434,11 @@ class World implements ChunkManager{
 			foreach($this->chunks as $chunkHash => $chunk){
 				self::getXZ($chunkHash, $chunkX, $chunkZ);
 				$this->provider->saveChunk($chunkX, $chunkZ, new ChunkData(
-					$chunk,
+					$chunk->getSubChunks(),
+					$chunk->isPopulated(),
 					array_map(fn(Entity $e) => $e->saveNBT(), array_filter($this->getChunkEntities($chunkX, $chunkZ), fn(Entity $e) => $e->canSaveWithChunk())),
 					array_map(fn(Tile $t) => $t->saveNBT(), $chunk->getTiles()),
-				));
+				), $chunk->getTerrainDirtyFlags());
 				$chunk->clearTerrainDirtyFlags();
 			}
 		}finally{
@@ -1353,9 +1461,9 @@ class World implements ChunkManager{
 		$this->scheduledBlockUpdateQueue->insert(new Vector3((int) $pos->x, (int) $pos->y, (int) $pos->z), $delay + $this->server->getTick());
 	}
 
-	private function tryAddToNeighbourUpdateQueue(Vector3 $pos) : void{
-		if($this->isInWorld($pos->x, $pos->y, $pos->z)){
-			$hash = World::blockHash($pos->x, $pos->y, $pos->z);
+	private function tryAddToNeighbourUpdateQueue(int $x, int $y, int $z) : void{
+		if($this->isInWorld($x, $y, $z)){
+			$hash = World::blockHash($x, $y, $z);
 			if(!isset($this->neighbourBlockUpdateQueueIndex[$hash])){
 				$this->neighbourBlockUpdateQueue->enqueue($hash);
 				$this->neighbourBlockUpdateQueueIndex[$hash] = true;
@@ -1363,17 +1471,28 @@ class World implements ChunkManager{
 		}
 	}
 
+	/**
+	 * Identical to {@link World::notifyNeighbourBlockUpdate()}, but without the Vector3 requirement. We don't want or
+	 * need Vector3 in the places where this is called.
+	 *
+	 * TODO: make this the primary method in PM6
+	 */
+	private function internalNotifyNeighbourBlockUpdate(int $x, int $y, int $z) : void{
+		$this->tryAddToNeighbourUpdateQueue($x, $y, $z);
+		foreach(Facing::OFFSET as [$dx, $dy, $dz]){
+			$this->tryAddToNeighbourUpdateQueue($x + $dx, $y + $dy, $z + $dz);
+		}
+	}
+
 	/**
 	 * Notify the blocks at and around the position that the block at the position may have changed.
 	 * This will cause onNearbyBlockChange() to be called for these blocks.
+	 * TODO: Accept plain integers in PM6 - the Vector3 requirement is an unnecessary inconvenience
 	 *
 	 * @see Block::onNearbyBlockChange()
 	 */
 	public function notifyNeighbourBlockUpdate(Vector3 $pos) : void{
-		$this->tryAddToNeighbourUpdateQueue($pos);
-		foreach($pos->sides() as $side){
-			$this->tryAddToNeighbourUpdateQueue($side);
-		}
+		$this->internalNotifyNeighbourBlockUpdate($pos->getFloorX(), $pos->getFloorY(), $pos->getFloorZ());
 	}
 
 	/**
@@ -1417,25 +1536,53 @@ class World implements ChunkManager{
 		return $collides;
 	}
 
+	/**
+	 * Returns a list of all block AABBs which overlap the full block area at the given coordinates.
+	 * This checks a padding of 1 block around the coordinates to account for oversized AABBs of blocks like fences.
+	 * Larger AABBs (>= 2 blocks on any axis) are not accounted for.
+	 *
+	 * @return AxisAlignedBB[]
+	 */
+	private function getBlockCollisionBoxesForCell(int $x, int $y, int $z) : array{
+		$block = $this->getBlockAt($x, $y, $z);
+		$boxes = $block->getCollisionBoxes();
+
+		$cellBB = AxisAlignedBB::one()->offset($x, $y, $z);
+		foreach(Facing::OFFSET as [$dx, $dy, $dz]){
+			$extraBoxes = $this->getBlockAt($x + $dx, $y + $dy, $z + $dz)->getCollisionBoxes();
+			foreach($extraBoxes as $extraBox){
+				if($extraBox->intersectsWith($cellBB)){
+					$boxes[] = $extraBox;
+				}
+			}
+		}
+
+		return $boxes;
+	}
+
 	/**
 	 * @return AxisAlignedBB[]
 	 * @phpstan-return list<AxisAlignedBB>
 	 */
-	public function getCollisionBoxes(Entity $entity, AxisAlignedBB $bb, bool $entities = true) : array{
-		$minX = (int) floor($bb->minX - 1);
-		$minY = (int) floor($bb->minY - 1);
-		$minZ = (int) floor($bb->minZ - 1);
-		$maxX = (int) floor($bb->maxX + 1);
-		$maxY = (int) floor($bb->maxY + 1);
-		$maxZ = (int) floor($bb->maxZ + 1);
+	public function getBlockCollisionBoxes(AxisAlignedBB $bb) : array{
+		$minX = (int) floor($bb->minX);
+		$minY = (int) floor($bb->minY);
+		$minZ = (int) floor($bb->minZ);
+		$maxX = (int) floor($bb->maxX);
+		$maxY = (int) floor($bb->maxY);
+		$maxZ = (int) floor($bb->maxZ);
 
 		$collides = [];
 
 		for($z = $minZ; $z <= $maxZ; ++$z){
 			for($x = $minX; $x <= $maxX; ++$x){
+				$chunkPosHash = World::chunkHash($x >> Chunk::COORD_BIT_SIZE, $z >> Chunk::COORD_BIT_SIZE);
 				for($y = $minY; $y <= $maxY; ++$y){
-					$block = $this->getBlockAt($x, $y, $z);
-					foreach($block->getCollisionBoxes() as $blockBB){
+					$relativeBlockHash = World::chunkBlockHash($x, $y, $z);
+
+					$boxes = $this->blockCollisionBoxCache[$chunkPosHash][$relativeBlockHash] ??= $this->getBlockCollisionBoxesForCell($x, $y, $z);
+
+					foreach($boxes as $blockBB){
 						if($blockBB->intersectsWith($bb)){
 							$collides[] = $blockBB;
 						}
@@ -1444,6 +1591,19 @@ class World implements ChunkManager{
 			}
 		}
 
+		return $collides;
+	}
+
+	/**
+	 * @deprecated Use {@link World::getBlockCollisionBoxes()} instead (alongside {@link World::getCollidingEntities()}
+	 * if entity collision boxes are also required).
+	 *
+	 * @return AxisAlignedBB[]
+	 * @phpstan-return list<AxisAlignedBB>
+	 */
+	public function getCollisionBoxes(Entity $entity, AxisAlignedBB $bb, bool $entities = true) : array{
+		$collides = $this->getBlockCollisionBoxes($bb);
+
 		if($entities){
 			foreach($this->getCollidingEntities($bb->expandedCopy(0.25, 0.25, 0.25), $entity) as $ent){
 				$collides[] = clone $ent->boundingBox;
@@ -1511,16 +1671,19 @@ class World implements ChunkManager{
 	}
 
 	/**
-	 * Returns the highest available level of any type of light at the given coordinates, adjusted for the current
-	 * weather and time of day.
+	 * Returns the highest level of any type of light at the given coordinates, adjusted for the current weather and
+	 * time of day.
 	 */
 	public function getFullLight(Vector3 $pos) : int{
-		return $this->getFullLightAt($pos->x, $pos->y, $pos->z);
+		$floorX = $pos->getFloorX();
+		$floorY = $pos->getFloorY();
+		$floorZ = $pos->getFloorZ();
+		return $this->getFullLightAt($floorX, $floorY, $floorZ);
 	}
 
 	/**
-	 * Returns the highest available level of any type of light at the given coordinates, adjusted for the current
-	 * weather and time of day.
+	 * Returns the highest level of any type of light at the given coordinates, adjusted for the current weather and
+	 * time of day.
 	 */
 	public function getFullLightAt(int $x, int $y, int $z) : int{
 		$skyLight = $this->getRealBlockSkyLightAt($x, $y, $z);
@@ -1532,18 +1695,43 @@ class World implements ChunkManager{
 	}
 
 	/**
-	 * Returns the highest available level of any type of light at, or adjacent to, the given coordinates, adjusted for
-	 * the current weather and time of day.
+	 * Returns the highest level of any type of light at, or adjacent to, the given coordinates, adjusted for the
+	 * current weather and time of day.
 	 */
 	public function getHighestAdjacentFullLightAt(int $x, int $y, int $z) : int{
-		return $this->getHighestAdjacentLight($x, $y, $z, \Closure::fromCallable([$this, 'getFullLightAt']));
+		return $this->getHighestAdjacentLight($x, $y, $z, $this->getFullLightAt(...));
+	}
+
+	/**
+	 * Returns the highest potential level of any type of light at the target coordinates.
+	 * This is not affected by weather or time of day.
+	 */
+	public function getPotentialLight(Vector3 $pos) : int{
+		$floorX = $pos->getFloorX();
+		$floorY = $pos->getFloorY();
+		$floorZ = $pos->getFloorZ();
+		return $this->getPotentialLightAt($floorX, $floorY, $floorZ);
+	}
+
+	/**
+	 * Returns the highest potential level of any type of light at the target coordinates.
+	 * This is not affected by weather or time of day.
+	 */
+	public function getPotentialLightAt(int $x, int $y, int $z) : int{
+		return max($this->getPotentialBlockSkyLightAt($x, $y, $z), $this->getBlockLightAt($x, $y, $z));
+	}
+
+	/**
+	 * Returns the highest potential level of any type of light at, or adjacent to, the given coordinates.
+	 * This is not affected by weather or time of day.
+	 */
+	public function getHighestAdjacentPotentialLightAt(int $x, int $y, int $z) : int{
+		return $this->getHighestAdjacentLight($x, $y, $z, $this->getPotentialLightAt(...));
 	}
 
 	/**
 	 * Returns the highest potential level of sky light at the target coordinates, regardless of the time of day or
 	 * weather conditions.
-	 * You usually don't want to use this for vanilla gameplay logic; prefer the real sky light instead.
-	 * @see World::getRealBlockSkyLightAt()
 	 *
 	 * @return int 0-15
 	 */
@@ -1587,7 +1775,7 @@ class World implements ChunkManager{
 			return;
 		}
 
-		$blockFactory = BlockFactory::getInstance();
+		$blockFactory = RuntimeBlockStateRegistry::getInstance();
 		$this->timings->doBlockSkyLightUpdates->startTiming();
 		if($this->skyLightUpdate === null){
 			$this->skyLightUpdate = new SkyLightUpdate(new SubChunkExplorer($this), $blockFactory->lightFilter, $blockFactory->blocksDirectSkyLight);
@@ -1608,14 +1796,10 @@ class World implements ChunkManager{
 	 */
 	private function getHighestAdjacentLight(int $x, int $y, int $z, \Closure $lightGetter) : int{
 		$max = 0;
-		foreach([
-			[$x + 1, $y, $z],
-			[$x - 1, $y, $z],
-			[$x, $y + 1, $z],
-			[$x, $y - 1, $z],
-			[$x, $y, $z + 1],
-			[$x, $y, $z - 1]
-		] as [$x1, $y1, $z1]){
+		foreach(Facing::OFFSET as [$offsetX, $offsetY, $offsetZ]){
+			$x1 = $x + $offsetX;
+			$y1 = $y + $offsetY;
+			$z1 = $z + $offsetZ;
 			if(
 				!$this->isInWorld($x1, $y1, $z1) ||
 				($chunk = $this->getChunk($x1 >> Chunk::COORD_BIT_SIZE, $z1 >> Chunk::COORD_BIT_SIZE)) === null ||
@@ -1632,7 +1816,7 @@ class World implements ChunkManager{
 	 * Returns the highest potential level of sky light in the positions adjacent to the specified block coordinates.
 	 */
 	public function getHighestAdjacentPotentialBlockSkyLight(int $x, int $y, int $z) : int{
-		return $this->getHighestAdjacentLight($x, $y, $z, \Closure::fromCallable([$this, 'getPotentialBlockSkyLightAt']));
+		return $this->getHighestAdjacentLight($x, $y, $z, $this->getPotentialBlockSkyLightAt(...));
 	}
 
 	/**
@@ -1647,7 +1831,7 @@ class World implements ChunkManager{
 	 * Returns the highest block light level available in the positions adjacent to the specified block coordinates.
 	 */
 	public function getHighestAdjacentBlockLight(int $x, int $y, int $z) : int{
-		return $this->getHighestAdjacentLight($x, $y, $z, \Closure::fromCallable([$this, 'getBlockLightAt']));
+		return $this->getHighestAdjacentLight($x, $y, $z, $this->getBlockLightAt(...));
 	}
 
 	private function executeQueuedLightUpdates() : void{
@@ -1710,7 +1894,7 @@ class World implements ChunkManager{
 
 			$chunk = $this->chunks[$chunkHash] ?? null;
 			if($chunk !== null){
-				$block = BlockFactory::getInstance()->fromFullBlock($chunk->getFullBlock($x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK));
+				$block = RuntimeBlockStateRegistry::getInstance()->fromStateId($chunk->getBlockStateId($x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK));
 			}else{
 				$addToCache = false;
 				$block = VanillaBlocks::AIR();
@@ -1728,7 +1912,11 @@ class World implements ChunkManager{
 			$addToCache = false;
 		}else{
 			$this->inDynamicStateRecalculation = true;
-			$block->readStateFromWorld();
+			$replacement = $block->readStateFromWorld();
+			if($replacement !== $block){
+				$replacement->position($this, $x, $y, $z);
+				$block = $replacement;
+			}
 			$this->inDynamicStateRecalculation = false;
 		}
 
@@ -1780,6 +1968,14 @@ class World implements ChunkManager{
 		$relativeBlockHash = World::chunkBlockHash($x, $y, $z);
 
 		unset($this->blockCache[$chunkHash][$relativeBlockHash]);
+		unset($this->blockCollisionBoxCache[$chunkHash][$relativeBlockHash]);
+		//blocks like fences have collision boxes that reach into neighbouring blocks, so we need to invalidate the
+		//caches for those blocks as well
+		foreach(Facing::OFFSET as [$offsetX, $offsetY, $offsetZ]){
+			$sideChunkPosHash = World::chunkHash(($x + $offsetX) >> Chunk::COORD_BIT_SIZE, ($z + $offsetZ) >> Chunk::COORD_BIT_SIZE);
+			$sideChunkBlockHash = World::chunkBlockHash($x + $offsetX, $y + $offsetY, $z + $offsetZ);
+			unset($this->blockCollisionBoxCache[$sideChunkPosHash][$sideChunkBlockHash]);
+		}
 
 		if(!isset($this->changedBlocks[$chunkHash])){
 			$this->changedBlocks[$chunkHash] = [];
@@ -1792,7 +1988,7 @@ class World implements ChunkManager{
 
 		if($update){
 			$this->updateAllLight($x, $y, $z);
-			$this->notifyNeighbourBlockUpdate($pos);
+			$this->internalNotifyNeighbourBlockUpdate($x, $y, $z);
 		}
 
 		$this->timings->setBlock->stopTiming();
@@ -1803,10 +1999,10 @@ class World implements ChunkManager{
 			return null;
 		}
 
-		$itemEntity = new ItemEntity(Location::fromObject($source, $this, lcg_value() * 360, 0), $item);
+		$itemEntity = new ItemEntity(Location::fromObject($source, $this, Utils::getRandomFloat() * 360, 0), $item);
 
 		$itemEntity->setPickupDelay($delay);
-		$itemEntity->setMotion($motion ?? new Vector3(lcg_value() * 0.2 - 0.1, 0.2, lcg_value() * 0.2 - 0.1));
+		$itemEntity->setMotion($motion ?? new Vector3(Utils::getRandomFloat() * 0.2 - 0.1, 0.2, Utils::getRandomFloat() * 0.2 - 0.1));
 		$itemEntity->spawnToAll();
 
 		return $itemEntity;
@@ -1823,9 +2019,9 @@ class World implements ChunkManager{
 		$orbs = [];
 
 		foreach(ExperienceOrb::splitIntoOrbSizes($amount) as $split){
-			$orb = new ExperienceOrb(Location::fromObject($pos, $this, lcg_value() * 360, 0), $split);
+			$orb = new ExperienceOrb(Location::fromObject($pos, $this, Utils::getRandomFloat() * 360, 0), $split);
 
-			$orb->setMotion(new Vector3((lcg_value() * 0.2 - 0.1) * 2, lcg_value() * 0.4, (lcg_value() * 0.2 - 0.1) * 2));
+			$orb->setMotion(new Vector3((Utils::getRandomFloat() * 0.2 - 0.1) * 2, Utils::getRandomFloat() * 0.4, (Utils::getRandomFloat() * 0.2 - 0.1) * 2));
 			$orb->spawnToAll();
 
 			$orbs[] = $orb;
@@ -1838,10 +2034,11 @@ class World implements ChunkManager{
 	 * Tries to break a block using a item, including Player time checks if available
 	 * It'll try to lower the durability if Item is a tool, and set it to Air if broken.
 	 *
-	 * @param Item $item reference parameter (if null, can break anything)
+	 * @param Item   &$item          reference parameter (if null, can break anything)
+	 * @param Item[] &$returnedItems Items to be added to the target's inventory (or dropped, if the inventory is full)
 	 * @phpstan-param-out Item $item
 	 */
-	public function useBreakOn(Vector3 $vector, Item &$item = null, ?Player $player = null, bool $createParticles = false) : bool{
+	public function useBreakOn(Vector3 $vector, ?Item &$item = null, ?Player $player = null, bool $createParticles = false, array &$returnedItems = []) : bool{
 		$vector = $vector->floor();
 
 		$chunkX = $vector->getFloorX() >> Chunk::COORD_BIT_SIZE;
@@ -1879,7 +2076,7 @@ class World implements ChunkManager{
 				$itemParser = LegacyStringToItemParser::getInstance();
 				foreach($item->getCanDestroy() as $v){
 					$entry = $itemParser->parse($v);
-					if($entry->getBlock()->isSameType($target)){
+					if($entry->getBlock()->hasSameTypeId($target)){
 						$canBreak = true;
 						break;
 					}
@@ -1903,10 +2100,10 @@ class World implements ChunkManager{
 		}
 
 		foreach($affectedBlocks as $t){
-			$this->destroyBlockInternal($t, $item, $player, $createParticles);
+			$this->destroyBlockInternal($t, $item, $player, $createParticles, $returnedItems);
 		}
 
-		$item->onDestroyBlock($target);
+		$item->onDestroyBlock($target, $returnedItems);
 
 		if(count($drops) > 0){
 			$dropPos = $vector->add(0.5, 0.5, 0.5);
@@ -1924,12 +2121,15 @@ class World implements ChunkManager{
 		return true;
 	}
 
-	private function destroyBlockInternal(Block $target, Item $item, ?Player $player = null, bool $createParticles = false) : void{
+	/**
+	 * @param Item[] &$returnedItems
+	 */
+	private function destroyBlockInternal(Block $target, Item $item, ?Player $player, bool $createParticles, array &$returnedItems) : void{
 		if($createParticles){
 			$this->addParticle($target->getPosition()->add(0.5, 0.5, 0.5), new BlockBreakParticle($target));
 		}
 
-		$target->onBreak($item, $player);
+		$target->onBreak($item, $player, $returnedItems);
 
 		$tile = $this->getTile($target->getPosition());
 		if($tile !== null){
@@ -1940,15 +2140,22 @@ class World implements ChunkManager{
 	/**
 	 * Uses a item on a position and face, placing it or activating the block
 	 *
-	 * @param Player|null $player    default null
-	 * @param bool        $playSound Whether to play a block-place sound if the block was placed successfully.
+	 * @param Player|null $player         default null
+	 * @param bool        $playSound      Whether to play a block-place sound if the block was placed successfully.
+	 * @param Item[]      &$returnedItems Items to be added to the target's inventory (or dropped if the inventory is full)
 	 */
-	public function useItemOn(Vector3 $vector, Item &$item, int $face, ?Vector3 $clickVector = null, ?Player $player = null, bool $playSound = false) : bool{
+	public function useItemOn(Vector3 $vector, Item &$item, int $face, ?Vector3 $clickVector = null, ?Player $player = null, bool $playSound = false, array &$returnedItems = []) : bool{
 		$blockClicked = $this->getBlock($vector);
 		$blockReplace = $blockClicked->getSide($face);
 
 		if($clickVector === null){
 			$clickVector = new Vector3(0.0, 0.0, 0.0);
+		}else{
+			$clickVector = new Vector3(
+				min(1.0, max(0.0, $clickVector->x)),
+				min(1.0, max(0.0, $clickVector->y)),
+				min(1.0, max(0.0, $clickVector->z))
+			);
 		}
 
 		if(!$this->isInWorld($blockReplace->getPosition()->x, $blockReplace->getPosition()->y, $blockReplace->getPosition()->z)){
@@ -1961,30 +2168,36 @@ class World implements ChunkManager{
 			return false;
 		}
 
-		if($blockClicked->getId() === BlockLegacyIds::AIR){
+		if($blockClicked->getTypeId() === BlockTypeIds::AIR){
 			return false;
 		}
 
 		if($player !== null){
 			$ev = new PlayerInteractEvent($player, $item, $blockClicked, $clickVector, $face, PlayerInteractEvent::RIGHT_CLICK_BLOCK);
+			if($player->isSneaking()){
+				$ev->setUseItem(false);
+				$ev->setUseBlock($item->isNull()); //opening doors is still possible when sneaking if using an empty hand
+			}
 			if(!$player->hasPermission(DefaultPermissionNames::GAME_BLOCK_INTERACT)){
 				$ev->cancel(); //set it to cancelled so plugins can bypass this
 			}
 
 			$ev->call();
 			if(!$ev->isCancelled()){
-				if((!$player->isSneaking() || $item->isNull()) && $blockClicked->onInteract($item, $face, $clickVector, $player)){
+				if($ev->useBlock() && $blockClicked->onInteract($item, $face, $clickVector, $player, $returnedItems)){
 					return true;
 				}
 
-				$result = $item->onInteractBlock($player, $blockReplace, $blockClicked, $face, $clickVector);
-				if(!$result->equals(ItemUseResult::NONE())){
-					return $result->equals(ItemUseResult::SUCCESS());
+				if($ev->useItem()){
+					$result = $item->onInteractBlock($player, $blockReplace, $blockClicked, $face, $clickVector, $returnedItems);
+					if($result !== ItemUseResult::NONE){
+						return $result === ItemUseResult::SUCCESS;
+					}
 				}
 			}else{
 				return false;
 			}
-		}elseif($blockClicked->onInteract($item, $face, $clickVector, $player)){
+		}elseif($blockClicked->onInteract($item, $face, $clickVector, $player, $returnedItems)){
 			return true;
 		}
 
@@ -2020,7 +2233,7 @@ class World implements ChunkManager{
 		}
 
 		if($player !== null){
-			$ev = new BlockPlaceEvent($player, $hand, $blockReplace, $blockClicked, $item);
+			$ev = new BlockPlaceEvent($player, $tx, $blockClicked, $item);
 			if(!$player->hasPermission(DefaultPermissionNames::GAME_BLOCK_PLACE)){
 				$ev->cancel();
 			}
@@ -2030,7 +2243,7 @@ class World implements ChunkManager{
 				$itemParser = LegacyStringToItemParser::getInstance();
 				foreach($item->getCanPlaceOn() as $v){
 					$entry = $itemParser->parse($v);
-					if($entry->getBlock()->isSameType($blockClicked)){
+					if($entry->getBlock()->hasSameTypeId($blockClicked)){
 						$canPlace = true;
 						break;
 					}
@@ -2096,11 +2309,9 @@ class World implements ChunkManager{
 	public function getCollidingEntities(AxisAlignedBB $bb, ?Entity $entity = null) : array{
 		$nearby = [];
 
-		if($entity === null || $entity->canCollide){
-			foreach($this->getNearbyEntities($bb, $entity) as $ent){
-				if($ent->canBeCollidedWith() && ($entity === null || $entity->canCollideWith($ent))){
-					$nearby[] = $ent;
-				}
+		foreach($this->getNearbyEntities($bb, $entity) as $ent){
+			if($ent->canBeCollidedWith() && ($entity === null || $entity->canCollideWith($ent))){
+				$nearby[] = $ent;
 			}
 		}
 
@@ -2123,9 +2334,6 @@ class World implements ChunkManager{
 
 		for($x = $minX; $x <= $maxX; ++$x){
 			for($z = $minZ; $z <= $maxZ; ++$z){
-				if(!$this->isChunkLoaded($x, $z)){
-					continue;
-				}
 				foreach($this->getChunkEntities($x, $z) as $ent){
 					if($ent !== $entity && $ent->boundingBox->intersectsWith($bb)){
 						$nearby[] = $ent;
@@ -2166,9 +2374,6 @@ class World implements ChunkManager{
 
 		for($x = $minX; $x <= $maxX; ++$x){
 			for($z = $minZ; $z <= $maxZ; ++$z){
-				if(!$this->isChunkLoaded($x, $z)){
-					continue;
-				}
 				foreach($this->getChunkEntities($x, $z) as $entity){
 					if(!($entity instanceof $entityType) || $entity->isFlaggedForDespawn() || (!$includeDead && !$entity->isAlive())){
 						continue;
@@ -2212,23 +2417,23 @@ class World implements ChunkManager{
 		return ($chunk = $this->loadChunk($x >> Chunk::COORD_BIT_SIZE, $z >> Chunk::COORD_BIT_SIZE)) !== null ? $chunk->getTile($x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK) : null;
 	}
 
-	public function getBiomeId(int $x, int $z) : int{
+	public function getBiomeId(int $x, int $y, int $z) : int{
 		if(($chunk = $this->loadChunk($x >> Chunk::COORD_BIT_SIZE, $z >> Chunk::COORD_BIT_SIZE)) !== null){
-			return $chunk->getBiomeId($x & Chunk::COORD_MASK, $z & Chunk::COORD_MASK);
+			return $chunk->getBiomeId($x & Chunk::COORD_MASK, $y & Chunk::COORD_MASK, $z & Chunk::COORD_MASK);
 		}
 		return BiomeIds::OCEAN; //TODO: this should probably throw instead (terrain not generated yet)
 	}
 
-	public function getBiome(int $x, int $z) : Biome{
-		return BiomeRegistry::getInstance()->getBiome($this->getBiomeId($x, $z));
+	public function getBiome(int $x, int $y, int $z) : Biome{
+		return BiomeRegistry::getInstance()->getBiome($this->getBiomeId($x, $y, $z));
 	}
 
-	public function setBiomeId(int $x, int $z, int $biomeId) : void{
+	public function setBiomeId(int $x, int $y, int $z, int $biomeId) : void{
 		$chunkX = $x >> Chunk::COORD_BIT_SIZE;
 		$chunkZ = $z >> Chunk::COORD_BIT_SIZE;
 		$this->unlockChunk($chunkX, $chunkZ, null);
 		if(($chunk = $this->loadChunk($chunkX, $chunkZ)) !== null){
-			$chunk->setBiomeId($x & Chunk::COORD_MASK, $z & Chunk::COORD_MASK, $biomeId);
+			$chunk->setBiomeId($x & Chunk::COORD_MASK, $y & Chunk::COORD_MASK, $z & Chunk::COORD_MASK, $biomeId);
 		}else{
 			//if we allowed this, the modifications would be lost when the chunk is created
 			throw new WorldException("Cannot set biome in a non-generated chunk");
@@ -2302,6 +2507,7 @@ class World implements ChunkManager{
 			throw new \InvalidArgumentException("Chunk $chunkX $chunkZ is already locked");
 		}
 		$this->chunkLock[$chunkHash] = $lockId;
+		$this->markTickingChunkForRecheck($chunkX, $chunkZ);
 	}
 
 	/**
@@ -2316,6 +2522,7 @@ class World implements ChunkManager{
 		$chunkHash = World::chunkHash($chunkX, $chunkZ);
 		if(isset($this->chunkLock[$chunkHash]) && ($lockId === null || $this->chunkLock[$chunkHash] === $lockId)){
 			unset($this->chunkLock[$chunkHash]);
+			$this->markTickingChunkForRecheck($chunkX, $chunkZ);
 			return true;
 		}
 		return false;
@@ -2342,7 +2549,7 @@ class World implements ChunkManager{
 				$localY = $tilePosition->getFloorY();
 				$localZ = $tilePosition->getFloorZ() & Chunk::COORD_MASK;
 
-				$newBlock = BlockFactory::getInstance()->fromFullBlock($chunk->getFullBlock($localX, $localY, $localZ));
+				$newBlock = RuntimeBlockStateRegistry::getInstance()->fromStateId($chunk->getBlockStateId($localX, $localY, $localZ));
 				$expectedTileClass = $newBlock->getIdInfo()->getTileClass();
 				if(
 					$expectedTileClass === null || //new block doesn't expect a tile
@@ -2365,15 +2572,19 @@ class World implements ChunkManager{
 		$this->chunks[$chunkHash] = $chunk;
 
 		unset($this->blockCache[$chunkHash]);
+		unset($this->blockCollisionBoxCache[$chunkHash]);
 		unset($this->changedBlocks[$chunkHash]);
 		$chunk->setTerrainDirty();
+		$this->markTickingChunkForRecheck($chunkX, $chunkZ); //this replacement chunk may not meet the conditions for ticking
 
 		if(!$this->isChunkInUse($chunkX, $chunkZ)){
 			$this->unloadChunkRequest($chunkX, $chunkZ);
 		}
 
 		if($oldChunk === null){
-			(new ChunkLoadEvent($this, $chunkX, $chunkZ, $chunk, true))->call();
+			if(ChunkLoadEvent::hasHandlers()){
+				(new ChunkLoadEvent($this, $chunkX, $chunkZ, $chunk, true))->call();
+			}
 
 			foreach($this->getChunkListeners($chunkX, $chunkZ) as $listener){
 				$listener->onChunkLoaded($chunkX, $chunkZ, $chunk);
@@ -2423,7 +2634,7 @@ class World implements ChunkManager{
 
 	public function isChunkPopulated(int $x, int $z) : bool{
 		$chunk = $this->loadChunk($x, $z);
-		return $chunk !== null ? $chunk->isPopulated() : false;
+		return $chunk !== null && $chunk->isPopulated();
 	}
 
 	/**
@@ -2489,9 +2700,10 @@ class World implements ChunkManager{
 		$pos = $this->entityLastKnownPositions[$entity->getId()];
 		$chunkHash = World::chunkHash($pos->getFloorX() >> Chunk::COORD_BIT_SIZE, $pos->getFloorZ() >> Chunk::COORD_BIT_SIZE);
 		if(isset($this->entitiesByChunk[$chunkHash][$entity->getId()])){
-			unset($this->entitiesByChunk[$chunkHash][$entity->getId()]);
-			if(count($this->entitiesByChunk[$chunkHash]) === 0){
+			if(count($this->entitiesByChunk[$chunkHash]) === 1){
 				unset($this->entitiesByChunk[$chunkHash]);
+			}else{
+				unset($this->entitiesByChunk[$chunkHash][$entity->getId()]);
 			}
 		}
 		unset($this->entityLastKnownPositions[$entity->getId()]);
@@ -2524,9 +2736,10 @@ class World implements ChunkManager{
 		if($oldChunkX !== $newChunkX || $oldChunkZ !== $newChunkZ){
 			$oldChunkHash = World::chunkHash($oldChunkX, $oldChunkZ);
 			if(isset($this->entitiesByChunk[$oldChunkHash][$entity->getId()])){
-				unset($this->entitiesByChunk[$oldChunkHash][$entity->getId()]);
-				if(count($this->entitiesByChunk[$oldChunkHash]) === 0){
+				if(count($this->entitiesByChunk[$oldChunkHash]) === 1){
 					unset($this->entitiesByChunk[$oldChunkHash]);
+				}else{
+					unset($this->entitiesByChunk[$oldChunkHash][$entity->getId()]);
 				}
 			}
 
@@ -2619,27 +2832,37 @@ class World implements ChunkManager{
 
 		$this->timings->syncChunkLoadData->startTiming();
 
-		$chunk = null;
+		$loadedChunkData = null;
 
 		try{
-			$chunk = $this->provider->loadChunk($x, $z);
+			$loadedChunkData = $this->provider->loadChunk($x, $z);
 		}catch(CorruptedChunkException $e){
 			$this->logger->critical("Failed to load chunk x=$x z=$z: " . $e->getMessage());
 		}
 
 		$this->timings->syncChunkLoadData->stopTiming();
 
-		if($chunk === null){
+		if($loadedChunkData === null){
 			$this->timings->syncChunkLoad->stopTiming();
 			return null;
 		}
 
-		$this->chunks[$chunkHash] = $chunk->getChunk();
+		$chunkData = $loadedChunkData->getData();
+		$chunk = new Chunk($chunkData->getSubChunks(), $chunkData->isPopulated());
+		if(!$loadedChunkData->isUpgraded()){
+			$chunk->clearTerrainDirtyFlags();
+		}else{
+			$this->logger->debug("Chunk $x $z has been upgraded, will be saved at the next autosave opportunity");
+		}
+		$this->chunks[$chunkHash] = $chunk;
 		unset($this->blockCache[$chunkHash]);
+		unset($this->blockCollisionBoxCache[$chunkHash]);
 
-		$this->initChunk($x, $z, $chunk);
+		$this->initChunk($x, $z, $chunkData);
 
-		(new ChunkLoadEvent($this, $x, $z, $this->chunks[$chunkHash], false))->call();
+		if(ChunkLoadEvent::hasHandlers()){
+			(new ChunkLoadEvent($this, $x, $z, $this->chunks[$chunkHash], false))->call();
+		}
 
 		if(!$this->isChunkInUse($x, $z)){
 			$this->logger->debug("Newly loaded chunk $x $z has no loaders registered, will be unloaded at next available opportunity");
@@ -2648,6 +2871,7 @@ class World implements ChunkManager{
 		foreach($this->getChunkListeners($x, $z) as $listener){
 			$listener->onChunkLoaded($x, $z, $this->chunks[$chunkHash]);
 		}
+		$this->markTickingChunkForRecheck($x, $z); //tickers may have been registered before the chunk was loaded
 
 		$this->timings->syncChunkLoad->stopTiming();
 
@@ -2657,26 +2881,6 @@ class World implements ChunkManager{
 	private function initChunk(int $chunkX, int $chunkZ, ChunkData $chunkData) : void{
 		$logger = new \PrefixedLogger($this->logger, "Loading chunk $chunkX $chunkZ");
 
-		$this->timings->syncChunkLoadFixInvalidBlocks->startTiming();
-		$blockFactory = BlockFactory::getInstance();
-		$invalidBlocks = 0;
-		foreach($chunkData->getChunk()->getSubChunks() as $subChunk){
-			foreach($subChunk->getBlockLayers() as $blockLayer){
-				foreach($blockLayer->getPalette() as $blockStateId){
-					$mappedStateId = $blockFactory->getMappedStateId($blockStateId);
-					if($mappedStateId !== $blockStateId){
-						$blockLayer->replaceAll($blockStateId, $mappedStateId);
-						$invalidBlocks++;
-					}
-				}
-			}
-		}
-		if($invalidBlocks > 0){
-			$logger->debug("Fixed $invalidBlocks invalid blockstates");
-			$chunkData->getChunk()->setTerrainDirtyFlag(Chunk::DIRTY_FLAG_BLOCKS, true);
-		}
-		$this->timings->syncChunkLoadFixInvalidBlocks->stopTiming();
-
 		if(count($chunkData->getEntityNBT()) !== 0){
 			$this->timings->syncChunkLoadEntities->startTiming();
 			$entityFactory = EntityFactory::getInstance();
@@ -2771,22 +2975,25 @@ class World implements ChunkManager{
 		$chunk = $this->chunks[$chunkHash] ?? null;
 
 		if($chunk !== null){
-			$ev = new ChunkUnloadEvent($this, $x, $z, $chunk);
-			$ev->call();
-			if($ev->isCancelled()){
-				$this->timings->doChunkUnload->stopTiming();
+			if(ChunkUnloadEvent::hasHandlers()){
+				$ev = new ChunkUnloadEvent($this, $x, $z, $chunk);
+				$ev->call();
+				if($ev->isCancelled()){
+					$this->timings->doChunkUnload->stopTiming();
 
-				return false;
+					return false;
+				}
 			}
 
 			if($trySave && $this->getAutoSave()){
 				$this->timings->syncChunkSave->startTiming();
 				try{
 					$this->provider->saveChunk($x, $z, new ChunkData(
-						$chunk,
+						$chunk->getSubChunks(),
+						$chunk->isPopulated(),
 						array_map(fn(Entity $e) => $e->saveNBT(), array_filter($this->getChunkEntities($x, $z), fn(Entity $e) => $e->canSaveWithChunk())),
 						array_map(fn(Tile $t) => $t->saveNBT(), $chunk->getTiles()),
-					));
+					), $chunk->getTerrainDirtyFlags());
 				}finally{
 					$this->timings->syncChunkSave->stopTiming();
 				}
@@ -2808,7 +3015,10 @@ class World implements ChunkManager{
 
 		unset($this->chunks[$chunkHash]);
 		unset($this->blockCache[$chunkHash]);
+		unset($this->blockCollisionBoxCache[$chunkHash]);
 		unset($this->changedBlocks[$chunkHash]);
+		unset($this->registeredTickingChunks[$chunkHash]);
+		$this->markTickingChunkForRecheck($x, $z);
 
 		if(array_key_exists($chunkHash, $this->chunkPopulationRequestMap)){
 			$this->logger->debug("Rejecting population promise for chunk $x $z");
@@ -2870,7 +3080,7 @@ class World implements ChunkManager{
 	 * @throws WorldException if the terrain is not generated
 	 */
 	public function getSafeSpawn(?Vector3 $spawn = null) : Position{
-		if(!($spawn instanceof Vector3) || $spawn->y < 1){
+		if(!($spawn instanceof Vector3) || $spawn->y <= $this->minY){
 			$spawn = $this->getSpawnLocation();
 		}
 
@@ -2883,7 +3093,7 @@ class World implements ChunkManager{
 		$x = (int) $v->x;
 		$z = (int) $v->z;
 		$y = (int) min($max - 2, $v->y);
-		$wasAir = $this->getBlockAt($x, $y - 1, $z)->getId() === BlockLegacyIds::AIR; //TODO: bad hack, clean up
+		$wasAir = $this->getBlockAt($x, $y - 1, $z)->getTypeId() === BlockTypeIds::AIR; //TODO: bad hack, clean up
 		for(; $y > $this->minY; --$y){
 			if($this->getBlockAt($x, $y, $z)->isFullCube()){
 				if($wasAir){
@@ -2930,6 +3140,16 @@ class World implements ChunkManager{
 		return $this->displayName;
 	}
 
+	/**
+	 * Sets the World display name.
+	 */
+	public function setDisplayName(string $name) : void{
+		(new WorldDisplayNameChangeEvent($this, $this->displayName, $name))->call();
+
+		$this->displayName = $name;
+		$this->provider->getWorldData()->setName($name);
+	}
+
 	/**
 	 * Returns the World folder name. This will not change at runtime and will be unique to a world per runtime.
 	 */
@@ -2984,6 +3204,7 @@ class World implements ChunkManager{
 		if($difficulty < 0 || $difficulty > 3){
 			throw new \InvalidArgumentException("Invalid difficulty level $difficulty");
 		}
+		(new WorldDifficultyChangeEvent($this, $this->getDifficulty(), $difficulty))->call();
 		$this->provider->getWorldData()->setDifficulty($difficulty);
 
 		foreach($this->players as $player){
@@ -3117,61 +3338,66 @@ class World implements ChunkManager{
 	private function internalOrderChunkPopulation(int $chunkX, int $chunkZ, ?ChunkLoader $associatedChunkLoader, ?PromiseResolver $resolver) : Promise{
 		$chunkHash = World::chunkHash($chunkX, $chunkZ);
 
-		Timings::$population->startTiming();
+		$timings = $this->timings->chunkPopulationOrder;
+		$timings->startTiming();
 
-		for($xx = -1; $xx <= 1; ++$xx){
-			for($zz = -1; $zz <= 1; ++$zz){
-				if($this->isChunkLocked($chunkX + $xx, $chunkZ + $zz)){
-					//chunk is already in use by another generation request; queue the request for later
-					return $resolver?->getPromise() ?? $this->enqueuePopulationRequest($chunkX, $chunkZ, $associatedChunkLoader);
+		try{
+			for($xx = -1; $xx <= 1; ++$xx){
+				for($zz = -1; $zz <= 1; ++$zz){
+					if($this->isChunkLocked($chunkX + $xx, $chunkZ + $zz)){
+						//chunk is already in use by another generation request; queue the request for later
+						return $resolver?->getPromise() ?? $this->enqueuePopulationRequest($chunkX, $chunkZ, $associatedChunkLoader);
+					}
 				}
 			}
-		}
 
-		$this->activeChunkPopulationTasks[$chunkHash] = true;
-		if($resolver === null){
-			$resolver = new PromiseResolver();
-			$this->chunkPopulationRequestMap[$chunkHash] = $resolver;
-		}
-
-		$chunkPopulationLockId = new ChunkLockId();
-
-		$temporaryChunkLoader = new class implements ChunkLoader{};
-		for($xx = -1; $xx <= 1; ++$xx){
-			for($zz = -1; $zz <= 1; ++$zz){
-				$this->lockChunk($chunkX + $xx, $chunkZ + $zz, $chunkPopulationLockId);
-				$this->registerChunkLoader($temporaryChunkLoader, $chunkX + $xx, $chunkZ + $zz);
+			$this->activeChunkPopulationTasks[$chunkHash] = true;
+			if($resolver === null){
+				$resolver = new PromiseResolver();
+				$this->chunkPopulationRequestMap[$chunkHash] = $resolver;
 			}
-		}
 
-		$centerChunk = $this->loadChunk($chunkX, $chunkZ);
-		$adjacentChunks = $this->getAdjacentChunks($chunkX, $chunkZ);
-		$task = new PopulationTask(
-			$this->worldId,
-			$chunkX,
-			$chunkZ,
-			$centerChunk,
-			$adjacentChunks,
-			function(Chunk $centerChunk, array $adjacentChunks) use ($chunkPopulationLockId, $chunkX, $chunkZ, $temporaryChunkLoader) : void{
-				if(!$this->isLoaded()){
-					return;
+			$chunkPopulationLockId = new ChunkLockId();
+
+			$temporaryChunkLoader = new class implements ChunkLoader{
+			};
+			for($xx = -1; $xx <= 1; ++$xx){
+				for($zz = -1; $zz <= 1; ++$zz){
+					$this->lockChunk($chunkX + $xx, $chunkZ + $zz, $chunkPopulationLockId);
+					$this->registerChunkLoader($temporaryChunkLoader, $chunkX + $xx, $chunkZ + $zz);
 				}
-
-				$this->generateChunkCallback($chunkPopulationLockId, $chunkX, $chunkZ, $centerChunk, $adjacentChunks, $temporaryChunkLoader);
 			}
-		);
-		$workerId = $this->workerPool->selectWorker();
-		if(!isset($this->workerPool->getRunningWorkers()[$workerId]) && isset($this->generatorRegisteredWorkers[$workerId])){
-			$this->logger->debug("Selected worker $workerId previously had generator registered, but is now offline");
-			unset($this->generatorRegisteredWorkers[$workerId]);
-		}
-		if(!isset($this->generatorRegisteredWorkers[$workerId])){
-			$this->registerGeneratorToWorker($workerId);
-		}
-		$this->workerPool->submitTaskToWorker($task, $workerId);
 
-		Timings::$population->stopTiming();
-		return $resolver->getPromise();
+			$centerChunk = $this->loadChunk($chunkX, $chunkZ);
+			$adjacentChunks = $this->getAdjacentChunks($chunkX, $chunkZ);
+			$task = new PopulationTask(
+				$this->worldId,
+				$chunkX,
+				$chunkZ,
+				$centerChunk,
+				$adjacentChunks,
+				function(Chunk $centerChunk, array $adjacentChunks) use ($chunkPopulationLockId, $chunkX, $chunkZ, $temporaryChunkLoader) : void{
+					if(!$this->isLoaded()){
+						return;
+					}
+
+					$this->generateChunkCallback($chunkPopulationLockId, $chunkX, $chunkZ, $centerChunk, $adjacentChunks, $temporaryChunkLoader);
+				}
+			);
+			$workerId = $this->workerPool->selectWorker();
+			if(!isset($this->workerPool->getRunningWorkers()[$workerId]) && isset($this->generatorRegisteredWorkers[$workerId])){
+				$this->logger->debug("Selected worker $workerId previously had generator registered, but is now offline");
+				unset($this->generatorRegisteredWorkers[$workerId]);
+			}
+			if(!isset($this->generatorRegisteredWorkers[$workerId])){
+				$this->registerGeneratorToWorker($workerId);
+			}
+			$this->workerPool->submitTaskToWorker($task, $workerId);
+
+			return $resolver->getPromise();
+		}finally{
+			$timings->stopTiming();
+		}
 	}
 
 	/**
@@ -3179,7 +3405,8 @@ class World implements ChunkManager{
 	 * @phpstan-param array<int, Chunk> $adjacentChunks
 	 */
 	private function generateChunkCallback(ChunkLockId $chunkLockId, int $x, int $z, Chunk $chunk, array $adjacentChunks, ChunkLoader $temporaryChunkLoader) : void{
-		Timings::$generationCallback->startTiming();
+		$timings = $this->timings->chunkPopulationCompletion;
+		$timings->startTiming();
 
 		$dirtyChunks = 0;
 		for($xx = -1; $xx <= 1; ++$xx){
@@ -3212,7 +3439,9 @@ class World implements ChunkManager{
 				}
 
 				if(($oldChunk === null || !$oldChunk->isPopulated()) && $chunk->isPopulated()){
-					(new ChunkPopulateEvent($this, $x, $z, $chunk))->call();
+					if(ChunkPopulateEvent::hasHandlers()){
+						(new ChunkPopulateEvent($this, $x, $z, $chunk))->call();
+					}
 
 					foreach($this->getChunkListeners($x, $z) as $listener){
 						$listener->onChunkPopulated($x, $z, $chunk);
@@ -3248,7 +3477,7 @@ class World implements ChunkManager{
 
 			$this->drainPopulationRequestQueue();
 		}
-		Timings::$generationCallback->stopTiming();
+		$timings->stopTiming();
 	}
 
 	public function doChunkGarbageCollection() : void{
diff --git a/src/world/WorldManager.php b/src/world/WorldManager.php
index 5632c960bd..7ff4ed6e02 100644
--- a/src/world/WorldManager.php
+++ b/src/world/WorldManager.php
@@ -30,7 +30,6 @@ use pocketmine\event\world\WorldUnloadEvent;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\player\ChunkSelector;
 use pocketmine\Server;
-use pocketmine\timings\Timings;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\format\io\exception\CorruptedWorldException;
 use pocketmine\world\format\io\exception\UnsupportedWorldFormatException;
@@ -57,7 +56,10 @@ use function trim;
 class WorldManager{
 	public const TICKS_PER_AUTOSAVE = 300 * Server::TARGET_TICKS_PER_SECOND;
 
-	/** @var World[] */
+	/**
+	 * @var World[]
+	 * @phpstan-var array<int, World>
+	 */
 	private array $worlds = [];
 	private ?World $defaultWorld = null;
 
@@ -77,6 +79,7 @@ class WorldManager{
 
 	/**
 	 * @return World[]
+	 * @phpstan-return array<int, World>
 	 */
 	public function getWorlds() : array{
 		return $this->worlds;
@@ -130,10 +133,6 @@ class WorldManager{
 		}
 
 		$ev = new WorldUnloadEvent($world);
-		if($world === $this->defaultWorld && !$forceUnload){
-			$ev->cancel();
-		}
-
 		$ev->call();
 
 		if(!$forceUnload && $ev->isCancelled()){
@@ -197,7 +196,7 @@ class WorldManager{
 		$providerClass = array_shift($providers);
 
 		try{
-			$provider = $providerClass->fromPath($path);
+			$provider = $providerClass->fromPath($path, new \PrefixedLogger($this->server->getLogger(), "World Provider: $name"));
 		}catch(CorruptedWorldException $e){
 			$this->server->getLogger()->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_level_loadError(
 				$name,
@@ -239,8 +238,10 @@ class WorldManager{
 			}
 			$this->server->getLogger()->notice($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_level_conversion_start($name)));
 
-			$converter = new FormatConverter($provider, $this->providerManager->getDefault(), Path::join($this->server->getDataPath(), "backups", "worlds"), $this->server->getLogger());
-			$provider = $converter->execute();
+			$providerClass = $this->providerManager->getDefault();
+			$converter = new FormatConverter($provider, $providerClass, Path::join($this->server->getDataPath(), "backups", "worlds"), $this->server->getLogger());
+			$converter->execute();
+			$provider = $providerClass->fromPath($path, new \PrefixedLogger($this->server->getLogger(), "World Provider: $name"));
 
 			$this->server->getLogger()->notice($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_level_conversion_finish($name, $converter->getBackupPath())));
 		}
@@ -270,7 +271,7 @@ class WorldManager{
 		$path = $this->getWorldPath($name);
 		$providerEntry->generate($path, $name, $options);
 
-		$world = new World($this->server, $name, $providerEntry->fromPath($path), $this->server->getAsyncPool());
+		$world = new World($this->server, $name, $providerEntry->fromPath($path, new \PrefixedLogger($this->server->getLogger(), "World Provider: $name")), $this->server->getAsyncPool());
 		$this->worlds[$world->getId()] = $world;
 
 		$world->setAutoSave($this->autoSave);
@@ -286,7 +287,7 @@ class WorldManager{
 			$centerX = $spawnLocation->getFloorX() >> Chunk::COORD_BIT_SIZE;
 			$centerZ = $spawnLocation->getFloorZ() >> Chunk::COORD_BIT_SIZE;
 
-			$selected = iterator_to_array((new ChunkSelector())->selectChunks(8, $centerX, $centerZ));
+			$selected = iterator_to_array((new ChunkSelector())->selectChunks(8, $centerX, $centerZ), preserve_keys: false);
 			$done = 0;
 			$total = count($selected);
 			foreach($selected as $index){
@@ -391,7 +392,6 @@ class WorldManager{
 	}
 
 	private function doAutoSave() : void{
-		Timings::$worldSave->startTiming();
 		foreach($this->worlds as $world){
 			foreach($world->getPlayers() as $player){
 				if($player->spawned){
@@ -400,6 +400,5 @@ class WorldManager{
 			}
 			$world->save(false);
 		}
-		Timings::$worldSave->stopTiming();
 	}
 }
diff --git a/src/world/WorldTimings.php b/src/world/WorldTimings.php
index e6a5d6d60e..9a43828c2a 100644
--- a/src/world/WorldTimings.php
+++ b/src/world/WorldTimings.php
@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\world;
 
-use pocketmine\timings\Timings;
 use pocketmine\timings\TimingsHandler;
 
 class WorldTimings{
@@ -34,10 +33,12 @@ class WorldTimings{
 
 	public TimingsHandler $doChunkUnload;
 	public TimingsHandler $scheduledBlockUpdates;
+	public TimingsHandler $neighbourBlockUpdates;
 	public TimingsHandler $randomChunkUpdates;
 	public TimingsHandler $randomChunkUpdatesChunkSelection;
 	public TimingsHandler $doChunkGC;
 	public TimingsHandler $entityTick;
+	public TimingsHandler $tileTick;
 	public TimingsHandler $doTick;
 
 	public TimingsHandler $syncChunkSend;
@@ -48,33 +49,55 @@ class WorldTimings{
 	public TimingsHandler $syncChunkLoadFixInvalidBlocks;
 	public TimingsHandler $syncChunkLoadEntities;
 	public TimingsHandler $syncChunkLoadTileEntities;
+
+	public TimingsHandler $syncDataSave;
 	public TimingsHandler $syncChunkSave;
 
+	public TimingsHandler $chunkPopulationOrder;
+	public TimingsHandler $chunkPopulationCompletion;
+
+	/**
+	 * @var TimingsHandler[]
+	 * @phpstan-var array<string, TimingsHandler>
+	 */
+	private static array $aggregators = [];
+
+	private static function newTimer(string $worldName, string $timerName) : TimingsHandler{
+		$aggregator = self::$aggregators[$timerName] ??= new TimingsHandler("Worlds - $timerName"); //displayed in Minecraft primary table
+
+		return new TimingsHandler("$worldName - $timerName", $aggregator);
+	}
+
 	public function __construct(World $world){
-		$name = $world->getFolderName() . " - ";
+		$name = $world->getFolderName();
 
-		$this->setBlock = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "setBlock");
-		$this->doBlockLightUpdates = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Block Light Updates");
-		$this->doBlockSkyLightUpdates = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Sky Light Updates");
+		$this->setBlock = self::newTimer($name, "Set Blocks");
+		$this->doBlockLightUpdates = self::newTimer($name, "Block Light Updates");
+		$this->doBlockSkyLightUpdates = self::newTimer($name, "Sky Light Updates");
 
-		$this->doChunkUnload = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Unload Chunks");
-		$this->scheduledBlockUpdates = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Scheduled Block Updates");
-		$this->randomChunkUpdates = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Random Chunk Updates");
-		$this->randomChunkUpdatesChunkSelection = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Random Chunk Updates - Chunk Selection");
-		$this->doChunkGC = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Garbage Collection");
-		$this->entityTick = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Tick Entities");
+		$this->doChunkUnload = self::newTimer($name, "Unload Chunks");
+		$this->scheduledBlockUpdates = self::newTimer($name, "Scheduled Block Updates");
+		$this->neighbourBlockUpdates = self::newTimer($name, "Neighbour Block Updates");
+		$this->randomChunkUpdates = self::newTimer($name, "Random Chunk Updates");
+		$this->randomChunkUpdatesChunkSelection = self::newTimer($name, "Random Chunk Updates - Chunk Selection");
+		$this->doChunkGC = self::newTimer($name, "Garbage Collection");
+		$this->entityTick = self::newTimer($name, "Entity Tick");
+		$this->tileTick = self::newTimer($name, "Block Entity Tick");
+		$this->doTick = self::newTimer($name, "World Tick");
 
-		Timings::init(); //make sure the timers we want are available
-		$this->syncChunkSend = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Player Send Chunks", Timings::$playerChunkSend);
-		$this->syncChunkSendPrepare = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Player Send Chunk Prepare", Timings::$playerChunkSend);
+		$this->syncChunkSend = self::newTimer($name, "Player Send Chunks");
+		$this->syncChunkSendPrepare = self::newTimer($name, "Player Send Chunk Prepare");
 
-		$this->syncChunkLoad = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Load", Timings::$worldLoad);
-		$this->syncChunkLoadData = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Load - Data");
-		$this->syncChunkLoadFixInvalidBlocks = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Load - Fix Invalid Blocks");
-		$this->syncChunkLoadEntities = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Load - Entities");
-		$this->syncChunkLoadTileEntities = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Load - TileEntities");
-		$this->syncChunkSave = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Save", Timings::$worldSave);
+		$this->syncChunkLoad = self::newTimer($name, "Chunk Load");
+		$this->syncChunkLoadData = self::newTimer($name, "Chunk Load - Data");
+		$this->syncChunkLoadFixInvalidBlocks = self::newTimer($name, "Chunk Load - Fix Invalid Blocks");
+		$this->syncChunkLoadEntities = self::newTimer($name, "Chunk Load - Entities");
+		$this->syncChunkLoadTileEntities = self::newTimer($name, "Chunk Load - Block Entities");
 
-		$this->doTick = new TimingsHandler($name . "World Tick");
+		$this->syncDataSave = self::newTimer($name, "Data Save");
+		$this->syncChunkSave = self::newTimer($name, "Chunk Save");
+
+		$this->chunkPopulationOrder = self::newTimer($name, "Chunk Population - Order");
+		$this->chunkPopulationCompletion = self::newTimer($name, "Chunk Population - Completion");
 	}
 }
diff --git a/src/world/biome/Biome.php b/src/world/biome/Biome.php
index e42983cc82..b7f5020e6f 100644
--- a/src/world/biome/Biome.php
+++ b/src/world/biome/Biome.php
@@ -44,10 +44,8 @@ abstract class Biome{
 	/** @var Block[] */
 	private array $groundCover = [];
 
-	/** @var float */
-	protected $rainfall = 0.5;
-	/** @var float */
-	protected $temperature = 0.5;
+	protected float $rainfall = 0.5;
+	protected float $temperature = 0.5;
 
 	public function clearPopulators() : void{
 		$this->populators = [];
diff --git a/src/world/biome/BiomeRegistry.php b/src/world/biome/BiomeRegistry.php
index 470360d4b4..1af60fcd59 100644
--- a/src/world/biome/BiomeRegistry.php
+++ b/src/world/biome/BiomeRegistry.php
@@ -23,9 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\world\biome;
 
-use pocketmine\block\utils\TreeType;
 use pocketmine\data\bedrock\BiomeIds;
 use pocketmine\utils\SingletonTrait;
+use pocketmine\world\generator\object\TreeType;
 
 final class BiomeRegistry{
 	use SingletonTrait;
@@ -54,7 +54,7 @@ final class BiomeRegistry{
 
 		$this->register(BiomeIds::EXTREME_HILLS_EDGE, new SmallMountainsBiome());
 
-		$this->register(BiomeIds::BIRCH_FOREST, new ForestBiome(TreeType::BIRCH()));
+		$this->register(BiomeIds::BIRCH_FOREST, new ForestBiome(TreeType::BIRCH));
 	}
 
 	public function register(int $id, Biome $biome) : void{
diff --git a/src/world/biome/ForestBiome.php b/src/world/biome/ForestBiome.php
index f75c303c40..94d3e567cc 100644
--- a/src/world/biome/ForestBiome.php
+++ b/src/world/biome/ForestBiome.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\world\biome;
 
-use pocketmine\block\utils\TreeType;
+use pocketmine\world\generator\object\TreeType;
 use pocketmine\world\generator\populator\TallGrass;
 use pocketmine\world\generator\populator\Tree;
 
@@ -33,7 +33,7 @@ class ForestBiome extends GrassyBiome{
 	public function __construct(?TreeType $type = null){
 		parent::__construct();
 
-		$this->type = $type ?? TreeType::OAK();
+		$this->type = $type ?? TreeType::OAK;
 
 		$trees = new Tree($type);
 		$trees->setBaseAmount(5);
@@ -46,7 +46,7 @@ class ForestBiome extends GrassyBiome{
 
 		$this->setElevation(63, 81);
 
-		if($this->type->equals(TreeType::BIRCH())){
+		if($this->type === TreeType::BIRCH){
 			$this->temperature = 0.6;
 			$this->rainfall = 0.5;
 		}else{
diff --git a/src/world/biome/TaigaBiome.php b/src/world/biome/TaigaBiome.php
index b96c69bcc5..979ca66ec2 100644
--- a/src/world/biome/TaigaBiome.php
+++ b/src/world/biome/TaigaBiome.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\world\biome;
 
-use pocketmine\block\utils\TreeType;
+use pocketmine\world\generator\object\TreeType;
 use pocketmine\world\generator\populator\TallGrass;
 use pocketmine\world\generator\populator\Tree;
 
@@ -32,7 +32,7 @@ class TaigaBiome extends SnowyBiome{
 	public function __construct(){
 		parent::__construct();
 
-		$trees = new Tree(TreeType::SPRUCE());
+		$trees = new Tree(TreeType::SPRUCE);
 		$trees->setBaseAmount(10);
 		$this->addPopulator($trees);
 
diff --git a/src/world/format/BiomeArray.php b/src/world/format/BiomeArray.php
deleted file mode 100644
index 5c7a3131f1..0000000000
--- a/src/world/format/BiomeArray.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\world\format;
-
-use function chr;
-use function ord;
-use function str_repeat;
-use function strlen;
-
-final class BiomeArray{
-	private string $payload;
-
-	/**
-	 * @param string $payload ZZZZXXXX key bits
-	 */
-	public function __construct(string $payload){
-		if(strlen($payload) !== 256){
-			throw new \InvalidArgumentException("Biome array is expected to be exactly 256 bytes");
-		}
-		$this->payload = $payload;
-	}
-
-	public static function fill(int $biomeId) : self{
-		return new BiomeArray(str_repeat(chr($biomeId), 256));
-	}
-
-	private static function idx(int $x, int $z) : int{
-		if($x < 0 || $x >= 16 || $z < 0 || $z >= 16){
-			throw new \InvalidArgumentException("x and z must be in the range 0-15");
-		}
-		return ($z << 4) | $x;
-	}
-
-	public function get(int $x, int $z) : int{
-		return ord($this->payload[self::idx($x, $z)]);
-	}
-
-	public function set(int $x, int $z, int $biomeId) : void{
-		if($biomeId < 0 || $biomeId >= 256){
-			throw new \InvalidArgumentException("Biome ID must be in the range 0-255");
-		}
-		$this->payload[self::idx($x, $z)] = chr($biomeId);
-	}
-
-	/**
-	 * @return string ZZZZXXXX key bits
-	 */
-	public function getData() : string{
-		return $this->payload;
-	}
-}
diff --git a/src/world/format/Chunk.php b/src/world/format/Chunk.php
index afcbf259e4..e4c877dc91 100644
--- a/src/world/format/Chunk.php
+++ b/src/world/format/Chunk.php
@@ -27,57 +27,54 @@ declare(strict_types=1);
 namespace pocketmine\world\format;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockLegacyIds;
 use pocketmine\block\tile\Tile;
+use pocketmine\data\bedrock\BiomeIds;
 use function array_map;
 
 class Chunk{
 	public const DIRTY_FLAG_BLOCKS = 1 << 0;
 	public const DIRTY_FLAG_BIOMES = 1 << 3;
 
-	public const MIN_SUBCHUNK_INDEX = 0;
-	public const MAX_SUBCHUNK_INDEX = 15;
+	public const DIRTY_FLAGS_ALL = ~0;
+	public const DIRTY_FLAGS_NONE = 0;
+
+	public const MIN_SUBCHUNK_INDEX = -4;
+	public const MAX_SUBCHUNK_INDEX = 19;
 	public const MAX_SUBCHUNKS = self::MAX_SUBCHUNK_INDEX - self::MIN_SUBCHUNK_INDEX + 1;
 
 	public const EDGE_LENGTH = SubChunk::EDGE_LENGTH;
 	public const COORD_BIT_SIZE = SubChunk::COORD_BIT_SIZE;
 	public const COORD_MASK = SubChunk::COORD_MASK;
 
-	private int $terrainDirtyFlags = 0;
+	private int $terrainDirtyFlags = self::DIRTY_FLAGS_ALL;
 
-	/** @var bool|null */
-	protected $lightPopulated = false;
-	/** @var bool */
-	protected $terrainPopulated = false;
+	protected ?bool $lightPopulated = false;
+	protected bool $terrainPopulated = false;
 
 	/**
 	 * @var \SplFixedArray|SubChunk[]
 	 * @phpstan-var \SplFixedArray<SubChunk>
 	 */
-	protected $subChunks;
+	protected \SplFixedArray $subChunks;
 
 	/** @var Tile[] */
-	protected $tiles = [];
+	protected array $tiles = [];
 
-	/** @var HeightArray */
-	protected $heightMap;
-
-	/** @var BiomeArray */
-	protected $biomeIds;
+	protected HeightArray $heightMap;
 
 	/**
 	 * @param SubChunk[] $subChunks
 	 */
-	public function __construct(array $subChunks, BiomeArray $biomeIds, bool $terrainPopulated){
+	public function __construct(array $subChunks, bool $terrainPopulated){
 		$this->subChunks = new \SplFixedArray(Chunk::MAX_SUBCHUNKS);
 
 		foreach($this->subChunks as $y => $null){
-			$this->subChunks[$y] = $subChunks[$y + self::MIN_SUBCHUNK_INDEX] ?? new SubChunk(BlockLegacyIds::AIR << Block::INTERNAL_METADATA_BITS, []);
+			//TODO: we should probably require all subchunks to be provided here
+			$this->subChunks[$y] = $subChunks[$y + self::MIN_SUBCHUNK_INDEX] ?? new SubChunk(Block::EMPTY_STATE_ID, [], new PalettedBlockArray(BiomeIds::OCEAN));
 		}
 
 		$val = (self::MAX_SUBCHUNK_INDEX + 1) * SubChunk::EDGE_LENGTH;
 		$this->heightMap = HeightArray::fill($val); //TODO: what about lazily initializing this?
-		$this->biomeIds = $biomeIds;
 
 		$this->terrainPopulated = $terrainPopulated;
 	}
@@ -93,20 +90,20 @@ class Chunk{
 	 * Returns the internal ID of the blockstate at the given coordinates.
 	 *
 	 * @param int $x 0-15
-	 * @param int $y 0-255
+	 * @param int $y dependent on the height of the world
 	 * @param int $z 0-15
 	 *
-	 * @return int bitmap, (id << 4) | meta
+	 * @return int the blockstate ID of the given block
 	 */
-	public function getFullBlock(int $x, int $y, int $z) : int{
-		return $this->getSubChunk($y >> SubChunk::COORD_BIT_SIZE)->getFullBlock($x, $y & SubChunk::COORD_MASK, $z);
+	public function getBlockStateId(int $x, int $y, int $z) : int{
+		return $this->getSubChunk($y >> SubChunk::COORD_BIT_SIZE)->getBlockStateId($x, $y & SubChunk::COORD_MASK, $z);
 	}
 
 	/**
 	 * Sets the blockstate at the given coordinate by internal ID.
 	 */
-	public function setFullBlock(int $x, int $y, int $z, int $block) : void{
-		$this->getSubChunk($y >> SubChunk::COORD_BIT_SIZE)->setFullBlock($x, $y & SubChunk::COORD_MASK, $z, $block);
+	public function setBlockStateId(int $x, int $y, int $z, int $block) : void{
+		$this->getSubChunk($y >> SubChunk::COORD_BIT_SIZE)->setBlockStateId($x, $y & SubChunk::COORD_MASK, $z, $block);
 		$this->terrainDirtyFlags |= self::DIRTY_FLAG_BLOCKS;
 	}
 
@@ -116,7 +113,7 @@ class Chunk{
 	 * @param int $x 0-15
 	 * @param int $z 0-15
 	 *
-	 * @return int|null 0-255, or null if there are no blocks in the column
+	 * @return int|null the Y coordinate, or null if there are no blocks in the column
 	 */
 	public function getHighestBlockAt(int $x, int $z) : ?int{
 		for($y = self::MAX_SUBCHUNK_INDEX; $y >= self::MIN_SUBCHUNK_INDEX; --$y){
@@ -153,23 +150,27 @@ class Chunk{
 	 * Returns the biome ID at the specified X/Z chunk block coordinates
 	 *
 	 * @param int $x 0-15
+	 * @param int $y dependent on the height of the world
 	 * @param int $z 0-15
 	 *
-	 * @return int 0-255
+	 * @see BiomeIds
 	 */
-	public function getBiomeId(int $x, int $z) : int{
-		return $this->biomeIds->get($x, $z);
+	public function getBiomeId(int $x, int $y, int $z) : int{
+		return $this->getSubChunk($y >> SubChunk::COORD_BIT_SIZE)->getBiomeArray()->get($x, $y, $z);
 	}
 
 	/**
 	 * Sets the biome ID at the specified X/Z chunk block coordinates
 	 *
 	 * @param int $x       0-15
+	 * @param int $y       dependent on the height of the world
 	 * @param int $z       0-15
-	 * @param int $biomeId 0-255
+	 * @param int $biomeId A valid biome ID
+	 *
+	 * @see BiomeIds
 	 */
-	public function setBiomeId(int $x, int $z, int $biomeId) : void{
-		$this->biomeIds->set($x, $z, $biomeId);
+	public function setBiomeId(int $x, int $y, int $z, int $biomeId) : void{
+		$this->getSubChunk($y >> SubChunk::COORD_BIT_SIZE)->getBiomeArray()->set($x, $y, $z, $biomeId);
 		$this->terrainDirtyFlags |= self::DIRTY_FLAG_BIOMES;
 	}
 
@@ -218,7 +219,7 @@ class Chunk{
 	 * Returns the tile at the specified chunk block coordinates, or null if no tile exists.
 	 *
 	 * @param int $x 0-15
-	 * @param int $y 0-255
+	 * @param int $y dependent on the height of the world
 	 * @param int $z 0-15
 	 */
 	public function getTile(int $x, int $y, int $z) : ?Tile{
@@ -234,10 +235,6 @@ class Chunk{
 		}
 	}
 
-	public function getBiomeIdArray() : string{
-		return $this->biomeIds->getData();
-	}
-
 	/**
 	 * @return int[]
 	 */
@@ -253,7 +250,7 @@ class Chunk{
 	}
 
 	public function isTerrainDirty() : bool{
-		return $this->terrainDirtyFlags !== 0;
+		return $this->terrainDirtyFlags !== self::DIRTY_FLAGS_NONE;
 	}
 
 	public function getTerrainDirtyFlag(int $flag) : bool{
@@ -273,11 +270,11 @@ class Chunk{
 	}
 
 	public function setTerrainDirty() : void{
-		$this->terrainDirtyFlags = ~0;
+		$this->terrainDirtyFlags = self::DIRTY_FLAGS_ALL;
 	}
 
 	public function clearTerrainDirtyFlags() : void{
-		$this->terrainDirtyFlags = 0;
+		$this->terrainDirtyFlags = self::DIRTY_FLAGS_NONE;
 	}
 
 	public function getSubChunk(int $y) : SubChunk{
@@ -295,8 +292,8 @@ class Chunk{
 			throw new \InvalidArgumentException("Invalid subchunk Y coordinate $y");
 		}
 
-		$this->subChunks[$y - self::MIN_SUBCHUNK_INDEX] = $subChunk ?? new SubChunk(BlockLegacyIds::AIR << Block::INTERNAL_METADATA_BITS, []);
-		$this->setTerrainDirtyFlag(self::DIRTY_FLAG_BLOCKS, true);
+		$this->subChunks[$y - self::MIN_SUBCHUNK_INDEX] = $subChunk ?? new SubChunk(Block::EMPTY_STATE_ID, [], new PalettedBlockArray(BiomeIds::OCEAN));
+		$this->terrainDirtyFlags |= self::DIRTY_FLAG_BLOCKS;
 	}
 
 	/**
@@ -326,14 +323,13 @@ class Chunk{
 			return clone $subChunk;
 		}, $this->subChunks->toArray()));
 		$this->heightMap = clone $this->heightMap;
-		$this->biomeIds = clone $this->biomeIds;
 	}
 
 	/**
 	 * Hashes the given chunk block coordinates into a single integer.
 	 *
 	 * @param int $x 0-15
-	 * @param int $y 0-255
+	 * @param int $y dependent on the height of the world
 	 * @param int $z 0-15
 	 */
 	public static function blockHash(int $x, int $y, int $z) : int{
diff --git a/src/world/format/SubChunk.php b/src/world/format/SubChunk.php
index 9f1b94beca..d8546e7e92 100644
--- a/src/world/format/SubChunk.php
+++ b/src/world/format/SubChunk.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\world\format;
 
 use function array_map;
-use function array_values;
 use function count;
 
 class SubChunk{
@@ -32,22 +31,19 @@ class SubChunk{
 	public const COORD_MASK = ~(~0 << self::COORD_BIT_SIZE);
 	public const EDGE_LENGTH = 1 << self::COORD_BIT_SIZE;
 
-	/** @var PalettedBlockArray[] */
-	private array $blockLayers;
-
 	/**
 	 * SubChunk constructor.
 	 *
-	 * @param PalettedBlockArray[] $blocks
+	 * @param PalettedBlockArray[] $blockLayers
+	 * @phpstan-param list<PalettedBlockArray> $blockLayers
 	 */
 	public function __construct(
 		private int $emptyBlockId,
-		array $blocks, //TODO: promote this once we can break BC again (needs a name change)
+		private array $blockLayers,
+		private PalettedBlockArray $biomes,
 		private ?LightArray $skyLight = null,
 		private ?LightArray $blockLight = null
-	){
-		$this->blockLayers = $blocks;
-	}
+	){}
 
 	/**
 	 * Returns whether this subchunk contains any non-air blocks.
@@ -73,14 +69,14 @@ class SubChunk{
 	 */
 	public function getEmptyBlockId() : int{ return $this->emptyBlockId; }
 
-	public function getFullBlock(int $x, int $y, int $z) : int{
+	public function getBlockStateId(int $x, int $y, int $z) : int{
 		if(count($this->blockLayers) === 0){
 			return $this->emptyBlockId;
 		}
 		return $this->blockLayers[0]->get($x, $y, $z);
 	}
 
-	public function setFullBlock(int $x, int $y, int $z, int $block) : void{
+	public function setBlockStateId(int $x, int $y, int $z, int $block) : void{
 		if(count($this->blockLayers) === 0){
 			$this->blockLayers[] = new PalettedBlockArray($this->emptyBlockId);
 		}
@@ -89,6 +85,7 @@ class SubChunk{
 
 	/**
 	 * @return PalettedBlockArray[]
+	 * @phpstan-return list<PalettedBlockArray>
 	 */
 	public function getBlockLayers() : array{
 		return $this->blockLayers;
@@ -107,6 +104,8 @@ class SubChunk{
 		return null; //highest block not in this subchunk
 	}
 
+	public function getBiomeArray() : PalettedBlockArray{ return $this->biomes; }
+
 	public function getBlockSkyLightArray() : LightArray{
 		return $this->skyLight ??= LightArray::fill(0);
 	}
@@ -131,17 +130,19 @@ class SubChunk{
 	}
 
 	public function collectGarbage() : void{
-		foreach($this->blockLayers as $k => $layer){
+		$cleanedLayers = [];
+		foreach($this->blockLayers as $layer){
 			$layer->collectGarbage();
 
 			foreach($layer->getPalette() as $p){
 				if($p !== $this->emptyBlockId){
+					$cleanedLayers[] = $layer;
 					continue 2;
 				}
 			}
-			unset($this->blockLayers[$k]);
 		}
-		$this->blockLayers = array_values($this->blockLayers);
+		$this->blockLayers = $cleanedLayers;
+		$this->biomes->collectGarbage();
 
 		if($this->skyLight !== null && $this->skyLight->isUniform(0)){
 			$this->skyLight = null;
@@ -155,6 +156,7 @@ class SubChunk{
 		$this->blockLayers = array_map(function(PalettedBlockArray $array) : PalettedBlockArray{
 			return clone $array;
 		}, $this->blockLayers);
+		$this->biomes = clone $this->biomes;
 
 		if($this->skyLight !== null){
 			$this->skyLight = clone $this->skyLight;
diff --git a/src/world/format/io/BaseWorldProvider.php b/src/world/format/io/BaseWorldProvider.php
index bb5491aa40..79f6875a4b 100644
--- a/src/world/format/io/BaseWorldProvider.php
+++ b/src/world/format/io/BaseWorldProvider.php
@@ -23,23 +23,38 @@ declare(strict_types=1);
 
 namespace pocketmine\world\format\io;
 
+use pocketmine\data\bedrock\block\BlockStateDeserializeException;
+use pocketmine\data\bedrock\block\BlockStateDeserializer;
+use pocketmine\data\bedrock\block\BlockStateSerializer;
+use pocketmine\data\bedrock\block\upgrade\BlockDataUpgrader;
 use pocketmine\world\format\io\exception\CorruptedWorldException;
 use pocketmine\world\format\io\exception\UnsupportedWorldFormatException;
+use pocketmine\world\format\PalettedBlockArray;
 use pocketmine\world\WorldException;
+use function count;
 use function file_exists;
+use function implode;
 
 abstract class BaseWorldProvider implements WorldProvider{
-	/** @var string */
-	protected $path;
-	/** @var WorldData */
-	protected $worldData;
+	protected WorldData $worldData;
 
-	public function __construct(string $path){
+	protected BlockStateDeserializer $blockStateDeserializer;
+	protected BlockDataUpgrader $blockDataUpgrader;
+	protected BlockStateSerializer $blockStateSerializer;
+
+	public function __construct(
+		protected string $path,
+		protected \Logger $logger
+	){
 		if(!file_exists($path)){
 			throw new WorldException("World does not exist");
 		}
 
-		$this->path = $path;
+		//TODO: this should not rely on singletons
+		$this->blockStateDeserializer = GlobalBlockStateHandlers::getDeserializer();
+		$this->blockDataUpgrader = GlobalBlockStateHandlers::getUpgrader();
+		$this->blockStateSerializer = GlobalBlockStateHandlers::getSerializer();
+
 		$this->worldData = $this->loadLevelData();
 	}
 
@@ -49,6 +64,57 @@ abstract class BaseWorldProvider implements WorldProvider{
 	 */
 	abstract protected function loadLevelData() : WorldData;
 
+	private function translatePalette(PalettedBlockArray $blockArray, \Logger $logger) : PalettedBlockArray{
+		//TODO: missing type info in stubs
+		/** @phpstan-var list<int> $palette */
+		$palette = $blockArray->getPalette();
+
+		$newPalette = [];
+		$blockDecodeErrors = [];
+		foreach($palette as $k => $legacyIdMeta){
+			//TODO: remember data for unknown states so we can implement them later
+			$id = $legacyIdMeta >> 4;
+			$meta = $legacyIdMeta & 0xf;
+			try{
+				$newStateData = $this->blockDataUpgrader->upgradeIntIdMeta($id, $meta);
+			}catch(BlockStateDeserializeException $e){
+				$blockDecodeErrors[] = "Palette offset $k / Failed to upgrade legacy ID/meta $id:$meta: " . $e->getMessage();
+				$newStateData = GlobalBlockStateHandlers::getUnknownBlockStateData();
+			}
+
+			try{
+				$newPalette[$k] = $this->blockStateDeserializer->deserialize($newStateData);
+			}catch(BlockStateDeserializeException $e){
+				//this should never happen anyway - if the upgrader returned an invalid state, we have bigger problems
+				$blockDecodeErrors[] = "Palette offset $k / Failed to deserialize upgraded state $id:$meta: " . $e->getMessage();
+				$newPalette[$k] = $this->blockStateDeserializer->deserialize(GlobalBlockStateHandlers::getUnknownBlockStateData());
+			}
+		}
+
+		if(count($blockDecodeErrors) > 0){
+			$logger->error("Errors decoding/upgrading blocks:\n - " . implode("\n - ", $blockDecodeErrors));
+		}
+
+		//TODO: this is sub-optimal since it reallocates the offset table multiple times
+		return PalettedBlockArray::fromData(
+			$blockArray->getBitsPerBlock(),
+			$blockArray->getWordArray(),
+			$newPalette
+		);
+	}
+
+	protected function palettizeLegacySubChunkXZY(string $idArray, string $metaArray, \Logger $logger) : PalettedBlockArray{
+		return $this->translatePalette(SubChunkConverter::convertSubChunkXZY($idArray, $metaArray), $logger);
+	}
+
+	protected function palettizeLegacySubChunkYZX(string $idArray, string $metaArray, \Logger $logger) : PalettedBlockArray{
+		return $this->translatePalette(SubChunkConverter::convertSubChunkYZX($idArray, $metaArray), $logger);
+	}
+
+	protected function palettizeLegacySubChunkFromColumn(string $idArray, string $metaArray, int $yOffset, \Logger $logger) : PalettedBlockArray{
+		return $this->translatePalette(SubChunkConverter::convertSubChunkFromLegacyColumn($idArray, $metaArray, $yOffset), $logger);
+	}
+
 	public function getPath() : string{
 		return $this->path;
 	}
diff --git a/src/world/format/io/ChunkData.php b/src/world/format/io/ChunkData.php
index edd28dcbf6..235ac07bfc 100644
--- a/src/world/format/io/ChunkData.php
+++ b/src/world/format/io/ChunkData.php
@@ -24,25 +24,43 @@ declare(strict_types=1);
 namespace pocketmine\world\format\io;
 
 use pocketmine\nbt\tag\CompoundTag;
-use pocketmine\world\format\Chunk;
+use pocketmine\world\format\SubChunk;
 
 final class ChunkData{
 
 	/**
+	 * @param SubChunk[]    $subChunks
 	 * @param CompoundTag[] $entityNBT
 	 * @param CompoundTag[] $tileNBT
+	 *
+	 * @phpstan-param array<int, SubChunk> $subChunks
+	 * @phpstan-param list<CompoundTag> $entityNBT
+	 * @phpstan-param list<CompoundTag> $tileNBT
 	 */
 	public function __construct(
-		private Chunk $chunk,
+		private array $subChunks,
+		private bool $populated,
 		private array $entityNBT,
 		private array $tileNBT
 	){}
 
-	public function getChunk() : Chunk{ return $this->chunk; }
+	/**
+	 * @return SubChunk[]
+	 * @phpstan-return array<int, SubChunk>
+	 */
+	public function getSubChunks() : array{ return $this->subChunks; }
 
-	/** @return CompoundTag[] */
+	public function isPopulated() : bool{ return $this->populated; }
+
+	/**
+	 * @return CompoundTag[]
+	 * @phpstan-return list<CompoundTag>
+	 */
 	public function getEntityNBT() : array{ return $this->entityNBT; }
 
-	/** @return CompoundTag[] */
+	/**
+	 * @return CompoundTag[]
+	 * @phpstan-return list<CompoundTag>
+	 */
 	public function getTileNBT() : array{ return $this->tileNBT; }
 }
diff --git a/src/world/format/io/ChunkUtils.php b/src/world/format/io/ChunkUtils.php
index b9b3666855..3692b2470f 100644
--- a/src/world/format/io/ChunkUtils.php
+++ b/src/world/format/io/ChunkUtils.php
@@ -23,8 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\world\format\io;
 
+use pocketmine\world\format\PalettedBlockArray;
 use function chr;
+use function ord;
 use function str_repeat;
+use function strlen;
 
 class ChunkUtils{
 
@@ -42,4 +45,23 @@ class ChunkUtils{
 		return $result;
 	}
 
+	/**
+	 * Converts 2D biomes into a 3D biome palette. This palette can then be cloned for every subchunk.
+	 */
+	public static function extrapolate3DBiomes(string $biomes2d) : PalettedBlockArray{
+		if(strlen($biomes2d) !== 256){
+			throw new \InvalidArgumentException("Biome array is expected to be exactly 256 bytes");
+		}
+		$biomePalette = new PalettedBlockArray(ord($biomes2d[0]));
+		for($x = 0; $x < 16; ++$x){
+			for($z = 0; $z < 16; ++$z){
+				$biomeId = ord($biomes2d[($z << 4) | $x]);
+				for($y = 0; $y < 16; ++$y){
+					$biomePalette->set($x, $y, $z, $biomeId);
+				}
+			}
+		}
+
+		return $biomePalette;
+	}
 }
diff --git a/src/world/format/io/FastChunkSerializer.php b/src/world/format/io/FastChunkSerializer.php
index 7da8c9ab4c..6e18f27ac5 100644
--- a/src/world/format/io/FastChunkSerializer.php
+++ b/src/world/format/io/FastChunkSerializer.php
@@ -25,7 +25,6 @@ namespace pocketmine\world\format\io;
 
 use pocketmine\utils\Binary;
 use pocketmine\utils\BinaryStream;
-use pocketmine\world\format\BiomeArray;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\format\PalettedBlockArray;
 use pocketmine\world\format\SubChunk;
@@ -46,6 +45,17 @@ final class FastChunkSerializer{
 		//NOOP
 	}
 
+	private static function serializePalettedArray(BinaryStream $stream, PalettedBlockArray $array) : void{
+		$wordArray = $array->getWordArray();
+		$palette = $array->getPalette();
+
+		$stream->putByte($array->getBitsPerBlock());
+		$stream->put($wordArray);
+		$serialPalette = pack("L*", ...$palette);
+		$stream->putInt(strlen($serialPalette));
+		$stream->put($serialPalette);
+	}
+
 	/**
 	 * Fast-serializes the chunk for passing between threads
 	 * TODO: tiles and entities
@@ -67,23 +77,25 @@ final class FastChunkSerializer{
 			$layers = $subChunk->getBlockLayers();
 			$stream->putByte(count($layers));
 			foreach($layers as $blocks){
-				$wordArray = $blocks->getWordArray();
-				$palette = $blocks->getPalette();
-
-				$stream->putByte($blocks->getBitsPerBlock());
-				$stream->put($wordArray);
-				$serialPalette = pack("L*", ...$palette);
-				$stream->putInt(strlen($serialPalette));
-				$stream->put($serialPalette);
+				self::serializePalettedArray($stream, $blocks);
 			}
+			self::serializePalettedArray($stream, $subChunk->getBiomeArray());
+
 		}
 
-		//biomes
-		$stream->put($chunk->getBiomeIdArray());
-
 		return $stream->getBuffer();
 	}
 
+	private static function deserializePalettedArray(BinaryStream $stream) : PalettedBlockArray{
+		$bitsPerBlock = $stream->getByte();
+		$words = $stream->get(PalettedBlockArray::getExpectedWordArraySize($bitsPerBlock));
+		/** @var int[] $unpackedPalette */
+		$unpackedPalette = unpack("L*", $stream->get($stream->getInt())); //unpack() will never fail here
+		$palette = array_values($unpackedPalette);
+
+		return PalettedBlockArray::fromData($bitsPerBlock, $words, $palette);
+	}
+
 	/**
 	 * Deserializes a fast-serialized chunk
 	 */
@@ -103,19 +115,12 @@ final class FastChunkSerializer{
 			/** @var PalettedBlockArray[] $layers */
 			$layers = [];
 			for($i = 0, $layerCount = $stream->getByte(); $i < $layerCount; ++$i){
-				$bitsPerBlock = $stream->getByte();
-				$words = $stream->get(PalettedBlockArray::getExpectedWordArraySize($bitsPerBlock));
-				/** @var int[] $unpackedPalette */
-				$unpackedPalette = unpack("L*", $stream->get($stream->getInt())); //unpack() will never fail here
-				$palette = array_values($unpackedPalette);
-
-				$layers[] = PalettedBlockArray::fromData($bitsPerBlock, $words, $palette);
+				$layers[] = self::deserializePalettedArray($stream);
 			}
-			$subChunks[$y] = new SubChunk($airBlockId, $layers);
+			$biomeArray = self::deserializePalettedArray($stream);
+			$subChunks[$y] = new SubChunk($airBlockId, $layers, $biomeArray);
 		}
 
-		$biomeIds = new BiomeArray($stream->get(256));
-
-		return new Chunk($subChunks, $biomeIds, $terrainPopulated);
+		return new Chunk($subChunks, $terrainPopulated);
 	}
 }
diff --git a/src/world/format/io/FormatConverter.php b/src/world/format/io/FormatConverter.php
index 5f93f3a7b8..1d485afa21 100644
--- a/src/world/format/io/FormatConverter.php
+++ b/src/world/format/io/FormatConverter.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\world\format\io;
 
 use pocketmine\utils\Filesystem;
+use pocketmine\world\format\Chunk;
 use pocketmine\world\generator\GeneratorManager;
 use pocketmine\world\generator\normal\Normal;
 use pocketmine\world\WorldCreationOptions;
@@ -67,7 +68,7 @@ class FormatConverter{
 		return $this->backupPath;
 	}
 
-	public function execute() : WritableWorldProvider{
+	public function execute() : void{
 		$new = $this->generateNew();
 
 		$this->populateLevelData($new->getWorldData());
@@ -91,7 +92,6 @@ class FormatConverter{
 		}
 
 		$this->logger->info("Conversion completed");
-		return $this->newProvider->fromPath($path);
 	}
 
 	private function generateNew() : WritableWorldProvider{
@@ -113,7 +113,7 @@ class FormatConverter{
 			->setDifficulty($data->getDifficulty())
 		);
 
-		return $this->newProvider->fromPath($convertedOutput);
+		return $this->newProvider->fromPath($convertedOutput, $this->logger);
 	}
 
 	private function populateLevelData(WorldData $data) : void{
@@ -141,10 +141,9 @@ class FormatConverter{
 
 		$start = microtime(true);
 		$thisRound = $start;
-		foreach($this->oldProvider->getAllChunks(true, $this->logger) as $coords => $chunk){
+		foreach($this->oldProvider->getAllChunks(true, $this->logger) as $coords => $loadedChunkData){
 			[$chunkX, $chunkZ] = $coords;
-			$chunk->getChunk()->setTerrainDirty();
-			$new->saveChunk($chunkX, $chunkZ, $chunk);
+			$new->saveChunk($chunkX, $chunkZ, $loadedChunkData->getData(), Chunk::DIRTY_FLAGS_ALL);
 			$counter++;
 			if(($counter % $this->chunksPerProgressUpdate) === 0){
 				$time = microtime(true);
diff --git a/src/world/format/io/GlobalBlockStateHandlers.php b/src/world/format/io/GlobalBlockStateHandlers.php
new file mode 100644
index 0000000000..c1d3934cf3
--- /dev/null
+++ b/src/world/format/io/GlobalBlockStateHandlers.php
@@ -0,0 +1,88 @@
+<?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\format\io;
+
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\data\bedrock\block\BlockTypeNames;
+use pocketmine\data\bedrock\block\convert\BlockObjectToStateSerializer;
+use pocketmine\data\bedrock\block\convert\BlockStateToObjectDeserializer;
+use pocketmine\data\bedrock\block\upgrade\BlockDataUpgrader;
+use pocketmine\data\bedrock\block\upgrade\BlockIdMetaUpgrader;
+use pocketmine\data\bedrock\block\upgrade\BlockStateUpgrader;
+use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaUtils;
+use pocketmine\data\bedrock\block\upgrade\LegacyBlockIdToStringIdMap;
+use pocketmine\utils\Filesystem;
+use Symfony\Component\Filesystem\Path;
+use const PHP_INT_MAX;
+use const pocketmine\BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH;
+
+/**
+ * Provides global access to blockstate serializers for all world providers.
+ * TODO: Get rid of this. This is necessary to enable plugins to register custom serialize/deserialize handlers, and
+ * also because we can't break BC of WorldProvider before PM5. While this is a sucky hack, it provides meaningful
+ * benefits for now.
+ */
+final class GlobalBlockStateHandlers{
+	private static ?BlockObjectToStateSerializer $blockStateSerializer = null;
+
+	private static ?BlockStateToObjectDeserializer $blockStateDeserializer = null;
+
+	private static ?BlockDataUpgrader $blockDataUpgrader = null;
+
+	private static ?BlockStateData $unknownBlockStateData = null;
+
+	public static function getDeserializer() : BlockStateToObjectDeserializer{
+		return self::$blockStateDeserializer ??= new BlockStateToObjectDeserializer();
+	}
+
+	public static function getSerializer() : BlockObjectToStateSerializer{
+		return self::$blockStateSerializer ??= new BlockObjectToStateSerializer();
+	}
+
+	public static function getUpgrader() : BlockDataUpgrader{
+		if(self::$blockDataUpgrader === null){
+			$blockStateUpgrader = new BlockStateUpgrader(BlockStateUpgradeSchemaUtils::loadSchemas(
+				Path::join(BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH, 'nbt_upgrade_schema'),
+				PHP_INT_MAX
+			));
+			self::$blockDataUpgrader = new BlockDataUpgrader(
+				BlockIdMetaUpgrader::loadFromString(
+					Filesystem::fileGetContents(Path::join(
+						BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH,
+						'id_meta_to_nbt/1.12.0.bin'
+					)),
+					LegacyBlockIdToStringIdMap::getInstance(),
+					$blockStateUpgrader
+				),
+				$blockStateUpgrader
+			);
+		}
+
+		return self::$blockDataUpgrader;
+	}
+
+	public static function getUnknownBlockStateData() : BlockStateData{
+		return self::$unknownBlockStateData ??= BlockStateData::current(BlockTypeNames::INFO_UPDATE, []);
+	}
+}
diff --git a/src/world/format/io/GlobalItemDataHandlers.php b/src/world/format/io/GlobalItemDataHandlers.php
new file mode 100644
index 0000000000..f622584784
--- /dev/null
+++ b/src/world/format/io/GlobalItemDataHandlers.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\format\io;
+
+use pocketmine\data\bedrock\item\BlockItemIdMap;
+use pocketmine\data\bedrock\item\ItemDeserializer;
+use pocketmine\data\bedrock\item\ItemSerializer;
+use pocketmine\data\bedrock\item\upgrade\ItemDataUpgrader;
+use pocketmine\data\bedrock\item\upgrade\ItemIdMetaUpgrader;
+use pocketmine\data\bedrock\item\upgrade\ItemIdMetaUpgradeSchemaUtils;
+use pocketmine\data\bedrock\item\upgrade\LegacyItemIdToStringIdMap;
+use pocketmine\data\bedrock\item\upgrade\R12ItemIdToBlockIdMap;
+use pocketmine\network\mcpe\convert\TypeConverter;
+use Symfony\Component\Filesystem\Path;
+use const PHP_INT_MAX;
+use const pocketmine\BEDROCK_ITEM_UPGRADE_SCHEMA_PATH;
+
+final class GlobalItemDataHandlers{
+	private static ?ItemSerializer $itemSerializer = null;
+
+	private static ?ItemDeserializer $itemDeserializer = null;
+
+	private static ?ItemDataUpgrader $itemDataUpgrader = null;
+
+	public static function getSerializer() : ItemSerializer{
+		return self::$itemSerializer ??= new ItemSerializer(GlobalBlockStateHandlers::getSerializer());
+	}
+
+	public static function getDeserializer() : ItemDeserializer{
+		return self::$itemDeserializer ??= new ItemDeserializer(GlobalBlockStateHandlers::getDeserializer());
+	}
+
+	public static function getUpgrader() : ItemDataUpgrader{
+		return self::$itemDataUpgrader ??= new ItemDataUpgrader(
+			new ItemIdMetaUpgrader(ItemIdMetaUpgradeSchemaUtils::loadSchemas(Path::join(BEDROCK_ITEM_UPGRADE_SCHEMA_PATH, 'id_meta_upgrade_schema'), PHP_INT_MAX)),
+			LegacyItemIdToStringIdMap::getInstance(),
+			R12ItemIdToBlockIdMap::getInstance(),
+			GlobalBlockStateHandlers::getUpgrader(),
+			BlockItemIdMap::getInstance(),
+			TypeConverter::getInstance()->getBlockTranslator()->getBlockStateDictionary()
+		);
+	}
+}
diff --git a/src/world/format/io/LoadedChunkData.php b/src/world/format/io/LoadedChunkData.php
new file mode 100644
index 0000000000..bb31a97e19
--- /dev/null
+++ b/src/world/format/io/LoadedChunkData.php
@@ -0,0 +1,45 @@
+<?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\format\io;
+
+/**
+ * Encapsulates information returned when loading a chunk. This includes more information than saving a chunk, since the
+ * data might have been upgraded or need post-processing.
+ */
+final class LoadedChunkData{
+	public const FIXER_FLAG_NONE = 0;
+	public const FIXER_FLAG_ALL = ~0;
+
+	public function __construct(
+		private ChunkData $data,
+		private bool $upgraded,
+		private int $fixerFlags
+	){}
+
+	public function getData() : ChunkData{ return $this->data; }
+
+	public function isUpgraded() : bool{ return $this->upgraded; }
+
+	public function getFixerFlags() : int{ return $this->fixerFlags; }
+}
diff --git a/src/world/format/io/ReadOnlyWorldProviderManagerEntry.php b/src/world/format/io/ReadOnlyWorldProviderManagerEntry.php
index 2bbc11bf3c..b9348179ff 100644
--- a/src/world/format/io/ReadOnlyWorldProviderManagerEntry.php
+++ b/src/world/format/io/ReadOnlyWorldProviderManagerEntry.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\world\format\io;
 
 /**
- * @phpstan-type FromPath \Closure(string $path) : WorldProvider
+ * @phpstan-type FromPath \Closure(string $path, \Logger $logger) : WorldProvider
  */
 class ReadOnlyWorldProviderManagerEntry extends WorldProviderManagerEntry{
 
@@ -36,5 +36,5 @@ class ReadOnlyWorldProviderManagerEntry extends WorldProviderManagerEntry{
 		parent::__construct($isValid);
 	}
 
-	public function fromPath(string $path) : WorldProvider{ return ($this->fromPath)($path); }
+	public function fromPath(string $path, \Logger $logger) : WorldProvider{ return ($this->fromPath)($path, $logger); }
 }
diff --git a/src/world/format/io/WorldData.php b/src/world/format/io/WorldData.php
index ba60c1ab8f..18ac9b1bea 100644
--- a/src/world/format/io/WorldData.php
+++ b/src/world/format/io/WorldData.php
@@ -34,6 +34,8 @@ interface WorldData{
 
 	public function getName() : string;
 
+	public function setName(string $value) : void;
+
 	/**
 	 * Returns the generator name
 	 */
diff --git a/src/world/format/io/WorldProvider.php b/src/world/format/io/WorldProvider.php
index 3d08df8607..546ca12040 100644
--- a/src/world/format/io/WorldProvider.php
+++ b/src/world/format/io/WorldProvider.php
@@ -43,7 +43,7 @@ interface WorldProvider{
 	 *
 	 * @throws CorruptedChunkException
 	 */
-	public function loadChunk(int $chunkX, int $chunkZ) : ?ChunkData;
+	public function loadChunk(int $chunkX, int $chunkZ) : ?LoadedChunkData;
 
 	/**
 	 * Performs garbage collection in the world provider, such as cleaning up regions in Region-based worlds.
@@ -63,8 +63,8 @@ interface WorldProvider{
 	/**
 	 * Returns a generator which yields all the chunks in this world.
 	 *
-	 * @return \Generator|ChunkData[]
-	 * @phpstan-return \Generator<array{int, int}, ChunkData, void, void>
+	 * @return \Generator|LoadedChunkData[]
+	 * @phpstan-return \Generator<array{int, int}, LoadedChunkData, void, void>
 	 * @throws CorruptedChunkException
 	 */
 	public function getAllChunks(bool $skipCorrupted = false, ?\Logger $logger = null) : \Generator;
diff --git a/src/world/format/io/WorldProviderManager.php b/src/world/format/io/WorldProviderManager.php
index 4b0ce341b7..1767c539a7 100644
--- a/src/world/format/io/WorldProviderManager.php
+++ b/src/world/format/io/WorldProviderManager.php
@@ -36,18 +36,18 @@ final class WorldProviderManager{
 	 * @var WorldProviderManagerEntry[]
 	 * @phpstan-var array<string, WorldProviderManagerEntry>
 	 */
-	protected $providers = [];
+	protected array $providers = [];
 
 	private WritableWorldProviderManagerEntry $default;
 
 	public function __construct(){
-		$leveldb = new WritableWorldProviderManagerEntry(\Closure::fromCallable([LevelDB::class, 'isValid']), fn(string $path) => new LevelDB($path), \Closure::fromCallable([LevelDB::class, 'generate']));
+		$leveldb = new WritableWorldProviderManagerEntry(LevelDB::isValid(...), fn(string $path, \Logger $logger) => new LevelDB($path, $logger), LevelDB::generate(...));
 		$this->default = $leveldb;
 		$this->addProvider($leveldb, "leveldb");
 
-		$this->addProvider(new ReadOnlyWorldProviderManagerEntry(\Closure::fromCallable([Anvil::class, 'isValid']), fn(string $path) => new Anvil($path)), "anvil");
-		$this->addProvider(new ReadOnlyWorldProviderManagerEntry(\Closure::fromCallable([McRegion::class, 'isValid']), fn(string $path) => new McRegion($path)), "mcregion");
-		$this->addProvider(new ReadOnlyWorldProviderManagerEntry(\Closure::fromCallable([PMAnvil::class, 'isValid']), fn(string $path) => new PMAnvil($path)), "pmanvil");
+		$this->addProvider(new ReadOnlyWorldProviderManagerEntry(Anvil::isValid(...), fn(string $path, \Logger $logger) => new Anvil($path, $logger)), "anvil");
+		$this->addProvider(new ReadOnlyWorldProviderManagerEntry(McRegion::isValid(...), fn(string $path, \Logger $logger) => new McRegion($path, $logger)), "mcregion");
+		$this->addProvider(new ReadOnlyWorldProviderManagerEntry(PMAnvil::isValid(...), fn(string $path, \Logger $logger) => new PMAnvil($path, $logger)), "pmanvil");
 	}
 
 	/**
diff --git a/src/world/format/io/WorldProviderManagerEntry.php b/src/world/format/io/WorldProviderManagerEntry.php
index 96abcd1ea0..c3439fd335 100644
--- a/src/world/format/io/WorldProviderManagerEntry.php
+++ b/src/world/format/io/WorldProviderManagerEntry.php
@@ -46,5 +46,5 @@ abstract class WorldProviderManagerEntry{
 	 * @throws CorruptedWorldException
 	 * @throws UnsupportedWorldFormatException
 	 */
-	abstract public function fromPath(string $path) : WorldProvider;
+	abstract public function fromPath(string $path, \Logger $logger) : WorldProvider;
 }
diff --git a/src/world/format/io/WritableWorldProvider.php b/src/world/format/io/WritableWorldProvider.php
index 8ed1b0c094..5c6344b527 100644
--- a/src/world/format/io/WritableWorldProvider.php
+++ b/src/world/format/io/WritableWorldProvider.php
@@ -27,5 +27,5 @@ interface WritableWorldProvider extends WorldProvider{
 	/**
 	 * Saves a chunk (usually to disk).
 	 */
-	public function saveChunk(int $chunkX, int $chunkZ, ChunkData $chunkData) : void;
+	public function saveChunk(int $chunkX, int $chunkZ, ChunkData $chunkData, int $dirtyFlags) : void;
 }
diff --git a/src/world/format/io/WritableWorldProviderManagerEntry.php b/src/world/format/io/WritableWorldProviderManagerEntry.php
index 2c5b501edb..873b028317 100644
--- a/src/world/format/io/WritableWorldProviderManagerEntry.php
+++ b/src/world/format/io/WritableWorldProviderManagerEntry.php
@@ -26,7 +26,7 @@ namespace pocketmine\world\format\io;
 use pocketmine\world\WorldCreationOptions;
 
 /**
- * @phpstan-type FromPath \Closure(string $path) : WritableWorldProvider
+ * @phpstan-type FromPath \Closure(string $path, \Logger $logger) : WritableWorldProvider
  * @phpstan-type Generate \Closure(string $path, string $name, WorldCreationOptions $options) : void
  */
 final class WritableWorldProviderManagerEntry extends WorldProviderManagerEntry{
@@ -43,8 +43,8 @@ final class WritableWorldProviderManagerEntry extends WorldProviderManagerEntry{
 		parent::__construct($isValid);
 	}
 
-	public function fromPath(string $path) : WritableWorldProvider{
-		return ($this->fromPath)($path);
+	public function fromPath(string $path, \Logger $logger) : WritableWorldProvider{
+		return ($this->fromPath)($path, $logger);
 	}
 
 	/**
diff --git a/src/world/format/io/data/BaseNbtWorldData.php b/src/world/format/io/data/BaseNbtWorldData.php
index 3e5ca38f46..cb3f3eb4bc 100644
--- a/src/world/format/io/data/BaseNbtWorldData.php
+++ b/src/world/format/io/data/BaseNbtWorldData.php
@@ -32,20 +32,24 @@ use pocketmine\world\format\io\WorldData;
 use function file_exists;
 
 abstract class BaseNbtWorldData implements WorldData{
+	protected const TAG_LEVEL_NAME = "LevelName";
+	protected const TAG_GENERATOR_NAME = "generatorName";
+	protected const TAG_GENERATOR_OPTIONS = "generatorOptions";
+	protected const TAG_RANDOM_SEED = "RandomSeed";
+	protected const TAG_TIME = "Time";
+	protected const TAG_SPAWN_X = "SpawnX";
+	protected const TAG_SPAWN_Y = "SpawnY";
+	protected const TAG_SPAWN_Z = "SpawnZ";
 
-	/** @var string */
-	protected $dataPath;
-
-	/** @var CompoundTag */
-	protected $compoundTag;
+	protected CompoundTag $compoundTag;
 
 	/**
 	 * @throws CorruptedWorldException
 	 * @throws UnsupportedWorldFormatException
 	 */
-	public function __construct(string $dataPath){
-		$this->dataPath = $dataPath;
-
+	public function __construct(
+		protected string $dataPath
+	){
 		if(!file_exists($this->dataPath)){
 			throw new CorruptedWorldException("World data not found at $dataPath");
 		}
@@ -109,40 +113,44 @@ abstract class BaseNbtWorldData implements WorldData{
 	/* The below are common between PC and PE */
 
 	public function getName() : string{
-		return $this->compoundTag->getString("LevelName");
+		return $this->compoundTag->getString(self::TAG_LEVEL_NAME);
+	}
+
+	public function setName(string $value) : void{
+		$this->compoundTag->setString(self::TAG_LEVEL_NAME, $value);
 	}
 
 	public function getGenerator() : string{
-		return $this->compoundTag->getString("generatorName", "DEFAULT");
+		return $this->compoundTag->getString(self::TAG_GENERATOR_NAME, "DEFAULT");
 	}
 
 	public function getGeneratorOptions() : string{
-		return $this->compoundTag->getString("generatorOptions", "");
+		return $this->compoundTag->getString(self::TAG_GENERATOR_OPTIONS, "");
 	}
 
 	public function getSeed() : int{
-		return $this->compoundTag->getLong("RandomSeed");
+		return $this->compoundTag->getLong(self::TAG_RANDOM_SEED);
 	}
 
 	public function getTime() : int{
-		if(($timeTag = $this->compoundTag->getTag("Time")) instanceof IntTag){ //some older PM worlds had this in the wrong format
+		if(($timeTag = $this->compoundTag->getTag(self::TAG_TIME)) instanceof IntTag){ //some older PM worlds had this in the wrong format
 			return $timeTag->getValue();
 		}
-		return $this->compoundTag->getLong("Time", 0);
+		return $this->compoundTag->getLong(self::TAG_TIME, 0);
 	}
 
 	public function setTime(int $value) : void{
-		$this->compoundTag->setLong("Time", $value);
+		$this->compoundTag->setLong(self::TAG_TIME, $value);
 	}
 
 	public function getSpawn() : Vector3{
-		return new Vector3($this->compoundTag->getInt("SpawnX"), $this->compoundTag->getInt("SpawnY"), $this->compoundTag->getInt("SpawnZ"));
+		return new Vector3($this->compoundTag->getInt(self::TAG_SPAWN_X), $this->compoundTag->getInt(self::TAG_SPAWN_Y), $this->compoundTag->getInt(self::TAG_SPAWN_Z));
 	}
 
 	public function setSpawn(Vector3 $pos) : void{
-		$this->compoundTag->setInt("SpawnX", $pos->getFloorX());
-		$this->compoundTag->setInt("SpawnY", $pos->getFloorY());
-		$this->compoundTag->setInt("SpawnZ", $pos->getFloorZ());
+		$this->compoundTag->setInt(self::TAG_SPAWN_X, $pos->getFloorX());
+		$this->compoundTag->setInt(self::TAG_SPAWN_Y, $pos->getFloorY());
+		$this->compoundTag->setInt(self::TAG_SPAWN_Z, $pos->getFloorZ());
 	}
 
 }
diff --git a/src/world/format/io/data/BedrockWorldData.php b/src/world/format/io/data/BedrockWorldData.php
index d6f1b2e105..b2e079124a 100644
--- a/src/world/format/io/data/BedrockWorldData.php
+++ b/src/world/format/io/data/BedrockWorldData.php
@@ -27,11 +27,13 @@ use pocketmine\nbt\LittleEndianNbtSerializer;
 use pocketmine\nbt\NbtDataException;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\StringTag;
 use pocketmine\nbt\TreeRoot;
 use pocketmine\utils\Binary;
 use pocketmine\utils\Filesystem;
 use pocketmine\utils\Limits;
+use pocketmine\VersionInfo;
 use pocketmine\world\format\io\exception\CorruptedWorldException;
 use pocketmine\world\format\io\exception\UnsupportedWorldFormatException;
 use pocketmine\world\generator\Flat;
@@ -39,25 +41,52 @@ use pocketmine\world\generator\GeneratorManager;
 use pocketmine\world\World;
 use pocketmine\world\WorldCreationOptions;
 use Symfony\Component\Filesystem\Path;
+use function array_map;
 use function file_put_contents;
+use function sprintf;
 use function strlen;
 use function substr;
 use function time;
 
 class BedrockWorldData extends BaseNbtWorldData{
 
-	public const CURRENT_STORAGE_VERSION = 8;
-	/**
-	 * WARNING: In the future, this should be only as high as the newest world format currently supported. We don't
-	 * actually support worlds from 1.18.10 yet, but due to an old stupid bug, all worlds created by PM will report this
-	 * version.
-	 */
-	public const CURRENT_STORAGE_NETWORK_VERSION = 486; // 1.18.10
+	public const CURRENT_STORAGE_VERSION = 10;
+	public const CURRENT_STORAGE_NETWORK_VERSION = 748;
+	public const CURRENT_CLIENT_VERSION_TARGET = [
+		1, //major
+		21, //minor
+		40, //patch
+		1, //revision
+		0 //is beta
+	];
 
 	public const GENERATOR_LIMITED = 0;
 	public const GENERATOR_INFINITE = 1;
 	public const GENERATOR_FLAT = 2;
 
+	private const TAG_DAY_CYCLE_STOP_TIME = "DayCycleStopTime";
+	private const TAG_DIFFICULTY = "Difficulty";
+	private const TAG_FORCE_GAME_TYPE = "ForceGameType";
+	private const TAG_GAME_TYPE = "GameType";
+	private const TAG_GENERATOR = "Generator";
+	private const TAG_LAST_PLAYED = "LastPlayed";
+	private const TAG_NETWORK_VERSION = "NetworkVersion";
+	private const TAG_STORAGE_VERSION = "StorageVersion";
+	private const TAG_IS_EDU = "eduLevel";
+	private const TAG_FALL_DAMAGE_ENABLED = "falldamage";
+	private const TAG_FIRE_DAMAGE_ENABLED = "firedamage";
+	private const TAG_ACHIEVEMENTS_DISABLED = "hasBeenLoadedInCreative";
+	private const TAG_IMMUTABLE_WORLD = "immutableWorld";
+	private const TAG_LIGHTNING_LEVEL = "lightningLevel";
+	private const TAG_LIGHTNING_TIME = "lightningTime";
+	private const TAG_PVP_ENABLED = "pvp";
+	private const TAG_RAIN_LEVEL = "rainLevel";
+	private const TAG_RAIN_TIME = "rainTime";
+	private const TAG_SPAWN_MOBS = "spawnMobs";
+	private const TAG_TEXTURE_PACKS_REQUIRED = "texturePacksRequired";
+	private const TAG_LAST_OPENED_WITH_VERSION = "lastOpenedWithVersion";
+	private const TAG_COMMANDS_ENABLED = "commandsEnabled";
+
 	public static function generate(string $path, string $name, WorldCreationOptions $options) : void{
 		switch($options->getGeneratorClass()){
 			case Flat::class:
@@ -70,39 +99,39 @@ class BedrockWorldData extends BaseNbtWorldData{
 
 		$worldData = CompoundTag::create()
 			//Vanilla fields
-			->setInt("DayCycleStopTime", -1)
-			->setInt("Difficulty", $options->getDifficulty())
-			->setByte("ForceGameType", 0)
-			->setInt("GameType", 0)
-			->setInt("Generator", $generatorType)
-			->setLong("LastPlayed", time())
-			->setString("LevelName", $name)
-			->setInt("NetworkVersion", self::CURRENT_STORAGE_NETWORK_VERSION)
+			->setInt(self::TAG_DAY_CYCLE_STOP_TIME, -1)
+			->setInt(self::TAG_DIFFICULTY, $options->getDifficulty())
+			->setByte(self::TAG_FORCE_GAME_TYPE, 0)
+			->setInt(self::TAG_GAME_TYPE, 0)
+			->setInt(self::TAG_GENERATOR, $generatorType)
+			->setLong(self::TAG_LAST_PLAYED, time())
+			->setString(self::TAG_LEVEL_NAME, $name)
+			->setInt(self::TAG_NETWORK_VERSION, self::CURRENT_STORAGE_NETWORK_VERSION)
 			//->setInt("Platform", 2) //TODO: find out what the possible values are for
-			->setLong("RandomSeed", $options->getSeed())
-			->setInt("SpawnX", $options->getSpawnPosition()->getFloorX())
-			->setInt("SpawnY", $options->getSpawnPosition()->getFloorY())
-			->setInt("SpawnZ", $options->getSpawnPosition()->getFloorZ())
-			->setInt("StorageVersion", self::CURRENT_STORAGE_VERSION)
-			->setLong("Time", 0)
-			->setByte("eduLevel", 0)
-			->setByte("falldamage", 1)
-			->setByte("firedamage", 1)
-			->setByte("hasBeenLoadedInCreative", 1) //badly named, this actually determines whether achievements can be earned in this world...
-			->setByte("immutableWorld", 0)
-			->setFloat("lightningLevel", 0.0)
-			->setInt("lightningTime", 0)
-			->setByte("pvp", 1)
-			->setFloat("rainLevel", 0.0)
-			->setInt("rainTime", 0)
-			->setByte("spawnMobs", 1)
-			->setByte("texturePacksRequired", 0) //TODO
+			->setLong(self::TAG_RANDOM_SEED, $options->getSeed())
+			->setInt(self::TAG_SPAWN_X, $options->getSpawnPosition()->getFloorX())
+			->setInt(self::TAG_SPAWN_Y, $options->getSpawnPosition()->getFloorY())
+			->setInt(self::TAG_SPAWN_Z, $options->getSpawnPosition()->getFloorZ())
+			->setInt(self::TAG_STORAGE_VERSION, self::CURRENT_STORAGE_VERSION)
+			->setLong(self::TAG_TIME, 0)
+			->setByte(self::TAG_IS_EDU, 0)
+			->setByte(self::TAG_FALL_DAMAGE_ENABLED, 1)
+			->setByte(self::TAG_FIRE_DAMAGE_ENABLED, 1)
+			->setByte(self::TAG_ACHIEVEMENTS_DISABLED, 1) //badly named, this actually determines whether achievements can be earned in this world...
+			->setByte(self::TAG_IMMUTABLE_WORLD, 0)
+			->setFloat(self::TAG_LIGHTNING_LEVEL, 0.0)
+			->setInt(self::TAG_LIGHTNING_TIME, 0)
+			->setByte(self::TAG_PVP_ENABLED, 1)
+			->setFloat(self::TAG_RAIN_LEVEL, 0.0)
+			->setInt(self::TAG_RAIN_TIME, 0)
+			->setByte(self::TAG_SPAWN_MOBS, 1)
+			->setByte(self::TAG_TEXTURE_PACKS_REQUIRED, 0) //TODO
+			->setByte(self::TAG_COMMANDS_ENABLED, 1)
+			->setTag(self::TAG_LAST_OPENED_WITH_VERSION, new ListTag(array_map(fn(int $v) => new IntTag($v), self::CURRENT_CLIENT_VERSION_TARGET)))
 
 			//Additional PocketMine-MP fields
-			->setTag("GameRules", new CompoundTag())
-			->setByte("hardcore", 0)
-			->setString("generatorName", GeneratorManager::getInstance()->getGeneratorName($options->getGeneratorClass()))
-			->setString("generatorOptions", $options->getGeneratorOptions());
+			->setString(self::TAG_GENERATOR_NAME, GeneratorManager::getInstance()->getGeneratorName($options->getGeneratorClass()))
+			->setString(self::TAG_GENERATOR_OPTIONS, $options->getGeneratorOptions());
 
 		$nbt = new LittleEndianNbtSerializer();
 		$buffer = $nbt->write(new TreeRoot($worldData));
@@ -125,27 +154,39 @@ class BedrockWorldData extends BaseNbtWorldData{
 			throw new CorruptedWorldException($e->getMessage(), 0, $e);
 		}
 
-		$version = $worldData->getInt("StorageVersion", Limits::INT32_MAX);
+		$version = $worldData->getInt(self::TAG_STORAGE_VERSION, Limits::INT32_MAX);
+		if($version === Limits::INT32_MAX){
+			throw new CorruptedWorldException(sprintf("Missing '%s' tag in level.dat", self::TAG_STORAGE_VERSION));
+		}
 		if($version > self::CURRENT_STORAGE_VERSION){
 			throw new UnsupportedWorldFormatException("LevelDB world format version $version is currently unsupported");
 		}
+		//StorageVersion is rarely updated - instead, the game relies on the NetworkVersion tag, which is synced with
+		//the network protocol version for that version.
+		$protocolVersion = $worldData->getInt(self::TAG_NETWORK_VERSION, Limits::INT32_MAX);
+		if($protocolVersion === Limits::INT32_MAX){
+			throw new CorruptedWorldException(sprintf("Missing '%s' tag in level.dat", self::TAG_NETWORK_VERSION));
+		}
+		if($protocolVersion > self::CURRENT_STORAGE_NETWORK_VERSION){
+			throw new UnsupportedWorldFormatException("LevelDB world protocol version $protocolVersion is currently unsupported");
+		}
 
 		return $worldData;
 	}
 
 	protected function fix() : void{
-		$generatorNameTag = $this->compoundTag->getTag("generatorName");
+		$generatorNameTag = $this->compoundTag->getTag(self::TAG_GENERATOR_NAME);
 		if(!($generatorNameTag instanceof StringTag)){
-			if(($mcpeGeneratorTypeTag = $this->compoundTag->getTag("Generator")) instanceof IntTag){
+			if(($mcpeGeneratorTypeTag = $this->compoundTag->getTag(self::TAG_GENERATOR)) instanceof IntTag){
 				switch($mcpeGeneratorTypeTag->getValue()){ //Detect correct generator from MCPE data
 					case self::GENERATOR_FLAT:
-						$this->compoundTag->setString("generatorName", "flat");
-						$this->compoundTag->setString("generatorOptions", "2;7,3,3,2;1");
+						$this->compoundTag->setString(self::TAG_GENERATOR_NAME, "flat");
+						$this->compoundTag->setString(self::TAG_GENERATOR_OPTIONS, "2;7,3,3,2;1");
 						break;
 					case self::GENERATOR_INFINITE:
 						//TODO: add a null generator which does not generate missing chunks (to allow importing back to MCPE and generating more normal terrain without PocketMine messing things up)
-						$this->compoundTag->setString("generatorName", "default");
-						$this->compoundTag->setString("generatorOptions", "");
+						$this->compoundTag->setString(self::TAG_GENERATOR_NAME, "default");
+						$this->compoundTag->setString(self::TAG_GENERATOR_OPTIONS, "");
 						break;
 					case self::GENERATOR_LIMITED:
 						throw new UnsupportedWorldFormatException("Limited worlds are not currently supported");
@@ -153,20 +194,22 @@ class BedrockWorldData extends BaseNbtWorldData{
 						throw new UnsupportedWorldFormatException("Unknown LevelDB generator type");
 				}
 			}else{
-				$this->compoundTag->setString("generatorName", "default");
+				$this->compoundTag->setString(self::TAG_GENERATOR_NAME, "default");
 			}
 		}elseif(($generatorName = self::hackyFixForGeneratorClasspathInLevelDat($generatorNameTag->getValue())) !== null){
-			$this->compoundTag->setString("generatorName", $generatorName);
+			$this->compoundTag->setString(self::TAG_GENERATOR_NAME, $generatorName);
 		}
 
-		if(!($this->compoundTag->getTag("generatorOptions")) instanceof StringTag){
-			$this->compoundTag->setString("generatorOptions", "");
+		if(!($this->compoundTag->getTag(self::TAG_GENERATOR_OPTIONS)) instanceof StringTag){
+			$this->compoundTag->setString(self::TAG_GENERATOR_OPTIONS, "");
 		}
 	}
 
 	public function save() : void{
-		$this->compoundTag->setInt("NetworkVersion", self::CURRENT_STORAGE_NETWORK_VERSION);
-		$this->compoundTag->setInt("StorageVersion", self::CURRENT_STORAGE_VERSION);
+		$this->compoundTag->setInt(self::TAG_NETWORK_VERSION, self::CURRENT_STORAGE_NETWORK_VERSION);
+		$this->compoundTag->setInt(self::TAG_STORAGE_VERSION, self::CURRENT_STORAGE_VERSION);
+		$this->compoundTag->setTag(self::TAG_LAST_OPENED_WITH_VERSION, new ListTag(array_map(fn(int $v) => new IntTag($v), self::CURRENT_CLIENT_VERSION_TARGET)));
+		$this->compoundTag->setLong(VersionInfo::TAG_WORLD_DATA_VERSION, VersionInfo::WORLD_DATA_VERSION);
 
 		$nbt = new LittleEndianNbtSerializer();
 		$buffer = $nbt->write(new TreeRoot($this->compoundTag));
@@ -174,42 +217,42 @@ class BedrockWorldData extends BaseNbtWorldData{
 	}
 
 	public function getDifficulty() : int{
-		return $this->compoundTag->getInt("Difficulty", World::DIFFICULTY_NORMAL);
+		return $this->compoundTag->getInt(self::TAG_DIFFICULTY, World::DIFFICULTY_NORMAL);
 	}
 
 	public function setDifficulty(int $difficulty) : void{
-		$this->compoundTag->setInt("Difficulty", $difficulty); //yes, this is intended! (in PE: int, PC: byte)
+		$this->compoundTag->setInt(self::TAG_DIFFICULTY, $difficulty); //yes, this is intended! (in PE: int, PC: byte)
 	}
 
 	public function getRainTime() : int{
-		return $this->compoundTag->getInt("rainTime", 0);
+		return $this->compoundTag->getInt(self::TAG_RAIN_TIME, 0);
 	}
 
 	public function setRainTime(int $ticks) : void{
-		$this->compoundTag->setInt("rainTime", $ticks);
+		$this->compoundTag->setInt(self::TAG_RAIN_TIME, $ticks);
 	}
 
 	public function getRainLevel() : float{
-		return $this->compoundTag->getFloat("rainLevel", 0.0);
+		return $this->compoundTag->getFloat(self::TAG_RAIN_LEVEL, 0.0);
 	}
 
 	public function setRainLevel(float $level) : void{
-		$this->compoundTag->setFloat("rainLevel", $level);
+		$this->compoundTag->setFloat(self::TAG_RAIN_LEVEL, $level);
 	}
 
 	public function getLightningTime() : int{
-		return $this->compoundTag->getInt("lightningTime", 0);
+		return $this->compoundTag->getInt(self::TAG_LIGHTNING_TIME, 0);
 	}
 
 	public function setLightningTime(int $ticks) : void{
-		$this->compoundTag->setInt("lightningTime", $ticks);
+		$this->compoundTag->setInt(self::TAG_LIGHTNING_TIME, $ticks);
 	}
 
 	public function getLightningLevel() : float{
-		return $this->compoundTag->getFloat("lightningLevel", 0.0);
+		return $this->compoundTag->getFloat(self::TAG_LIGHTNING_LEVEL, 0.0);
 	}
 
 	public function setLightningLevel(float $level) : void{
-		$this->compoundTag->setFloat("lightningLevel", $level);
+		$this->compoundTag->setFloat(self::TAG_LIGHTNING_LEVEL, $level);
 	}
 }
diff --git a/src/world/format/io/data/JavaWorldData.php b/src/world/format/io/data/JavaWorldData.php
index 377480c9ab..b53ad34a58 100644
--- a/src/world/format/io/data/JavaWorldData.php
+++ b/src/world/format/io/data/JavaWorldData.php
@@ -26,11 +26,11 @@ namespace pocketmine\world\format\io\data;
 use pocketmine\nbt\BigEndianNbtSerializer;
 use pocketmine\nbt\NbtDataException;
 use pocketmine\nbt\tag\CompoundTag;
-use pocketmine\nbt\tag\FloatTag;
 use pocketmine\nbt\tag\StringTag;
 use pocketmine\nbt\TreeRoot;
 use pocketmine\utils\Filesystem;
 use pocketmine\utils\Utils;
+use pocketmine\VersionInfo;
 use pocketmine\world\format\io\exception\CorruptedWorldException;
 use pocketmine\world\generator\GeneratorManager;
 use pocketmine\world\World;
@@ -45,31 +45,47 @@ use const ZLIB_ENCODING_GZIP;
 
 class JavaWorldData extends BaseNbtWorldData{
 
+	private const TAG_DAY_TIME = "DayTime";
+	private const TAG_DIFFICULTY = "Difficulty";
+	private const TAG_FORMAT_VERSION = "version";
+	private const TAG_GAME_RULES = "GameRules";
+	private const TAG_GAME_TYPE = "GameType";
+	private const TAG_GENERATOR_VERSION = "generatorVersion";
+	private const TAG_HARDCORE = "hardcore";
+	private const TAG_INITIALIZED = "initialized";
+	private const TAG_LAST_PLAYED = "LastPlayed";
+	private const TAG_RAINING = "raining";
+	private const TAG_RAIN_TIME = "rainTime";
+	private const TAG_ROOT_DATA = "Data";
+	private const TAG_SIZE_ON_DISK = "SizeOnDisk";
+	private const TAG_THUNDERING = "thundering";
+	private const TAG_THUNDER_TIME = "thunderTime";
+
 	public static function generate(string $path, string $name, WorldCreationOptions $options, int $version = 19133) : void{
 		//TODO, add extra details
 
 		$worldData = CompoundTag::create()
-			->setByte("hardcore", 0)
-			->setByte("Difficulty", $options->getDifficulty())
-			->setByte("initialized", 1)
-			->setInt("GameType", 0)
-			->setInt("generatorVersion", 1) //2 in MCPE
-			->setInt("SpawnX", $options->getSpawnPosition()->getFloorX())
-			->setInt("SpawnY", $options->getSpawnPosition()->getFloorY())
-			->setInt("SpawnZ", $options->getSpawnPosition()->getFloorZ())
-			->setInt("version", $version)
-			->setInt("DayTime", 0)
-			->setLong("LastPlayed", (int) (microtime(true) * 1000))
-			->setLong("RandomSeed", $options->getSeed())
-			->setLong("SizeOnDisk", 0)
-			->setLong("Time", 0)
-			->setString("generatorName", GeneratorManager::getInstance()->getGeneratorName($options->getGeneratorClass()))
-			->setString("generatorOptions", $options->getGeneratorOptions())
-			->setString("LevelName", $name)
-			->setTag("GameRules", new CompoundTag());
+			->setByte(self::TAG_HARDCORE, 0)
+			->setByte(self::TAG_DIFFICULTY, $options->getDifficulty())
+			->setByte(self::TAG_INITIALIZED, 1)
+			->setInt(self::TAG_GAME_TYPE, 0)
+			->setInt(self::TAG_GENERATOR_VERSION, 1) //2 in MCPE
+			->setInt(self::TAG_SPAWN_X, $options->getSpawnPosition()->getFloorX())
+			->setInt(self::TAG_SPAWN_Y, $options->getSpawnPosition()->getFloorY())
+			->setInt(self::TAG_SPAWN_Z, $options->getSpawnPosition()->getFloorZ())
+			->setInt(self::TAG_FORMAT_VERSION, $version)
+			->setInt(self::TAG_DAY_TIME, 0)
+			->setLong(self::TAG_LAST_PLAYED, (int) (microtime(true) * 1000))
+			->setLong(self::TAG_RANDOM_SEED, $options->getSeed())
+			->setLong(self::TAG_SIZE_ON_DISK, 0)
+			->setLong(self::TAG_TIME, 0)
+			->setString(self::TAG_GENERATOR_NAME, GeneratorManager::getInstance()->getGeneratorName($options->getGeneratorClass()))
+			->setString(self::TAG_GENERATOR_OPTIONS, $options->getGeneratorOptions())
+			->setString(self::TAG_LEVEL_NAME, $name)
+			->setTag(self::TAG_GAME_RULES, new CompoundTag());
 
 		$nbt = new BigEndianNbtSerializer();
-		$buffer = zlib_encode($nbt->write(new TreeRoot(CompoundTag::create()->setTag("Data", $worldData))), ZLIB_ENCODING_GZIP);
+		$buffer = zlib_encode($nbt->write(new TreeRoot(CompoundTag::create()->setTag(self::TAG_ROOT_DATA, $worldData))), ZLIB_ENCODING_GZIP);
 		file_put_contents(Path::join($path, "level.dat"), $buffer);
 	}
 
@@ -90,79 +106,71 @@ class JavaWorldData extends BaseNbtWorldData{
 			throw new CorruptedWorldException($e->getMessage(), 0, $e);
 		}
 
-		$dataTag = $worldData->getTag("Data");
+		$dataTag = $worldData->getTag(self::TAG_ROOT_DATA);
 		if(!($dataTag instanceof CompoundTag)){
-			throw new CorruptedWorldException("Missing 'Data' key or wrong type");
+			throw new CorruptedWorldException("Missing '" . self::TAG_ROOT_DATA . "' key or wrong type");
 		}
 		return $dataTag;
 	}
 
 	protected function fix() : void{
-		$generatorNameTag = $this->compoundTag->getTag("generatorName");
+		$generatorNameTag = $this->compoundTag->getTag(self::TAG_GENERATOR_NAME);
 		if(!($generatorNameTag instanceof StringTag)){
-			$this->compoundTag->setString("generatorName", "default");
+			$this->compoundTag->setString(self::TAG_GENERATOR_NAME, "default");
 		}elseif(($generatorName = self::hackyFixForGeneratorClasspathInLevelDat($generatorNameTag->getValue())) !== null){
-			$this->compoundTag->setString("generatorName", $generatorName);
+			$this->compoundTag->setString(self::TAG_GENERATOR_NAME, $generatorName);
 		}
 
-		if(!($this->compoundTag->getTag("generatorOptions") instanceof StringTag)){
-			$this->compoundTag->setString("generatorOptions", "");
+		if(!($this->compoundTag->getTag(self::TAG_GENERATOR_OPTIONS) instanceof StringTag)){
+			$this->compoundTag->setString(self::TAG_GENERATOR_OPTIONS, "");
 		}
 	}
 
 	public function save() : void{
+		$this->compoundTag->setLong(VersionInfo::TAG_WORLD_DATA_VERSION, VersionInfo::WORLD_DATA_VERSION);
+
 		$nbt = new BigEndianNbtSerializer();
-		$buffer = Utils::assumeNotFalse(zlib_encode($nbt->write(new TreeRoot(CompoundTag::create()->setTag("Data", $this->compoundTag))), ZLIB_ENCODING_GZIP));
+		$buffer = Utils::assumeNotFalse(zlib_encode($nbt->write(new TreeRoot(CompoundTag::create()->setTag(self::TAG_ROOT_DATA, $this->compoundTag))), ZLIB_ENCODING_GZIP));
 		Filesystem::safeFilePutContents($this->dataPath, $buffer);
 	}
 
 	public function getDifficulty() : int{
-		return $this->compoundTag->getByte("Difficulty", World::DIFFICULTY_NORMAL);
+		return $this->compoundTag->getByte(self::TAG_DIFFICULTY, World::DIFFICULTY_NORMAL);
 	}
 
 	public function setDifficulty(int $difficulty) : void{
-		$this->compoundTag->setByte("Difficulty", $difficulty);
+		$this->compoundTag->setByte(self::TAG_DIFFICULTY, $difficulty);
 	}
 
 	public function getRainTime() : int{
-		return $this->compoundTag->getInt("rainTime", 0);
+		return $this->compoundTag->getInt(self::TAG_RAIN_TIME, 0);
 	}
 
 	public function setRainTime(int $ticks) : void{
-		$this->compoundTag->setInt("rainTime", $ticks);
+		$this->compoundTag->setInt(self::TAG_RAIN_TIME, $ticks);
 	}
 
 	public function getRainLevel() : float{
-		if(($rainLevelTag = $this->compoundTag->getTag("rainLevel")) instanceof FloatTag){ //PocketMine/MCPE
-			return $rainLevelTag->getValue();
-		}
-
-		return (float) $this->compoundTag->getByte("raining", 0); //PC vanilla
+		return (float) $this->compoundTag->getByte(self::TAG_RAINING, 0);
 	}
 
 	public function setRainLevel(float $level) : void{
-		$this->compoundTag->setFloat("rainLevel", $level); //PocketMine/MCPE
-		$this->compoundTag->setByte("raining", (int) ceil($level)); //PC vanilla
+		$this->compoundTag->setByte(self::TAG_RAINING, (int) ceil($level));
 	}
 
 	public function getLightningTime() : int{
-		return $this->compoundTag->getInt("thunderTime", 0);
+		return $this->compoundTag->getInt(self::TAG_THUNDER_TIME, 0);
 	}
 
 	public function setLightningTime(int $ticks) : void{
-		$this->compoundTag->setInt("thunderTime", $ticks);
+		$this->compoundTag->setInt(self::TAG_THUNDER_TIME, $ticks);
 	}
 
 	public function getLightningLevel() : float{
-		if(($lightningLevelTag = $this->compoundTag->getTag("lightningLevel")) instanceof FloatTag){ //PocketMine/MCPE
-			return $lightningLevelTag->getValue();
-		}
-
-		return (float) $this->compoundTag->getByte("thundering", 0); //PC vanilla
+		return (float) $this->compoundTag->getByte(self::TAG_THUNDERING, 0);
 	}
 
 	public function setLightningLevel(float $level) : void{
-		$this->compoundTag->setFloat("lightningLevel", $level); //PocketMine/MCPE
-		$this->compoundTag->setByte("thundering", (int) ceil($level)); //PC vanilla
+		$this->compoundTag->setByte(self::TAG_THUNDERING, (int) ceil($level));
 	}
 }
diff --git a/src/world/format/io/leveldb/ChunkDataKey.php b/src/world/format/io/leveldb/ChunkDataKey.php
index 6d1b2980c7..13cfe0bbe6 100644
--- a/src/world/format/io/leveldb/ChunkDataKey.php
+++ b/src/world/format/io/leveldb/ChunkDataKey.php
@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\world\format\io\leveldb;
 
+use pocketmine\VersionInfo;
+
 final class ChunkDataKey{
 	private function __construct(){
 		//NOOP
@@ -50,4 +52,6 @@ final class ChunkDataKey{
 
 	public const OLD_VERSION = "\x76";
 
+	public const PM_DATA_VERSION = VersionInfo::TAG_WORLD_DATA_VERSION;
+
 }
diff --git a/src/world/format/io/leveldb/ChunkVersion.php b/src/world/format/io/leveldb/ChunkVersion.php
index 249e66e3ec..a69e4ff459 100644
--- a/src/world/format/io/leveldb/ChunkVersion.php
+++ b/src/world/format/io/leveldb/ChunkVersion.php
@@ -70,4 +70,6 @@ final class ChunkVersion{
 	public const v1_18_0_24_beta = 37;
 	public const v1_18_0_24_unused = 38;
 	public const v1_18_0_25_beta = 39;
+	public const v1_18_30 = 40;
+	public const v1_21_40 = 41;
 }
diff --git a/src/world/format/io/leveldb/LevelDB.php b/src/world/format/io/leveldb/LevelDB.php
index 05f4dd8f1c..dda489d317 100644
--- a/src/world/format/io/leveldb/LevelDB.php
+++ b/src/world/format/io/leveldb/LevelDB.php
@@ -24,18 +24,18 @@ declare(strict_types=1);
 namespace pocketmine\world\format\io\leveldb;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockLegacyIds;
 use pocketmine\data\bedrock\BiomeIds;
-use pocketmine\data\bedrock\LegacyBlockIdToStringIdMap;
+use pocketmine\data\bedrock\block\BlockStateDeserializeException;
+use pocketmine\data\bedrock\block\convert\UnsupportedBlockStateException;
 use pocketmine\nbt\LittleEndianNbtSerializer;
+use pocketmine\nbt\NBT;
 use pocketmine\nbt\NbtDataException;
-use pocketmine\nbt\NbtException;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\TreeRoot;
 use pocketmine\utils\Binary;
 use pocketmine\utils\BinaryDataException;
 use pocketmine\utils\BinaryStream;
-use pocketmine\world\format\BiomeArray;
+use pocketmine\VersionInfo;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\format\io\BaseWorldProvider;
 use pocketmine\world\format\io\ChunkData;
@@ -44,7 +44,8 @@ use pocketmine\world\format\io\data\BedrockWorldData;
 use pocketmine\world\format\io\exception\CorruptedChunkException;
 use pocketmine\world\format\io\exception\CorruptedWorldException;
 use pocketmine\world\format\io\exception\UnsupportedWorldFormatException;
-use pocketmine\world\format\io\SubChunkConverter;
+use pocketmine\world\format\io\GlobalBlockStateHandlers;
+use pocketmine\world\format\io\LoadedChunkData;
 use pocketmine\world\format\io\WorldData;
 use pocketmine\world\format\io\WritableWorldProvider;
 use pocketmine\world\format\PalettedBlockArray;
@@ -58,6 +59,7 @@ use function count;
 use function defined;
 use function extension_loaded;
 use function file_exists;
+use function implode;
 use function is_dir;
 use function mkdir;
 use function ord;
@@ -70,34 +72,18 @@ use const LEVELDB_ZLIB_RAW_COMPRESSION;
 
 class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 
-	//According to Tomasso, these aren't supposed to be readable anymore. Thankfully he didn't change the readable ones...
-	protected const TAG_DATA_2D = ChunkDataKey::HEIGHTMAP_AND_2D_BIOMES;
-	protected const TAG_DATA_2D_LEGACY = ChunkDataKey::HEIGHTMAP_AND_2D_BIOME_COLORS;
-	protected const TAG_SUBCHUNK_PREFIX = ChunkDataKey::SUBCHUNK;
-	protected const TAG_LEGACY_TERRAIN = ChunkDataKey::LEGACY_TERRAIN;
-	protected const TAG_BLOCK_ENTITY = ChunkDataKey::BLOCK_ENTITIES;
-	protected const TAG_ENTITY = ChunkDataKey::ENTITIES;
-	protected const TAG_PENDING_TICK = ChunkDataKey::PENDING_SCHEDULED_TICKS;
-	protected const TAG_BLOCK_EXTRA_DATA = ChunkDataKey::LEGACY_BLOCK_EXTRA_DATA;
-	protected const TAG_BIOME_STATE = ChunkDataKey::BIOME_STATES;
-	protected const TAG_STATE_FINALISATION = ChunkDataKey::FINALIZATION;
-
-	protected const TAG_BORDER_BLOCKS = ChunkDataKey::BORDER_BLOCKS;
-	protected const TAG_HARDCODED_SPAWNERS = ChunkDataKey::HARDCODED_SPAWNERS;
-
 	protected const FINALISATION_NEEDS_INSTATICKING = 0;
 	protected const FINALISATION_NEEDS_POPULATION = 1;
 	protected const FINALISATION_DONE = 2;
 
-	protected const TAG_VERSION = ChunkDataKey::OLD_VERSION;
-
 	protected const ENTRY_FLAT_WORLD_LAYERS = "game_flatworldlayers";
 
-	protected const CURRENT_LEVEL_CHUNK_VERSION = ChunkVersion::v1_2_0; //yes, I know this is wrong, but it ensures vanilla auto-fixes stuff we currently don't
+	protected const CURRENT_LEVEL_CHUNK_VERSION = ChunkVersion::v1_21_40;
 	protected const CURRENT_LEVEL_SUBCHUNK_VERSION = SubChunkVersion::PALETTED_MULTI;
 
-	/** @var \LevelDB */
-	protected $db;
+	private const CAVES_CLIFFS_EXPERIMENTAL_SUBCHUNK_KEY_OFFSET = 4;
+
+	protected \LevelDB $db;
 
 	private static function checkForLevelDBExtension() : void{
 		if(!extension_loaded('leveldb')){
@@ -119,9 +105,9 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 		]);
 	}
 
-	public function __construct(string $path){
+	public function __construct(string $path, \Logger $logger){
 		self::checkForLevelDBExtension();
-		parent::__construct($path);
+		parent::__construct($path, $logger);
 
 		try{
 			$this->db = self::createDB($path);
@@ -136,11 +122,11 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 	}
 
 	public function getWorldMinY() : int{
-		return 0;
+		return -64;
 	}
 
 	public function getWorldMaxY() : int{
-		return 256;
+		return 320;
 	}
 
 	public static function isValid(string $path) : bool{
@@ -161,7 +147,7 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 	/**
 	 * @throws CorruptedChunkException
 	 */
-	protected function deserializePaletted(BinaryStream $stream) : PalettedBlockArray{
+	protected function deserializeBlockPalette(BinaryStream $stream, \Logger $logger) : PalettedBlockArray{
 		$bitsPerBlock = $stream->getByte() >> 1;
 
 		try{
@@ -171,26 +157,192 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 		}
 		$nbt = new LittleEndianNbtSerializer();
 		$palette = [];
-		$idMap = LegacyBlockIdToStringIdMap::getInstance();
-		for($i = 0, $paletteSize = $stream->getLInt(); $i < $paletteSize; ++$i){
+
+		if($bitsPerBlock === 0){
+			$paletteSize = 1;
+			/*
+			 * Due to code copy-paste in a public plugin, some PM4 worlds have 0 bpb palettes with a length prefix.
+			 * This is invalid and does not happen in vanilla.
+			 * These palettes were accepted by PM4 despite being invalid, but PM5 considered them corrupt, causing loss
+			 * of data. Since many users were affected by this, a workaround is therefore necessary to allow PM5 to read
+			 * these worlds without data loss.
+			 *
+			 * References:
+			 * - https://github.com/Refaltor77/CustomItemAPI/issues/68
+			 * - https://github.com/pmmp/PocketMine-MP/issues/5911
+			 */
+			$offset = $stream->getOffset();
+			$byte1 = $stream->getByte();
+			$stream->setOffset($offset); //reset offset
+
+			if($byte1 !== NBT::TAG_Compound){ //normally the first byte would be the NBT of the blockstate
+				$susLength = $stream->getLInt();
+				if($susLength !== 1){ //make sure the data isn't complete garbage
+					throw new CorruptedChunkException("CustomItemAPI borked 0 bpb palette should always have a length of 1");
+				}
+				$logger->error("Unexpected palette size for 0 bpb palette");
+			}
+		}else{
+			$paletteSize = $stream->getLInt();
+		}
+
+		$blockDecodeErrors = [];
+
+		for($i = 0; $i < $paletteSize; ++$i){
 			try{
 				$offset = $stream->getOffset();
-
-				$tag = $nbt->read($stream->getBuffer(), $offset)->mustGetCompoundTag();
+				$blockStateNbt = $nbt->read($stream->getBuffer(), $offset)->mustGetCompoundTag();
 				$stream->setOffset($offset);
-
-				$id = $idMap->stringToLegacy($tag->getString("name")) ?? BlockLegacyIds::INFO_UPDATE;
-				$data = $tag->getShort("val");
-				$palette[] = ($id << Block::INTERNAL_METADATA_BITS) | $data;
-			}catch(NbtException $e){
+			}catch(NbtDataException $e){
+				//NBT borked, unrecoverable
 				throw new CorruptedChunkException("Invalid blockstate NBT at offset $i in paletted storage: " . $e->getMessage(), 0, $e);
 			}
+
+			//TODO: remember data for unknown states so we can implement them later
+			try{
+				$blockStateData = $this->blockDataUpgrader->upgradeBlockStateNbt($blockStateNbt);
+			}catch(BlockStateDeserializeException $e){
+				//while not ideal, this is not a fatal error
+				$blockDecodeErrors[] = "Palette offset $i / Upgrade error: " . $e->getMessage() . ", NBT: " . $blockStateNbt->toString();
+				$palette[] = $this->blockStateDeserializer->deserialize(GlobalBlockStateHandlers::getUnknownBlockStateData());
+				continue;
+			}
+			try{
+				$palette[] = $this->blockStateDeserializer->deserialize($blockStateData);
+			}catch(UnsupportedBlockStateException $e){
+				$blockDecodeErrors[] = "Palette offset $i / " . $e->getMessage();
+				$palette[] = $this->blockStateDeserializer->deserialize(GlobalBlockStateHandlers::getUnknownBlockStateData());
+			}catch(BlockStateDeserializeException $e){
+				$blockDecodeErrors[] = "Palette offset $i / Deserialize error: " . $e->getMessage() . ", NBT: " . $blockStateNbt->toString();
+				$palette[] = $this->blockStateDeserializer->deserialize(GlobalBlockStateHandlers::getUnknownBlockStateData());
+			}
+		}
+
+		if(count($blockDecodeErrors) > 0){
+			$logger->error("Errors decoding blocks:\n - " . implode("\n - ", $blockDecodeErrors));
 		}
 
 		//TODO: exceptions
 		return PalettedBlockArray::fromData($bitsPerBlock, $words, $palette);
 	}
 
+	private function serializeBlockPalette(BinaryStream $stream, PalettedBlockArray $blocks) : void{
+		$stream->putByte($blocks->getBitsPerBlock() << 1);
+		$stream->put($blocks->getWordArray());
+
+		$palette = $blocks->getPalette();
+		if($blocks->getBitsPerBlock() !== 0){
+			$stream->putLInt(count($palette));
+		}
+		$tags = [];
+		foreach($palette as $p){
+			$tags[] = new TreeRoot($this->blockStateSerializer->serialize($p)->toNbt());
+		}
+
+		$stream->put((new LittleEndianNbtSerializer())->writeMultiple($tags));
+	}
+
+	/**
+	 * @throws CorruptedChunkException
+	 */
+	private static function getExpected3dBiomesCount(int $chunkVersion) : int{
+		return match(true){
+			$chunkVersion >= ChunkVersion::v1_18_30 => 24,
+			$chunkVersion >= ChunkVersion::v1_18_0_25_beta => 25,
+			$chunkVersion >= ChunkVersion::v1_18_0_24_beta => 32,
+			$chunkVersion >= ChunkVersion::v1_18_0_22_beta => 65,
+			$chunkVersion >= ChunkVersion::v1_17_40_20_beta_experimental_caves_cliffs => 32,
+			default => throw new CorruptedChunkException("Chunk version $chunkVersion should not have 3D biomes")
+		};
+	}
+
+	/**
+	 * @throws CorruptedChunkException
+	 */
+	private static function deserializeBiomePalette(BinaryStream $stream, int $bitsPerBlock) : PalettedBlockArray{
+		try{
+			$words = $stream->get(PalettedBlockArray::getExpectedWordArraySize($bitsPerBlock));
+		}catch(\InvalidArgumentException $e){
+			throw new CorruptedChunkException("Failed to deserialize paletted biomes: " . $e->getMessage(), 0, $e);
+		}
+		$palette = [];
+		$paletteSize = $bitsPerBlock === 0 ? 1 : $stream->getLInt();
+
+		for($i = 0; $i < $paletteSize; ++$i){
+			$palette[] = $stream->getLInt();
+		}
+
+		//TODO: exceptions
+		return PalettedBlockArray::fromData($bitsPerBlock, $words, $palette);
+	}
+
+	private static function serializeBiomePalette(BinaryStream $stream, PalettedBlockArray $biomes) : void{
+		$stream->putByte($biomes->getBitsPerBlock() << 1);
+		$stream->put($biomes->getWordArray());
+
+		$palette = $biomes->getPalette();
+		if($biomes->getBitsPerBlock() !== 0){
+			$stream->putLInt(count($palette));
+		}
+		foreach($palette as $p){
+			$stream->putLInt($p);
+		}
+	}
+
+	/**
+	 * @throws CorruptedChunkException
+	 * @return PalettedBlockArray[]
+	 * @phpstan-return array<int, PalettedBlockArray>
+	 */
+	private static function deserialize3dBiomes(BinaryStream $stream, int $chunkVersion, \Logger $logger) : array{
+		$previous = null;
+		$result = [];
+		$nextIndex = Chunk::MIN_SUBCHUNK_INDEX;
+
+		$expectedCount = self::getExpected3dBiomesCount($chunkVersion);
+		for($i = 0; $i < $expectedCount; ++$i){
+			try{
+				$bitsPerBlock = $stream->getByte() >> 1;
+				if($bitsPerBlock === 127){
+					if($previous === null){
+						throw new CorruptedChunkException("Serialized biome palette $i has no previous palette to copy from");
+					}
+					$decoded = clone $previous;
+				}else{
+					$decoded = self::deserializeBiomePalette($stream, $bitsPerBlock);
+				}
+				$previous = $decoded;
+				if($nextIndex <= Chunk::MAX_SUBCHUNK_INDEX){ //older versions wrote additional superfluous biome palettes
+					$result[$nextIndex++] = $decoded;
+				}elseif($stream->feof()){
+					//not enough padding biome arrays for the given version - this is non-critical since we discard the excess anyway, but this should be logged
+					$logger->error("Wrong number of 3D biome palettes for this chunk version: expected $expectedCount, but got " . ($i + 1) . " - this is not a problem, but may indicate a corrupted chunk");
+					break;
+				}
+			}catch(BinaryDataException $e){
+				throw new CorruptedChunkException("Failed to deserialize biome palette $i: " . $e->getMessage(), 0, $e);
+			}
+		}
+		if(!$stream->feof()){
+			//maybe bad output produced by a third-party conversion tool like Chunker
+			$logger->error("Unexpected trailing data after 3D biomes data");
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @param SubChunk[] $subChunks
+	 */
+	private static function serialize3dBiomes(BinaryStream $stream, array $subChunks) : void{
+		//TODO: the server-side min/max may not coincide with the world storage min/max - we may need additional logic to handle this
+		for($y = Chunk::MIN_SUBCHUNK_INDEX; $y <= Chunk::MAX_SUBCHUNK_INDEX; $y++){
+			//TODO: is it worth trying to use the previous palette if it's the same as the current one? vanilla supports
+			//this, but it's not clear if it's worth the effort to implement.
+			self::serializeBiomePalette($stream, $subChunks[$y]->getBiomeArray());
+		}
+	}
+
 	/**
 	 * @phpstan-param-out int $x
 	 * @phpstan-param-out int $y
@@ -211,7 +363,7 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 	/**
 	 * @return PalettedBlockArray[]
 	 */
-	protected function deserializeLegacyExtraData(string $index, int $chunkVersion) : array{
+	protected function deserializeLegacyExtraData(string $index, int $chunkVersion, \Logger $logger) : array{
 		if(($extraRawData = $this->db->get($index . ChunkDataKey::LEGACY_BLOCK_EXTRA_DATA)) === false || $extraRawData === ""){
 			return [];
 		}
@@ -220,6 +372,7 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 		$extraDataLayers = [];
 		$binaryStream = new BinaryStream($extraRawData);
 		$count = $binaryStream->getLInt();
+
 		for($i = 0; $i < $count; ++$i){
 			$key = $binaryStream->getLInt();
 			$value = $binaryStream->getLShort();
@@ -231,36 +384,304 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 
 			$blockId = $value & 0xff;
 			$blockData = ($value >> 8) & 0xf;
-			if(!isset($extraDataLayers[$ySub])){
-				$extraDataLayers[$ySub] = new PalettedBlockArray(BlockLegacyIds::AIR << Block::INTERNAL_METADATA_BITS);
+			try{
+				$blockStateData = $this->blockDataUpgrader->upgradeIntIdMeta($blockId, $blockData);
+			}catch(BlockStateDeserializeException $e){
+				//TODO: we could preserve this in case it's supported in the future, but this was historically only
+				//used for grass anyway, so we probably don't need to care
+				$logger->error("Failed to upgrade legacy extra block: " . $e->getMessage() . " ($blockId:$blockData)");
+				continue;
 			}
-			$extraDataLayers[$ySub]->set($x, $y, $z, ($blockId << Block::INTERNAL_METADATA_BITS) | $blockData);
+			//assume this won't throw
+			$blockStateId = $this->blockStateDeserializer->deserialize($blockStateData);
+
+			if(!isset($extraDataLayers[$ySub])){
+				$extraDataLayers[$ySub] = new PalettedBlockArray(Block::EMPTY_STATE_ID);
+			}
+			$extraDataLayers[$ySub]->set($x, $y, $z, $blockStateId);
 		}
 
 		return $extraDataLayers;
 	}
 
+	private function readVersion(int $chunkX, int $chunkZ) : ?int{
+		$index = self::chunkIndex($chunkX, $chunkZ);
+		$chunkVersionRaw = $this->db->get($index . ChunkDataKey::NEW_VERSION);
+		if($chunkVersionRaw === false){
+			$chunkVersionRaw = $this->db->get($index . ChunkDataKey::OLD_VERSION);
+			if($chunkVersionRaw === false){
+				return null;
+			}
+		}
+
+		return ord($chunkVersionRaw);
+	}
+
+	/**
+	 * Deserializes terrain data stored in the 0.9 full-chunk format into subchunks.
+	 *
+	 * @return SubChunk[]
+	 * @phpstan-return array<int, SubChunk>
+	 * @throws CorruptedWorldException
+	 */
+	private function deserializeLegacyTerrainData(string $index, int $chunkVersion, \Logger $logger) : array{
+		$convertedLegacyExtraData = $this->deserializeLegacyExtraData($index, $chunkVersion, $logger);
+
+		$legacyTerrain = $this->db->get($index . ChunkDataKey::LEGACY_TERRAIN);
+		if($legacyTerrain === false){
+			throw new CorruptedChunkException("Missing expected LEGACY_TERRAIN tag for format version $chunkVersion");
+		}
+		$binaryStream = new BinaryStream($legacyTerrain);
+		try{
+			$fullIds = $binaryStream->get(32768);
+			$fullData = $binaryStream->get(16384);
+			$binaryStream->get(32768); //legacy light info, discard it
+		}catch(BinaryDataException $e){
+			throw new CorruptedChunkException($e->getMessage(), 0, $e);
+		}
+
+		try{
+			$binaryStream->get(256); //heightmap, discard it
+			/** @var int[] $unpackedBiomeArray */
+			$unpackedBiomeArray = unpack("N*", $binaryStream->get(1024)); //unpack() will never fail here
+			$biomes3d = ChunkUtils::extrapolate3DBiomes(ChunkUtils::convertBiomeColors(array_values($unpackedBiomeArray))); //never throws
+		}catch(BinaryDataException $e){
+			throw new CorruptedChunkException($e->getMessage(), 0, $e);
+		}
+		if(!$binaryStream->feof()){
+			$logger->error("Unexpected trailing data in legacy terrain data");
+		}
+
+		$subChunks = [];
+		for($yy = 0; $yy < 8; ++$yy){
+			$storages = [$this->palettizeLegacySubChunkFromColumn($fullIds, $fullData, $yy, new \PrefixedLogger($logger, "Subchunk y=$yy"))];
+			if(isset($convertedLegacyExtraData[$yy])){
+				$storages[] = $convertedLegacyExtraData[$yy];
+			}
+			$subChunks[$yy] = new SubChunk(Block::EMPTY_STATE_ID, $storages, clone $biomes3d);
+		}
+
+		//make sure extrapolated biomes get filled in correctly
+		for($yy = Chunk::MIN_SUBCHUNK_INDEX; $yy <= Chunk::MAX_SUBCHUNK_INDEX; ++$yy){
+			if(!isset($subChunks[$yy])){
+				$subChunks[$yy] = new SubChunk(Block::EMPTY_STATE_ID, [], clone $biomes3d);
+			}
+		}
+
+		return $subChunks;
+	}
+
+	/**
+	 * Deserializes a subchunk stored in the legacy non-paletted format used from 1.0 until 1.2.13.
+	 */
+	private function deserializeNonPalettedSubChunkData(BinaryStream $binaryStream, int $chunkVersion, ?PalettedBlockArray $convertedLegacyExtraData, PalettedBlockArray $biomePalette, \Logger $logger) : SubChunk{
+		try{
+			$blocks = $binaryStream->get(4096);
+			$blockData = $binaryStream->get(2048);
+		}catch(BinaryDataException $e){
+			throw new CorruptedChunkException($e->getMessage(), 0, $e);
+		}
+
+		if($chunkVersion < ChunkVersion::v1_1_0){
+			try{
+				$binaryStream->get(4096); //legacy light info, discard it
+				if(!$binaryStream->feof()){
+					$logger->error("Unexpected trailing data in legacy subchunk data");
+				}
+			}catch(BinaryDataException $e){
+				$logger->error("Failed to read legacy subchunk light info: " . $e->getMessage());
+			}
+		}
+
+		$storages = [$this->palettizeLegacySubChunkXZY($blocks, $blockData, $logger)];
+		if($convertedLegacyExtraData !== null){
+			$storages[] = $convertedLegacyExtraData;
+		}
+
+		return new SubChunk(Block::EMPTY_STATE_ID, $storages, $biomePalette);
+	}
+
+	/**
+	 * Deserializes subchunk data stored under a subchunk LevelDB key.
+	 *
+	 * @see ChunkDataKey::SUBCHUNK
+	 * @throws CorruptedChunkException
+	 */
+	private function deserializeSubChunkData(BinaryStream $binaryStream, int $chunkVersion, int $subChunkVersion, ?PalettedBlockArray $convertedLegacyExtraData, PalettedBlockArray $biomePalette, \Logger $logger) : SubChunk{
+		switch($subChunkVersion){
+			case SubChunkVersion::CLASSIC:
+			case SubChunkVersion::CLASSIC_BUG_2: //these are all identical to version 0, but vanilla respects these so we should also
+			case SubChunkVersion::CLASSIC_BUG_3:
+			case SubChunkVersion::CLASSIC_BUG_4:
+			case SubChunkVersion::CLASSIC_BUG_5:
+			case SubChunkVersion::CLASSIC_BUG_6:
+			case SubChunkVersion::CLASSIC_BUG_7:
+				return $this->deserializeNonPalettedSubChunkData($binaryStream, $chunkVersion, $convertedLegacyExtraData, $biomePalette, $logger);
+			case SubChunkVersion::PALETTED_SINGLE:
+				$storages = [$this->deserializeBlockPalette($binaryStream, $logger)];
+				if($convertedLegacyExtraData !== null){
+					$storages[] = $convertedLegacyExtraData;
+				}
+				return new SubChunk(Block::EMPTY_STATE_ID, $storages, $biomePalette);
+			case SubChunkVersion::PALETTED_MULTI:
+			case SubChunkVersion::PALETTED_MULTI_WITH_OFFSET:
+				//legacy extradata layers intentionally ignored because they aren't supposed to exist in v8
+
+				$storageCount = $binaryStream->getByte();
+				if($subChunkVersion >= SubChunkVersion::PALETTED_MULTI_WITH_OFFSET){
+					//height ignored; this seems pointless since this is already in the key anyway
+					$binaryStream->getByte();
+				}
+
+				$storages = [];
+				for($k = 0; $k < $storageCount; ++$k){
+					$storages[] = $this->deserializeBlockPalette($binaryStream, $logger);
+				}
+				return new SubChunk(Block::EMPTY_STATE_ID, $storages, $biomePalette);
+			default:
+				//this should never happen - an unsupported chunk appearing in a supported world is a sign of corruption
+				throw new CorruptedChunkException("don't know how to decode LevelDB subchunk format version $subChunkVersion");
+		}
+	}
+
+	private static function hasOffsetCavesAndCliffsSubChunks(int $chunkVersion) : bool{
+		return $chunkVersion >= ChunkVersion::v1_16_220_50_unused && $chunkVersion <= ChunkVersion::v1_16_230_50_unused;
+	}
+
+	/**
+	 * Deserializes any subchunks stored under subchunk LevelDB keys, upgrading them to the current format if necessary.
+	 *
+	 * @param PalettedBlockArray[] $convertedLegacyExtraData
+	 * @param PalettedBlockArray[] $biomeArrays
+	 *
+	 * @phpstan-param array<int, PalettedBlockArray> $convertedLegacyExtraData
+	 * @phpstan-param array<int, PalettedBlockArray> $biomeArrays
+	 * @phpstan-param-out bool                       $hasBeenUpgraded
+	 *
+	 * @return SubChunk[]
+	 * @phpstan-return array<int, SubChunk>
+	 */
+	private function deserializeAllSubChunkData(string $index, int $chunkVersion, bool &$hasBeenUpgraded, array $convertedLegacyExtraData, array $biomeArrays, \Logger $logger) : array{
+		$subChunks = [];
+
+		$subChunkKeyOffset = self::hasOffsetCavesAndCliffsSubChunks($chunkVersion) ? self::CAVES_CLIFFS_EXPERIMENTAL_SUBCHUNK_KEY_OFFSET : 0;
+		for($y = Chunk::MIN_SUBCHUNK_INDEX; $y <= Chunk::MAX_SUBCHUNK_INDEX; ++$y){
+			if(($data = $this->db->get($index . ChunkDataKey::SUBCHUNK . chr($y + $subChunkKeyOffset))) === false){
+				$subChunks[$y] = new SubChunk(Block::EMPTY_STATE_ID, [], $biomeArrays[$y]);
+				continue;
+			}
+
+			$binaryStream = new BinaryStream($data);
+			if($binaryStream->feof()){
+				throw new CorruptedChunkException("Unexpected empty data for subchunk $y");
+			}
+			$subChunkVersion = $binaryStream->getByte();
+			if($subChunkVersion < self::CURRENT_LEVEL_SUBCHUNK_VERSION){
+				$hasBeenUpgraded = true;
+			}
+
+			$subChunks[$y] = $this->deserializeSubChunkData(
+				$binaryStream,
+				$chunkVersion,
+				$subChunkVersion,
+				$convertedLegacyExtraData[$y] ?? null,
+				$biomeArrays[$y],
+				new \PrefixedLogger($logger, "Subchunk y=$y v$subChunkVersion")
+			);
+		}
+
+		return $subChunks;
+	}
+
+	/**
+	 * Deserializes any available biome data into an array of paletted biomes. Old 2D biomes are extrapolated to 3D.
+	 *
+	 * @return PalettedBlockArray[]
+	 * @phpstan-return array<int, PalettedBlockArray>
+	 */
+	private function deserializeBiomeData(string $index, int $chunkVersion, \Logger $logger) : array{
+		$biomeArrays = [];
+		if(($maps2d = $this->db->get($index . ChunkDataKey::HEIGHTMAP_AND_2D_BIOMES)) !== false){
+			$binaryStream = new BinaryStream($maps2d);
+
+			try{
+				$binaryStream->get(512); //heightmap, discard it
+				$biomes3d = ChunkUtils::extrapolate3DBiomes($binaryStream->get(256)); //never throws
+				if(!$binaryStream->feof()){
+					$logger->error("Unexpected trailing data after 2D biome data");
+				}
+			}catch(BinaryDataException $e){
+				throw new CorruptedChunkException($e->getMessage(), 0, $e);
+			}
+			for($i = Chunk::MIN_SUBCHUNK_INDEX; $i <= Chunk::MAX_SUBCHUNK_INDEX; ++$i){
+				$biomeArrays[$i] = clone $biomes3d;
+			}
+		}elseif(($maps3d = $this->db->get($index . ChunkDataKey::HEIGHTMAP_AND_3D_BIOMES)) !== false){
+			$binaryStream = new BinaryStream($maps3d);
+
+			try{
+				$binaryStream->get(512);
+				$biomeArrays = self::deserialize3dBiomes($binaryStream, $chunkVersion, $logger);
+			}catch(BinaryDataException $e){
+				throw new CorruptedChunkException($e->getMessage(), 0, $e);
+			}
+		}else{
+			$logger->error("Missing biome data, using default ocean biome");
+			for($i = Chunk::MIN_SUBCHUNK_INDEX; $i <= Chunk::MAX_SUBCHUNK_INDEX; ++$i){
+				$biomeArrays[$i] = new PalettedBlockArray(BiomeIds::OCEAN); //polyfill
+			}
+		}
+
+		return $biomeArrays;
+	}
+
 	/**
 	 * @throws CorruptedChunkException
 	 */
-	public function loadChunk(int $chunkX, int $chunkZ) : ?ChunkData{
+	public function loadChunk(int $chunkX, int $chunkZ) : ?LoadedChunkData{
 		$index = LevelDB::chunkIndex($chunkX, $chunkZ);
 
-		$chunkVersionRaw = $this->db->get($index . ChunkDataKey::OLD_VERSION);
-		if($chunkVersionRaw === false){
+		$chunkVersion = $this->readVersion($chunkX, $chunkZ);
+		if($chunkVersion === null){
+			//TODO: this might be a slightly-corrupted chunk with a missing version field
 			return null;
 		}
 
-		/** @var SubChunk[] $subChunks */
-		$subChunks = [];
+		//TODO: read PM_DATA_VERSION - we'll need it to fix up old chunks
 
-		/** @var BiomeArray|null $biomeArray */
-		$biomeArray = null;
+		$logger = new \PrefixedLogger($this->logger, "Loading chunk x=$chunkX z=$chunkZ v$chunkVersion");
 
-		$chunkVersion = ord($chunkVersionRaw);
 		$hasBeenUpgraded = $chunkVersion < self::CURRENT_LEVEL_CHUNK_VERSION;
 
 		switch($chunkVersion){
+			case ChunkVersion::v1_21_40:
+				//TODO: BiomeStates became shorts instead of bytes
+			case ChunkVersion::v1_18_30:
+			case ChunkVersion::v1_18_0_25_beta:
+			case ChunkVersion::v1_18_0_24_unused:
+			case ChunkVersion::v1_18_0_24_beta:
+			case ChunkVersion::v1_18_0_22_unused:
+			case ChunkVersion::v1_18_0_22_beta:
+			case ChunkVersion::v1_18_0_20_unused:
+			case ChunkVersion::v1_18_0_20_beta:
+			case ChunkVersion::v1_17_40_unused:
+			case ChunkVersion::v1_17_40_20_beta_experimental_caves_cliffs:
+			case ChunkVersion::v1_17_30_25_unused:
+			case ChunkVersion::v1_17_30_25_beta_experimental_caves_cliffs:
+			case ChunkVersion::v1_17_30_23_unused:
+			case ChunkVersion::v1_17_30_23_beta_experimental_caves_cliffs:
+			case ChunkVersion::v1_16_230_50_unused:
+			case ChunkVersion::v1_16_230_50_beta_experimental_caves_cliffs:
+			case ChunkVersion::v1_16_220_50_unused:
+			case ChunkVersion::v1_16_220_50_beta_experimental_caves_cliffs:
+			case ChunkVersion::v1_16_210:
+			case ChunkVersion::v1_16_100_57_beta:
+			case ChunkVersion::v1_16_100_52_beta:
+			case ChunkVersion::v1_16_0:
+			case ChunkVersion::v1_16_0_51_beta:
+				//TODO: check walls
+			case ChunkVersion::v1_12_0_unused2:
+			case ChunkVersion::v1_12_0_unused1:
 			case ChunkVersion::v1_12_0_4_beta:
 			case ChunkVersion::v1_11_1:
 			case ChunkVersion::v1_11_0_4_beta:
@@ -271,125 +692,20 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 			case ChunkVersion::v1_2_13:
 			case ChunkVersion::v1_2_0:
 			case ChunkVersion::v1_2_0_2_beta:
+			case ChunkVersion::v1_1_0_converted_from_console:
 			case ChunkVersion::v1_1_0:
 				//TODO: check beds
 			case ChunkVersion::v1_0_0:
-				$convertedLegacyExtraData = $this->deserializeLegacyExtraData($index, $chunkVersion);
-
-				for($y = Chunk::MIN_SUBCHUNK_INDEX; $y <= Chunk::MAX_SUBCHUNK_INDEX; ++$y){
-					if(($data = $this->db->get($index . ChunkDataKey::SUBCHUNK . chr($y))) === false){
-						continue;
-					}
-
-					$binaryStream = new BinaryStream($data);
-					if($binaryStream->feof()){
-						throw new CorruptedChunkException("Unexpected empty data for subchunk $y");
-					}
-					$subChunkVersion = $binaryStream->getByte();
-					if($subChunkVersion < self::CURRENT_LEVEL_SUBCHUNK_VERSION){
-						$hasBeenUpgraded = true;
-					}
-
-					switch($subChunkVersion){
-						case SubChunkVersion::CLASSIC:
-						case SubChunkVersion::CLASSIC_BUG_2: //these are all identical to version 0, but vanilla respects these so we should also
-						case SubChunkVersion::CLASSIC_BUG_3:
-						case SubChunkVersion::CLASSIC_BUG_4:
-						case SubChunkVersion::CLASSIC_BUG_5:
-						case SubChunkVersion::CLASSIC_BUG_6:
-						case SubChunkVersion::CLASSIC_BUG_7:
-							try{
-								$blocks = $binaryStream->get(4096);
-								$blockData = $binaryStream->get(2048);
-
-								if($chunkVersion < ChunkVersion::v1_1_0){
-									$binaryStream->get(4096); //legacy light info, discard it
-									$hasBeenUpgraded = true;
-								}
-							}catch(BinaryDataException $e){
-								throw new CorruptedChunkException($e->getMessage(), 0, $e);
-							}
-
-							$storages = [SubChunkConverter::convertSubChunkXZY($blocks, $blockData)];
-							if(isset($convertedLegacyExtraData[$y])){
-								$storages[] = $convertedLegacyExtraData[$y];
-							}
-
-							$subChunks[$y] = new SubChunk(BlockLegacyIds::AIR << Block::INTERNAL_METADATA_BITS, $storages);
-							break;
-						case SubChunkVersion::PALETTED_SINGLE:
-							$storages = [$this->deserializePaletted($binaryStream)];
-							if(isset($convertedLegacyExtraData[$y])){
-								$storages[] = $convertedLegacyExtraData[$y];
-							}
-							$subChunks[$y] = new SubChunk(BlockLegacyIds::AIR << Block::INTERNAL_METADATA_BITS, $storages);
-							break;
-						case SubChunkVersion::PALETTED_MULTI:
-							//legacy extradata layers intentionally ignored because they aren't supposed to exist in v8
-							$storageCount = $binaryStream->getByte();
-							if($storageCount > 0){
-								$storages = [];
-
-								for($k = 0; $k < $storageCount; ++$k){
-									$storages[] = $this->deserializePaletted($binaryStream);
-								}
-								$subChunks[$y] = new SubChunk(BlockLegacyIds::AIR << Block::INTERNAL_METADATA_BITS, $storages);
-							}
-							break;
-						default:
-							//TODO: set chunks read-only so the version on disk doesn't get overwritten
-							throw new CorruptedChunkException("don't know how to decode LevelDB subchunk format version $subChunkVersion");
-					}
-				}
-
-				if(($maps2d = $this->db->get($index . ChunkDataKey::HEIGHTMAP_AND_2D_BIOMES)) !== false){
-					$binaryStream = new BinaryStream($maps2d);
-
-					try{
-						$binaryStream->get(512); //heightmap, discard it
-						$biomeArray = new BiomeArray($binaryStream->get(256)); //never throws
-					}catch(BinaryDataException $e){
-						throw new CorruptedChunkException($e->getMessage(), 0, $e);
-					}
-				}
+				$convertedLegacyExtraData = $this->deserializeLegacyExtraData($index, $chunkVersion, $logger);
+				$biomeArrays = $this->deserializeBiomeData($index, $chunkVersion, $logger);
+				$subChunks = $this->deserializeAllSubChunkData($index, $chunkVersion, $hasBeenUpgraded, $convertedLegacyExtraData, $biomeArrays, $logger);
 				break;
 			case ChunkVersion::v0_9_5:
 			case ChunkVersion::v0_9_2:
 			case ChunkVersion::v0_9_0:
-				$convertedLegacyExtraData = $this->deserializeLegacyExtraData($index, $chunkVersion);
-
-				$legacyTerrain = $this->db->get($index . ChunkDataKey::LEGACY_TERRAIN);
-				if($legacyTerrain === false){
-					throw new CorruptedChunkException("Missing expected LEGACY_TERRAIN tag for format version $chunkVersion");
-				}
-				$binaryStream = new BinaryStream($legacyTerrain);
-				try{
-					$fullIds = $binaryStream->get(32768);
-					$fullData = $binaryStream->get(16384);
-					$binaryStream->get(32768); //legacy light info, discard it
-				}catch(BinaryDataException $e){
-					throw new CorruptedChunkException($e->getMessage(), 0, $e);
-				}
-
-				for($yy = 0; $yy < 8; ++$yy){
-					$storages = [SubChunkConverter::convertSubChunkFromLegacyColumn($fullIds, $fullData, $yy)];
-					if(isset($convertedLegacyExtraData[$yy])){
-						$storages[] = $convertedLegacyExtraData[$yy];
-					}
-					$subChunks[$yy] = new SubChunk(BlockLegacyIds::AIR << Block::INTERNAL_METADATA_BITS, $storages);
-				}
-
-				try{
-					$binaryStream->get(256); //heightmap, discard it
-					/** @var int[] $unpackedBiomeArray */
-					$unpackedBiomeArray = unpack("N*", $binaryStream->get(1024)); //unpack() will never fail here
-					$biomeArray = new BiomeArray(ChunkUtils::convertBiomeColors(array_values($unpackedBiomeArray))); //never throws
-				}catch(BinaryDataException $e){
-					throw new CorruptedChunkException($e->getMessage(), 0, $e);
-				}
+				$subChunks = $this->deserializeLegacyTerrainData($index, $chunkVersion, $logger);
 				break;
 			default:
-				//TODO: set chunks read-only so the version on disk doesn't get overwritten
 				throw new CorruptedChunkException("don't know how to decode chunk format version $chunkVersion");
 		}
 
@@ -425,29 +741,25 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 
 		//TODO: tile ticks, biome states (?)
 
-		$chunk = new Chunk(
-			$subChunks,
-			$biomeArray ?? BiomeArray::fill(BiomeIds::OCEAN), //TODO: maybe missing biomes should be an error?
-			$terrainPopulated
+		return new LoadedChunkData(
+			data: new ChunkData($subChunks, $terrainPopulated, $entities, $tiles),
+			upgraded: $hasBeenUpgraded,
+			fixerFlags: LoadedChunkData::FIXER_FLAG_ALL //TODO: fill this by version rather than just setting all flags
 		);
-
-		if($hasBeenUpgraded){
-			$chunk->setTerrainDirty(); //trigger rewriting chunk to disk if it was converted from an older format
-		}
-
-		return new ChunkData($chunk, $entities, $tiles);
 	}
 
-	public function saveChunk(int $chunkX, int $chunkZ, ChunkData $chunkData) : void{
-		$idMap = LegacyBlockIdToStringIdMap::getInstance();
+	public function saveChunk(int $chunkX, int $chunkZ, ChunkData $chunkData, int $dirtyFlags) : void{
 		$index = LevelDB::chunkIndex($chunkX, $chunkZ);
 
 		$write = new \LevelDBWriteBatch();
-		$write->put($index . ChunkDataKey::OLD_VERSION, chr(self::CURRENT_LEVEL_CHUNK_VERSION));
 
-		$chunk = $chunkData->getChunk();
-		if($chunk->getTerrainDirtyFlag(Chunk::DIRTY_FLAG_BLOCKS)){
-			$subChunks = $chunk->getSubChunks();
+		$write->put($index . ChunkDataKey::NEW_VERSION, chr(self::CURRENT_LEVEL_CHUNK_VERSION));
+		$write->put($index . ChunkDataKey::PM_DATA_VERSION, Binary::writeLLong(VersionInfo::WORLD_DATA_VERSION));
+
+		$subChunks = $chunkData->getSubChunks();
+
+		if(($dirtyFlags & Chunk::DIRTY_FLAG_BLOCKS) !== 0){
+
 			foreach($subChunks as $y => $subChunk){
 				$key = $index . ChunkDataKey::SUBCHUNK . chr($y);
 				if($subChunk->isEmptyAuthoritative()){
@@ -459,27 +771,7 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 					$layers = $subChunk->getBlockLayers();
 					$subStream->putByte(count($layers));
 					foreach($layers as $blocks){
-						if($blocks->getBitsPerBlock() !== 0){
-							$subStream->putByte($blocks->getBitsPerBlock() << 1);
-							$subStream->put($blocks->getWordArray());
-						}else{
-							//TODO: we use these in-memory, but they aren't supported on disk by the game yet
-							//polyfill them with a zero'd 1-bpb instead
-							$subStream->putByte(1 << 1);
-							$subStream->put(str_repeat("\x00", PalettedBlockArray::getExpectedWordArraySize(1)));
-						}
-
-						$palette = $blocks->getPalette();
-						$subStream->putLInt(count($palette));
-						$tags = [];
-						foreach($palette as $p){
-							$tags[] = new TreeRoot(CompoundTag::create()
-								->setString("name", $idMap->legacyToString($p >> Block::INTERNAL_METADATA_BITS) ?? "minecraft:info_update")
-								->setInt("oldid", $p >> Block::INTERNAL_METADATA_BITS) //PM only (debugging), vanilla doesn't have this
-								->setShort("val", $p & Block::INTERNAL_METADATA_MASK));
-						}
-
-						$subStream->put((new LittleEndianNbtSerializer())->writeMultiple($tags));
+						$this->serializeBlockPalette($subStream, $blocks);
 					}
 
 					$write->put($key, $subStream->getBuffer());
@@ -487,12 +779,16 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 			}
 		}
 
-		if($chunk->getTerrainDirtyFlag(Chunk::DIRTY_FLAG_BIOMES)){
-			$write->put($index . ChunkDataKey::HEIGHTMAP_AND_2D_BIOMES, str_repeat("\x00", 512) . $chunk->getBiomeIdArray());
+		if(($dirtyFlags & Chunk::DIRTY_FLAG_BIOMES) !== 0){
+			$write->delete($index . ChunkDataKey::HEIGHTMAP_AND_2D_BIOMES);
+			$stream = new BinaryStream();
+			$stream->put(str_repeat("\x00", 512)); //fake heightmap
+			self::serialize3dBiomes($stream, $subChunks);
+			$write->put($index . ChunkDataKey::HEIGHTMAP_AND_3D_BIOMES, $stream->getBuffer());
 		}
 
 		//TODO: use this properly
-		$write->put($index . ChunkDataKey::FINALIZATION, chr($chunk->isPopulated() ? self::FINALISATION_DONE : self::FINALISATION_NEEDS_POPULATION));
+		$write->put($index . ChunkDataKey::FINALIZATION, chr($chunkData->isPopulated() ? self::FINALISATION_DONE : self::FINALISATION_NEEDS_POPULATION));
 
 		$this->writeTags($chunkData->getTileNBT(), $index . ChunkDataKey::BLOCK_ENTITIES, $write);
 		$this->writeTags($chunkData->getEntityNBT(), $index . ChunkDataKey::ENTITIES, $write);
@@ -533,7 +829,7 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 
 	public function getAllChunks(bool $skipCorrupted = false, ?\Logger $logger = null) : \Generator{
 		foreach($this->db->getIterator() as $key => $_){
-			if(strlen($key) === 9 && substr($key, -1) === ChunkDataKey::OLD_VERSION){
+			if(strlen($key) === 9 && ($key[8] === ChunkDataKey::NEW_VERSION || $key[8] === ChunkDataKey::OLD_VERSION)){
 				$chunkX = Binary::readLInt(substr($key, 0, 4));
 				$chunkZ = Binary::readLInt(substr($key, 4, 4));
 				try{
@@ -555,7 +851,7 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 	public function calculateChunkCount() : int{
 		$count = 0;
 		foreach($this->db->getIterator() as $key => $_){
-			if(strlen($key) === 9 && substr($key, -1) === ChunkDataKey::OLD_VERSION){
+			if(strlen($key) === 9 && ($key[8] === ChunkDataKey::NEW_VERSION || $key[8] === ChunkDataKey::OLD_VERSION)){
 				$count++;
 			}
 		}
diff --git a/src/world/format/io/region/Anvil.php b/src/world/format/io/region/Anvil.php
index 6fd00d26aa..2c14b54e87 100644
--- a/src/world/format/io/region/Anvil.php
+++ b/src/world/format/io/region/Anvil.php
@@ -24,19 +24,19 @@ declare(strict_types=1);
 namespace pocketmine\world\format\io\region;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockLegacyIds;
 use pocketmine\nbt\tag\CompoundTag;
-use pocketmine\world\format\io\SubChunkConverter;
+use pocketmine\world\format\PalettedBlockArray;
 use pocketmine\world\format\SubChunk;
 
 class Anvil extends RegionWorldProvider{
 	use LegacyAnvilChunkTrait;
 
-	protected function deserializeSubChunk(CompoundTag $subChunk) : SubChunk{
-		return new SubChunk(BlockLegacyIds::AIR << Block::INTERNAL_METADATA_BITS, [SubChunkConverter::convertSubChunkYZX(
+	protected function deserializeSubChunk(CompoundTag $subChunk, PalettedBlockArray $biomes3d, \Logger $logger) : SubChunk{
+		return new SubChunk(Block::EMPTY_STATE_ID, [$this->palettizeLegacySubChunkYZX(
 			self::readFixedSizeByteArray($subChunk, "Blocks", 4096),
-			self::readFixedSizeByteArray($subChunk, "Data", 2048)
-		)]);
+			self::readFixedSizeByteArray($subChunk, "Data", 2048),
+			$logger
+		)], $biomes3d);
 		//ignore legacy light information
 	}
 
diff --git a/src/world/format/io/region/LegacyAnvilChunkTrait.php b/src/world/format/io/region/LegacyAnvilChunkTrait.php
index 8d4f8ddf4d..6e2f4c8f8f 100644
--- a/src/world/format/io/region/LegacyAnvilChunkTrait.php
+++ b/src/world/format/io/region/LegacyAnvilChunkTrait.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\world\format\io\region;
 
+use pocketmine\block\Block;
 use pocketmine\data\bedrock\BiomeIds;
 use pocketmine\nbt\BigEndianNbtSerializer;
 use pocketmine\nbt\NbtDataException;
@@ -30,12 +31,14 @@ use pocketmine\nbt\tag\ByteArrayTag;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntArrayTag;
 use pocketmine\nbt\tag\ListTag;
-use pocketmine\world\format\BiomeArray;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\format\io\ChunkData;
 use pocketmine\world\format\io\ChunkUtils;
 use pocketmine\world\format\io\exception\CorruptedChunkException;
+use pocketmine\world\format\io\LoadedChunkData;
+use pocketmine\world\format\PalettedBlockArray;
 use pocketmine\world\format\SubChunk;
+use function strlen;
 use function zlib_decode;
 
 /**
@@ -51,7 +54,7 @@ trait LegacyAnvilChunkTrait{
 	/**
 	 * @throws CorruptedChunkException
 	 */
-	protected function deserializeChunk(string $data) : ?ChunkData{
+	protected function deserializeChunk(string $data, \Logger $logger) : ?LoadedChunkData{
 		$decompressed = @zlib_decode($data);
 		if($decompressed === false){
 			throw new CorruptedChunkException("Failed to decompress chunk NBT");
@@ -67,41 +70,48 @@ trait LegacyAnvilChunkTrait{
 			throw new CorruptedChunkException("'Level' key is missing from chunk NBT");
 		}
 
+		$makeBiomeArray = function(string $biomeIds) : PalettedBlockArray{
+			if(strlen($biomeIds) !== 256){
+				throw new CorruptedChunkException("Expected biome array to be exactly 256 bytes, got " . strlen($biomeIds));
+			}
+			//TODO: we may need to convert legacy biome IDs
+			return ChunkUtils::extrapolate3DBiomes($biomeIds);
+		};
+
+		if(($biomeColorsTag = $chunk->getTag("BiomeColors")) instanceof IntArrayTag){
+			$biomes3d = $makeBiomeArray(ChunkUtils::convertBiomeColors($biomeColorsTag->getValue())); //Convert back to original format
+		}elseif(($biomesTag = $chunk->getTag("Biomes")) instanceof ByteArrayTag){
+			$biomes3d = $makeBiomeArray($biomesTag->getValue());
+		}else{
+			$biomes3d = new PalettedBlockArray(BiomeIds::OCEAN);
+		}
+
 		$subChunks = [];
 		$subChunksTag = $chunk->getListTag("Sections") ?? [];
 		foreach($subChunksTag as $subChunk){
 			if($subChunk instanceof CompoundTag){
-				$subChunks[$subChunk->getByte("Y")] = $this->deserializeSubChunk($subChunk);
+				$y = $subChunk->getByte("Y");
+				$subChunks[$y] = $this->deserializeSubChunk($subChunk, clone $biomes3d, new \PrefixedLogger($logger, "Subchunk y=$y"));
+			}
+		}
+		for($y = Chunk::MIN_SUBCHUNK_INDEX; $y <= Chunk::MAX_SUBCHUNK_INDEX; ++$y){
+			if(!isset($subChunks[$y])){
+				$subChunks[$y] = new SubChunk(Block::EMPTY_STATE_ID, [], clone $biomes3d);
 			}
 		}
 
-		$makeBiomeArray = function(string $biomeIds) : BiomeArray{
-			try{
-				return new BiomeArray($biomeIds);
-			}catch(\InvalidArgumentException $e){
-				throw new CorruptedChunkException($e->getMessage(), 0, $e);
-			}
-		};
-		$biomeArray = null;
-		if(($biomeColorsTag = $chunk->getTag("BiomeColors")) instanceof IntArrayTag){
-			$biomeArray = $makeBiomeArray(ChunkUtils::convertBiomeColors($biomeColorsTag->getValue())); //Convert back to original format
-		}elseif(($biomesTag = $chunk->getTag("Biomes")) instanceof ByteArrayTag){
-			$biomeArray = $makeBiomeArray($biomesTag->getValue());
-		}else{
-			$biomeArray = BiomeArray::fill(BiomeIds::OCEAN);
-		}
-
-		return new ChunkData(
-			new Chunk(
+		return new LoadedChunkData(
+			data: new ChunkData(
 				$subChunks,
-				$biomeArray,
-				$chunk->getByte("TerrainPopulated", 0) !== 0
+				$chunk->getByte("TerrainPopulated", 0) !== 0,
+				($entitiesTag = $chunk->getTag("Entities")) instanceof ListTag ? self::getCompoundList("Entities", $entitiesTag) : [],
+				($tilesTag = $chunk->getTag("TileEntities")) instanceof ListTag ? self::getCompoundList("TileEntities", $tilesTag) : [],
 			),
-			($entitiesTag = $chunk->getTag("Entities")) instanceof ListTag ? self::getCompoundList("Entities", $entitiesTag) : [],
-			($tilesTag = $chunk->getTag("TileEntities")) instanceof ListTag ? self::getCompoundList("TileEntities", $tilesTag) : [],
+			upgraded: true,
+			fixerFlags: LoadedChunkData::FIXER_FLAG_ALL
 		);
 	}
 
-	abstract protected function deserializeSubChunk(CompoundTag $subChunk) : SubChunk;
+	abstract protected function deserializeSubChunk(CompoundTag $subChunk, PalettedBlockArray $biomes3d, \Logger $logger) : SubChunk;
 
 }
diff --git a/src/world/format/io/region/McRegion.php b/src/world/format/io/region/McRegion.php
index 184436e04b..ad6a2d7f2d 100644
--- a/src/world/format/io/region/McRegion.php
+++ b/src/world/format/io/region/McRegion.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\world\format\io\region;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockLegacyIds;
 use pocketmine\data\bedrock\BiomeIds;
 use pocketmine\nbt\BigEndianNbtSerializer;
 use pocketmine\nbt\NbtDataException;
@@ -33,20 +32,21 @@ use pocketmine\nbt\tag\ByteTag;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntArrayTag;
 use pocketmine\nbt\tag\ListTag;
-use pocketmine\world\format\BiomeArray;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\format\io\ChunkData;
 use pocketmine\world\format\io\ChunkUtils;
 use pocketmine\world\format\io\exception\CorruptedChunkException;
-use pocketmine\world\format\io\SubChunkConverter;
+use pocketmine\world\format\io\LoadedChunkData;
+use pocketmine\world\format\PalettedBlockArray;
 use pocketmine\world\format\SubChunk;
+use function strlen;
 use function zlib_decode;
 
 class McRegion extends RegionWorldProvider{
 	/**
 	 * @throws CorruptedChunkException
 	 */
-	protected function deserializeChunk(string $data) : ?ChunkData{
+	protected function deserializeChunk(string $data, \Logger $logger) : ?LoadedChunkData{
 		$decompressed = @zlib_decode($data);
 		if($decompressed === false){
 			throw new CorruptedChunkException("Failed to decompress chunk NBT");
@@ -70,38 +70,48 @@ class McRegion extends RegionWorldProvider{
 			//trying to read it.
 			return null;
 		}
+
+		$makeBiomeArray = function(string $biomeIds) : PalettedBlockArray{
+			if(strlen($biomeIds) !== 256){
+				throw new CorruptedChunkException("Expected biome array to be exactly 256 bytes, got " . strlen($biomeIds));
+			}
+			return ChunkUtils::extrapolate3DBiomes($biomeIds);
+		};
+		if(($biomeColorsTag = $chunk->getTag("BiomeColors")) instanceof IntArrayTag){
+			$biomes3d = $makeBiomeArray(ChunkUtils::convertBiomeColors($biomeColorsTag->getValue())); //Convert back to original format
+		}elseif(($biomesTag = $chunk->getTag("Biomes")) instanceof ByteArrayTag){
+			$biomes3d = $makeBiomeArray($biomesTag->getValue());
+		}else{
+			$biomes3d = new PalettedBlockArray(BiomeIds::OCEAN);
+		}
+
 		$subChunks = [];
 		$fullIds = self::readFixedSizeByteArray($chunk, "Blocks", 32768);
 		$fullData = self::readFixedSizeByteArray($chunk, "Data", 16384);
 
 		for($y = 0; $y < 8; ++$y){
-			$subChunks[$y] = new SubChunk(BlockLegacyIds::AIR << Block::INTERNAL_METADATA_BITS, [SubChunkConverter::convertSubChunkFromLegacyColumn($fullIds, $fullData, $y)]);
+			$subChunks[$y] = new SubChunk(Block::EMPTY_STATE_ID, [$this->palettizeLegacySubChunkFromColumn(
+				$fullIds,
+				$fullData,
+				$y,
+				new \PrefixedLogger($logger, "Subchunk y=$y"),
+			)], clone $biomes3d);
 		}
-
-		$makeBiomeArray = function(string $biomeIds) : BiomeArray{
-			try{
-				return new BiomeArray($biomeIds);
-			}catch(\InvalidArgumentException $e){
-				throw new CorruptedChunkException($e->getMessage(), 0, $e);
+		for($y = Chunk::MIN_SUBCHUNK_INDEX; $y <= Chunk::MAX_SUBCHUNK_INDEX; ++$y){
+			if(!isset($subChunks[$y])){
+				$subChunks[$y] = new SubChunk(Block::EMPTY_STATE_ID, [], clone $biomes3d);
 			}
-		};
-		$biomeIds = null;
-		if(($biomeColorsTag = $chunk->getTag("BiomeColors")) instanceof IntArrayTag){
-			$biomeIds = $makeBiomeArray(ChunkUtils::convertBiomeColors($biomeColorsTag->getValue())); //Convert back to original format
-		}elseif(($biomesTag = $chunk->getTag("Biomes")) instanceof ByteArrayTag){
-			$biomeIds = $makeBiomeArray($biomesTag->getValue());
-		}else{
-			$biomeIds = BiomeArray::fill(BiomeIds::OCEAN);
 		}
 
-		return new ChunkData(
-			new Chunk(
+		return new LoadedChunkData(
+			data: new ChunkData(
 				$subChunks,
-				$biomeIds,
-				$chunk->getByte("TerrainPopulated", 0) !== 0
+				$chunk->getByte("TerrainPopulated", 0) !== 0,
+				($entitiesTag = $chunk->getTag("Entities")) instanceof ListTag ? self::getCompoundList("Entities", $entitiesTag) : [],
+				($tilesTag = $chunk->getTag("TileEntities")) instanceof ListTag ? self::getCompoundList("TileEntities", $tilesTag) : [],
 			),
-			($entitiesTag = $chunk->getTag("Entities")) instanceof ListTag ? self::getCompoundList("Entities", $entitiesTag) : [],
-			($tilesTag = $chunk->getTag("TileEntities")) instanceof ListTag ? self::getCompoundList("TileEntities", $tilesTag) : [],
+			upgraded: true,
+			fixerFlags: LoadedChunkData::FIXER_FLAG_ALL
 		);
 	}
 
diff --git a/src/world/format/io/region/PMAnvil.php b/src/world/format/io/region/PMAnvil.php
index 7baa473486..4fb4631242 100644
--- a/src/world/format/io/region/PMAnvil.php
+++ b/src/world/format/io/region/PMAnvil.php
@@ -24,9 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\world\format\io\region;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockLegacyIds;
 use pocketmine\nbt\tag\CompoundTag;
-use pocketmine\world\format\io\SubChunkConverter;
+use pocketmine\world\format\PalettedBlockArray;
 use pocketmine\world\format\SubChunk;
 
 /**
@@ -36,11 +35,12 @@ use pocketmine\world\format\SubChunk;
 class PMAnvil extends RegionWorldProvider{
 	use LegacyAnvilChunkTrait;
 
-	protected function deserializeSubChunk(CompoundTag $subChunk) : SubChunk{
-		return new SubChunk(BlockLegacyIds::AIR << Block::INTERNAL_METADATA_BITS, [SubChunkConverter::convertSubChunkXZY(
+	protected function deserializeSubChunk(CompoundTag $subChunk, PalettedBlockArray $biomes3d, \Logger $logger) : SubChunk{
+		return new SubChunk(Block::EMPTY_STATE_ID, [$this->palettizeLegacySubChunkXZY(
 			self::readFixedSizeByteArray($subChunk, "Blocks", 4096),
-			self::readFixedSizeByteArray($subChunk, "Data", 2048)
-		)]);
+			self::readFixedSizeByteArray($subChunk, "Data", 2048),
+			$logger
+		)], $biomes3d);
 	}
 
 	protected static function getRegionFileExtension() : string{
diff --git a/src/world/format/io/region/RegionGarbageMap.php b/src/world/format/io/region/RegionGarbageMap.php
index d1e9504524..9e4e232ee0 100644
--- a/src/world/format/io/region/RegionGarbageMap.php
+++ b/src/world/format/io/region/RegionGarbageMap.php
@@ -31,7 +31,10 @@ use const SORT_NUMERIC;
 
 final class RegionGarbageMap{
 
-	/** @var RegionLocationTableEntry[] */
+	/**
+	 * @var RegionLocationTableEntry[]
+	 * @phpstan-var array<int, RegionLocationTableEntry>
+	 */
 	private array $entries = [];
 	private bool $clean = false;
 
@@ -48,7 +51,6 @@ final class RegionGarbageMap{
 	 * @param RegionLocationTableEntry[]|null[] $locationTable
 	 */
 	public static function buildFromLocationTable(array $locationTable) : self{
-		/** @var RegionLocationTableEntry[] $usedMap */
 		$usedMap = [];
 		foreach($locationTable as $entry){
 			if($entry === null){
@@ -62,12 +64,10 @@ final class RegionGarbageMap{
 
 		ksort($usedMap, SORT_NUMERIC);
 
-		/** @var RegionLocationTableEntry[] $garbageMap */
 		$garbageMap = [];
 
-		/** @var RegionLocationTableEntry|null $prevEntry */
 		$prevEntry = null;
-		foreach($usedMap as $firstSector => $entry){
+		foreach($usedMap as $entry){
 			$prevEndPlusOne = ($prevEntry !== null ? $prevEntry->getLastSector() + 1 : RegionLoader::FIRST_SECTOR);
 			$currentStart = $entry->getFirstSector();
 			if($prevEndPlusOne < $currentStart){
diff --git a/src/world/format/io/region/RegionLoader.php b/src/world/format/io/region/RegionLoader.php
index cdba29f68d..b65f5346cc 100644
--- a/src/world/format/io/region/RegionLoader.php
+++ b/src/world/format/io/region/RegionLoader.php
@@ -64,27 +64,23 @@ class RegionLoader{
 
 	public const FIRST_SECTOR = 2; //location table occupies 0 and 1
 
-	/** @var int */
-	public static $COMPRESSION_LEVEL = 7;
-
-	/** @var string */
-	protected $filePath;
 	/** @var resource */
 	protected $filePointer;
-	/** @var int */
-	protected $nextSector = self::FIRST_SECTOR;
-	/** @var RegionLocationTableEntry[]|null[] */
-	protected $locationTable = [];
-	/** @var RegionGarbageMap */
-	protected $garbageTable;
-	/** @var int */
-	public $lastUsed = 0;
+	protected int $nextSector = self::FIRST_SECTOR;
+	/**
+	 * @var RegionLocationTableEntry[]|null[]
+	 * @phpstan-var list<RegionLocationTableEntry|null>
+	 */
+	protected array $locationTable = [];
+	protected RegionGarbageMap $garbageTable;
+	public int $lastUsed;
 
 	/**
 	 * @throws CorruptedRegionException
 	 */
-	private function __construct(string $filePath){
-		$this->filePath = $filePath;
+	private function __construct(
+		protected string $filePath
+	){
 		$this->garbageTable = new RegionGarbageMap([]);
 		$this->lastUsed = time();
 
@@ -334,7 +330,6 @@ class RegionLoader{
 	 * @throws CorruptedRegionException
 	 */
 	private function checkLocationTableValidity() : void{
-		/** @var int[] $usedOffsets */
 		$usedOffsets = [];
 
 		$fileSize = filesize($this->filePath);
@@ -362,7 +357,7 @@ class RegionLoader{
 		}
 		ksort($usedOffsets, SORT_NUMERIC);
 		$prevLocationIndex = null;
-		foreach($usedOffsets as $startOffset => $locationTableIndex){
+		foreach($usedOffsets as $locationTableIndex){
 			if($this->locationTable[$locationTableIndex] === null){
 				continue;
 			}
diff --git a/src/world/format/io/region/RegionLocationTableEntry.php b/src/world/format/io/region/RegionLocationTableEntry.php
index abb92accf2..ad0b1ce487 100644
--- a/src/world/format/io/region/RegionLocationTableEntry.php
+++ b/src/world/format/io/region/RegionLocationTableEntry.php
@@ -27,6 +27,7 @@ use function range;
 
 class RegionLocationTableEntry{
 	private int $firstSector;
+	/** @phpstan-var positive-int */
 	private int $sectorCount;
 	private int $timestamp;
 
@@ -61,6 +62,9 @@ class RegionLocationTableEntry{
 		return range($this->getFirstSector(), $this->getLastSector());
 	}
 
+	/**
+	 * @phpstan-return positive-int
+	 */
 	public function getSectorCount() : int{
 		return $this->sectorCount;
 	}
diff --git a/src/world/format/io/region/RegionWorldProvider.php b/src/world/format/io/region/RegionWorldProvider.php
index 0efd50c4c7..75fcfd0832 100644
--- a/src/world/format/io/region/RegionWorldProvider.php
+++ b/src/world/format/io/region/RegionWorldProvider.php
@@ -28,9 +28,9 @@ use pocketmine\nbt\tag\ByteArrayTag;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\world\format\io\BaseWorldProvider;
-use pocketmine\world\format\io\ChunkData;
 use pocketmine\world\format\io\data\JavaWorldData;
 use pocketmine\world\format\io\exception\CorruptedChunkException;
+use pocketmine\world\format\io\LoadedChunkData;
 use pocketmine\world\format\io\WorldData;
 use Symfony\Component\Filesystem\Path;
 use function assert;
@@ -72,8 +72,11 @@ abstract class RegionWorldProvider extends BaseWorldProvider{
 		return false;
 	}
 
-	/** @var RegionLoader[] */
-	protected $regions = [];
+	/**
+	 * @var RegionLoader[]
+	 * @phpstan-var array<int, RegionLoader>
+	 */
+	protected array $regions = [];
 
 	protected function loadLevelData() : WorldData{
 		return new JavaWorldData(Path::join($this->getPath(), "level.dat"));
@@ -118,12 +121,11 @@ abstract class RegionWorldProvider extends BaseWorldProvider{
 			try{
 				$this->regions[$index] = RegionLoader::loadExisting($path);
 			}catch(CorruptedRegionException $e){
-				$logger = \GlobalLogger::get();
-				$logger->error("Corrupted region file detected: " . $e->getMessage());
+				$this->logger->error("Corrupted region file detected: " . $e->getMessage());
 
 				$backupPath = $path . ".bak." . time();
 				rename($path, $backupPath);
-				$logger->error("Corrupted region file has been backed up to " . $backupPath);
+				$this->logger->error("Corrupted region file has been backed up to " . $backupPath);
 
 				$this->regions[$index] = RegionLoader::createNew($path);
 			}
@@ -148,7 +150,7 @@ abstract class RegionWorldProvider extends BaseWorldProvider{
 	/**
 	 * @throws CorruptedChunkException
 	 */
-	abstract protected function deserializeChunk(string $data) : ?ChunkData;
+	abstract protected function deserializeChunk(string $data, \Logger $logger) : ?LoadedChunkData;
 
 	/**
 	 * @return CompoundTag[]
@@ -190,7 +192,7 @@ abstract class RegionWorldProvider extends BaseWorldProvider{
 	/**
 	 * @throws CorruptedChunkException
 	 */
-	public function loadChunk(int $chunkX, int $chunkZ) : ?ChunkData{
+	public function loadChunk(int $chunkX, int $chunkZ) : ?LoadedChunkData{
 		$regionX = $regionZ = null;
 		self::getRegionIndex($chunkX, $chunkZ, $regionX, $regionZ);
 		assert(is_int($regionX) && is_int($regionZ));
@@ -201,7 +203,7 @@ abstract class RegionWorldProvider extends BaseWorldProvider{
 
 		$chunkData = $this->loadRegion($regionX, $regionZ)->readChunk($chunkX & 0x1f, $chunkZ & 0x1f);
 		if($chunkData !== null){
-			return $this->deserializeChunk($chunkData);
+			return $this->deserializeChunk($chunkData, new \PrefixedLogger($this->logger, "Loading chunk x=$chunkX z=$chunkZ"));
 		}
 
 		return null;
diff --git a/src/world/format/io/region/WritableRegionWorldProvider.php b/src/world/format/io/region/WritableRegionWorldProvider.php
index 56cc2ff710..40353f5f9e 100644
--- a/src/world/format/io/region/WritableRegionWorldProvider.php
+++ b/src/world/format/io/region/WritableRegionWorldProvider.php
@@ -53,7 +53,7 @@ abstract class WritableRegionWorldProvider extends RegionWorldProvider implement
 
 	abstract protected function serializeChunk(ChunkData $chunk) : string;
 
-	public function saveChunk(int $chunkX, int $chunkZ, ChunkData $chunkData) : void{
+	public function saveChunk(int $chunkX, int $chunkZ, ChunkData $chunkData, int $dirtyFlags) : void{
 		self::getRegionIndex($chunkX, $chunkZ, $regionX, $regionZ);
 		$this->loadRegion($regionX, $regionZ)->writeChunk($chunkX & 0x1f, $chunkZ & 0x1f, $this->serializeChunk($chunkData));
 	}
diff --git a/src/world/generator/Flat.php b/src/world/generator/Flat.php
index 12dbc4bd0c..01efaff07c 100644
--- a/src/world/generator/Flat.php
+++ b/src/world/generator/Flat.php
@@ -25,7 +25,6 @@ namespace pocketmine\world\generator;
 
 use pocketmine\block\VanillaBlocks;
 use pocketmine\world\ChunkManager;
-use pocketmine\world\format\BiomeArray;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\format\SubChunk;
 use pocketmine\world\generator\object\OreType;
@@ -67,7 +66,7 @@ class Flat extends Generator{
 	}
 
 	protected function generateBaseChunk() : void{
-		$this->chunk = new Chunk([], BiomeArray::fill($this->options->getBiomeId()), false);
+		$this->chunk = new Chunk([], false);
 
 		$structure = $this->options->getStructure();
 		$count = count($structure);
@@ -78,7 +77,7 @@ class Flat extends Generator{
 
 				for($Z = 0; $Z < SubChunk::EDGE_LENGTH; ++$Z){
 					for($X = 0; $X < SubChunk::EDGE_LENGTH; ++$X){
-						$subchunk->setFullBlock($X, $y, $Z, $id);
+						$subchunk->setBlockStateId($X, $y, $Z, $id);
 					}
 				}
 			}
diff --git a/src/world/generator/FlatGeneratorOptions.php b/src/world/generator/FlatGeneratorOptions.php
index a47c979900..ab10c8a475 100644
--- a/src/world/generator/FlatGeneratorOptions.php
+++ b/src/world/generator/FlatGeneratorOptions.php
@@ -87,7 +87,7 @@ final class FlatGeneratorOptions{
 				throw new InvalidGeneratorOptionsException("Invalid preset layer \"$line\": " . $e->getMessage(), 0, $e);
 			}
 			for($cY = $y, $y += $cnt; $cY < $y; ++$cY){
-				$result[$cY] = $b->getFullId();
+				$result[$cY] = $b->getStateId();
 			}
 		}
 
diff --git a/src/world/generator/Generator.php b/src/world/generator/Generator.php
index 234fdea6a5..2104d8585d 100644
--- a/src/world/generator/Generator.php
+++ b/src/world/generator/Generator.php
@@ -48,17 +48,12 @@ abstract class Generator{
 		return $convertedSeed;
 	}
 
-	/** @var int */
-	protected $seed;
+	protected Random $random;
 
-	protected string $preset;
-
-	/** @var Random */
-	protected $random;
-
-	public function __construct(int $seed, string $preset){
-		$this->seed = $seed;
-		$this->preset = $preset;
+	public function __construct(
+		protected int $seed,
+		protected string $preset
+	){
 		$this->random = new Random($seed);
 	}
 
diff --git a/src/world/generator/GeneratorManager.php b/src/world/generator/GeneratorManager.php
index a00edd5591..291ea91de0 100644
--- a/src/world/generator/GeneratorManager.php
+++ b/src/world/generator/GeneratorManager.php
@@ -40,7 +40,7 @@ final class GeneratorManager{
 	private array $list = [];
 
 	public function __construct(){
-		$this->addGenerator(Flat::class, "flat", \Closure::fromCallable(function(string $preset) : ?InvalidGeneratorOptionsException{
+		$this->addGenerator(Flat::class, "flat", function(string $preset) : ?InvalidGeneratorOptionsException{
 			if($preset === ""){
 				return null;
 			}
@@ -50,11 +50,11 @@ final class GeneratorManager{
 			}catch(InvalidGeneratorOptionsException $e){
 				return $e;
 			}
-		}));
+		});
 		$this->addGenerator(Normal::class, "normal", fn() => null);
-		$this->addGenerator(Normal::class, "default", fn() => null);
-		$this->addGenerator(Nether::class, "hell", fn() => null);
+		$this->addAlias("normal", "default");
 		$this->addGenerator(Nether::class, "nether", fn() => null);
+		$this->addAlias("nether", "hell");
 	}
 
 	/**
@@ -80,6 +80,22 @@ final class GeneratorManager{
 		$this->list[$name] = new GeneratorManagerEntry($class, $presetValidator);
 	}
 
+	/**
+	 * Aliases an already-registered generator name to another name. Useful if you want to map a generator name to an
+	 * existing generator without having to replicate the parameters.
+	 */
+	public function addAlias(string $name, string $alias) : void{
+		$name = strtolower($name);
+		$alias = strtolower($alias);
+		if(!isset($this->list[$name])){
+			throw new \InvalidArgumentException("Alias \"$name\" is not assigned");
+		}
+		if(isset($this->list[$alias])){
+			throw new \InvalidArgumentException("Alias \"$alias\" is already assigned");
+		}
+		$this->list[$alias] = $this->list[$name];
+	}
+
 	/**
 	 * Returns a list of names for registered generators.
 	 *
diff --git a/src/world/generator/GeneratorRegisterTask.php b/src/world/generator/GeneratorRegisterTask.php
index 547cb0d32a..e2e773a35e 100644
--- a/src/world/generator/GeneratorRegisterTask.php
+++ b/src/world/generator/GeneratorRegisterTask.php
@@ -27,29 +27,19 @@ use pocketmine\scheduler\AsyncTask;
 use pocketmine\world\World;
 
 class GeneratorRegisterTask extends AsyncTask{
-
-	/**
-	 * @var string
-	 * @phpstan-var class-string<Generator>
-	 */
-	public $generatorClass;
-	/** @var string */
-	public $settings;
-	/** @var int */
-	public $seed;
-	/** @var int */
-	public $worldId;
-	/** @var int */
-	public $worldMinY;
-	/** @var int */
-	public $worldMaxY;
+	public int $seed;
+	public int $worldId;
+	public int $worldMinY;
+	public int $worldMaxY;
 
 	/**
 	 * @phpstan-param class-string<Generator> $generatorClass
 	 */
-	public function __construct(World $world, string $generatorClass, string $generatorSettings){
-		$this->generatorClass = $generatorClass;
-		$this->settings = $generatorSettings;
+	public function __construct(
+		World $world,
+		public string $generatorClass,
+		public string $generatorSettings
+	){
 		$this->seed = $world->getSeed();
 		$this->worldId = $world->getId();
 		$this->worldMinY = $world->getMinY();
@@ -61,7 +51,7 @@ class GeneratorRegisterTask extends AsyncTask{
 		 * @var Generator $generator
 		 * @see Generator::__construct()
 		 */
-		$generator = new $this->generatorClass($this->seed, $this->settings);
+		$generator = new $this->generatorClass($this->seed, $this->generatorSettings);
 		ThreadLocalGeneratorContext::register(new ThreadLocalGeneratorContext($generator, $this->worldMinY, $this->worldMaxY), $this->worldId);
 	}
 }
diff --git a/src/world/generator/GeneratorUnregisterTask.php b/src/world/generator/GeneratorUnregisterTask.php
index 2ad9ae52b6..41b4cd8082 100644
--- a/src/world/generator/GeneratorUnregisterTask.php
+++ b/src/world/generator/GeneratorUnregisterTask.php
@@ -27,9 +27,7 @@ use pocketmine\scheduler\AsyncTask;
 use pocketmine\world\World;
 
 class GeneratorUnregisterTask extends AsyncTask{
-
-	/** @var int */
-	public $worldId;
+	public int $worldId;
 
 	public function __construct(World $world){
 		$this->worldId = $world->getId();
diff --git a/src/world/generator/PopulationTask.php b/src/world/generator/PopulationTask.php
index b2e3d610c1..bad1343240 100644
--- a/src/world/generator/PopulationTask.php
+++ b/src/world/generator/PopulationTask.php
@@ -23,10 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\world\generator;
 
-use pocketmine\data\bedrock\BiomeIds;
 use pocketmine\scheduler\AsyncTask;
 use pocketmine\utils\AssumptionFailedError;
-use pocketmine\world\format\BiomeArray;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\format\io\FastChunkSerializer;
 use pocketmine\world\SimpleChunkManager;
@@ -78,16 +76,25 @@ class PopulationTask extends AsyncTask{
 
 		$chunk = $this->chunk !== null ? FastChunkSerializer::deserializeTerrain($this->chunk) : null;
 
-		/** @var string[] $serialChunks */
+		/**
+		 * @var string[] $serialChunks
+		 * @phpstan-var array<int, string|null> $serialChunks
+		 */
 		$serialChunks = igbinary_unserialize($this->adjacentChunks);
 		$chunks = array_map(
-			fn(?string $serialized) => $serialized !== null ? FastChunkSerializer::deserializeTerrain($serialized) : null,
+			function(?string $serialized) : ?Chunk{
+				if($serialized === null){
+					return null;
+				}
+				$chunk = FastChunkSerializer::deserializeTerrain($serialized);
+				$chunk->clearTerrainDirtyFlags(); //this allows us to avoid sending existing chunks back to the main thread if they haven't changed during generation
+				return $chunk;
+			},
 			$serialChunks
 		);
 
 		self::setOrGenerateChunk($manager, $generator, $this->chunkX, $this->chunkZ, $chunk);
 
-		/** @var Chunk[] $resultChunks */
 		$resultChunks = []; //this is just to keep phpstan's type inference happy
 		foreach($chunks as $relativeChunkHash => $c){
 			World::getXZ($relativeChunkHash, $relativeX, $relativeZ);
@@ -112,15 +119,13 @@ class PopulationTask extends AsyncTask{
 	}
 
 	private static function setOrGenerateChunk(SimpleChunkManager $manager, Generator $generator, int $chunkX, int $chunkZ, ?Chunk $chunk) : Chunk{
-		$manager->setChunk($chunkX, $chunkZ, $chunk ?? new Chunk([], BiomeArray::fill(BiomeIds::OCEAN), false));
+		$manager->setChunk($chunkX, $chunkZ, $chunk ?? new Chunk([], false));
 		if($chunk === null){
 			$generator->generateChunk($manager, $chunkX, $chunkZ);
 			$chunk = $manager->getChunk($chunkX, $chunkZ);
 			if($chunk === null){
 				throw new AssumptionFailedError("We just set this chunk, so it must exist");
 			}
-			$chunk->setTerrainDirtyFlag(Chunk::DIRTY_FLAG_BLOCKS, true);
-			$chunk->setTerrainDirtyFlag(Chunk::DIRTY_FLAG_BIOMES, true);
 		}
 		return $chunk;
 	}
diff --git a/src/world/generator/hell/Nether.php b/src/world/generator/hell/Nether.php
index 8e75b0d3bf..e12e03eb51 100644
--- a/src/world/generator/hell/Nether.php
+++ b/src/world/generator/hell/Nether.php
@@ -34,6 +34,7 @@ use pocketmine\world\generator\noise\Simplex;
 use pocketmine\world\generator\object\OreType;
 use pocketmine\world\generator\populator\Ore;
 use pocketmine\world\generator\populator\Populator;
+use pocketmine\world\World;
 use function abs;
 
 class Nether extends Generator{
@@ -70,28 +71,31 @@ class Nether extends Generator{
 
 		$noise = $this->noiseBase->getFastNoise3D(Chunk::EDGE_LENGTH, 128, Chunk::EDGE_LENGTH, 4, 8, 4, $chunkX * Chunk::EDGE_LENGTH, 0, $chunkZ * Chunk::EDGE_LENGTH);
 
-		$chunk = $world->getChunk($chunkX, $chunkZ);
+		//TODO: why don't we just create and set the chunk here directly?
+		$chunk = $world->getChunk($chunkX, $chunkZ) ?? throw new \InvalidArgumentException("Chunk $chunkX $chunkZ does not yet exist");
 
-		$bedrock = VanillaBlocks::BEDROCK()->getFullId();
-		$netherrack = VanillaBlocks::NETHERRACK()->getFullId();
-		$stillLava = VanillaBlocks::LAVA()->getFullId();
+		$bedrock = VanillaBlocks::BEDROCK()->getStateId();
+		$netherrack = VanillaBlocks::NETHERRACK()->getStateId();
+		$stillLava = VanillaBlocks::LAVA()->getStateId();
 
 		for($x = 0; $x < Chunk::EDGE_LENGTH; ++$x){
 			for($z = 0; $z < Chunk::EDGE_LENGTH; ++$z){
-				$chunk->setBiomeId($x, $z, BiomeIds::HELL);
+				for($y = World::Y_MIN; $y < World::Y_MAX; $y++){
+					$chunk->setBiomeId($x, $y, $z, BiomeIds::HELL);
+				}
 
 				for($y = 0; $y < 128; ++$y){
 					if($y === 0 || $y === 127){
-						$chunk->setFullBlock($x, $y, $z, $bedrock);
+						$chunk->setBlockStateId($x, $y, $z, $bedrock);
 						continue;
 					}
 					$noiseValue = (abs($this->emptyHeight - $y) / $this->emptyHeight) * $this->emptyAmplitude - $noise[$x][$z][$y];
 					$noiseValue -= 1 - $this->density;
 
 					if($noiseValue > 0){
-						$chunk->setFullBlock($x, $y, $z, $netherrack);
+						$chunk->setBlockStateId($x, $y, $z, $netherrack);
 					}elseif($y <= $this->waterHeight){
-						$chunk->setFullBlock($x, $y, $z, $stillLava);
+						$chunk->setBlockStateId($x, $y, $z, $stillLava);
 					}
 				}
 			}
@@ -109,7 +113,7 @@ class Nether extends Generator{
 		}
 
 		$chunk = $world->getChunk($chunkX, $chunkZ);
-		$biome = BiomeRegistry::getInstance()->getBiome($chunk->getBiomeId(7, 7));
+		$biome = BiomeRegistry::getInstance()->getBiome($chunk->getBiomeId(7, 7, 7));
 		$biome->populateChunk($world, $chunkX, $chunkZ, $this->random);
 	}
 }
diff --git a/src/world/generator/noise/Noise.php b/src/world/generator/noise/Noise.php
index 31d743dc19..d91a58350a 100644
--- a/src/world/generator/noise/Noise.php
+++ b/src/world/generator/noise/Noise.php
@@ -111,18 +111,11 @@ abstract class Noise{
 		);
 	}
 
-	/** @var float */
-	protected $persistence;
-	/** @var float */
-	protected $expansion;
-	/** @var int */
-	protected $octaves;
-
-	public function __construct(int $octaves, float $persistence, float $expansion){
-		$this->octaves = $octaves;
-		$this->persistence = $persistence;
-		$this->expansion = $expansion;
-	}
+	public function __construct(
+		protected int $octaves,
+		protected float $persistence,
+		protected float $expansion
+	){}
 
 	/**
 	 * @param float $x
@@ -215,6 +208,7 @@ abstract class Noise{
 			throw new \InvalidArgumentException("xSize % samplingRate must return 0");
 		}
 
+		/** @phpstan-var \SplFixedArray<float> $noiseArray */
 		$noiseArray = new \SplFixedArray($xSize + 1);
 
 		for($xx = 0; $xx <= $xSize; $xx += $samplingRate){
@@ -224,7 +218,13 @@ abstract class Noise{
 		for($xx = 0; $xx < $xSize; ++$xx){
 			if($xx % $samplingRate !== 0){
 				$nx = (int) ($xx / $samplingRate) * $samplingRate;
-				$noiseArray[$xx] = self::linearLerp($xx, $nx, $nx + $samplingRate, $noiseArray[$nx], $noiseArray[$nx + $samplingRate]);
+				$noiseArray[$xx] = self::linearLerp(
+					x: $xx,
+					x1: $nx,
+					x2: $nx + $samplingRate,
+					q0: $noiseArray[$nx],
+					q1: $noiseArray[$nx + $samplingRate]
+				);
 			}
 		}
 
@@ -241,6 +241,7 @@ abstract class Noise{
 		assert($xSize % $samplingRate === 0, new \InvalidArgumentException("xSize % samplingRate must return 0"));
 		assert($zSize % $samplingRate === 0, new \InvalidArgumentException("zSize % samplingRate must return 0"));
 
+		/** @phpstan-var \SplFixedArray<\SplFixedArray<float>> $noiseArray */
 		$noiseArray = new \SplFixedArray($xSize + 1);
 
 		for($xx = 0; $xx <= $xSize; $xx += $samplingRate){
@@ -260,9 +261,16 @@ abstract class Noise{
 					$nx = (int) ($xx / $samplingRate) * $samplingRate;
 					$nz = (int) ($zz / $samplingRate) * $samplingRate;
 					$noiseArray[$xx][$zz] = Noise::bilinearLerp(
-						$xx, $zz, $noiseArray[$nx][$nz], $noiseArray[$nx][$nz + $samplingRate],
-						$noiseArray[$nx + $samplingRate][$nz], $noiseArray[$nx + $samplingRate][$nz + $samplingRate],
-						$nx, $nx + $samplingRate, $nz, $nz + $samplingRate
+						x: $xx,
+						y: $zz,
+						q00: $noiseArray[$nx][$nz],
+						q01: $noiseArray[$nx][$nz + $samplingRate],
+						q10: $noiseArray[$nx + $samplingRate][$nz],
+						q11: $noiseArray[$nx + $samplingRate][$nz + $samplingRate],
+						x1: $nx,
+						x2: $nx + $samplingRate,
+						y1: $nz,
+						y2: $nz + $samplingRate
 					);
 				}
 			}
diff --git a/src/world/generator/noise/Simplex.php b/src/world/generator/noise/Simplex.php
index 7d8953a8be..9707775b43 100644
--- a/src/world/generator/noise/Simplex.php
+++ b/src/world/generator/noise/Simplex.php
@@ -46,14 +46,11 @@ class Simplex extends Noise{
 	protected const F3 = 1.0 / 3.0;
 	protected const G3 = 1.0 / 6.0;
 
-	/** @var float */
-	protected $offsetX;
-	/** @var float */
-	protected $offsetZ;
-	/** @var float */
-	protected $offsetY;
+	protected float $offsetX;
+	protected float $offsetZ;
+	protected float $offsetY;
 	/** @var int[] */
-	protected $perm = [];
+	protected array $perm = [];
 
 	public function __construct(Random $random, int $octaves, float $persistence, float $expansion){
 		parent::__construct($octaves, $persistence, $expansion);
diff --git a/src/world/generator/normal/Normal.php b/src/world/generator/normal/Normal.php
index 0e520c8aed..1d4805e165 100644
--- a/src/world/generator/normal/Normal.php
+++ b/src/world/generator/normal/Normal.php
@@ -141,13 +141,14 @@ class Normal extends Generator{
 
 		$noise = $this->noiseBase->getFastNoise3D(Chunk::EDGE_LENGTH, 128, Chunk::EDGE_LENGTH, 4, 8, 4, $chunkX * Chunk::EDGE_LENGTH, 0, $chunkZ * Chunk::EDGE_LENGTH);
 
-		$chunk = $world->getChunk($chunkX, $chunkZ);
+		//TODO: why don't we just create and set the chunk here directly?
+		$chunk = $world->getChunk($chunkX, $chunkZ) ?? throw new \InvalidArgumentException("Chunk $chunkX $chunkZ does not yet exist");
 
 		$biomeCache = [];
 
-		$bedrock = VanillaBlocks::BEDROCK()->getFullId();
-		$stillWater = VanillaBlocks::WATER()->getFullId();
-		$stone = VanillaBlocks::STONE()->getFullId();
+		$bedrock = VanillaBlocks::BEDROCK()->getStateId();
+		$stillWater = VanillaBlocks::WATER()->getStateId();
+		$stone = VanillaBlocks::STONE()->getStateId();
 
 		$baseX = $chunkX * Chunk::EDGE_LENGTH;
 		$baseZ = $chunkZ * Chunk::EDGE_LENGTH;
@@ -160,7 +161,9 @@ class Normal extends Generator{
 				$weightSum = 0;
 
 				$biome = $this->pickBiome($absoluteX, $absoluteZ);
-				$chunk->setBiomeId($x, $z, $biome->getId());
+				for($y = World::Y_MIN; $y < World::Y_MAX; $y++){
+					$chunk->setBiomeId($x, $y, $z, $biome->getId());
+				}
 
 				for($sx = -$this->gaussian->smoothSize; $sx <= $this->gaussian->smoothSize; ++$sx){
 					for($sz = -$this->gaussian->smoothSize; $sz <= $this->gaussian->smoothSize; ++$sz){
@@ -192,15 +195,15 @@ class Normal extends Generator{
 
 				for($y = 0; $y < 128; ++$y){
 					if($y === 0){
-						$chunk->setFullBlock($x, $y, $z, $bedrock);
+						$chunk->setBlockStateId($x, $y, $z, $bedrock);
 						continue;
 					}
 					$noiseValue = $noise[$x][$z][$y] - 1 / $smoothHeight * ($y - $smoothHeight - $minSum);
 
 					if($noiseValue > 0){
-						$chunk->setFullBlock($x, $y, $z, $stone);
+						$chunk->setBlockStateId($x, $y, $z, $stone);
 					}elseif($y <= $this->waterHeight){
-						$chunk->setFullBlock($x, $y, $z, $stillWater);
+						$chunk->setBlockStateId($x, $y, $z, $stillWater);
 					}
 				}
 			}
@@ -218,7 +221,7 @@ class Normal extends Generator{
 		}
 
 		$chunk = $world->getChunk($chunkX, $chunkZ);
-		$biome = BiomeRegistry::getInstance()->getBiome($chunk->getBiomeId(7, 7));
+		$biome = BiomeRegistry::getInstance()->getBiome($chunk->getBiomeId(7, 7, 7));
 		$biome->populateChunk($world, $chunkX, $chunkZ, $this->random);
 	}
 }
diff --git a/src/world/generator/object/AcaciaTree.php b/src/world/generator/object/AcaciaTree.php
new file mode 100644
index 0000000000..75e58a9b35
--- /dev/null
+++ b/src/world/generator/object/AcaciaTree.php
@@ -0,0 +1,132 @@
+<?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\generator\object;
+
+use pocketmine\block\VanillaBlocks;
+use pocketmine\math\Facing;
+use pocketmine\math\Vector3;
+use pocketmine\utils\Random;
+use pocketmine\world\BlockTransaction;
+use function abs;
+use function array_rand;
+
+final class AcaciaTree extends Tree{
+	private const MIN_HEIGHT = 5;
+
+	private ?Vector3 $mainBranchTip = null;
+	private ?Vector3 $secondBranchTip = null;
+
+	public function __construct(){
+		parent::__construct(
+			VanillaBlocks::ACACIA_LOG(),
+			VanillaBlocks::ACACIA_LEAVES(),
+			0 //we don't use this anyway - everything is overridden
+		);
+	}
+
+	protected function generateTrunkHeight(Random $random) : int{
+		//50% chance of 2 extra blocks, 33% chance 1 or 3, 17% chance 0 or 4
+		return self::MIN_HEIGHT + $random->nextRange(0, 2) + $random->nextRange(0, 2);
+	}
+
+	protected function placeTrunk(int $x, int $y, int $z, Random $random, int $trunkHeight, BlockTransaction $transaction) : void{
+		// The base dirt block
+		$transaction->addBlockAt($x, $y - 1, $z, VanillaBlocks::DIRT());
+
+		$firstBranchHeight = $trunkHeight - 1 - $random->nextRange(0, 3);
+
+		for($yy = 0; $yy <= $firstBranchHeight; ++$yy){
+			$transaction->addBlockAt($x, $y + $yy, $z, $this->trunkBlock);
+		}
+
+		$mainBranchFacing = Facing::HORIZONTAL[array_rand(Facing::HORIZONTAL)];
+
+		//this branch may grow a second trunk if the diagonal length is less than the max length
+		$this->mainBranchTip = $this->placeBranch(
+			$transaction,
+			new Vector3($x, $y + $firstBranchHeight, $z),
+			$mainBranchFacing,
+			$random->nextRange(1, 3),
+			$trunkHeight - $firstBranchHeight
+		);
+
+		$secondBranchFacing = Facing::HORIZONTAL[array_rand(Facing::HORIZONTAL)];
+		if($secondBranchFacing !== $mainBranchFacing){
+			$secondBranchLength = $random->nextRange(1, 3);
+			$this->secondBranchTip = $this->placeBranch(
+				$transaction,
+				new Vector3($x, $y + ($firstBranchHeight - $random->nextRange(0, 1)), $z),
+				$secondBranchFacing,
+				$secondBranchLength,
+				$secondBranchLength //the secondary branch may not form a second trunk
+			);
+		}
+	}
+
+	protected function placeBranch(BlockTransaction $transaction, Vector3 $start, int $branchFacing, int $maxDiagonal, int $length) : Vector3{
+		$diagonalPlaced = 0;
+
+		$nextBlockPos = $start;
+		for($yy = 0; $yy < $length; $yy++){
+			$nextBlockPos = $nextBlockPos->up();
+			if($diagonalPlaced < $maxDiagonal){
+				$nextBlockPos = $nextBlockPos->getSide($branchFacing);
+				$diagonalPlaced++;
+			}
+			$transaction->addBlock($nextBlockPos, $this->trunkBlock);
+		}
+
+		return $nextBlockPos;
+	}
+
+	protected function placeCanopyLayer(BlockTransaction $transaction, Vector3 $center, int $radius, int $maxTaxicabDistance) : void{
+		$centerX = $center->getFloorX();
+		$centerY = $center->getFloorY();
+		$centerZ = $center->getFloorZ();
+
+		for($x = $centerX - $radius; $x <= $centerX + $radius; ++$x){
+			for($z = $centerZ - $radius; $z <= $centerZ + $radius; ++$z){
+				if(
+					abs($x - $centerX) + abs($z - $centerZ) <= $maxTaxicabDistance &&
+					$transaction->fetchBlockAt($x, $centerY, $z)->canBeReplaced()
+				){
+					$transaction->addBlockAt($x, $centerY, $z, $this->leafBlock);
+				}
+			}
+		}
+	}
+
+	protected function placeCanopy(int $x, int $y, int $z, Random $random, BlockTransaction $transaction) : void{
+		$mainBranchTip = $this->mainBranchTip;
+		if($mainBranchTip !== null){
+			$this->placeCanopyLayer($transaction, $mainBranchTip, radius: 3, maxTaxicabDistance: 5);
+			$this->placeCanopyLayer($transaction, $mainBranchTip->up(), radius: 2, maxTaxicabDistance: 2);
+		}
+		$secondBranchTip = $this->secondBranchTip;
+		if($secondBranchTip !== null){
+			$this->placeCanopyLayer($transaction, $secondBranchTip, radius: 2, maxTaxicabDistance: 3);
+			$this->placeCanopyLayer($transaction, $secondBranchTip->up(), radius: 1, maxTaxicabDistance: 2);
+		}
+	}
+}
diff --git a/src/world/generator/object/BirchTree.php b/src/world/generator/object/BirchTree.php
index 671ebe3a4b..ad4ac05e18 100644
--- a/src/world/generator/object/BirchTree.php
+++ b/src/world/generator/object/BirchTree.php
@@ -29,12 +29,10 @@ use pocketmine\world\BlockTransaction;
 use pocketmine\world\ChunkManager;
 
 class BirchTree extends Tree{
-	/** @var bool */
-	protected $superBirch = false;
-
-	public function __construct(bool $superBirch = false){
+	public function __construct(
+		protected bool $superBirch = false
+	){
 		parent::__construct(VanillaBlocks::BIRCH_LOG(), VanillaBlocks::BIRCH_LEAVES());
-		$this->superBirch = $superBirch;
 	}
 
 	public function getBlockTransaction(ChunkManager $world, int $x, int $y, int $z, Random $random) : ?BlockTransaction{
diff --git a/src/world/generator/object/Ore.php b/src/world/generator/object/Ore.php
index ac7e6f0fc1..533b731752 100644
--- a/src/world/generator/object/Ore.php
+++ b/src/world/generator/object/Ore.php
@@ -30,21 +30,17 @@ use function sin;
 use const M_PI;
 
 class Ore{
-	private Random $random;
-	/** @var OreType */
-	public $type;
-
-	public function __construct(Random $random, OreType $type){
-		$this->type = $type;
-		$this->random = $random;
-	}
+	public function __construct(
+		private Random $random,
+		public OreType $type
+	){}
 
 	public function getType() : OreType{
 		return $this->type;
 	}
 
 	public function canPlaceObject(ChunkManager $world, int $x, int $y, int $z) : bool{
-		return $world->getBlockAt($x, $y, $z)->isSameType($this->type->replaces);
+		return $world->getBlockAt($x, $y, $z)->hasSameTypeId($this->type->replaces);
 	}
 
 	public function placeObject(ChunkManager $world, int $x, int $y, int $z) : void{
@@ -84,7 +80,7 @@ class Ore{
 								$sizeZ = ($zz + 0.5 - $seedZ) / $size;
 								$sizeZ *= $sizeZ;
 
-								if(($sizeX + $sizeY + $sizeZ) < 1 && $world->getBlockAt($xx, $yy, $zz)->isSameType($this->type->replaces)){
+								if(($sizeX + $sizeY + $sizeZ) < 1 && $world->getBlockAt($xx, $yy, $zz)->hasSameTypeId($this->type->replaces)){
 									$world->setBlockAt($xx, $yy, $zz, $this->type->material);
 								}
 							}
diff --git a/src/world/generator/object/TallGrass.php b/src/world/generator/object/TallGrass.php
index 5de9ec3de8..a3b2d8bcdf 100644
--- a/src/world/generator/object/TallGrass.php
+++ b/src/world/generator/object/TallGrass.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\world\generator\object;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockLegacyIds;
+use pocketmine\block\BlockTypeIds;
 use pocketmine\block\VanillaBlocks;
 use pocketmine\math\Vector3;
 use pocketmine\utils\Random;
@@ -47,7 +47,7 @@ class TallGrass{
 		for($c = 0; $c < $count; ++$c){
 			$x = $random->nextRange($pos->x - $radius, $pos->x + $radius);
 			$z = $random->nextRange($pos->z - $radius, $pos->z + $radius);
-			if($world->getBlockAt($x, $pos->y + 1, $z)->getId() === BlockLegacyIds::AIR && $world->getBlockAt($x, $pos->y, $z)->getId() === BlockLegacyIds::GRASS){
+			if($world->getBlockAt($x, $pos->y + 1, $z)->getTypeId() === BlockTypeIds::AIR && $world->getBlockAt($x, $pos->y, $z)->getTypeId() === BlockTypeIds::GRASS){
 				$world->setBlockAt($x, $pos->y + 1, $z, $arr[$random->nextRange(0, $arrC)]);
 			}
 		}
diff --git a/src/world/generator/object/Tree.php b/src/world/generator/object/Tree.php
index 397f2aca38..c25481694d 100644
--- a/src/world/generator/object/Tree.php
+++ b/src/world/generator/object/Tree.php
@@ -33,20 +33,11 @@ use pocketmine\world\ChunkManager;
 use function abs;
 
 abstract class Tree{
-	/** @var Block */
-	protected $trunkBlock;
-	/** @var Block */
-	protected $leafBlock;
-
-	/** @var int */
-	protected $treeHeight;
-
-	public function __construct(Block $trunkBlock, Block $leafBlock, int $treeHeight = 7){
-		$this->trunkBlock = $trunkBlock;
-		$this->leafBlock = $leafBlock;
-
-		$this->treeHeight = $treeHeight;
-	}
+	public function __construct(
+		protected Block $trunkBlock,
+		protected Block $leafBlock,
+		protected int $treeHeight = 7
+	){}
 
 	public function canPlaceObject(ChunkManager $world, int $x, int $y, int $z, Random $random) : bool{
 		$radiusToCheck = 0;
diff --git a/src/world/generator/object/TreeFactory.php b/src/world/generator/object/TreeFactory.php
index 741ceacf91..d1f3dbebb3 100644
--- a/src/world/generator/object/TreeFactory.php
+++ b/src/world/generator/object/TreeFactory.php
@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\world\generator\object;
 
-use pocketmine\block\utils\TreeType;
 use pocketmine\utils\Random;
 
 final class TreeFactory{
@@ -32,25 +31,13 @@ final class TreeFactory{
 	 * @param TreeType|null $type default oak
 	 */
 	public static function get(Random $random, ?TreeType $type = null) : ?Tree{
-		$type = $type ?? TreeType::OAK();
-		if($type->equals(TreeType::SPRUCE())){
-			return new SpruceTree();
-		}elseif($type->equals(TreeType::BIRCH())){
-			if($random->nextBoundedInt(39) === 0){
-				return new BirchTree(true);
-			}else{
-				return new BirchTree();
-			}
-		}elseif($type->equals(TreeType::JUNGLE())){
-			return new JungleTree();
-		}elseif($type->equals(TreeType::OAK())){ //default
-			return new OakTree();
-			/*if($random->nextRange(0, 9) === 0){
-				$tree = new BigTree();
-			}else{*/
-
-			//}
-		}
-		return null;
+		return match($type){
+			null, TreeType::OAK => new OakTree(), //TODO: big oak has a 1/10 chance
+			TreeType::SPRUCE => new SpruceTree(),
+			TreeType::JUNGLE => new JungleTree(),
+			TreeType::ACACIA => new AcaciaTree(),
+			TreeType::BIRCH => new BirchTree($random->nextBoundedInt(39) === 0),
+			default => null,
+		};
 	}
 }
diff --git a/src/world/generator/object/TreeType.php b/src/world/generator/object/TreeType.php
new file mode 100644
index 0000000000..d4d62946a5
--- /dev/null
+++ b/src/world/generator/object/TreeType.php
@@ -0,0 +1,62 @@
+<?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\generator\object;
+
+use pocketmine\utils\LegacyEnumShimTrait;
+
+/**
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
+ *
+ * @method static TreeType ACACIA()
+ * @method static TreeType BIRCH()
+ * @method static TreeType DARK_OAK()
+ * @method static TreeType JUNGLE()
+ * @method static TreeType OAK()
+ * @method static TreeType SPRUCE()
+ */
+enum TreeType{
+	use LegacyEnumShimTrait;
+
+	case OAK;
+	case SPRUCE;
+	case BIRCH;
+	case JUNGLE;
+	case ACACIA;
+	case DARK_OAK;
+	//TODO: cherry blossom, mangrove, azalea
+	//TODO: do crimson and warped "trees" belong here? I'm not sure if they're actually trees or just fungi
+	//TODO: perhaps huge mushrooms should be here too???
+
+	public function getDisplayName() : string{
+		return match($this){
+			self::OAK => "Oak",
+			self::SPRUCE => "Spruce",
+			self::BIRCH => "Birch",
+			self::JUNGLE => "Jungle",
+			self::ACACIA => "Acacia",
+			self::DARK_OAK => "Dark Oak",
+		};
+	}
+}
diff --git a/src/world/generator/populator/GroundCover.php b/src/world/generator/populator/GroundCover.php
index 0095aa64f6..6af3e657ca 100644
--- a/src/world/generator/populator/GroundCover.php
+++ b/src/world/generator/populator/GroundCover.php
@@ -23,9 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\world\generator\populator;
 
-use pocketmine\block\BlockFactory;
-use pocketmine\block\BlockLegacyIds;
+use pocketmine\block\BlockTypeIds;
 use pocketmine\block\Liquid;
+use pocketmine\block\RuntimeBlockStateRegistry;
 use pocketmine\utils\Random;
 use pocketmine\world\biome\BiomeRegistry;
 use pocketmine\world\ChunkManager;
@@ -36,12 +36,12 @@ use function min;
 class GroundCover implements Populator{
 
 	public function populate(ChunkManager $world, int $chunkX, int $chunkZ, Random $random) : void{
-		$chunk = $world->getChunk($chunkX, $chunkZ);
-		$factory = BlockFactory::getInstance();
+		$chunk = $world->getChunk($chunkX, $chunkZ) ?? throw new \InvalidArgumentException("Chunk $chunkX $chunkZ does not yet exist");
+		$factory = RuntimeBlockStateRegistry::getInstance();
 		$biomeRegistry = BiomeRegistry::getInstance();
 		for($x = 0; $x < Chunk::EDGE_LENGTH; ++$x){
 			for($z = 0; $z < Chunk::EDGE_LENGTH; ++$z){
-				$biome = $biomeRegistry->getBiome($chunk->getBiomeId($x, $z));
+				$biome = $biomeRegistry->getBiome($chunk->getBiomeId($x, 0, $z));
 				$cover = $biome->getGroundCover();
 				if(count($cover) > 0){
 					$diffY = 0;
@@ -51,7 +51,7 @@ class GroundCover implements Populator{
 
 					$startY = 127;
 					for(; $startY > 0; --$startY){
-						if(!$factory->fromFullBlock($chunk->getFullBlock($x, $startY, $z))->isTransparent()){
+						if(!$factory->fromStateId($chunk->getBlockStateId($x, $startY, $z))->isTransparent()){
 							break;
 						}
 					}
@@ -59,15 +59,15 @@ class GroundCover implements Populator{
 					$endY = $startY - count($cover);
 					for($y = $startY; $y > $endY && $y >= 0; --$y){
 						$b = $cover[$startY - $y];
-						$id = $factory->fromFullBlock($chunk->getFullBlock($x, $y, $z));
-						if($id->getId() === BlockLegacyIds::AIR && $b->isSolid()){
+						$id = $factory->fromStateId($chunk->getBlockStateId($x, $y, $z));
+						if($id->getTypeId() === BlockTypeIds::AIR && $b->isSolid()){
 							break;
 						}
 						if($b->canBeFlowedInto() && $id instanceof Liquid){
 							continue;
 						}
 
-						$chunk->setFullBlock($x, $y, $z, $b->getFullId());
+						$chunk->setBlockStateId($x, $y, $z, $b->getStateId());
 					}
 				}
 			}
diff --git a/src/world/generator/populator/TallGrass.php b/src/world/generator/populator/TallGrass.php
index 59d9f6a44d..989578c81a 100644
--- a/src/world/generator/populator/TallGrass.php
+++ b/src/world/generator/populator/TallGrass.php
@@ -23,7 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\world\generator\populator;
 
-use pocketmine\block\BlockLegacyIds;
+use pocketmine\block\BlockTypeIds;
+use pocketmine\block\Leaves;
 use pocketmine\block\VanillaBlocks;
 use pocketmine\utils\Random;
 use pocketmine\world\ChunkManager;
@@ -57,14 +58,14 @@ class TallGrass implements Populator{
 	}
 
 	private function canTallGrassStay(ChunkManager $world, int $x, int $y, int $z) : bool{
-		$b = $world->getBlockAt($x, $y, $z)->getId();
-		return ($b === BlockLegacyIds::AIR || $b === BlockLegacyIds::SNOW_LAYER) && $world->getBlockAt($x, $y - 1, $z)->getId() === BlockLegacyIds::GRASS;
+		$b = $world->getBlockAt($x, $y, $z)->getTypeId();
+		return ($b === BlockTypeIds::AIR || $b === BlockTypeIds::SNOW_LAYER) && $world->getBlockAt($x, $y - 1, $z)->getTypeId() === BlockTypeIds::GRASS;
 	}
 
 	private function getHighestWorkableBlock(ChunkManager $world, int $x, int $z) : int{
 		for($y = 127; $y >= 0; --$y){
-			$b = $world->getBlockAt($x, $y, $z)->getId();
-			if($b !== BlockLegacyIds::AIR && $b !== BlockLegacyIds::LEAVES && $b !== BlockLegacyIds::LEAVES2 && $b !== BlockLegacyIds::SNOW_LAYER){
+			$b = $world->getBlockAt($x, $y, $z);
+			if($b->getTypeId() !== BlockTypeIds::AIR && !($b instanceof Leaves) && $b->getTypeId() !== BlockTypeIds::SNOW_LAYER){
 				return $y + 1;
 			}
 		}
diff --git a/src/world/generator/populator/Tree.php b/src/world/generator/populator/Tree.php
index 7cd1d14a6f..e470c46f0b 100644
--- a/src/world/generator/populator/Tree.php
+++ b/src/world/generator/populator/Tree.php
@@ -23,12 +23,13 @@ declare(strict_types=1);
 
 namespace pocketmine\world\generator\populator;
 
-use pocketmine\block\BlockLegacyIds;
-use pocketmine\block\utils\TreeType;
+use pocketmine\block\BlockTypeIds;
+use pocketmine\block\BlockTypeTags;
 use pocketmine\utils\Random;
 use pocketmine\world\ChunkManager;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\generator\object\TreeFactory;
+use pocketmine\world\generator\object\TreeType;
 
 class Tree implements Populator{
 	private int $randomAmount = 1;
@@ -39,7 +40,7 @@ class Tree implements Populator{
 	 * @param TreeType|null $type default oak
 	 */
 	public function __construct(?TreeType $type = null){
-		$this->type = $type ?? TreeType::OAK();
+		$this->type = $type ?? TreeType::OAK;
 	}
 
 	public function setRandomAmount(int $amount) : void{
@@ -67,10 +68,10 @@ class Tree implements Populator{
 
 	private function getHighestWorkableBlock(ChunkManager $world, int $x, int $z) : int{
 		for($y = 127; $y >= 0; --$y){
-			$b = $world->getBlockAt($x, $y, $z)->getId();
-			if($b === BlockLegacyIds::DIRT || $b === BlockLegacyIds::GRASS){
+			$b = $world->getBlockAt($x, $y, $z);
+			if($b->hasTypeTag(BlockTypeTags::DIRT) || $b->hasTypeTag(BlockTypeTags::MUD)){
 				return $y + 1;
-			}elseif($b !== BlockLegacyIds::AIR && $b !== BlockLegacyIds::SNOW_LAYER){
+			}elseif($b->getTypeId() !== BlockTypeIds::AIR && $b->getTypeId() !== BlockTypeIds::SNOW_LAYER){
 				return -1;
 			}
 		}
diff --git a/src/world/light/BlockLightUpdate.php b/src/world/light/BlockLightUpdate.php
index 3e5ae01d6c..b7e0aa9e30 100644
--- a/src/world/light/BlockLightUpdate.php
+++ b/src/world/light/BlockLightUpdate.php
@@ -31,15 +31,15 @@ use function max;
 
 class BlockLightUpdate extends LightUpdate{
 	/**
-	 * @param \SplFixedArray|int[] $lightFilters
-	 * @param \SplFixedArray|int[] $lightEmitters
-	 * @phpstan-param \SplFixedArray<int> $lightFilters
-	 * @phpstan-param \SplFixedArray<int> $lightEmitters
+	 * @param int[] $lightFilters
+	 * @param int[] $lightEmitters
+	 * @phpstan-param array<int, int> $lightFilters
+	 * @phpstan-param array<int, int> $lightEmitters
 	 */
 	public function __construct(
 		SubChunkExplorer $subChunkExplorer,
-		\SplFixedArray $lightFilters,
-		private \SplFixedArray $lightEmitters
+		array $lightFilters,
+		private array $lightEmitters
 	){
 		parent::__construct($subChunkExplorer, $lightFilters);
 	}
@@ -50,8 +50,8 @@ class BlockLightUpdate extends LightUpdate{
 
 	public function recalculateNode(int $x, int $y, int $z) : void{
 		if($this->subChunkExplorer->moveTo($x, $y, $z) !== SubChunkExplorerStatus::INVALID){
-			$block = $this->subChunkExplorer->currentSubChunk->getFullBlock($x & SubChunk::COORD_MASK, $y & SubChunk::COORD_MASK, $z & SubChunk::COORD_MASK);
-			$this->setAndUpdateLight($x, $y, $z, max($this->lightEmitters[$block], $this->getHighestAdjacentLight($x, $y, $z) - $this->lightFilters[$block]));
+			$block = $this->subChunkExplorer->currentSubChunk->getBlockStateId($x & SubChunk::COORD_MASK, $y & SubChunk::COORD_MASK, $z & SubChunk::COORD_MASK);
+			$this->setAndUpdateLight($x, $y, $z, max($this->lightEmitters[$block] ?? 0, $this->getHighestAdjacentLight($x, $y, $z) - ($this->lightFilters[$block] ?? self::BASE_LIGHT_FILTER)));
 		}
 	}
 
@@ -67,7 +67,7 @@ class BlockLightUpdate extends LightUpdate{
 
 			foreach($subChunk->getBlockLayers() as $layer){
 				foreach($layer->getPalette() as $state){
-					if($this->lightEmitters[$state] > 0){
+					if(($this->lightEmitters[$state] ?? 0) > 0){
 						$lightSources += $this->scanForLightEmittingBlocks($subChunk, $chunkX << SubChunk::COORD_BIT_SIZE, $subChunkY << SubChunk::COORD_BIT_SIZE, $chunkZ << SubChunk::COORD_BIT_SIZE);
 						break 2;
 					}
@@ -83,7 +83,7 @@ class BlockLightUpdate extends LightUpdate{
 		for($x = 0; $x < SubChunk::EDGE_LENGTH; ++$x){
 			for($z = 0; $z < SubChunk::EDGE_LENGTH; ++$z){
 				for($y = 0; $y < SubChunk::EDGE_LENGTH; ++$y){
-					$light = $this->lightEmitters[$subChunk->getFullBlock($x, $y, $z)];
+					$light = $this->lightEmitters[$subChunk->getBlockStateId($x, $y, $z)] ?? 0;
 					if($light > 0){
 						$this->setAndUpdateLight(
 							$baseX + $x,
diff --git a/src/world/light/LightPopulationTask.php b/src/world/light/LightPopulationTask.php
index 34ad841afd..5aa0ead65a 100644
--- a/src/world/light/LightPopulationTask.php
+++ b/src/world/light/LightPopulationTask.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\world\light;
 
-use pocketmine\block\BlockFactory;
+use pocketmine\block\RuntimeBlockStateRegistry;
 use pocketmine\scheduler\AsyncTask;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\format\io\FastChunkSerializer;
@@ -37,8 +37,7 @@ use function igbinary_unserialize;
 class LightPopulationTask extends AsyncTask{
 	private const TLS_KEY_COMPLETION_CALLBACK = "onCompletion";
 
-	/** @var string */
-	public $chunk;
+	public string $chunk;
 
 	private string $resultHeightMap;
 	private string $resultSkyLightArrays;
@@ -58,7 +57,7 @@ class LightPopulationTask extends AsyncTask{
 		$manager = new SimpleChunkManager(World::Y_MIN, World::Y_MAX);
 		$manager->setChunk(0, 0, $chunk);
 
-		$blockFactory = BlockFactory::getInstance();
+		$blockFactory = RuntimeBlockStateRegistry::getInstance();
 		foreach([
 			"Block" => new BlockLightUpdate(new SubChunkExplorer($manager), $blockFactory->lightFilter, $blockFactory->light),
 			"Sky" => new SkyLightUpdate(new SubChunkExplorer($manager), $blockFactory->lightFilter, $blockFactory->blocksDirectSkyLight),
diff --git a/src/world/light/LightPropagationContext.php b/src/world/light/LightPropagationContext.php
index 47b61bcee2..c3d45b3c63 100644
--- a/src/world/light/LightPropagationContext.php
+++ b/src/world/light/LightPropagationContext.php
@@ -25,27 +25,21 @@ namespace pocketmine\world\light;
 
 final class LightPropagationContext{
 
+	/** @phpstan-var \SplQueue<array{int, int, int}> */
+	public \SplQueue $spreadQueue;
 	/**
-	 * @var \SplQueue
-	 * @phpstan-var \SplQueue<array{int, int, int}>
+	 * @var int[]|true[]
+	 * @phpstan-var array<int, int|true>
 	 */
-	public $spreadQueue;
-	/**
-	 * @var true[]
-	 * @phpstan-var array<int, true>
-	 */
-	public $spreadVisited = [];
+	public array $spreadVisited = [];
 
-	/**
-	 * @var \SplQueue
-	 * @phpstan-var \SplQueue<array{int, int, int, int}>
-	 */
-	public $removalQueue;
+	/** @phpstan-var \SplQueue<array{int, int, int, int}> */
+	public \SplQueue $removalQueue;
 	/**
 	 * @var true[]
 	 * @phpstan-var array<int, true>
 	 */
-	public $removalVisited = [];
+	public array $removalVisited = [];
 
 	public function __construct(){
 		$this->removalQueue = new \SplQueue();
diff --git a/src/world/light/LightUpdate.php b/src/world/light/LightUpdate.php
index b75c2812fe..b7455c6cc3 100644
--- a/src/world/light/LightUpdate.php
+++ b/src/world/light/LightUpdate.php
@@ -23,48 +23,33 @@ declare(strict_types=1);
 
 namespace pocketmine\world\light;
 
+use pocketmine\math\Facing;
 use pocketmine\world\format\LightArray;
 use pocketmine\world\format\SubChunk;
 use pocketmine\world\utils\SubChunkExplorer;
 use pocketmine\world\utils\SubChunkExplorerStatus;
 use pocketmine\world\World;
+use function assert;
 use function max;
 
 //TODO: make light updates asynchronous
 abstract class LightUpdate{
-	private const ADJACENTS = [
-		[ 1,  0,  0],
-		[-1,  0,  0],
-		[ 0,  1,  0],
-		[ 0, -1,  0],
-		[ 0,  0,  1],
-		[ 0,  0, -1]
-	];
-
-	/**
-	 * @var \SplFixedArray|int[]
-	 * @phpstan-var \SplFixedArray<int>
-	 */
-	protected $lightFilters;
+	public const BASE_LIGHT_FILTER = 1;
 
 	/**
 	 * @var int[][] blockhash => [x, y, z, new light level]
 	 * @phpstan-var array<int, array{int, int, int, int}>
 	 */
-	protected $updateNodes = [];
-
-	/** @var SubChunkExplorer */
-	protected $subChunkExplorer;
+	protected array $updateNodes = [];
 
 	/**
-	 * @param \SplFixedArray|int[] $lightFilters
-	 * @phpstan-param \SplFixedArray<int> $lightFilters
+	 * @param int[] $lightFilters
+	 * @phpstan-param array<int, int> $lightFilters
 	 */
-	public function __construct(SubChunkExplorer $subChunkExplorer, \SplFixedArray $lightFilters){
-		$this->lightFilters = $lightFilters;
-
-		$this->subChunkExplorer = $subChunkExplorer;
-	}
+	public function __construct(
+		protected SubChunkExplorer $subChunkExplorer,
+		protected array $lightFilters
+	){}
 
 	abstract protected function getCurrentLightArray() : LightArray;
 
@@ -85,7 +70,7 @@ abstract class LightUpdate{
 
 	protected function getHighestAdjacentLight(int $x, int $y, int $z) : int{
 		$adjacent = 0;
-		foreach(self::ADJACENTS as [$ox, $oy, $oz]){
+		foreach(Facing::OFFSET as [$ox, $oy, $oz]){
 			if(($adjacent = max($adjacent, $this->getEffectiveLight($x + $ox, $y + $oy, $z + $oz))) === 15){
 				break;
 			}
@@ -114,9 +99,6 @@ abstract class LightUpdate{
 						$context->removalQueue->enqueue([$x, $y, $z, $oldLevel]);
 					}
 				}
-			}elseif($this->getEffectiveLight($x, $y, $z) > 0){ //outside the chunk (e.g. virtual sky light from y=256)
-				$context->spreadVisited[$blockHash] = true;
-				$context->spreadQueue->enqueue([$x, $y, $z]);
 			}
 		}
 		return $context;
@@ -126,51 +108,80 @@ abstract class LightUpdate{
 		$context = $this->prepareNodes();
 
 		$touched = 0;
+		$lightArray = null;
+		$subChunkExplorer = $this->subChunkExplorer;
+		$subChunkExplorer->invalidate();
 		while(!$context->removalQueue->isEmpty()){
 			$touched++;
 			[$x, $y, $z, $oldAdjacentLight] = $context->removalQueue->dequeue();
 
-			foreach(self::ADJACENTS as [$ox, $oy, $oz]){
+			foreach(Facing::OFFSET as [$ox, $oy, $oz]){
 				$cx = $x + $ox;
 				$cy = $y + $oy;
 				$cz = $z + $oz;
 
-				if($this->subChunkExplorer->moveTo($cx, $cy, $cz) !== SubChunkExplorerStatus::INVALID){
-					$this->computeRemoveLight($cx, $cy, $cz, $oldAdjacentLight, $context);
-				}elseif($this->getEffectiveLight($cx, $cy, $cz) > 0 && !isset($context->spreadVisited[$index = World::blockHash($cx, $cy, $cz)])){
-					$context->spreadVisited[$index] = true;
-					$context->spreadQueue->enqueue([$cx, $cy, $cz]);
+				$moveStatus = $subChunkExplorer->moveTo($cx, $cy, $cz);
+				if($moveStatus === SubChunkExplorerStatus::INVALID){
+					continue;
 				}
+				if($moveStatus === SubChunkExplorerStatus::MOVED){
+					$lightArray = $this->getCurrentLightArray();
+				}
+				assert($lightArray !== null);
+				$this->computeRemoveLight($cx, $cy, $cz, $oldAdjacentLight, $context, $lightArray);
 			}
 		}
 
+		$subChunk = null;
+		$subChunkExplorer->invalidate();
 		while(!$context->spreadQueue->isEmpty()){
 			$touched++;
 			[$x, $y, $z] = $context->spreadQueue->dequeue();
+			$from = $context->spreadVisited[World::blockHash($x, $y, $z)];
 
 			unset($context->spreadVisited[World::blockHash($x, $y, $z)]);
 
-			$newAdjacentLight = $this->getEffectiveLight($x, $y, $z);
+			$moveStatus = $subChunkExplorer->moveTo($x, $y, $z);
+			if($moveStatus === SubChunkExplorerStatus::INVALID){
+				continue;
+			}
+			if($moveStatus === SubChunkExplorerStatus::MOVED){
+				$subChunk = $subChunkExplorer->currentSubChunk;
+				$lightArray = $this->getCurrentLightArray();
+			}
+			assert($lightArray !== null);
+
+			$newAdjacentLight = $lightArray->get($x & SubChunk::COORD_MASK, $y & SubChunk::COORD_MASK, $z & SubChunk::COORD_MASK);
 			if($newAdjacentLight <= 0){
 				continue;
 			}
 
-			foreach(self::ADJACENTS as [$ox, $oy, $oz]){
+			foreach(Facing::OFFSET as $side => [$ox, $oy, $oz]){
+				if($from === $side){
+					//don't check the side that this node received its initial light from
+					continue;
+				}
 				$cx = $x + $ox;
 				$cy = $y + $oy;
 				$cz = $z + $oz;
 
-				if($this->subChunkExplorer->moveTo($cx, $cy, $cz) !== SubChunkExplorerStatus::INVALID){
-					$this->computeSpreadLight($cx, $cy, $cz, $newAdjacentLight, $context);
+				$moveStatus = $subChunkExplorer->moveTo($cx, $cy, $cz);
+				if($moveStatus === SubChunkExplorerStatus::INVALID){
+					continue;
 				}
+				if($moveStatus === SubChunkExplorerStatus::MOVED){
+					$subChunk = $subChunkExplorer->currentSubChunk;
+					$lightArray = $this->getCurrentLightArray();
+				}
+				assert($subChunk !== null);
+				$this->computeSpreadLight($cx, $cy, $cz, $newAdjacentLight, $context, $lightArray, $subChunk, $side);
 			}
 		}
 
 		return $touched;
 	}
 
-	protected function computeRemoveLight(int $x, int $y, int $z, int $oldAdjacentLevel, LightPropagationContext $context) : void{
-		$lightArray = $this->getCurrentLightArray();
+	protected function computeRemoveLight(int $x, int $y, int $z, int $oldAdjacentLevel, LightPropagationContext $context, LightArray $lightArray) : void{
 		$lx = $x & SubChunk::COORD_MASK;
 		$ly = $y & SubChunk::COORD_MASK;
 		$lz = $z & SubChunk::COORD_MASK;
@@ -193,19 +204,22 @@ abstract class LightUpdate{
 		}
 	}
 
-	protected function computeSpreadLight(int $x, int $y, int $z, int $newAdjacentLevel, LightPropagationContext $context) : void{
-		$lightArray = $this->getCurrentLightArray();
+	protected function computeSpreadLight(int $x, int $y, int $z, int $newAdjacentLevel, LightPropagationContext $context, LightArray $lightArray, SubChunk $subChunk, int $side) : void{
 		$lx = $x & SubChunk::COORD_MASK;
 		$ly = $y & SubChunk::COORD_MASK;
 		$lz = $z & SubChunk::COORD_MASK;
 		$current = $lightArray->get($lx, $ly, $lz);
-		$potentialLight = $newAdjacentLevel - $this->lightFilters[$this->subChunkExplorer->currentSubChunk->getFullBlock($lx, $ly, $lz)];
+		$potentialLight = $newAdjacentLevel - ($this->lightFilters[$subChunk->getBlockStateId($lx, $ly, $lz)] ?? self::BASE_LIGHT_FILTER);
 
 		if($current < $potentialLight){
 			$lightArray->set($lx, $ly, $lz, $potentialLight);
 
 			if(!isset($context->spreadVisited[$index = World::blockHash($x, $y, $z)]) && $potentialLight > 1){
-				$context->spreadVisited[$index] = true;
+				//Track where this node was lit from, to avoid checking the source again when we propagate from here
+				//TODO: In the future it might be worth tracking more than one adjacent source face in case multiple
+				//nodes try to light the same node. However, this is a rare case since the vast majority of calls are
+				//basic propagation with only one source anyway.
+				$context->spreadVisited[$index] = Facing::opposite($side);
 				$context->spreadQueue->enqueue([$x, $y, $z]);
 			}
 		}
diff --git a/src/world/light/SkyLightUpdate.php b/src/world/light/SkyLightUpdate.php
index bc0e1603c4..783ca11ab8 100644
--- a/src/world/light/SkyLightUpdate.php
+++ b/src/world/light/SkyLightUpdate.php
@@ -34,15 +34,15 @@ use function max;
 
 class SkyLightUpdate extends LightUpdate{
 	/**
-	 * @param \SplFixedArray|int[]  $lightFilters
-	 * @param \SplFixedArray|bool[] $directSkyLightBlockers
-	 * @phpstan-param \SplFixedArray<int>  $lightFilters
-	 * @phpstan-param \SplFixedArray<bool> $directSkyLightBlockers
+	 * @param int[]  $lightFilters
+	 * @param true[] $directSkyLightBlockers
+	 * @phpstan-param array<int, int>  $lightFilters
+	 * @phpstan-param array<int, true> $directSkyLightBlockers
 	 */
 	public function __construct(
 		SubChunkExplorer $subChunkExplorer,
-		\SplFixedArray $lightFilters,
-		private \SplFixedArray $directSkyLightBlockers
+		array $lightFilters,
+		private array $directSkyLightBlockers
 	){
 		parent::__construct($subChunkExplorer, $lightFilters);
 	}
@@ -66,7 +66,7 @@ class SkyLightUpdate extends LightUpdate{
 		$chunk = $this->subChunkExplorer->currentChunk;
 
 		$oldHeightMap = $chunk->getHeightMap($x & Chunk::COORD_MASK, $z & Chunk::COORD_MASK);
-		$source = $this->subChunkExplorer->currentSubChunk->getFullBlock($x & SubChunk::COORD_MASK, $y & SubChunk::COORD_MASK, $z & SubChunk::COORD_MASK);
+		$source = $this->subChunkExplorer->currentSubChunk->getBlockStateId($x & SubChunk::COORD_MASK, $y & SubChunk::COORD_MASK, $z & SubChunk::COORD_MASK);
 
 		$yPlusOne = $y + 1;
 
@@ -74,7 +74,7 @@ class SkyLightUpdate extends LightUpdate{
 			$newHeightMap = self::recalculateHeightMapColumn($chunk, $x & Chunk::COORD_MASK, $z & Chunk::COORD_MASK, $this->directSkyLightBlockers);
 			$chunk->setHeightMap($x & Chunk::COORD_MASK, $z & Chunk::COORD_MASK, $newHeightMap);
 		}elseif($yPlusOne > $oldHeightMap){ //Block changed above the heightmap.
-			if($this->directSkyLightBlockers[$source]){
+			if(isset($this->directSkyLightBlockers[$source])){
 				$chunk->setHeightMap($x & Chunk::COORD_MASK, $z & Chunk::COORD_MASK, $yPlusOne);
 				$newHeightMap = $yPlusOne;
 			}else{ //Block changed which has no effect on direct sky light, for example placing or removing glass.
@@ -84,16 +84,17 @@ class SkyLightUpdate extends LightUpdate{
 			$newHeightMap = $oldHeightMap;
 		}
 
-		if($newHeightMap > $oldHeightMap){ //Heightmap increase, block placed, remove sky light
-			for($i = $y; $i >= $oldHeightMap; --$i){
+		if($newHeightMap >= $oldHeightMap){
+			for($i = $y - 1; $i >= $oldHeightMap; --$i){
 				$this->setAndUpdateLight($x, $i, $z, 0); //Remove all light beneath, adjacent recalculation will handle the rest.
 			}
-		}elseif($newHeightMap < $oldHeightMap){ //Heightmap decrease, block changed or removed, add sky light
+
+			//recalculate light for the placed block from its surroundings - this avoids having to check effective light during propagation
+			$this->setAndUpdateLight($x, $y, $z, max(0, $this->getHighestAdjacentLight($x, $y, $z) - ($this->lightFilters[$source] ?? self::BASE_LIGHT_FILTER)));
+		}else{ //Heightmap decrease, block changed or removed, add sky light
 			for($i = $y; $i >= $newHeightMap; --$i){
 				$this->setAndUpdateLight($x, $i, $z, 15);
 			}
-		}else{ //No heightmap change, block changed "underground"
-			$this->setAndUpdateLight($x, $y, $z, max(0, $this->getHighestAdjacentLight($x, $y, $z) - $this->lightFilters[$source]));
 		}
 	}
 
@@ -124,35 +125,45 @@ class SkyLightUpdate extends LightUpdate{
 		for($x = 0; $x < Chunk::EDGE_LENGTH; ++$x){
 			for($z = 0; $z < Chunk::EDGE_LENGTH; ++$z){
 				$currentHeight = $chunk->getHeightMap($x, $z);
-				$maxAdjacentHeight = World::Y_MIN;
-				if($x !== 0){
-					$maxAdjacentHeight = max($maxAdjacentHeight, $chunk->getHeightMap($x - 1, $z));
-				}
-				if($x !== 15){
-					$maxAdjacentHeight = max($maxAdjacentHeight, $chunk->getHeightMap($x + 1, $z));
-				}
-				if($z !== 0){
-					$maxAdjacentHeight = max($maxAdjacentHeight, $chunk->getHeightMap($x, $z - 1));
-				}
-				if($z !== 15){
-					$maxAdjacentHeight = max($maxAdjacentHeight, $chunk->getHeightMap($x, $z + 1));
-				}
 
-				/*
-				 * We skip the top two blocks between current height and max adjacent (if there's a difference) because:
-				 * - the block next to the highest adjacent will do nothing during propagation (it's surrounded by 15s)
-				 * - the block below that block will do the same as the node in the highest adjacent
-				 * NOTE: If block opacity becomes direction-aware in the future, the second point will become invalid.
-				 */
-				$nodeColumnEnd = max($currentHeight, $maxAdjacentHeight - 2);
-
-				for($y = $currentHeight; $y <= $nodeColumnEnd; $y++){
-					$this->setAndUpdateLight($x + $baseX, $y, $z + $baseZ, 15);
-					$lightSources++;
-				}
-				for($y = $nodeColumnEnd + 1, $yMax = $lowestClearSubChunk * SubChunk::EDGE_LENGTH; $y < $yMax; $y++){
+				if($currentHeight === World::Y_MAX){
+					//this column has a light-filtering block in the top cell - make sure it's lit from above the world
+					//light from above the world bounds will not be checked during propagation
+					$y = $currentHeight - 1;
 					if($this->subChunkExplorer->moveTo($x + $baseX, $y, $z + $baseZ) !== SubChunkExplorerStatus::INVALID){
-						$this->getCurrentLightArray()->set($x, $y & SubChunk::COORD_MASK, $z, 15);
+						$block = $this->subChunkExplorer->currentSubChunk->getBlockStateId($x, $y & SubChunk::COORD_MASK, $z);
+						$this->setAndUpdateLight($x + $baseX, $y, $z + $baseZ, max(0, 15 - ($this->lightFilters[$block] ?? self::BASE_LIGHT_FILTER)));
+					}
+				}else{
+					$maxAdjacentHeight = World::Y_MIN;
+					if($x !== 0){
+						$maxAdjacentHeight = max($maxAdjacentHeight, $chunk->getHeightMap($x - 1, $z));
+					}
+					if($x !== 15){
+						$maxAdjacentHeight = max($maxAdjacentHeight, $chunk->getHeightMap($x + 1, $z));
+					}
+					if($z !== 0){
+						$maxAdjacentHeight = max($maxAdjacentHeight, $chunk->getHeightMap($x, $z - 1));
+					}
+					if($z !== 15){
+						$maxAdjacentHeight = max($maxAdjacentHeight, $chunk->getHeightMap($x, $z + 1));
+					}
+
+					/*
+					 * We skip the top two blocks between current height and max adjacent (if there's a difference) because:
+					 * - the block next to the highest adjacent will do nothing during propagation (it's surrounded by 15s)
+					 * - the block below that block will do the same as the node in the highest adjacent
+					 * NOTE: If block opacity becomes direction-aware in the future, the second point will become invalid.
+					 */
+					$nodeColumnEnd = max($currentHeight, $maxAdjacentHeight - 2);
+					for($y = $currentHeight; $y <= $nodeColumnEnd; $y++){
+						$this->setAndUpdateLight($x + $baseX, $y, $z + $baseZ, 15);
+						$lightSources++;
+					}
+					for($y = $nodeColumnEnd + 1, $yMax = $lowestClearSubChunk * SubChunk::EDGE_LENGTH; $y < $yMax; $y++){
+						if($this->subChunkExplorer->moveTo($x + $baseX, $y, $z + $baseZ) !== SubChunkExplorerStatus::INVALID){
+							$this->getCurrentLightArray()->set($x, $y & SubChunk::COORD_MASK, $z, 15);
+						}
 					}
 				}
 			}
@@ -164,10 +175,10 @@ class SkyLightUpdate extends LightUpdate{
 	/**
 	 * Recalculates the heightmap for the whole chunk.
 	 *
-	 * @param \SplFixedArray|bool[] $directSkyLightBlockers
-	 * @phpstan-param \SplFixedArray<bool> $directSkyLightBlockers
+	 * @param true[] $directSkyLightBlockers
+	 * @phpstan-param array<int, true> $directSkyLightBlockers
 	 */
-	private static function recalculateHeightMap(Chunk $chunk, \SplFixedArray $directSkyLightBlockers) : HeightArray{
+	private static function recalculateHeightMap(Chunk $chunk, array $directSkyLightBlockers) : HeightArray{
 		$maxSubChunkY = Chunk::MAX_SUBCHUNK_INDEX;
 		for(; $maxSubChunkY >= Chunk::MIN_SUBCHUNK_INDEX; $maxSubChunkY--){
 			if(!$chunk->getSubChunk($maxSubChunkY)->isEmptyFast()){
@@ -194,7 +205,7 @@ class SkyLightUpdate extends LightUpdate{
 					$result->set($x, $z, World::Y_MIN);
 				}else{
 					for(; $y >= World::Y_MIN; --$y){
-						if($directSkyLightBlockers[$chunk->getFullBlock($x, $y, $z)]){
+						if(isset($directSkyLightBlockers[$chunk->getBlockStateId($x, $y, $z)])){
 							$result->set($x, $z, $y + 1);
 							break;
 						}
@@ -208,20 +219,20 @@ class SkyLightUpdate extends LightUpdate{
 	/**
 	 * Recalculates the heightmap for the block column at the specified X/Z chunk coordinates
 	 *
-	 * @param int                   $x                      0-15
-	 * @param int                   $z                      0-15
-	 * @param \SplFixedArray|bool[] $directSkyLightBlockers
-	 * @phpstan-param \SplFixedArray<bool> $directSkyLightBlockers
+	 * @param int    $x                      0-15
+	 * @param int    $z                      0-15
+	 * @param true[] $directSkyLightBlockers
+	 * @phpstan-param array<int, true> $directSkyLightBlockers
 	 *
 	 * @return int New calculated heightmap value (0-256 inclusive)
 	 */
-	private static function recalculateHeightMapColumn(Chunk $chunk, int $x, int $z, \SplFixedArray $directSkyLightBlockers) : int{
+	private static function recalculateHeightMapColumn(Chunk $chunk, int $x, int $z, array $directSkyLightBlockers) : int{
 		$y = $chunk->getHighestBlockAt($x, $z);
 		if($y === null){
 			return World::Y_MIN;
 		}
 		for(; $y >= World::Y_MIN; --$y){
-			if($directSkyLightBlockers[$chunk->getFullBlock($x, $y, $z)]){
+			if(isset($directSkyLightBlockers[$chunk->getBlockStateId($x, $y, $z)])){
 				break;
 			}
 		}
diff --git a/src/world/particle/BlockBreakParticle.php b/src/world/particle/BlockBreakParticle.php
index 8801686e28..f3814c5fbf 100644
--- a/src/world/particle/BlockBreakParticle.php
+++ b/src/world/particle/BlockBreakParticle.php
@@ -25,7 +25,7 @@ namespace pocketmine\world\particle;
 
 use pocketmine\block\Block;
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelEvent;
 
@@ -34,6 +34,6 @@ class BlockBreakParticle implements Particle{
 	public function __construct(private Block $b){}
 
 	public function encode(Vector3 $pos) : array{
-		return [LevelEventPacket::create(LevelEvent::PARTICLE_DESTROY, RuntimeBlockMapping::getInstance()->toRuntimeId($this->b->getFullId()), $pos)];
+		return [LevelEventPacket::create(LevelEvent::PARTICLE_DESTROY, TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId($this->b->getStateId()), $pos)];
 	}
 }
diff --git a/src/world/particle/BlockPunchParticle.php b/src/world/particle/BlockPunchParticle.php
index d9ddad2090..74478ca95c 100644
--- a/src/world/particle/BlockPunchParticle.php
+++ b/src/world/particle/BlockPunchParticle.php
@@ -25,7 +25,7 @@ namespace pocketmine\world\particle;
 
 use pocketmine\block\Block;
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelEvent;
 
@@ -39,6 +39,6 @@ class BlockPunchParticle implements Particle{
 	){}
 
 	public function encode(Vector3 $pos) : array{
-		return [LevelEventPacket::create(LevelEvent::PARTICLE_PUNCH_BLOCK, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()) | ($this->face << 24), $pos)];
+		return [LevelEventPacket::create(LevelEvent::PARTICLE_PUNCH_BLOCK, TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId($this->block->getStateId()) | ($this->face << 24), $pos)];
 	}
 }
diff --git a/src/world/particle/FloatingTextParticle.php b/src/world/particle/FloatingTextParticle.php
index 8797a7d5c4..180bb4a412 100644
--- a/src/world/particle/FloatingTextParticle.php
+++ b/src/world/particle/FloatingTextParticle.php
@@ -26,7 +26,7 @@ namespace pocketmine\world\particle;
 use pocketmine\block\VanillaBlocks;
 use pocketmine\entity\Entity;
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\AddActorPacket;
 use pocketmine\network\mcpe\protocol\RemoveActorPacket;
 use pocketmine\network\mcpe\protocol\types\entity\ByteMetadataProperty;
@@ -42,19 +42,13 @@ use pocketmine\network\mcpe\protocol\types\entity\StringMetadataProperty;
 class FloatingTextParticle implements Particle{
 	//TODO: HACK!
 
-	/** @var string */
-	protected $text;
-	/** @var string */
-	protected $title;
-	/** @var int|null */
-	protected $entityId = null;
-	/** @var bool */
-	protected $invisible = false;
+	protected ?int $entityId = null;
+	protected bool $invisible = false;
 
-	public function __construct(string $text, string $title = ""){
-		$this->text = $text;
-		$this->title = $title;
-	}
+	public function __construct(
+		protected string $text,
+		protected string $title = ""
+	){}
 
 	public function getText() : string{
 		return $this->text;
@@ -93,7 +87,7 @@ class FloatingTextParticle implements Particle{
 			$name = $this->title . ($this->text !== "" ? "\n" . $this->text : "");
 
 			$actorFlags = (
-				1 << EntityMetadataFlags::IMMOBILE
+				1 << EntityMetadataFlags::NO_AI
 			);
 			$actorMetadata = [
 				EntityMetadataProperties::FLAGS => new LongMetadataProperty($actorFlags),
@@ -101,7 +95,7 @@ class FloatingTextParticle implements Particle{
 				EntityMetadataProperties::BOUNDING_BOX_WIDTH => new FloatMetadataProperty(0.0),
 				EntityMetadataProperties::BOUNDING_BOX_HEIGHT => new FloatMetadataProperty(0.0),
 				EntityMetadataProperties::NAMETAG => new StringMetadataProperty($name),
-				EntityMetadataProperties::VARIANT => new IntMetadataProperty(RuntimeBlockMapping::getInstance()->toRuntimeId(VanillaBlocks::AIR()->getFullId())),
+				EntityMetadataProperties::VARIANT => new IntMetadataProperty(TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId(VanillaBlocks::AIR()->getStateId())),
 				EntityMetadataProperties::ALWAYS_SHOW_NAMETAG => new ByteMetadataProperty(1),
 			];
 			$p[] = AddActorPacket::create(
diff --git a/src/world/particle/ItemBreakParticle.php b/src/world/particle/ItemBreakParticle.php
index bc0e2d7579..4f8c9ea913 100644
--- a/src/world/particle/ItemBreakParticle.php
+++ b/src/world/particle/ItemBreakParticle.php
@@ -25,7 +25,7 @@ namespace pocketmine\world\particle;
 
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\convert\ItemTranslator;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
 use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
@@ -33,7 +33,7 @@ class ItemBreakParticle implements Particle{
 	public function __construct(private Item $item){}
 
 	public function encode(Vector3 $pos) : array{
-		[$id, $meta] = ItemTranslator::getInstance()->toNetworkId($this->item->getId(), $this->item->getMeta());
+		[$id, $meta] = TypeConverter::getInstance()->getItemTranslator()->toNetworkId($this->item);
 		return [LevelEventPacket::standardParticle(ParticleIds::ITEM_BREAK, ($id << 16) | $meta, $pos)];
 	}
 }
diff --git a/src/world/particle/MobSpawnParticle.php b/src/world/particle/MobSpawnParticle.php
index cb1aed68b2..c4d0ff56f7 100644
--- a/src/world/particle/MobSpawnParticle.php
+++ b/src/world/particle/MobSpawnParticle.php
@@ -28,15 +28,11 @@ use pocketmine\network\mcpe\protocol\LevelEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelEvent;
 
 class MobSpawnParticle implements Particle{
-	/** @var int */
-	protected $width;
-	/** @var int */
-	protected $height;
-
-	public function __construct(int $width = 0, int $height = 0){
+	public function __construct(
+		protected int $width = 0,
+		protected int $height = 0
+	){
 		//TODO: bounds checks
-		$this->width = $width;
-		$this->height = $height;
 	}
 
 	public function encode(Vector3 $pos) : array{
diff --git a/src/world/particle/TerrainParticle.php b/src/world/particle/TerrainParticle.php
index 863b844018..b0ac9debda 100644
--- a/src/world/particle/TerrainParticle.php
+++ b/src/world/particle/TerrainParticle.php
@@ -25,7 +25,7 @@ namespace pocketmine\world\particle;
 
 use pocketmine\block\Block;
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
 use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
@@ -33,6 +33,6 @@ class TerrainParticle implements Particle{
 	public function __construct(private Block $b){}
 
 	public function encode(Vector3 $pos) : array{
-		return [LevelEventPacket::standardParticle(ParticleIds::TERRAIN, RuntimeBlockMapping::getInstance()->toRuntimeId($this->b->getFullId()), $pos)];
+		return [LevelEventPacket::standardParticle(ParticleIds::TERRAIN, TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId($this->b->getStateId()), $pos)];
 	}
 }
diff --git a/src/world/sound/AmethystBlockChimeSound.php b/src/world/sound/AmethystBlockChimeSound.php
new file mode 100644
index 0000000000..64efbb8ced
--- /dev/null
+++ b/src/world/sound/AmethystBlockChimeSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+class AmethystBlockChimeSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::AMETHYST_BLOCK_CHIME, $pos, false)];
+	}
+}
diff --git a/src/world/sound/ArmorEquipChainSound.php b/src/world/sound/ArmorEquipChainSound.php
new file mode 100644
index 0000000000..efcb4f982e
--- /dev/null
+++ b/src/world/sound/ArmorEquipChainSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+class ArmorEquipChainSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::ARMOR_EQUIP_CHAIN, $pos, false)];
+	}
+}
diff --git a/src/world/sound/ArmorEquipDiamondSound.php b/src/world/sound/ArmorEquipDiamondSound.php
new file mode 100644
index 0000000000..b3057eaba6
--- /dev/null
+++ b/src/world/sound/ArmorEquipDiamondSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+class ArmorEquipDiamondSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::ARMOR_EQUIP_DIAMOND, $pos, false)];
+	}
+}
diff --git a/src/world/sound/ArmorEquipGenericSound.php b/src/world/sound/ArmorEquipGenericSound.php
new file mode 100644
index 0000000000..c11567bdd5
--- /dev/null
+++ b/src/world/sound/ArmorEquipGenericSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+class ArmorEquipGenericSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::ARMOR_EQUIP_GENERIC, $pos, false)];
+	}
+}
diff --git a/src/world/sound/ArmorEquipGoldSound.php b/src/world/sound/ArmorEquipGoldSound.php
new file mode 100644
index 0000000000..aeabafbe2c
--- /dev/null
+++ b/src/world/sound/ArmorEquipGoldSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+class ArmorEquipGoldSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::ARMOR_EQUIP_GOLD, $pos, false)];
+	}
+}
diff --git a/src/world/sound/ArmorEquipIronSound.php b/src/world/sound/ArmorEquipIronSound.php
new file mode 100644
index 0000000000..3988f453fb
--- /dev/null
+++ b/src/world/sound/ArmorEquipIronSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+class ArmorEquipIronSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::ARMOR_EQUIP_IRON, $pos, false)];
+	}
+}
diff --git a/src/world/sound/ArmorEquipLeatherSound.php b/src/world/sound/ArmorEquipLeatherSound.php
new file mode 100644
index 0000000000..894d6392ba
--- /dev/null
+++ b/src/world/sound/ArmorEquipLeatherSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+class ArmorEquipLeatherSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::ARMOR_EQUIP_LEATHER, $pos, false)];
+	}
+}
diff --git a/src/world/sound/ArmorEquipNetheriteSound.php b/src/world/sound/ArmorEquipNetheriteSound.php
new file mode 100644
index 0000000000..a75c461060
--- /dev/null
+++ b/src/world/sound/ArmorEquipNetheriteSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+class ArmorEquipNetheriteSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::ARMOR_EQUIP_NETHERITE, $pos, false)];
+	}
+}
diff --git a/src/world/sound/BlockBreakSound.php b/src/world/sound/BlockBreakSound.php
index 2075518e09..ba3ec893ed 100644
--- a/src/world/sound/BlockBreakSound.php
+++ b/src/world/sound/BlockBreakSound.php
@@ -25,7 +25,7 @@ namespace pocketmine\world\sound;
 
 use pocketmine\block\Block;
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
 
@@ -33,6 +33,6 @@ class BlockBreakSound implements Sound{
 	public function __construct(private Block $block){}
 
 	public function encode(Vector3 $pos) : array{
-		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::BREAK, $pos, false, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()))];
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::BREAK, $pos, false, TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId($this->block->getStateId()))];
 	}
 }
diff --git a/src/world/sound/BlockPlaceSound.php b/src/world/sound/BlockPlaceSound.php
index 000dadd678..5efe8a384c 100644
--- a/src/world/sound/BlockPlaceSound.php
+++ b/src/world/sound/BlockPlaceSound.php
@@ -25,7 +25,7 @@ namespace pocketmine\world\sound;
 
 use pocketmine\block\Block;
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
 
@@ -33,6 +33,6 @@ class BlockPlaceSound implements Sound{
 	public function __construct(private Block $block){}
 
 	public function encode(Vector3 $pos) : array{
-		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::PLACE, $pos, false, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()))];
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::PLACE, $pos, false, TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId($this->block->getStateId()))];
 	}
 }
diff --git a/src/world/sound/BlockPunchSound.php b/src/world/sound/BlockPunchSound.php
index 28ab73c941..8fee7875b6 100644
--- a/src/world/sound/BlockPunchSound.php
+++ b/src/world/sound/BlockPunchSound.php
@@ -25,7 +25,7 @@ namespace pocketmine\world\sound;
 
 use pocketmine\block\Block;
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
 
@@ -40,7 +40,7 @@ class BlockPunchSound implements Sound{
 			LevelSoundEvent::HIT,
 			$pos,
 			false,
-			RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId())
+			TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId($this->block->getStateId())
 		)];
 	}
 }
diff --git a/src/world/sound/BottleEmptySound.php b/src/world/sound/BottleEmptySound.php
new file mode 100644
index 0000000000..bb2a0be2ad
--- /dev/null
+++ b/src/world/sound/BottleEmptySound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+class BottleEmptySound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::BOTTLE_EMPTY, $pos, false)];
+	}
+}
diff --git a/src/world/sound/CampfireSound.php b/src/world/sound/CampfireSound.php
new file mode 100644
index 0000000000..7e01342efe
--- /dev/null
+++ b/src/world/sound/CampfireSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+final class CampfireSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::BLOCK_CAMPFIRE_CRACKLE, $pos, false)];
+	}
+}
diff --git a/src/world/sound/CauldronAddDyeSound.php b/src/world/sound/CauldronAddDyeSound.php
new file mode 100644
index 0000000000..2a427959ee
--- /dev/null
+++ b/src/world/sound/CauldronAddDyeSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelEvent;
+
+final class CauldronAddDyeSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelEventPacket::create(LevelEvent::CAULDRON_ADD_DYE, 0, $pos)];
+	}
+}
diff --git a/src/world/sound/CauldronCleanItemSound.php b/src/world/sound/CauldronCleanItemSound.php
new file mode 100644
index 0000000000..fc46e8d9c8
--- /dev/null
+++ b/src/world/sound/CauldronCleanItemSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelEvent;
+
+final class CauldronCleanItemSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelEventPacket::create(LevelEvent::CAULDRON_CLEAN_ARMOR, 0, $pos)];
+	}
+}
diff --git a/src/world/sound/CauldronDyeItemSound.php b/src/world/sound/CauldronDyeItemSound.php
new file mode 100644
index 0000000000..1d79b82762
--- /dev/null
+++ b/src/world/sound/CauldronDyeItemSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelEvent;
+
+final class CauldronDyeItemSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelEventPacket::create(LevelEvent::CAULDRON_DYE_ARMOR, 0, $pos)];
+	}
+}
diff --git a/src/world/sound/CauldronEmptyLavaSound.php b/src/world/sound/CauldronEmptyLavaSound.php
new file mode 100644
index 0000000000..d38b4844f3
--- /dev/null
+++ b/src/world/sound/CauldronEmptyLavaSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelEvent;
+
+final class CauldronEmptyLavaSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelEventPacket::create(LevelEvent::SOUND_CAULDRON_TAKE_LAVA, 0, $pos)];
+	}
+}
diff --git a/src/world/sound/CauldronEmptyPotionSound.php b/src/world/sound/CauldronEmptyPotionSound.php
new file mode 100644
index 0000000000..aa88b35fb8
--- /dev/null
+++ b/src/world/sound/CauldronEmptyPotionSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelEvent;
+
+final class CauldronEmptyPotionSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelEventPacket::create(LevelEvent::CAULDRON_TAKE_POTION, 0, $pos)];
+	}
+}
diff --git a/src/world/sound/CauldronEmptyPowderSnowSound.php b/src/world/sound/CauldronEmptyPowderSnowSound.php
new file mode 100644
index 0000000000..e463294013
--- /dev/null
+++ b/src/world/sound/CauldronEmptyPowderSnowSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelEvent;
+
+final class CauldronEmptyPowderSnowSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelEventPacket::create(LevelEvent::SOUND_CAULDRON_TAKE_POWDER_SNOW, 0, $pos)];
+	}
+}
diff --git a/src/world/sound/CauldronEmptyWaterSound.php b/src/world/sound/CauldronEmptyWaterSound.php
new file mode 100644
index 0000000000..c917a6fbc1
--- /dev/null
+++ b/src/world/sound/CauldronEmptyWaterSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelEvent;
+
+final class CauldronEmptyWaterSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelEventPacket::create(LevelEvent::CAULDRON_TAKE_WATER, 0, $pos)];
+	}
+}
diff --git a/src/world/sound/CauldronFillLavaSound.php b/src/world/sound/CauldronFillLavaSound.php
new file mode 100644
index 0000000000..5126aea65d
--- /dev/null
+++ b/src/world/sound/CauldronFillLavaSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelEvent;
+
+final class CauldronFillLavaSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelEventPacket::create(LevelEvent::SOUND_CAULDRON_FILL_LAVA, 0, $pos)];
+	}
+}
diff --git a/src/world/sound/CauldronFillPotionSound.php b/src/world/sound/CauldronFillPotionSound.php
new file mode 100644
index 0000000000..16caceff6f
--- /dev/null
+++ b/src/world/sound/CauldronFillPotionSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelEvent;
+
+final class CauldronFillPotionSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelEventPacket::create(LevelEvent::CAULDRON_FILL_POTION, 0, $pos)];
+	}
+}
diff --git a/src/world/sound/CauldronFillPowderSnowSound.php b/src/world/sound/CauldronFillPowderSnowSound.php
new file mode 100644
index 0000000000..7c119cb650
--- /dev/null
+++ b/src/world/sound/CauldronFillPowderSnowSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelEvent;
+
+final class CauldronFillPowderSnowSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelEventPacket::create(LevelEvent::SOUND_CAULDRON_FILL_POWDER_SNOW, 0, $pos)];
+	}
+}
diff --git a/src/world/sound/CauldronFillWaterSound.php b/src/world/sound/CauldronFillWaterSound.php
new file mode 100644
index 0000000000..80fc1c90ae
--- /dev/null
+++ b/src/world/sound/CauldronFillWaterSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelEvent;
+
+final class CauldronFillWaterSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelEventPacket::create(LevelEvent::CAULDRON_FILL_WATER, 0, $pos)];
+	}
+}
diff --git a/src/world/sound/ChorusFlowerDieSound.php b/src/world/sound/ChorusFlowerDieSound.php
new file mode 100644
index 0000000000..c91bdf9eda
--- /dev/null
+++ b/src/world/sound/ChorusFlowerDieSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+final class ChorusFlowerDieSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::CHORUSDEATH, $pos, false)];
+	}
+}
diff --git a/src/world/sound/ChorusFlowerGrowSound.php b/src/world/sound/ChorusFlowerGrowSound.php
new file mode 100644
index 0000000000..53066fec0d
--- /dev/null
+++ b/src/world/sound/ChorusFlowerGrowSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+final class ChorusFlowerGrowSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::CHORUSGROW, $pos, false)];
+	}
+}
diff --git a/src/world/sound/CopperWaxApplySound.php b/src/world/sound/CopperWaxApplySound.php
new file mode 100644
index 0000000000..3775fa70c3
--- /dev/null
+++ b/src/world/sound/CopperWaxApplySound.php
@@ -0,0 +1,34 @@
+<?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\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+final class CopperWaxApplySound implements Sound{
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::COPPER_WAX_ON, $pos, false)];
+	}
+}
diff --git a/src/world/sound/CopperWaxRemoveSound.php b/src/world/sound/CopperWaxRemoveSound.php
new file mode 100644
index 0000000000..201efefde4
--- /dev/null
+++ b/src/world/sound/CopperWaxRemoveSound.php
@@ -0,0 +1,34 @@
+<?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\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+final class CopperWaxRemoveSound implements Sound{
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::COPPER_WAX_OFF, $pos, false)];
+	}
+}
diff --git a/src/world/sound/DripleafTiltDownSound.php b/src/world/sound/DripleafTiltDownSound.php
new file mode 100644
index 0000000000..1366f1b715
--- /dev/null
+++ b/src/world/sound/DripleafTiltDownSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+class DripleafTiltDownSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::TILT_DOWN_BIG_DRIPLEAF, $pos, false)];
+	}
+}
diff --git a/src/world/sound/DripleafTiltUpSound.php b/src/world/sound/DripleafTiltUpSound.php
new file mode 100644
index 0000000000..4554cca7b8
--- /dev/null
+++ b/src/world/sound/DripleafTiltUpSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+class DripleafTiltUpSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::TILT_UP_BIG_DRIPLEAF, $pos, false)];
+	}
+}
diff --git a/src/world/sound/DyeUseSound.php b/src/world/sound/DyeUseSound.php
new file mode 100644
index 0000000000..5357c6e8bc
--- /dev/null
+++ b/src/world/sound/DyeUseSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelEvent;
+
+final class DyeUseSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelEventPacket::create(LevelEvent::SOUND_DYE_USED, 0, $pos)];
+	}
+}
diff --git a/src/world/sound/EntityLandSound.php b/src/world/sound/EntityLandSound.php
index 6412e6ab0e..998c5ed02a 100644
--- a/src/world/sound/EntityLandSound.php
+++ b/src/world/sound/EntityLandSound.php
@@ -26,7 +26,7 @@ namespace pocketmine\world\sound;
 use pocketmine\block\Block;
 use pocketmine\entity\Entity;
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
 
@@ -43,7 +43,7 @@ class EntityLandSound implements Sound{
 		return [LevelSoundEventPacket::create(
 			LevelSoundEvent::LAND,
 			$pos,
-			RuntimeBlockMapping::getInstance()->toRuntimeId($this->blockLandedOn->getFullId()),
+			TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId($this->blockLandedOn->getStateId()),
 			$this->entity::getNetworkTypeId(),
 			false, //TODO: does isBaby have any relevance here?
 			false
diff --git a/src/world/sound/GlowBerriesPickSound.php b/src/world/sound/GlowBerriesPickSound.php
new file mode 100644
index 0000000000..0c76ff75eb
--- /dev/null
+++ b/src/world/sound/GlowBerriesPickSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+class GlowBerriesPickSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::CAVE_VINES_PICK_BERRIES, $pos, false)];
+	}
+}
diff --git a/src/world/sound/GoatHornSound.php b/src/world/sound/GoatHornSound.php
new file mode 100644
index 0000000000..3987db3dae
--- /dev/null
+++ b/src/world/sound/GoatHornSound.php
@@ -0,0 +1,46 @@
+<?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\sound;
+
+use pocketmine\item\GoatHornType;
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+class GoatHornSound implements Sound{
+	public function __construct(private GoatHornType $goatHornType){}
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(match($this->goatHornType){
+			GoatHornType::PONDER => LevelSoundEvent::HORN_CALL0,
+			GoatHornType::SING => LevelSoundEvent::HORN_CALL1,
+			GoatHornType::SEEK => LevelSoundEvent::HORN_CALL2,
+			GoatHornType::FEEL => LevelSoundEvent::HORN_CALL3,
+			GoatHornType::ADMIRE => LevelSoundEvent::HORN_CALL4,
+			GoatHornType::CALL => LevelSoundEvent::HORN_CALL5,
+			GoatHornType::YEARN => LevelSoundEvent::HORN_CALL6,
+			GoatHornType::DREAM => LevelSoundEvent::HORN_CALL7
+		}, $pos, false)];
+	}
+}
diff --git a/src/world/sound/IceBombHitSound.php b/src/world/sound/IceBombHitSound.php
new file mode 100644
index 0000000000..7dcdeebf67
--- /dev/null
+++ b/src/world/sound/IceBombHitSound.php
@@ -0,0 +1,34 @@
+<?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\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+final class IceBombHitSound implements Sound{
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::ICEBOMB_HIT, $pos, false)];
+	}
+}
diff --git a/src/world/sound/InkSacUseSound.php b/src/world/sound/InkSacUseSound.php
new file mode 100644
index 0000000000..51b18c08c7
--- /dev/null
+++ b/src/world/sound/InkSacUseSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelEvent;
+
+final class InkSacUseSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelEventPacket::create(LevelEvent::SOUND_INK_SAC_USED, 0, $pos)];
+	}
+}
diff --git a/src/world/sound/ItemUseOnBlockSound.php b/src/world/sound/ItemUseOnBlockSound.php
index 3e090a9054..7daba166e5 100644
--- a/src/world/sound/ItemUseOnBlockSound.php
+++ b/src/world/sound/ItemUseOnBlockSound.php
@@ -25,7 +25,7 @@ namespace pocketmine\world\sound;
 
 use pocketmine\block\Block;
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
 
@@ -42,7 +42,7 @@ final class ItemUseOnBlockSound implements Sound{
 			LevelSoundEvent::ITEM_USE_ON,
 			$pos,
 			false,
-			RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId())
+			TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId($this->block->getStateId())
 		)];
 	}
 }
diff --git a/src/world/sound/NoteInstrument.php b/src/world/sound/NoteInstrument.php
index 06053c566f..a91d52cf70 100644
--- a/src/world/sound/NoteInstrument.php
+++ b/src/world/sound/NoteInstrument.php
@@ -23,43 +23,46 @@ declare(strict_types=1);
 
 namespace pocketmine\world\sound;
 
-use pocketmine\utils\EnumTrait;
+use pocketmine\utils\LegacyEnumShimTrait;
 
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
+ * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
+ *  These are retained for backwards compatibility only.
  *
+ * @method static NoteInstrument BANJO()
  * @method static NoteInstrument BASS_DRUM()
+ * @method static NoteInstrument BELL()
+ * @method static NoteInstrument BIT()
+ * @method static NoteInstrument CHIME()
  * @method static NoteInstrument CLICKS_AND_STICKS()
+ * @method static NoteInstrument COW_BELL()
+ * @method static NoteInstrument DIDGERIDOO()
  * @method static NoteInstrument DOUBLE_BASS()
+ * @method static NoteInstrument FLUTE()
+ * @method static NoteInstrument GUITAR()
+ * @method static NoteInstrument IRON_XYLOPHONE()
  * @method static NoteInstrument PIANO()
+ * @method static NoteInstrument PLING()
  * @method static NoteInstrument SNARE()
+ * @method static NoteInstrument XYLOPHONE()
  */
-final class NoteInstrument{
-	use EnumTrait {
-		__construct as Enum___construct;
-	}
+enum NoteInstrument{
+	use LegacyEnumShimTrait;
 
-	protected static function setup() : void{
-		self::registerAll(
-			new self("piano", 0),
-			new self("bass_drum", 1),
-			new self("snare", 2),
-			new self("clicks_and_sticks", 3),
-			new self("double_bass", 4)
-		);
-	}
-
-	private function __construct(
-		string $name,
-		private int $magicNumber
-	){
-		$this->Enum___construct($name);
-	}
-
-	public function getMagicNumber() : int{
-		return $this->magicNumber;
-	}
+	case PIANO;
+	case BASS_DRUM;
+	case SNARE;
+	case CLICKS_AND_STICKS;
+	case DOUBLE_BASS;
+	case BELL;
+	case FLUTE;
+	case CHIME;
+	case GUITAR;
+	case XYLOPHONE;
+	case IRON_XYLOPHONE;
+	case COW_BELL;
+	case DIDGERIDOO;
+	case BIT;
+	case BANJO;
+	case PLING;
 }
diff --git a/src/world/sound/NoteSound.php b/src/world/sound/NoteSound.php
index b0459bdbea..6082567092 100644
--- a/src/world/sound/NoteSound.php
+++ b/src/world/sound/NoteSound.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\world\sound;
 
+use pocketmine\data\bedrock\NoteInstrumentIdMap;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
@@ -38,6 +39,7 @@ class NoteSound implements Sound{
 	}
 
 	public function encode(Vector3 $pos) : array{
-		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::NOTE, $pos, false, ($this->instrument->getMagicNumber() << 8) | $this->note)];
+		$instrumentId = NoteInstrumentIdMap::getInstance()->toId($this->instrument);
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::NOTE, $pos, false, ($instrumentId << 8) | $this->note)];
 	}
 }
diff --git a/src/world/sound/PressurePlateActivateSound.php b/src/world/sound/PressurePlateActivateSound.php
new file mode 100644
index 0000000000..fac24e285c
--- /dev/null
+++ b/src/world/sound/PressurePlateActivateSound.php
@@ -0,0 +1,46 @@
+<?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\sound;
+
+use pocketmine\block\Block;
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\convert\TypeConverter;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+final class PressurePlateActivateSound implements Sound{
+
+	public function __construct(
+		private readonly Block $block
+	){}
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(
+			LevelSoundEvent::PRESSURE_PLATE_CLICK_ON,
+			$pos,
+			false,
+			TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId($this->block->getStateId())
+		)];
+	}
+}
diff --git a/src/world/sound/PressurePlateDeactivateSound.php b/src/world/sound/PressurePlateDeactivateSound.php
new file mode 100644
index 0000000000..895bb8b8a0
--- /dev/null
+++ b/src/world/sound/PressurePlateDeactivateSound.php
@@ -0,0 +1,46 @@
+<?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\sound;
+
+use pocketmine\block\Block;
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\convert\TypeConverter;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+final class PressurePlateDeactivateSound implements Sound{
+
+	public function __construct(
+		private readonly Block $block
+	){}
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(
+			LevelSoundEvent::PRESSURE_PLATE_CLICK_OFF,
+			$pos,
+			false,
+			TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId($this->block->getStateId())
+		)];
+	}
+}
diff --git a/src/world/sound/ScrapeSound.php b/src/world/sound/ScrapeSound.php
new file mode 100644
index 0000000000..39f35adab0
--- /dev/null
+++ b/src/world/sound/ScrapeSound.php
@@ -0,0 +1,34 @@
+<?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\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+final class ScrapeSound implements Sound{
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::SCRAPE, $pos, false)];
+	}
+}
diff --git a/src/world/sound/SweetBerriesPickSound.php b/src/world/sound/SweetBerriesPickSound.php
new file mode 100644
index 0000000000..fb8f3c8cf9
--- /dev/null
+++ b/src/world/sound/SweetBerriesPickSound.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\world\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+class SweetBerriesPickSound implements Sound{
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::BLOCK_SWEET_BERRY_BUSH_PICK, $pos, false)];
+	}
+}
diff --git a/src/world/sound/WaterSplashSound.php b/src/world/sound/WaterSplashSound.php
new file mode 100644
index 0000000000..f7b662ec8e
--- /dev/null
+++ b/src/world/sound/WaterSplashSound.php
@@ -0,0 +1,48 @@
+<?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\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+final class WaterSplashSound implements Sound{
+
+	public function __construct(private float $volume){
+		if($volume < 0 || $volume > 1){
+			throw new \InvalidArgumentException("Volume must be between 0 and 1");
+		}
+	}
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::create(
+			LevelSoundEvent::SPLASH,
+			$pos,
+			(int) ($this->volume * 16777215),
+			":",
+			false,
+			false
+		)];
+	}
+}
diff --git a/src/world/utils/SubChunkExplorer.php b/src/world/utils/SubChunkExplorer.php
index 84a58cf3bb..9e0054ecfc 100644
--- a/src/world/utils/SubChunkExplorer.php
+++ b/src/world/utils/SubChunkExplorer.php
@@ -28,24 +28,16 @@ use pocketmine\world\format\Chunk;
 use pocketmine\world\format\SubChunk;
 
 class SubChunkExplorer{
-	/** @var ChunkManager */
-	protected $world;
+	public ?Chunk $currentChunk = null;
+	public ?SubChunk $currentSubChunk = null;
 
-	/** @var Chunk|null */
-	public $currentChunk;
-	/** @var SubChunk|null */
-	public $currentSubChunk;
+	protected int $currentX;
+	protected int $currentY;
+	protected int $currentZ;
 
-	/** @var int */
-	protected $currentX;
-	/** @var int */
-	protected $currentY;
-	/** @var int */
-	protected $currentZ;
-
-	public function __construct(ChunkManager $world){
-		$this->world = $world;
-	}
+	public function __construct(
+		protected ChunkManager $world
+	){}
 
 	/**
 	 * @phpstan-return SubChunkExplorerStatus::*
diff --git a/start.sh b/start.sh
index 63a9a273b8..8f458b4e6d 100755
--- a/start.sh
+++ b/start.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 DIR="$(cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
-cd "$DIR"
+cd "$DIR" || { echo "Couldn't change directory to $DIR"; exit 1; }
 
 while getopts "p:f:l" OPTION 2> /dev/null; do
 	case ${OPTION} in
@@ -23,7 +23,7 @@ if [ "$PHP_BINARY" == "" ]; then
 	if [ -f ./bin/php7/bin/php ]; then
 		export PHPRC=""
 		PHP_BINARY="./bin/php7/bin/php"
-	elif [[ ! -z $(type php 2> /dev/null) ]]; then
+	elif [[ -n $(type php 2> /dev/null) ]]; then
 		PHP_BINARY=$(type -p php)
 	else
 		echo "Couldn't find a PHP binary in system PATH or $PWD/bin/php7/bin"
@@ -44,6 +44,27 @@ fi
 
 LOOPS=0
 
+handle_exit_code() {
+	local exitcode=$1
+	if [ "$exitcode" -eq 134 ] || [ "$exitcode" -eq 139 ]; then #SIGABRT/SIGSEGV
+		echo ""
+		echo "ERROR: The server process was killed due to a critical error (code $exitcode) which could indicate a problem with PHP."
+		echo "Updating your PHP binary is recommended."
+		echo "If this keeps happening, please open a bug report."
+		echo ""
+	elif [ "$exitcode" -eq 143 ]; then #SIGKILL, maybe user intervention
+		echo ""
+		echo "WARNING: Server was forcibly killed!"
+		echo "If you didn't kill the server manually, this probably means the server used too much memory and was killed by the system's OOM Killer."
+		echo "Please ensure your system has enough available RAM."
+		echo ""
+	elif [ "$exitcode" -ne 0 ] && [ "$exitcode" -ne 137 ]; then #normal exit / SIGTERM
+		echo ""
+		echo "WARNING: Server did not shut down correctly! (code $exitcode)"
+		echo ""
+	fi
+}
+
 set +e
 
 if [ "$DO_LOOP" == "yes" ]; then
@@ -51,12 +72,16 @@ if [ "$DO_LOOP" == "yes" ]; then
 		if [ ${LOOPS} -gt 0 ]; then
 			echo "Restarted $LOOPS times"
 		fi
-		"$PHP_BINARY" "$POCKETMINE_FILE" $@
+		"$PHP_BINARY" "$POCKETMINE_FILE" "$@"
+		handle_exit_code $?
 		echo "To escape the loop, press CTRL+C now. Otherwise, wait 5 seconds for the server to restart."
 		echo ""
 		sleep 5
 		((LOOPS++))
 	done
 else
-	exec "$PHP_BINARY" "$POCKETMINE_FILE" $@
+	"$PHP_BINARY" "$POCKETMINE_FILE" "$@"
+	exitcode=$?
+	handle_exit_code $exitcode
+	exit $exitcode
 fi
diff --git a/tests/phpstan/configs/actual-problems.neon b/tests/phpstan/configs/actual-problems.neon
index 1d5e3dfb32..f15dc9d53e 100644
--- a/tests/phpstan/configs/actual-problems.neon
+++ b/tests/phpstan/configs/actual-problems.neon
@@ -5,11 +5,6 @@ parameters:
 			count: 2
 			path: ../../../build/make-release.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 \\$strings of function pocketmine\\\\build\\\\server_phar\\\\preg_quote_array expects array\\<string\\>, array\\<int, string\\|false\\> given\\.$#"
 			count: 1
@@ -25,16 +20,6 @@ parameters:
 			count: 1
 			path: ../../../src/Server.php
 
-		-
-			message: "#^Parameter \\#1 \\$input of function yaml_parse expects string, string\\|false given\\.$#"
-			count: 1
-			path: ../../../src/Server.php
-
-		-
-			message: "#^Cannot cast array\\<int, mixed\\>\\|string\\|false to string\\.$#"
-			count: 1
-			path: ../../../src/ServerConfigGroup.php
-
 		-
 			message: "#^Cannot cast mixed to int\\.$#"
 			count: 2
@@ -47,7 +32,7 @@ parameters:
 
 		-
 			message: "#^Cannot access offset 'git' on mixed\\.$#"
-			count: 2
+			count: 1
 			path: ../../../src/VersionInfo.php
 
 		-
@@ -61,10 +46,25 @@ parameters:
 			path: ../../../src/VersionInfo.php
 
 		-
-			message: "#^Cannot call method setFullBlock\\(\\) on pocketmine\\\\world\\\\format\\\\Chunk\\|null\\.$#"
+			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
+			count: 3
+			path: ../../../src/block/Block.php
+
+		-
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
+			count: 3
+			path: ../../../src/block/Block.php
+
+		-
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\format\\\\Chunk\\:\\:setBlockStateId\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/block/Block.php
 
+		-
+			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
+			count: 3
+			path: ../../../src/block/Block.php
+
 		-
 			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
@@ -95,6 +95,21 @@ parameters:
 			count: 1
 			path: ../../../src/block/Cactus.php
 
+		-
+			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
+			count: 2
+			path: ../../../src/block/ChorusFlower.php
+
+		-
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
+			count: 2
+			path: ../../../src/block/ChorusFlower.php
+
+		-
+			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\world\\\\World\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
+			count: 2
+			path: ../../../src/block/ChorusFlower.php
+
 		-
 			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getRealBlockSkyLightAt\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
@@ -121,7 +136,7 @@ parameters:
 			path: ../../../src/block/DragonEgg.php
 
 		-
-			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int\\<0, 255\\> given\\.$#"
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int\\<\\-64, 319\\> given\\.$#"
 			count: 1
 			path: ../../../src/block/DragonEgg.php
 
@@ -140,21 +155,6 @@ parameters:
 			count: 1
 			path: ../../../src/block/DragonEgg.php
 
-		-
-			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/block/Farmland.php
-
-		-
-			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/block/Farmland.php
-
-		-
-			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/block/Farmland.php
-
 		-
 			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
@@ -285,31 +285,16 @@ parameters:
 			count: 1
 			path: ../../../src/block/Leaves.php
 
-		-
-			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 11
-			path: ../../../src/block/Liquid.php
-
 		-
 			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/block/Liquid.php
 
-		-
-			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 11
-			path: ../../../src/block/Liquid.php
-
 		-
 			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
 			path: ../../../src/block/Liquid.php
 
-		-
-			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 11
-			path: ../../../src/block/Liquid.php
-
 		-
 			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\world\\\\World\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
@@ -426,14 +411,14 @@ parameters:
 			path: ../../../src/block/tile/Chest.php
 
 		-
-			message: "#^Constant pocketmine\\\\block\\\\tile\\\\Skull\\:\\:TAG_MOUTH_MOVING is unused\\.$#"
+			message: "#^Constant pocketmine\\\\block\\\\tile\\\\MobHead\\:\\:TAG_MOUTH_MOVING is unused\\.$#"
 			count: 1
-			path: ../../../src/block/tile/Skull.php
+			path: ../../../src/block/tile/MobHead.php
 
 		-
-			message: "#^Constant pocketmine\\\\block\\\\tile\\\\Skull\\:\\:TAG_MOUTH_TICK_COUNT is unused\\.$#"
+			message: "#^Constant pocketmine\\\\block\\\\tile\\\\MobHead\\:\\:TAG_MOUTH_TICK_COUNT is unused\\.$#"
 			count: 1
-			path: ../../../src/block/tile/Skull.php
+			path: ../../../src/block/tile/MobHead.php
 
 		-
 			message: "#^Parameter \\#2 \\$value of method pocketmine\\\\nbt\\\\tag\\\\CompoundTag\\:\\:setInt\\(\\) expects int, float\\|int given\\.$#"
@@ -441,29 +426,19 @@ parameters:
 			path: ../../../src/block/tile/Spawnable.php
 
 		-
-			message: "#^Parameter \\#2 \\$replace of function str_replace expects array\\|string, string\\|null given\\.$#"
+			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getPotentialLightAt\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
-			path: ../../../src/command/Command.php
+			path: ../../../src/block/utils/CropGrowthHelper.php
 
 		-
-			message: "#^Cannot call method startTiming\\(\\) on pocketmine\\\\timings\\\\TimingsHandler\\|null\\.$#"
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getPotentialLightAt\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
-			path: ../../../src/command/FormattedCommandAlias.php
+			path: ../../../src/block/utils/CropGrowthHelper.php
 
 		-
-			message: "#^Cannot call method stopTiming\\(\\) on pocketmine\\\\timings\\\\TimingsHandler\\|null\\.$#"
+			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\world\\\\World\\:\\:getPotentialLightAt\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
-			path: ../../../src/command/FormattedCommandAlias.php
-
-		-
-			message: "#^Cannot call method startTiming\\(\\) on pocketmine\\\\timings\\\\TimingsHandler\\|null\\.$#"
-			count: 1
-			path: ../../../src/command/SimpleCommandMap.php
-
-		-
-			message: "#^Cannot call method stopTiming\\(\\) on pocketmine\\\\timings\\\\TimingsHandler\\|null\\.$#"
-			count: 1
-			path: ../../../src/command/SimpleCommandMap.php
+			path: ../../../src/block/utils/CropGrowthHelper.php
 
 		-
 			message: "#^Cannot call method addParticle\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
@@ -505,11 +480,6 @@ parameters:
 			count: 1
 			path: ../../../src/command/defaults/TimingsCommand.php
 
-		-
-			message: "#^Call to function is_resource\\(\\) with resource will always evaluate to true\\.$#"
-			count: 2
-			path: ../../../src/console/ConsoleReader.php
-
 		-
 			message: "#^Parameter \\#1 \\$path of static method pocketmine\\\\utils\\\\Filesystem\\:\\:cleanPath\\(\\) expects string, mixed given\\.$#"
 			count: 1
@@ -565,11 +535,6 @@ parameters:
 			count: 1
 			path: ../../../src/entity/projectile/Projectile.php
 
-		-
-			message: "#^Parameter \\#2 \\$value of method pocketmine\\\\nbt\\\\tag\\\\CompoundTag\\:\\:setInt\\(\\) expects int, float\\|int given\\.$#"
-			count: 3
-			path: ../../../src/entity/projectile/Projectile.php
-
 		-
 			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
@@ -580,21 +545,6 @@ parameters:
 			count: 1
 			path: ../../../src/entity/projectile/Projectile.php
 
-		-
-			message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: ../../../src/inventory/CreativeInventory.php
-
-		-
-			message: "#^Parameter \\#1 \\$data of static method pocketmine\\\\item\\\\Item\\:\\:jsonDeserialize\\(\\) expects array\\{id\\: int, damage\\?\\: int, count\\?\\: int, nbt\\?\\: string, nbt_hex\\?\\: string, nbt_b64\\?\\: string\\}, mixed given\\.$#"
-			count: 1
-			path: ../../../src/inventory/CreativeInventory.php
-
-		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
-			count: 1
-			path: ../../../src/inventory/CreativeInventory.php
-
 		-
 			message: "#^Parameter \\#2 \\$recipe of class pocketmine\\\\event\\\\inventory\\\\CraftItemEvent constructor expects pocketmine\\\\crafting\\\\CraftingRecipe, pocketmine\\\\crafting\\\\CraftingRecipe\\|null given\\.$#"
 			count: 1
@@ -606,7 +556,22 @@ parameters:
 			path: ../../../src/inventory/transaction/CraftingTransaction.php
 
 		-
-			message: "#^Parameter \\#1 \\$buffer of method pocketmine\\\\nbt\\\\BaseNbtSerializer\\:\\:read\\(\\) expects string, string\\|false given\\.$#"
+			message: "#^Cannot cast mixed to int\\.$#"
+			count: 2
+			path: ../../../src/item/Item.php
+
+		-
+			message: "#^Parameter \\#1 \\$buffer of method pocketmine\\\\nbt\\\\BaseNbtSerializer\\:\\:read\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: ../../../src/item/Item.php
+
+		-
+			message: "#^Parameter \\#1 \\$string of function base64_decode expects string, mixed given\\.$#"
+			count: 1
+			path: ../../../src/item/Item.php
+
+		-
+			message: "#^Parameter \\#1 \\$string of function hex2bin expects string, mixed given\\.$#"
 			count: 1
 			path: ../../../src/item/Item.php
 
@@ -627,7 +592,7 @@ parameters:
 
 		-
 			message: "#^Cannot call method getLanguage\\(\\) on pocketmine\\\\player\\\\Player\\|null\\.$#"
-			count: 2
+			count: 4
 			path: ../../../src/network/mcpe/NetworkSession.php
 
 		-
@@ -656,7 +621,7 @@ parameters:
 			path: ../../../src/network/mcpe/NetworkSession.php
 
 		-
-			message: "#^Cannot call method setImmobile\\(\\) on pocketmine\\\\player\\\\Player\\|null\\.$#"
+			message: "#^Cannot call method setNoClientPredictions\\(\\) on pocketmine\\\\player\\\\Player\\|null\\.$#"
 			count: 2
 			path: ../../../src/network/mcpe/NetworkSession.php
 
@@ -670,21 +635,6 @@ parameters:
 			count: 1
 			path: ../../../src/network/mcpe/NetworkSession.php
 
-		-
-			message: "#^Parameter \\#1 \\$entity of method pocketmine\\\\network\\\\mcpe\\\\NetworkSession\\:\\:onEntityEffectAdded\\(\\) expects pocketmine\\\\entity\\\\Living, pocketmine\\\\player\\\\Player\\|null given\\.$#"
-			count: 1
-			path: ../../../src/network/mcpe/NetworkSession.php
-
-		-
-			message: "#^Parameter \\#1 \\$entity of method pocketmine\\\\network\\\\mcpe\\\\NetworkSession\\:\\:onEntityEffectRemoved\\(\\) expects pocketmine\\\\entity\\\\Living, pocketmine\\\\player\\\\Player\\|null given\\.$#"
-			count: 1
-			path: ../../../src/network/mcpe/NetworkSession.php
-
-		-
-			message: "#^Parameter \\#1 \\$entity of method pocketmine\\\\network\\\\mcpe\\\\NetworkSession\\:\\:syncAttributes\\(\\) expects pocketmine\\\\entity\\\\Living, pocketmine\\\\player\\\\Player\\|null given\\.$#"
-			count: 1
-			path: ../../../src/network/mcpe/NetworkSession.php
-
 		-
 			message: "#^Parameter \\#1 \\$for of method pocketmine\\\\network\\\\mcpe\\\\NetworkSession\\:\\:syncAbilities\\(\\) expects pocketmine\\\\player\\\\Player, pocketmine\\\\player\\\\Player\\|null given\\.$#"
 			count: 2
@@ -700,11 +650,31 @@ parameters:
 			count: 2
 			path: ../../../src/network/mcpe/NetworkSession.php
 
+		-
+			message: "#^Parameter \\#1 \\$playerInfo of class pocketmine\\\\event\\\\player\\\\PlayerResourcePackOfferEvent constructor expects pocketmine\\\\player\\\\PlayerInfo, pocketmine\\\\player\\\\PlayerInfo\\|null given\\.$#"
+			count: 1
+			path: ../../../src/network/mcpe/NetworkSession.php
+
 		-
 			message: "#^Parameter \\#1 \\$target of method pocketmine\\\\command\\\\Command\\:\\:testPermissionSilent\\(\\) expects pocketmine\\\\command\\\\CommandSender, pocketmine\\\\player\\\\Player\\|null given\\.$#"
 			count: 1
 			path: ../../../src/network/mcpe/NetworkSession.php
 
+		-
+			message: "#^Parameter \\#2 \\$entity of method pocketmine\\\\network\\\\mcpe\\\\EntityEventBroadcaster\\:\\:onEntityEffectAdded\\(\\) expects pocketmine\\\\entity\\\\Living, pocketmine\\\\player\\\\Player\\|null given\\.$#"
+			count: 1
+			path: ../../../src/network/mcpe/NetworkSession.php
+
+		-
+			message: "#^Parameter \\#2 \\$entity of method pocketmine\\\\network\\\\mcpe\\\\EntityEventBroadcaster\\:\\:onEntityEffectRemoved\\(\\) expects pocketmine\\\\entity\\\\Living, pocketmine\\\\player\\\\Player\\|null given\\.$#"
+			count: 1
+			path: ../../../src/network/mcpe/NetworkSession.php
+
+		-
+			message: "#^Parameter \\#2 \\$entity of method pocketmine\\\\network\\\\mcpe\\\\EntityEventBroadcaster\\:\\:syncAttributes\\(\\) expects pocketmine\\\\entity\\\\Living, pocketmine\\\\player\\\\Player\\|null given\\.$#"
+			count: 1
+			path: ../../../src/network/mcpe/NetworkSession.php
+
 		-
 			message: "#^Parameter \\#2 \\$player of class pocketmine\\\\network\\\\mcpe\\\\handler\\\\PreSpawnPacketHandler constructor expects pocketmine\\\\player\\\\Player, pocketmine\\\\player\\\\Player\\|null given\\.$#"
 			count: 1
@@ -740,11 +710,6 @@ parameters:
 			count: 1
 			path: ../../../src/network/mcpe/encryption/PrepareEncryptionTask.php
 
-		-
-			message: "#^Method pocketmine\\\\network\\\\mcpe\\\\raklib\\\\PthreadsChannelReader\\:\\:read\\(\\) should return string\\|null but returns mixed\\.$#"
-			count: 1
-			path: ../../../src/network/mcpe/raklib/PthreadsChannelReader.php
-
 		-
 			message: "#^Method pocketmine\\\\permission\\\\DefaultPermissions\\:\\:registerPermission\\(\\) should return pocketmine\\\\permission\\\\Permission but returns pocketmine\\\\permission\\\\Permission\\|null\\.$#"
 			count: 1
@@ -756,7 +721,7 @@ parameters:
 			path: ../../../src/permission/PermissionParser.php
 
 		-
-			message: "#^Parameter \\#2 \\$description of class pocketmine\\\\permission\\\\Permission constructor expects string\\|null, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$description of class pocketmine\\\\permission\\\\Permission constructor expects pocketmine\\\\lang\\\\Translatable\\|string\\|null, mixed given\\.$#"
 			count: 1
 			path: ../../../src/permission/PermissionParser.php
 
@@ -820,11 +785,6 @@ parameters:
 			count: 1
 			path: ../../../src/resourcepacks/ZippedResourcePack.php
 
-		-
-			message: "#^Parameter \\#2 \\$length of function fread expects int\\<0, max\\>, int given\\.$#"
-			count: 1
-			path: ../../../src/resourcepacks/ZippedResourcePack.php
-
 		-
 			message: "#^Property pocketmine\\\\resourcepacks\\\\ZippedResourcePack\\:\\:\\$fileResource \\(resource\\) does not accept resource\\|false\\.$#"
 			count: 1
@@ -835,54 +795,19 @@ parameters:
 			count: 1
 			path: ../../../src/resourcepacks/ZippedResourcePack.php
 
-		-
-			message: "#^Cannot call method getNotifier\\(\\) on pocketmine\\\\scheduler\\\\AsyncWorker\\|null\\.$#"
-			count: 1
-			path: ../../../src/scheduler/AsyncTask.php
-
-		-
-			message: "#^Cannot call method handleException\\(\\) on pocketmine\\\\scheduler\\\\AsyncWorker\\|null\\.$#"
-			count: 1
-			path: ../../../src/scheduler/AsyncTask.php
-
-		-
-			message: "#^PHPDoc type pocketmine\\\\scheduler\\\\AsyncWorker\\|null of property pocketmine\\\\scheduler\\\\AsyncTask\\:\\:\\$worker is not the same as PHPDoc type Worker of overridden property Threaded\\:\\:\\$worker\\.$#"
-			count: 1
-			path: ../../../src/scheduler/AsyncTask.php
-
-		-
-			message: "#^Parameter \\#1 \\$str of function igbinary_unserialize expects string, mixed given\\.$#"
-			count: 1
-			path: ../../../src/scheduler/AsyncTask.php
-
-		-
-			message: "#^Property pocketmine\\\\scheduler\\\\AsyncTask\\:\\:\\$result \\(bool\\|float\\|int\\|string\\|null\\) does not accept mixed\\.$#"
-			count: 1
-			path: ../../../src/scheduler/AsyncTask.php
-
 		-
 			message: "#^Property pocketmine\\\\scheduler\\\\BulkCurlTask\\:\\:\\$operations \\(string\\) does not accept string\\|null\\.$#"
 			count: 1
 			path: ../../../src/scheduler/BulkCurlTask.php
 
 		-
-			message: "#^Cannot call method getAsyncWorkerId\\(\\) on pocketmine\\\\scheduler\\\\AsyncWorker\\|null\\.$#"
-			count: 1
-			path: ../../../src/scheduler/DumpWorkerMemoryTask.php
-
-		-
-			message: "#^Cannot call method getLogger\\(\\) on pocketmine\\\\scheduler\\\\AsyncWorker\\|null\\.$#"
-			count: 1
-			path: ../../../src/scheduler/DumpWorkerMemoryTask.php
-
-		-
-			message: "#^Cannot call method getNextRun\\(\\) on array\\<string, int\\|pocketmine\\\\scheduler\\\\TaskHandler\\>\\|int\\|pocketmine\\\\scheduler\\\\TaskHandler\\.$#"
+			message: "#^Cannot call method getNextRun\\(\\) on array\\<string, int\\|pocketmine\\\\scheduler\\\\TaskHandler\\<covariant pocketmine\\\\scheduler\\\\Task\\>\\>\\|int\\|pocketmine\\\\scheduler\\\\TaskHandler\\<covariant pocketmine\\\\scheduler\\\\Task\\>\\.$#"
 			count: 1
 			path: ../../../src/scheduler/TaskScheduler.php
 
 		-
 			message: "#^Cannot access offset string on mixed\\.$#"
-			count: 3
+			count: 2
 			path: ../../../src/utils/Config.php
 
 		-
@@ -916,19 +841,14 @@ parameters:
 			path: ../../../src/utils/Utils.php
 
 		-
-			message: "#^Parameter \\#1 \\$trace of static method pocketmine\\\\utils\\\\Utils\\:\\:printableTrace\\(\\) expects array\\<int, array\\<string, mixed\\>\\>, array given\\.$#"
+			message: "#^Parameter \\#2 \\$file of class pocketmine\\\\thread\\\\ThreadCrashInfoFrame constructor expects string\\|null, mixed given\\.$#"
 			count: 1
 			path: ../../../src/utils/Utils.php
 
 		-
-			message: "#^Cannot call method getFullBlock\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			message: "#^Parameter \\#3 \\$line of class pocketmine\\\\thread\\\\ThreadCrashInfoFrame constructor expects int, mixed given\\.$#"
 			count: 1
-			path: ../../../src/world/Explosion.php
-
-		-
-			message: "#^Only numeric types are allowed in /, float\\|null given on the left side\\.$#"
-			count: 1
-			path: ../../../src/world/Explosion.php
+			path: ../../../src/utils/Utils.php
 
 		-
 			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getTileAt\\(\\) expects int, float\\|int given\\.$#"
@@ -1000,11 +920,6 @@ parameters:
 			count: 1
 			path: ../../../src/world/World.php
 
-		-
-			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getFullLightAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/world/World.php
-
 		-
 			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getTileAt\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
@@ -1012,12 +927,12 @@ parameters:
 
 		-
 			message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
-			count: 3
+			count: 2
 			path: ../../../src/world/World.php
 
 		-
 			message: "#^Parameter \\#1 \\$x of static method pocketmine\\\\world\\\\World\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
-			count: 3
+			count: 2
 			path: ../../../src/world/World.php
 
 		-
@@ -1030,11 +945,6 @@ parameters:
 			count: 1
 			path: ../../../src/world/World.php
 
-		-
-			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getFullLightAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/world/World.php
-
 		-
 			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getTileAt\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
@@ -1042,17 +952,12 @@ parameters:
 
 		-
 			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
-			count: 3
+			count: 2
 			path: ../../../src/world/World.php
 
 		-
 			message: "#^Parameter \\#2 \\$y of static method pocketmine\\\\world\\\\World\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
-			count: 3
-			path: ../../../src/world/World.php
-
-		-
-			message: "#^Parameter \\#3 \\$chunk of method pocketmine\\\\player\\\\Player\\:\\:onChunkChanged\\(\\) expects pocketmine\\\\world\\\\format\\\\Chunk, pocketmine\\\\world\\\\format\\\\Chunk\\|null given\\.$#"
-			count: 1
+			count: 2
 			path: ../../../src/world/World.php
 
 		-
@@ -1065,11 +970,6 @@ parameters:
 			count: 1
 			path: ../../../src/world/World.php
 
-		-
-			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\world\\\\World\\:\\:getFullLightAt\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: ../../../src/world/World.php
-
 		-
 			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\world\\\\World\\:\\:getTileAt\\(\\) expects int, float\\|int given\\.$#"
 			count: 1
@@ -1077,12 +977,12 @@ parameters:
 
 		-
 			message: "#^Parameter \\#3 \\$z of method pocketmine\\\\world\\\\World\\:\\:isInWorld\\(\\) expects int, float\\|int given\\.$#"
-			count: 3
+			count: 2
 			path: ../../../src/world/World.php
 
 		-
 			message: "#^Parameter \\#3 \\$z of static method pocketmine\\\\world\\\\World\\:\\:blockHash\\(\\) expects int, float\\|int given\\.$#"
-			count: 3
+			count: 2
 			path: ../../../src/world/World.php
 
 		-
@@ -1125,11 +1025,6 @@ parameters:
 			count: 1
 			path: ../../../src/world/format/io/region/RegionLoader.php
 
-		-
-			message: "#^Parameter \\#2 \\$length of function fread expects int\\<0, max\\>, int given\\.$#"
-			count: 1
-			path: ../../../src/world/format/io/region/RegionLoader.php
-
 		-
 			message: "#^Parameter \\#2 \\$size of function ftruncate expects int\\<0, max\\>, int given\\.$#"
 			count: 1
@@ -1166,30 +1061,25 @@ parameters:
 			path: ../../../src/world/generator/hell/Nether.php
 
 		-
-			message: "#^Cannot call method setBiomeId\\(\\) on pocketmine\\\\world\\\\format\\\\Chunk\\|null\\.$#"
-			count: 1
-			path: ../../../src/world/generator/hell/Nether.php
+			message: "#^Offset int does not exist on SplFixedArray\\<float\\>\\|null\\.$#"
+			count: 4
+			path: ../../../src/world/generator/noise/Noise.php
 
 		-
-			message: "#^Cannot call method setFullBlock\\(\\) on pocketmine\\\\world\\\\format\\\\Chunk\\|null\\.$#"
-			count: 3
-			path: ../../../src/world/generator/hell/Nether.php
+			message: "#^Parameter \\$q0 of static method pocketmine\\\\world\\\\generator\\\\noise\\\\Noise\\:\\:linearLerp\\(\\) expects float, float\\|null given\\.$#"
+			count: 1
+			path: ../../../src/world/generator/noise/Noise.php
+
+		-
+			message: "#^Parameter \\$q1 of static method pocketmine\\\\world\\\\generator\\\\noise\\\\Noise\\:\\:linearLerp\\(\\) expects float, float\\|null given\\.$#"
+			count: 1
+			path: ../../../src/world/generator/noise/Noise.php
 
 		-
 			message: "#^Cannot call method getBiomeId\\(\\) on pocketmine\\\\world\\\\format\\\\Chunk\\|null\\.$#"
 			count: 1
 			path: ../../../src/world/generator/normal/Normal.php
 
-		-
-			message: "#^Cannot call method setBiomeId\\(\\) on pocketmine\\\\world\\\\format\\\\Chunk\\|null\\.$#"
-			count: 1
-			path: ../../../src/world/generator/normal/Normal.php
-
-		-
-			message: "#^Cannot call method setFullBlock\\(\\) on pocketmine\\\\world\\\\format\\\\Chunk\\|null\\.$#"
-			count: 3
-			path: ../../../src/world/generator/normal/Normal.php
-
 		-
 			message: "#^Parameter \\#1 \\$start of method pocketmine\\\\utils\\\\Random\\:\\:nextRange\\(\\) expects int, float\\|int given\\.$#"
 			count: 2
@@ -1210,28 +1100,13 @@ parameters:
 			count: 1
 			path: ../../../src/world/generator/object/TallGrass.php
 
-		-
-			message: "#^Cannot call method getBiomeId\\(\\) on pocketmine\\\\world\\\\format\\\\Chunk\\|null\\.$#"
-			count: 1
-			path: ../../../src/world/generator/populator/GroundCover.php
-
-		-
-			message: "#^Cannot call method getFullBlock\\(\\) on pocketmine\\\\world\\\\format\\\\Chunk\\|null\\.$#"
-			count: 2
-			path: ../../../src/world/generator/populator/GroundCover.php
-
-		-
-			message: "#^Cannot call method setFullBlock\\(\\) on pocketmine\\\\world\\\\format\\\\Chunk\\|null\\.$#"
-			count: 1
-			path: ../../../src/world/generator/populator/GroundCover.php
-
 		-
 			message: "#^Cannot call method getBlockLightArray\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
 			count: 1
 			path: ../../../src/world/light/BlockLightUpdate.php
 
 		-
-			message: "#^Cannot call method getFullBlock\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			message: "#^Cannot call method getBlockStateId\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
 			count: 1
 			path: ../../../src/world/light/BlockLightUpdate.php
 
@@ -1240,16 +1115,6 @@ parameters:
 			count: 1
 			path: ../../../src/world/light/BlockLightUpdate.php
 
-		-
-			message: "#^Only numeric types are allowed in \\-, int\\|null given on the right side\\.$#"
-			count: 1
-			path: ../../../src/world/light/BlockLightUpdate.php
-
-		-
-			message: "#^Parameter \\#4 \\$newLevel of method pocketmine\\\\world\\\\light\\\\LightUpdate\\:\\:setAndUpdateLight\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: ../../../src/world/light/BlockLightUpdate.php
-
 		-
 			message: "#^Property pocketmine\\\\world\\\\light\\\\LightPopulationTask\\:\\:\\$resultBlockLightArrays \\(string\\) does not accept string\\|null\\.$#"
 			count: 1
@@ -1265,24 +1130,14 @@ parameters:
 			count: 1
 			path: ../../../src/world/light/LightPopulationTask.php
 
-		-
-			message: "#^Cannot call method getFullBlock\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
-			count: 1
-			path: ../../../src/world/light/LightUpdate.php
-
-		-
-			message: "#^Only numeric types are allowed in \\-, int\\|null given on the right side\\.$#"
-			count: 1
-			path: ../../../src/world/light/LightUpdate.php
-
 		-
 			message: "#^Cannot call method getBlockSkyLightArray\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
 			count: 1
 			path: ../../../src/world/light/SkyLightUpdate.php
 
 		-
-			message: "#^Cannot call method getFullBlock\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
-			count: 1
+			message: "#^Cannot call method getBlockStateId\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			count: 2
 			path: ../../../src/world/light/SkyLightUpdate.php
 
 		-
@@ -1310,21 +1165,6 @@ parameters:
 			count: 1
 			path: ../../../src/world/light/SkyLightUpdate.php
 
-		-
-			message: "#^Only booleans are allowed in an if condition, bool\\|null given\\.$#"
-			count: 3
-			path: ../../../src/world/light/SkyLightUpdate.php
-
-		-
-			message: "#^Only numeric types are allowed in \\+, int\\|false given on the left side\\.$#"
-			count: 1
-			path: ../../../src/world/light/SkyLightUpdate.php
-
-		-
-			message: "#^Only numeric types are allowed in \\-, int\\|null given on the right side\\.$#"
-			count: 1
-			path: ../../../src/world/light/SkyLightUpdate.php
-
 		-
 			message: "#^Parameter \\#1 \\$chunk of static method pocketmine\\\\world\\\\light\\\\SkyLightUpdate\\:\\:recalculateHeightMap\\(\\) expects pocketmine\\\\world\\\\format\\\\Chunk, pocketmine\\\\world\\\\format\\\\Chunk\\|null given\\.$#"
 			count: 1
@@ -1335,28 +1175,3 @@ parameters:
 			count: 1
 			path: ../../../src/world/light/SkyLightUpdate.php
 
-		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
-			count: 1
-			path: ../../phpunit/block/BlockTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
-			count: 1
-			path: ../../phpunit/block/regenerate_consistency_check.php
-
-		-
-			message: "#^Property pocketmine\\\\event\\\\HandlerListManagerTest\\:\\:\\$isValidFunc \\(Closure\\(ReflectionClass\\<pocketmine\\\\event\\\\Event\\>\\)\\: bool\\) does not accept Closure\\|null\\.$#"
-			count: 1
-			path: ../../phpunit/event/HandlerListManagerTest.php
-
-		-
-			message: "#^Property pocketmine\\\\event\\\\HandlerListManagerTest\\:\\:\\$resolveParentFunc \\(Closure\\(ReflectionClass\\<pocketmine\\\\event\\\\Event\\>\\)\\: ReflectionClass\\<pocketmine\\\\event\\\\Event\\>\\|null\\) does not accept Closure\\|null\\.$#"
-			count: 1
-			path: ../../phpunit/event/HandlerListManagerTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$logFile of class pocketmine\\\\utils\\\\MainLogger constructor expects string, string\\|false given\\.$#"
-			count: 1
-			path: ../../phpunit/scheduler/AsyncPoolTest.php
-
diff --git a/tests/phpstan/configs/gc-hacks.neon b/tests/phpstan/configs/gc-hacks.neon
deleted file mode 100644
index 37ac037f18..0000000000
--- a/tests/phpstan/configs/gc-hacks.neon
+++ /dev/null
@@ -1,37 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Property pocketmine\\\\entity\\\\Human\\:\\:\\$enderInventory \\(pocketmine\\\\inventory\\\\PlayerEnderInventory\\) does not accept null\\.$#"
-			count: 1
-			path: ../../../src/entity/Human.php
-
-		-
-			message: "#^Property pocketmine\\\\entity\\\\Human\\:\\:\\$hungerManager \\(pocketmine\\\\entity\\\\HungerManager\\) does not accept null\\.$#"
-			count: 1
-			path: ../../../src/entity/Human.php
-
-		-
-			message: "#^Property pocketmine\\\\entity\\\\Human\\:\\:\\$inventory \\(pocketmine\\\\inventory\\\\PlayerInventory\\) does not accept null\\.$#"
-			count: 1
-			path: ../../../src/entity/Human.php
-
-		-
-			message: "#^Property pocketmine\\\\entity\\\\Human\\:\\:\\$offHandInventory \\(pocketmine\\\\inventory\\\\PlayerOffHandInventory\\) does not accept null\\.$#"
-			count: 1
-			path: ../../../src/entity/Human.php
-
-		-
-			message: "#^Property pocketmine\\\\entity\\\\Human\\:\\:\\$xpManager \\(pocketmine\\\\entity\\\\ExperienceManager\\) does not accept null\\.$#"
-			count: 1
-			path: ../../../src/entity/Human.php
-
-		-
-			message: "#^Property pocketmine\\\\entity\\\\Living\\:\\:\\$armorInventory \\(pocketmine\\\\inventory\\\\ArmorInventory\\) does not accept null\\.$#"
-			count: 1
-			path: ../../../src/entity/Living.php
-
-		-
-			message: "#^Property pocketmine\\\\entity\\\\Living\\:\\:\\$effectManager \\(pocketmine\\\\entity\\\\effect\\\\EffectManager\\) does not accept null\\.$#"
-			count: 1
-			path: ../../../src/entity/Living.php
-
diff --git a/tests/phpstan/configs/php-bugs.neon b/tests/phpstan/configs/php-bugs.neon
index 4475ec4684..13a42a53bb 100644
--- a/tests/phpstan/configs/php-bugs.neon
+++ b/tests/phpstan/configs/php-bugs.neon
@@ -1,6 +1,11 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\handler\\\\StupidJsonDecodeTest\\:\\:\\$stupidJsonDecodeFunc \\(Closure\\(string, bool\\=\\)\\: mixed\\) does not accept Closure\\|null\\.$#"
+			message: "#^Property pocketmine\\\\event\\\\HandlerListManagerTest\\:\\:\\$isValidFunc \\(Closure\\(ReflectionClass\\<pocketmine\\\\event\\\\Event\\>\\)\\: bool\\) does not accept Closure\\|null\\.$#"
 			count: 1
-			path: ../../phpunit/network/mcpe/handler/StupidJsonDecodeTest.php
+			path: ../../phpunit/event/HandlerListManagerTest.php
+
+		-
+			message: "#^Property pocketmine\\\\event\\\\HandlerListManagerTest\\:\\:\\$resolveParentFunc \\(Closure\\(ReflectionClass\\<pocketmine\\\\event\\\\Event\\>\\)\\: \\(ReflectionClass\\<pocketmine\\\\event\\\\Event\\>\\|null\\)\\) does not accept Closure\\|null\\.$#"
+			count: 1
+			path: ../../phpunit/event/HandlerListManagerTest.php
diff --git a/tests/phpstan/configs/phpstan-bugs.neon b/tests/phpstan/configs/phpstan-bugs.neon
index 3ee56e8be5..6f2c94223c 100644
--- a/tests/phpstan/configs/phpstan-bugs.neon
+++ b/tests/phpstan/configs/phpstan-bugs.neon
@@ -1,30 +1,80 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Instanceof between pocketmine\\\\block\\\\utils\\\\BannerPatternLayer and pocketmine\\\\block\\\\utils\\\\BannerPatternLayer will always evaluate to true\\.$#"
+			message: "#^Method pocketmine\\\\block\\\\CakeWithCandle\\:\\:onInteractCandle\\(\\) has parameter \\$returnedItems with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: ../../../src/block/BaseBanner.php
+			path: ../../../src/block/CakeWithCandle.php
 
 		-
-			message: "#^Comparison operation \"\\<\" between int\\<1, max\\> and 1 is always false\\.$#"
+			message: "#^Method pocketmine\\\\block\\\\CopperDoor\\:\\:onInteractCopper\\(\\) has parameter \\$returnedItems with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: ../../../src/console/ConsoleCommandSender.php
+			path: ../../../src/block/CopperDoor.php
+
+		-
+			message: "#^Method pocketmine\\\\block\\\\CopperTrapdoor\\:\\:onInteractCopper\\(\\) has parameter \\$returnedItems with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: ../../../src/block/CopperTrapdoor.php
+
+		-
+			message: "#^Method pocketmine\\\\block\\\\DoubleTallGrass\\:\\:traitGetDropsForIncompatibleTool\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: ../../../src/block/DoubleTallGrass.php
+
+		-
+			message: "#^Creating callable from a non\\-native static method pocketmine\\\\item\\\\VanillaItems\\:\\:ACACIA_SIGN\\(\\)\\.$#"
+			count: 1
+			path: ../../../src/block/VanillaBlocks.php
+
+		-
+			message: "#^Creating callable from a non\\-native static method pocketmine\\\\item\\\\VanillaItems\\:\\:BIRCH_SIGN\\(\\)\\.$#"
+			count: 1
+			path: ../../../src/block/VanillaBlocks.php
+
+		-
+			message: "#^Creating callable from a non\\-native static method pocketmine\\\\item\\\\VanillaItems\\:\\:CHERRY_SIGN\\(\\)\\.$#"
+			count: 1
+			path: ../../../src/block/VanillaBlocks.php
+
+		-
+			message: "#^Creating callable from a non\\-native static method pocketmine\\\\item\\\\VanillaItems\\:\\:CRIMSON_SIGN\\(\\)\\.$#"
+			count: 1
+			path: ../../../src/block/VanillaBlocks.php
+
+		-
+			message: "#^Creating callable from a non\\-native static method pocketmine\\\\item\\\\VanillaItems\\:\\:DARK_OAK_SIGN\\(\\)\\.$#"
+			count: 1
+			path: ../../../src/block/VanillaBlocks.php
+
+		-
+			message: "#^Creating callable from a non\\-native static method pocketmine\\\\item\\\\VanillaItems\\:\\:JUNGLE_SIGN\\(\\)\\.$#"
+			count: 1
+			path: ../../../src/block/VanillaBlocks.php
+
+		-
+			message: "#^Creating callable from a non\\-native static method pocketmine\\\\item\\\\VanillaItems\\:\\:MANGROVE_SIGN\\(\\)\\.$#"
+			count: 1
+			path: ../../../src/block/VanillaBlocks.php
+
+		-
+			message: "#^Creating callable from a non\\-native static method pocketmine\\\\item\\\\VanillaItems\\:\\:OAK_SIGN\\(\\)\\.$#"
+			count: 1
+			path: ../../../src/block/VanillaBlocks.php
+
+		-
+			message: "#^Creating callable from a non\\-native static method pocketmine\\\\item\\\\VanillaItems\\:\\:SPRUCE_SIGN\\(\\)\\.$#"
+			count: 1
+			path: ../../../src/block/VanillaBlocks.php
+
+		-
+			message: "#^Creating callable from a non\\-native static method pocketmine\\\\item\\\\VanillaItems\\:\\:WARPED_SIGN\\(\\)\\.$#"
+			count: 1
+			path: ../../../src/block/VanillaBlocks.php
 
 		-
 			message: "#^Call to function assert\\(\\) with false and 'unknown hit type' will always evaluate to false\\.$#"
 			count: 1
 			path: ../../../src/entity/projectile/Projectile.php
 
-		-
-			message: "#^Match arm comparison between 4 and 4 is always true\\.$#"
-			count: 1
-			path: ../../../src/network/mcpe/handler/InGamePacketHandler.php
-
-		-
-			message: "#^Match arm is unreachable because previous comparison is always true\\.$#"
-			count: 1
-			path: ../../../src/network/mcpe/handler/InGamePacketHandler.php
-
 		-
 			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\raklib\\\\PthreadsChannelWriter\\:\\:\\$buffer is never read, only written\\.$#"
 			count: 1
@@ -35,43 +85,33 @@ parameters:
 			count: 1
 			path: ../../../src/network/mcpe/raklib/SnoozeAwarePthreadsChannelWriter.php
 
-		-
-			message: "#^Comparison operation \"\\<\" between int\\<1, max\\> and 1 is always false\\.$#"
-			count: 1
-			path: ../../../src/player/Player.php
-
 		-
 			message: "#^Dead catch \\- RuntimeException is never thrown in the try block\\.$#"
 			count: 1
 			path: ../../../src/plugin/PluginManager.php
 
-		-
-			message: "#^Offset \\(int\\|string\\) on array\\<pocketmine\\\\plugin\\\\Plugin\\> in isset\\(\\) always exists and is not nullable\\.$#"
-			count: 1
-			path: ../../../src/plugin/PluginManager.php
-
-		-
-			message: "#^Static property pocketmine\\\\scheduler\\\\AsyncTask\\:\\:\\$threadLocalStorage \\(ArrayObject\\<int, array\\<string, mixed\\>\\>\\|null\\) does not accept non\\-empty\\-array\\<int, non\\-empty\\-array\\<string, mixed\\>\\>\\|ArrayObject\\<int, array\\<string, mixed\\>\\>\\.$#"
-			count: 1
-			path: ../../../src/scheduler/AsyncTask.php
-
-		-
-			message: "#^Property pocketmine\\\\thread\\\\Thread\\:\\:\\$classLoaders \\(\\(iterable\\<ClassLoader\\>&Threaded\\)\\|null\\) does not accept array\\<int, ClassLoader\\>\\|\\(iterable\\<ClassLoader\\>&Threaded\\)\\.$#"
-			count: 1
-			path: ../../../src/thread/Thread.php
-
-		-
-			message: "#^Property pocketmine\\\\thread\\\\Worker\\:\\:\\$classLoaders \\(\\(iterable\\<ClassLoader\\>&Threaded\\)\\|null\\) does not accept array\\<int, ClassLoader\\>\\|\\(iterable\\<ClassLoader\\>&Threaded\\)\\.$#"
-			count: 1
-			path: ../../../src/thread/Worker.php
-
-		-
-			message: "#^Call to function is_resource\\(\\) with resource will always evaluate to true\\.$#"
-			count: 2
-			path: ../../../src/world/format/io/region/RegionLoader.php
-
 		-
 			message: "#^Casting to int something that's already int\\.$#"
 			count: 1
 			path: ../../../src/world/generator/normal/Normal.php
 
+		-
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertFalse\\(\\) with false will always evaluate to true\\.$#"
+			count: 1
+			path: ../../phpunit/promise/PromiseTest.php
+
+		-
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) with false and 'All promise should…' will always evaluate to false\\.$#"
+			count: 1
+			path: ../../phpunit/promise/PromiseTest.php
+
+		-
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) with false will always evaluate to false\\.$#"
+			count: 2
+			path: ../../phpunit/promise/PromiseTest.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between 0 and 0 will always evaluate to true\\.$#"
+			count: 1
+			path: ../rules/UnsafeForeachArrayOfStringRule.php
+
diff --git a/tests/phpstan/configs/runtime-type-checks.neon b/tests/phpstan/configs/runtime-type-checks.neon
deleted file mode 100644
index fb1e456b78..0000000000
--- a/tests/phpstan/configs/runtime-type-checks.neon
+++ /dev/null
@@ -1,12 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Casting to int something that's already int\\.$#"
-			count: 2
-			path: ../../../src/item/Item.php
-
-		-
-			message: "#^Instanceof between pocketmine\\\\nbt\\\\tag\\\\CompoundTag and pocketmine\\\\nbt\\\\tag\\\\CompoundTag will always evaluate to true\\.$#"
-			count: 1
-			path: ../../../src/network/mcpe/handler/InGamePacketHandler.php
-
diff --git a/tests/phpstan/rules/DeprecatedLegacyEnumAccessRule.php b/tests/phpstan/rules/DeprecatedLegacyEnumAccessRule.php
new file mode 100644
index 0000000000..4fa7670224
--- /dev/null
+++ b/tests/phpstan/rules/DeprecatedLegacyEnumAccessRule.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\phpstan\rules;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\StaticCall;
+use PHPStan\Analyser\Scope;
+use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleErrorBuilder;
+use PHPStan\Type\TypeWithClassName;
+use pocketmine\utils\LegacyEnumShimTrait;
+use function sprintf;
+
+/**
+ * @phpstan-implements Rule<StaticCall>
+ */
+final class DeprecatedLegacyEnumAccessRule implements Rule{
+
+	public function getNodeType() : string{
+		return StaticCall::class;
+	}
+
+	public function processNode(Node $node, Scope $scope) : array{
+		/** @var StaticCall $node */
+		if(!$node->name instanceof Node\Identifier){
+			return [];
+		}
+		$caseName = $node->name->name;
+		$classType = $node->class instanceof Node\Name ?
+			$scope->resolveTypeByName($node->class) :
+			$scope->getType($node->class);
+
+		if(!$classType instanceof TypeWithClassName){
+			return [];
+		}
+
+		$reflection = $classType->getClassReflection();
+		if($reflection === null || !$reflection->hasTraitUse(LegacyEnumShimTrait::class) || !$reflection->implementsInterface(\UnitEnum::class)){
+			return [];
+		}
+
+		if(!$reflection->hasNativeMethod($caseName)){
+			return [
+				RuleErrorBuilder::message(sprintf(
+					'Use of legacy enum case accessor %s::%s().',
+					$reflection->getName(),
+					$caseName
+				))->tip(sprintf(
+					'Access the enum constant directly instead (remove the brackets), e.g. %s::%s',
+					$reflection->getName(),
+					$caseName
+				))->build()
+			];
+		}
+
+		return [];
+	}
+}
diff --git a/tests/phpstan/rules/DisallowForeachByReferenceRule.php b/tests/phpstan/rules/DisallowForeachByReferenceRule.php
new file mode 100644
index 0000000000..79124d3283
--- /dev/null
+++ b/tests/phpstan/rules/DisallowForeachByReferenceRule.php
@@ -0,0 +1,53 @@
+<?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\phpstan\rules;
+
+use PhpParser\Node;
+use PhpParser\Node\Stmt\Foreach_;
+use PHPStan\Analyser\Scope;
+use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleErrorBuilder;
+
+/**
+ * @phpstan-implements Rule<Foreach_>
+ */
+final class DisallowForeachByReferenceRule implements Rule{
+
+	public function getNodeType() : string{
+		return Foreach_::class;
+	}
+
+	public function processNode(Node $node, Scope $scope) : array{
+		/** @var Foreach_ $node */
+		if($node->byRef){
+			return [
+				RuleErrorBuilder::message("Foreach by-reference is not allowed, because it has surprising behaviour.")
+					->tip("If the value variable is used outside of the foreach construct (e.g. in a second foreach), the iterable's contents will be unexpectedly altered.")
+					->build()
+			];
+		}
+
+		return [];
+	}
+}
diff --git a/tests/phpstan/rules/UnsafeForeachArrayOfStringRule.php b/tests/phpstan/rules/UnsafeForeachArrayOfStringRule.php
index d53baa3651..745cf2109d 100644
--- a/tests/phpstan/rules/UnsafeForeachArrayOfStringRule.php
+++ b/tests/phpstan/rules/UnsafeForeachArrayOfStringRule.php
@@ -28,6 +28,7 @@ use PhpParser\Node\Stmt\Foreach_;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
+use PHPStan\Type\BenevolentUnionType;
 use PHPStan\Type\ClassStringType;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\StringType;
@@ -62,8 +63,17 @@ final class UnsafeForeachArrayOfStringRule implements Rule{
 
 		$hasCastableKeyTypes = false;
 		$expectsIntKeyTypes = false;
-		TypeTraverser::map($iterableType->getIterableKeyType(), function(Type $type, callable $traverse) use (&$hasCastableKeyTypes, &$expectsIntKeyTypes) : Type{
-			if($type instanceof IntegerType){
+		$implicitType = false;
+		$benevolentUnionDepth = 0;
+		TypeTraverser::map($iterableType->getIterableKeyType(), function(Type $type, callable $traverse) use (&$hasCastableKeyTypes, &$expectsIntKeyTypes, &$benevolentUnionDepth, &$implicitType) : Type{
+			if($type instanceof BenevolentUnionType){
+				$implicitType = true;
+				$benevolentUnionDepth++;
+				$result = $traverse($type);
+				$benevolentUnionDepth--;
+				return $result;
+			}
+			if($type instanceof IntegerType && $benevolentUnionDepth === 0){
 				$expectsIntKeyTypes = true;
 				return $type;
 			}
@@ -78,12 +88,20 @@ final class UnsafeForeachArrayOfStringRule implements Rule{
 			return $type;
 		});
 		if($hasCastableKeyTypes && !$expectsIntKeyTypes){
-			$func = \Closure::fromCallable([Utils::class, 'stringifyKeys']);
+			$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",
+					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(sprintf("Use %s() for a safe Generator-based iterator.", Utils::getNiceClosureName($func)))->build()
+				))->tip($tip)->build()
 			];
 		}
 		return [];
diff --git a/tests/phpstan/stubs/phpasn1.stub b/tests/phpstan/stubs/phpasn1.stub
deleted file mode 100644
index b459289efb..0000000000
--- a/tests/phpstan/stubs/phpasn1.stub
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/*
- * This file is part of the PHPASN1 library.
- *
- * Copyright © Friedrich Große <friedrich.grosse@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace FG\ASN1\Universal;
-
-class Integer
-{
-    /**
-     * @param int|string $value
-     */
-    public function __construct($value){}
-
-    /** @return int|string */
-    public function getContent(){}
-}
diff --git a/tests/phpstan/stubs/pmmpthread.stub b/tests/phpstan/stubs/pmmpthread.stub
new file mode 100644
index 0000000000..9fe0a850af
--- /dev/null
+++ b/tests/phpstan/stubs/pmmpthread.stub
@@ -0,0 +1,35 @@
+<?php
+
+namespace pmmp\thread;
+
+/**
+ * @implements \IteratorAggregate<array-key, mixed>
+ */
+abstract class ThreadSafe implements \IteratorAggregate{
+
+    /**
+     * @template TReturn
+     * @param \Closure() : TReturn $function
+     * @param mixed ...$args
+     * @return TReturn
+     */
+    public function synchronized(\Closure $function, mixed ...$args) : mixed{}
+}
+
+/**
+ * @template TKey of array-key
+ * @template TValue
+ * @implements \ArrayAccess<TKey, TValue>
+ */
+final class ThreadSafeArray extends ThreadSafe implements \Countable, \ArrayAccess{
+
+    /**
+     * @return TValue|null
+     */
+    public function pop() : mixed{}
+
+    /**
+     * @return TValue|null
+     */
+    public function shift() : mixed{}
+}
diff --git a/tests/phpstan/stubs/pthreads.stub b/tests/phpstan/stubs/pthreads.stub
deleted file mode 100644
index 054c8c372a..0000000000
--- a/tests/phpstan/stubs/pthreads.stub
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-/**
- * @implements \Traversable<array-key, mixed>
- */
-class Threaded implements \Traversable{}
diff --git a/tests/phpunit/block/BlockTest.php b/tests/phpunit/block/BlockTest.php
index c8fbf513fb..841917787a 100644
--- a/tests/phpunit/block/BlockTest.php
+++ b/tests/phpunit/block/BlockTest.php
@@ -24,67 +24,50 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use PHPUnit\Framework\TestCase;
-use function file_get_contents;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Filesystem;
+use pocketmine\utils\Utils;
+use function implode;
 use function is_array;
+use function is_int;
+use function is_string;
 use function json_decode;
+use function log;
+use const JSON_THROW_ON_ERROR;
 
 class BlockTest extends TestCase{
 
-	/** @var BlockFactory */
+	/** @var RuntimeBlockStateRegistry */
 	private $blockFactory;
 
 	public function setUp() : void{
-		$this->blockFactory = new BlockFactory();
+		$this->blockFactory = new RuntimeBlockStateRegistry();
 	}
 
 	/**
 	 * Test registering a block which would overwrite another block, without forcing it
 	 */
 	public function testAccidentalOverrideBlock() : void{
-		$block = new MyCustomBlock(new BlockIdentifier(BlockLegacyIds::COBBLESTONE, 0), "Cobblestone", BlockBreakInfo::instant());
+		$block = new MyCustomBlock(new BlockIdentifier(BlockTypeIds::COBBLESTONE), "Cobblestone", new BlockTypeInfo(BlockBreakInfo::instant()));
 		$this->expectException(\InvalidArgumentException::class);
 		$this->blockFactory->register($block);
 	}
 
-	/**
-	 * Test registering a block deliberately overwriting another block works as expected
-	 */
-	public function testDeliberateOverrideBlock() : void{
-		$block = new MyCustomBlock(new BlockIdentifier(BlockLegacyIds::COBBLESTONE, 0), "Cobblestone", BlockBreakInfo::instant());
-		$this->blockFactory->register($block, true);
-		self::assertInstanceOf(MyCustomBlock::class, $this->blockFactory->get($block->getId(), 0));
-	}
-
 	/**
 	 * Test registering a new block which does not yet exist
 	 */
 	public function testRegisterNewBlock() : void{
-		for($i = 0; $i < 256; ++$i){
-			if(!$this->blockFactory->isRegistered($i)){
-				$b = new StrangeNewBlock(new BlockIdentifier($i, 0), "Strange New Block", BlockBreakInfo::instant());
-				$this->blockFactory->register($b);
-				self::assertInstanceOf(StrangeNewBlock::class, $this->blockFactory->get($b->getId(), 0));
-				return;
-			}
-		}
-
-		throw new \RuntimeException("Can't test registering new blocks because no unused spaces left");
-	}
-
-	/**
-	 * Verifies that blocks with IDs larger than 255 can't be registered
-	 */
-	public function testRegisterIdTooLarge() : void{
-		self::expectException(\RuntimeException::class);
-		$this->blockFactory->register(new OutOfBoundsBlock(new BlockIdentifier(25555, 0), "Out Of Bounds Block", BlockBreakInfo::instant()));
+		$b = new StrangeNewBlock(new BlockIdentifier(BlockTypeIds::newId()), "Strange New Block", new BlockTypeInfo(BlockBreakInfo::instant()));
+		$this->blockFactory->register($b);
+		self::assertInstanceOf(StrangeNewBlock::class, $this->blockFactory->fromStateId($b->getStateId()));
 	}
 
 	/**
 	 * Verifies that blocks with IDs smaller than 0 can't be registered
 	 */
 	public function testRegisterIdTooSmall() : void{
-		self::expectException(\RuntimeException::class);
-		$this->blockFactory->register(new OutOfBoundsBlock(new BlockIdentifier(-1, 0), "Out Of Bounds Block", BlockBreakInfo::instant()));
+		self::expectException(\InvalidArgumentException::class);
+		$this->blockFactory->register(new OutOfBoundsBlock(new BlockIdentifier(-1), "Out Of Bounds Block", new BlockTypeInfo(BlockBreakInfo::instant())));
 	}
 
 	/**
@@ -93,81 +76,109 @@ class BlockTest extends TestCase{
 	 * instances which would hold position data and other things, so it's necessary to clone them to avoid astonishing behaviour.
 	 */
 	public function testBlockFactoryClone() : void{
-		for($i = 0; $i < 256; ++$i){
-			$b1 = $this->blockFactory->get($i, 0);
-			$b2 = $this->blockFactory->get($i, 0);
+		foreach($this->blockFactory->getAllKnownStates() as $k => $state){
+			$b1 = $this->blockFactory->fromStateId($k);
+			$b2 = $this->blockFactory->fromStateId($k);
 			self::assertNotSame($b1, $b2);
 		}
 	}
 
-	/**
-	 * @return int[][]
-	 * @phpstan-return list<array{int,int}>
-	 */
-	public function blockGetProvider() : array{
-		return [
-			[BlockLegacyIds::STONE, 5],
-			[BlockLegacyIds::GOLD_BLOCK, 0],
-			[BlockLegacyIds::WOODEN_PLANKS, 5],
-			[BlockLegacyIds::SAND, 0],
-			[BlockLegacyIds::GOLD_BLOCK, 0]
-		];
-	}
-
-	/**
-	 * @dataProvider blockGetProvider
-	 */
-	public function testBlockGet(int $id, int $meta) : void{
-		$block = $this->blockFactory->get($id, $meta);
-
-		self::assertEquals($id, $block->getId());
-		self::assertEquals($meta, $block->getMeta());
-	}
-
-	public function testBlockIds() : void{
-		for($i = 0; $i < 256; ++$i){
-			$b = $this->blockFactory->get($i, 0);
-			self::assertContains($i, $b->getIdInfo()->getAllBlockIds());
-		}
-	}
-
 	/**
 	 * Test that light filters in the static arrays have valid values. Wrong values can cause lots of unpleasant bugs
 	 * (like freezes) when doing light population.
 	 */
 	public function testLightFiltersValid() : void{
 		foreach($this->blockFactory->lightFilter as $id => $value){
-			self::assertNotNull($value, "Light filter value missing for $id");
 			self::assertLessThanOrEqual(15, $value, "Light filter value for $id is larger than the expected 15");
 			self::assertGreaterThan(0, $value, "Light filter value for $id must be larger than 0");
 		}
 	}
 
-	public function testConsistency() : void{
-		$list = json_decode(file_get_contents(__DIR__ . '/block_factory_consistency_check.json'), true);
-		if(!is_array($list)){
-			throw new \pocketmine\utils\AssumptionFailedError("Old table should be array{knownStates: array<string, string>, remaps: array<string, int>}");
-		}
-		$knownStates = $list["knownStates"];
-		$remaps = $list["remaps"];
+	/**
+	 * @return int[]
+	 * @phpstan-return array<string, int>
+	 */
+	public static function computeConsistencyCheckTable(RuntimeBlockStateRegistry $blockStateRegistry) : array{
+		$newTable = [];
 
-		$states = $this->blockFactory->getAllKnownStates();
-		foreach($states as $k => $state){
-			if($state->getFullId() !== $k){
-				self::assertArrayHasKey($k, $remaps, "New remap of state $k (" . $state->getName() . ") - consistency check may need regenerating");
-				self::assertSame($state->getFullId(), $remaps[$k], "Mismatched full IDs of remapped state $k");
-			}else{
-				self::assertArrayHasKey($k, $knownStates, "New block state $k (" . $state->getName() . ") - consistency check may need regenerating");
-				self::assertSame($knownStates[$k], $state->getName());
+		$idNameLookup = [];
+		//if we ever split up block registration into multiple registries (e.g. separating chemistry blocks),
+		//we'll need to ensure those additional registries are also included here
+		foreach(Utils::stringifyKeys(VanillaBlocks::getAll()) as $name => $blockType){
+			$id = $blockType->getTypeId();
+			if(isset($idNameLookup[$id])){
+				throw new AssumptionFailedError("TypeID $name collides with " . $idNameLookup[$id]);
+			}
+			$idNameLookup[$id] = $name;
+		}
+
+		foreach($blockStateRegistry->getAllKnownStates() as $index => $block){
+			if($index !== $block->getStateId()){
+				throw new AssumptionFailedError("State index should always match state ID");
+			}
+			$idName = $idNameLookup[$block->getTypeId()];
+			$newTable[$idName] = ($newTable[$idName] ?? 0) + 1;
+		}
+
+		return $newTable;
+	}
+
+	/**
+	 * @phpstan-param array<string, int> $actual
+	 *
+	 * @return string[]
+	 */
+	public static function computeConsistencyCheckDiff(string $expectedFile, array $actual) : array{
+		$expected = json_decode(Filesystem::fileGetContents($expectedFile), true, 2, JSON_THROW_ON_ERROR);
+		if(!is_array($expected)){
+			throw new AssumptionFailedError("Old table should be array<string, int>");
+		}
+
+		$errors = [];
+		foreach(Utils::promoteKeys($expected) as $typeName => $numStates){
+			if(!is_string($typeName) || !is_int($numStates)){
+				throw new AssumptionFailedError("Old table should be array<string, int>");
+			}
+			if(!isset($actual[$typeName])){
+				$errors[] = "Removed block type $typeName ($numStates permutations)";
+			}elseif($actual[$typeName] !== $numStates){
+				$errors[] = "Block type $typeName permutation count changed: $numStates -> " . $actual[$typeName];
 			}
 		}
-		foreach($knownStates as $k => $name){
-			self::assertArrayHasKey($k, $states, "Missing previously-known block state $k ($name)");
-			self::assertSame($name, $states[$k]->getName());
-		}
-		foreach($remaps as $origin => $destination){
-			self::assertArrayHasKey($origin, $states, "Missing previously-remapped state $origin");
-			self::assertSame($destination, $states[$origin]->getFullId());
+		foreach(Utils::stringifyKeys($actual) as $typeName => $numStates){
+			if(!isset($expected[$typeName])){
+				$errors[] = "Added block type $typeName (" . $actual[$typeName] . " permutations)";
+			}
 		}
+
+		return $errors;
+	}
+
+	public function testConsistency() : void{
+		$newTable = self::computeConsistencyCheckTable($this->blockFactory);
+		$errors = self::computeConsistencyCheckDiff(__DIR__ . '/block_factory_consistency_check.json', $newTable);
+
+		self::assertEmpty($errors, "Block factory consistency check failed:\n" . implode("\n", $errors));
+	}
+
+	public function testEmptyStateId() : void{
+		$block = $this->blockFactory->fromStateId(Block::EMPTY_STATE_ID);
+		self::assertInstanceOf(Air::class, $block);
+	}
+
+	public function testStateDataSizeNotTooLarge() : void{
+		$typeIdBitsMin = ((int) log(BlockTypeIds::FIRST_UNUSED_BLOCK_ID, 2)) + 1;
+
+		$typeIdBitsMin++; //for custom blocks
+
+		self::assertLessThanOrEqual(32, Block::INTERNAL_STATE_DATA_BITS + $typeIdBitsMin, "State data size cannot be larger than " . (32 - $typeIdBitsMin) . " bits (need at least $typeIdBitsMin bits for block type ID)");
+	}
+
+	public function testAsItemFromItem() : void{
+		$block = VanillaBlocks::FLOWER_POT();
+		$item = $block->asItem();
+		$defaultBlock = $item->getBlock();
+		$item2 = $defaultBlock->asItem();
+		self::assertTrue($item2->equalsExact($item));
 	}
 }
diff --git a/tests/phpunit/block/BlockTypeIdsTest.php b/tests/phpunit/block/BlockTypeIdsTest.php
new file mode 100644
index 0000000000..ce21a89ab6
--- /dev/null
+++ b/tests/phpunit/block/BlockTypeIdsTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use PHPUnit\Framework\TestCase;
+use pocketmine\utils\Utils;
+use function array_unique;
+use function max;
+
+class BlockTypeIdsTest extends TestCase{
+
+	public function testFirstUnused() : void{
+		$reflect = new \ReflectionClass(BlockTypeIds::class);
+
+		$constants = $reflect->getConstants();
+		unset($constants['FIRST_UNUSED_BLOCK_ID']);
+
+		self::assertSame($reflect->getConstant('FIRST_UNUSED_BLOCK_ID'), max($constants) + 1, "FIRST_UNUSED_BLOCK_ID must be one higher than the highest fixed type ID");
+	}
+
+	public function testNoDuplicates() : void{
+		$idTable = (new \ReflectionClass(BlockTypeIds::class))->getConstants();
+
+		self::assertSameSize($idTable, array_unique($idTable), "Every BlockTypeID must be unique");
+	}
+
+	public function testVanillaBlocksParity() : void{
+		$reflect = new \ReflectionClass(BlockTypeIds::class);
+
+		foreach(Utils::stringifyKeys(VanillaBlocks::getAll()) as $name => $block){
+			$expected = $block->getTypeId();
+			$actual = $reflect->getConstant($name);
+			self::assertNotFalse($actual, "VanillaBlocks::$name() does not have a BlockTypeIds constant");
+			self::assertSame($expected, $actual, "VanillaBlocks::$name() does not match BlockTypeIds::$name");
+		}
+	}
+}
diff --git a/tests/phpunit/block/BrewingStandTest.php b/tests/phpunit/block/BrewingStandTest.php
index c61a1db6da..85cdd90e11 100644
--- a/tests/phpunit/block/BrewingStandTest.php
+++ b/tests/phpunit/block/BrewingStandTest.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use PHPUnit\Framework\TestCase;
 use pocketmine\block\utils\BrewingStandSlot;
-use function array_values;
 use function count;
 
 class BrewingStandTest extends TestCase{
@@ -33,10 +32,10 @@ class BrewingStandTest extends TestCase{
 	/**
 	 * @phpstan-return \Generator<int, array{list<BrewingStandSlot>}, void, void>
 	 */
-	public function slotsProvider() : \Generator{
-		yield [array_values(BrewingStandSlot::getAll())];
-		yield [[BrewingStandSlot::EAST()]];
-		yield [[BrewingStandSlot::EAST(), BrewingStandSlot::NORTHWEST()]];
+	public static function slotsProvider() : \Generator{
+		yield [BrewingStandSlot::cases()];
+		yield [[BrewingStandSlot::EAST]];
+		yield [[BrewingStandSlot::EAST, BrewingStandSlot::NORTHWEST]];
 	}
 
 	/**
diff --git a/tests/phpunit/block/OutOfBoundsBlock.php b/tests/phpunit/block/OutOfBoundsBlock.php
index 21cbf9a9f6..6a4a2edcb3 100644
--- a/tests/phpunit/block/OutOfBoundsBlock.php
+++ b/tests/phpunit/block/OutOfBoundsBlock.php
@@ -25,7 +25,4 @@ namespace pocketmine\block;
 
 class OutOfBoundsBlock extends Block{
 
-	public function getName() : string{
-		return "Out of Bounds Block";
-	}
 }
diff --git a/tests/phpunit/block/block_factory_consistency_check.json b/tests/phpunit/block/block_factory_consistency_check.json
index 5353c05954..79804d8cbd 100644
--- a/tests/phpunit/block/block_factory_consistency_check.json
+++ b/tests/phpunit/block/block_factory_consistency_check.json
@@ -1 +1,712 @@
-{"knownStates":{"0":"Air","16":"Stone","17":"Granite","18":"Polished Granite","19":"Diorite","20":"Polished Diorite","21":"Andesite","22":"Polished Andesite","32":"Grass","48":"Dirt","49":"Dirt","64":"Cobblestone","80":"Oak Planks","81":"Spruce Planks","82":"Birch Planks","83":"Jungle Planks","84":"Acacia Planks","85":"Dark Oak Planks","96":"Oak Sapling","97":"Spruce Sapling","98":"Birch Sapling","99":"Jungle Sapling","100":"Acacia Sapling","101":"Dark Oak Sapling","104":"Oak Sapling","105":"Spruce Sapling","106":"Birch Sapling","107":"Jungle Sapling","108":"Acacia Sapling","109":"Dark Oak Sapling","112":"Bedrock","113":"Bedrock","128":"Water","129":"Water","130":"Water","131":"Water","132":"Water","133":"Water","134":"Water","135":"Water","136":"Water","137":"Water","138":"Water","139":"Water","140":"Water","141":"Water","142":"Water","143":"Water","144":"Water","145":"Water","146":"Water","147":"Water","148":"Water","149":"Water","150":"Water","151":"Water","152":"Water","153":"Water","154":"Water","155":"Water","156":"Water","157":"Water","158":"Water","159":"Water","160":"Lava","161":"Lava","162":"Lava","163":"Lava","164":"Lava","165":"Lava","166":"Lava","167":"Lava","168":"Lava","169":"Lava","170":"Lava","171":"Lava","172":"Lava","173":"Lava","174":"Lava","175":"Lava","176":"Lava","177":"Lava","178":"Lava","179":"Lava","180":"Lava","181":"Lava","182":"Lava","183":"Lava","184":"Lava","185":"Lava","186":"Lava","187":"Lava","188":"Lava","189":"Lava","190":"Lava","191":"Lava","192":"Sand","193":"Red Sand","208":"Gravel","224":"Gold Ore","240":"Iron Ore","256":"Coal Ore","272":"Oak Log","273":"Spruce Log","274":"Birch Log","275":"Jungle Log","276":"Oak Log","277":"Spruce Log","278":"Birch Log","279":"Jungle Log","280":"Oak Log","281":"Spruce Log","282":"Birch Log","283":"Jungle Log","288":"Oak Leaves","289":"Spruce Leaves","290":"Birch Leaves","291":"Jungle Leaves","292":"Oak Leaves","293":"Spruce Leaves","294":"Birch Leaves","295":"Jungle Leaves","296":"Oak Leaves","297":"Spruce Leaves","298":"Birch Leaves","299":"Jungle Leaves","300":"Oak Leaves","301":"Spruce Leaves","302":"Birch Leaves","303":"Jungle Leaves","304":"Sponge","305":"Sponge","320":"Glass","336":"Lapis Lazuli Ore","352":"Lapis Lazuli Block","384":"Sandstone","385":"Chiseled Sandstone","386":"Cut Sandstone","387":"Smooth Sandstone","400":"Note Block","416":"Bed Block","417":"Bed Block","418":"Bed Block","419":"Bed Block","420":"Bed Block","421":"Bed Block","422":"Bed Block","423":"Bed Block","424":"Bed Block","425":"Bed Block","426":"Bed Block","427":"Bed Block","428":"Bed Block","429":"Bed Block","430":"Bed Block","431":"Bed Block","432":"Powered Rail","433":"Powered Rail","434":"Powered Rail","435":"Powered Rail","436":"Powered Rail","437":"Powered Rail","440":"Powered Rail","441":"Powered Rail","442":"Powered Rail","443":"Powered Rail","444":"Powered Rail","445":"Powered Rail","448":"Detector Rail","449":"Detector Rail","450":"Detector Rail","451":"Detector Rail","452":"Detector Rail","453":"Detector Rail","456":"Detector Rail","457":"Detector Rail","458":"Detector Rail","459":"Detector Rail","460":"Detector Rail","461":"Detector Rail","480":"Cobweb","497":"Tall Grass","498":"Fern","512":"Dead Bush","560":"Wool","561":"Wool","562":"Wool","563":"Wool","564":"Wool","565":"Wool","566":"Wool","567":"Wool","568":"Wool","569":"Wool","570":"Wool","571":"Wool","572":"Wool","573":"Wool","574":"Wool","575":"Wool","576":"???","592":"Dandelion","608":"Poppy","609":"Blue Orchid","610":"Allium","611":"Azure Bluet","612":"Red Tulip","613":"Orange Tulip","614":"White Tulip","615":"Pink Tulip","616":"Oxeye Daisy","617":"Cornflower","618":"Lily of the Valley","624":"Brown Mushroom","640":"Red Mushroom","656":"Gold Block","672":"Iron Block","688":"Smooth Stone Slab","689":"Sandstone Slab","690":"Fake Wooden Slab","691":"Cobblestone Slab","692":"Brick Slab","693":"Stone Brick Slab","694":"Quartz Slab","695":"Nether Brick Slab","704":"Smooth Stone Slab","705":"Sandstone Slab","706":"Fake Wooden Slab","707":"Cobblestone Slab","708":"Brick Slab","709":"Stone Brick Slab","710":"Quartz Slab","711":"Nether Brick Slab","712":"Smooth Stone Slab","713":"Sandstone Slab","714":"Fake Wooden Slab","715":"Cobblestone Slab","716":"Brick Slab","717":"Stone Brick Slab","718":"Quartz Slab","719":"Nether Brick Slab","720":"Bricks","736":"TNT","737":"TNT","738":"TNT","739":"TNT","752":"Bookshelf","768":"Mossy Cobblestone","784":"Obsidian","801":"Torch","802":"Torch","803":"Torch","804":"Torch","805":"Torch","816":"Fire Block","817":"Fire Block","818":"Fire Block","819":"Fire Block","820":"Fire Block","821":"Fire Block","822":"Fire Block","823":"Fire Block","824":"Fire Block","825":"Fire Block","826":"Fire Block","827":"Fire Block","828":"Fire Block","829":"Fire Block","830":"Fire Block","831":"Fire Block","832":"Monster Spawner","848":"Oak Stairs","849":"Oak Stairs","850":"Oak Stairs","851":"Oak Stairs","852":"Oak Stairs","853":"Oak Stairs","854":"Oak Stairs","855":"Oak Stairs","866":"Chest","867":"Chest","868":"Chest","869":"Chest","880":"Redstone","881":"Redstone","882":"Redstone","883":"Redstone","884":"Redstone","885":"Redstone","886":"Redstone","887":"Redstone","888":"Redstone","889":"Redstone","890":"Redstone","891":"Redstone","892":"Redstone","893":"Redstone","894":"Redstone","895":"Redstone","896":"Diamond Ore","912":"Diamond Block","928":"Crafting Table","944":"Wheat Block","945":"Wheat Block","946":"Wheat Block","947":"Wheat Block","948":"Wheat Block","949":"Wheat Block","950":"Wheat Block","951":"Wheat Block","960":"Farmland","961":"Farmland","962":"Farmland","963":"Farmland","964":"Farmland","965":"Farmland","966":"Farmland","967":"Farmland","978":"Furnace","979":"Furnace","980":"Furnace","981":"Furnace","994":"Furnace","995":"Furnace","996":"Furnace","997":"Furnace","1008":"Oak Sign","1009":"Oak Sign","1010":"Oak Sign","1011":"Oak Sign","1012":"Oak Sign","1013":"Oak Sign","1014":"Oak Sign","1015":"Oak Sign","1016":"Oak Sign","1017":"Oak Sign","1018":"Oak Sign","1019":"Oak Sign","1020":"Oak Sign","1021":"Oak Sign","1022":"Oak Sign","1023":"Oak Sign","1024":"Oak Door","1025":"Oak Door","1026":"Oak Door","1027":"Oak Door","1028":"Oak Door","1029":"Oak Door","1030":"Oak Door","1031":"Oak Door","1032":"Oak Door","1033":"Oak Door","1034":"Oak Door","1035":"Oak Door","1042":"Ladder","1043":"Ladder","1044":"Ladder","1045":"Ladder","1056":"Rail","1057":"Rail","1058":"Rail","1059":"Rail","1060":"Rail","1061":"Rail","1062":"Rail","1063":"Rail","1064":"Rail","1065":"Rail","1072":"Cobblestone Stairs","1073":"Cobblestone Stairs","1074":"Cobblestone Stairs","1075":"Cobblestone Stairs","1076":"Cobblestone Stairs","1077":"Cobblestone Stairs","1078":"Cobblestone Stairs","1079":"Cobblestone Stairs","1090":"Oak Wall Sign","1091":"Oak Wall Sign","1092":"Oak Wall Sign","1093":"Oak Wall Sign","1104":"Lever","1105":"Lever","1106":"Lever","1107":"Lever","1108":"Lever","1109":"Lever","1110":"Lever","1111":"Lever","1112":"Lever","1113":"Lever","1114":"Lever","1115":"Lever","1116":"Lever","1117":"Lever","1118":"Lever","1119":"Lever","1120":"Stone Pressure Plate","1121":"Stone Pressure Plate","1136":"Iron Door","1137":"Iron Door","1138":"Iron Door","1139":"Iron Door","1140":"Iron Door","1141":"Iron Door","1142":"Iron Door","1143":"Iron Door","1144":"Iron Door","1145":"Iron Door","1146":"Iron Door","1147":"Iron Door","1152":"Oak Pressure Plate","1153":"Oak Pressure Plate","1168":"Redstone Ore","1184":"Redstone Ore","1201":"Redstone Torch","1202":"Redstone Torch","1203":"Redstone Torch","1204":"Redstone Torch","1205":"Redstone Torch","1217":"Redstone Torch","1218":"Redstone Torch","1219":"Redstone Torch","1220":"Redstone Torch","1221":"Redstone Torch","1232":"Stone Button","1233":"Stone Button","1234":"Stone Button","1235":"Stone Button","1236":"Stone Button","1237":"Stone Button","1240":"Stone Button","1241":"Stone Button","1242":"Stone Button","1243":"Stone Button","1244":"Stone Button","1245":"Stone Button","1248":"Snow Layer","1249":"Snow Layer","1250":"Snow Layer","1251":"Snow Layer","1252":"Snow Layer","1253":"Snow Layer","1254":"Snow Layer","1255":"Snow Layer","1264":"Ice","1280":"Snow Block","1296":"Cactus","1297":"Cactus","1298":"Cactus","1299":"Cactus","1300":"Cactus","1301":"Cactus","1302":"Cactus","1303":"Cactus","1304":"Cactus","1305":"Cactus","1306":"Cactus","1307":"Cactus","1308":"Cactus","1309":"Cactus","1310":"Cactus","1311":"Cactus","1312":"Clay Block","1328":"Sugarcane","1329":"Sugarcane","1330":"Sugarcane","1331":"Sugarcane","1332":"Sugarcane","1333":"Sugarcane","1334":"Sugarcane","1335":"Sugarcane","1336":"Sugarcane","1337":"Sugarcane","1338":"Sugarcane","1339":"Sugarcane","1340":"Sugarcane","1341":"Sugarcane","1342":"Sugarcane","1343":"Sugarcane","1344":"Jukebox","1360":"Oak Fence","1361":"Spruce Fence","1362":"Birch Fence","1363":"Jungle Fence","1364":"Acacia Fence","1365":"Dark Oak Fence","1376":"Pumpkin","1392":"Netherrack","1408":"Soul Sand","1424":"Glowstone","1441":"Nether Portal","1442":"Nether Portal","1456":"Jack o'Lantern","1457":"Jack o'Lantern","1458":"Jack o'Lantern","1459":"Jack o'Lantern","1472":"Cake","1473":"Cake","1474":"Cake","1475":"Cake","1476":"Cake","1477":"Cake","1478":"Cake","1488":"Redstone Repeater","1489":"Redstone Repeater","1490":"Redstone Repeater","1491":"Redstone Repeater","1492":"Redstone Repeater","1493":"Redstone Repeater","1494":"Redstone Repeater","1495":"Redstone Repeater","1496":"Redstone Repeater","1497":"Redstone Repeater","1498":"Redstone Repeater","1499":"Redstone Repeater","1500":"Redstone Repeater","1501":"Redstone Repeater","1502":"Redstone Repeater","1503":"Redstone Repeater","1504":"Redstone Repeater","1505":"Redstone Repeater","1506":"Redstone Repeater","1507":"Redstone Repeater","1508":"Redstone Repeater","1509":"Redstone Repeater","1510":"Redstone Repeater","1511":"Redstone Repeater","1512":"Redstone Repeater","1513":"Redstone Repeater","1514":"Redstone Repeater","1515":"Redstone Repeater","1516":"Redstone Repeater","1517":"Redstone Repeater","1518":"Redstone Repeater","1519":"Redstone Repeater","1520":"Invisible Bedrock","1536":"Oak Trapdoor","1537":"Oak Trapdoor","1538":"Oak Trapdoor","1539":"Oak Trapdoor","1540":"Oak Trapdoor","1541":"Oak Trapdoor","1542":"Oak Trapdoor","1543":"Oak Trapdoor","1544":"Oak Trapdoor","1545":"Oak Trapdoor","1546":"Oak Trapdoor","1547":"Oak Trapdoor","1548":"Oak Trapdoor","1549":"Oak Trapdoor","1550":"Oak Trapdoor","1551":"Oak Trapdoor","1552":"Infested Stone","1553":"Infested Cobblestone","1554":"Infested Stone Brick","1555":"Infested Mossy Stone Brick","1556":"Infested Cracked Stone Brick","1557":"Infested Chiseled Stone Brick","1568":"Stone Bricks","1569":"Mossy Stone Bricks","1570":"Cracked Stone Bricks","1571":"Chiseled Stone Bricks","1584":"Brown Mushroom Block","1585":"Brown Mushroom Block","1586":"Brown Mushroom Block","1587":"Brown Mushroom Block","1588":"Brown Mushroom Block","1589":"Brown Mushroom Block","1590":"Brown Mushroom Block","1591":"Brown Mushroom Block","1592":"Brown Mushroom Block","1593":"Brown Mushroom Block","1594":"Mushroom Stem","1598":"Brown Mushroom Block","1599":"All Sided Mushroom Stem","1600":"Red Mushroom Block","1601":"Red Mushroom Block","1602":"Red Mushroom Block","1603":"Red Mushroom Block","1604":"Red Mushroom Block","1605":"Red Mushroom Block","1606":"Red Mushroom Block","1607":"Red Mushroom Block","1608":"Red Mushroom Block","1609":"Red Mushroom Block","1614":"Red Mushroom Block","1616":"Iron Bars","1632":"Glass Pane","1648":"Melon Block","1664":"Pumpkin Stem","1665":"Pumpkin Stem","1666":"Pumpkin Stem","1667":"Pumpkin Stem","1668":"Pumpkin Stem","1669":"Pumpkin Stem","1670":"Pumpkin Stem","1671":"Pumpkin Stem","1680":"Melon Stem","1681":"Melon Stem","1682":"Melon Stem","1683":"Melon Stem","1684":"Melon Stem","1685":"Melon Stem","1686":"Melon Stem","1687":"Melon Stem","1696":"Vines","1697":"Vines","1698":"Vines","1699":"Vines","1700":"Vines","1701":"Vines","1702":"Vines","1703":"Vines","1704":"Vines","1705":"Vines","1706":"Vines","1707":"Vines","1708":"Vines","1709":"Vines","1710":"Vines","1711":"Vines","1712":"Oak Fence Gate","1713":"Oak Fence Gate","1714":"Oak Fence Gate","1715":"Oak Fence Gate","1716":"Oak Fence Gate","1717":"Oak Fence Gate","1718":"Oak Fence Gate","1719":"Oak Fence Gate","1720":"Oak Fence Gate","1721":"Oak Fence Gate","1722":"Oak Fence Gate","1723":"Oak Fence Gate","1724":"Oak Fence Gate","1725":"Oak Fence Gate","1726":"Oak Fence Gate","1727":"Oak Fence Gate","1728":"Brick Stairs","1729":"Brick Stairs","1730":"Brick Stairs","1731":"Brick Stairs","1732":"Brick Stairs","1733":"Brick Stairs","1734":"Brick Stairs","1735":"Brick Stairs","1744":"Stone Brick Stairs","1745":"Stone Brick Stairs","1746":"Stone Brick Stairs","1747":"Stone Brick Stairs","1748":"Stone Brick Stairs","1749":"Stone Brick Stairs","1750":"Stone Brick Stairs","1751":"Stone Brick Stairs","1760":"Mycelium","1776":"Lily Pad","1792":"Nether Bricks","1808":"Nether Brick Fence","1824":"Nether Brick Stairs","1825":"Nether Brick Stairs","1826":"Nether Brick Stairs","1827":"Nether Brick Stairs","1828":"Nether Brick Stairs","1829":"Nether Brick Stairs","1830":"Nether Brick Stairs","1831":"Nether Brick Stairs","1840":"Nether Wart","1841":"Nether Wart","1842":"Nether Wart","1843":"Nether Wart","1856":"Enchanting Table","1872":"Brewing Stand","1873":"Brewing Stand","1874":"Brewing Stand","1875":"Brewing Stand","1876":"Brewing Stand","1877":"Brewing Stand","1878":"Brewing Stand","1879":"Brewing Stand","1920":"End Portal Frame","1921":"End Portal Frame","1922":"End Portal Frame","1923":"End Portal Frame","1924":"End Portal Frame","1925":"End Portal Frame","1926":"End Portal Frame","1927":"End Portal Frame","1936":"End Stone","1952":"Dragon Egg","1968":"Redstone Lamp","1984":"Redstone Lamp","2016":"Activator Rail","2017":"Activator Rail","2018":"Activator Rail","2019":"Activator Rail","2020":"Activator Rail","2021":"Activator Rail","2024":"Activator Rail","2025":"Activator Rail","2026":"Activator Rail","2027":"Activator Rail","2028":"Activator Rail","2029":"Activator Rail","2032":"Cocoa Block","2033":"Cocoa Block","2034":"Cocoa Block","2035":"Cocoa Block","2036":"Cocoa Block","2037":"Cocoa Block","2038":"Cocoa Block","2039":"Cocoa Block","2040":"Cocoa Block","2041":"Cocoa Block","2042":"Cocoa Block","2043":"Cocoa Block","2048":"Sandstone Stairs","2049":"Sandstone Stairs","2050":"Sandstone Stairs","2051":"Sandstone Stairs","2052":"Sandstone Stairs","2053":"Sandstone Stairs","2054":"Sandstone Stairs","2055":"Sandstone Stairs","2064":"Emerald Ore","2082":"Ender Chest","2083":"Ender Chest","2084":"Ender Chest","2085":"Ender Chest","2096":"Tripwire Hook","2097":"Tripwire Hook","2098":"Tripwire Hook","2099":"Tripwire Hook","2100":"Tripwire Hook","2101":"Tripwire Hook","2102":"Tripwire Hook","2103":"Tripwire Hook","2104":"Tripwire Hook","2105":"Tripwire Hook","2106":"Tripwire Hook","2107":"Tripwire Hook","2108":"Tripwire Hook","2109":"Tripwire Hook","2110":"Tripwire Hook","2111":"Tripwire Hook","2112":"Tripwire","2113":"Tripwire","2114":"Tripwire","2115":"Tripwire","2116":"Tripwire","2117":"Tripwire","2118":"Tripwire","2119":"Tripwire","2120":"Tripwire","2121":"Tripwire","2122":"Tripwire","2123":"Tripwire","2124":"Tripwire","2125":"Tripwire","2126":"Tripwire","2127":"Tripwire","2128":"Emerald Block","2144":"Spruce Stairs","2145":"Spruce Stairs","2146":"Spruce Stairs","2147":"Spruce Stairs","2148":"Spruce Stairs","2149":"Spruce Stairs","2150":"Spruce Stairs","2151":"Spruce Stairs","2160":"Birch Stairs","2161":"Birch Stairs","2162":"Birch Stairs","2163":"Birch Stairs","2164":"Birch Stairs","2165":"Birch Stairs","2166":"Birch Stairs","2167":"Birch Stairs","2176":"Jungle Stairs","2177":"Jungle Stairs","2178":"Jungle Stairs","2179":"Jungle Stairs","2180":"Jungle Stairs","2181":"Jungle Stairs","2182":"Jungle Stairs","2183":"Jungle Stairs","2208":"Beacon","2224":"Cobblestone Wall","2225":"Mossy Cobblestone Wall","2226":"Granite Wall","2227":"Diorite Wall","2228":"Andesite Wall","2229":"Sandstone Wall","2230":"Brick Wall","2231":"Stone Brick Wall","2232":"Mossy Stone Brick Wall","2233":"Nether Brick Wall","2234":"End Stone Brick Wall","2235":"Prismarine Wall","2236":"Red Sandstone Wall","2237":"Red Nether Brick Wall","2240":"Flower Pot","2256":"Carrot Block","2257":"Carrot Block","2258":"Carrot Block","2259":"Carrot Block","2260":"Carrot Block","2261":"Carrot Block","2262":"Carrot Block","2263":"Carrot Block","2272":"Potato Block","2273":"Potato Block","2274":"Potato Block","2275":"Potato Block","2276":"Potato Block","2277":"Potato Block","2278":"Potato Block","2279":"Potato Block","2288":"Oak Button","2289":"Oak Button","2290":"Oak Button","2291":"Oak Button","2292":"Oak Button","2293":"Oak Button","2296":"Oak Button","2297":"Oak Button","2298":"Oak Button","2299":"Oak Button","2300":"Oak Button","2301":"Oak Button","2305":"Mob Head","2306":"Mob Head","2307":"Mob Head","2308":"Mob Head","2309":"Mob Head","2313":"Mob Head","2314":"Mob Head","2315":"Mob Head","2316":"Mob Head","2317":"Mob Head","2320":"Anvil","2321":"Anvil","2322":"Anvil","2323":"Anvil","2324":"Anvil","2325":"Anvil","2326":"Anvil","2327":"Anvil","2328":"Anvil","2329":"Anvil","2330":"Anvil","2331":"Anvil","2338":"Trapped Chest","2339":"Trapped Chest","2340":"Trapped Chest","2341":"Trapped Chest","2352":"Weighted Pressure Plate Light","2353":"Weighted Pressure Plate Light","2354":"Weighted Pressure Plate Light","2355":"Weighted Pressure Plate Light","2356":"Weighted Pressure Plate Light","2357":"Weighted Pressure Plate Light","2358":"Weighted Pressure Plate Light","2359":"Weighted Pressure Plate Light","2360":"Weighted Pressure Plate Light","2361":"Weighted Pressure Plate Light","2362":"Weighted Pressure Plate Light","2363":"Weighted Pressure Plate Light","2364":"Weighted Pressure Plate Light","2365":"Weighted Pressure Plate Light","2366":"Weighted Pressure Plate Light","2367":"Weighted Pressure Plate Light","2368":"Weighted Pressure Plate Heavy","2369":"Weighted Pressure Plate Heavy","2370":"Weighted Pressure Plate Heavy","2371":"Weighted Pressure Plate Heavy","2372":"Weighted Pressure Plate Heavy","2373":"Weighted Pressure Plate Heavy","2374":"Weighted Pressure Plate Heavy","2375":"Weighted Pressure Plate Heavy","2376":"Weighted Pressure Plate Heavy","2377":"Weighted Pressure Plate Heavy","2378":"Weighted Pressure Plate Heavy","2379":"Weighted Pressure Plate Heavy","2380":"Weighted Pressure Plate Heavy","2381":"Weighted Pressure Plate Heavy","2382":"Weighted Pressure Plate Heavy","2383":"Weighted Pressure Plate Heavy","2384":"Redstone Comparator","2385":"Redstone Comparator","2386":"Redstone Comparator","2387":"Redstone Comparator","2388":"Redstone Comparator","2389":"Redstone Comparator","2390":"Redstone Comparator","2391":"Redstone Comparator","2408":"Redstone Comparator","2409":"Redstone Comparator","2410":"Redstone Comparator","2411":"Redstone Comparator","2412":"Redstone Comparator","2413":"Redstone Comparator","2414":"Redstone Comparator","2415":"Redstone Comparator","2416":"Daylight Sensor","2417":"Daylight Sensor","2418":"Daylight Sensor","2419":"Daylight Sensor","2420":"Daylight Sensor","2421":"Daylight Sensor","2422":"Daylight Sensor","2423":"Daylight Sensor","2424":"Daylight Sensor","2425":"Daylight Sensor","2426":"Daylight Sensor","2427":"Daylight Sensor","2428":"Daylight Sensor","2429":"Daylight Sensor","2430":"Daylight Sensor","2431":"Daylight Sensor","2432":"Redstone Block","2448":"Nether Quartz Ore","2464":"Hopper","2466":"Hopper","2467":"Hopper","2468":"Hopper","2469":"Hopper","2472":"Hopper","2474":"Hopper","2475":"Hopper","2476":"Hopper","2477":"Hopper","2480":"Quartz Block","2481":"Chiseled Quartz Block","2482":"Quartz Pillar","2483":"Smooth Quartz Block","2485":"Chiseled Quartz Block","2486":"Quartz Pillar","2489":"Chiseled Quartz Block","2490":"Quartz Pillar","2496":"Quartz Stairs","2497":"Quartz Stairs","2498":"Quartz Stairs","2499":"Quartz Stairs","2500":"Quartz Stairs","2501":"Quartz Stairs","2502":"Quartz Stairs","2503":"Quartz Stairs","2512":"Oak Slab","2513":"Spruce Slab","2514":"Birch Slab","2515":"Jungle Slab","2516":"Acacia Slab","2517":"Dark Oak Slab","2528":"Oak Slab","2529":"Spruce Slab","2530":"Birch Slab","2531":"Jungle Slab","2532":"Acacia Slab","2533":"Dark Oak Slab","2536":"Oak Slab","2537":"Spruce Slab","2538":"Birch Slab","2539":"Jungle Slab","2540":"Acacia Slab","2541":"Dark Oak Slab","2544":"Stained Clay","2545":"Stained Clay","2546":"Stained Clay","2547":"Stained Clay","2548":"Stained Clay","2549":"Stained Clay","2550":"Stained Clay","2551":"Stained Clay","2552":"Stained Clay","2553":"Stained Clay","2554":"Stained Clay","2555":"Stained Clay","2556":"Stained Clay","2557":"Stained Clay","2558":"Stained Clay","2559":"Stained Clay","2560":"Stained Glass Pane","2561":"Stained Glass Pane","2562":"Stained Glass Pane","2563":"Stained Glass Pane","2564":"Stained Glass Pane","2565":"Stained Glass Pane","2566":"Stained Glass Pane","2567":"Stained Glass Pane","2568":"Stained Glass Pane","2569":"Stained Glass Pane","2570":"Stained Glass Pane","2571":"Stained Glass Pane","2572":"Stained Glass Pane","2573":"Stained Glass Pane","2574":"Stained Glass Pane","2575":"Stained Glass Pane","2576":"Acacia Leaves","2577":"Dark Oak Leaves","2580":"Acacia Leaves","2581":"Dark Oak Leaves","2584":"Acacia Leaves","2585":"Dark Oak Leaves","2588":"Acacia Leaves","2589":"Dark Oak Leaves","2592":"Acacia Log","2593":"Dark Oak Log","2596":"Acacia Log","2597":"Dark Oak Log","2600":"Acacia Log","2601":"Dark Oak Log","2608":"Acacia Stairs","2609":"Acacia Stairs","2610":"Acacia Stairs","2611":"Acacia Stairs","2612":"Acacia Stairs","2613":"Acacia Stairs","2614":"Acacia Stairs","2615":"Acacia Stairs","2624":"Dark Oak Stairs","2625":"Dark Oak Stairs","2626":"Dark Oak Stairs","2627":"Dark Oak Stairs","2628":"Dark Oak Stairs","2629":"Dark Oak Stairs","2630":"Dark Oak Stairs","2631":"Dark Oak Stairs","2640":"Slime Block","2672":"Iron Trapdoor","2673":"Iron Trapdoor","2674":"Iron Trapdoor","2675":"Iron Trapdoor","2676":"Iron Trapdoor","2677":"Iron Trapdoor","2678":"Iron Trapdoor","2679":"Iron Trapdoor","2680":"Iron Trapdoor","2681":"Iron Trapdoor","2682":"Iron Trapdoor","2683":"Iron Trapdoor","2684":"Iron Trapdoor","2685":"Iron Trapdoor","2686":"Iron Trapdoor","2687":"Iron Trapdoor","2688":"Prismarine","2689":"Dark Prismarine","2690":"Prismarine Bricks","2704":"Sea Lantern","2720":"Hay Bale","2724":"Hay Bale","2728":"Hay Bale","2736":"Carpet","2737":"Carpet","2738":"Carpet","2739":"Carpet","2740":"Carpet","2741":"Carpet","2742":"Carpet","2743":"Carpet","2744":"Carpet","2745":"Carpet","2746":"Carpet","2747":"Carpet","2748":"Carpet","2749":"Carpet","2750":"Carpet","2751":"Carpet","2752":"Hardened Clay","2768":"Coal Block","2784":"Packed Ice","2800":"Sunflower","2801":"Lilac","2802":"Double Tallgrass","2803":"Large Fern","2804":"Rose Bush","2805":"Peony","2808":"Sunflower","2809":"Lilac","2810":"Double Tallgrass","2811":"Large Fern","2812":"Rose Bush","2813":"Peony","2816":"Banner","2817":"Banner","2818":"Banner","2819":"Banner","2820":"Banner","2821":"Banner","2822":"Banner","2823":"Banner","2824":"Banner","2825":"Banner","2826":"Banner","2827":"Banner","2828":"Banner","2829":"Banner","2830":"Banner","2831":"Banner","2834":"Wall Banner","2835":"Wall Banner","2836":"Wall Banner","2837":"Wall Banner","2848":"Daylight Sensor","2849":"Daylight Sensor","2850":"Daylight Sensor","2851":"Daylight Sensor","2852":"Daylight Sensor","2853":"Daylight Sensor","2854":"Daylight Sensor","2855":"Daylight Sensor","2856":"Daylight Sensor","2857":"Daylight Sensor","2858":"Daylight Sensor","2859":"Daylight Sensor","2860":"Daylight Sensor","2861":"Daylight Sensor","2862":"Daylight Sensor","2863":"Daylight Sensor","2864":"Red Sandstone","2865":"Chiseled Red Sandstone","2866":"Cut Red Sandstone","2867":"Smooth Red Sandstone","2880":"Red Sandstone Stairs","2881":"Red Sandstone Stairs","2882":"Red Sandstone Stairs","2883":"Red Sandstone Stairs","2884":"Red Sandstone Stairs","2885":"Red Sandstone Stairs","2886":"Red Sandstone Stairs","2887":"Red Sandstone Stairs","2896":"Red Sandstone Slab","2897":"Purpur Slab","2898":"Prismarine Slab","2899":"Dark Prismarine Slab","2900":"Prismarine Bricks Slab","2901":"Mossy Cobblestone Slab","2902":"Smooth Sandstone Slab","2903":"Red Nether Brick Slab","2912":"Red Sandstone Slab","2913":"Purpur Slab","2914":"Prismarine Slab","2915":"Dark Prismarine Slab","2916":"Prismarine Bricks Slab","2917":"Mossy Cobblestone Slab","2918":"Smooth Sandstone Slab","2919":"Red Nether Brick Slab","2920":"Red Sandstone Slab","2921":"Purpur Slab","2922":"Prismarine Slab","2923":"Dark Prismarine Slab","2924":"Prismarine Bricks Slab","2925":"Mossy Cobblestone Slab","2926":"Smooth Sandstone Slab","2927":"Red Nether Brick Slab","2928":"Spruce Fence Gate","2929":"Spruce Fence Gate","2930":"Spruce Fence Gate","2931":"Spruce Fence Gate","2932":"Spruce Fence Gate","2933":"Spruce Fence Gate","2934":"Spruce Fence Gate","2935":"Spruce Fence Gate","2936":"Spruce Fence Gate","2937":"Spruce Fence Gate","2938":"Spruce Fence Gate","2939":"Spruce Fence Gate","2940":"Spruce Fence Gate","2941":"Spruce Fence Gate","2942":"Spruce Fence Gate","2943":"Spruce Fence Gate","2944":"Birch Fence Gate","2945":"Birch Fence Gate","2946":"Birch Fence Gate","2947":"Birch Fence Gate","2948":"Birch Fence Gate","2949":"Birch Fence Gate","2950":"Birch Fence Gate","2951":"Birch Fence Gate","2952":"Birch Fence Gate","2953":"Birch Fence Gate","2954":"Birch Fence Gate","2955":"Birch Fence Gate","2956":"Birch Fence Gate","2957":"Birch Fence Gate","2958":"Birch Fence Gate","2959":"Birch Fence Gate","2960":"Jungle Fence Gate","2961":"Jungle Fence Gate","2962":"Jungle Fence Gate","2963":"Jungle Fence Gate","2964":"Jungle Fence Gate","2965":"Jungle Fence Gate","2966":"Jungle Fence Gate","2967":"Jungle Fence Gate","2968":"Jungle Fence Gate","2969":"Jungle Fence Gate","2970":"Jungle Fence Gate","2971":"Jungle Fence Gate","2972":"Jungle Fence Gate","2973":"Jungle Fence Gate","2974":"Jungle Fence Gate","2975":"Jungle Fence Gate","2976":"Dark Oak Fence Gate","2977":"Dark Oak Fence Gate","2978":"Dark Oak Fence Gate","2979":"Dark Oak Fence Gate","2980":"Dark Oak Fence Gate","2981":"Dark Oak Fence Gate","2982":"Dark Oak Fence Gate","2983":"Dark Oak Fence Gate","2984":"Dark Oak Fence Gate","2985":"Dark Oak Fence Gate","2986":"Dark Oak Fence Gate","2987":"Dark Oak Fence Gate","2988":"Dark Oak Fence Gate","2989":"Dark Oak Fence Gate","2990":"Dark Oak Fence Gate","2991":"Dark Oak Fence Gate","2992":"Acacia Fence Gate","2993":"Acacia Fence Gate","2994":"Acacia Fence Gate","2995":"Acacia Fence Gate","2996":"Acacia Fence Gate","2997":"Acacia Fence Gate","2998":"Acacia Fence Gate","2999":"Acacia Fence Gate","3000":"Acacia Fence Gate","3001":"Acacia Fence Gate","3002":"Acacia Fence Gate","3003":"Acacia Fence Gate","3004":"Acacia Fence Gate","3005":"Acacia Fence Gate","3006":"Acacia Fence Gate","3007":"Acacia Fence Gate","3040":"Hardened Glass Pane","3056":"Stained Hardened Glass Pane","3057":"Stained Hardened Glass Pane","3058":"Stained Hardened Glass Pane","3059":"Stained Hardened Glass Pane","3060":"Stained Hardened Glass Pane","3061":"Stained Hardened Glass Pane","3062":"Stained Hardened Glass Pane","3063":"Stained Hardened Glass Pane","3064":"Stained Hardened Glass Pane","3065":"Stained Hardened Glass Pane","3066":"Stained Hardened Glass Pane","3067":"Stained Hardened Glass Pane","3068":"Stained Hardened Glass Pane","3069":"Stained Hardened Glass Pane","3070":"Stained Hardened Glass Pane","3071":"Stained Hardened Glass Pane","3072":"Heat Block","3088":"Spruce Door","3089":"Spruce Door","3090":"Spruce Door","3091":"Spruce Door","3092":"Spruce Door","3093":"Spruce Door","3094":"Spruce Door","3095":"Spruce Door","3096":"Spruce Door","3097":"Spruce Door","3098":"Spruce Door","3099":"Spruce Door","3104":"Birch Door","3105":"Birch Door","3106":"Birch Door","3107":"Birch Door","3108":"Birch Door","3109":"Birch Door","3110":"Birch Door","3111":"Birch Door","3112":"Birch Door","3113":"Birch Door","3114":"Birch Door","3115":"Birch Door","3120":"Jungle Door","3121":"Jungle Door","3122":"Jungle Door","3123":"Jungle Door","3124":"Jungle Door","3125":"Jungle Door","3126":"Jungle Door","3127":"Jungle Door","3128":"Jungle Door","3129":"Jungle Door","3130":"Jungle Door","3131":"Jungle Door","3136":"Acacia Door","3137":"Acacia Door","3138":"Acacia Door","3139":"Acacia Door","3140":"Acacia Door","3141":"Acacia Door","3142":"Acacia Door","3143":"Acacia Door","3144":"Acacia Door","3145":"Acacia Door","3146":"Acacia Door","3147":"Acacia Door","3152":"Dark Oak Door","3153":"Dark Oak Door","3154":"Dark Oak Door","3155":"Dark Oak Door","3156":"Dark Oak Door","3157":"Dark Oak Door","3158":"Dark Oak Door","3159":"Dark Oak Door","3160":"Dark Oak Door","3161":"Dark Oak Door","3162":"Dark Oak Door","3163":"Dark Oak Door","3168":"Grass Path","3184":"Item Frame","3185":"Item Frame","3186":"Item Frame","3187":"Item Frame","3188":"Item Frame","3189":"Item Frame","3190":"Item Frame","3191":"Item Frame","3216":"Purpur Block","3218":"Purpur Pillar","3222":"Purpur Pillar","3226":"Purpur Pillar","3233":"Red Torch","3234":"Red Torch","3235":"Red Torch","3236":"Red Torch","3237":"Red Torch","3241":"Green Torch","3242":"Green Torch","3243":"Green Torch","3244":"Green Torch","3245":"Green Torch","3248":"Purpur Stairs","3249":"Purpur Stairs","3250":"Purpur Stairs","3251":"Purpur Stairs","3252":"Purpur Stairs","3253":"Purpur Stairs","3254":"Purpur Stairs","3255":"Purpur Stairs","3265":"Blue Torch","3266":"Blue Torch","3267":"Blue Torch","3268":"Blue Torch","3269":"Blue Torch","3273":"Purple Torch","3274":"Purple Torch","3275":"Purple Torch","3276":"Purple Torch","3277":"Purple Torch","3280":"Shulker Box","3296":"End Stone Bricks","3312":"Frosted Ice","3313":"Frosted Ice","3314":"Frosted Ice","3315":"Frosted Ice","3328":"End Rod","3329":"End Rod","3330":"End Rod","3331":"End Rod","3332":"End Rod","3333":"End Rod","3408":"Magma Block","3424":"Nether Wart Block","3440":"Red Nether Bricks","3456":"Bone Block","3460":"Bone Block","3464":"Bone Block","3488":"Dyed Shulker Box","3489":"Dyed Shulker Box","3490":"Dyed Shulker Box","3491":"Dyed Shulker Box","3492":"Dyed Shulker Box","3493":"Dyed Shulker Box","3494":"Dyed Shulker Box","3495":"Dyed Shulker Box","3496":"Dyed Shulker Box","3497":"Dyed Shulker Box","3498":"Dyed Shulker Box","3499":"Dyed Shulker Box","3500":"Dyed Shulker Box","3501":"Dyed Shulker Box","3502":"Dyed Shulker Box","3503":"Dyed Shulker Box","3506":"Purple Glazed Terracotta","3507":"Purple Glazed Terracotta","3508":"Purple Glazed Terracotta","3509":"Purple Glazed Terracotta","3522":"White Glazed Terracotta","3523":"White Glazed Terracotta","3524":"White Glazed Terracotta","3525":"White Glazed Terracotta","3538":"Orange Glazed Terracotta","3539":"Orange Glazed Terracotta","3540":"Orange Glazed Terracotta","3541":"Orange Glazed Terracotta","3554":"Magenta Glazed Terracotta","3555":"Magenta Glazed Terracotta","3556":"Magenta Glazed Terracotta","3557":"Magenta Glazed Terracotta","3570":"Light Blue Glazed Terracotta","3571":"Light Blue Glazed Terracotta","3572":"Light Blue Glazed Terracotta","3573":"Light Blue Glazed Terracotta","3586":"Yellow Glazed Terracotta","3587":"Yellow Glazed Terracotta","3588":"Yellow Glazed Terracotta","3589":"Yellow Glazed Terracotta","3602":"Lime Glazed Terracotta","3603":"Lime Glazed Terracotta","3604":"Lime Glazed Terracotta","3605":"Lime Glazed Terracotta","3618":"Pink Glazed Terracotta","3619":"Pink Glazed Terracotta","3620":"Pink Glazed Terracotta","3621":"Pink Glazed Terracotta","3634":"Gray Glazed Terracotta","3635":"Gray Glazed Terracotta","3636":"Gray Glazed Terracotta","3637":"Gray Glazed Terracotta","3650":"Light Gray Glazed Terracotta","3651":"Light Gray Glazed Terracotta","3652":"Light Gray Glazed Terracotta","3653":"Light Gray Glazed Terracotta","3666":"Cyan Glazed Terracotta","3667":"Cyan Glazed Terracotta","3668":"Cyan Glazed Terracotta","3669":"Cyan Glazed Terracotta","3698":"Blue Glazed Terracotta","3699":"Blue Glazed Terracotta","3700":"Blue Glazed Terracotta","3701":"Blue Glazed Terracotta","3714":"Brown Glazed Terracotta","3715":"Brown Glazed Terracotta","3716":"Brown Glazed Terracotta","3717":"Brown Glazed Terracotta","3730":"Green Glazed Terracotta","3731":"Green Glazed Terracotta","3732":"Green Glazed Terracotta","3733":"Green Glazed Terracotta","3746":"Red Glazed Terracotta","3747":"Red Glazed Terracotta","3748":"Red Glazed Terracotta","3749":"Red Glazed Terracotta","3762":"Black Glazed Terracotta","3763":"Black Glazed Terracotta","3764":"Black Glazed Terracotta","3765":"Black Glazed Terracotta","3776":"Concrete","3777":"Concrete","3778":"Concrete","3779":"Concrete","3780":"Concrete","3781":"Concrete","3782":"Concrete","3783":"Concrete","3784":"Concrete","3785":"Concrete","3786":"Concrete","3787":"Concrete","3788":"Concrete","3789":"Concrete","3790":"Concrete","3791":"Concrete","3792":"Concrete Powder","3793":"Concrete Powder","3794":"Concrete Powder","3795":"Concrete Powder","3796":"Concrete Powder","3797":"Concrete Powder","3798":"Concrete Powder","3799":"Concrete Powder","3800":"Concrete Powder","3801":"Concrete Powder","3802":"Concrete Powder","3803":"Concrete Powder","3804":"Concrete Powder","3805":"Concrete Powder","3806":"Concrete Powder","3807":"Concrete Powder","3808":"Compound Creator","3809":"Compound Creator","3810":"Compound Creator","3811":"Compound Creator","3812":"Material Reducer","3813":"Material Reducer","3814":"Material Reducer","3815":"Material Reducer","3816":"Element Constructor","3817":"Element Constructor","3818":"Element Constructor","3819":"Element Constructor","3820":"Lab Table","3821":"Lab Table","3822":"Lab Table","3823":"Lab Table","3825":"Underwater Torch","3826":"Underwater Torch","3827":"Underwater Torch","3828":"Underwater Torch","3829":"Underwater Torch","3856":"Stained Glass","3857":"Stained Glass","3858":"Stained Glass","3859":"Stained Glass","3860":"Stained Glass","3861":"Stained Glass","3862":"Stained Glass","3863":"Stained Glass","3864":"Stained Glass","3865":"Stained Glass","3866":"Stained Glass","3867":"Stained Glass","3868":"Stained Glass","3869":"Stained Glass","3870":"Stained Glass","3871":"Stained Glass","3888":"Podzol","3904":"Beetroot Block","3905":"Beetroot Block","3906":"Beetroot Block","3907":"Beetroot Block","3908":"Beetroot Block","3909":"Beetroot Block","3910":"Beetroot Block","3911":"Beetroot Block","3920":"Legacy Stonecutter","3936":"Glowing Obsidian","3952":"Nether Reactor Core","3953":"Nether Reactor Core","3954":"Nether Reactor Core","3968":"update!","3984":"ate!upd","4048":"Hardened Glass","4064":"Stained Hardened Glass","4065":"Stained Hardened Glass","4066":"Stained Hardened Glass","4067":"Stained Hardened Glass","4068":"Stained Hardened Glass","4069":"Stained Hardened Glass","4070":"Stained Hardened Glass","4071":"Stained Hardened Glass","4072":"Stained Hardened Glass","4073":"Stained Hardened Glass","4074":"Stained Hardened Glass","4075":"Stained Hardened Glass","4076":"Stained Hardened Glass","4077":"Stained Hardened Glass","4078":"Stained Hardened Glass","4079":"Stained Hardened Glass","4080":"reserved6","4112":"Prismarine Stairs","4113":"Prismarine Stairs","4114":"Prismarine Stairs","4115":"Prismarine Stairs","4116":"Prismarine Stairs","4117":"Prismarine Stairs","4118":"Prismarine Stairs","4119":"Prismarine Stairs","4128":"Dark Prismarine Stairs","4129":"Dark Prismarine Stairs","4130":"Dark Prismarine Stairs","4131":"Dark Prismarine Stairs","4132":"Dark Prismarine Stairs","4133":"Dark Prismarine Stairs","4134":"Dark Prismarine Stairs","4135":"Dark Prismarine Stairs","4144":"Prismarine Bricks Stairs","4145":"Prismarine Bricks Stairs","4146":"Prismarine Bricks Stairs","4147":"Prismarine Bricks Stairs","4148":"Prismarine Bricks Stairs","4149":"Prismarine Bricks Stairs","4150":"Prismarine Bricks Stairs","4151":"Prismarine Bricks Stairs","4160":"Stripped Spruce Log","4161":"Stripped Spruce Log","4162":"Stripped Spruce Log","4176":"Stripped Birch Log","4177":"Stripped Birch Log","4178":"Stripped Birch Log","4192":"Stripped Jungle Log","4193":"Stripped Jungle Log","4194":"Stripped Jungle Log","4208":"Stripped Acacia Log","4209":"Stripped Acacia Log","4210":"Stripped Acacia Log","4224":"Stripped Dark Oak Log","4225":"Stripped Dark Oak Log","4226":"Stripped Dark Oak Log","4240":"Stripped Oak Log","4241":"Stripped Oak Log","4242":"Stripped Oak Log","4256":"Blue Ice","4272":"Hydrogen","4288":"Helium","4304":"Lithium","4320":"Beryllium","4336":"Boron","4352":"Carbon","4368":"Nitrogen","4384":"Oxygen","4400":"Fluorine","4416":"Neon","4432":"Sodium","4448":"Magnesium","4464":"Aluminum","4480":"Silicon","4496":"Phosphorus","4512":"Sulfur","4528":"Chlorine","4544":"Argon","4560":"Potassium","4576":"Calcium","4592":"Scandium","4608":"Titanium","4624":"Vanadium","4640":"Chromium","4656":"Manganese","4672":"Iron","4688":"Cobalt","4704":"Nickel","4720":"Copper","4736":"Zinc","4752":"Gallium","4768":"Germanium","4784":"Arsenic","4800":"Selenium","4816":"Bromine","4832":"Krypton","4848":"Rubidium","4864":"Strontium","4880":"Yttrium","4896":"Zirconium","4912":"Niobium","4928":"Molybdenum","4944":"Technetium","4960":"Ruthenium","4976":"Rhodium","4992":"Palladium","5008":"Silver","5024":"Cadmium","5040":"Indium","5056":"Tin","5072":"Antimony","5088":"Tellurium","5104":"Iodine","5120":"Xenon","5136":"Cesium","5152":"Barium","5168":"Lanthanum","5184":"Cerium","5200":"Praseodymium","5216":"Neodymium","5232":"Promethium","5248":"Samarium","5264":"Europium","5280":"Gadolinium","5296":"Terbium","5312":"Dysprosium","5328":"Holmium","5344":"Erbium","5360":"Thulium","5376":"Ytterbium","5392":"Lutetium","5408":"Hafnium","5424":"Tantalum","5440":"Tungsten","5456":"Rhenium","5472":"Osmium","5488":"Iridium","5504":"Platinum","5520":"Gold","5536":"Mercury","5552":"Thallium","5568":"Lead","5584":"Bismuth","5600":"Polonium","5616":"Astatine","5632":"Radon","5648":"Francium","5664":"Radium","5680":"Actinium","5696":"Thorium","5712":"Protactinium","5728":"Uranium","5744":"Neptunium","5760":"Plutonium","5776":"Americium","5792":"Curium","5808":"Berkelium","5824":"Californium","5840":"Einsteinium","5856":"Fermium","5872":"Mendelevium","5888":"Nobelium","5904":"Lawrencium","5920":"Rutherfordium","5936":"Dubnium","5952":"Seaborgium","5968":"Bohrium","5984":"Hassium","6000":"Meitnerium","6016":"Darmstadtium","6032":"Roentgenium","6048":"Copernicium","6064":"Nihonium","6080":"Flerovium","6096":"Moscovium","6112":"Livermorium","6128":"Tennessine","6144":"Oganesson","6176":"Coral","6177":"Coral","6178":"Coral","6179":"Coral","6180":"Coral","6192":"Coral Block","6193":"Coral Block","6194":"Coral Block","6195":"Coral Block","6196":"Coral Block","6200":"Coral Block","6201":"Coral Block","6202":"Coral Block","6203":"Coral Block","6204":"Coral Block","6208":"Coral Fan","6209":"Coral Fan","6210":"Coral Fan","6211":"Coral Fan","6212":"Coral Fan","6216":"Coral Fan","6217":"Coral Fan","6218":"Coral Fan","6219":"Coral Fan","6220":"Coral Fan","6224":"Coral Fan","6225":"Coral Fan","6226":"Coral Fan","6227":"Coral Fan","6228":"Coral Fan","6232":"Coral Fan","6233":"Coral Fan","6234":"Coral Fan","6235":"Coral Fan","6236":"Coral Fan","6240":"Wall Coral Fan","6241":"Wall Coral Fan","6242":"Wall Coral Fan","6243":"Wall Coral Fan","6244":"Wall Coral Fan","6245":"Wall Coral Fan","6246":"Wall Coral Fan","6247":"Wall Coral Fan","6248":"Wall Coral Fan","6249":"Wall Coral Fan","6250":"Wall Coral Fan","6251":"Wall Coral Fan","6252":"Wall Coral Fan","6253":"Wall Coral Fan","6254":"Wall Coral Fan","6255":"Wall Coral Fan","6256":"Wall Coral Fan","6257":"Wall Coral Fan","6258":"Wall Coral Fan","6259":"Wall Coral Fan","6260":"Wall Coral Fan","6261":"Wall Coral Fan","6262":"Wall Coral Fan","6263":"Wall Coral Fan","6264":"Wall Coral Fan","6265":"Wall Coral Fan","6266":"Wall Coral Fan","6267":"Wall Coral Fan","6268":"Wall Coral Fan","6269":"Wall Coral Fan","6270":"Wall Coral Fan","6271":"Wall Coral Fan","6272":"Wall Coral Fan","6274":"Wall Coral Fan","6276":"Wall Coral Fan","6278":"Wall Coral Fan","6280":"Wall Coral Fan","6282":"Wall Coral Fan","6284":"Wall Coral Fan","6286":"Wall Coral Fan","6304":"Dried Kelp Block","6320":"Acacia Button","6321":"Acacia Button","6322":"Acacia Button","6323":"Acacia Button","6324":"Acacia Button","6325":"Acacia Button","6328":"Acacia Button","6329":"Acacia Button","6330":"Acacia Button","6331":"Acacia Button","6332":"Acacia Button","6333":"Acacia Button","6336":"Birch Button","6337":"Birch Button","6338":"Birch Button","6339":"Birch Button","6340":"Birch Button","6341":"Birch Button","6344":"Birch Button","6345":"Birch Button","6346":"Birch Button","6347":"Birch Button","6348":"Birch Button","6349":"Birch Button","6352":"Dark Oak Button","6353":"Dark Oak Button","6354":"Dark Oak Button","6355":"Dark Oak Button","6356":"Dark Oak Button","6357":"Dark Oak Button","6360":"Dark Oak Button","6361":"Dark Oak Button","6362":"Dark Oak Button","6363":"Dark Oak Button","6364":"Dark Oak Button","6365":"Dark Oak Button","6368":"Jungle Button","6369":"Jungle Button","6370":"Jungle Button","6371":"Jungle Button","6372":"Jungle Button","6373":"Jungle Button","6376":"Jungle Button","6377":"Jungle Button","6378":"Jungle Button","6379":"Jungle Button","6380":"Jungle Button","6381":"Jungle Button","6384":"Spruce Button","6385":"Spruce Button","6386":"Spruce Button","6387":"Spruce Button","6388":"Spruce Button","6389":"Spruce Button","6392":"Spruce Button","6393":"Spruce Button","6394":"Spruce Button","6395":"Spruce Button","6396":"Spruce Button","6397":"Spruce Button","6400":"Acacia Trapdoor","6401":"Acacia Trapdoor","6402":"Acacia Trapdoor","6403":"Acacia Trapdoor","6404":"Acacia Trapdoor","6405":"Acacia Trapdoor","6406":"Acacia Trapdoor","6407":"Acacia Trapdoor","6408":"Acacia Trapdoor","6409":"Acacia Trapdoor","6410":"Acacia Trapdoor","6411":"Acacia Trapdoor","6412":"Acacia Trapdoor","6413":"Acacia Trapdoor","6414":"Acacia Trapdoor","6415":"Acacia Trapdoor","6416":"Birch Trapdoor","6417":"Birch Trapdoor","6418":"Birch Trapdoor","6419":"Birch Trapdoor","6420":"Birch Trapdoor","6421":"Birch Trapdoor","6422":"Birch Trapdoor","6423":"Birch Trapdoor","6424":"Birch Trapdoor","6425":"Birch Trapdoor","6426":"Birch Trapdoor","6427":"Birch Trapdoor","6428":"Birch Trapdoor","6429":"Birch Trapdoor","6430":"Birch Trapdoor","6431":"Birch Trapdoor","6432":"Dark Oak Trapdoor","6433":"Dark Oak Trapdoor","6434":"Dark Oak Trapdoor","6435":"Dark Oak Trapdoor","6436":"Dark Oak Trapdoor","6437":"Dark Oak Trapdoor","6438":"Dark Oak Trapdoor","6439":"Dark Oak Trapdoor","6440":"Dark Oak Trapdoor","6441":"Dark Oak Trapdoor","6442":"Dark Oak Trapdoor","6443":"Dark Oak Trapdoor","6444":"Dark Oak Trapdoor","6445":"Dark Oak Trapdoor","6446":"Dark Oak Trapdoor","6447":"Dark Oak Trapdoor","6448":"Jungle Trapdoor","6449":"Jungle Trapdoor","6450":"Jungle Trapdoor","6451":"Jungle Trapdoor","6452":"Jungle Trapdoor","6453":"Jungle Trapdoor","6454":"Jungle Trapdoor","6455":"Jungle Trapdoor","6456":"Jungle Trapdoor","6457":"Jungle Trapdoor","6458":"Jungle Trapdoor","6459":"Jungle Trapdoor","6460":"Jungle Trapdoor","6461":"Jungle Trapdoor","6462":"Jungle Trapdoor","6463":"Jungle Trapdoor","6464":"Spruce Trapdoor","6465":"Spruce Trapdoor","6466":"Spruce Trapdoor","6467":"Spruce Trapdoor","6468":"Spruce Trapdoor","6469":"Spruce Trapdoor","6470":"Spruce Trapdoor","6471":"Spruce Trapdoor","6472":"Spruce Trapdoor","6473":"Spruce Trapdoor","6474":"Spruce Trapdoor","6475":"Spruce Trapdoor","6476":"Spruce Trapdoor","6477":"Spruce Trapdoor","6478":"Spruce Trapdoor","6479":"Spruce Trapdoor","6480":"Acacia Pressure Plate","6481":"Acacia Pressure Plate","6496":"Birch Pressure Plate","6497":"Birch Pressure Plate","6512":"Dark Oak Pressure Plate","6513":"Dark Oak Pressure Plate","6528":"Jungle Pressure Plate","6529":"Jungle Pressure Plate","6544":"Spruce Pressure Plate","6545":"Spruce Pressure Plate","6560":"Carved Pumpkin","6561":"Carved Pumpkin","6562":"Carved Pumpkin","6563":"Carved Pumpkin","6576":"Sea Pickle","6577":"Sea Pickle","6578":"Sea Pickle","6579":"Sea Pickle","6580":"Sea Pickle","6581":"Sea Pickle","6582":"Sea Pickle","6583":"Sea Pickle","6656":"Barrier","6672":"End Stone Brick Slab","6673":"Smooth Red Sandstone Slab","6674":"Polished Andesite Slab","6675":"Andesite Slab","6676":"Diorite Slab","6677":"Polished Diorite Slab","6678":"Granite Slab","6679":"Polished Granite Slab","6680":"End Stone Brick Slab","6681":"Smooth Red Sandstone Slab","6682":"Polished Andesite Slab","6683":"Andesite Slab","6684":"Diorite Slab","6685":"Polished Diorite Slab","6686":"Granite Slab","6687":"Polished Granite Slab","6688":"Bamboo","6689":"Bamboo","6690":"Bamboo","6691":"Bamboo","6692":"Bamboo","6693":"Bamboo","6696":"Bamboo","6697":"Bamboo","6698":"Bamboo","6699":"Bamboo","6700":"Bamboo","6701":"Bamboo","6704":"Bamboo Sapling","6705":"Bamboo Sapling","6736":"Mossy Stone Brick Slab","6737":"Smooth Quartz Slab","6738":"Stone Slab","6739":"Cut Sandstone Slab","6740":"Cut Red Sandstone Slab","6744":"Mossy Stone Brick Slab","6745":"Smooth Quartz Slab","6746":"Stone Slab","6747":"Cut Sandstone Slab","6748":"Cut Red Sandstone Slab","6752":"End Stone Brick Slab","6753":"Smooth Red Sandstone Slab","6754":"Polished Andesite Slab","6755":"Andesite Slab","6756":"Diorite Slab","6757":"Polished Diorite Slab","6758":"Granite Slab","6759":"Polished Granite Slab","6768":"Mossy Stone Brick Slab","6769":"Smooth Quartz Slab","6770":"Stone Slab","6771":"Cut Sandstone Slab","6772":"Cut Red Sandstone Slab","6784":"Granite Stairs","6785":"Granite Stairs","6786":"Granite Stairs","6787":"Granite Stairs","6788":"Granite Stairs","6789":"Granite Stairs","6790":"Granite Stairs","6791":"Granite Stairs","6800":"Diorite Stairs","6801":"Diorite Stairs","6802":"Diorite Stairs","6803":"Diorite Stairs","6804":"Diorite Stairs","6805":"Diorite Stairs","6806":"Diorite Stairs","6807":"Diorite Stairs","6816":"Andesite Stairs","6817":"Andesite Stairs","6818":"Andesite Stairs","6819":"Andesite Stairs","6820":"Andesite Stairs","6821":"Andesite Stairs","6822":"Andesite Stairs","6823":"Andesite Stairs","6832":"Polished Granite Stairs","6833":"Polished Granite Stairs","6834":"Polished Granite Stairs","6835":"Polished Granite Stairs","6836":"Polished Granite Stairs","6837":"Polished Granite Stairs","6838":"Polished Granite Stairs","6839":"Polished Granite Stairs","6848":"Polished Diorite Stairs","6849":"Polished Diorite Stairs","6850":"Polished Diorite Stairs","6851":"Polished Diorite Stairs","6852":"Polished Diorite Stairs","6853":"Polished Diorite Stairs","6854":"Polished Diorite Stairs","6855":"Polished Diorite Stairs","6864":"Polished Andesite Stairs","6865":"Polished Andesite Stairs","6866":"Polished Andesite Stairs","6867":"Polished Andesite Stairs","6868":"Polished Andesite Stairs","6869":"Polished Andesite Stairs","6870":"Polished Andesite Stairs","6871":"Polished Andesite Stairs","6880":"Mossy Stone Brick Stairs","6881":"Mossy Stone Brick Stairs","6882":"Mossy Stone Brick Stairs","6883":"Mossy Stone Brick Stairs","6884":"Mossy Stone Brick Stairs","6885":"Mossy Stone Brick Stairs","6886":"Mossy Stone Brick Stairs","6887":"Mossy Stone Brick Stairs","6896":"Smooth Red Sandstone Stairs","6897":"Smooth Red Sandstone Stairs","6898":"Smooth Red Sandstone Stairs","6899":"Smooth Red Sandstone Stairs","6900":"Smooth Red Sandstone Stairs","6901":"Smooth Red Sandstone Stairs","6902":"Smooth Red Sandstone Stairs","6903":"Smooth Red Sandstone Stairs","6912":"Smooth Sandstone Stairs","6913":"Smooth Sandstone Stairs","6914":"Smooth Sandstone Stairs","6915":"Smooth Sandstone Stairs","6916":"Smooth Sandstone Stairs","6917":"Smooth Sandstone Stairs","6918":"Smooth Sandstone Stairs","6919":"Smooth Sandstone Stairs","6928":"End Stone Brick Stairs","6929":"End Stone Brick Stairs","6930":"End Stone Brick Stairs","6931":"End Stone Brick Stairs","6932":"End Stone Brick Stairs","6933":"End Stone Brick Stairs","6934":"End Stone Brick Stairs","6935":"End Stone Brick Stairs","6944":"Mossy Cobblestone Stairs","6945":"Mossy Cobblestone Stairs","6946":"Mossy Cobblestone Stairs","6947":"Mossy Cobblestone Stairs","6948":"Mossy Cobblestone Stairs","6949":"Mossy Cobblestone Stairs","6950":"Mossy Cobblestone Stairs","6951":"Mossy Cobblestone Stairs","6960":"Stone Stairs","6961":"Stone Stairs","6962":"Stone Stairs","6963":"Stone Stairs","6964":"Stone Stairs","6965":"Stone Stairs","6966":"Stone Stairs","6967":"Stone Stairs","6976":"Spruce Sign","6977":"Spruce Sign","6978":"Spruce Sign","6979":"Spruce Sign","6980":"Spruce Sign","6981":"Spruce Sign","6982":"Spruce Sign","6983":"Spruce Sign","6984":"Spruce Sign","6985":"Spruce Sign","6986":"Spruce Sign","6987":"Spruce Sign","6988":"Spruce Sign","6989":"Spruce Sign","6990":"Spruce Sign","6991":"Spruce Sign","6994":"Spruce Wall Sign","6995":"Spruce Wall Sign","6996":"Spruce Wall Sign","6997":"Spruce Wall Sign","7008":"Smooth Stone","7024":"Red Nether Brick Stairs","7025":"Red Nether Brick Stairs","7026":"Red Nether Brick Stairs","7027":"Red Nether Brick Stairs","7028":"Red Nether Brick Stairs","7029":"Red Nether Brick Stairs","7030":"Red Nether Brick Stairs","7031":"Red Nether Brick Stairs","7040":"Smooth Quartz Stairs","7041":"Smooth Quartz Stairs","7042":"Smooth Quartz Stairs","7043":"Smooth Quartz Stairs","7044":"Smooth Quartz Stairs","7045":"Smooth Quartz Stairs","7046":"Smooth Quartz Stairs","7047":"Smooth Quartz Stairs","7056":"Birch Sign","7057":"Birch Sign","7058":"Birch Sign","7059":"Birch Sign","7060":"Birch Sign","7061":"Birch Sign","7062":"Birch Sign","7063":"Birch Sign","7064":"Birch Sign","7065":"Birch Sign","7066":"Birch Sign","7067":"Birch Sign","7068":"Birch Sign","7069":"Birch Sign","7070":"Birch Sign","7071":"Birch Sign","7074":"Birch Wall Sign","7075":"Birch Wall Sign","7076":"Birch Wall Sign","7077":"Birch Wall Sign","7088":"Jungle Sign","7089":"Jungle Sign","7090":"Jungle Sign","7091":"Jungle Sign","7092":"Jungle Sign","7093":"Jungle Sign","7094":"Jungle Sign","7095":"Jungle Sign","7096":"Jungle Sign","7097":"Jungle Sign","7098":"Jungle Sign","7099":"Jungle Sign","7100":"Jungle Sign","7101":"Jungle Sign","7102":"Jungle Sign","7103":"Jungle Sign","7106":"Jungle Wall Sign","7107":"Jungle Wall Sign","7108":"Jungle Wall Sign","7109":"Jungle Wall Sign","7120":"Acacia Sign","7121":"Acacia Sign","7122":"Acacia Sign","7123":"Acacia Sign","7124":"Acacia Sign","7125":"Acacia Sign","7126":"Acacia Sign","7127":"Acacia Sign","7128":"Acacia Sign","7129":"Acacia Sign","7130":"Acacia Sign","7131":"Acacia Sign","7132":"Acacia Sign","7133":"Acacia Sign","7134":"Acacia Sign","7135":"Acacia Sign","7138":"Acacia Wall Sign","7139":"Acacia Wall Sign","7140":"Acacia Wall Sign","7141":"Acacia Wall Sign","7152":"Dark Oak Sign","7153":"Dark Oak Sign","7154":"Dark Oak Sign","7155":"Dark Oak Sign","7156":"Dark Oak Sign","7157":"Dark Oak Sign","7158":"Dark Oak Sign","7159":"Dark Oak Sign","7160":"Dark Oak Sign","7161":"Dark Oak Sign","7162":"Dark Oak Sign","7163":"Dark Oak Sign","7164":"Dark Oak Sign","7165":"Dark Oak Sign","7166":"Dark Oak Sign","7167":"Dark Oak Sign","7170":"Dark Oak Wall Sign","7171":"Dark Oak Wall Sign","7172":"Dark Oak Wall Sign","7173":"Dark Oak Wall Sign","7184":"Lectern","7185":"Lectern","7186":"Lectern","7187":"Lectern","7188":"Lectern","7189":"Lectern","7190":"Lectern","7191":"Lectern","7218":"Blast Furnace","7219":"Blast Furnace","7220":"Blast Furnace","7221":"Blast Furnace","7234":"Stonecutter","7235":"Stonecutter","7236":"Stonecutter","7237":"Stonecutter","7250":"Smoker","7251":"Smoker","7252":"Smoker","7253":"Smoker","7266":"Smoker","7267":"Smoker","7268":"Smoker","7269":"Smoker","7296":"Fletching Table","7328":"Barrel","7329":"Barrel","7330":"Barrel","7331":"Barrel","7332":"Barrel","7333":"Barrel","7336":"Barrel","7337":"Barrel","7338":"Barrel","7339":"Barrel","7340":"Barrel","7341":"Barrel","7344":"Loom","7345":"Loom","7346":"Loom","7347":"Loom","7376":"Bell","7377":"Bell","7378":"Bell","7379":"Bell","7380":"Bell","7381":"Bell","7382":"Bell","7383":"Bell","7384":"Bell","7385":"Bell","7386":"Bell","7387":"Bell","7388":"Bell","7389":"Bell","7390":"Bell","7391":"Bell","7392":"Sweet Berry Bush","7393":"Sweet Berry Bush","7394":"Sweet Berry Bush","7395":"Sweet Berry Bush","7408":"Lantern","7409":"Lantern","7472":"Oak Wood","7473":"Spruce Wood","7474":"Birch Wood","7475":"Jungle Wood","7476":"Acacia Wood","7477":"Dark Oak Wood","7480":"Stripped Oak Wood","7481":"Stripped Spruce Wood","7482":"Stripped Birch Wood","7483":"Stripped Jungle Wood","7484":"Stripped Acacia Wood","7485":"Stripped Dark Oak Wood","7506":"Blast Furnace","7507":"Blast Furnace","7508":"Blast Furnace","7509":"Blast Furnace"},"remaps":{"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"23":16,"24":16,"25":16,"26":16,"27":16,"28":16,"29":16,"30":16,"31":16,"33":32,"34":32,"35":32,"36":32,"37":32,"38":32,"39":32,"40":32,"41":32,"42":32,"43":32,"44":32,"45":32,"46":32,"47":32,"50":48,"51":48,"52":48,"53":48,"54":48,"55":48,"56":48,"57":48,"58":48,"59":48,"60":48,"61":48,"62":48,"63":48,"65":64,"66":64,"67":64,"68":64,"69":64,"70":64,"71":64,"72":64,"73":64,"74":64,"75":64,"76":64,"77":64,"78":64,"79":64,"86":80,"87":80,"88":80,"89":80,"90":80,"91":80,"92":80,"93":80,"94":80,"95":80,"102":96,"103":96,"110":96,"111":96,"114":112,"115":112,"116":112,"117":112,"118":112,"119":112,"120":112,"121":112,"122":112,"123":112,"124":112,"125":112,"126":112,"127":112,"194":192,"195":192,"196":192,"197":192,"198":192,"199":192,"200":192,"201":192,"202":192,"203":192,"204":192,"205":192,"206":192,"207":192,"209":208,"210":208,"211":208,"212":208,"213":208,"214":208,"215":208,"216":208,"217":208,"218":208,"219":208,"220":208,"221":208,"222":208,"223":208,"225":224,"226":224,"227":224,"228":224,"229":224,"230":224,"231":224,"232":224,"233":224,"234":224,"235":224,"236":224,"237":224,"238":224,"239":224,"241":240,"242":240,"243":240,"244":240,"245":240,"246":240,"247":240,"248":240,"249":240,"250":240,"251":240,"252":240,"253":240,"254":240,"255":240,"257":256,"258":256,"259":256,"260":256,"261":256,"262":256,"263":256,"264":256,"265":256,"266":256,"267":256,"268":256,"269":256,"270":256,"271":256,"284":7472,"285":7473,"286":7474,"287":7475,"306":304,"307":304,"308":304,"309":304,"310":304,"311":304,"312":304,"313":304,"314":304,"315":304,"316":304,"317":304,"318":304,"319":304,"321":320,"322":320,"323":320,"324":320,"325":320,"326":320,"327":320,"328":320,"329":320,"330":320,"331":320,"332":320,"333":320,"334":320,"335":320,"337":336,"338":336,"339":336,"340":336,"341":336,"342":336,"343":336,"344":336,"345":336,"346":336,"347":336,"348":336,"349":336,"350":336,"351":336,"353":352,"354":352,"355":352,"356":352,"357":352,"358":352,"359":352,"360":352,"361":352,"362":352,"363":352,"364":352,"365":352,"366":352,"367":352,"388":384,"389":384,"390":384,"391":384,"392":384,"393":384,"394":384,"395":384,"396":384,"397":384,"398":384,"399":384,"401":400,"402":400,"403":400,"404":400,"405":400,"406":400,"407":400,"408":400,"409":400,"410":400,"411":400,"412":400,"413":400,"414":400,"415":400,"438":432,"439":432,"446":432,"447":432,"454":448,"455":448,"462":448,"463":448,"481":480,"482":480,"483":480,"484":480,"485":480,"486":480,"487":480,"488":480,"489":480,"490":480,"491":480,"492":480,"493":480,"494":480,"495":480,"496":498,"499":498,"500":498,"501":498,"502":498,"503":498,"504":498,"505":498,"506":498,"507":498,"508":498,"509":498,"510":498,"511":498,"513":512,"514":512,"515":512,"516":512,"517":512,"518":512,"519":512,"520":512,"521":512,"522":512,"523":512,"524":512,"525":512,"526":512,"527":512,"577":576,"578":576,"579":576,"580":576,"581":576,"582":576,"583":576,"584":576,"585":576,"586":576,"587":576,"588":576,"589":576,"590":576,"591":576,"593":592,"594":592,"595":592,"596":592,"597":592,"598":592,"599":592,"600":592,"601":592,"602":592,"603":592,"604":592,"605":592,"606":592,"607":592,"619":608,"620":608,"621":608,"622":608,"623":608,"625":624,"626":624,"627":624,"628":624,"629":624,"630":624,"631":624,"632":624,"633":624,"634":624,"635":624,"636":624,"637":624,"638":624,"639":624,"641":640,"642":640,"643":640,"644":640,"645":640,"646":640,"647":640,"648":640,"649":640,"650":640,"651":640,"652":640,"653":640,"654":640,"655":640,"657":656,"658":656,"659":656,"660":656,"661":656,"662":656,"663":656,"664":656,"665":656,"666":656,"667":656,"668":656,"669":656,"670":656,"671":656,"673":672,"674":672,"675":672,"676":672,"677":672,"678":672,"679":672,"680":672,"681":672,"682":672,"683":672,"684":672,"685":672,"686":672,"687":672,"696":688,"697":689,"698":690,"699":691,"700":692,"701":693,"702":694,"703":695,"721":720,"722":720,"723":720,"724":720,"725":720,"726":720,"727":720,"728":720,"729":720,"730":720,"731":720,"732":720,"733":720,"734":720,"735":720,"740":736,"741":736,"742":736,"743":736,"744":736,"745":736,"746":736,"747":736,"748":736,"749":736,"750":736,"751":736,"753":752,"754":752,"755":752,"756":752,"757":752,"758":752,"759":752,"760":752,"761":752,"762":752,"763":752,"764":752,"765":752,"766":752,"767":752,"769":768,"770":768,"771":768,"772":768,"773":768,"774":768,"775":768,"776":768,"777":768,"778":768,"779":768,"780":768,"781":768,"782":768,"783":768,"785":784,"786":784,"787":784,"788":784,"789":784,"790":784,"791":784,"792":784,"793":784,"794":784,"795":784,"796":784,"797":784,"798":784,"799":784,"800":805,"806":805,"807":805,"808":805,"809":805,"810":805,"811":805,"812":805,"813":805,"814":805,"815":805,"833":832,"834":832,"835":832,"836":832,"837":832,"838":832,"839":832,"840":832,"841":832,"842":832,"843":832,"844":832,"845":832,"846":832,"847":832,"856":851,"857":851,"858":851,"859":851,"860":851,"861":851,"862":851,"863":851,"864":866,"865":866,"870":866,"871":866,"872":866,"873":866,"874":866,"875":866,"876":866,"877":866,"878":866,"879":866,"897":896,"898":896,"899":896,"900":896,"901":896,"902":896,"903":896,"904":896,"905":896,"906":896,"907":896,"908":896,"909":896,"910":896,"911":896,"913":912,"914":912,"915":912,"916":912,"917":912,"918":912,"919":912,"920":912,"921":912,"922":912,"923":912,"924":912,"925":912,"926":912,"927":912,"929":928,"930":928,"931":928,"932":928,"933":928,"934":928,"935":928,"936":928,"937":928,"938":928,"939":928,"940":928,"941":928,"942":928,"943":928,"952":944,"953":944,"954":944,"955":944,"956":944,"957":944,"958":944,"959":944,"968":960,"969":960,"970":960,"971":960,"972":960,"973":960,"974":960,"975":960,"976":978,"977":978,"982":978,"983":978,"984":978,"985":978,"986":978,"987":978,"988":978,"989":978,"990":978,"991":978,"992":978,"993":978,"998":978,"999":978,"1000":978,"1001":978,"1002":978,"1003":978,"1004":978,"1005":978,"1006":978,"1007":978,"1036":1027,"1037":1027,"1038":1027,"1039":1027,"1040":1042,"1041":1042,"1046":1042,"1047":1042,"1048":1042,"1049":1042,"1050":1042,"1051":1042,"1052":1042,"1053":1042,"1054":1042,"1055":1042,"1066":1056,"1067":1056,"1068":1056,"1069":1056,"1070":1056,"1071":1056,"1080":1075,"1081":1075,"1082":1075,"1083":1075,"1084":1075,"1085":1075,"1086":1075,"1087":1075,"1088":1090,"1089":1090,"1094":1090,"1095":1090,"1096":1090,"1097":1090,"1098":1090,"1099":1090,"1100":1090,"1101":1090,"1102":1090,"1103":1090,"1122":1120,"1123":1120,"1124":1120,"1125":1120,"1126":1120,"1127":1120,"1128":1120,"1129":1120,"1130":1120,"1131":1120,"1132":1120,"1133":1120,"1134":1120,"1135":1120,"1148":1139,"1149":1139,"1150":1139,"1151":1139,"1154":1152,"1155":1152,"1156":1152,"1157":1152,"1158":1152,"1159":1152,"1160":1152,"1161":1152,"1162":1152,"1163":1152,"1164":1152,"1165":1152,"1166":1152,"1167":1152,"1169":1168,"1170":1168,"1171":1168,"1172":1168,"1173":1168,"1174":1168,"1175":1168,"1176":1168,"1177":1168,"1178":1168,"1179":1168,"1180":1168,"1181":1168,"1182":1168,"1183":1168,"1185":1168,"1186":1168,"1187":1168,"1188":1168,"1189":1168,"1190":1168,"1191":1168,"1192":1168,"1193":1168,"1194":1168,"1195":1168,"1196":1168,"1197":1168,"1198":1168,"1199":1168,"1200":1221,"1206":1221,"1207":1221,"1208":1221,"1209":1221,"1210":1221,"1211":1221,"1212":1221,"1213":1221,"1214":1221,"1215":1221,"1216":1221,"1222":1221,"1223":1221,"1224":1221,"1225":1221,"1226":1221,"1227":1221,"1228":1221,"1229":1221,"1230":1221,"1231":1221,"1238":1232,"1239":1232,"1246":1232,"1247":1232,"1256":1248,"1257":1248,"1258":1248,"1259":1248,"1260":1248,"1261":1248,"1262":1248,"1263":1248,"1265":1264,"1266":1264,"1267":1264,"1268":1264,"1269":1264,"1270":1264,"1271":1264,"1272":1264,"1273":1264,"1274":1264,"1275":1264,"1276":1264,"1277":1264,"1278":1264,"1279":1264,"1281":1280,"1282":1280,"1283":1280,"1284":1280,"1285":1280,"1286":1280,"1287":1280,"1288":1280,"1289":1280,"1290":1280,"1291":1280,"1292":1280,"1293":1280,"1294":1280,"1295":1280,"1313":1312,"1314":1312,"1315":1312,"1316":1312,"1317":1312,"1318":1312,"1319":1312,"1320":1312,"1321":1312,"1322":1312,"1323":1312,"1324":1312,"1325":1312,"1326":1312,"1327":1312,"1345":1344,"1346":1344,"1347":1344,"1348":1344,"1349":1344,"1350":1344,"1351":1344,"1352":1344,"1353":1344,"1354":1344,"1355":1344,"1356":1344,"1357":1344,"1358":1344,"1359":1344,"1366":1360,"1367":1360,"1368":1360,"1369":1360,"1370":1360,"1371":1360,"1372":1360,"1373":1360,"1374":1360,"1375":1360,"1377":1376,"1378":1376,"1379":1376,"1380":1376,"1381":1376,"1382":1376,"1383":1376,"1384":1376,"1385":1376,"1386":1376,"1387":1376,"1388":1376,"1389":1376,"1390":1376,"1391":1376,"1393":1392,"1394":1392,"1395":1392,"1396":1392,"1397":1392,"1398":1392,"1399":1392,"1400":1392,"1401":1392,"1402":1392,"1403":1392,"1404":1392,"1405":1392,"1406":1392,"1407":1392,"1409":1408,"1410":1408,"1411":1408,"1412":1408,"1413":1408,"1414":1408,"1415":1408,"1416":1408,"1417":1408,"1418":1408,"1419":1408,"1420":1408,"1421":1408,"1422":1408,"1423":1408,"1425":1424,"1426":1424,"1427":1424,"1428":1424,"1429":1424,"1430":1424,"1431":1424,"1432":1424,"1433":1424,"1434":1424,"1435":1424,"1436":1424,"1437":1424,"1438":1424,"1439":1424,"1440":1441,"1443":1441,"1444":1441,"1445":1441,"1446":1441,"1447":1441,"1448":1441,"1449":1441,"1450":1441,"1451":1441,"1452":1441,"1453":1441,"1454":1441,"1455":1441,"1460":1458,"1461":1458,"1462":1458,"1463":1458,"1464":1458,"1465":1458,"1466":1458,"1467":1458,"1468":1458,"1469":1458,"1470":1458,"1471":1458,"1479":1472,"1480":1472,"1481":1472,"1482":1472,"1483":1472,"1484":1472,"1485":1472,"1486":1472,"1487":1472,"1521":1520,"1522":1520,"1523":1520,"1524":1520,"1525":1520,"1526":1520,"1527":1520,"1528":1520,"1529":1520,"1530":1520,"1531":1520,"1532":1520,"1533":1520,"1534":1520,"1535":1520,"1558":1552,"1559":1552,"1560":1552,"1561":1552,"1562":1552,"1563":1552,"1564":1552,"1565":1552,"1566":1552,"1567":1552,"1572":1568,"1573":1568,"1574":1568,"1575":1568,"1576":1568,"1577":1568,"1578":1568,"1579":1568,"1580":1568,"1581":1568,"1582":1568,"1583":1568,"1595":1598,"1596":1598,"1597":1598,"1610":1594,"1611":1614,"1612":1614,"1613":1614,"1615":1599,"1617":1616,"1618":1616,"1619":1616,"1620":1616,"1621":1616,"1622":1616,"1623":1616,"1624":1616,"1625":1616,"1626":1616,"1627":1616,"1628":1616,"1629":1616,"1630":1616,"1631":1616,"1633":1632,"1634":1632,"1635":1632,"1636":1632,"1637":1632,"1638":1632,"1639":1632,"1640":1632,"1641":1632,"1642":1632,"1643":1632,"1644":1632,"1645":1632,"1646":1632,"1647":1632,"1649":1648,"1650":1648,"1651":1648,"1652":1648,"1653":1648,"1654":1648,"1655":1648,"1656":1648,"1657":1648,"1658":1648,"1659":1648,"1660":1648,"1661":1648,"1662":1648,"1663":1648,"1672":1664,"1673":1664,"1674":1664,"1675":1664,"1676":1664,"1677":1664,"1678":1664,"1679":1664,"1688":1680,"1689":1680,"1690":1680,"1691":1680,"1692":1680,"1693":1680,"1694":1680,"1695":1680,"1736":1731,"1737":1731,"1738":1731,"1739":1731,"1740":1731,"1741":1731,"1742":1731,"1743":1731,"1752":1747,"1753":1747,"1754":1747,"1755":1747,"1756":1747,"1757":1747,"1758":1747,"1759":1747,"1761":1760,"1762":1760,"1763":1760,"1764":1760,"1765":1760,"1766":1760,"1767":1760,"1768":1760,"1769":1760,"1770":1760,"1771":1760,"1772":1760,"1773":1760,"1774":1760,"1775":1760,"1777":1776,"1778":1776,"1779":1776,"1780":1776,"1781":1776,"1782":1776,"1783":1776,"1784":1776,"1785":1776,"1786":1776,"1787":1776,"1788":1776,"1789":1776,"1790":1776,"1791":1776,"1793":1792,"1794":1792,"1795":1792,"1796":1792,"1797":1792,"1798":1792,"1799":1792,"1800":1792,"1801":1792,"1802":1792,"1803":1792,"1804":1792,"1805":1792,"1806":1792,"1807":1792,"1809":1808,"1810":1808,"1811":1808,"1812":1808,"1813":1808,"1814":1808,"1815":1808,"1816":1808,"1817":1808,"1818":1808,"1819":1808,"1820":1808,"1821":1808,"1822":1808,"1823":1808,"1832":1827,"1833":1827,"1834":1827,"1835":1827,"1836":1827,"1837":1827,"1838":1827,"1839":1827,"1844":1840,"1845":1840,"1846":1840,"1847":1840,"1848":1840,"1849":1840,"1850":1840,"1851":1840,"1852":1840,"1853":1840,"1854":1840,"1855":1840,"1857":1856,"1858":1856,"1859":1856,"1860":1856,"1861":1856,"1862":1856,"1863":1856,"1864":1856,"1865":1856,"1866":1856,"1867":1856,"1868":1856,"1869":1856,"1870":1856,"1871":1856,"1880":1872,"1881":1872,"1882":1872,"1883":1872,"1884":1872,"1885":1872,"1886":1872,"1887":1872,"1928":1922,"1929":1922,"1930":1922,"1931":1922,"1932":1922,"1933":1922,"1934":1922,"1935":1922,"1937":1936,"1938":1936,"1939":1936,"1940":1936,"1941":1936,"1942":1936,"1943":1936,"1944":1936,"1945":1936,"1946":1936,"1947":1936,"1948":1936,"1949":1936,"1950":1936,"1951":1936,"1953":1952,"1954":1952,"1955":1952,"1956":1952,"1957":1952,"1958":1952,"1959":1952,"1960":1952,"1961":1952,"1962":1952,"1963":1952,"1964":1952,"1965":1952,"1966":1952,"1967":1952,"1969":1968,"1970":1968,"1971":1968,"1972":1968,"1973":1968,"1974":1968,"1975":1968,"1976":1968,"1977":1968,"1978":1968,"1979":1968,"1980":1968,"1981":1968,"1982":1968,"1983":1968,"1985":1968,"1986":1968,"1987":1968,"1988":1968,"1989":1968,"1990":1968,"1991":1968,"1992":1968,"1993":1968,"1994":1968,"1995":1968,"1996":1968,"1997":1968,"1998":1968,"1999":1968,"2022":2016,"2023":2016,"2030":2016,"2031":2016,"2044":2032,"2045":2032,"2046":2032,"2047":2032,"2056":2051,"2057":2051,"2058":2051,"2059":2051,"2060":2051,"2061":2051,"2062":2051,"2063":2051,"2065":2064,"2066":2064,"2067":2064,"2068":2064,"2069":2064,"2070":2064,"2071":2064,"2072":2064,"2073":2064,"2074":2064,"2075":2064,"2076":2064,"2077":2064,"2078":2064,"2079":2064,"2080":2082,"2081":2082,"2086":2082,"2087":2082,"2088":2082,"2089":2082,"2090":2082,"2091":2082,"2092":2082,"2093":2082,"2094":2082,"2095":2082,"2129":2128,"2130":2128,"2131":2128,"2132":2128,"2133":2128,"2134":2128,"2135":2128,"2136":2128,"2137":2128,"2138":2128,"2139":2128,"2140":2128,"2141":2128,"2142":2128,"2143":2128,"2152":2147,"2153":2147,"2154":2147,"2155":2147,"2156":2147,"2157":2147,"2158":2147,"2159":2147,"2168":2163,"2169":2163,"2170":2163,"2171":2163,"2172":2163,"2173":2163,"2174":2163,"2175":2163,"2184":2179,"2185":2179,"2186":2179,"2187":2179,"2188":2179,"2189":2179,"2190":2179,"2191":2179,"2209":2208,"2210":2208,"2211":2208,"2212":2208,"2213":2208,"2214":2208,"2215":2208,"2216":2208,"2217":2208,"2218":2208,"2219":2208,"2220":2208,"2221":2208,"2222":2208,"2223":2208,"2238":2224,"2239":2224,"2241":2240,"2242":2240,"2243":2240,"2244":2240,"2245":2240,"2246":2240,"2247":2240,"2248":2240,"2249":2240,"2250":2240,"2251":2240,"2252":2240,"2253":2240,"2254":2240,"2255":2240,"2264":2256,"2265":2256,"2266":2256,"2267":2256,"2268":2256,"2269":2256,"2270":2256,"2271":2256,"2280":2272,"2281":2272,"2282":2272,"2283":2272,"2284":2272,"2285":2272,"2286":2272,"2287":2272,"2294":2288,"2295":2288,"2302":2288,"2303":2288,"2304":2306,"2310":2306,"2311":2306,"2312":2306,"2318":2306,"2319":2306,"2332":2322,"2333":2322,"2334":2322,"2335":2322,"2336":2338,"2337":2338,"2342":2338,"2343":2338,"2344":2338,"2345":2338,"2346":2338,"2347":2338,"2348":2338,"2349":2338,"2350":2338,"2351":2338,"2392":2386,"2393":2386,"2394":2386,"2395":2386,"2396":2386,"2397":2386,"2398":2386,"2399":2386,"2400":2386,"2401":2386,"2402":2386,"2403":2386,"2404":2386,"2405":2386,"2406":2386,"2407":2386,"2433":2432,"2434":2432,"2435":2432,"2436":2432,"2437":2432,"2438":2432,"2439":2432,"2440":2432,"2441":2432,"2442":2432,"2443":2432,"2444":2432,"2445":2432,"2446":2432,"2447":2432,"2449":2448,"2450":2448,"2451":2448,"2452":2448,"2453":2448,"2454":2448,"2455":2448,"2456":2448,"2457":2448,"2458":2448,"2459":2448,"2460":2448,"2461":2448,"2462":2448,"2463":2448,"2465":2464,"2470":2464,"2471":2464,"2473":2464,"2478":2464,"2479":2464,"2484":2480,"2487":2480,"2488":2480,"2491":2480,"2492":2480,"2493":2481,"2494":2482,"2495":2480,"2504":2499,"2505":2499,"2506":2499,"2507":2499,"2508":2499,"2509":2499,"2510":2499,"2511":2499,"2520":2512,"2521":2513,"2522":2514,"2523":2515,"2524":2516,"2525":2517,"2578":288,"2579":288,"2582":288,"2583":288,"2586":288,"2587":288,"2590":288,"2591":288,"2604":7476,"2605":7477,"2616":2611,"2617":2611,"2618":2611,"2619":2611,"2620":2611,"2621":2611,"2622":2611,"2623":2611,"2632":2627,"2633":2627,"2634":2627,"2635":2627,"2636":2627,"2637":2627,"2638":2627,"2639":2627,"2641":2640,"2642":2640,"2643":2640,"2644":2640,"2645":2640,"2646":2640,"2647":2640,"2648":2640,"2649":2640,"2650":2640,"2651":2640,"2652":2640,"2653":2640,"2654":2640,"2655":2640,"2691":2688,"2692":2688,"2693":2688,"2694":2688,"2695":2688,"2696":2688,"2697":2688,"2698":2688,"2699":2688,"2700":2688,"2701":2688,"2702":2688,"2703":2688,"2705":2704,"2706":2704,"2707":2704,"2708":2704,"2709":2704,"2710":2704,"2711":2704,"2712":2704,"2713":2704,"2714":2704,"2715":2704,"2716":2704,"2717":2704,"2718":2704,"2719":2704,"2721":2720,"2722":2720,"2723":2720,"2725":2720,"2726":2720,"2727":2720,"2729":2720,"2730":2720,"2731":2720,"2732":2720,"2733":2720,"2734":2720,"2735":2720,"2753":2752,"2754":2752,"2755":2752,"2756":2752,"2757":2752,"2758":2752,"2759":2752,"2760":2752,"2761":2752,"2762":2752,"2763":2752,"2764":2752,"2765":2752,"2766":2752,"2767":2752,"2769":2768,"2770":2768,"2771":2768,"2772":2768,"2773":2768,"2774":2768,"2775":2768,"2776":2768,"2777":2768,"2778":2768,"2779":2768,"2780":2768,"2781":2768,"2782":2768,"2783":2768,"2785":2784,"2786":2784,"2787":2784,"2788":2784,"2789":2784,"2790":2784,"2791":2784,"2792":2784,"2793":2784,"2794":2784,"2795":2784,"2796":2784,"2797":2784,"2798":2784,"2799":2784,"2806":2800,"2807":2800,"2814":2800,"2815":2800,"2832":2834,"2833":2834,"2838":2834,"2839":2834,"2840":2834,"2841":2834,"2842":2834,"2843":2834,"2844":2834,"2845":2834,"2846":2834,"2847":2834,"2868":2864,"2869":2864,"2870":2864,"2871":2864,"2872":2864,"2873":2864,"2874":2864,"2875":2864,"2876":2864,"2877":2864,"2878":2864,"2879":2864,"2888":2883,"2889":2883,"2890":2883,"2891":2883,"2892":2883,"2893":2883,"2894":2883,"2895":2883,"2904":2896,"2905":2897,"2906":2898,"2907":2899,"2908":2900,"2909":2901,"2910":2902,"2911":2903,"3041":3040,"3042":3040,"3043":3040,"3044":3040,"3045":3040,"3046":3040,"3047":3040,"3048":3040,"3049":3040,"3050":3040,"3051":3040,"3052":3040,"3053":3040,"3054":3040,"3055":3040,"3073":3072,"3074":3072,"3075":3072,"3076":3072,"3077":3072,"3078":3072,"3079":3072,"3080":3072,"3081":3072,"3082":3072,"3083":3072,"3084":3072,"3085":3072,"3086":3072,"3087":3072,"3100":3091,"3101":3091,"3102":3091,"3103":3091,"3116":3107,"3117":3107,"3118":3107,"3119":3107,"3132":3123,"3133":3123,"3134":3123,"3135":3123,"3148":3139,"3149":3139,"3150":3139,"3151":3139,"3164":3155,"3165":3155,"3166":3155,"3167":3155,"3169":3168,"3170":3168,"3171":3168,"3172":3168,"3173":3168,"3174":3168,"3175":3168,"3176":3168,"3177":3168,"3178":3168,"3179":3168,"3180":3168,"3181":3168,"3182":3168,"3183":3168,"3192":3187,"3193":3187,"3194":3187,"3195":3187,"3196":3187,"3197":3187,"3198":3187,"3199":3187,"3217":3216,"3219":3216,"3220":3216,"3221":3216,"3223":3216,"3224":3216,"3225":3216,"3227":3216,"3228":3216,"3229":3216,"3230":3218,"3231":3216,"3232":3237,"3238":3237,"3239":3237,"3240":3245,"3246":3245,"3247":3245,"3256":3251,"3257":3251,"3258":3251,"3259":3251,"3260":3251,"3261":3251,"3262":3251,"3263":3251,"3264":3269,"3270":3269,"3271":3269,"3272":3277,"3278":3277,"3279":3277,"3281":3280,"3282":3280,"3283":3280,"3284":3280,"3285":3280,"3286":3280,"3287":3280,"3288":3280,"3289":3280,"3290":3280,"3291":3280,"3292":3280,"3293":3280,"3294":3280,"3295":3280,"3297":3296,"3298":3296,"3299":3296,"3300":3296,"3301":3296,"3302":3296,"3303":3296,"3304":3296,"3305":3296,"3306":3296,"3307":3296,"3308":3296,"3309":3296,"3310":3296,"3311":3296,"3316":3312,"3317":3312,"3318":3312,"3319":3312,"3320":3312,"3321":3312,"3322":3312,"3323":3312,"3324":3312,"3325":3312,"3326":3312,"3327":3312,"3334":3328,"3335":3328,"3336":3328,"3337":3328,"3338":3328,"3339":3328,"3340":3328,"3341":3328,"3342":3328,"3343":3328,"3409":3408,"3410":3408,"3411":3408,"3412":3408,"3413":3408,"3414":3408,"3415":3408,"3416":3408,"3417":3408,"3418":3408,"3419":3408,"3420":3408,"3421":3408,"3422":3408,"3423":3408,"3425":3424,"3426":3424,"3427":3424,"3428":3424,"3429":3424,"3430":3424,"3431":3424,"3432":3424,"3433":3424,"3434":3424,"3435":3424,"3436":3424,"3437":3424,"3438":3424,"3439":3424,"3441":3440,"3442":3440,"3443":3440,"3444":3440,"3445":3440,"3446":3440,"3447":3440,"3448":3440,"3449":3440,"3450":3440,"3451":3440,"3452":3440,"3453":3440,"3454":3440,"3455":3440,"3457":3456,"3458":3456,"3459":3456,"3461":3456,"3462":3456,"3463":3456,"3465":3456,"3466":3456,"3467":3456,"3468":3456,"3469":3456,"3470":3456,"3471":3456,"3504":3506,"3505":3506,"3510":3506,"3511":3506,"3512":3506,"3513":3506,"3514":3506,"3515":3506,"3516":3506,"3517":3506,"3518":3506,"3519":3506,"3520":3522,"3521":3522,"3526":3522,"3527":3522,"3528":3522,"3529":3522,"3530":3522,"3531":3522,"3532":3522,"3533":3522,"3534":3522,"3535":3522,"3536":3538,"3537":3538,"3542":3538,"3543":3538,"3544":3538,"3545":3538,"3546":3538,"3547":3538,"3548":3538,"3549":3538,"3550":3538,"3551":3538,"3552":3554,"3553":3554,"3558":3554,"3559":3554,"3560":3554,"3561":3554,"3562":3554,"3563":3554,"3564":3554,"3565":3554,"3566":3554,"3567":3554,"3568":3570,"3569":3570,"3574":3570,"3575":3570,"3576":3570,"3577":3570,"3578":3570,"3579":3570,"3580":3570,"3581":3570,"3582":3570,"3583":3570,"3584":3586,"3585":3586,"3590":3586,"3591":3586,"3592":3586,"3593":3586,"3594":3586,"3595":3586,"3596":3586,"3597":3586,"3598":3586,"3599":3586,"3600":3602,"3601":3602,"3606":3602,"3607":3602,"3608":3602,"3609":3602,"3610":3602,"3611":3602,"3612":3602,"3613":3602,"3614":3602,"3615":3602,"3616":3618,"3617":3618,"3622":3618,"3623":3618,"3624":3618,"3625":3618,"3626":3618,"3627":3618,"3628":3618,"3629":3618,"3630":3618,"3631":3618,"3632":3634,"3633":3634,"3638":3634,"3639":3634,"3640":3634,"3641":3634,"3642":3634,"3643":3634,"3644":3634,"3645":3634,"3646":3634,"3647":3634,"3648":3650,"3649":3650,"3654":3650,"3655":3650,"3656":3650,"3657":3650,"3658":3650,"3659":3650,"3660":3650,"3661":3650,"3662":3650,"3663":3650,"3664":3666,"3665":3666,"3670":3666,"3671":3666,"3672":3666,"3673":3666,"3674":3666,"3675":3666,"3676":3666,"3677":3666,"3678":3666,"3679":3666,"3696":3698,"3697":3698,"3702":3698,"3703":3698,"3704":3698,"3705":3698,"3706":3698,"3707":3698,"3708":3698,"3709":3698,"3710":3698,"3711":3698,"3712":3714,"3713":3714,"3718":3714,"3719":3714,"3720":3714,"3721":3714,"3722":3714,"3723":3714,"3724":3714,"3725":3714,"3726":3714,"3727":3714,"3728":3730,"3729":3730,"3734":3730,"3735":3730,"3736":3730,"3737":3730,"3738":3730,"3739":3730,"3740":3730,"3741":3730,"3742":3730,"3743":3730,"3744":3746,"3745":3746,"3750":3746,"3751":3746,"3752":3746,"3753":3746,"3754":3746,"3755":3746,"3756":3746,"3757":3746,"3758":3746,"3759":3746,"3760":3762,"3761":3762,"3766":3762,"3767":3762,"3768":3762,"3769":3762,"3770":3762,"3771":3762,"3772":3762,"3773":3762,"3774":3762,"3775":3762,"3824":3829,"3830":3829,"3831":3829,"3832":3829,"3833":3829,"3834":3829,"3835":3829,"3836":3829,"3837":3829,"3838":3829,"3839":3829,"3889":3888,"3890":3888,"3891":3888,"3892":3888,"3893":3888,"3894":3888,"3895":3888,"3896":3888,"3897":3888,"3898":3888,"3899":3888,"3900":3888,"3901":3888,"3902":3888,"3903":3888,"3912":3904,"3913":3904,"3914":3904,"3915":3904,"3916":3904,"3917":3904,"3918":3904,"3919":3904,"3921":3920,"3922":3920,"3923":3920,"3924":3920,"3925":3920,"3926":3920,"3927":3920,"3928":3920,"3929":3920,"3930":3920,"3931":3920,"3932":3920,"3933":3920,"3934":3920,"3935":3920,"3937":3936,"3938":3936,"3939":3936,"3940":3936,"3941":3936,"3942":3936,"3943":3936,"3944":3936,"3945":3936,"3946":3936,"3947":3936,"3948":3936,"3949":3936,"3950":3936,"3951":3936,"3955":3952,"3956":3952,"3957":3952,"3958":3952,"3959":3952,"3960":3952,"3961":3952,"3962":3952,"3963":3952,"3964":3952,"3965":3952,"3966":3952,"3967":3952,"3969":3968,"3970":3968,"3971":3968,"3972":3968,"3973":3968,"3974":3968,"3975":3968,"3976":3968,"3977":3968,"3978":3968,"3979":3968,"3980":3968,"3981":3968,"3982":3968,"3983":3968,"3985":3984,"3986":3984,"3987":3984,"3988":3984,"3989":3984,"3990":3984,"3991":3984,"3992":3984,"3993":3984,"3994":3984,"3995":3984,"3996":3984,"3997":3984,"3998":3984,"3999":3984,"4049":4048,"4050":4048,"4051":4048,"4052":4048,"4053":4048,"4054":4048,"4055":4048,"4056":4048,"4057":4048,"4058":4048,"4059":4048,"4060":4048,"4061":4048,"4062":4048,"4063":4048,"4081":4080,"4082":4080,"4083":4080,"4084":4080,"4085":4080,"4086":4080,"4087":4080,"4088":4080,"4089":4080,"4090":4080,"4091":4080,"4092":4080,"4093":4080,"4094":4080,"4095":4080,"4120":4115,"4121":4115,"4122":4115,"4123":4115,"4124":4115,"4125":4115,"4126":4115,"4127":4115,"4136":4131,"4137":4131,"4138":4131,"4139":4131,"4140":4131,"4141":4131,"4142":4131,"4143":4131,"4152":4147,"4153":4147,"4154":4147,"4155":4147,"4156":4147,"4157":4147,"4158":4147,"4159":4147,"4163":4160,"4164":4160,"4165":4160,"4166":4160,"4167":4160,"4168":4160,"4169":4160,"4170":4160,"4171":4160,"4172":4160,"4173":4160,"4174":4160,"4175":4160,"4179":4176,"4180":4176,"4181":4176,"4182":4176,"4183":4176,"4184":4176,"4185":4176,"4186":4176,"4187":4176,"4188":4176,"4189":4176,"4190":4176,"4191":4176,"4195":4192,"4196":4192,"4197":4192,"4198":4192,"4199":4192,"4200":4192,"4201":4192,"4202":4192,"4203":4192,"4204":4192,"4205":4192,"4206":4192,"4207":4192,"4211":4208,"4212":4208,"4213":4208,"4214":4208,"4215":4208,"4216":4208,"4217":4208,"4218":4208,"4219":4208,"4220":4208,"4221":4208,"4222":4208,"4223":4208,"4227":4224,"4228":4224,"4229":4224,"4230":4224,"4231":4224,"4232":4224,"4233":4224,"4234":4224,"4235":4224,"4236":4224,"4237":4224,"4238":4224,"4239":4224,"4243":4240,"4244":4240,"4245":4240,"4246":4240,"4247":4240,"4248":4240,"4249":4240,"4250":4240,"4251":4240,"4252":4240,"4253":4240,"4254":4240,"4255":4240,"4257":4256,"4258":4256,"4259":4256,"4260":4256,"4261":4256,"4262":4256,"4263":4256,"4264":4256,"4265":4256,"4266":4256,"4267":4256,"4268":4256,"4269":4256,"4270":4256,"4271":4256,"4273":4272,"4274":4272,"4275":4272,"4276":4272,"4277":4272,"4278":4272,"4279":4272,"4280":4272,"4281":4272,"4282":4272,"4283":4272,"4284":4272,"4285":4272,"4286":4272,"4287":4272,"4289":4288,"4290":4288,"4291":4288,"4292":4288,"4293":4288,"4294":4288,"4295":4288,"4296":4288,"4297":4288,"4298":4288,"4299":4288,"4300":4288,"4301":4288,"4302":4288,"4303":4288,"4305":4304,"4306":4304,"4307":4304,"4308":4304,"4309":4304,"4310":4304,"4311":4304,"4312":4304,"4313":4304,"4314":4304,"4315":4304,"4316":4304,"4317":4304,"4318":4304,"4319":4304,"4321":4320,"4322":4320,"4323":4320,"4324":4320,"4325":4320,"4326":4320,"4327":4320,"4328":4320,"4329":4320,"4330":4320,"4331":4320,"4332":4320,"4333":4320,"4334":4320,"4335":4320,"4337":4336,"4338":4336,"4339":4336,"4340":4336,"4341":4336,"4342":4336,"4343":4336,"4344":4336,"4345":4336,"4346":4336,"4347":4336,"4348":4336,"4349":4336,"4350":4336,"4351":4336,"4353":4352,"4354":4352,"4355":4352,"4356":4352,"4357":4352,"4358":4352,"4359":4352,"4360":4352,"4361":4352,"4362":4352,"4363":4352,"4364":4352,"4365":4352,"4366":4352,"4367":4352,"4369":4368,"4370":4368,"4371":4368,"4372":4368,"4373":4368,"4374":4368,"4375":4368,"4376":4368,"4377":4368,"4378":4368,"4379":4368,"4380":4368,"4381":4368,"4382":4368,"4383":4368,"4385":4384,"4386":4384,"4387":4384,"4388":4384,"4389":4384,"4390":4384,"4391":4384,"4392":4384,"4393":4384,"4394":4384,"4395":4384,"4396":4384,"4397":4384,"4398":4384,"4399":4384,"4401":4400,"4402":4400,"4403":4400,"4404":4400,"4405":4400,"4406":4400,"4407":4400,"4408":4400,"4409":4400,"4410":4400,"4411":4400,"4412":4400,"4413":4400,"4414":4400,"4415":4400,"4417":4416,"4418":4416,"4419":4416,"4420":4416,"4421":4416,"4422":4416,"4423":4416,"4424":4416,"4425":4416,"4426":4416,"4427":4416,"4428":4416,"4429":4416,"4430":4416,"4431":4416,"4433":4432,"4434":4432,"4435":4432,"4436":4432,"4437":4432,"4438":4432,"4439":4432,"4440":4432,"4441":4432,"4442":4432,"4443":4432,"4444":4432,"4445":4432,"4446":4432,"4447":4432,"4449":4448,"4450":4448,"4451":4448,"4452":4448,"4453":4448,"4454":4448,"4455":4448,"4456":4448,"4457":4448,"4458":4448,"4459":4448,"4460":4448,"4461":4448,"4462":4448,"4463":4448,"4465":4464,"4466":4464,"4467":4464,"4468":4464,"4469":4464,"4470":4464,"4471":4464,"4472":4464,"4473":4464,"4474":4464,"4475":4464,"4476":4464,"4477":4464,"4478":4464,"4479":4464,"4481":4480,"4482":4480,"4483":4480,"4484":4480,"4485":4480,"4486":4480,"4487":4480,"4488":4480,"4489":4480,"4490":4480,"4491":4480,"4492":4480,"4493":4480,"4494":4480,"4495":4480,"4497":4496,"4498":4496,"4499":4496,"4500":4496,"4501":4496,"4502":4496,"4503":4496,"4504":4496,"4505":4496,"4506":4496,"4507":4496,"4508":4496,"4509":4496,"4510":4496,"4511":4496,"4513":4512,"4514":4512,"4515":4512,"4516":4512,"4517":4512,"4518":4512,"4519":4512,"4520":4512,"4521":4512,"4522":4512,"4523":4512,"4524":4512,"4525":4512,"4526":4512,"4527":4512,"4529":4528,"4530":4528,"4531":4528,"4532":4528,"4533":4528,"4534":4528,"4535":4528,"4536":4528,"4537":4528,"4538":4528,"4539":4528,"4540":4528,"4541":4528,"4542":4528,"4543":4528,"4545":4544,"4546":4544,"4547":4544,"4548":4544,"4549":4544,"4550":4544,"4551":4544,"4552":4544,"4553":4544,"4554":4544,"4555":4544,"4556":4544,"4557":4544,"4558":4544,"4559":4544,"4561":4560,"4562":4560,"4563":4560,"4564":4560,"4565":4560,"4566":4560,"4567":4560,"4568":4560,"4569":4560,"4570":4560,"4571":4560,"4572":4560,"4573":4560,"4574":4560,"4575":4560,"4577":4576,"4578":4576,"4579":4576,"4580":4576,"4581":4576,"4582":4576,"4583":4576,"4584":4576,"4585":4576,"4586":4576,"4587":4576,"4588":4576,"4589":4576,"4590":4576,"4591":4576,"4593":4592,"4594":4592,"4595":4592,"4596":4592,"4597":4592,"4598":4592,"4599":4592,"4600":4592,"4601":4592,"4602":4592,"4603":4592,"4604":4592,"4605":4592,"4606":4592,"4607":4592,"4609":4608,"4610":4608,"4611":4608,"4612":4608,"4613":4608,"4614":4608,"4615":4608,"4616":4608,"4617":4608,"4618":4608,"4619":4608,"4620":4608,"4621":4608,"4622":4608,"4623":4608,"4625":4624,"4626":4624,"4627":4624,"4628":4624,"4629":4624,"4630":4624,"4631":4624,"4632":4624,"4633":4624,"4634":4624,"4635":4624,"4636":4624,"4637":4624,"4638":4624,"4639":4624,"4641":4640,"4642":4640,"4643":4640,"4644":4640,"4645":4640,"4646":4640,"4647":4640,"4648":4640,"4649":4640,"4650":4640,"4651":4640,"4652":4640,"4653":4640,"4654":4640,"4655":4640,"4657":4656,"4658":4656,"4659":4656,"4660":4656,"4661":4656,"4662":4656,"4663":4656,"4664":4656,"4665":4656,"4666":4656,"4667":4656,"4668":4656,"4669":4656,"4670":4656,"4671":4656,"4673":4672,"4674":4672,"4675":4672,"4676":4672,"4677":4672,"4678":4672,"4679":4672,"4680":4672,"4681":4672,"4682":4672,"4683":4672,"4684":4672,"4685":4672,"4686":4672,"4687":4672,"4689":4688,"4690":4688,"4691":4688,"4692":4688,"4693":4688,"4694":4688,"4695":4688,"4696":4688,"4697":4688,"4698":4688,"4699":4688,"4700":4688,"4701":4688,"4702":4688,"4703":4688,"4705":4704,"4706":4704,"4707":4704,"4708":4704,"4709":4704,"4710":4704,"4711":4704,"4712":4704,"4713":4704,"4714":4704,"4715":4704,"4716":4704,"4717":4704,"4718":4704,"4719":4704,"4721":4720,"4722":4720,"4723":4720,"4724":4720,"4725":4720,"4726":4720,"4727":4720,"4728":4720,"4729":4720,"4730":4720,"4731":4720,"4732":4720,"4733":4720,"4734":4720,"4735":4720,"4737":4736,"4738":4736,"4739":4736,"4740":4736,"4741":4736,"4742":4736,"4743":4736,"4744":4736,"4745":4736,"4746":4736,"4747":4736,"4748":4736,"4749":4736,"4750":4736,"4751":4736,"4753":4752,"4754":4752,"4755":4752,"4756":4752,"4757":4752,"4758":4752,"4759":4752,"4760":4752,"4761":4752,"4762":4752,"4763":4752,"4764":4752,"4765":4752,"4766":4752,"4767":4752,"4769":4768,"4770":4768,"4771":4768,"4772":4768,"4773":4768,"4774":4768,"4775":4768,"4776":4768,"4777":4768,"4778":4768,"4779":4768,"4780":4768,"4781":4768,"4782":4768,"4783":4768,"4785":4784,"4786":4784,"4787":4784,"4788":4784,"4789":4784,"4790":4784,"4791":4784,"4792":4784,"4793":4784,"4794":4784,"4795":4784,"4796":4784,"4797":4784,"4798":4784,"4799":4784,"4801":4800,"4802":4800,"4803":4800,"4804":4800,"4805":4800,"4806":4800,"4807":4800,"4808":4800,"4809":4800,"4810":4800,"4811":4800,"4812":4800,"4813":4800,"4814":4800,"4815":4800,"4817":4816,"4818":4816,"4819":4816,"4820":4816,"4821":4816,"4822":4816,"4823":4816,"4824":4816,"4825":4816,"4826":4816,"4827":4816,"4828":4816,"4829":4816,"4830":4816,"4831":4816,"4833":4832,"4834":4832,"4835":4832,"4836":4832,"4837":4832,"4838":4832,"4839":4832,"4840":4832,"4841":4832,"4842":4832,"4843":4832,"4844":4832,"4845":4832,"4846":4832,"4847":4832,"4849":4848,"4850":4848,"4851":4848,"4852":4848,"4853":4848,"4854":4848,"4855":4848,"4856":4848,"4857":4848,"4858":4848,"4859":4848,"4860":4848,"4861":4848,"4862":4848,"4863":4848,"4865":4864,"4866":4864,"4867":4864,"4868":4864,"4869":4864,"4870":4864,"4871":4864,"4872":4864,"4873":4864,"4874":4864,"4875":4864,"4876":4864,"4877":4864,"4878":4864,"4879":4864,"4881":4880,"4882":4880,"4883":4880,"4884":4880,"4885":4880,"4886":4880,"4887":4880,"4888":4880,"4889":4880,"4890":4880,"4891":4880,"4892":4880,"4893":4880,"4894":4880,"4895":4880,"4897":4896,"4898":4896,"4899":4896,"4900":4896,"4901":4896,"4902":4896,"4903":4896,"4904":4896,"4905":4896,"4906":4896,"4907":4896,"4908":4896,"4909":4896,"4910":4896,"4911":4896,"4913":4912,"4914":4912,"4915":4912,"4916":4912,"4917":4912,"4918":4912,"4919":4912,"4920":4912,"4921":4912,"4922":4912,"4923":4912,"4924":4912,"4925":4912,"4926":4912,"4927":4912,"4929":4928,"4930":4928,"4931":4928,"4932":4928,"4933":4928,"4934":4928,"4935":4928,"4936":4928,"4937":4928,"4938":4928,"4939":4928,"4940":4928,"4941":4928,"4942":4928,"4943":4928,"4945":4944,"4946":4944,"4947":4944,"4948":4944,"4949":4944,"4950":4944,"4951":4944,"4952":4944,"4953":4944,"4954":4944,"4955":4944,"4956":4944,"4957":4944,"4958":4944,"4959":4944,"4961":4960,"4962":4960,"4963":4960,"4964":4960,"4965":4960,"4966":4960,"4967":4960,"4968":4960,"4969":4960,"4970":4960,"4971":4960,"4972":4960,"4973":4960,"4974":4960,"4975":4960,"4977":4976,"4978":4976,"4979":4976,"4980":4976,"4981":4976,"4982":4976,"4983":4976,"4984":4976,"4985":4976,"4986":4976,"4987":4976,"4988":4976,"4989":4976,"4990":4976,"4991":4976,"4993":4992,"4994":4992,"4995":4992,"4996":4992,"4997":4992,"4998":4992,"4999":4992,"5000":4992,"5001":4992,"5002":4992,"5003":4992,"5004":4992,"5005":4992,"5006":4992,"5007":4992,"5009":5008,"5010":5008,"5011":5008,"5012":5008,"5013":5008,"5014":5008,"5015":5008,"5016":5008,"5017":5008,"5018":5008,"5019":5008,"5020":5008,"5021":5008,"5022":5008,"5023":5008,"5025":5024,"5026":5024,"5027":5024,"5028":5024,"5029":5024,"5030":5024,"5031":5024,"5032":5024,"5033":5024,"5034":5024,"5035":5024,"5036":5024,"5037":5024,"5038":5024,"5039":5024,"5041":5040,"5042":5040,"5043":5040,"5044":5040,"5045":5040,"5046":5040,"5047":5040,"5048":5040,"5049":5040,"5050":5040,"5051":5040,"5052":5040,"5053":5040,"5054":5040,"5055":5040,"5057":5056,"5058":5056,"5059":5056,"5060":5056,"5061":5056,"5062":5056,"5063":5056,"5064":5056,"5065":5056,"5066":5056,"5067":5056,"5068":5056,"5069":5056,"5070":5056,"5071":5056,"5073":5072,"5074":5072,"5075":5072,"5076":5072,"5077":5072,"5078":5072,"5079":5072,"5080":5072,"5081":5072,"5082":5072,"5083":5072,"5084":5072,"5085":5072,"5086":5072,"5087":5072,"5089":5088,"5090":5088,"5091":5088,"5092":5088,"5093":5088,"5094":5088,"5095":5088,"5096":5088,"5097":5088,"5098":5088,"5099":5088,"5100":5088,"5101":5088,"5102":5088,"5103":5088,"5105":5104,"5106":5104,"5107":5104,"5108":5104,"5109":5104,"5110":5104,"5111":5104,"5112":5104,"5113":5104,"5114":5104,"5115":5104,"5116":5104,"5117":5104,"5118":5104,"5119":5104,"5121":5120,"5122":5120,"5123":5120,"5124":5120,"5125":5120,"5126":5120,"5127":5120,"5128":5120,"5129":5120,"5130":5120,"5131":5120,"5132":5120,"5133":5120,"5134":5120,"5135":5120,"5137":5136,"5138":5136,"5139":5136,"5140":5136,"5141":5136,"5142":5136,"5143":5136,"5144":5136,"5145":5136,"5146":5136,"5147":5136,"5148":5136,"5149":5136,"5150":5136,"5151":5136,"5153":5152,"5154":5152,"5155":5152,"5156":5152,"5157":5152,"5158":5152,"5159":5152,"5160":5152,"5161":5152,"5162":5152,"5163":5152,"5164":5152,"5165":5152,"5166":5152,"5167":5152,"5169":5168,"5170":5168,"5171":5168,"5172":5168,"5173":5168,"5174":5168,"5175":5168,"5176":5168,"5177":5168,"5178":5168,"5179":5168,"5180":5168,"5181":5168,"5182":5168,"5183":5168,"5185":5184,"5186":5184,"5187":5184,"5188":5184,"5189":5184,"5190":5184,"5191":5184,"5192":5184,"5193":5184,"5194":5184,"5195":5184,"5196":5184,"5197":5184,"5198":5184,"5199":5184,"5201":5200,"5202":5200,"5203":5200,"5204":5200,"5205":5200,"5206":5200,"5207":5200,"5208":5200,"5209":5200,"5210":5200,"5211":5200,"5212":5200,"5213":5200,"5214":5200,"5215":5200,"5217":5216,"5218":5216,"5219":5216,"5220":5216,"5221":5216,"5222":5216,"5223":5216,"5224":5216,"5225":5216,"5226":5216,"5227":5216,"5228":5216,"5229":5216,"5230":5216,"5231":5216,"5233":5232,"5234":5232,"5235":5232,"5236":5232,"5237":5232,"5238":5232,"5239":5232,"5240":5232,"5241":5232,"5242":5232,"5243":5232,"5244":5232,"5245":5232,"5246":5232,"5247":5232,"5249":5248,"5250":5248,"5251":5248,"5252":5248,"5253":5248,"5254":5248,"5255":5248,"5256":5248,"5257":5248,"5258":5248,"5259":5248,"5260":5248,"5261":5248,"5262":5248,"5263":5248,"5265":5264,"5266":5264,"5267":5264,"5268":5264,"5269":5264,"5270":5264,"5271":5264,"5272":5264,"5273":5264,"5274":5264,"5275":5264,"5276":5264,"5277":5264,"5278":5264,"5279":5264,"5281":5280,"5282":5280,"5283":5280,"5284":5280,"5285":5280,"5286":5280,"5287":5280,"5288":5280,"5289":5280,"5290":5280,"5291":5280,"5292":5280,"5293":5280,"5294":5280,"5295":5280,"5297":5296,"5298":5296,"5299":5296,"5300":5296,"5301":5296,"5302":5296,"5303":5296,"5304":5296,"5305":5296,"5306":5296,"5307":5296,"5308":5296,"5309":5296,"5310":5296,"5311":5296,"5313":5312,"5314":5312,"5315":5312,"5316":5312,"5317":5312,"5318":5312,"5319":5312,"5320":5312,"5321":5312,"5322":5312,"5323":5312,"5324":5312,"5325":5312,"5326":5312,"5327":5312,"5329":5328,"5330":5328,"5331":5328,"5332":5328,"5333":5328,"5334":5328,"5335":5328,"5336":5328,"5337":5328,"5338":5328,"5339":5328,"5340":5328,"5341":5328,"5342":5328,"5343":5328,"5345":5344,"5346":5344,"5347":5344,"5348":5344,"5349":5344,"5350":5344,"5351":5344,"5352":5344,"5353":5344,"5354":5344,"5355":5344,"5356":5344,"5357":5344,"5358":5344,"5359":5344,"5361":5360,"5362":5360,"5363":5360,"5364":5360,"5365":5360,"5366":5360,"5367":5360,"5368":5360,"5369":5360,"5370":5360,"5371":5360,"5372":5360,"5373":5360,"5374":5360,"5375":5360,"5377":5376,"5378":5376,"5379":5376,"5380":5376,"5381":5376,"5382":5376,"5383":5376,"5384":5376,"5385":5376,"5386":5376,"5387":5376,"5388":5376,"5389":5376,"5390":5376,"5391":5376,"5393":5392,"5394":5392,"5395":5392,"5396":5392,"5397":5392,"5398":5392,"5399":5392,"5400":5392,"5401":5392,"5402":5392,"5403":5392,"5404":5392,"5405":5392,"5406":5392,"5407":5392,"5409":5408,"5410":5408,"5411":5408,"5412":5408,"5413":5408,"5414":5408,"5415":5408,"5416":5408,"5417":5408,"5418":5408,"5419":5408,"5420":5408,"5421":5408,"5422":5408,"5423":5408,"5425":5424,"5426":5424,"5427":5424,"5428":5424,"5429":5424,"5430":5424,"5431":5424,"5432":5424,"5433":5424,"5434":5424,"5435":5424,"5436":5424,"5437":5424,"5438":5424,"5439":5424,"5441":5440,"5442":5440,"5443":5440,"5444":5440,"5445":5440,"5446":5440,"5447":5440,"5448":5440,"5449":5440,"5450":5440,"5451":5440,"5452":5440,"5453":5440,"5454":5440,"5455":5440,"5457":5456,"5458":5456,"5459":5456,"5460":5456,"5461":5456,"5462":5456,"5463":5456,"5464":5456,"5465":5456,"5466":5456,"5467":5456,"5468":5456,"5469":5456,"5470":5456,"5471":5456,"5473":5472,"5474":5472,"5475":5472,"5476":5472,"5477":5472,"5478":5472,"5479":5472,"5480":5472,"5481":5472,"5482":5472,"5483":5472,"5484":5472,"5485":5472,"5486":5472,"5487":5472,"5489":5488,"5490":5488,"5491":5488,"5492":5488,"5493":5488,"5494":5488,"5495":5488,"5496":5488,"5497":5488,"5498":5488,"5499":5488,"5500":5488,"5501":5488,"5502":5488,"5503":5488,"5505":5504,"5506":5504,"5507":5504,"5508":5504,"5509":5504,"5510":5504,"5511":5504,"5512":5504,"5513":5504,"5514":5504,"5515":5504,"5516":5504,"5517":5504,"5518":5504,"5519":5504,"5521":5520,"5522":5520,"5523":5520,"5524":5520,"5525":5520,"5526":5520,"5527":5520,"5528":5520,"5529":5520,"5530":5520,"5531":5520,"5532":5520,"5533":5520,"5534":5520,"5535":5520,"5537":5536,"5538":5536,"5539":5536,"5540":5536,"5541":5536,"5542":5536,"5543":5536,"5544":5536,"5545":5536,"5546":5536,"5547":5536,"5548":5536,"5549":5536,"5550":5536,"5551":5536,"5553":5552,"5554":5552,"5555":5552,"5556":5552,"5557":5552,"5558":5552,"5559":5552,"5560":5552,"5561":5552,"5562":5552,"5563":5552,"5564":5552,"5565":5552,"5566":5552,"5567":5552,"5569":5568,"5570":5568,"5571":5568,"5572":5568,"5573":5568,"5574":5568,"5575":5568,"5576":5568,"5577":5568,"5578":5568,"5579":5568,"5580":5568,"5581":5568,"5582":5568,"5583":5568,"5585":5584,"5586":5584,"5587":5584,"5588":5584,"5589":5584,"5590":5584,"5591":5584,"5592":5584,"5593":5584,"5594":5584,"5595":5584,"5596":5584,"5597":5584,"5598":5584,"5599":5584,"5601":5600,"5602":5600,"5603":5600,"5604":5600,"5605":5600,"5606":5600,"5607":5600,"5608":5600,"5609":5600,"5610":5600,"5611":5600,"5612":5600,"5613":5600,"5614":5600,"5615":5600,"5617":5616,"5618":5616,"5619":5616,"5620":5616,"5621":5616,"5622":5616,"5623":5616,"5624":5616,"5625":5616,"5626":5616,"5627":5616,"5628":5616,"5629":5616,"5630":5616,"5631":5616,"5633":5632,"5634":5632,"5635":5632,"5636":5632,"5637":5632,"5638":5632,"5639":5632,"5640":5632,"5641":5632,"5642":5632,"5643":5632,"5644":5632,"5645":5632,"5646":5632,"5647":5632,"5649":5648,"5650":5648,"5651":5648,"5652":5648,"5653":5648,"5654":5648,"5655":5648,"5656":5648,"5657":5648,"5658":5648,"5659":5648,"5660":5648,"5661":5648,"5662":5648,"5663":5648,"5665":5664,"5666":5664,"5667":5664,"5668":5664,"5669":5664,"5670":5664,"5671":5664,"5672":5664,"5673":5664,"5674":5664,"5675":5664,"5676":5664,"5677":5664,"5678":5664,"5679":5664,"5681":5680,"5682":5680,"5683":5680,"5684":5680,"5685":5680,"5686":5680,"5687":5680,"5688":5680,"5689":5680,"5690":5680,"5691":5680,"5692":5680,"5693":5680,"5694":5680,"5695":5680,"5697":5696,"5698":5696,"5699":5696,"5700":5696,"5701":5696,"5702":5696,"5703":5696,"5704":5696,"5705":5696,"5706":5696,"5707":5696,"5708":5696,"5709":5696,"5710":5696,"5711":5696,"5713":5712,"5714":5712,"5715":5712,"5716":5712,"5717":5712,"5718":5712,"5719":5712,"5720":5712,"5721":5712,"5722":5712,"5723":5712,"5724":5712,"5725":5712,"5726":5712,"5727":5712,"5729":5728,"5730":5728,"5731":5728,"5732":5728,"5733":5728,"5734":5728,"5735":5728,"5736":5728,"5737":5728,"5738":5728,"5739":5728,"5740":5728,"5741":5728,"5742":5728,"5743":5728,"5745":5744,"5746":5744,"5747":5744,"5748":5744,"5749":5744,"5750":5744,"5751":5744,"5752":5744,"5753":5744,"5754":5744,"5755":5744,"5756":5744,"5757":5744,"5758":5744,"5759":5744,"5761":5760,"5762":5760,"5763":5760,"5764":5760,"5765":5760,"5766":5760,"5767":5760,"5768":5760,"5769":5760,"5770":5760,"5771":5760,"5772":5760,"5773":5760,"5774":5760,"5775":5760,"5777":5776,"5778":5776,"5779":5776,"5780":5776,"5781":5776,"5782":5776,"5783":5776,"5784":5776,"5785":5776,"5786":5776,"5787":5776,"5788":5776,"5789":5776,"5790":5776,"5791":5776,"5793":5792,"5794":5792,"5795":5792,"5796":5792,"5797":5792,"5798":5792,"5799":5792,"5800":5792,"5801":5792,"5802":5792,"5803":5792,"5804":5792,"5805":5792,"5806":5792,"5807":5792,"5809":5808,"5810":5808,"5811":5808,"5812":5808,"5813":5808,"5814":5808,"5815":5808,"5816":5808,"5817":5808,"5818":5808,"5819":5808,"5820":5808,"5821":5808,"5822":5808,"5823":5808,"5825":5824,"5826":5824,"5827":5824,"5828":5824,"5829":5824,"5830":5824,"5831":5824,"5832":5824,"5833":5824,"5834":5824,"5835":5824,"5836":5824,"5837":5824,"5838":5824,"5839":5824,"5841":5840,"5842":5840,"5843":5840,"5844":5840,"5845":5840,"5846":5840,"5847":5840,"5848":5840,"5849":5840,"5850":5840,"5851":5840,"5852":5840,"5853":5840,"5854":5840,"5855":5840,"5857":5856,"5858":5856,"5859":5856,"5860":5856,"5861":5856,"5862":5856,"5863":5856,"5864":5856,"5865":5856,"5866":5856,"5867":5856,"5868":5856,"5869":5856,"5870":5856,"5871":5856,"5873":5872,"5874":5872,"5875":5872,"5876":5872,"5877":5872,"5878":5872,"5879":5872,"5880":5872,"5881":5872,"5882":5872,"5883":5872,"5884":5872,"5885":5872,"5886":5872,"5887":5872,"5889":5888,"5890":5888,"5891":5888,"5892":5888,"5893":5888,"5894":5888,"5895":5888,"5896":5888,"5897":5888,"5898":5888,"5899":5888,"5900":5888,"5901":5888,"5902":5888,"5903":5888,"5905":5904,"5906":5904,"5907":5904,"5908":5904,"5909":5904,"5910":5904,"5911":5904,"5912":5904,"5913":5904,"5914":5904,"5915":5904,"5916":5904,"5917":5904,"5918":5904,"5919":5904,"5921":5920,"5922":5920,"5923":5920,"5924":5920,"5925":5920,"5926":5920,"5927":5920,"5928":5920,"5929":5920,"5930":5920,"5931":5920,"5932":5920,"5933":5920,"5934":5920,"5935":5920,"5937":5936,"5938":5936,"5939":5936,"5940":5936,"5941":5936,"5942":5936,"5943":5936,"5944":5936,"5945":5936,"5946":5936,"5947":5936,"5948":5936,"5949":5936,"5950":5936,"5951":5936,"5953":5952,"5954":5952,"5955":5952,"5956":5952,"5957":5952,"5958":5952,"5959":5952,"5960":5952,"5961":5952,"5962":5952,"5963":5952,"5964":5952,"5965":5952,"5966":5952,"5967":5952,"5969":5968,"5970":5968,"5971":5968,"5972":5968,"5973":5968,"5974":5968,"5975":5968,"5976":5968,"5977":5968,"5978":5968,"5979":5968,"5980":5968,"5981":5968,"5982":5968,"5983":5968,"5985":5984,"5986":5984,"5987":5984,"5988":5984,"5989":5984,"5990":5984,"5991":5984,"5992":5984,"5993":5984,"5994":5984,"5995":5984,"5996":5984,"5997":5984,"5998":5984,"5999":5984,"6001":6000,"6002":6000,"6003":6000,"6004":6000,"6005":6000,"6006":6000,"6007":6000,"6008":6000,"6009":6000,"6010":6000,"6011":6000,"6012":6000,"6013":6000,"6014":6000,"6015":6000,"6017":6016,"6018":6016,"6019":6016,"6020":6016,"6021":6016,"6022":6016,"6023":6016,"6024":6016,"6025":6016,"6026":6016,"6027":6016,"6028":6016,"6029":6016,"6030":6016,"6031":6016,"6033":6032,"6034":6032,"6035":6032,"6036":6032,"6037":6032,"6038":6032,"6039":6032,"6040":6032,"6041":6032,"6042":6032,"6043":6032,"6044":6032,"6045":6032,"6046":6032,"6047":6032,"6049":6048,"6050":6048,"6051":6048,"6052":6048,"6053":6048,"6054":6048,"6055":6048,"6056":6048,"6057":6048,"6058":6048,"6059":6048,"6060":6048,"6061":6048,"6062":6048,"6063":6048,"6065":6064,"6066":6064,"6067":6064,"6068":6064,"6069":6064,"6070":6064,"6071":6064,"6072":6064,"6073":6064,"6074":6064,"6075":6064,"6076":6064,"6077":6064,"6078":6064,"6079":6064,"6081":6080,"6082":6080,"6083":6080,"6084":6080,"6085":6080,"6086":6080,"6087":6080,"6088":6080,"6089":6080,"6090":6080,"6091":6080,"6092":6080,"6093":6080,"6094":6080,"6095":6080,"6097":6096,"6098":6096,"6099":6096,"6100":6096,"6101":6096,"6102":6096,"6103":6096,"6104":6096,"6105":6096,"6106":6096,"6107":6096,"6108":6096,"6109":6096,"6110":6096,"6111":6096,"6113":6112,"6114":6112,"6115":6112,"6116":6112,"6117":6112,"6118":6112,"6119":6112,"6120":6112,"6121":6112,"6122":6112,"6123":6112,"6124":6112,"6125":6112,"6126":6112,"6127":6112,"6129":6128,"6130":6128,"6131":6128,"6132":6128,"6133":6128,"6134":6128,"6135":6128,"6136":6128,"6137":6128,"6138":6128,"6139":6128,"6140":6128,"6141":6128,"6142":6128,"6143":6128,"6145":6144,"6146":6144,"6147":6144,"6148":6144,"6149":6144,"6150":6144,"6151":6144,"6152":6144,"6153":6144,"6154":6144,"6155":6144,"6156":6144,"6157":6144,"6158":6144,"6159":6144,"6181":6176,"6182":6176,"6183":6176,"6184":6176,"6185":6176,"6186":6176,"6187":6176,"6188":6176,"6189":6176,"6190":6176,"6191":6176,"6197":6192,"6198":6192,"6199":6192,"6205":6192,"6206":6192,"6207":6192,"6213":6208,"6214":6208,"6215":6208,"6221":6208,"6222":6208,"6223":6208,"6229":6208,"6230":6208,"6231":6208,"6237":6208,"6238":6208,"6239":6208,"6273":6248,"6275":6248,"6277":6248,"6279":6248,"6281":6248,"6283":6248,"6285":6248,"6287":6248,"6305":6304,"6306":6304,"6307":6304,"6308":6304,"6309":6304,"6310":6304,"6311":6304,"6312":6304,"6313":6304,"6314":6304,"6315":6304,"6316":6304,"6317":6304,"6318":6304,"6319":6304,"6326":6320,"6327":6320,"6334":6320,"6335":6320,"6342":6336,"6343":6336,"6350":6336,"6351":6336,"6358":6352,"6359":6352,"6366":6352,"6367":6352,"6374":6368,"6375":6368,"6382":6368,"6383":6368,"6390":6384,"6391":6384,"6398":6384,"6399":6384,"6482":6480,"6483":6480,"6484":6480,"6485":6480,"6486":6480,"6487":6480,"6488":6480,"6489":6480,"6490":6480,"6491":6480,"6492":6480,"6493":6480,"6494":6480,"6495":6480,"6498":6496,"6499":6496,"6500":6496,"6501":6496,"6502":6496,"6503":6496,"6504":6496,"6505":6496,"6506":6496,"6507":6496,"6508":6496,"6509":6496,"6510":6496,"6511":6496,"6514":6512,"6515":6512,"6516":6512,"6517":6512,"6518":6512,"6519":6512,"6520":6512,"6521":6512,"6522":6512,"6523":6512,"6524":6512,"6525":6512,"6526":6512,"6527":6512,"6530":6528,"6531":6528,"6532":6528,"6533":6528,"6534":6528,"6535":6528,"6536":6528,"6537":6528,"6538":6528,"6539":6528,"6540":6528,"6541":6528,"6542":6528,"6543":6528,"6546":6544,"6547":6544,"6548":6544,"6549":6544,"6550":6544,"6551":6544,"6552":6544,"6553":6544,"6554":6544,"6555":6544,"6556":6544,"6557":6544,"6558":6544,"6559":6544,"6564":6562,"6565":6562,"6566":6562,"6567":6562,"6568":6562,"6569":6562,"6570":6562,"6571":6562,"6572":6562,"6573":6562,"6574":6562,"6575":6562,"6584":6580,"6585":6580,"6586":6580,"6587":6580,"6588":6580,"6589":6580,"6590":6580,"6591":6580,"6657":6656,"6658":6656,"6659":6656,"6660":6656,"6661":6656,"6662":6656,"6663":6656,"6664":6656,"6665":6656,"6666":6656,"6667":6656,"6668":6656,"6669":6656,"6670":6656,"6671":6656,"6694":6688,"6695":6688,"6702":6688,"6703":6688,"6706":6704,"6707":6704,"6708":6704,"6709":6704,"6710":6704,"6711":6704,"6712":6704,"6713":6704,"6714":6704,"6715":6704,"6716":6704,"6717":6704,"6718":6704,"6719":6704,"6760":6752,"6761":6753,"6762":6754,"6763":6755,"6764":6756,"6765":6757,"6766":6758,"6767":6759,"6776":6768,"6777":6769,"6778":6770,"6779":6771,"6780":6772,"6792":6787,"6793":6787,"6794":6787,"6795":6787,"6796":6787,"6797":6787,"6798":6787,"6799":6787,"6808":6803,"6809":6803,"6810":6803,"6811":6803,"6812":6803,"6813":6803,"6814":6803,"6815":6803,"6824":6819,"6825":6819,"6826":6819,"6827":6819,"6828":6819,"6829":6819,"6830":6819,"6831":6819,"6840":6835,"6841":6835,"6842":6835,"6843":6835,"6844":6835,"6845":6835,"6846":6835,"6847":6835,"6856":6851,"6857":6851,"6858":6851,"6859":6851,"6860":6851,"6861":6851,"6862":6851,"6863":6851,"6872":6867,"6873":6867,"6874":6867,"6875":6867,"6876":6867,"6877":6867,"6878":6867,"6879":6867,"6888":6883,"6889":6883,"6890":6883,"6891":6883,"6892":6883,"6893":6883,"6894":6883,"6895":6883,"6904":6899,"6905":6899,"6906":6899,"6907":6899,"6908":6899,"6909":6899,"6910":6899,"6911":6899,"6920":6915,"6921":6915,"6922":6915,"6923":6915,"6924":6915,"6925":6915,"6926":6915,"6927":6915,"6936":6931,"6937":6931,"6938":6931,"6939":6931,"6940":6931,"6941":6931,"6942":6931,"6943":6931,"6952":6947,"6953":6947,"6954":6947,"6955":6947,"6956":6947,"6957":6947,"6958":6947,"6959":6947,"6968":6963,"6969":6963,"6970":6963,"6971":6963,"6972":6963,"6973":6963,"6974":6963,"6975":6963,"6992":6994,"6993":6994,"6998":6994,"6999":6994,"7000":6994,"7001":6994,"7002":6994,"7003":6994,"7004":6994,"7005":6994,"7006":6994,"7007":6994,"7009":7008,"7010":7008,"7011":7008,"7012":7008,"7013":7008,"7014":7008,"7015":7008,"7016":7008,"7017":7008,"7018":7008,"7019":7008,"7020":7008,"7021":7008,"7022":7008,"7023":7008,"7032":7027,"7033":7027,"7034":7027,"7035":7027,"7036":7027,"7037":7027,"7038":7027,"7039":7027,"7048":7043,"7049":7043,"7050":7043,"7051":7043,"7052":7043,"7053":7043,"7054":7043,"7055":7043,"7072":7074,"7073":7074,"7078":7074,"7079":7074,"7080":7074,"7081":7074,"7082":7074,"7083":7074,"7084":7074,"7085":7074,"7086":7074,"7087":7074,"7104":7106,"7105":7106,"7110":7106,"7111":7106,"7112":7106,"7113":7106,"7114":7106,"7115":7106,"7116":7106,"7117":7106,"7118":7106,"7119":7106,"7136":7138,"7137":7138,"7142":7138,"7143":7138,"7144":7138,"7145":7138,"7146":7138,"7147":7138,"7148":7138,"7149":7138,"7150":7138,"7151":7138,"7168":7170,"7169":7170,"7174":7170,"7175":7170,"7176":7170,"7177":7170,"7178":7170,"7179":7170,"7180":7170,"7181":7170,"7182":7170,"7183":7170,"7192":7186,"7193":7186,"7194":7186,"7195":7186,"7196":7186,"7197":7186,"7198":7186,"7199":7186,"7216":7218,"7217":7218,"7222":7218,"7223":7218,"7224":7218,"7225":7218,"7226":7218,"7227":7218,"7228":7218,"7229":7218,"7230":7218,"7231":7218,"7232":7234,"7233":7234,"7238":7234,"7239":7234,"7240":7234,"7241":7234,"7242":7234,"7243":7234,"7244":7234,"7245":7234,"7246":7234,"7247":7234,"7248":7250,"7249":7250,"7254":7250,"7255":7250,"7256":7250,"7257":7250,"7258":7250,"7259":7250,"7260":7250,"7261":7250,"7262":7250,"7263":7250,"7264":7250,"7265":7250,"7270":7250,"7271":7250,"7272":7250,"7273":7250,"7274":7250,"7275":7250,"7276":7250,"7277":7250,"7278":7250,"7279":7250,"7297":7296,"7298":7296,"7299":7296,"7300":7296,"7301":7296,"7302":7296,"7303":7296,"7304":7296,"7305":7296,"7306":7296,"7307":7296,"7308":7296,"7309":7296,"7310":7296,"7311":7296,"7334":7328,"7335":7328,"7342":7328,"7343":7328,"7348":7346,"7349":7346,"7350":7346,"7351":7346,"7352":7346,"7353":7346,"7354":7346,"7355":7346,"7356":7346,"7357":7346,"7358":7346,"7359":7346,"7396":7392,"7397":7392,"7398":7392,"7399":7392,"7400":7392,"7401":7392,"7402":7392,"7403":7392,"7404":7392,"7405":7392,"7406":7392,"7407":7392,"7410":7408,"7411":7408,"7412":7408,"7413":7408,"7414":7408,"7415":7408,"7416":7408,"7417":7408,"7418":7408,"7419":7408,"7420":7408,"7421":7408,"7422":7408,"7423":7408,"7478":7472,"7479":7472,"7486":7472,"7487":7472,"7504":7218,"7505":7218,"7510":7218,"7511":7218,"7512":7218,"7513":7218,"7514":7218,"7515":7218,"7516":7218,"7517":7218,"7518":7218,"7519":7218}}
\ No newline at end of file
+{
+    "ACACIA_BUTTON": 12,
+    "ACACIA_DOOR": 32,
+    "ACACIA_FENCE": 1,
+    "ACACIA_FENCE_GATE": 16,
+    "ACACIA_LEAVES": 4,
+    "ACACIA_LOG": 6,
+    "ACACIA_PLANKS": 1,
+    "ACACIA_PRESSURE_PLATE": 2,
+    "ACACIA_SAPLING": 2,
+    "ACACIA_SIGN": 16,
+    "ACACIA_SLAB": 3,
+    "ACACIA_STAIRS": 8,
+    "ACACIA_TRAPDOOR": 16,
+    "ACACIA_WALL_SIGN": 4,
+    "ACACIA_WOOD": 6,
+    "ACTIVATOR_RAIL": 12,
+    "AIR": 1,
+    "ALLIUM": 1,
+    "ALL_SIDED_MUSHROOM_STEM": 1,
+    "AMETHYST": 1,
+    "AMETHYST_CLUSTER": 24,
+    "ANCIENT_DEBRIS": 1,
+    "ANDESITE": 1,
+    "ANDESITE_SLAB": 3,
+    "ANDESITE_STAIRS": 8,
+    "ANDESITE_WALL": 162,
+    "ANVIL": 12,
+    "AZALEA_LEAVES": 4,
+    "AZURE_BLUET": 1,
+    "BAMBOO": 12,
+    "BAMBOO_SAPLING": 2,
+    "BANNER": 256,
+    "BARREL": 12,
+    "BARRIER": 1,
+    "BASALT": 3,
+    "BEACON": 1,
+    "BED": 256,
+    "BEDROCK": 2,
+    "BEETROOTS": 8,
+    "BELL": 16,
+    "BIG_DRIPLEAF_HEAD": 16,
+    "BIG_DRIPLEAF_STEM": 4,
+    "BIRCH_BUTTON": 12,
+    "BIRCH_DOOR": 32,
+    "BIRCH_FENCE": 1,
+    "BIRCH_FENCE_GATE": 16,
+    "BIRCH_LEAVES": 4,
+    "BIRCH_LOG": 6,
+    "BIRCH_PLANKS": 1,
+    "BIRCH_PRESSURE_PLATE": 2,
+    "BIRCH_SAPLING": 2,
+    "BIRCH_SIGN": 16,
+    "BIRCH_SLAB": 3,
+    "BIRCH_STAIRS": 8,
+    "BIRCH_TRAPDOOR": 16,
+    "BIRCH_WALL_SIGN": 4,
+    "BIRCH_WOOD": 6,
+    "BLACKSTONE": 1,
+    "BLACKSTONE_SLAB": 3,
+    "BLACKSTONE_STAIRS": 8,
+    "BLACKSTONE_WALL": 162,
+    "BLAST_FURNACE": 8,
+    "BLUE_ICE": 1,
+    "BLUE_ORCHID": 1,
+    "BLUE_TORCH": 5,
+    "BONE_BLOCK": 3,
+    "BOOKSHELF": 1,
+    "BREWING_STAND": 8,
+    "BRICKS": 1,
+    "BRICK_SLAB": 3,
+    "BRICK_STAIRS": 8,
+    "BRICK_WALL": 162,
+    "BROWN_MUSHROOM": 1,
+    "BROWN_MUSHROOM_BLOCK": 11,
+    "BUDDING_AMETHYST": 1,
+    "CACTUS": 16,
+    "CAKE": 7,
+    "CAKE_WITH_CANDLE": 2,
+    "CAKE_WITH_DYED_CANDLE": 32,
+    "CALCITE": 1,
+    "CAMPFIRE": 8,
+    "CANDLE": 8,
+    "CARPET": 16,
+    "CARROTS": 8,
+    "CARTOGRAPHY_TABLE": 1,
+    "CARVED_PUMPKIN": 4,
+    "CAULDRON": 1,
+    "CAVE_VINES": 104,
+    "CHAIN": 3,
+    "CHEMICAL_HEAT": 1,
+    "CHERRY_BUTTON": 12,
+    "CHERRY_DOOR": 32,
+    "CHERRY_FENCE": 1,
+    "CHERRY_FENCE_GATE": 16,
+    "CHERRY_LEAVES": 4,
+    "CHERRY_LOG": 6,
+    "CHERRY_PLANKS": 1,
+    "CHERRY_PRESSURE_PLATE": 2,
+    "CHERRY_SIGN": 16,
+    "CHERRY_SLAB": 3,
+    "CHERRY_STAIRS": 8,
+    "CHERRY_TRAPDOOR": 16,
+    "CHERRY_WALL_SIGN": 4,
+    "CHERRY_WOOD": 6,
+    "CHEST": 4,
+    "CHISELED_BOOKSHELF": 256,
+    "CHISELED_COPPER": 8,
+    "CHISELED_DEEPSLATE": 1,
+    "CHISELED_NETHER_BRICKS": 1,
+    "CHISELED_POLISHED_BLACKSTONE": 1,
+    "CHISELED_QUARTZ": 3,
+    "CHISELED_RED_SANDSTONE": 1,
+    "CHISELED_SANDSTONE": 1,
+    "CHISELED_STONE_BRICKS": 1,
+    "CHISELED_TUFF": 1,
+    "CHISELED_TUFF_BRICKS": 1,
+    "CHORUS_FLOWER": 6,
+    "CHORUS_PLANT": 1,
+    "CLAY": 1,
+    "COAL": 1,
+    "COAL_ORE": 1,
+    "COBBLED_DEEPSLATE": 1,
+    "COBBLED_DEEPSLATE_SLAB": 3,
+    "COBBLED_DEEPSLATE_STAIRS": 8,
+    "COBBLED_DEEPSLATE_WALL": 162,
+    "COBBLESTONE": 1,
+    "COBBLESTONE_SLAB": 3,
+    "COBBLESTONE_STAIRS": 8,
+    "COBBLESTONE_WALL": 162,
+    "COBWEB": 1,
+    "COCOA_POD": 12,
+    "COMPOUND_CREATOR": 4,
+    "CONCRETE": 16,
+    "CONCRETE_POWDER": 16,
+    "COPPER": 8,
+    "COPPER_BULB": 32,
+    "COPPER_DOOR": 256,
+    "COPPER_GRATE": 8,
+    "COPPER_ORE": 1,
+    "COPPER_TRAPDOOR": 128,
+    "CORAL": 10,
+    "CORAL_BLOCK": 10,
+    "CORAL_FAN": 20,
+    "CORNFLOWER": 1,
+    "CRACKED_DEEPSLATE_BRICKS": 1,
+    "CRACKED_DEEPSLATE_TILES": 1,
+    "CRACKED_NETHER_BRICKS": 1,
+    "CRACKED_POLISHED_BLACKSTONE_BRICKS": 1,
+    "CRACKED_STONE_BRICKS": 1,
+    "CRAFTING_TABLE": 1,
+    "CRIMSON_BUTTON": 12,
+    "CRIMSON_DOOR": 32,
+    "CRIMSON_FENCE": 1,
+    "CRIMSON_FENCE_GATE": 16,
+    "CRIMSON_HYPHAE": 6,
+    "CRIMSON_PLANKS": 1,
+    "CRIMSON_PRESSURE_PLATE": 2,
+    "CRIMSON_ROOTS": 1,
+    "CRIMSON_SIGN": 16,
+    "CRIMSON_SLAB": 3,
+    "CRIMSON_STAIRS": 8,
+    "CRIMSON_STEM": 6,
+    "CRIMSON_TRAPDOOR": 16,
+    "CRIMSON_WALL_SIGN": 4,
+    "CRYING_OBSIDIAN": 1,
+    "CUT_COPPER": 8,
+    "CUT_COPPER_SLAB": 24,
+    "CUT_COPPER_STAIRS": 64,
+    "CUT_RED_SANDSTONE": 1,
+    "CUT_RED_SANDSTONE_SLAB": 3,
+    "CUT_SANDSTONE": 1,
+    "CUT_SANDSTONE_SLAB": 3,
+    "DANDELION": 1,
+    "DARK_OAK_BUTTON": 12,
+    "DARK_OAK_DOOR": 32,
+    "DARK_OAK_FENCE": 1,
+    "DARK_OAK_FENCE_GATE": 16,
+    "DARK_OAK_LEAVES": 4,
+    "DARK_OAK_LOG": 6,
+    "DARK_OAK_PLANKS": 1,
+    "DARK_OAK_PRESSURE_PLATE": 2,
+    "DARK_OAK_SAPLING": 2,
+    "DARK_OAK_SIGN": 16,
+    "DARK_OAK_SLAB": 3,
+    "DARK_OAK_STAIRS": 8,
+    "DARK_OAK_TRAPDOOR": 16,
+    "DARK_OAK_WALL_SIGN": 4,
+    "DARK_OAK_WOOD": 6,
+    "DARK_PRISMARINE": 1,
+    "DARK_PRISMARINE_SLAB": 3,
+    "DARK_PRISMARINE_STAIRS": 8,
+    "DAYLIGHT_SENSOR": 32,
+    "DEAD_BUSH": 1,
+    "DEEPSLATE": 3,
+    "DEEPSLATE_BRICKS": 1,
+    "DEEPSLATE_BRICK_SLAB": 3,
+    "DEEPSLATE_BRICK_STAIRS": 8,
+    "DEEPSLATE_BRICK_WALL": 162,
+    "DEEPSLATE_COAL_ORE": 1,
+    "DEEPSLATE_COPPER_ORE": 1,
+    "DEEPSLATE_DIAMOND_ORE": 1,
+    "DEEPSLATE_EMERALD_ORE": 1,
+    "DEEPSLATE_GOLD_ORE": 1,
+    "DEEPSLATE_IRON_ORE": 1,
+    "DEEPSLATE_LAPIS_LAZULI_ORE": 1,
+    "DEEPSLATE_REDSTONE_ORE": 2,
+    "DEEPSLATE_TILES": 1,
+    "DEEPSLATE_TILE_SLAB": 3,
+    "DEEPSLATE_TILE_STAIRS": 8,
+    "DEEPSLATE_TILE_WALL": 162,
+    "DETECTOR_RAIL": 12,
+    "DIAMOND": 1,
+    "DIAMOND_ORE": 1,
+    "DIORITE": 1,
+    "DIORITE_SLAB": 3,
+    "DIORITE_STAIRS": 8,
+    "DIORITE_WALL": 162,
+    "DIRT": 3,
+    "DOUBLE_PITCHER_CROP": 4,
+    "DOUBLE_TALLGRASS": 2,
+    "DRAGON_EGG": 1,
+    "DRIED_KELP": 1,
+    "DYED_CANDLE": 128,
+    "DYED_SHULKER_BOX": 16,
+    "ELEMENT_ACTINIUM": 1,
+    "ELEMENT_ALUMINUM": 1,
+    "ELEMENT_AMERICIUM": 1,
+    "ELEMENT_ANTIMONY": 1,
+    "ELEMENT_ARGON": 1,
+    "ELEMENT_ARSENIC": 1,
+    "ELEMENT_ASTATINE": 1,
+    "ELEMENT_BARIUM": 1,
+    "ELEMENT_BERKELIUM": 1,
+    "ELEMENT_BERYLLIUM": 1,
+    "ELEMENT_BISMUTH": 1,
+    "ELEMENT_BOHRIUM": 1,
+    "ELEMENT_BORON": 1,
+    "ELEMENT_BROMINE": 1,
+    "ELEMENT_CADMIUM": 1,
+    "ELEMENT_CALCIUM": 1,
+    "ELEMENT_CALIFORNIUM": 1,
+    "ELEMENT_CARBON": 1,
+    "ELEMENT_CERIUM": 1,
+    "ELEMENT_CESIUM": 1,
+    "ELEMENT_CHLORINE": 1,
+    "ELEMENT_CHROMIUM": 1,
+    "ELEMENT_COBALT": 1,
+    "ELEMENT_CONSTRUCTOR": 4,
+    "ELEMENT_COPERNICIUM": 1,
+    "ELEMENT_COPPER": 1,
+    "ELEMENT_CURIUM": 1,
+    "ELEMENT_DARMSTADTIUM": 1,
+    "ELEMENT_DUBNIUM": 1,
+    "ELEMENT_DYSPROSIUM": 1,
+    "ELEMENT_EINSTEINIUM": 1,
+    "ELEMENT_ERBIUM": 1,
+    "ELEMENT_EUROPIUM": 1,
+    "ELEMENT_FERMIUM": 1,
+    "ELEMENT_FLEROVIUM": 1,
+    "ELEMENT_FLUORINE": 1,
+    "ELEMENT_FRANCIUM": 1,
+    "ELEMENT_GADOLINIUM": 1,
+    "ELEMENT_GALLIUM": 1,
+    "ELEMENT_GERMANIUM": 1,
+    "ELEMENT_GOLD": 1,
+    "ELEMENT_HAFNIUM": 1,
+    "ELEMENT_HASSIUM": 1,
+    "ELEMENT_HELIUM": 1,
+    "ELEMENT_HOLMIUM": 1,
+    "ELEMENT_HYDROGEN": 1,
+    "ELEMENT_INDIUM": 1,
+    "ELEMENT_IODINE": 1,
+    "ELEMENT_IRIDIUM": 1,
+    "ELEMENT_IRON": 1,
+    "ELEMENT_KRYPTON": 1,
+    "ELEMENT_LANTHANUM": 1,
+    "ELEMENT_LAWRENCIUM": 1,
+    "ELEMENT_LEAD": 1,
+    "ELEMENT_LITHIUM": 1,
+    "ELEMENT_LIVERMORIUM": 1,
+    "ELEMENT_LUTETIUM": 1,
+    "ELEMENT_MAGNESIUM": 1,
+    "ELEMENT_MANGANESE": 1,
+    "ELEMENT_MEITNERIUM": 1,
+    "ELEMENT_MENDELEVIUM": 1,
+    "ELEMENT_MERCURY": 1,
+    "ELEMENT_MOLYBDENUM": 1,
+    "ELEMENT_MOSCOVIUM": 1,
+    "ELEMENT_NEODYMIUM": 1,
+    "ELEMENT_NEON": 1,
+    "ELEMENT_NEPTUNIUM": 1,
+    "ELEMENT_NICKEL": 1,
+    "ELEMENT_NIHONIUM": 1,
+    "ELEMENT_NIOBIUM": 1,
+    "ELEMENT_NITROGEN": 1,
+    "ELEMENT_NOBELIUM": 1,
+    "ELEMENT_OGANESSON": 1,
+    "ELEMENT_OSMIUM": 1,
+    "ELEMENT_OXYGEN": 1,
+    "ELEMENT_PALLADIUM": 1,
+    "ELEMENT_PHOSPHORUS": 1,
+    "ELEMENT_PLATINUM": 1,
+    "ELEMENT_PLUTONIUM": 1,
+    "ELEMENT_POLONIUM": 1,
+    "ELEMENT_POTASSIUM": 1,
+    "ELEMENT_PRASEODYMIUM": 1,
+    "ELEMENT_PROMETHIUM": 1,
+    "ELEMENT_PROTACTINIUM": 1,
+    "ELEMENT_RADIUM": 1,
+    "ELEMENT_RADON": 1,
+    "ELEMENT_RHENIUM": 1,
+    "ELEMENT_RHODIUM": 1,
+    "ELEMENT_ROENTGENIUM": 1,
+    "ELEMENT_RUBIDIUM": 1,
+    "ELEMENT_RUTHENIUM": 1,
+    "ELEMENT_RUTHERFORDIUM": 1,
+    "ELEMENT_SAMARIUM": 1,
+    "ELEMENT_SCANDIUM": 1,
+    "ELEMENT_SEABORGIUM": 1,
+    "ELEMENT_SELENIUM": 1,
+    "ELEMENT_SILICON": 1,
+    "ELEMENT_SILVER": 1,
+    "ELEMENT_SODIUM": 1,
+    "ELEMENT_STRONTIUM": 1,
+    "ELEMENT_SULFUR": 1,
+    "ELEMENT_TANTALUM": 1,
+    "ELEMENT_TECHNETIUM": 1,
+    "ELEMENT_TELLURIUM": 1,
+    "ELEMENT_TENNESSINE": 1,
+    "ELEMENT_TERBIUM": 1,
+    "ELEMENT_THALLIUM": 1,
+    "ELEMENT_THORIUM": 1,
+    "ELEMENT_THULIUM": 1,
+    "ELEMENT_TIN": 1,
+    "ELEMENT_TITANIUM": 1,
+    "ELEMENT_TUNGSTEN": 1,
+    "ELEMENT_URANIUM": 1,
+    "ELEMENT_VANADIUM": 1,
+    "ELEMENT_XENON": 1,
+    "ELEMENT_YTTERBIUM": 1,
+    "ELEMENT_YTTRIUM": 1,
+    "ELEMENT_ZERO": 1,
+    "ELEMENT_ZINC": 1,
+    "ELEMENT_ZIRCONIUM": 1,
+    "EMERALD": 1,
+    "EMERALD_ORE": 1,
+    "ENCHANTING_TABLE": 1,
+    "ENDER_CHEST": 4,
+    "END_PORTAL_FRAME": 8,
+    "END_ROD": 6,
+    "END_STONE": 1,
+    "END_STONE_BRICKS": 1,
+    "END_STONE_BRICK_SLAB": 3,
+    "END_STONE_BRICK_STAIRS": 8,
+    "END_STONE_BRICK_WALL": 162,
+    "FAKE_WOODEN_SLAB": 3,
+    "FARMLAND": 1304,
+    "FERN": 1,
+    "FIRE": 16,
+    "FLETCHING_TABLE": 1,
+    "FLOWERING_AZALEA_LEAVES": 4,
+    "FLOWER_POT": 1,
+    "FROGLIGHT": 9,
+    "FROSTED_ICE": 4,
+    "FURNACE": 8,
+    "GILDED_BLACKSTONE": 1,
+    "GLASS": 1,
+    "GLASS_PANE": 1,
+    "GLAZED_TERRACOTTA": 64,
+    "GLOWING_ITEM_FRAME": 12,
+    "GLOWING_OBSIDIAN": 1,
+    "GLOWSTONE": 1,
+    "GLOW_LICHEN": 64,
+    "GOLD": 1,
+    "GOLD_ORE": 1,
+    "GRANITE": 1,
+    "GRANITE_SLAB": 3,
+    "GRANITE_STAIRS": 8,
+    "GRANITE_WALL": 162,
+    "GRASS": 1,
+    "GRASS_PATH": 1,
+    "GRAVEL": 1,
+    "GREEN_TORCH": 5,
+    "HANGING_ROOTS": 1,
+    "HARDENED_CLAY": 1,
+    "HARDENED_GLASS": 1,
+    "HARDENED_GLASS_PANE": 1,
+    "HAY_BALE": 3,
+    "HONEYCOMB": 1,
+    "HOPPER": 10,
+    "ICE": 1,
+    "INFESTED_CHISELED_STONE_BRICK": 1,
+    "INFESTED_COBBLESTONE": 1,
+    "INFESTED_CRACKED_STONE_BRICK": 1,
+    "INFESTED_MOSSY_STONE_BRICK": 1,
+    "INFESTED_STONE": 1,
+    "INFESTED_STONE_BRICK": 1,
+    "INFO_UPDATE": 1,
+    "INFO_UPDATE2": 1,
+    "INVISIBLE_BEDROCK": 1,
+    "IRON": 1,
+    "IRON_BARS": 1,
+    "IRON_DOOR": 32,
+    "IRON_ORE": 1,
+    "IRON_TRAPDOOR": 16,
+    "ITEM_FRAME": 12,
+    "JUKEBOX": 1,
+    "JUNGLE_BUTTON": 12,
+    "JUNGLE_DOOR": 32,
+    "JUNGLE_FENCE": 1,
+    "JUNGLE_FENCE_GATE": 16,
+    "JUNGLE_LEAVES": 4,
+    "JUNGLE_LOG": 6,
+    "JUNGLE_PLANKS": 1,
+    "JUNGLE_PRESSURE_PLATE": 2,
+    "JUNGLE_SAPLING": 2,
+    "JUNGLE_SIGN": 16,
+    "JUNGLE_SLAB": 3,
+    "JUNGLE_STAIRS": 8,
+    "JUNGLE_TRAPDOOR": 16,
+    "JUNGLE_WALL_SIGN": 4,
+    "JUNGLE_WOOD": 6,
+    "LAB_TABLE": 4,
+    "LADDER": 4,
+    "LANTERN": 2,
+    "LAPIS_LAZULI": 1,
+    "LAPIS_LAZULI_ORE": 1,
+    "LARGE_FERN": 2,
+    "LAVA": 32,
+    "LAVA_CAULDRON": 6,
+    "LECTERN": 8,
+    "LEGACY_STONECUTTER": 1,
+    "LEVER": 16,
+    "LIGHT": 16,
+    "LIGHTNING_ROD": 6,
+    "LILAC": 2,
+    "LILY_OF_THE_VALLEY": 1,
+    "LILY_PAD": 1,
+    "LIT_PUMPKIN": 4,
+    "LOOM": 4,
+    "MAGMA": 1,
+    "MANGROVE_BUTTON": 12,
+    "MANGROVE_DOOR": 32,
+    "MANGROVE_FENCE": 1,
+    "MANGROVE_FENCE_GATE": 16,
+    "MANGROVE_LEAVES": 4,
+    "MANGROVE_LOG": 6,
+    "MANGROVE_PLANKS": 1,
+    "MANGROVE_PRESSURE_PLATE": 2,
+    "MANGROVE_ROOTS": 1,
+    "MANGROVE_SIGN": 16,
+    "MANGROVE_SLAB": 3,
+    "MANGROVE_STAIRS": 8,
+    "MANGROVE_TRAPDOOR": 16,
+    "MANGROVE_WALL_SIGN": 4,
+    "MANGROVE_WOOD": 6,
+    "MATERIAL_REDUCER": 4,
+    "MELON": 1,
+    "MELON_STEM": 40,
+    "MOB_HEAD": 35,
+    "MONSTER_SPAWNER": 1,
+    "MOSSY_COBBLESTONE": 1,
+    "MOSSY_COBBLESTONE_SLAB": 3,
+    "MOSSY_COBBLESTONE_STAIRS": 8,
+    "MOSSY_COBBLESTONE_WALL": 162,
+    "MOSSY_STONE_BRICKS": 1,
+    "MOSSY_STONE_BRICK_SLAB": 3,
+    "MOSSY_STONE_BRICK_STAIRS": 8,
+    "MOSSY_STONE_BRICK_WALL": 162,
+    "MUD": 1,
+    "MUDDY_MANGROVE_ROOTS": 3,
+    "MUD_BRICKS": 1,
+    "MUD_BRICK_SLAB": 3,
+    "MUD_BRICK_STAIRS": 8,
+    "MUD_BRICK_WALL": 162,
+    "MUSHROOM_STEM": 1,
+    "MYCELIUM": 1,
+    "NETHERITE": 1,
+    "NETHERRACK": 1,
+    "NETHER_BRICKS": 1,
+    "NETHER_BRICK_FENCE": 1,
+    "NETHER_BRICK_SLAB": 3,
+    "NETHER_BRICK_STAIRS": 8,
+    "NETHER_BRICK_WALL": 162,
+    "NETHER_GOLD_ORE": 1,
+    "NETHER_PORTAL": 2,
+    "NETHER_QUARTZ_ORE": 1,
+    "NETHER_REACTOR_CORE": 1,
+    "NETHER_WART": 4,
+    "NETHER_WART_BLOCK": 1,
+    "NOTE_BLOCK": 1,
+    "OAK_BUTTON": 12,
+    "OAK_DOOR": 32,
+    "OAK_FENCE": 1,
+    "OAK_FENCE_GATE": 16,
+    "OAK_LEAVES": 4,
+    "OAK_LOG": 6,
+    "OAK_PLANKS": 1,
+    "OAK_PRESSURE_PLATE": 2,
+    "OAK_SAPLING": 2,
+    "OAK_SIGN": 16,
+    "OAK_SLAB": 3,
+    "OAK_STAIRS": 8,
+    "OAK_TRAPDOOR": 16,
+    "OAK_WALL_SIGN": 4,
+    "OAK_WOOD": 6,
+    "OBSIDIAN": 1,
+    "ORANGE_TULIP": 1,
+    "OXEYE_DAISY": 1,
+    "PACKED_ICE": 1,
+    "PACKED_MUD": 1,
+    "PEONY": 2,
+    "PINK_PETALS": 16,
+    "PINK_TULIP": 1,
+    "PITCHER_CROP": 3,
+    "PITCHER_PLANT": 2,
+    "PODZOL": 1,
+    "POLISHED_ANDESITE": 1,
+    "POLISHED_ANDESITE_SLAB": 3,
+    "POLISHED_ANDESITE_STAIRS": 8,
+    "POLISHED_BASALT": 3,
+    "POLISHED_BLACKSTONE": 1,
+    "POLISHED_BLACKSTONE_BRICKS": 1,
+    "POLISHED_BLACKSTONE_BRICK_SLAB": 3,
+    "POLISHED_BLACKSTONE_BRICK_STAIRS": 8,
+    "POLISHED_BLACKSTONE_BRICK_WALL": 162,
+    "POLISHED_BLACKSTONE_BUTTON": 12,
+    "POLISHED_BLACKSTONE_PRESSURE_PLATE": 2,
+    "POLISHED_BLACKSTONE_SLAB": 3,
+    "POLISHED_BLACKSTONE_STAIRS": 8,
+    "POLISHED_BLACKSTONE_WALL": 162,
+    "POLISHED_DEEPSLATE": 1,
+    "POLISHED_DEEPSLATE_SLAB": 3,
+    "POLISHED_DEEPSLATE_STAIRS": 8,
+    "POLISHED_DEEPSLATE_WALL": 162,
+    "POLISHED_DIORITE": 1,
+    "POLISHED_DIORITE_SLAB": 3,
+    "POLISHED_DIORITE_STAIRS": 8,
+    "POLISHED_GRANITE": 1,
+    "POLISHED_GRANITE_SLAB": 3,
+    "POLISHED_GRANITE_STAIRS": 8,
+    "POLISHED_TUFF": 1,
+    "POLISHED_TUFF_SLAB": 3,
+    "POLISHED_TUFF_STAIRS": 8,
+    "POLISHED_TUFF_WALL": 162,
+    "POPPY": 1,
+    "POTATOES": 8,
+    "POTION_CAULDRON": 6,
+    "POWERED_RAIL": 12,
+    "PRISMARINE": 1,
+    "PRISMARINE_BRICKS": 1,
+    "PRISMARINE_BRICKS_SLAB": 3,
+    "PRISMARINE_BRICKS_STAIRS": 8,
+    "PRISMARINE_SLAB": 3,
+    "PRISMARINE_STAIRS": 8,
+    "PRISMARINE_WALL": 162,
+    "PUMPKIN": 1,
+    "PUMPKIN_STEM": 40,
+    "PURPLE_TORCH": 5,
+    "PURPUR": 1,
+    "PURPUR_PILLAR": 3,
+    "PURPUR_SLAB": 3,
+    "PURPUR_STAIRS": 8,
+    "QUARTZ": 1,
+    "QUARTZ_BRICKS": 1,
+    "QUARTZ_PILLAR": 3,
+    "QUARTZ_SLAB": 3,
+    "QUARTZ_STAIRS": 8,
+    "RAIL": 10,
+    "RAW_COPPER": 1,
+    "RAW_GOLD": 1,
+    "RAW_IRON": 1,
+    "REDSTONE": 1,
+    "REDSTONE_COMPARATOR": 16,
+    "REDSTONE_LAMP": 2,
+    "REDSTONE_ORE": 2,
+    "REDSTONE_REPEATER": 32,
+    "REDSTONE_TORCH": 10,
+    "REDSTONE_WIRE": 16,
+    "RED_MUSHROOM": 1,
+    "RED_MUSHROOM_BLOCK": 11,
+    "RED_NETHER_BRICKS": 1,
+    "RED_NETHER_BRICK_SLAB": 3,
+    "RED_NETHER_BRICK_STAIRS": 8,
+    "RED_NETHER_BRICK_WALL": 162,
+    "RED_SAND": 1,
+    "RED_SANDSTONE": 1,
+    "RED_SANDSTONE_SLAB": 3,
+    "RED_SANDSTONE_STAIRS": 8,
+    "RED_SANDSTONE_WALL": 162,
+    "RED_TORCH": 5,
+    "RED_TULIP": 1,
+    "REINFORCED_DEEPSLATE": 1,
+    "RESERVED6": 1,
+    "ROSE_BUSH": 2,
+    "SAND": 1,
+    "SANDSTONE": 1,
+    "SANDSTONE_SLAB": 3,
+    "SANDSTONE_STAIRS": 8,
+    "SANDSTONE_WALL": 162,
+    "SCULK": 1,
+    "SEA_LANTERN": 1,
+    "SEA_PICKLE": 8,
+    "SHROOMLIGHT": 1,
+    "SHULKER_BOX": 1,
+    "SLIME": 1,
+    "SMALL_DRIPLEAF": 8,
+    "SMITHING_TABLE": 1,
+    "SMOKER": 8,
+    "SMOOTH_BASALT": 1,
+    "SMOOTH_QUARTZ": 1,
+    "SMOOTH_QUARTZ_SLAB": 3,
+    "SMOOTH_QUARTZ_STAIRS": 8,
+    "SMOOTH_RED_SANDSTONE": 1,
+    "SMOOTH_RED_SANDSTONE_SLAB": 3,
+    "SMOOTH_RED_SANDSTONE_STAIRS": 8,
+    "SMOOTH_SANDSTONE": 1,
+    "SMOOTH_SANDSTONE_SLAB": 3,
+    "SMOOTH_SANDSTONE_STAIRS": 8,
+    "SMOOTH_STONE": 1,
+    "SMOOTH_STONE_SLAB": 3,
+    "SNOW": 1,
+    "SNOW_LAYER": 8,
+    "SOUL_CAMPFIRE": 8,
+    "SOUL_FIRE": 1,
+    "SOUL_LANTERN": 2,
+    "SOUL_SAND": 1,
+    "SOUL_SOIL": 1,
+    "SOUL_TORCH": 5,
+    "SPONGE": 2,
+    "SPORE_BLOSSOM": 1,
+    "SPRUCE_BUTTON": 12,
+    "SPRUCE_DOOR": 32,
+    "SPRUCE_FENCE": 1,
+    "SPRUCE_FENCE_GATE": 16,
+    "SPRUCE_LEAVES": 4,
+    "SPRUCE_LOG": 6,
+    "SPRUCE_PLANKS": 1,
+    "SPRUCE_PRESSURE_PLATE": 2,
+    "SPRUCE_SAPLING": 2,
+    "SPRUCE_SIGN": 16,
+    "SPRUCE_SLAB": 3,
+    "SPRUCE_STAIRS": 8,
+    "SPRUCE_TRAPDOOR": 16,
+    "SPRUCE_WALL_SIGN": 4,
+    "SPRUCE_WOOD": 6,
+    "STAINED_CLAY": 16,
+    "STAINED_GLASS": 16,
+    "STAINED_GLASS_PANE": 16,
+    "STAINED_HARDENED_GLASS": 16,
+    "STAINED_HARDENED_GLASS_PANE": 16,
+    "STONE": 1,
+    "STONECUTTER": 4,
+    "STONE_BRICKS": 1,
+    "STONE_BRICK_SLAB": 3,
+    "STONE_BRICK_STAIRS": 8,
+    "STONE_BRICK_WALL": 162,
+    "STONE_BUTTON": 12,
+    "STONE_PRESSURE_PLATE": 2,
+    "STONE_SLAB": 3,
+    "STONE_STAIRS": 8,
+    "SUGARCANE": 16,
+    "SUNFLOWER": 2,
+    "SWEET_BERRY_BUSH": 4,
+    "TALL_GRASS": 1,
+    "TINTED_GLASS": 1,
+    "TNT": 4,
+    "TORCH": 5,
+    "TORCHFLOWER": 1,
+    "TORCHFLOWER_CROP": 2,
+    "TRAPPED_CHEST": 4,
+    "TRIPWIRE": 16,
+    "TRIPWIRE_HOOK": 16,
+    "TUFF": 1,
+    "TUFF_BRICKS": 1,
+    "TUFF_BRICK_SLAB": 3,
+    "TUFF_BRICK_STAIRS": 8,
+    "TUFF_BRICK_WALL": 162,
+    "TUFF_SLAB": 3,
+    "TUFF_STAIRS": 8,
+    "TUFF_WALL": 162,
+    "TWISTING_VINES": 26,
+    "UNDERWATER_TORCH": 5,
+    "VINES": 16,
+    "WALL_BANNER": 64,
+    "WALL_CORAL_FAN": 40,
+    "WARPED_BUTTON": 12,
+    "WARPED_DOOR": 32,
+    "WARPED_FENCE": 1,
+    "WARPED_FENCE_GATE": 16,
+    "WARPED_HYPHAE": 6,
+    "WARPED_PLANKS": 1,
+    "WARPED_PRESSURE_PLATE": 2,
+    "WARPED_ROOTS": 1,
+    "WARPED_SIGN": 16,
+    "WARPED_SLAB": 3,
+    "WARPED_STAIRS": 8,
+    "WARPED_STEM": 6,
+    "WARPED_TRAPDOOR": 16,
+    "WARPED_WALL_SIGN": 4,
+    "WARPED_WART_BLOCK": 1,
+    "WATER": 32,
+    "WATER_CAULDRON": 6,
+    "WEEPING_VINES": 26,
+    "WEIGHTED_PRESSURE_PLATE_HEAVY": 16,
+    "WEIGHTED_PRESSURE_PLATE_LIGHT": 16,
+    "WHEAT": 8,
+    "WHITE_TULIP": 1,
+    "WITHER_ROSE": 1,
+    "WOOL": 16
+}
\ No newline at end of file
diff --git a/tests/phpunit/block/regenerate_consistency_check.php b/tests/phpunit/block/regenerate_consistency_check.php
index 38fd2afb3f..e86f70d70e 100644
--- a/tests/phpunit/block/regenerate_consistency_check.php
+++ b/tests/phpunit/block/regenerate_consistency_check.php
@@ -21,56 +21,31 @@
 
 declare(strict_types=1);
 
+use pocketmine\block\BlockTest;
+use pocketmine\block\RuntimeBlockStateRegistry;
+
 require dirname(__DIR__, 3) . '/vendor/autoload.php';
 
 /* This script needs to be re-run after any intentional blockfactory change (adding or removing a block state). */
 
-$factory = new \pocketmine\block\BlockFactory();
-$remaps = [];
-$new = [];
-foreach($factory->getAllKnownStates() as $index => $block){
-	if($block->getFullId() !== $index){
-		$remaps[$index] = $block->getFullId();
+$newTable = BlockTest::computeConsistencyCheckTable(RuntimeBlockStateRegistry::getInstance());
+
+$oldTablePath = __DIR__ . '/block_factory_consistency_check.json';
+if(file_exists($oldTablePath)){
+	$errors = BlockTest::computeConsistencyCheckDiff($oldTablePath, $newTable);
+
+	if(count($errors) > 0){
+		echo count($errors) . " changes detected:\n";
+		foreach($errors as $error){
+			echo $error . "\n";
+		}
 	}else{
-		$new[$index] = $block->getName();
-	}
-}
-$oldTable = json_decode(file_get_contents(__DIR__ . '/block_factory_consistency_check.json'), true);
-if(!is_array($oldTable)){
-	throw new \pocketmine\utils\AssumptionFailedError("Old table should be array{knownStates: array<string, string>, remaps: array<string, int>}");
-}
-$old = $oldTable["knownStates"];
-$oldRemaps = $oldTable["remaps"];
-
-foreach($old as $k => $name){
-	if(!isset($new[$k])){
-		echo "Removed state for $name (" . ($k >> \pocketmine\block\Block::INTERNAL_METADATA_BITS) . ":" . ($k & \pocketmine\block\Block::INTERNAL_METADATA_MASK) . ")\n";
-	}
-}
-foreach($new as $k => $name){
-	if(!isset($old[$k])){
-		echo "Added state for $name (" . ($k >> \pocketmine\block\Block::INTERNAL_METADATA_BITS) . ":" . ($k & \pocketmine\block\Block::INTERNAL_METADATA_MASK) . ")\n";
-	}elseif($old[$k] !== $name){
-		echo "Name changed (" . ($k >> \pocketmine\block\Block::INTERNAL_METADATA_BITS) . ":" . ($k & \pocketmine\block\Block::INTERNAL_METADATA_MASK) . "): " . $old[$k] . " -> " . $name . "\n";
+		echo "No changes detected\n";
 	}
+}else{
+	echo "WARNING: Unable to calculate diff, no previous consistency check file found\n";
 }
 
-foreach($oldRemaps as $index => $mapped){
-	if(!isset($remaps[$index])){
-		echo "Removed remap of " . ($index >> 4) . ":" . ($index & 0xf) . "\n";
-	}
-}
-foreach($remaps as $index => $mapped){
-	if(!isset($oldRemaps[$index])){
-		echo "New remap of " . ($index >> 4) . ":" . ($index & 0xf) . " (" . ($mapped >> 4) . ":" . ($mapped & 0xf) . ") (" . $new[$mapped] . ")\n";
-	}elseif($oldRemaps[$index] !== $mapped){
-		echo "Remap changed for " . ($index >> 4) . ":" . ($index & 0xf) . " (" . ($oldRemaps[$index] >> 4) . ":" . ($oldRemaps[$index] & 0xf) . " (" . $old[$oldRemaps[$index]] . ") -> " . ($mapped >> 4) . ":" . ($mapped & 0xf) . " (" . $new[$mapped] . "))\n";
-	}
-}
-file_put_contents(__DIR__ . '/block_factory_consistency_check.json', json_encode(
-	[
-		"knownStates" => $new,
-		"remaps" => $remaps
-	],
-	JSON_THROW_ON_ERROR
-));
+ksort($newTable, SORT_STRING);
+
+file_put_contents($oldTablePath, json_encode($newTable, JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT));
diff --git a/tests/phpunit/command/utils/CommandStringHelperTest.php b/tests/phpunit/command/utils/CommandStringHelperTest.php
index 0b8502348b..047dc7cebd 100644
--- a/tests/phpunit/command/utils/CommandStringHelperTest.php
+++ b/tests/phpunit/command/utils/CommandStringHelperTest.php
@@ -27,7 +27,7 @@ use PHPUnit\Framework\TestCase;
 
 class CommandStringHelperTest extends TestCase{
 
-	public function parseQuoteAwareProvider() : \Generator{
+	public static function parseQuoteAwareProvider() : \Generator{
 		yield [
 			'give "steve jobs" apple',
 			['give', 'steve jobs', 'apple']
diff --git a/tests/phpunit/console/ConsoleReaderChildProcessUtilsTest.php b/tests/phpunit/console/ConsoleReaderChildProcessUtilsTest.php
new file mode 100644
index 0000000000..31ae2e27a4
--- /dev/null
+++ b/tests/phpunit/console/ConsoleReaderChildProcessUtilsTest.php
@@ -0,0 +1,92 @@
+<?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\console;
+
+use PHPUnit\Framework\TestCase;
+use function mt_rand;
+use function str_repeat;
+
+final class ConsoleReaderChildProcessUtilsTest extends TestCase{
+
+	/**
+	 * @phpstan-return \Generator<int, array{string}, void, void>
+	 */
+	public static function commandStringProvider() : \Generator{
+		yield ["stop"];
+		yield ["pocketmine:status"];
+		yield [str_repeat("s", 1000)];
+		yield ["time set day"];
+		yield ["give \"Steve\" golden_apple"];
+	}
+
+	/**
+	 * @dataProvider commandStringProvider
+	 */
+	public function testCreateParseSymmetry(string $input) : void{
+		$counterCreate = $counterParse = mt_rand();
+		$message = ConsoleReaderChildProcessUtils::createMessage($input, $counterCreate);
+		$parsedInput = ConsoleReaderChildProcessUtils::parseMessage($message, $counterParse);
+
+		self::assertSame($input, $parsedInput);
+	}
+
+	public function testCreateMessage() : void{
+		$counter = 0;
+
+		ConsoleReaderChildProcessUtils::createMessage("", $counter);
+		self::assertSame(1, $counter, "createMessage should always bump the counter");
+	}
+
+	/**
+	 * @phpstan-return \Generator<int, array{string, bool}, void, void>
+	 */
+	public static function parseMessageProvider() : \Generator{
+		$counter = 0;
+		yield [ConsoleReaderChildProcessUtils::createMessage("", $counter), true];
+
+		yield ["", false]; //keepalive message, doesn't bump counter
+
+		$counter = 1;
+		yield [ConsoleReaderChildProcessUtils::createMessage("", $counter), false]; //mismatched counter
+
+		$counter = 0;
+		yield ["a" . ConsoleReaderChildProcessUtils::TOKEN_DELIMITER . "b", false]; //message with delimiter but not a valid IPC message
+	}
+
+	/**
+	 * @dataProvider parseMessageProvider
+	 */
+	public static function testParseMessage(string $message, bool $valid) : void{
+		$counter = $oldCounter = 0;
+
+		$input = ConsoleReaderChildProcessUtils::parseMessage($message, $counter);
+		if(!$valid){
+			self::assertNull($input, "Result should be null on invalid message");
+			self::assertSame($oldCounter, $counter, "Counter shouldn't be bumped on invalid message");
+		}else{
+			self::assertNotNull($input, "This was a valid message, expected a result");
+			self::assertSame($oldCounter + 1, $counter, "Counter should be bumped on valid message parse");
+		}
+	}
+}
diff --git a/tests/phpunit/data/bedrock/block/BlockStateDataTest.php b/tests/phpunit/data/bedrock/block/BlockStateDataTest.php
new file mode 100644
index 0000000000..7add2eddae
--- /dev/null
+++ b/tests/phpunit/data/bedrock/block/BlockStateDataTest.php
@@ -0,0 +1,58 @@
+<?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 phpunit\data\bedrock\block;
+
+use PHPUnit\Framework\TestCase;
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaUtils;
+use Symfony\Component\Filesystem\Path;
+use function sprintf;
+use const PHP_INT_MAX;
+use const pocketmine\BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH;
+
+final class BlockStateDataTest extends TestCase{
+
+	public function testCurrentVersion() : void{
+		foreach(BlockStateUpgradeSchemaUtils::loadSchemas(
+			Path::join(BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH, 'nbt_upgrade_schema'),
+				PHP_INT_MAX
+		) as $schema){
+			$expected = BlockStateData::CURRENT_VERSION;
+			$actual = $schema->getVersionId();
+			self::assertLessThanOrEqual($expected, $actual, sprintf(
+				"Schema version %d (%d.%d.%d.%d) is newer than the current version %d (%d.%d.%d.%d)",
+				$actual,
+				($actual >> 24) & 0xff,
+				($actual >> 16) & 0xff,
+				($actual >> 8) & 0xff,
+				$actual & 0xff,
+				$expected,
+				($expected >> 24) & 0xff,
+				($expected >> 16) & 0xff,
+				($expected >> 8) & 0xff,
+				$expected & 0xff
+			));
+		}
+	}
+}
diff --git a/tests/phpunit/data/bedrock/block/convert/BlockSerializerDeserializerTest.php b/tests/phpunit/data/bedrock/block/convert/BlockSerializerDeserializerTest.php
new file mode 100644
index 0000000000..a47a9b155a
--- /dev/null
+++ b/tests/phpunit/data/bedrock/block/convert/BlockSerializerDeserializerTest.php
@@ -0,0 +1,87 @@
+<?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\block\convert;
+
+use PHPUnit\Framework\TestCase;
+use pocketmine\block\BaseBanner;
+use pocketmine\block\Bed;
+use pocketmine\block\BlockTypeIds;
+use pocketmine\block\CaveVines;
+use pocketmine\block\Farmland;
+use pocketmine\block\MobHead;
+use pocketmine\block\RuntimeBlockStateRegistry;
+use pocketmine\data\bedrock\block\BlockStateDeserializeException;
+use pocketmine\data\bedrock\block\BlockStateSerializeException;
+use function print_r;
+
+final class BlockSerializerDeserializerTest extends TestCase{
+	private BlockStateToObjectDeserializer $deserializer;
+	private BlockObjectToStateSerializer $serializer;
+
+	public function setUp() : void{
+		$this->deserializer = new BlockStateToObjectDeserializer();
+		$this->serializer = new BlockObjectToStateSerializer();
+	}
+
+	public function testAllKnownBlockStatesSerializableAndDeserializable() : void{
+		foreach(RuntimeBlockStateRegistry::getInstance()->getAllKnownStates() as $block){
+			try{
+				$blockStateData = $this->serializer->serializeBlock($block);
+			}catch(BlockStateSerializeException $e){
+				self::fail($e->getMessage());
+			}
+			try{
+				$newBlock = $this->deserializer->deserializeBlock($blockStateData);
+			}catch(BlockStateDeserializeException $e){
+				self::fail($e->getMessage());
+			}
+
+			if($block->getTypeId() === BlockTypeIds::POTION_CAULDRON){
+				//this pretends to be a water cauldron in the blockstate, and stores its actual data in the blockentity
+				continue;
+			}
+
+			//The following are workarounds for differences in blockstate representation in Bedrock vs PM
+			//In some cases, some properties are not stored in the blockstate (but rather in the block entity NBT), but
+			//they do form part of the internal blockstate hash in PM. In other cases, PM allows representing states
+			//that don't exist in Bedrock, such as the cave vines head without berries, which is a state that visually
+			//exists in Bedrock, but doesn't have its own ID.
+			//This leads to inconsistencies when serializing and deserializing blockstates which we need to correct for.
+			if(
+				($block instanceof BaseBanner && $newBlock instanceof BaseBanner) ||
+				($block instanceof Bed && $newBlock instanceof Bed)
+			){
+				$newBlock->setColor($block->getColor());
+			}elseif($block instanceof MobHead && $newBlock instanceof MobHead){
+				$newBlock->setMobHeadType($block->getMobHeadType());
+			}elseif($block instanceof CaveVines && $newBlock instanceof CaveVines && !$block->hasBerries()){
+				$newBlock->setHead($block->isHead());
+			}elseif($block instanceof Farmland && $newBlock instanceof Farmland){
+				$block->setWaterPositionIndex($newBlock->getWaterPositionIndex());
+			}
+
+			self::assertSame($block->getStateId(), $newBlock->getStateId(), "Mismatch of blockstate for " . $block->getName() . ", " . print_r($block, true) . " vs " . print_r($newBlock, true));
+		}
+	}
+}
diff --git a/tests/phpunit/data/bedrock/block/upgrade/BlockStateUpgraderTest.php b/tests/phpunit/data/bedrock/block/upgrade/BlockStateUpgraderTest.php
new file mode 100644
index 0000000000..91afd8ed92
--- /dev/null
+++ b/tests/phpunit/data/bedrock/block/upgrade/BlockStateUpgraderTest.php
@@ -0,0 +1,262 @@
+<?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\block\upgrade;
+
+use PHPUnit\Framework\TestCase;
+use pocketmine\block\Block;
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\StringTag;
+use const PHP_INT_MAX;
+
+class BlockStateUpgraderTest extends TestCase{
+
+	private const TEST_BLOCK = "pocketmine:test_block";
+	private const TEST_BLOCK_2 = "pocketmine:test_block_2";
+	private const TEST_PROPERTY = "test_property";
+	private const TEST_PROPERTY_2 = "test_property_2";
+	private const TEST_VERSION = 1;
+
+	private const TEST_PROPERTY_VALUE_1 = 1;
+	private const TEST_PROPERTY_VALUE_2 = 2;
+	private const TEST_PROPERTY_VALUE_3 = 3;
+
+	private BlockStateUpgrader $upgrader;
+
+	public function setUp() : void{
+		$this->upgrader = new BlockStateUpgrader([]);
+	}
+
+	private function getNewSchema() : BlockStateUpgradeSchema{
+		return $this->getNewSchemaVersion(PHP_INT_MAX, 0);
+	}
+
+	private function getNewSchemaVersion(int $versionId, int $schemaId) : BlockStateUpgradeSchema{
+		$schema = new BlockStateUpgradeSchema(($versionId >> 24) & 0xff, ($versionId >> 16) & 0xff, ($versionId >> 8) & 0xff, $versionId & 0xff, $schemaId);
+		$this->upgrader->addSchema($schema);
+		return $schema;
+	}
+
+	/**
+	 * @phpstan-param \Closure() : BlockStateData $getStateData
+	 */
+	private function upgrade(BlockStateData $stateData, \Closure $getStateData) : BlockStateData{
+		$result = $this->upgrader->upgrade($stateData);
+		self::assertTrue($stateData->equals($getStateData()), "Upgrading states must not alter the original input");
+
+		return $result;
+	}
+
+	public function testRenameId() : void{
+		$this->getNewSchema()->renamedIds[self::TEST_BLOCK] = self::TEST_BLOCK_2;
+
+		$getStateData = fn() => self::getEmptyPreimage();
+		$upgradedStateData = $this->upgrade($getStateData(), $getStateData);
+
+		self::assertSame($upgradedStateData->getName(), self::TEST_BLOCK_2);
+	}
+
+	private function prepareAddPropertySchema(BlockStateUpgradeSchema $schema) : void{
+		$schema->addedProperties[self::TEST_BLOCK][self::TEST_PROPERTY] = new IntTag(self::TEST_PROPERTY_VALUE_1);
+	}
+
+	private static function getEmptyPreimage() : BlockStateData{
+		return new BlockStateData(self::TEST_BLOCK, [], self::TEST_VERSION);
+	}
+
+	private static function getPreimageOneProperty(string $propertyName, int $value) : BlockStateData{
+		return new BlockStateData(
+			self::TEST_BLOCK,
+			[$propertyName => new IntTag($value)],
+			self::TEST_VERSION
+		);
+	}
+
+	public function testAddNewProperty() : void{
+		$this->prepareAddPropertySchema($this->getNewSchema());
+
+		$getStateData = fn() => self::getEmptyPreimage();
+		$upgradedStateData = $this->upgrade($getStateData(), $getStateData);
+
+		self::assertSame(self::TEST_PROPERTY_VALUE_1, $upgradedStateData->getState(self::TEST_PROPERTY)?->getValue());
+	}
+
+	public function testAddPropertyAlreadyExists() : void{
+		$this->prepareAddPropertySchema($this->getNewSchema());
+
+		$getStateData = fn() => self::getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_1 + 1);
+		$stateData = $getStateData();
+		$upgradedStateData = $this->upgrade($stateData, $getStateData);
+
+		//the object may not be the same due to
+		self::assertTrue($stateData->equals($upgradedStateData), "Adding a property that already exists with a different value should not alter the state");
+	}
+
+	private function prepareRemovePropertySchema(BlockStateUpgradeSchema $schema) : void{
+		$schema->removedProperties[self::TEST_BLOCK][] = self::TEST_PROPERTY;
+	}
+
+	/**
+	 * @phpstan-return \Generator<int, array{\Closure() : BlockStateData}, void, void>
+	 */
+	public static function removePropertyProvider() : \Generator{
+		yield [fn() => self::getEmptyPreimage()];
+		yield [fn() => self::getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_1)];
+	}
+
+	/**
+	 * @dataProvider removePropertyProvider
+	 * @phpstan-param \Closure() : BlockStateData $getStateData
+	 */
+	public function testRemoveProperty(\Closure $getStateData) : void{
+		$this->prepareRemovePropertySchema($this->getNewSchema());
+
+		$upgradedStateData = $this->upgrade($getStateData(), $getStateData);
+
+		self::assertNull($upgradedStateData->getState(self::TEST_PROPERTY));
+	}
+
+	private function prepareRenamePropertySchema(BlockStateUpgradeSchema $schema) : void{
+		$schema->renamedProperties[self::TEST_BLOCK][self::TEST_PROPERTY] = self::TEST_PROPERTY_2;
+	}
+
+	/**
+	 * @phpstan-return \Generator<int, array{\Closure() : BlockStateData, ?int}, void, void>
+	 */
+	public static function renamePropertyProvider() : \Generator{
+		yield [fn() => self::getEmptyPreimage(), null];
+		yield [fn() => self::getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_1), self::TEST_PROPERTY_VALUE_1];
+		yield [fn() => self::getPreimageOneProperty(self::TEST_PROPERTY_2, self::TEST_PROPERTY_VALUE_1), self::TEST_PROPERTY_VALUE_1];
+	}
+
+	/**
+	 * @dataProvider renamePropertyProvider
+	 * @phpstan-param \Closure() : BlockStateData $getStateData
+	 */
+	public function testRenameProperty(\Closure $getStateData, ?int $valueAfter) : void{
+		$this->prepareRenamePropertySchema($this->getNewSchema());
+
+		$upgradedStateData = $this->upgrade($getStateData(), $getStateData);
+
+		self::assertSame($valueAfter, $upgradedStateData->getState(self::TEST_PROPERTY_2)?->getValue());
+	}
+
+	private function prepareRemapPropertyValueSchema(BlockStateUpgradeSchema $schema) : void{
+		$schema->remappedPropertyValues[self::TEST_BLOCK][self::TEST_PROPERTY][] = new BlockStateUpgradeSchemaValueRemap(
+			new IntTag(self::TEST_PROPERTY_VALUE_1),
+			new IntTag(self::TEST_PROPERTY_VALUE_2)
+		);
+	}
+
+	/**
+	 * @phpstan-return \Generator<int, array{\Closure() : BlockStateData, ?int}, void, void>
+	 */
+	public static function remapPropertyValueProvider() : \Generator{
+		//no property to remap
+		yield [fn() => self::getEmptyPreimage(), null];
+
+		//value that will be remapped
+		yield [fn() => self::getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_1), self::TEST_PROPERTY_VALUE_2];
+
+		//value that is already at the target value
+		yield [fn() => self::getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_2), self::TEST_PROPERTY_VALUE_2];
+
+		//value that is not remapped and is different from target value (to detect unconditional overwrite bugs)
+		yield [fn() => self::getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_3), self::TEST_PROPERTY_VALUE_3];
+	}
+
+	/**
+	 * @dataProvider remapPropertyValueProvider
+	 * @phpstan-param \Closure() : BlockStateData $getStateData
+	 */
+	public function testRemapPropertyValue(\Closure $getStateData, ?int $valueAfter) : void{
+		$this->prepareRemapPropertyValueSchema($this->getNewSchema());
+
+		$upgradedStateData = $this->upgrade($getStateData(), $getStateData);
+
+		self::assertSame($upgradedStateData->getState(self::TEST_PROPERTY)?->getValue(), $valueAfter);
+	}
+
+	/**
+	 * @dataProvider remapPropertyValueProvider
+	 * @phpstan-param \Closure() : BlockStateData $getStateData
+	 */
+	public function testRemapAndRenameProperty(\Closure $getStateData, ?int $valueAfter) : void{
+		$schema = $this->getNewSchema();
+		$this->prepareRenamePropertySchema($schema);
+		$this->prepareRemapPropertyValueSchema($schema);
+
+		$upgradedStateData = $this->upgrade($getStateData(), $getStateData);
+
+		self::assertSame($upgradedStateData->getState(self::TEST_PROPERTY_2)?->getValue(), $valueAfter);
+	}
+
+	public function testFlattenProperty() : void{
+		$schema = $this->getNewSchema();
+		$schema->flattenedProperties[self::TEST_BLOCK] = new BlockStateUpgradeSchemaFlattenInfo(
+			"minecraft:",
+			"test",
+			"_suffix",
+			[],
+			StringTag::class
+		);
+
+		$stateData = new BlockStateData(self::TEST_BLOCK, ["test" => new StringTag("value1")], 0);
+		$upgradedStateData = $this->upgrade($stateData, fn() => $stateData);
+
+		self::assertSame("minecraft:value1_suffix", $upgradedStateData->getName());
+		self::assertEmpty($upgradedStateData->getStates());
+	}
+
+	/**
+	 * @phpstan-return \Generator<int, array{int, int, bool, int}, void, void>
+	 */
+	public static function upgraderVersionCompatibilityProvider() : \Generator{
+		yield [0x1_00_00_00, 0x1_00_00_00, true, 2]; //Same version, multiple schemas targeting version - must be altered, we don't know which schemas are applicable
+		yield [0x1_00_00_00, 0x1_00_00_00, false, 1]; //Same version, one schema targeting version - do not change
+		yield [0x1_00_01_00, 0x1_00_00_00, true, 1]; //Schema newer than block: must be altered
+		yield [0x1_00_00_00, 0x1_00_01_00, false, 1]; //Block newer than schema: block must NOT be altered
+	}
+
+	/**
+	 * @dataProvider upgraderVersionCompatibilityProvider
+	 */
+	public function testUpgraderVersionCompatibility(int $schemaVersion, int $stateVersion, bool $shouldChange, int $schemaCount) : void{
+		for($i = 0; $i < $schemaCount; $i++){
+			$schema = $this->getNewSchemaVersion($schemaVersion, $i);
+			$schema->renamedIds[self::TEST_BLOCK] = self::TEST_BLOCK_2;
+		}
+
+		$getStateData = fn() => new BlockStateData(
+			self::TEST_BLOCK,
+			[],
+			$stateVersion
+		);
+
+		$upgradedStateData = $this->upgrade($getStateData(), $getStateData);
+		$originalStateData = $getStateData();
+
+		self::assertNotSame($shouldChange, $upgradedStateData->equals($originalStateData));
+	}
+}
diff --git a/tests/phpunit/data/bedrock/item/ItemSerializerDeserializerTest.php b/tests/phpunit/data/bedrock/item/ItemSerializerDeserializerTest.php
new file mode 100644
index 0000000000..b3945d0f6b
--- /dev/null
+++ b/tests/phpunit/data/bedrock/item/ItemSerializerDeserializerTest.php
@@ -0,0 +1,83 @@
+<?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\item;
+
+use PHPUnit\Framework\TestCase;
+use pocketmine\block\RuntimeBlockStateRegistry;
+use pocketmine\item\VanillaItems;
+use pocketmine\world\format\io\GlobalBlockStateHandlers;
+
+final class ItemSerializerDeserializerTest extends TestCase{
+
+	private ItemDeserializer $deserializer;
+	private ItemSerializer $serializer;
+
+	public function setUp() : void{
+		$this->deserializer = new ItemDeserializer(GlobalBlockStateHandlers::getDeserializer());
+		$this->serializer = new ItemSerializer(GlobalBlockStateHandlers::getSerializer());
+	}
+
+	public function testAllVanillaItemsSerializableAndDeserializable() : void{
+		foreach(VanillaItems::getAll() as $item){
+			if($item->isNull()){
+				continue;
+			}
+
+			try{
+				$itemData = $this->serializer->serializeType($item);
+			}catch(ItemTypeSerializeException $e){
+				self::fail($e->getMessage());
+			}
+			try{
+				$newItem = $this->deserializer->deserializeType($itemData);
+			}catch(ItemTypeDeserializeException $e){
+				self::fail($e->getMessage());
+			}
+
+			self::assertTrue($item->equalsExact($newItem));
+		}
+	}
+
+	public function testAllVanillaBlocksSerializableAndDeserializable() : void{
+		foreach(RuntimeBlockStateRegistry::getInstance()->getAllKnownStates() as $block){
+			$item = $block->asItem();
+			if($item->isNull()){
+				continue;
+			}
+
+			try{
+				$itemData = $this->serializer->serializeType($item);
+			}catch(ItemTypeSerializeException $e){
+				self::fail($e->getMessage());
+			}
+			try{
+				$newItem = $this->deserializer->deserializeType($itemData);
+			}catch(ItemTypeDeserializeException $e){
+				self::fail($e->getMessage());
+			}
+
+			self::assertTrue($item->equalsExact($newItem));
+		}
+	}
+}
diff --git a/tests/phpunit/event/EventTest.php b/tests/phpunit/event/EventTest.php
new file mode 100644
index 0000000000..7410cc3bb0
--- /dev/null
+++ b/tests/phpunit/event/EventTest.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\event;
+
+use PHPUnit\Framework\TestCase;
+use pocketmine\event\fixtures\TestChildEvent;
+use pocketmine\event\fixtures\TestGrandchildEvent;
+use pocketmine\event\fixtures\TestParentEvent;
+use pocketmine\plugin\Plugin;
+use pocketmine\plugin\PluginManager;
+use pocketmine\Server;
+
+final class EventTest extends TestCase{
+
+	private Plugin $mockPlugin;
+	private PluginManager $pluginManager;
+
+	protected function setUp() : void{
+		HandlerListManager::global()->unregisterAll();
+
+		//TODO: this is a really bad hack and could break any time if PluginManager decides to access its Server field
+		//we really need to make it possible to register events without a Plugin or Server context
+		$mockServer = $this->createMock(Server::class);
+		$this->mockPlugin = self::createStub(Plugin::class);
+		$this->mockPlugin->method('isEnabled')->willReturn(true);
+
+		$this->pluginManager = new PluginManager($mockServer, null);
+	}
+
+	public static function tearDownAfterClass() : void{
+		HandlerListManager::global()->unregisterAll();
+	}
+
+	public function testHandlerInheritance() : void{
+		$expectedOrder = [
+			TestGrandchildEvent::class,
+			TestChildEvent::class,
+			TestParentEvent::class
+		];
+		$actualOrder = [];
+
+		foreach($expectedOrder as $class){
+			$this->pluginManager->registerEvent(
+				$class,
+				function(TestParentEvent $event) use (&$actualOrder, $class) : void{
+					$actualOrder[] = $class;
+				},
+				EventPriority::NORMAL,
+				$this->mockPlugin
+			);
+		}
+
+		$event = new TestGrandchildEvent();
+		$event->call();
+
+		self::assertSame($expectedOrder, $actualOrder, "Expected event handlers to be called from most specific to least specific");
+	}
+}
diff --git a/tests/phpunit/event/HandlerListManagerTest.php b/tests/phpunit/event/HandlerListManagerTest.php
index 6d728151be..c61043dab8 100644
--- a/tests/phpunit/event/HandlerListManagerTest.php
+++ b/tests/phpunit/event/HandlerListManagerTest.php
@@ -24,6 +24,12 @@ declare(strict_types=1);
 namespace pocketmine\event;
 
 use PHPUnit\Framework\TestCase;
+use pocketmine\event\fixtures\TestAbstractAllowHandleEvent;
+use pocketmine\event\fixtures\TestAbstractEvent;
+use pocketmine\event\fixtures\TestConcreteEvent;
+use pocketmine\event\fixtures\TestConcreteExtendsAbstractEvent;
+use pocketmine\event\fixtures\TestConcreteExtendsAllowHandleEvent;
+use pocketmine\event\fixtures\TestConcreteExtendsConcreteEvent;
 
 class HandlerListManagerTest extends TestCase{
 
@@ -49,7 +55,7 @@ class HandlerListManagerTest extends TestCase{
 	 * @return \Generator|mixed[][]
 	 * @phpstan-return \Generator<int, array{\ReflectionClass<Event>, bool, string}, void, void>
 	 */
-	public function isValidClassProvider() : \Generator{
+	public static function isValidClassProvider() : \Generator{
 		yield [new \ReflectionClass(Event::class), false, "event base should not be handleable"];
 		yield [new \ReflectionClass(TestConcreteEvent::class), true, ""];
 		yield [new \ReflectionClass(TestAbstractEvent::class), false, "abstract event cannot be handled"];
@@ -69,7 +75,7 @@ class HandlerListManagerTest extends TestCase{
 	 * @return \Generator|\ReflectionClass[][]
 	 * @phpstan-return \Generator<int, array{\ReflectionClass<Event>, \ReflectionClass<Event>|null}, void, void>
 	 */
-	public function resolveParentClassProvider() : \Generator{
+	public static function resolveParentClassProvider() : \Generator{
 		yield [new \ReflectionClass(TestConcreteExtendsAllowHandleEvent::class), new \ReflectionClass(TestAbstractAllowHandleEvent::class)];
 		yield [new \ReflectionClass(TestConcreteEvent::class), null];
 		yield [new \ReflectionClass(TestConcreteExtendsAbstractEvent::class), null];
diff --git a/tests/phpunit/event/TestAbstractAllowHandleEvent.php b/tests/phpunit/event/fixtures/TestAbstractAllowHandleEvent.php
similarity index 92%
rename from tests/phpunit/event/TestAbstractAllowHandleEvent.php
rename to tests/phpunit/event/fixtures/TestAbstractAllowHandleEvent.php
index 1bac06bbb0..3831698098 100644
--- a/tests/phpunit/event/TestAbstractAllowHandleEvent.php
+++ b/tests/phpunit/event/fixtures/TestAbstractAllowHandleEvent.php
@@ -21,7 +21,9 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\event;
+namespace pocketmine\event\fixtures;
+
+use pocketmine\event\Event;
 
 /**
  * @allowHandle
diff --git a/tests/phpunit/event/TestAbstractEvent.php b/tests/phpunit/event/fixtures/TestAbstractEvent.php
similarity index 92%
rename from tests/phpunit/event/TestAbstractEvent.php
rename to tests/phpunit/event/fixtures/TestAbstractEvent.php
index 92a95363e3..b48d8f5269 100644
--- a/tests/phpunit/event/TestAbstractEvent.php
+++ b/tests/phpunit/event/fixtures/TestAbstractEvent.php
@@ -21,7 +21,9 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\event;
+namespace pocketmine\event\fixtures;
+
+use pocketmine\event\Event;
 
 abstract class TestAbstractEvent extends Event{
 
diff --git a/tests/phpunit/event/fixtures/TestChildEvent.php b/tests/phpunit/event/fixtures/TestChildEvent.php
new file mode 100644
index 0000000000..569a2c069a
--- /dev/null
+++ b/tests/phpunit/event/fixtures/TestChildEvent.php
@@ -0,0 +1,28 @@
+<?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\event\fixtures;
+
+class TestChildEvent extends TestParentEvent{
+
+}
diff --git a/tests/phpunit/event/TestConcreteEvent.php b/tests/phpunit/event/fixtures/TestConcreteEvent.php
similarity index 92%
rename from tests/phpunit/event/TestConcreteEvent.php
rename to tests/phpunit/event/fixtures/TestConcreteEvent.php
index 8b159df91a..cf744eb2ce 100644
--- a/tests/phpunit/event/TestConcreteEvent.php
+++ b/tests/phpunit/event/fixtures/TestConcreteEvent.php
@@ -21,7 +21,9 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\event;
+namespace pocketmine\event\fixtures;
+
+use pocketmine\event\Event;
 
 class TestConcreteEvent extends Event{
 
diff --git a/tests/phpunit/event/TestConcreteExtendsAbstractEvent.php b/tests/phpunit/event/fixtures/TestConcreteExtendsAbstractEvent.php
similarity index 95%
rename from tests/phpunit/event/TestConcreteExtendsAbstractEvent.php
rename to tests/phpunit/event/fixtures/TestConcreteExtendsAbstractEvent.php
index 3f0fa572fe..54ec3dbb12 100644
--- a/tests/phpunit/event/TestConcreteExtendsAbstractEvent.php
+++ b/tests/phpunit/event/fixtures/TestConcreteExtendsAbstractEvent.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\event;
+namespace pocketmine\event\fixtures;
 
 class TestConcreteExtendsAbstractEvent extends TestAbstractEvent{
 
diff --git a/tests/phpunit/event/TestConcreteExtendsAllowHandleEvent.php b/tests/phpunit/event/fixtures/TestConcreteExtendsAllowHandleEvent.php
similarity index 95%
rename from tests/phpunit/event/TestConcreteExtendsAllowHandleEvent.php
rename to tests/phpunit/event/fixtures/TestConcreteExtendsAllowHandleEvent.php
index e414651211..362ce693b5 100644
--- a/tests/phpunit/event/TestConcreteExtendsAllowHandleEvent.php
+++ b/tests/phpunit/event/fixtures/TestConcreteExtendsAllowHandleEvent.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\event;
+namespace pocketmine\event\fixtures;
 
 class TestConcreteExtendsAllowHandleEvent extends TestAbstractAllowHandleEvent{
 
diff --git a/tests/phpunit/event/TestConcreteExtendsConcreteEvent.php b/tests/phpunit/event/fixtures/TestConcreteExtendsConcreteEvent.php
similarity index 95%
rename from tests/phpunit/event/TestConcreteExtendsConcreteEvent.php
rename to tests/phpunit/event/fixtures/TestConcreteExtendsConcreteEvent.php
index cc95589351..3fd3a6cf0e 100644
--- a/tests/phpunit/event/TestConcreteExtendsConcreteEvent.php
+++ b/tests/phpunit/event/fixtures/TestConcreteExtendsConcreteEvent.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\event;
+namespace pocketmine\event\fixtures;
 
 class TestConcreteExtendsConcreteEvent extends TestConcreteEvent{
 
diff --git a/tests/phpunit/event/fixtures/TestGrandchildEvent.php b/tests/phpunit/event/fixtures/TestGrandchildEvent.php
new file mode 100644
index 0000000000..bfe50f9f3d
--- /dev/null
+++ b/tests/phpunit/event/fixtures/TestGrandchildEvent.php
@@ -0,0 +1,28 @@
+<?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\event\fixtures;
+
+class TestGrandchildEvent extends TestChildEvent{
+
+}
diff --git a/tests/phpunit/event/fixtures/TestParentEvent.php b/tests/phpunit/event/fixtures/TestParentEvent.php
new file mode 100644
index 0000000000..c204422722
--- /dev/null
+++ b/tests/phpunit/event/fixtures/TestParentEvent.php
@@ -0,0 +1,30 @@
+<?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\event\fixtures;
+
+use pocketmine\event\Event;
+
+class TestParentEvent extends Event{
+
+}
diff --git a/tests/phpunit/item/BannerTest.php b/tests/phpunit/item/BannerTest.php
index c555031a09..797ca60fca 100644
--- a/tests/phpunit/item/BannerTest.php
+++ b/tests/phpunit/item/BannerTest.php
@@ -36,7 +36,7 @@ final class BannerTest extends TestCase{
 		$item = VanillaBlocks::BANNER()->asItem();
 		assert($item instanceof Banner);
 		$item->setPatterns([
-			new BannerPatternLayer(BannerPatternType::FLOWER(), DyeColor::RED())
+			new BannerPatternLayer(BannerPatternType::FLOWER, DyeColor::RED)
 		]);
 		$data = $item->nbtSerialize();
 
@@ -45,6 +45,6 @@ final class BannerTest extends TestCase{
 		self::assertInstanceOf(Banner::class, $item2);
 		$patterns = $item2->getPatterns();
 		self::assertCount(1, $patterns);
-		self::assertTrue(BannerPatternType::FLOWER()->equals($patterns[0]->getType()));
+		self::assertTrue(BannerPatternType::FLOWER === $patterns[0]->getType());
 	}
 }
diff --git a/tests/phpunit/item/ItemFactoryTest.php b/tests/phpunit/item/ItemFactoryTest.php
deleted file mode 100644
index e9f45169ed..0000000000
--- a/tests/phpunit/item/ItemFactoryTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\item;
-
-use PHPUnit\Framework\TestCase;
-use pocketmine\block\BlockFactory;
-
-class ItemFactoryTest extends TestCase{
-
-	/**
-	 * Tests that blocks are considered to be valid registered items
-	 */
-	public function testItemBlockRegistered() : void{
-		for($id = 0; $id < 256; ++$id){
-			self::assertEquals(BlockFactory::getInstance()->isRegistered($id), ItemFactory::getInstance()->isRegistered($id));
-		}
-	}
-
-	/**
-	 * Test that durable items are correctly created by the item factory
-	 */
-	public function testGetDurableItem() : void{
-		self::assertInstanceOf(Sword::class, $i1 = ItemFactory::getInstance()->get(ItemIds::WOODEN_SWORD));
-		/** @var Sword $i1 */
-		self::assertSame(0, $i1->getDamage());
-		self::assertInstanceOf(Sword::class, $i2 = ItemFactory::getInstance()->get(ItemIds::WOODEN_SWORD, 1));
-		/** @var Sword $i2 */
-		self::assertSame(1, $i2->getDamage());
-	}
-
-	public function testGetDurableItemWithTooLargeDurability() : void{
-		self::assertInstanceOf(Sword::class, ItemFactory::getInstance()->get(ItemIds::WOODEN_SWORD, ToolTier::WOOD()->getMaxDurability()));
-		ItemFactory::getInstance()->get(ItemIds::WOODEN_SWORD, ToolTier::WOOD()->getMaxDurability() + 1);
-	}
-}
diff --git a/tests/phpunit/item/ItemTest.php b/tests/phpunit/item/ItemTest.php
index 05cb48b30f..36ca5c5ffc 100644
--- a/tests/phpunit/item/ItemTest.php
+++ b/tests/phpunit/item/ItemTest.php
@@ -89,7 +89,6 @@ class ItemTest extends TestCase{
 	}
 
 	public function testGetEnchantments() : void{
-		/** @var EnchantmentInstance[] $enchantments */
 		$enchantments = [
 			new EnchantmentInstance(VanillaEnchantments::EFFICIENCY(), 5),
 			new EnchantmentInstance(VanillaEnchantments::SHARPNESS(), 1)
diff --git a/tests/phpunit/item/ItemTypeIdsTest.php b/tests/phpunit/item/ItemTypeIdsTest.php
new file mode 100644
index 0000000000..7336780b33
--- /dev/null
+++ b/tests/phpunit/item/ItemTypeIdsTest.php
@@ -0,0 +1,61 @@
+<?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\item;
+
+use PHPUnit\Framework\TestCase;
+use pocketmine\utils\Utils;
+use function array_unique;
+use function max;
+
+class ItemTypeIdsTest extends TestCase{
+
+	public function testFirstUnused() : void{
+		$reflect = new \ReflectionClass(ItemTypeIds::class);
+
+		$constants = $reflect->getConstants();
+		unset($constants['FIRST_UNUSED_ITEM_ID']);
+
+		self::assertSame($reflect->getConstant('FIRST_UNUSED_ITEM_ID'), max($constants) + 1, "FIRST_UNUSED_ITEM_ID must be one higher than the highest fixed type ID");
+	}
+
+	public function testNoDuplicates() : void{
+		$idTable = (new \ReflectionClass(ItemTypeIds::class))->getConstants();
+
+		self::assertSameSize($idTable, array_unique($idTable), "Every ItemTypeID must be unique");
+	}
+
+	public function testVanillaItemsParity() : void{
+		$reflect = new \ReflectionClass(ItemTypeIds::class);
+
+		foreach(Utils::stringifyKeys(VanillaItems::getAll()) as $name => $item){
+			if($item instanceof ItemBlock){
+				continue;
+			}
+			$expected = $item->getTypeId();
+			$actual = $reflect->getConstant($name);
+			self::assertNotFalse($actual, "VanillaItems::$name() does not have an ItemTypeIds constant");
+			self::assertSame($expected, $actual, "VanillaItems::$name() type ID does not match ItemTypeIds::$name");
+		}
+	}
+}
diff --git a/tests/phpunit/item/LegacyStringToItemParserTest.php b/tests/phpunit/item/LegacyStringToItemParserTest.php
index ef5127fec8..f9243df7e3 100644
--- a/tests/phpunit/item/LegacyStringToItemParserTest.php
+++ b/tests/phpunit/item/LegacyStringToItemParserTest.php
@@ -24,32 +24,31 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 use PHPUnit\Framework\TestCase;
+use pocketmine\block\VanillaBlocks;
 
 class LegacyStringToItemParserTest extends TestCase{
 
 	/**
 	 * @return mixed[][]
-	 * @phpstan-return list<array{string,int,int}>
+	 * @phpstan-return list<array{string,Item}>
 	 */
-	public function itemFromStringProvider() : array{
+	public static function itemFromStringProvider() : array{
 		return [
-			["dye:4", ItemIds::DYE, 4],
-			["351", ItemIds::DYE, 0],
-			["351:4", ItemIds::DYE, 4],
-			["stone:3", ItemIds::STONE, 3],
-			["minecraft:string", ItemIds::STRING, 0],
-			["diamond_pickaxe", ItemIds::DIAMOND_PICKAXE, 0],
-			["diamond_pickaxe:5", ItemIds::DIAMOND_PICKAXE, 5]
+			["dye:4", VanillaItems::LAPIS_LAZULI()],
+			["351", VanillaItems::INK_SAC()],
+			["351:4", VanillaItems::LAPIS_LAZULI()],
+			["stone:3", VanillaBlocks::DIORITE()->asItem()],
+			["minecraft:string", VanillaItems::STRING()],
+			["diamond_pickaxe", VanillaItems::DIAMOND_PICKAXE()]
 		];
 	}
 
 	/**
 	 * @dataProvider itemFromStringProvider
 	 */
-	public function testFromStringSingle(string $string, int $id, int $meta) : void{
+	public function testFromStringSingle(string $string, Item $expected) : void{
 		$item = LegacyStringToItemParser::getInstance()->parse($string);
 
-		self::assertEquals($id, $item->getId());
-		self::assertEquals($meta, $item->getMeta());
+		self::assertTrue($item->equals($expected));
 	}
 }
diff --git a/src/network/mcpe/convert/R12ToCurrentBlockMapEntry.php b/tests/phpunit/network/mcpe/convert/BlockTranslatorTest.php
similarity index 62%
rename from src/network/mcpe/convert/R12ToCurrentBlockMapEntry.php
rename to tests/phpunit/network/mcpe/convert/BlockTranslatorTest.php
index f482e083b7..ef8e297c44 100644
--- a/src/network/mcpe/convert/R12ToCurrentBlockMapEntry.php
+++ b/tests/phpunit/network/mcpe/convert/BlockTranslatorTest.php
@@ -23,28 +23,18 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\convert;
 
-use pocketmine\nbt\tag\CompoundTag;
+use PHPUnit\Framework\TestCase;
+use pocketmine\block\RuntimeBlockStateRegistry;
 
-final class R12ToCurrentBlockMapEntry{
-	public function __construct(
-		private string $id,
-		private int $meta,
-		private CompoundTag $blockState
-	){}
+class BlockTranslatorTest extends TestCase{
 
-	public function getId() : string{
-		return $this->id;
-	}
-
-	public function getMeta() : int{
-		return $this->meta;
-	}
-
-	public function getBlockState() : CompoundTag{
-		return $this->blockState;
-	}
-
-	public function __toString(){
-		return "id=$this->id, meta=$this->meta, nbt=$this->blockState";
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function testAllBlockStatesSerialize() : void{
+		$blockTranslator = TypeConverter::getInstance()->getBlockTranslator();
+		foreach(RuntimeBlockStateRegistry::getInstance()->getAllKnownStates() as $state){
+			$blockTranslator->internalIdToNetworkId($state->getStateId());
+		}
 	}
 }
diff --git a/tests/phpunit/plugin/ApiVersionTest.php b/tests/phpunit/plugin/ApiVersionTest.php
index c068f25ceb..faa68200de 100644
--- a/tests/phpunit/plugin/ApiVersionTest.php
+++ b/tests/phpunit/plugin/ApiVersionTest.php
@@ -32,7 +32,7 @@ class ApiVersionTest extends TestCase{
 	 * @return \Generator|mixed[][]
 	 * @phpstan-return \Generator<int, array{string, string, bool}, void, void>
 	 */
-	public function compatibleApiProvider() : \Generator{
+	public static function compatibleApiProvider() : \Generator{
 		yield ["3.0.0", "3.0.0", true];
 		yield ["3.1.0", "3.0.0", true];
 		yield ["3.0.0", "3.1.0", false];
@@ -58,7 +58,7 @@ class ApiVersionTest extends TestCase{
 	 * @return mixed[][][]
 	 * @phpstan-return \Generator<int, array{list<string>, list<string>}, void, void>
 	 */
-	public function ambiguousVersionsProvider() : \Generator{
+	public static function ambiguousVersionsProvider() : \Generator{
 		yield [["3.0.0"], []];
 		yield [["3.0.0", "3.0.1"], ["3.0.0", "3.0.1"]];
 		yield [["3.0.0", "3.1.0", "4.0.0"], ["3.0.0", "3.1.0"]];
diff --git a/tests/phpunit/promise/PromiseTest.php b/tests/phpunit/promise/PromiseTest.php
new file mode 100644
index 0000000000..682ee00703
--- /dev/null
+++ b/tests/phpunit/promise/PromiseTest.php
@@ -0,0 +1,148 @@
+<?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\promise;
+
+use PHPUnit\Framework\TestCase;
+
+final class PromiseTest extends TestCase{
+
+	public function testPromiseNull() : void{
+		$resolver = new PromiseResolver();
+		$resolver->resolve(null);
+		$resolver->getPromise()->onCompletion(
+			function(mixed $value) : void{
+				self::assertNull($value);
+			},
+			function() : void{
+				self::fail("Promise should not be rejected");
+			}
+		);
+	}
+
+	public function testAllPreResolved() : void{
+		$resolver = new PromiseResolver();
+		$resolver->resolve(1);
+
+		$allPromise = Promise::all([$resolver->getPromise()]);
+		$done = false;
+		$allPromise->onCompletion(
+			function($value) use (&$done) : void{
+				$done = true;
+				self::assertEquals([1], $value);
+			},
+			function() use (&$done) : void{
+				$done = true;
+				self::fail("Promise was rejected");
+			}
+		);
+		self::assertTrue($done);
+	}
+
+	public function testAllPostResolved() : void{
+		$resolver = new PromiseResolver();
+
+		$allPromise = Promise::all([$resolver->getPromise()]);
+		$done = false;
+		$allPromise->onCompletion(
+			function($value) use (&$done) : void{
+				$done = true;
+				self::assertEquals([1], $value);
+			},
+			function() use (&$done) : void{
+				$done = true;
+				self::fail("Promise was rejected");
+			}
+		);
+		self::assertFalse($done);
+		$resolver->resolve(1);
+		self::assertTrue($done);
+	}
+
+	public function testAllResolve() : void{
+		$resolver1 = new PromiseResolver();
+		$resolver2 = new PromiseResolver();
+
+		$allPromise = Promise::all([$resolver1->getPromise(), $resolver2->getPromise()]);
+		$done = false;
+		$allPromise->onCompletion(
+			function($value) use (&$done) : void{
+				$done = true;
+				self::assertEquals([1, 2], $value);
+			},
+			function() use (&$done) : void{
+				$done = true;
+				self::fail("Promise was rejected");
+			}
+		);
+		self::assertFalse($done);
+		$resolver1->resolve(1);
+		self::assertFalse($done);
+		$resolver2->resolve(2);
+		self::assertTrue($done);
+	}
+
+	public function testAllPartialReject() : void{
+		$resolver1 = new PromiseResolver();
+		$resolver2 = new PromiseResolver();
+
+		$allPromise = Promise::all([$resolver1->getPromise(), $resolver2->getPromise()]);
+		$done = false;
+		$allPromise->onCompletion(
+			function($value) use (&$done) : void{
+				$done = true;
+				self::fail("Promise was unexpectedly resolved");
+			},
+			function() use (&$done) : void{
+				$done = true;
+			}
+		);
+		self::assertFalse($done);
+		$resolver2->reject();
+		self::assertTrue($done, "All promise should be rejected immediately after the first constituent rejection");
+		$resolver1->resolve(1);
+	}
+
+	/**
+	 * Promise::all() should return a rejected promise if any of the input promises were rejected at the call time
+	 */
+	public function testAllPartialPreReject() : void{
+		$resolver1 = new PromiseResolver();
+		$resolver2 = new PromiseResolver();
+		$resolver2->reject();
+
+		$allPromise = Promise::all([$resolver1->getPromise(), $resolver2->getPromise()]);
+		$done = false;
+		$allPromise->onCompletion(
+			function($value) use (&$done) : void{
+				$done = true;
+				self::fail("Promise was unexpectedly resolved");
+			},
+			function() use (&$done) : void{
+				$done = true;
+			}
+		);
+		self::assertTrue($done, "All promise should be rejected immediately after the first constituent rejection");
+		$resolver1->resolve(1);
+	}
+}
diff --git a/tests/phpunit/scheduler/AsyncPoolTest.php b/tests/phpunit/scheduler/AsyncPoolTest.php
index 9a61c33ffb..53ec15c12b 100644
--- a/tests/phpunit/scheduler/AsyncPoolTest.php
+++ b/tests/phpunit/scheduler/AsyncPoolTest.php
@@ -24,13 +24,14 @@ declare(strict_types=1);
 namespace pocketmine\scheduler;
 
 use PHPUnit\Framework\TestCase;
+use pmmp\thread\ThreadSafeArray;
+use pocketmine\promise\PromiseResolver;
 use pocketmine\snooze\SleeperHandler;
+use pocketmine\thread\ThreadSafeClassLoader;
 use pocketmine\utils\MainLogger;
 use function define;
 use function dirname;
 use function microtime;
-use function sys_get_temp_dir;
-use function tempnam;
 use function usleep;
 
 class AsyncPoolTest extends TestCase{
@@ -42,13 +43,12 @@ class AsyncPoolTest extends TestCase{
 
 	public function setUp() : void{
 		@define('pocketmine\\COMPOSER_AUTOLOADER_PATH', dirname(__DIR__, 3) . '/vendor/autoload.php');
-		$this->mainLogger = new MainLogger(tempnam(sys_get_temp_dir(), "pmlog"), false, "Main", new \DateTimeZone('UTC'));
-		$this->pool = new AsyncPool(2, 1024, new \BaseClassLoader(), $this->mainLogger, new SleeperHandler());
+		$this->mainLogger = new MainLogger(null, false, "Main", new \DateTimeZone('UTC'));
+		$this->pool = new AsyncPool(2, 1024, new ThreadSafeClassLoader(), $this->mainLogger, new SleeperHandler());
 	}
 
 	public function tearDown() : void{
 		$this->pool->shutdown();
-		$this->mainLogger->shutdownLogWriterThread();
 	}
 
 	public function testTaskLeak() : void{
@@ -69,4 +69,72 @@ class AsyncPoolTest extends TestCase{
 		}
 		self::assertTrue(PublishProgressRaceAsyncTask::$success, "Progress was not reported before task completion");
 	}
+
+	public function testThreadSafeSetResult() : void{
+		$resolver = new PromiseResolver();
+		$resolver->getPromise()->onCompletion(
+			function(ThreadSafeArray $result) : void{
+				self::assertCount(1, $result);
+				self::assertSame(["foo"], (array) $result);
+			},
+			function() : void{
+				self::fail("Promise failed");
+			}
+		);
+		$this->pool->submitTask(new ThreadSafeResultAsyncTask($resolver));
+		while($this->pool->collectTasks()){
+			usleep(50 * 1000);
+		}
+	}
+
+	/**
+	 * This test ensures that the fix for an exotic AsyncTask::__destruct() reentrancy bug has not regressed.
+	 *
+	 * Due to an unset() in the function body, other AsyncTask::__destruct() calls could be triggered during
+	 * an AsyncTask's destruction. If done in the wrong way, this could lead to a crash.
+	 *
+	 * @doesNotPerformAssertions This test is checking for a crash condition, not a specific output.
+	 */
+	public function testTaskDestructorReentrancy() : void{
+		$this->pool->submitTask(new class extends AsyncTask{
+			public function __construct(){
+				$this->storeLocal("task", new class extends AsyncTask{
+
+					public function __construct(){
+						$this->storeLocal("dummy", 1);
+					}
+
+					public function onRun() : void{
+						//dummy
+					}
+				});
+			}
+
+			public function onRun() : void{
+				//dummy
+			}
+		});
+		while($this->pool->collectTasks()){
+			usleep(50 * 1000);
+		}
+	}
+
+	public function testNullComplexDataFetch() : void{
+		$this->pool->submitTask(new class extends AsyncTask{
+			public function __construct(){
+				$this->storeLocal("null", null);
+			}
+
+			public function onRun() : void{
+				//dummy
+			}
+
+			public function onCompletion() : void{
+				AsyncPoolTest::assertNull($this->fetchLocal("null"));
+			}
+		});
+		while($this->pool->collectTasks()){
+			usleep(50 * 1000);
+		}
+	}
 }
diff --git a/tests/phpunit/scheduler/ThreadSafeResultAsyncTask.php b/tests/phpunit/scheduler/ThreadSafeResultAsyncTask.php
new file mode 100644
index 0000000000..791d36d751
--- /dev/null
+++ b/tests/phpunit/scheduler/ThreadSafeResultAsyncTask.php
@@ -0,0 +1,56 @@
+<?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\scheduler;
+
+use pmmp\thread\ThreadSafeArray;
+use pocketmine\promise\PromiseResolver;
+
+class ThreadSafeResultAsyncTask extends AsyncTask{
+	private const TLS_KEY_PROMISE = "promise";
+
+	/**
+	 * @phpstan-param PromiseResolver<ThreadSafeArray<array-key, mixed>> $promise
+	 */
+	public function __construct(
+		PromiseResolver $promise
+	){
+		$this->storeLocal(self::TLS_KEY_PROMISE, $promise);
+	}
+
+	public function onRun() : void{
+		//this only works in pthreads 5.1+ and pmmpthread
+		//in prior versions the ThreadSafe would be destroyed before onCompletion is called
+		$result = new ThreadSafeArray();
+		$result[] = "foo";
+		$this->setResult($result);
+	}
+
+	public function onCompletion() : void{
+		/** @var PromiseResolver<ThreadSafeArray<array-key, mixed>> $promise */
+		$promise = $this->fetchLocal(self::TLS_KEY_PROMISE);
+		/** @var ThreadSafeArray<array-key, mixed> $result */
+		$result = $this->getResult();
+		$promise->resolve($result);
+	}
+}
diff --git a/tests/phpunit/utils/CloningRegistryTraitTest.php b/tests/phpunit/utils/CloningRegistryTraitTest.php
index 2cf10bed12..e3b53ecb56 100644
--- a/tests/phpunit/utils/CloningRegistryTraitTest.php
+++ b/tests/phpunit/utils/CloningRegistryTraitTest.php
@@ -30,7 +30,7 @@ final class CloningRegistryTraitTest extends TestCase{
 	/**
 	 * @phpstan-return \Generator<int, array{\Closure() : \stdClass}, void, void>
 	 */
-	public function cloningRegistryMembersProvider() : \Generator{
+	public static function cloningRegistryMembersProvider() : \Generator{
 		yield [function() : \stdClass{ return TestCloningRegistry::TEST1(); }];
 		yield [function() : \stdClass{ return TestCloningRegistry::TEST2(); }];
 		yield [function() : \stdClass{ return TestCloningRegistry::TEST3(); }];
@@ -47,7 +47,7 @@ final class CloningRegistryTraitTest extends TestCase{
 	public function testGetAllClone() : void{
 		$list1 = TestCloningRegistry::getAll();
 		$list2 = TestCloningRegistry::getAll();
-		foreach($list1 as $k => $member){
+		foreach(Utils::promoteKeys($list1) as $k => $member){
 			self::assertNotSame($member, $list2[$k], "VanillaBlocks ought to clone its members");
 		}
 	}
diff --git a/tests/phpunit/utils/ConfigTest.php b/tests/phpunit/utils/ConfigTest.php
index 76b1a4b719..55b4bc2d49 100644
--- a/tests/phpunit/utils/ConfigTest.php
+++ b/tests/phpunit/utils/ConfigTest.php
@@ -32,7 +32,7 @@ class ConfigTest extends TestCase{
 	 * @return \Generator|mixed[][]
 	 * @phpstan-return \Generator<int, array{string, mixed[]}, void, void>
 	 */
-	public function fixYamlIndexesProvider() : \Generator{
+	public static function fixYamlIndexesProvider() : \Generator{
 		yield ["x: 1\ny: 2\nz: 3\n", [
 			"x" => 1,
 			"y" => 2,
diff --git a/tests/phpunit/utils/TestCloningRegistry.php b/tests/phpunit/utils/TestCloningRegistry.php
index ade94d461a..d65b8abaac 100644
--- a/tests/phpunit/utils/TestCloningRegistry.php
+++ b/tests/phpunit/utils/TestCloningRegistry.php
@@ -37,9 +37,13 @@ final class TestCloningRegistry{
 
 	/**
 	 * @return \stdClass[]
+	 * @phpstan-return array<string, \stdClass>
 	 */
 	public static function getAll() : array{
-		/** @var \stdClass[] $result */
+		/**
+		 * @var \stdClass[] $result
+		 * @phpstan-var array<string, \stdClass> $result
+		 */
 		$result = self::_registryGetAll();
 		return $result;
 	}
diff --git a/tests/phpunit/utils/UtilsTest.php b/tests/phpunit/utils/UtilsTest.php
index ab93d73c35..f061abac27 100644
--- a/tests/phpunit/utils/UtilsTest.php
+++ b/tests/phpunit/utils/UtilsTest.php
@@ -44,7 +44,7 @@ class UtilsTest extends TestCase{
 	 * @return string[][]
 	 * @phpstan-return list<array{string}>
 	 */
-	public function parseDocCommentNewlineProvider() : array{
+	public static function parseDocCommentNewlineProvider() : array{
 		return [
 			["\t/**\r\n\t * @param PlayerJoinEvent \$event\r\n\t * @priority HIGHEST\r\n\t * @notHandler\r\n\t */"],
 			["\t/**\n\t * @param PlayerJoinEvent \$event\n\t * @priority HIGHEST\n\t * @notHandler\n\t */"],
@@ -68,7 +68,7 @@ class UtilsTest extends TestCase{
 	 * @return string[][]
 	 * @phpstan-return list<array{string}>
 	 */
-	public function parseDocCommentOneLineProvider() : array{
+	public static function parseDocCommentOneLineProvider() : array{
 		return [
 			["/** @ignoreCancelled true dummy */"],
 			["/**@ignoreCancelled true dummy*/"],
@@ -105,7 +105,7 @@ class UtilsTest extends TestCase{
 	 * @return string[][]
 	 * @return list<array{class-string, class-string}>
 	 */
-	public function validInstanceProvider() : array{
+	public static function validInstanceProvider() : array{
 		return [
 			//direct instance / implement / extend
 			[TestInstantiableClass::class, TestInstantiableClass::class],
@@ -133,7 +133,7 @@ class UtilsTest extends TestCase{
 	 * @return string[][]
 	 * @return list<array{string, string}>
 	 */
-	public function validInstanceInvalidCombinationsProvider() : array{
+	public static function validInstanceInvalidCombinationsProvider() : array{
 		return [
 			["iDontExist abc", TestInstantiableClass::class],
 			[TestInstantiableClass::class, "iDon'tExist abc"],
diff --git a/tests/phpunit/world/format/ChunkTest.php b/tests/phpunit/world/format/ChunkTest.php
index b285a63085..d612ce9d29 100644
--- a/tests/phpunit/world/format/ChunkTest.php
+++ b/tests/phpunit/world/format/ChunkTest.php
@@ -24,23 +24,22 @@ declare(strict_types=1);
 namespace pocketmine\world\format;
 
 use PHPUnit\Framework\TestCase;
-use pocketmine\data\bedrock\BiomeIds;
 
 class ChunkTest extends TestCase{
 
 	public function testClone() : void{
-		$chunk = new Chunk([], BiomeArray::fill(BiomeIds::OCEAN), false);
-		$chunk->setFullBlock(0, 0, 0, 1);
-		$chunk->setBiomeId(0, 0, 1);
+		$chunk = new Chunk([], false);
+		$chunk->setBlockStateId(0, 0, 0, 1);
+		$chunk->setBiomeId(0, 0, 0, 1);
 		$chunk->setHeightMap(0, 0, 1);
 
 		$chunk2 = clone $chunk;
-		$chunk2->setFullBlock(0, 0, 0, 2);
-		$chunk2->setBiomeId(0, 0, 2);
+		$chunk2->setBlockStateId(0, 0, 0, 2);
+		$chunk2->setBiomeId(0, 0, 0, 2);
 		$chunk2->setHeightMap(0, 0, 2);
 
-		self::assertNotSame($chunk->getFullBlock(0, 0, 0), $chunk2->getFullBlock(0, 0, 0));
-		self::assertNotSame($chunk->getBiomeId(0, 0), $chunk2->getBiomeId(0, 0));
+		self::assertNotSame($chunk->getBlockStateId(0, 0, 0), $chunk2->getBlockStateId(0, 0, 0));
+		self::assertNotSame($chunk->getBiomeId(0, 0, 0), $chunk2->getBiomeId(0, 0, 0));
 		self::assertNotSame($chunk->getHeightMap(0, 0), $chunk2->getHeightMap(0, 0));
 	}
 }
diff --git a/tests/phpunit/world/format/SubChunkTest.php b/tests/phpunit/world/format/SubChunkTest.php
index 4f33a45fc0..cdb440147f 100644
--- a/tests/phpunit/world/format/SubChunkTest.php
+++ b/tests/phpunit/world/format/SubChunkTest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\world\format;
 
 use PHPUnit\Framework\TestCase;
+use pocketmine\data\bedrock\BiomeIds;
 
 class SubChunkTest extends TestCase{
 
@@ -31,19 +32,19 @@ class SubChunkTest extends TestCase{
 	 * Test that a cloned SubChunk instance doesn't influence the original
 	 */
 	public function testClone() : void{
-		$sub1 = new SubChunk(0, []);
+		$sub1 = new SubChunk(0, [], new PalettedBlockArray(BiomeIds::OCEAN));
 
-		$sub1->setFullBlock(0, 0, 0, 1);
+		$sub1->setBlockStateId(0, 0, 0, 1);
 		$sub1->getBlockLightArray()->set(0, 0, 0, 1);
 		$sub1->getBlockSkyLightArray()->set(0, 0, 0, 1);
 
 		$sub2 = clone $sub1;
 
-		$sub2->setFullBlock(0, 0, 0, 2);
+		$sub2->setBlockStateId(0, 0, 0, 2);
 		$sub2->getBlockLightArray()->set(0, 0, 0, 2);
 		$sub2->getBlockSkyLightArray()->set(0, 0, 0, 2);
 
-		self::assertNotSame($sub1->getFullBlock(0, 0, 0), $sub2->getFullBlock(0, 0, 0));
+		self::assertNotSame($sub1->getBlockStateId(0, 0, 0), $sub2->getBlockStateId(0, 0, 0));
 		self::assertNotSame($sub1->getBlockLightArray()->get(0, 0, 0), $sub2->getBlockLightArray()->get(0, 0, 0));
 		self::assertNotSame($sub1->getBlockSkyLightArray()->get(0, 0, 0), $sub2->getBlockSkyLightArray()->get(0, 0, 0));
 	}
diff --git a/tests/phpunit/world/format/io/region/RegionLoaderTest.php b/tests/phpunit/world/format/io/region/RegionLoaderTest.php
index e4db900727..ee96b6bc05 100644
--- a/tests/phpunit/world/format/io/region/RegionLoaderTest.php
+++ b/tests/phpunit/world/format/io/region/RegionLoaderTest.php
@@ -74,7 +74,7 @@ class RegionLoaderTest extends TestCase{
 	 * @return \Generator|int[][]
 	 * @phpstan-return \Generator<int, array{int,int}, void, void>
 	 */
-	public function outOfBoundsCoordsProvider() : \Generator{
+	public static function outOfBoundsCoordsProvider() : \Generator{
 		yield [-1, -1];
 		yield [32, 32];
 		yield [-1, 32];
diff --git a/tests/phpunit/world/format/io/region/RegionLocationTableEntryTest.php b/tests/phpunit/world/format/io/region/RegionLocationTableEntryTest.php
index 597af06d3a..498e2767e3 100644
--- a/tests/phpunit/world/format/io/region/RegionLocationTableEntryTest.php
+++ b/tests/phpunit/world/format/io/region/RegionLocationTableEntryTest.php
@@ -31,7 +31,7 @@ class RegionLocationTableEntryTest extends TestCase{
 	/**
 	 * @phpstan-return \Generator<int, array{RegionLocationTableEntry, RegionLocationTableEntry, bool}, void, void>
 	 */
-	public function overlapDataProvider() : \Generator{
+	public static function overlapDataProvider() : \Generator{
 		yield [new RegionLocationTableEntry(2, 1, 0), new RegionLocationTableEntry(2, 1, 0), true];
 		yield [new RegionLocationTableEntry(2, 1, 0), new RegionLocationTableEntry(3, 1, 0), false];
 		yield [new RegionLocationTableEntry(2, 2, 0), new RegionLocationTableEntry(3, 2, 0), true];
diff --git a/tests/plugins/DevTools b/tests/plugins/DevTools
index 95921c6d87..c6dca357c7 160000
--- a/tests/plugins/DevTools
+++ b/tests/plugins/DevTools
@@ -1 +1 @@
-Subproject commit 95921c6d877cbe07921a20bcca436db76b0d8bda
+Subproject commit c6dca357c7e8a37ce3479a1bedfe849451e072e3
diff --git a/tests/plugins/TesterPlugin/plugin.yml b/tests/plugins/TesterPlugin/plugin.yml
index dc00d97c79..5d18dff760 100644
--- a/tests/plugins/TesterPlugin/plugin.yml
+++ b/tests/plugins/TesterPlugin/plugin.yml
@@ -2,7 +2,7 @@ name: TesterPlugin
 main: pmmp\TesterPlugin\Main
 src-namespace-prefix: pmmp\TesterPlugin
 version: 0.1.0
-api: [3.2.0, 4.0.0]
+api: [5.0.0]
 load: POSTWORLD
 author: pmmp
 description: Plugin used to run tests on PocketMine-MP
diff --git a/tests/plugins/TesterPlugin/src/Main.php b/tests/plugins/TesterPlugin/src/Main.php
index 2afd9d6aea..08b59dbacb 100644
--- a/tests/plugins/TesterPlugin/src/Main.php
+++ b/tests/plugins/TesterPlugin/src/Main.php
@@ -56,7 +56,9 @@ class Main extends PluginBase implements Listener{
 			}
 		}), 10);
 
-		$this->waitingTests = [];
+		$this->waitingTests = [
+			//Add test objects here
+		];
 	}
 
 	public function onServerCommand(CommandEvent $event) : void{
diff --git a/tests/travis.sh b/tests/travis.sh
index 094f659053..a4674fb6f2 100755
--- a/tests/travis.sh
+++ b/tests/travis.sh
@@ -7,6 +7,9 @@ while getopts "t:" OPTION 2> /dev/null; do
 		t)
 			PM_WORKERS="$OPTARG"
 			;;
+		\?)
+			break
+			;;
 	esac
 done
 
@@ -19,7 +22,7 @@ rm PocketMine-MP.phar 2> /dev/null
 mkdir "$DATA_DIR"
 mkdir "$PLUGINS_DIR"
 
-cd tests/plugins/DevTools
+cd tests/plugins/DevTools || { echo "Couldn't change directory to $DIR"; exit 1; }
 php -dphar.readonly=0 ./src/ConsoleScript.php --make ./ --relative ./ --out "$PLUGINS_DIR/DevTools.phar"
 cd ../../..
 composer make-server
@@ -45,7 +48,7 @@ if [ "$result" != "" ]; then
 	echo "$result"
 	echo Some tests did not complete successfully, changing build status to failed
 	exit 1
-elif [ $(grep -c "ERROR\|CRITICAL\|EMERGENCY" "$DATA_DIR/server.log") -ne 0 ]; then
+elif [ "$(grep -c "ERROR\|CRITICAL\|EMERGENCY" "$DATA_DIR/server.log")" -ne 0 ]; then
 	echo Server log contains error messages, changing build status to failed
 	exit 1
 else
diff --git a/tools/blockstate-upgrade-schema-utils.php b/tools/blockstate-upgrade-schema-utils.php
new file mode 100644
index 0000000000..b7a9a4169d
--- /dev/null
+++ b/tools/blockstate-upgrade-schema-utils.php
@@ -0,0 +1,913 @@
+<?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\tools\blockstate_upgrade_schema_utils;
+
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\data\bedrock\block\upgrade\BlockStateUpgrader;
+use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchema;
+use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaBlockRemap;
+use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaFlattenInfo;
+use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaUtils;
+use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaValueRemap;
+use pocketmine\nbt\LittleEndianNbtSerializer;
+use pocketmine\nbt\tag\ByteTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\StringTag;
+use pocketmine\nbt\tag\Tag;
+use pocketmine\nbt\TreeRoot;
+use pocketmine\network\mcpe\convert\BlockStateDictionary;
+use pocketmine\network\mcpe\protocol\serializer\NetworkNbtSerializer;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Filesystem;
+use pocketmine\utils\Utils;
+use Symfony\Component\Filesystem\Path;
+use function array_key_first;
+use function array_key_last;
+use function array_keys;
+use function array_map;
+use function array_shift;
+use function array_unique;
+use function array_values;
+use function count;
+use function dirname;
+use function file_exists;
+use function file_put_contents;
+use function fwrite;
+use function get_class;
+use function get_debug_type;
+use function implode;
+use function is_dir;
+use function is_numeric;
+use function json_encode;
+use function ksort;
+use function min;
+use function preg_match;
+use function scandir;
+use function sort;
+use function strlen;
+use function strrev;
+use function substr;
+use function usort;
+use const JSON_PRETTY_PRINT;
+use const SORT_STRING;
+use const STDERR;
+
+require_once dirname(__DIR__) . '/vendor/autoload.php';
+
+class BlockStateMapping{
+	public function __construct(
+		public BlockStateData $old,
+		public BlockStateData $new
+	){}
+}
+
+/**
+ * @param Tag[] $properties
+ * @phpstan-param array<string, Tag> $properties
+ */
+function encodeOrderedProperties(array $properties) : string{
+	ksort($properties, SORT_STRING);
+	return implode("", array_map(fn(Tag $tag) => encodeProperty($tag), array_values($properties)));
+}
+
+function encodeProperty(Tag $tag) : string{
+	return (new LittleEndianNbtSerializer())->write(new TreeRoot($tag));
+}
+
+/**
+ * @param TreeRoot[] $oldNewStateList
+ * @phpstan-param list<TreeRoot> $oldNewStateList
+ *
+ * @return BlockStateMapping[][]
+ * @phpstan-return array<string, array<string, BlockStateMapping>>
+ */
+function buildUpgradeTableFromData(array $oldNewStateList, bool $reverse) : array{
+	$result = [];
+
+	for($i = 0; isset($oldNewStateList[$i]); $i += 2){
+		$oldTag = $oldNewStateList[$i]->mustGetCompoundTag();
+		$newTag = $oldNewStateList[$i + 1]->mustGetCompoundTag();
+		$old = BlockStateData::fromNbt($reverse ? $newTag : $oldTag);
+		$new = BlockStateData::fromNbt($reverse ? $oldTag : $newTag);
+
+		$result[$old->getName()][encodeOrderedProperties($old->getStates())] = new BlockStateMapping(
+			$old,
+			$new
+		);
+	}
+
+	return $result;
+}
+
+/**
+ * @return BlockStateMapping[][]
+ * @phpstan-return array<string, array<string, BlockStateMapping>>
+ */
+function loadUpgradeTableFromFile(string $file, bool $reverse) : array{
+	$contents = Filesystem::fileGetContents($file);
+	$data = (new NetworkNbtSerializer())->readMultiple($contents);
+
+	return buildUpgradeTableFromData($data, $reverse);
+}
+
+/**
+ * @param BlockStateData[] $states
+ * @phpstan-param array<string, BlockStateData> $states
+ *
+ * @return Tag[][]
+ * @phpstan-return array<string, array<string, Tag>>
+ */
+function buildStateGroupSchema(array $states) : ?array{
+	$first = $states[array_key_first($states)];
+
+	$properties = [];
+	foreach(Utils::stringifyKeys($first->getStates()) as $propertyName => $propertyValue){
+		$properties[$propertyName][encodeProperty($propertyValue)] = $propertyValue;
+	}
+	foreach($states as $state){
+		if(count($state->getStates()) !== count($properties)){
+			return null;
+		}
+		foreach(Utils::stringifyKeys($state->getStates()) as $propertyName => $propertyValue){
+			if(!isset($properties[$propertyName])){
+				return null;
+			}
+			$properties[$propertyName][encodeProperty($propertyValue)] = $propertyValue;
+		}
+	}
+
+	return $properties;
+}
+
+/**
+ * @param BlockStateMapping[] $upgradeTable
+ * @phpstan-param array<string, BlockStateMapping> $upgradeTable
+ */
+function processStateGroup(string $oldName, array $upgradeTable, BlockStateUpgradeSchema $result) : bool{
+	$newProperties = buildStateGroupSchema(array_map(fn(BlockStateMapping $m) => $m->new, $upgradeTable));
+	if($newProperties === null){
+		\GlobalLogger::get()->warning("New states for $oldName don't all have the same set of properties - processing as remaps instead");
+		return false;
+	}
+	$oldProperties = buildStateGroupSchema(array_map(fn(BlockStateMapping $m) => $m->old, $upgradeTable));
+	if($oldProperties === null){
+		//TODO: not sure if this is actually required - we may be able to apply some transformations even if the states are not consistent
+		//however, this should never normally occur anyway
+		\GlobalLogger::get()->warning("Old states for $oldName don't all have the same set of properties - processing as remaps instead");
+		return false;
+	}
+
+	$remappedPropertyValues = [];
+	$addedProperties = [];
+	$removedProperties = [];
+	$renamedProperties = [];
+
+	$uniqueNewIds = [];
+	foreach($upgradeTable as $pair){
+		$uniqueNewIds[$pair->new->getName()] = $pair->new->getName();
+	}
+
+	foreach(Utils::stringifyKeys($newProperties) as $newPropertyName => $newPropertyValues){
+		if(count($newPropertyValues) === 1){
+			$newPropertyValue = $newPropertyValues[array_key_first($newPropertyValues)];
+			if(isset($oldProperties[$newPropertyName])){
+				//all the old values for this property were mapped to the same new value
+				//it would be more space-efficient to represent this as a remove+add, but we can't guarantee that the
+				//removal of the old value will be done before the addition of the new value
+				foreach($oldProperties[$newPropertyName] as $oldPropertyValue){
+					$remappedPropertyValues[$newPropertyName][encodeProperty($oldPropertyValue)] = $newPropertyValue;
+				}
+			}else{
+				//this property has no relation to any property value in any of the old states - it's a new property
+				$addedProperties[$newPropertyName] = $newPropertyValue;
+			}
+		}
+	}
+
+	foreach(Utils::stringifyKeys($oldProperties) as $oldPropertyName => $oldPropertyValues){
+		$mappingsContainingOldValue = [];
+		foreach($upgradeTable as $mapping){
+			$mappingOldValue = $mapping->old->getState($oldPropertyName) ?? throw new AssumptionFailedError("This should never happen");
+			foreach($oldPropertyValues as $oldPropertyValue){
+				if($mappingOldValue->equals($oldPropertyValue)){
+					$mappingsContainingOldValue[encodeProperty($oldPropertyValue)][] = $mapping;
+					break;
+				}
+			}
+		}
+
+		$candidateNewPropertyNames = [];
+		//foreach mappings by unique value, compute the diff across all the states in the list
+		foreach(Utils::stringifyKeys($mappingsContainingOldValue) as $rawOldValue => $mappingList){
+			$first = array_shift($mappingList);
+			foreach(Utils::stringifyKeys($first->new->getStates()) as $newPropertyName => $newPropertyValue){
+				if(isset($addedProperties[$newPropertyName])){
+					//this property was already determined to be unrelated to any old property
+					continue;
+				}
+				foreach($mappingList as $pair){
+					if(!($pair->new->getState($newPropertyName)?->equals($newPropertyValue) ?? false)){
+						//if the new property is different with an unchanged old value,
+						//the property may be influenced by multiple old properties, or be unrelated entirely
+						continue 2;
+					}
+				}
+				$candidateNewPropertyNames[$newPropertyName][$rawOldValue] = $newPropertyValue;
+			}
+		}
+
+		if(count($candidateNewPropertyNames) === 0){
+			$removedProperties[$oldPropertyName] = $oldPropertyName;
+		}elseif(count($candidateNewPropertyNames) === 1){
+			$newPropertyName = array_key_first($candidateNewPropertyNames);
+			$newPropertyValues = $candidateNewPropertyNames[$newPropertyName];
+
+			if($oldPropertyName !== $newPropertyName){
+				$renamedProperties[$oldPropertyName] = $newPropertyName;
+			}
+
+			foreach(Utils::stringifyKeys($newPropertyValues) as $rawOldValue => $newPropertyValue){
+				if(!$newPropertyValue->equals($oldPropertyValues[$rawOldValue])){
+					$remappedPropertyValues[$oldPropertyName][$rawOldValue] = $newPropertyValue;
+				}
+			}
+		}else{
+			$split = true;
+			if(isset($candidateNewPropertyNames[$oldPropertyName])){
+				//In 1.10, direction wasn't changed at all, but not all state permutations were present in the palette,
+				//making it appear that door_hinge_bit was correlated with direction.
+				//If a new property is present with the same name and values as an old property, we can assume that
+				//the property was unchanged, and that any extra matches properties are probably unrelated.
+				$changedValues = false;
+				foreach(Utils::stringifyKeys($candidateNewPropertyNames[$oldPropertyName]) as $rawOldValue => $newPropertyValue){
+					if(!$newPropertyValue->equals($oldPropertyValues[$rawOldValue])){
+						//if any of the new values are different, we may be dealing with a property being split into
+						//multiple new properties - hand this off to the remap handler
+						$changedValues = true;
+						break;
+					}
+				}
+				if(!$changedValues){
+					$split = false;
+				}
+			}
+			if($split){
+				\GlobalLogger::get()->warning(
+					"Multiple new properties (" . (implode(", ", array_keys($candidateNewPropertyNames))) . ") are correlated with $oldName property $oldPropertyName, processing as remaps instead"
+				);
+				return false;
+			}else{
+				//is it safe to ignore the rest?
+			}
+		}
+	}
+
+	if(count($uniqueNewIds) > 1){
+		//detect possible flattening
+		$flattenedProperty = null;
+		$flattenedPropertyType = null;
+		$flattenedPropertyMap = [];
+		foreach($removedProperties as $removedProperty){
+			$valueMap = [];
+			foreach($upgradeTable as $pair){
+				$oldValue = $pair->old->getState($removedProperty);
+				if($oldValue === null){
+					throw new AssumptionFailedError("We already checked that all states had consistent old properties");
+				}
+				if(!checkFlattenPropertySuitability($oldValue, $flattenedPropertyType, $pair->new->getName(), $valueMap)){
+					continue 2;
+				}
+			}
+
+			if($flattenedProperty !== null){
+				//found multiple candidates for flattening - fallback to remappedStates
+				return false;
+			}
+			//we found a suitable candidate
+			$flattenedProperty = $removedProperty;
+			$flattenedPropertyMap = $valueMap;
+			break;
+		}
+
+		if($flattenedProperty === null){
+			//can't figure out how the new IDs are related to the old states - fallback to remappedStates
+			return false;
+		}
+		if($flattenedPropertyType === null){
+			throw new AssumptionFailedError("This should never happen at this point");
+		}
+
+		$result->flattenedProperties[$oldName] = buildFlattenPropertyRule($flattenedPropertyMap, $flattenedProperty, $flattenedPropertyType);
+		unset($removedProperties[$flattenedProperty]);
+	}
+
+	//finally, write the results to the schema
+
+	if(count($remappedPropertyValues) !== 0){
+		foreach(Utils::stringifyKeys($remappedPropertyValues) as $oldPropertyName => $propertyValues){
+			foreach(Utils::stringifyKeys($propertyValues) as $rawOldValue => $newPropertyValue){
+				$oldPropertyValue = $oldProperties[$oldPropertyName][$rawOldValue];
+				$result->remappedPropertyValues[$oldName][$oldPropertyName][] = new BlockStateUpgradeSchemaValueRemap(
+					$oldPropertyValue,
+					$newPropertyValue
+				);
+			}
+		}
+	}
+	if(count($addedProperties) !== 0){
+		$result->addedProperties[$oldName] = $addedProperties;
+	}
+	if(count($removedProperties) !== 0){
+		$result->removedProperties[$oldName] = array_values($removedProperties);
+	}
+	if(count($renamedProperties) !== 0){
+		$result->renamedProperties[$oldName] = $renamedProperties;
+	}
+
+	return true;
+}
+
+/**
+ * @param string[] $strings
+ */
+function findCommonPrefix(array $strings) : string{
+	sort($strings, SORT_STRING);
+
+	$first = $strings[array_key_first($strings)];
+	$last = $strings[array_key_last($strings)];
+
+	$maxLength = min(strlen($first), strlen($last));
+	for($i = 0; $i < $maxLength; ++$i){
+		if($first[$i] !== $last[$i]){
+			return substr($first, 0, $i);
+		}
+	}
+
+	return substr($first, 0, $maxLength);
+}
+
+/**
+ * @param string[] $strings
+ */
+function findCommonSuffix(array $strings) : string{
+	$reversed = array_map(strrev(...), $strings);
+
+	return strrev(findCommonPrefix($reversed));
+}
+
+/**
+ * @param string[] $valueToIdMap
+ * @phpstan-param ?class-string<ByteTag|IntTag|StringTag> $expectedType
+ * @phpstan-param-out class-string<ByteTag|IntTag|StringTag> $expectedType
+ * @phpstan-param array<string, string> $valueToIdMap
+ * @phpstan-param-out array<string, string> $valueToIdMap
+ */
+function checkFlattenPropertySuitability(Tag $oldValue, ?string &$expectedType, string $actualNewId, array &$valueToIdMap) : bool{
+	//TODO: lots of similar logic to the remappedStates builder below
+	if(!$oldValue instanceof ByteTag && !$oldValue instanceof IntTag && !$oldValue instanceof StringTag){
+		//unknown property type - bad candidate for flattening
+		return false;
+	}
+	if($expectedType === null){
+		$expectedType = get_class($oldValue);
+	}elseif(!$oldValue instanceof $expectedType){
+		//property type mismatch - bad candidate for flattening
+		return false;
+	}
+
+	$rawValue = (string) $oldValue->getValue();
+	$existingNewId = $valueToIdMap[$rawValue] ?? null;
+	if($existingNewId !== null && $existingNewId !== $actualNewId){
+		//this property value is associated with multiple new IDs - bad candidate for flattening
+		return false;
+	}
+	$valueToIdMap[$rawValue] = $actualNewId;
+
+	return true;
+}
+
+/**
+ * @param string[] $valueToId
+ * @phpstan-param array<string, string> $valueToId
+ * @phpstan-param class-string<ByteTag|IntTag|StringTag> $propertyType
+ */
+function buildFlattenPropertyRule(array $valueToId, string $propertyName, string $propertyType) : BlockStateUpgradeSchemaFlattenInfo{
+	$ids = array_values($valueToId);
+
+	//TODO: this is a bit too enthusiastic. For example, when flattening the old "stone", it will see that
+	//"granite", "andesite", "stone" etc all have "e" as a common suffix, which works, but looks a bit daft.
+	//This also causes more remaps to be generated than necessary, since some of the values are already
+	//contained in the new ID.
+	$idPrefix = findCommonPrefix($ids);
+	$idSuffix = findCommonSuffix($ids);
+	if(strlen($idSuffix) < 2){
+		$idSuffix = "";
+	}
+
+	$valueMap = [];
+	foreach(Utils::stringifyKeys($valueToId) as $value => $newId){
+		$newValue = substr($newId, strlen($idPrefix), $idSuffix !== "" ? -strlen($idSuffix) : null);
+		if($newValue !== $value){
+			$valueMap[$value] = $newValue;
+		}
+	}
+
+	$allNumeric = true;
+	if(count($valueMap) > 0){
+		foreach(Utils::stringifyKeys($valueMap) as $value => $newValue){
+			if(!is_numeric($value)){
+				$allNumeric = false;
+				break;
+			}
+		}
+		if($allNumeric){
+			//add a dummy key to force the JSON to be an object and not a list
+			$valueMap["dummy"] = "map_not_list";
+		}
+	}
+
+	return new BlockStateUpgradeSchemaFlattenInfo(
+		$idPrefix,
+		$propertyName,
+		$idSuffix,
+		$valueMap,
+		$propertyType,
+	);
+}
+
+/**
+ * @param string[][][] $candidateFlattenedValues
+ * @phpstan-param array<string, array<string, array<string, string>>> $candidateFlattenedValues
+ * @param string[] $candidateFlattenPropertyTypes
+ * @phpstan-param array<string, class-string<ByteTag|IntTag|StringTag>> $candidateFlattenPropertyTypes
+ *
+ * @return BlockStateUpgradeSchemaFlattenInfo[][]
+ * @phpstan-return array<string, array<string, BlockStateUpgradeSchemaFlattenInfo>>
+ */
+function buildFlattenPropertyRules(array $candidateFlattenedValues, array $candidateFlattenPropertyTypes) : array{
+	$flattenPropertyRules = [];
+	foreach(Utils::stringifyKeys($candidateFlattenedValues) as $propertyName => $filters){
+		foreach(Utils::stringifyKeys($filters) as $filter => $valueToId){
+			$flattenPropertyRules[$propertyName][$filter] = buildFlattenPropertyRule($valueToId, $propertyName, $candidateFlattenPropertyTypes[$propertyName]);
+		}
+	}
+	ksort($flattenPropertyRules, SORT_STRING);
+	return $flattenPropertyRules;
+}
+
+/**
+ * Attempts to compress a list of remapped states by looking at which state properties were consistently unchanged.
+ * This significantly reduces the output size during flattening when the flattened block has many permutations
+ * (e.g. walls).
+ *
+ * @param BlockStateMapping[] $upgradeTable
+ * @phpstan-param array<string, BlockStateMapping>        $upgradeTable
+ *
+ * @return BlockStateUpgradeSchemaBlockRemap[]
+ * @phpstan-return list<BlockStateUpgradeSchemaBlockRemap>
+ */
+function processRemappedStates(array $upgradeTable) : array{
+	$unchangedStatesByNewName = [];
+
+	foreach($upgradeTable as $pair){
+		if(count($pair->old->getStates()) === 0 || count($pair->new->getStates()) === 0){
+			//all states have changed in some way - no states are copied over
+			$unchangedStatesByNewName[$pair->new->getName()] = [];
+			continue;
+		}
+
+		$oldStates = $pair->old->getStates();
+		$newStates = $pair->new->getStates();
+		if(!isset($unchangedStatesByNewName[$pair->new->getName()])){
+			//build list of unchanged states for this new ID
+			$unchangedStatesByNewName[$pair->new->getName()] = [];
+			foreach(Utils::stringifyKeys($oldStates) as $propertyName => $propertyValue){
+				if(isset($newStates[$propertyName]) && $newStates[$propertyName]->equals($propertyValue)){
+					$unchangedStatesByNewName[$pair->new->getName()][] = $propertyName;
+				}
+			}
+		}else{
+			//we already have a list of stuff that probably didn't change - verify that this is the case, and remove
+			//any that changed in later states with the same ID
+			foreach($unchangedStatesByNewName[$pair->new->getName()] as $k => $propertyName){
+				if(
+					!isset($oldStates[$propertyName]) ||
+					!isset($newStates[$propertyName]) ||
+					!$oldStates[$propertyName]->equals($newStates[$propertyName])
+				){
+					//this property disappeared or changed its value in another state with the same ID - we can't
+					//compress this state
+					unset($unchangedStatesByNewName[$pair->new->getName()][$k]);
+				}
+			}
+		}
+	}
+	foreach(Utils::stringifyKeys($unchangedStatesByNewName) as $newName => $unchangedStates){
+		ksort($unchangedStates);
+		$unchangedStatesByNewName[$newName] = $unchangedStates;
+	}
+
+	$notFlattenedProperties = [];
+
+	$candidateFlattenedValues = [];
+	$candidateFlattenedPropertyTypes = [];
+	foreach($upgradeTable as $pair){
+		foreach(Utils::stringifyKeys($pair->old->getStates()) as $propertyName => $propertyValue){
+			if(isset($notFlattenedProperties[$propertyName])){
+				continue;
+			}
+
+			$filter = $pair->old->getStates();
+			foreach($unchangedStatesByNewName[$pair->new->getName()] as $unchangedPropertyName){
+				if($unchangedPropertyName === $propertyName){
+					$notFlattenedProperties[$propertyName] = true;
+					continue 2;
+				}
+				unset($filter[$unchangedPropertyName]);
+			}
+			unset($filter[$propertyName]);
+
+			$rawFilter = encodeOrderedProperties($filter);
+			$candidateFlattenedValues[$propertyName][$rawFilter] ??= [];
+			$expectedType = $candidateFlattenedPropertyTypes[$propertyName] ?? null;
+			if(!checkFlattenPropertySuitability($propertyValue, $expectedType, $pair->new->getName(), $candidateFlattenedValues[$propertyName][$rawFilter])){
+				$notFlattenedProperties[$propertyName] = true;
+				continue;
+			}
+			$candidateFlattenedPropertyTypes[$propertyName] = $expectedType;
+		}
+	}
+	foreach(Utils::stringifyKeys($candidateFlattenedValues) as $propertyName => $filters){
+		foreach($filters as $valuesToIds){
+			if(count(array_unique($valuesToIds)) === 1){
+				//this property doesn't influence the new ID
+				$notFlattenedProperties[$propertyName] = true;
+				continue 2;
+			}
+		}
+	}
+	foreach(Utils::stringifyKeys($notFlattenedProperties) as $propertyName => $_){
+		unset($candidateFlattenedValues[$propertyName]);
+	}
+
+	$flattenedProperties = buildFlattenPropertyRules($candidateFlattenedValues, $candidateFlattenedPropertyTypes);
+	$flattenProperty = array_key_first($flattenedProperties);
+	//Properties with fewer rules take up less space for the same result
+	foreach(Utils::stringifyKeys($flattenedProperties) as $propertyName => $rules){
+		if(count($rules) < count($flattenedProperties[$flattenProperty])){
+			$flattenProperty = $propertyName;
+		}
+	}
+
+	$list = [];
+
+	foreach($upgradeTable as $pair){
+		$oldState = $pair->old->getStates();
+		$newState = $pair->new->getStates();
+
+		$cleanedOldState = $oldState;
+		$cleanedNewState = $newState;
+		$newName = $pair->new->getName();
+
+		foreach($unchangedStatesByNewName[$newName] as $propertyName){
+			unset($cleanedOldState[$propertyName]);
+			unset($cleanedNewState[$propertyName]);
+		}
+		ksort($cleanedOldState);
+		ksort($cleanedNewState);
+		if($flattenProperty !== null){
+			$flattenedValue = $cleanedOldState[$flattenProperty] ?? null;
+			if(!$flattenedValue instanceof StringTag && !$flattenedValue instanceof IntTag && !$flattenedValue instanceof ByteTag){
+				throw new AssumptionFailedError("Non-flattenable type of tag ($newName $flattenProperty) but have " . get_debug_type($flattenedValue));
+			}
+			unset($cleanedOldState[$flattenProperty]);
+		}
+		$rawOldState = encodeOrderedProperties($cleanedOldState);
+		$newNameRule = $flattenProperty !== null ?
+			$flattenedProperties[$flattenProperty][$rawOldState] ?? throw new AssumptionFailedError("This should always be set") :
+			$newName;
+
+		$remap = new BlockStateUpgradeSchemaBlockRemap(
+			$cleanedOldState,
+			$newNameRule,
+			$cleanedNewState,
+			$unchangedStatesByNewName[$pair->new->getName()]
+		);
+
+		$existing = $list[$rawOldState] ?? null;
+		if($existing === null || $existing->equals($remap)){
+			$list[$rawOldState] = $remap;
+		}else{
+			//TODO: ambiguous filter - this is a bug in the unchanged states calculation
+			//this is a real pain to fix, so workaround this for now
+			//this arose in 1.20.40 with brown_mushroom_block when variants 10 and 15 were remapped to mushroom_stem
+			//while also keeping the huge_mushroom_bits property with the same value
+			//this causes huge_mushroom_bits to be considered an "unchanged" state, which is *technically* correct, but
+			//means it can't be deleted from the filter
+
+			//move stuff from newState to copiedState where possible, even if we can't delete it from the filter
+			$cleanedNewState2 = $newState;
+			$copiedState = [];
+			foreach(Utils::stringifyKeys($cleanedNewState2) as $newPropertyName => $newPropertyValue){
+				if(isset($oldState[$newPropertyName]) && $oldState[$newPropertyName]->equals($newPropertyValue)){
+					$copiedState[] = $newPropertyName;
+					unset($cleanedNewState2[$newPropertyName]);
+				}
+			}
+
+			$fallbackRawFilter = encodeOrderedProperties($oldState);
+			if(isset($list[$fallbackRawFilter])){
+				throw new AssumptionFailedError("Exact match filter collision for \"" . $pair->old->getName() . "\" - this should never happen");
+			}
+			$list[$fallbackRawFilter] = new BlockStateUpgradeSchemaBlockRemap(
+				$oldState,
+				$newName,
+				$cleanedNewState2,
+				$copiedState
+			);
+			\GlobalLogger::get()->warning("Couldn't calculate an unambiguous partial remappedStates filter for some states of \"" . $pair->old->getName() . "\" - falling back to exact match");
+			\GlobalLogger::get()->warning("The schema should still work, but may be larger than desired");
+		}
+	}
+
+	//more specific filters must come before less specific ones, in case of a remap on a certain value which is
+	//otherwise unchanged
+	usort($list, function(BlockStateUpgradeSchemaBlockRemap $a, BlockStateUpgradeSchemaBlockRemap $b) : int{
+		return count($b->oldState) <=> count($a->oldState);
+	});
+	return array_values($list);
+}
+
+/**
+ * @param BlockStateMapping[][] $upgradeTable
+ * @phpstan-param array<string, array<string, BlockStateMapping>> $upgradeTable
+ */
+function generateBlockStateUpgradeSchema(array $upgradeTable) : BlockStateUpgradeSchema{
+	$foundVersion = -1;
+	foreach(Utils::stringifyKeys($upgradeTable) as $blockStateMappings){
+		foreach($blockStateMappings as $mapping){
+			if($foundVersion === -1 || $mapping->new->getVersion() === $foundVersion){
+				$foundVersion = $mapping->new->getVersion();
+			}else{
+				$logger = \GlobalLogger::get();
+				$logger->emergency("Mismatched upgraded versions found: $foundVersion and " . $mapping->new->getVersion());
+				$logger->emergency("Mismatched old state: " . $mapping->old->toNbt());
+				$logger->emergency("Mismatched new state: " . $mapping->new->toNbt());
+				$logger->emergency("This is probably because the game didn't recognize the input blockstate, so it was returned unchanged.");
+				$logger->emergency("This is usually because the block is locked behind an experimental toggle that isn't enabled on the world you used when generating this upgrade table.");
+				$logger->emergency("You can test this in a vanilla game using the /give or /setblock commands to try and acquire the block. Keep trying different experiments until you find the right one.");
+
+				exit(1);
+			}
+		}
+	}
+
+	$result = new BlockStateUpgradeSchema(
+		($foundVersion >> 24) & 0xff,
+		($foundVersion >> 16) & 0xff,
+		($foundVersion >> 8) & 0xff,
+		($foundVersion & 0xff),
+		0
+	);
+	foreach(Utils::stringifyKeys($upgradeTable) as $oldName => $blockStateMappings){
+		$newNameFound = [];
+
+		foreach($blockStateMappings as $mapping){
+			$newName = $mapping->new->getName();
+			$newNameFound[$newName] = true;
+		}
+		if(count($newNameFound) === 1){
+			$newName = array_key_first($newNameFound);
+			if($newName !== $oldName){
+				$result->renamedIds[$oldName] = array_key_first($newNameFound);
+			}
+			if(!processStateGroup($oldName, $blockStateMappings, $result)){
+				throw new \RuntimeException("States with the same ID should be fully consistent");
+			}
+		}else{
+			//try processing this as a regular state group first
+			//if a property was flattened into the ID, the remaining states will normally be consistent
+			//if not we fall back to remap states and state filters
+			if(!processStateGroup($oldName, $blockStateMappings, $result)){
+				//block mapped to multiple different new IDs; we can't guess these, so we just do a plain old remap
+				//even if some of the states stay under the same ID, the compression techniques used by this function
+				//implicitly rely on knowing the full set of old states and their new transformations
+				$result->remappedStates[$oldName] = processRemappedStates($blockStateMappings);
+			}
+		}
+	}
+
+	return $result;
+}
+
+/**
+ * @param BlockStateMapping[][] $upgradeTable
+ * @phpstan-param array<string, array<string, BlockStateMapping>> $upgradeTable
+ */
+function testBlockStateUpgradeSchema(array $upgradeTable, BlockStateUpgradeSchema $schema) : bool{
+	//TODO: HACK!
+	//the upgrader won't apply the schema if it's the same version and there's only one schema with a matching version
+	//ID (for performance reasons), which is a problem for testing isolated schemas
+	//add a dummy schema to bypass this optimization
+	$dummySchema = new BlockStateUpgradeSchema($schema->maxVersionMajor, $schema->maxVersionMinor, $schema->maxVersionPatch, $schema->maxVersionRevision, $schema->getSchemaId() + 1);
+	$upgrader = new BlockStateUpgrader([$schema, $dummySchema]);
+
+	foreach($upgradeTable as $mappingsByOldName){
+		foreach($mappingsByOldName as $mapping){
+			$expectedNewState = $mapping->new;
+
+			$actualNewState = $upgrader->upgrade($mapping->old);
+
+			if(!$expectedNewState->equals($actualNewState)){
+				\GlobalLogger::get()->error("Expected: " . $expectedNewState->toNbt());
+				\GlobalLogger::get()->error("Actual: " . $actualNewState->toNbt());
+				return false;
+			}
+		}
+	}
+
+	return true;
+}
+
+/**
+ * @param string[] $argv
+ */
+function cmdGenerate(array $argv) : int{
+	$upgradeTableFile = $argv[2];
+	$schemaFile = $argv[3];
+
+	$table = loadUpgradeTableFromFile($upgradeTableFile, false);
+
+	ksort($table, SORT_STRING);
+
+	$diff = generateBlockStateUpgradeSchema($table);
+	if($diff->isEmpty()){
+		\GlobalLogger::get()->warning("All states appear to be the same! No schema generated.");
+		return 0;
+	}
+
+	if(!testBlockStateUpgradeSchema($table, $diff)){
+		\GlobalLogger::get()->error("Generated schema does not produce the results expected by $upgradeTableFile");
+		\GlobalLogger::get()->error("This is probably a bug in the schema generation code. Please report this to the developers.");
+		return 1;
+	}
+
+	file_put_contents(
+		$schemaFile,
+		json_encode(BlockStateUpgradeSchemaUtils::toJsonModel($diff), JSON_PRETTY_PRINT) . "\n"
+	);
+	\GlobalLogger::get()->info("Schema file $schemaFile generated successfully.");
+	return 0;
+}
+
+/**
+ * @param string[] $argv
+ */
+function cmdTest(array $argv) : int{
+	$upgradeTableFile = $argv[2];
+	$schemaFile = $argv[3];
+
+	$table = loadUpgradeTableFromFile($upgradeTableFile, false);
+
+	ksort($table, SORT_STRING);
+
+	$schema = BlockStateUpgradeSchemaUtils::loadSchemaFromString(Filesystem::fileGetContents($schemaFile), 0);
+	if(!testBlockStateUpgradeSchema($table, $schema)){
+		\GlobalLogger::get()->error("Schema $schemaFile does not produce the results predicted by $upgradeTableFile");
+		return 1;
+	}
+	\GlobalLogger::get()->info("Schema $schemaFile is valid according to $upgradeTableFile");
+
+	return 0;
+}
+
+/**
+ * @param string[] $argv
+ */
+function cmdUpdate(array $argv) : int{
+	[, , $oldSchemaFile, $oldPaletteFile, $newSchemaFile] = $argv;
+
+	$palette = BlockStateDictionary::loadPaletteFromString(Filesystem::fileGetContents($oldPaletteFile));
+	$schema = BlockStateUpgradeSchemaUtils::loadSchemaFromString(Filesystem::fileGetContents($oldSchemaFile), 0);
+	//TODO: HACK!
+	//the upgrader won't apply the schema if it's the same version and there's only one schema with a matching version
+	//ID (for performance reasons), which is a problem for testing isolated schemas
+	//add a dummy schema to bypass this optimization
+	$dummySchema = new BlockStateUpgradeSchema($schema->maxVersionMajor, $schema->maxVersionMinor, $schema->maxVersionPatch, $schema->maxVersionRevision, $schema->getSchemaId() + 1);
+	$upgrader = new BlockStateUpgrader([$schema, $dummySchema]);
+
+	$tags = [];
+	foreach($palette as $stateData){
+		$tags[] = new TreeRoot($stateData->toNbt());
+		$tags[] = new TreeRoot($upgrader->upgrade($stateData)->toNbt());
+	}
+
+	$upgradeTable = buildUpgradeTableFromData($tags, false);
+	$newSchema = generateBlockStateUpgradeSchema($upgradeTable);
+
+	if(!testBlockStateUpgradeSchema($upgradeTable, $newSchema)){
+		\GlobalLogger::get()->error("Updated schema does not produce the expected results!");
+		\GlobalLogger::get()->error("This is probably a bug in the schema generation code. Please report this to the developers.");
+		return 1;
+	}
+
+	file_put_contents(
+		$newSchemaFile,
+		json_encode(BlockStateUpgradeSchemaUtils::toJsonModel($newSchema), JSON_PRETTY_PRINT) . "\n"
+	);
+	\GlobalLogger::get()->info("Schema file $newSchemaFile updated to new format (from $oldSchemaFile) successfully.");
+	return 0;
+}
+
+/**
+ * @param string[] $argv
+ */
+function cmdUpdateAll(array $argv) : int{
+	$oldPaletteFilenames = [
+		'1.9.0' => '1.09.0',
+		'1.19.50' => '1.19.50.23_beta',
+		'1.19.60' => '1.19.60.26_beta',
+		'1.19.70' => '1.19.70.26_beta',
+		'1.19.80' => '1.19.80.24_beta',
+	];
+	$schemaDir = $argv[2];
+	$paletteArchiveDir = $argv[3];
+
+	$schemaFileNames = scandir($schemaDir);
+	if($schemaFileNames === false){
+		\GlobalLogger::get()->error("Failed to read schema directory $schemaDir");
+		return 1;
+	}
+	foreach($schemaFileNames as $file){
+		$schemaFile = Path::join($schemaDir, $file);
+		if(!file_exists($schemaFile) || is_dir($schemaFile)){
+			continue;
+		}
+
+		if(preg_match('/^\d{4}_(.+?)_to_(.+?).json/', $file, $matches) !== 1){
+			continue;
+		}
+		$oldPaletteFile = Path::join($paletteArchiveDir, ($oldPaletteFilenames[$matches[1]] ?? $matches[1]) . '.nbt');
+
+		//a bit clunky but it avoids having to make yet another function
+		//TODO: perhaps in the future we should write the result to a tmpfile until all schemas are updated,
+		//and then copy the results into place at the end
+		if(cmdUpdate([$argv[0], "update", $schemaFile, $oldPaletteFile, $schemaFile]) !== 0){
+			return 1;
+		}
+	}
+
+	\GlobalLogger::get()->info("All schemas updated successfully.");
+	return 0;
+}
+
+/**
+ * @param string[] $argv
+ */
+function main(array $argv) : int{
+	$options = [
+		"generate" => [["palette upgrade table file", "schema output file"], cmdGenerate(...)],
+		"test" => [["palette upgrade table file", "schema output file"], cmdTest(...)],
+		"update" => [["schema input file", "old palette file", "updated schema output file"], cmdUpdate(...)],
+		"update-all" => [["schema folder", "path to BlockPaletteArchive"], cmdUpdateAll(...)]
+	];
+
+	$selected = $argv[1] ?? null;
+	if($selected === null || !isset($options[$selected])){
+		fwrite(STDERR, "Available commands:\n");
+		foreach($options as $command => [$args, $callback]){
+			fwrite(STDERR, " - $command " . implode(" ", array_map(fn(string $a) => "<$a>", $args)) . "\n");
+		}
+		return 1;
+	}
+
+	$callback = $options[$selected][1];
+	if(count($argv) !== count($options[$selected][0]) + 2){
+		fwrite(STDERR, "Usage: {$argv[0]} $selected " . implode(" ", array_map(fn(string $a) => "<$a>", $options[$selected][0])) . "\n");
+		return 1;
+	}
+	return $callback($argv);
+}
+
+exit(main($argv));
diff --git a/tools/compact-regions.php b/tools/compact-regions.php
index 6959c82fe2..04ac3f0c94 100644
--- a/tools/compact-regions.php
+++ b/tools/compact-regions.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\tools\compact_regions;
 
+use pocketmine\utils\Utils;
 use pocketmine\world\format\io\exception\CorruptedChunkException;
 use pocketmine\world\format\io\region\CorruptedRegionException;
 use pocketmine\world\format\io\region\RegionLoader;
@@ -59,6 +60,7 @@ const SUPPORTED_EXTENSIONS = [
 /**
  * @param int[] $files
  * @phpstan-param array<string, int> $files
+ * @phpstan-param-out array<string, int> $files
  */
 function find_regions_recursive(string $dir, array &$files) : void{
 	$dirFiles = scandir($dir, SCANDIR_SORT_NONE);
@@ -112,7 +114,7 @@ function main(array $argv) : int{
 	$corruptedFiles = [];
 	$doneCount = 0;
 	$totalCount = count($files);
-	foreach($files as $file => $size){
+	foreach(Utils::stringifyKeys($files) as $file => $size){
 		try{
 			$oldRegion = RegionLoader::loadExisting($file);
 		}catch(CorruptedRegionException $e){
@@ -162,7 +164,7 @@ function main(array $argv) : int{
 
 	clearstatcache();
 	$newSize = 0;
-	foreach($files as $file => $oldSize){
+	foreach(Utils::stringifyKeys($files) as $file => $oldSize){
 		$newSize += file_exists($file) ? filesize($file) : 0;
 	}
 	$diff = $currentSize - $newSize;
diff --git a/tools/convert-world.php b/tools/convert-world.php
index b079a75425..d4d15ce57b 100644
--- a/tools/convert-world.php
+++ b/tools/convert-world.php
@@ -21,10 +21,29 @@
 
 declare(strict_types=1);
 
+namespace pocketmine\tools\convert_world;
+
 use pocketmine\world\format\io\FormatConverter;
 use pocketmine\world\format\io\WorldProviderManager;
 use pocketmine\world\format\io\WorldProviderManagerEntry;
 use pocketmine\world\format\io\WritableWorldProviderManagerEntry;
+use function array_filter;
+use function array_key_exists;
+use function array_keys;
+use function array_map;
+use function array_shift;
+use function count;
+use function dirname;
+use function fwrite;
+use function getopt;
+use function implode;
+use function is_dir;
+use function is_string;
+use function is_writable;
+use function mkdir;
+use function realpath;
+use const PHP_EOL;
+use const STDERR;
 
 require_once dirname(__DIR__) . '/vendor/autoload.php';
 
@@ -74,7 +93,7 @@ if(count($oldProviderClasses) > 1){
 	exit(1);
 }
 $oldProviderClass = array_shift($oldProviderClasses);
-$oldProvider = $oldProviderClass->fromPath($inputPath);
+$oldProvider = $oldProviderClass->fromPath($inputPath, new \PrefixedLogger(\GlobalLogger::get(), "Old World Provider"));
 
-$converter = new FormatConverter($oldProvider, $writableFormats[$args["format"]], $backupPath, GlobalLogger::get());
+$converter = new FormatConverter($oldProvider, $writableFormats[$args["format"]], $backupPath, \GlobalLogger::get());
 $converter->execute();
diff --git a/tools/generate-bedrock-data-from-packets.php b/tools/generate-bedrock-data-from-packets.php
new file mode 100644
index 0000000000..2c20e6099d
--- /dev/null
+++ b/tools/generate-bedrock-data-from-packets.php
@@ -0,0 +1,601 @@
+<?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\tools\generate_bedrock_data_from_packets;
+
+use pocketmine\crafting\json\FurnaceRecipeData;
+use pocketmine\crafting\json\ItemStackData;
+use pocketmine\crafting\json\PotionContainerChangeRecipeData;
+use pocketmine\crafting\json\PotionTypeRecipeData;
+use pocketmine\crafting\json\RecipeIngredientData;
+use pocketmine\crafting\json\ShapedRecipeData;
+use pocketmine\crafting\json\ShapelessRecipeData;
+use pocketmine\crafting\json\SmithingTransformRecipeData;
+use pocketmine\crafting\json\SmithingTrimRecipeData;
+use pocketmine\data\bedrock\block\BlockStateData;
+use pocketmine\data\bedrock\item\BlockItemIdMap;
+use pocketmine\data\bedrock\item\ItemTypeNames;
+use pocketmine\nbt\LittleEndianNbtSerializer;
+use pocketmine\nbt\NBT;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\ListTag;
+use pocketmine\nbt\TreeRoot;
+use pocketmine\network\mcpe\convert\BlockStateDictionary;
+use pocketmine\network\mcpe\convert\BlockTranslator;
+use pocketmine\network\mcpe\convert\ItemTranslator;
+use pocketmine\network\mcpe\handler\PacketHandler;
+use pocketmine\network\mcpe\protocol\AvailableActorIdentifiersPacket;
+use pocketmine\network\mcpe\protocol\BiomeDefinitionListPacket;
+use pocketmine\network\mcpe\protocol\CraftingDataPacket;
+use pocketmine\network\mcpe\protocol\CreativeContentPacket;
+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\CreativeContentEntry;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStack;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackExtraData;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackExtraDataShield;
+use pocketmine\network\mcpe\protocol\types\recipe\ComplexAliasItemDescriptor;
+use pocketmine\network\mcpe\protocol\types\recipe\FurnaceRecipe;
+use pocketmine\network\mcpe\protocol\types\recipe\IntIdMetaItemDescriptor;
+use pocketmine\network\mcpe\protocol\types\recipe\MolangItemDescriptor;
+use pocketmine\network\mcpe\protocol\types\recipe\MultiRecipe;
+use pocketmine\network\mcpe\protocol\types\recipe\RecipeIngredient;
+use pocketmine\network\mcpe\protocol\types\recipe\ShapedRecipe;
+use pocketmine\network\mcpe\protocol\types\recipe\ShapelessRecipe;
+use pocketmine\network\mcpe\protocol\types\recipe\SmithingTransformRecipe;
+use pocketmine\network\mcpe\protocol\types\recipe\SmithingTrimRecipe;
+use pocketmine\network\mcpe\protocol\types\recipe\StringIdMetaItemDescriptor;
+use pocketmine\network\mcpe\protocol\types\recipe\TagItemDescriptor;
+use pocketmine\network\PacketHandlingException;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Filesystem;
+use pocketmine\utils\Utils;
+use pocketmine\world\format\io\GlobalBlockStateHandlers;
+use Ramsey\Uuid\Exception\InvalidArgumentException;
+use Symfony\Component\Filesystem\Path;
+use function array_map;
+use function array_values;
+use function asort;
+use function base64_decode;
+use function base64_encode;
+use function bin2hex;
+use function chr;
+use function count;
+use function dirname;
+use function explode;
+use function file;
+use function file_put_contents;
+use function fwrite;
+use function get_class;
+use function implode;
+use function is_array;
+use function is_object;
+use function json_encode;
+use function ksort;
+use function mkdir;
+use function ord;
+use function strlen;
+use const FILE_IGNORE_NEW_LINES;
+use const JSON_PRETTY_PRINT;
+use const JSON_THROW_ON_ERROR;
+use const PHP_BINARY;
+use const PHP_EOL;
+use const SORT_NUMERIC;
+use const SORT_STRING;
+use const STDERR;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+class ParserPacketHandler extends PacketHandler{
+
+	public ?ItemTypeDictionary $itemTypeDictionary = null;
+	private BlockTranslator $blockTranslator;
+	private BlockItemIdMap $blockItemIdMap;
+
+	public function __construct(private string $bedrockDataPath){
+		$this->blockTranslator = new BlockTranslator(
+			BlockStateDictionary::loadFromString(
+				Filesystem::fileGetContents(Path::join($this->bedrockDataPath, "canonical_block_states.nbt")),
+				Filesystem::fileGetContents(Path::join($this->bedrockDataPath, "block_state_meta_map.json")),
+			),
+			GlobalBlockStateHandlers::getSerializer()
+		);
+		$this->blockItemIdMap = BlockItemIdMap::getInstance();
+	}
+
+	private static function blockStatePropertiesToString(BlockStateData $blockStateData) : string{
+		$statePropertiesTag = CompoundTag::create();
+		foreach(Utils::stringifyKeys($blockStateData->getStates()) as $name => $value){
+			$statePropertiesTag->setTag($name, $value);
+		}
+		return base64_encode((new LittleEndianNbtSerializer())->write(new TreeRoot($statePropertiesTag)));
+	}
+
+	private function itemStackToJson(ItemStack $itemStack) : ItemStackData{
+		if($itemStack->getId() === 0){
+			throw new InvalidArgumentException("Cannot serialize a null itemstack");
+		}
+		if($this->itemTypeDictionary === null){
+			throw new PacketHandlingException("Can't process item yet; haven't received item type dictionary");
+		}
+		$itemStringId = $this->itemTypeDictionary->fromIntId($itemStack->getId());
+		$data = new ItemStackData($itemStringId);
+
+		if($itemStack->getCount() !== 1){
+			$data->count = $itemStack->getCount();
+		}
+
+		$meta = $itemStack->getMeta();
+		if($meta === 32767){
+			$meta = 0; //kick wildcard magic bullshit
+		}
+		if($this->blockItemIdMap->lookupBlockId($itemStringId) !== null){
+			if($meta !== 0){
+				throw new PacketHandlingException("Unexpected non-zero blockitem meta");
+			}
+			$blockState = $this->blockTranslator->getBlockStateDictionary()->generateDataFromStateId($itemStack->getBlockRuntimeId()) ?? null;
+			if($blockState === null){
+				throw new PacketHandlingException("Unmapped blockstate ID " . $itemStack->getBlockRuntimeId());
+			}
+
+			$stateProperties = $blockState->getStates();
+			if(count($stateProperties) > 0){
+				$data->block_states = self::blockStatePropertiesToString($blockState);
+			}
+		}elseif($itemStack->getBlockRuntimeId() !== ItemTranslator::NO_BLOCK_RUNTIME_ID){
+			throw new PacketHandlingException("Non-blockitems should have a zero block runtime ID (" . $itemStack->getBlockRuntimeId() . " on " . $itemStringId . ")");
+		}elseif($meta !== 0){
+			$data->meta = $meta;
+		}
+
+		$rawExtraData = $itemStack->getRawExtraData();
+		if($rawExtraData !== ""){
+			$decoder = PacketSerializer::decoder($rawExtraData, 0);
+			$extraData = $itemStringId === ItemTypeNames::SHIELD ? ItemStackExtraDataShield::read($decoder) : ItemStackExtraData::read($decoder);
+			$nbt = $extraData->getNbt();
+			if($nbt !== null && count($nbt) > 0){
+				$data->nbt = base64_encode((new LittleEndianNbtSerializer())->write(new TreeRoot($nbt)));
+			}
+
+			if(count($extraData->getCanPlaceOn()) > 0){
+				$data->can_place_on = $extraData->getCanPlaceOn();
+			}
+			if(count($extraData->getCanDestroy()) > 0){
+				$data->can_destroy = $extraData->getCanDestroy();
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * @return mixed[]
+	 */
+	private static function objectToOrderedArray(object $object) : array{
+		$result = (array) ($object instanceof \JsonSerializable ? $object->jsonSerialize() : $object);
+		ksort($result, SORT_STRING);
+
+		foreach(Utils::promoteKeys($result) as $property => $value){
+			if(is_object($value)){
+				$result[$property] = self::objectToOrderedArray($value);
+			}elseif(is_array($value)){
+				$array = [];
+				foreach(Utils::promoteKeys($value) as $k => $v){
+					if(is_object($v)){
+						$array[$k] = self::objectToOrderedArray($v);
+					}else{
+						$array[$k] = $v;
+					}
+				}
+
+				$result[$property] = $array;
+			}
+		}
+
+		return $result;
+	}
+
+	private static function sort(mixed $object) : mixed{
+		if(is_object($object)){
+			return self::objectToOrderedArray($object);
+		}
+		if(is_array($object)){
+			$result = [];
+			foreach(Utils::promoteKeys($object) as $k => $v){
+				$result[$k] = self::sort($v);
+			}
+			return $result;
+		}
+
+		return $object;
+	}
+
+	public function handleStartGame(StartGamePacket $packet) : bool{
+		$this->itemTypeDictionary = new ItemTypeDictionary($packet->itemTable);
+
+		echo "updating legacy item ID mapping table\n";
+		$table = [];
+		foreach($packet->itemTable as $entry){
+			$table[$entry->getStringId()] = [
+				"runtime_id" => $entry->getNumericId(),
+				"component_based" => $entry->isComponentBased()
+			];
+		}
+		ksort($table, SORT_STRING);
+		file_put_contents($this->bedrockDataPath . '/required_item_list.json', json_encode($table, JSON_PRETTY_PRINT) . "\n");
+
+		foreach(Utils::promoteKeys($packet->levelSettings->experiments->getExperiments()) as $name => $experiment){
+			echo "Experiment \"$name\" is " . ($experiment ? "" : "not ") . "active\n";
+		}
+		return true;
+	}
+
+	public function handleCreativeContent(CreativeContentPacket $packet) : bool{
+		echo "updating creative inventory data\n";
+		$items = array_map(function(CreativeContentEntry $entry) : array{
+			return self::objectToOrderedArray($this->itemStackToJson($entry->getItem()));
+		}, $packet->getEntries());
+		file_put_contents($this->bedrockDataPath . '/creativeitems.json', json_encode($items, JSON_PRETTY_PRINT) . "\n");
+		return true;
+	}
+
+	private function recipeIngredientToJson(RecipeIngredient $itemStack) : RecipeIngredientData{
+		if($this->itemTypeDictionary === null){
+			throw new PacketHandlingException("Can't process item yet; haven't received item type dictionary");
+		}
+
+		$descriptor = $itemStack->getDescriptor();
+		if($descriptor === null){
+			throw new PacketHandlingException("Can't json-serialize a null recipe ingredient");
+		}
+		$data = new RecipeIngredientData();
+
+		if($descriptor instanceof IntIdMetaItemDescriptor || $descriptor instanceof StringIdMetaItemDescriptor){
+			if($descriptor instanceof IntIdMetaItemDescriptor){
+				$data->name = $this->itemTypeDictionary->fromIntId($descriptor->getId());
+			}else{
+				$data->name = $descriptor->getId();
+			}
+			$meta = $descriptor->getMeta();
+			if($meta !== 32767){
+				$blockStateId = $this->blockTranslator->getBlockStateDictionary()->lookupStateIdFromIdMeta($data->name, $meta);
+				if($this->blockItemIdMap->lookupBlockId($data->name) !== null && $blockStateId !== null){
+					$blockState = $this->blockTranslator->getBlockStateDictionary()->generateDataFromStateId($blockStateId);
+					if($blockState !== null && count($blockState->getStates()) > 0){
+						$data->block_states = self::blockStatePropertiesToString($blockState);
+					}
+				}elseif($meta !== 0){
+					$data->meta = $meta;
+				}
+			}else{
+				$data->meta = $meta;
+			}
+		}elseif($descriptor instanceof TagItemDescriptor){
+			$data->tag = $descriptor->getTag();
+		}elseif($descriptor instanceof MolangItemDescriptor){
+			$data->molang_expression = $descriptor->getMolangExpression();
+			$data->molang_version = $descriptor->getMolangVersion();
+		}elseif($descriptor instanceof ComplexAliasItemDescriptor){
+			$data->name = $descriptor->getAlias();
+		}else{
+			throw new \UnexpectedValueException("Unknown item descriptor type " . get_class($descriptor));
+		}
+		if($itemStack->getCount() !== 1){
+			$data->count = $itemStack->getCount();
+		}
+
+		return $data;
+	}
+
+	private function shapedRecipeToJson(ShapedRecipe $entry) : ShapedRecipeData{
+		$keys = [];
+
+		$shape = [];
+		$char = ord("A");
+
+		$outputsByKey = [];
+		foreach(Utils::promoteKeys($entry->getInput()) as $x => $row){
+			foreach(Utils::promoteKeys($row) as $y => $ingredient){
+				if($ingredient->getDescriptor() === null){
+					$shape[$x][$y] = " ";
+				}else{
+					$jsonIngredient = $this->recipeIngredientToJson($ingredient);
+					$hash = json_encode($jsonIngredient, JSON_THROW_ON_ERROR);
+					if(isset($keys[$hash])){
+						$shape[$x][$y] = $keys[$hash];
+					}else{
+						$key = chr($char);
+						$keys[$hash] = $shape[$x][$y] = $key;
+						$outputsByKey[$key] = $jsonIngredient;
+						$char++;
+					}
+				}
+			}
+		}
+		$unlockingIngredients = $entry->getUnlockingRequirement()->getUnlockingIngredients();
+		return new ShapedRecipeData(
+			array_map(fn(array $array) => implode('', array_values($array)), array_values($shape)),
+			$outputsByKey,
+			array_map(fn(ItemStack $output) => $this->itemStackToJson($output), $entry->getOutput()),
+			$entry->getBlockName(),
+			$entry->getPriority(),
+			$unlockingIngredients !== null ? array_map(fn(RecipeIngredient $input) => $this->recipeIngredientToJson($input), $unlockingIngredients) : []
+		);
+	}
+
+	private function shapelessRecipeToJson(ShapelessRecipe $recipe) : ShapelessRecipeData{
+		$unlockingIngredients = $recipe->getUnlockingRequirement()->getUnlockingIngredients();
+		return new ShapelessRecipeData(
+			array_map(fn(RecipeIngredient $input) => $this->recipeIngredientToJson($input), $recipe->getInputs()),
+			array_map(fn(ItemStack $output) => $this->itemStackToJson($output), $recipe->getOutputs()),
+			$recipe->getBlockName(),
+			$recipe->getPriority(),
+			$unlockingIngredients !== null ? array_map(fn(RecipeIngredient $input) => $this->recipeIngredientToJson($input), $unlockingIngredients) : []
+		);
+	}
+
+	private function furnaceRecipeToJson(FurnaceRecipe $recipe) : FurnaceRecipeData{
+		return new FurnaceRecipeData(
+			$this->recipeIngredientToJson(new RecipeIngredient(new IntIdMetaItemDescriptor($recipe->getInputId(), $recipe->getInputMeta() ?? 32767), 1)),
+			$this->itemStackToJson($recipe->getResult()),
+			$recipe->getBlockName()
+		);
+	}
+
+	private function smithingRecipeToJson(SmithingTransformRecipe $recipe) : SmithingTransformRecipeData{
+		return new SmithingTransformRecipeData(
+			$this->recipeIngredientToJson($recipe->getTemplate()),
+			$this->recipeIngredientToJson($recipe->getInput()),
+			$this->recipeIngredientToJson($recipe->getAddition()),
+			$this->itemStackToJson($recipe->getOutput()),
+			$recipe->getBlockName()
+		);
+	}
+
+	private function smithingTrimRecipeToJson(SmithingTrimRecipe $recipe) : SmithingTrimRecipeData{
+		return new SmithingTrimRecipeData(
+			$this->recipeIngredientToJson($recipe->getTemplate()),
+			$this->recipeIngredientToJson($recipe->getInput()),
+			$this->recipeIngredientToJson($recipe->getAddition()),
+			$recipe->getBlockName()
+		);
+	}
+
+	public function handleCraftingData(CraftingDataPacket $packet) : bool{
+		echo "updating crafting data\n";
+
+		$recipesPath = Path::join($this->bedrockDataPath, "recipes");
+		Filesystem::recursiveUnlink($recipesPath);
+		@mkdir($recipesPath);
+
+		$recipes = [];
+		foreach($packet->recipesWithTypeIds as $entry){
+			static $typeMap = [
+				CraftingDataPacket::ENTRY_SHAPELESS => "shapeless_crafting",
+				CraftingDataPacket::ENTRY_SHAPED => "shaped_crafting",
+				CraftingDataPacket::ENTRY_FURNACE => "smelting",
+				CraftingDataPacket::ENTRY_FURNACE_DATA => "smelting",
+				CraftingDataPacket::ENTRY_MULTI => "special_hardcoded",
+				CraftingDataPacket::ENTRY_USER_DATA_SHAPELESS => "shapeless_shulker_box",
+				CraftingDataPacket::ENTRY_SHAPELESS_CHEMISTRY => "shapeless_chemistry",
+				CraftingDataPacket::ENTRY_SHAPED_CHEMISTRY => "shaped_chemistry",
+				CraftingDataPacket::ENTRY_SMITHING_TRANSFORM => "smithing",
+				CraftingDataPacket::ENTRY_SMITHING_TRIM => "smithing_trim",
+			];
+			if(!isset($typeMap[$entry->getTypeId()])){
+				throw new \UnexpectedValueException("Unknown recipe type ID " . $entry->getTypeId());
+			}
+			$mappedType = $typeMap[$entry->getTypeId()];
+
+			if($entry instanceof ShapedRecipe){
+				//all known recipes are currently symmetric and I don't feel like attaching a `symmetric` field to
+				//every shaped recipe for this - split it into a separate category instead
+				if(!$entry->isSymmetric()){
+					$recipes[$mappedType . "_asymmetric"][] = $this->shapedRecipeToJson($entry);
+				}else{
+					$recipes[$mappedType][] = $this->shapedRecipeToJson($entry);
+				}
+			}elseif($entry instanceof ShapelessRecipe){
+				$recipes[$mappedType][] = $this->shapelessRecipeToJson($entry);
+			}elseif($entry instanceof MultiRecipe){
+				$recipes[$mappedType][] = $entry->getRecipeId()->toString();
+			}elseif($entry instanceof FurnaceRecipe){
+				$recipes[$mappedType][] = $this->furnaceRecipeToJson($entry);
+			}elseif($entry instanceof SmithingTransformRecipe){
+				$recipes[$mappedType][] = $this->smithingRecipeToJson($entry);
+			}elseif($entry instanceof SmithingTrimRecipe){
+				$recipes[$mappedType][] = $this->smithingTrimRecipeToJson($entry);
+			}else{
+				throw new AssumptionFailedError("Unknown recipe type " . get_class($entry));
+			}
+		}
+
+		foreach($packet->potionTypeRecipes as $recipe){
+			$recipes["potion_type"][] = new PotionTypeRecipeData(
+				$this->recipeIngredientToJson(new RecipeIngredient(new IntIdMetaItemDescriptor($recipe->getInputItemId(), $recipe->getInputItemMeta()), 1)),
+				$this->recipeIngredientToJson(new RecipeIngredient(new IntIdMetaItemDescriptor($recipe->getIngredientItemId(), $recipe->getIngredientItemMeta()), 1)),
+				$this->itemStackToJson(new ItemStack($recipe->getOutputItemId(), $recipe->getOutputItemMeta(), 1, 0, "")),
+			);
+		}
+
+		if($this->itemTypeDictionary === null){
+			throw new AssumptionFailedError("We should have already crashed if this was null");
+		}
+		foreach($packet->potionContainerRecipes as $recipe){
+			$recipes["potion_container_change"][] = new PotionContainerChangeRecipeData(
+				$this->itemTypeDictionary->fromIntId($recipe->getInputItemId()),
+				$this->recipeIngredientToJson(new RecipeIngredient(new IntIdMetaItemDescriptor($recipe->getIngredientItemId(), 0), 1)),
+				$this->itemTypeDictionary->fromIntId($recipe->getOutputItemId()),
+			);
+		}
+
+		//this sorts the data into a canonical order to make diffs between versions reliable
+		//how the data is ordered doesn't matter as long as it's reproducible
+		foreach($recipes as $_type => $entries){
+			$_sortedRecipes = [];
+			$_seen = [];
+			foreach($entries as $entry){
+				$entry = self::sort($entry);
+				$_key = json_encode($entry);
+				$duplicates = $_seen[$_key] ??= 0;
+				$_seen[$_key]++;
+				$suffix = chr(ord("a") + $duplicates);
+				$_sortedRecipes[$_key . $suffix] = $entry;
+			}
+			ksort($_sortedRecipes, SORT_STRING);
+			$recipes[$_type] = array_values($_sortedRecipes);
+			foreach($_seen as $_key => $_seenCount){
+				if($_seenCount > 1){
+					fwrite(STDERR, "warning: $_type recipe $_key was seen $_seenCount times\n");
+				}
+			}
+		}
+
+		ksort($recipes, SORT_STRING);
+		foreach($recipes as $type => $entries){
+			echo "$type: " . count($entries) . "\n";
+		}
+		foreach($recipes as $type => $entries){
+			file_put_contents(Path::join($recipesPath, $type . '.json'), json_encode($entries, JSON_PRETTY_PRINT) . "\n");
+		}
+
+		return true;
+	}
+
+	public function handleAvailableActorIdentifiers(AvailableActorIdentifiersPacket $packet) : bool{
+		echo "storing actor identifiers" . PHP_EOL;
+
+		$tag = $packet->identifiers->getRoot();
+		if(!($tag instanceof CompoundTag)){
+			throw new AssumptionFailedError();
+		}
+		$idList = $tag->getTag("idlist");
+		if(!($idList instanceof ListTag) || $idList->getTagType() !== NBT::TAG_Compound){
+			echo $tag . "\n";
+			throw new \RuntimeException("expected TAG_List<TAG_Compound>(\"idlist\") tag inside root TAG_Compound");
+		}
+		if($tag->count() > 1){
+			echo $tag . "\n";
+			echo "!!! unexpected extra data found in available actor identifiers\n";
+		}
+		echo "updating legacy => string entity ID mapping table\n";
+		$map = [];
+		/**
+		 * @var CompoundTag $thing
+		 */
+		foreach($idList as $thing){
+			$map[$thing->getString("id")] = $thing->getInt("rid");
+		}
+		asort($map, SORT_NUMERIC);
+		file_put_contents($this->bedrockDataPath . '/entity_id_map.json', json_encode($map, JSON_PRETTY_PRINT) . "\n");
+		echo "storing entity identifiers\n";
+		file_put_contents($this->bedrockDataPath . '/entity_identifiers.nbt', $packet->identifiers->getEncodedNbt());
+		return true;
+	}
+
+	public function handleBiomeDefinitionList(BiomeDefinitionListPacket $packet) : bool{
+		echo "storing biome definitions" . PHP_EOL;
+
+		file_put_contents($this->bedrockDataPath . '/biome_definitions_full.nbt', $packet->definitions->getEncodedNbt());
+
+		$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);
+				}
+			}
+		}
+
+		file_put_contents($this->bedrockDataPath . '/biome_definitions.nbt', (new CacheableNbt($strippedNbt))->getEncodedNbt());
+
+		return true;
+	}
+}
+
+/**
+ * @param string[] $argv
+ */
+function main(array $argv) : int{
+	if(count($argv) !== 3){
+		fwrite(STDERR, 'Usage: ' . PHP_BINARY . ' ' . __FILE__ . ' <input file> <path to BedrockData>');
+		return 1;
+	}
+	[, $inputFile, $bedrockDataPath] = $argv;
+
+	$handler = new ParserPacketHandler($bedrockDataPath);
+
+	$packets = file($inputFile, FILE_IGNORE_NEW_LINES);
+	if($packets === false){
+		fwrite(STDERR, 'File ' . $inputFile . ' not found or permission denied');
+		return 1;
+	}
+
+	foreach($packets as $lineNum => $line){
+		$parts = explode(':', $line);
+		if(count($parts) !== 2){
+			fwrite(STDERR, 'Wrong packet format at line ' . ($lineNum + 1) . ', expected read:base64 or write:base64');
+			return 1;
+		}
+		$raw = base64_decode($parts[1], true);
+		if($raw === false){
+			fwrite(STDERR, 'Invalid base64\'d packet on line ' . ($lineNum + 1) . ' could not be parsed');
+			return 1;
+		}
+
+		$pk = PacketPool::getInstance()->getPacket($raw);
+		if($pk === null){
+			fwrite(STDERR, "Unknown packet on line " . ($lineNum + 1) . ": " . $parts[1]);
+			continue;
+		}
+		$serializer = PacketSerializer::decoder($raw, 0);
+
+		$pk->decode($serializer);
+		$pk->handle($handler);
+		if(!$serializer->feof()){
+			echo "Packet on line " . ($lineNum + 1) . ": didn't read all data from " . get_class($pk) . " (stopped at offset " . $serializer->getOffset() . " of " . strlen($serializer->getBuffer()) . " bytes): " . bin2hex($serializer->getRemaining()) . "\n";
+		}
+	}
+	return 0;
+}
+
+exit(main($argv));
diff --git a/tools/generate-block-palette-spec.php b/tools/generate-block-palette-spec.php
new file mode 100644
index 0000000000..879ffd6b48
--- /dev/null
+++ b/tools/generate-block-palette-spec.php
@@ -0,0 +1,92 @@
+<?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\tools\generate_block_palette_spec;
+
+use pocketmine\nbt\NbtException;
+use pocketmine\nbt\tag\ByteTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\StringTag;
+use pocketmine\network\mcpe\convert\BlockStateDictionary;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Filesystem;
+use pocketmine\utils\Utils;
+use function array_values;
+use function count;
+use function dirname;
+use function file_put_contents;
+use function fwrite;
+use function get_class;
+use function json_encode;
+use function ksort;
+use const JSON_PRETTY_PRINT;
+use const SORT_NATURAL;
+use const SORT_STRING;
+use const STDERR;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+if(count($argv) !== 3){
+	fwrite(STDERR, "Required arguments: input palette file path, output JSON file path\n");
+	exit(1);
+}
+
+[, $inputFile, $outputFile] = $argv;
+
+try{
+	$states = BlockStateDictionary::loadPaletteFromString(Filesystem::fileGetContents($inputFile));
+}catch(NbtException){
+	fwrite(STDERR, "Invalid block palette file $argv[1]\n");
+	exit(1);
+}
+
+$reportMap = [];
+
+foreach($states as $state){
+	$name = $state->getName();
+	$reportMap[$name] ??= [];
+	foreach(Utils::stringifyKeys($state->getStates()) as $propertyName => $value){
+		if($value instanceof IntTag || $value instanceof StringTag){
+			$rawValue = $value->getValue();
+		}elseif($value instanceof ByteTag){
+			$rawValue = match($value->getValue()){
+				0 => false,
+				1 => true,
+				default => throw new AssumptionFailedError("Unexpected ByteTag value for $name -> $propertyName ($value)")
+			};
+		}else{
+			throw new AssumptionFailedError("Unexpected tag type for $name -> $propertyName ($value)");
+		}
+		$reportMap[$name][$propertyName][get_class($value) . ":" . $value->getValue()] = $rawValue;
+	}
+}
+
+foreach(Utils::stringifyKeys($reportMap) as $blockName => $propertyList){
+	foreach(Utils::stringifyKeys($propertyList) as $propertyName => $propertyValues){
+		ksort($propertyValues, SORT_NATURAL);
+		$reportMap[$blockName][$propertyName] = array_values($propertyValues);
+	}
+}
+ksort($reportMap, SORT_STRING);
+
+file_put_contents($outputFile, json_encode($reportMap, JSON_PRETTY_PRINT));
diff --git a/tools/generate-item-upgrade-schema.php b/tools/generate-item-upgrade-schema.php
new file mode 100644
index 0000000000..4eee925392
--- /dev/null
+++ b/tools/generate-item-upgrade-schema.php
@@ -0,0 +1,130 @@
+<?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);
+
+/**
+ * This script is used to generate a version-to-version item upgrade schema.
+ * The following inputs are required:
+ * - A full item mapping table from a current version (e.g. r16_to_current_block_map.json)
+ * - A directory containing schemas for previous versions' incremental updates
+ */
+namespace pocketmine\tools\generate_item_upgrade_schema;
+
+use pocketmine\errorhandler\ErrorToExceptionHandler;
+use pocketmine\utils\Filesystem;
+use Symfony\Component\Filesystem\Path;
+use function count;
+use function dirname;
+use function file_put_contents;
+use function is_array;
+use function json_decode;
+use function json_encode;
+use function ksort;
+use function scandir;
+use const JSON_FORCE_OBJECT;
+use const JSON_PRETTY_PRINT;
+use const JSON_THROW_ON_ERROR;
+use const SCANDIR_SORT_ASCENDING;
+use const SORT_STRING;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+if(count($argv) !== 4){
+	\GlobalLogger::get()->error("Required arguments: path to mapping table, path to current schemas, path to output file");
+	exit(1);
+}
+
+[, $mappingTableFile, $upgradeSchemasDir, $outputFile] = $argv;
+
+$target = json_decode(Filesystem::fileGetContents($mappingTableFile), true, JSON_THROW_ON_ERROR);
+if(!is_array($target)){
+	\GlobalLogger::get()->error("Invalid mapping table file");
+	exit(1);
+}
+
+$files = ErrorToExceptionHandler::trapAndRemoveFalse(fn() => scandir($upgradeSchemasDir, SCANDIR_SORT_ASCENDING));
+
+$merged = [];
+foreach($files as $file){
+	if($file === "." || $file === ".."){
+		continue;
+	}
+	\GlobalLogger::get()->info("Processing schema file $file");
+	$data = json_decode(Filesystem::fileGetContents(Path::join($upgradeSchemasDir, $file)), associative: true, flags: JSON_THROW_ON_ERROR);
+	if(!is_array($data)){
+		\GlobalLogger::get()->error("Invalid schema file $file");
+		exit(1);
+	}
+	foreach(($data["renamedIds"] ?? []) as $oldId => $newId){
+		if(isset($merged["simple"][$oldId])){
+			\GlobalLogger::get()->warning("Duplicate rename for $oldId in file $file (was " . $merged["simple"][$oldId] . ", now $newId)");
+		}
+		$merged["simple"][$oldId] = $newId;
+	}
+
+	foreach(($data["remappedMetas"] ?? []) as $oldId => $mappings){
+		foreach($mappings as $meta => $newId){
+			if(isset($merged["complex"][$oldId][$meta])){
+				\GlobalLogger::get()->warning("Duplicate meta remap for $oldId meta $meta in file $file (was " . $merged["complex"][$oldId][$meta] . ", now $newId)");
+			}
+			$merged["complex"][$oldId][$meta] = $newId;
+		}
+	}
+}
+
+$newDiff = [];
+
+foreach($target["simple"] as $oldId => $newId){
+	$previousNewId = $merged["simple"][$oldId] ?? null;
+	if(
+		$previousNewId === $newId || //if previous schemas already accounted for this
+		($previousNewId !== null && isset($target["simple"][$previousNewId])) //or the item's ID has been changed for a second time
+	){
+		continue;
+	}
+	$newDiff["renamedIds"][$oldId] = $newId;
+}
+if(isset($newDiff["renamedIds"])){
+	ksort($newDiff["renamedIds"], SORT_STRING);
+}
+
+foreach($target["complex"] as $oldId => $mappings){
+	foreach($mappings as $meta => $newId){
+		if(($merged["complex"][$oldId][$meta] ?? null) !== $newId){
+			if($oldId === "minecraft:spawn_egg" && $meta === 130 && ($newId === "minecraft:axolotl_bucket" || $newId === "minecraft:axolotl_spawn_egg")){
+				//TODO: hack for vanilla bug workaround
+				continue;
+			}
+			$newDiff["remappedMetas"][$oldId][$meta] = $newId;
+		}
+	}
+	if(isset($newDiff["remappedMetas"][$oldId])){
+		ksort($newDiff["remappedMetas"][$oldId], SORT_STRING);
+	}
+}
+if(isset($newDiff["remappedMetas"])){
+	ksort($newDiff["remappedMetas"], SORT_STRING);
+}
+ksort($newDiff, SORT_STRING);
+
+\GlobalLogger::get()->info("Writing output file to $outputFile");
+file_put_contents($outputFile, json_encode($newDiff, JSON_PRETTY_PRINT | JSON_FORCE_OBJECT));
diff --git a/tools/generate-permission-doc.php b/tools/generate-permission-doc.php
index fd04f1a296..79b6ced5cf 100644
--- a/tools/generate-permission-doc.php
+++ b/tools/generate-permission-doc.php
@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\generate_permission_doc;
 
+use pocketmine\lang\Language;
+use pocketmine\lang\Translatable;
 use pocketmine\permission\DefaultPermissions;
 use pocketmine\permission\PermissionManager;
 use pocketmine\utils\Utils;
@@ -58,6 +60,7 @@ function markdownify(string $name) : string{
 	return str_replace(['.', '`', ' '], ['', '', '-'], strtolower($name));
 }
 DefaultPermissions::registerCorePermissions();
+$language = new Language(Language::FALLBACK_LANGUAGE);
 
 $cwd = Utils::assumeNotFalse(getcwd());
 $output = Path::join($cwd, "core-permissions.$format");
@@ -94,12 +97,14 @@ if($format === "md"){
 	fwrite($doc, "\n");
 }
 foreach($permissions as $permission){
+	$description = $permission->getDescription();
+	$plainDescription = $description instanceof Translatable ? $language->translate($description) : $description;
 	if($format === "md"){
 		$link = count($permission->getChildren()) === 0 ? "N/A" : "[Jump](#" . markdownify("Permissions implied by `" . $permission->getName() . "`") . ")";
-		fwrite($doc, "| `" . $permission->getName() . "` | " . $permission->getDescription() . " | $link |\n");
+		fwrite($doc, "| `" . $permission->getName() . "` | $plainDescription | $link |\n");
 	}else{
 		fwrite($doc, "   * - ``" . $permission->getName() . "``\n");
-		fwrite($doc, "     - " . $permission->getDescription() . "\n");
+		fwrite($doc, "     - $plainDescription\n");
 		if(count($permission->getChildren()) === 0){
 			fwrite($doc, "     - N/A\n");
 		}else{
diff --git a/tools/simulate-chunk-selector.php b/tools/simulate-chunk-selector.php
index 81beb6bb3c..0b279268ab 100644
--- a/tools/simulate-chunk-selector.php
+++ b/tools/simulate-chunk-selector.php
@@ -24,12 +24,10 @@ declare(strict_types=1);
 namespace pocketmine\tools\simulate_chunk_selector;
 
 use pocketmine\player\ChunkSelector;
-use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Utils;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\World;
 use Symfony\Component\Filesystem\Path;
-use function assert;
 use function count;
 use function dirname;
 use function fwrite;
@@ -128,7 +126,12 @@ if(count(getopt("", ["help"])) !== 0){
 	exit(0);
 }
 
-foreach(Utils::stringifyKeys(getopt("", ["radius:", "baseX:", "baseZ:", "scale:", "chunksPerStep:"])) as $name => $value){
+$opts = getopt("", ["radius:", "baseX:", "baseZ:", "scale:", "chunksPerStep:", "output:"]);
+foreach(["radius", "baseX", "baseZ", "scale", "chunksPerStep"] as $name){
+	$value = $opts[$name] ?? null;
+	if($value === null){
+		continue;
+	}
 	if(!is_string($value) || (string) ((int) $value) !== $value){
 		fwrite(STDERR, "Value for --$name must be an integer\n");
 		exit(1);
@@ -139,8 +142,7 @@ foreach(Utils::stringifyKeys(getopt("", ["radius:", "baseX:", "baseZ:", "scale:"
 		"baseX" => ($baseX = $value),
 		"baseZ" => ($baseZ = $value),
 		"scale" => ($scale = $value),
-		"chunksPerStep" => ($nChunksPerStep = $value),
-		default => throw new AssumptionFailedError("getopt() returned unknown option")
+		"chunksPerStep" => ($nChunksPerStep = $value)
 	};
 }
 if($radius === null){
@@ -149,10 +151,10 @@ if($radius === null){
 }
 
 $outputDirectory = null;
-foreach(Utils::stringifyKeys(getopt("", ["output:"])) as $name => $value){
-	assert($name === "output");
+if(isset($opts["output"])){
+	$value = $opts["output"];
 	if(!is_string($value)){
-		fwrite(STDERR, "Value for --$name must be a string\n");
+		fwrite(STDERR, "Value for --output be a string\n");
 		exit(1);
 	}
 	if(!@mkdir($value) && !is_dir($value)){